Packman Build Service PMBS

obs-studio.changes Changed

@@ -4,6 +4,818 @@
 - Disable BuildRequires libmfx as it is unavailable currently.
 
 -------------------------------------------------------------------
+Fri Jan 19 15:13:48 UTC 2024 - hpj@urpla.net
+
+- Update to version 30.0.2:
+ * libobs: Update version to 30.0.2
+ * CI: Downgrade flatpak-builder to fix Flatpak publish
+ * Revert "cmake: Align Product Name and Bundle Name on macOS"
+ * libobs: Update version to 30.0.1
+ * Update translations from Crowdin
+ * obs-websocket: Update version to 5.3.4
+ * obs-browser: Update version to 2.22.2
+ * win-wasapi: Ignore timestamp errors
+ * libobs: Fix PTS incrementation when FPS divisor is enabled
+ * updater: Clear shader cache after updating
+ * libobs-d3d11: Add checksum to shader cache
+ * cmake: Align Product Name and Bundle Name on macOS
+ * libobs: Use macOS specific APIs to report free disk space
+ * UI: Disable safe mode when --multi is used
+ * libobs: Fix memory leak when migrating from legacy scene item data
+ * libobs: Fix crash in `obs_sceneitem_remove()` when already removed
+ * linux-pipewire: Ensure number of dmabufs is zero initialized
+ * rtmp-services: Update IRLToolkit service
+ * mac-capture: Add handling for nil target window
+ * UI: cancel session end request on commitDataRequest() signal
+ * CI: Validate Flatpak with flatpak-builder-lint
+ * CI: Set build-log-url when publishing
+ * CI: Bump flatpak-github-actions commit hash
+ * win-capture: Update graphics hook version
+ * build-aux: Remove StatusNotifierItem Flatpak permission
+ * UI: Fix UseStreamKeyAdv not display stream key and not hide button
+ * win-capture: Fix Vulkan race condition
+ * UI: Fix typo in Virtual Camera logging functions
+ * CI: Update deps to 2023-11-03 release
+ * UI: Log Virtual Camera output type
+ * libobs: Fix crash when plugins delete properties in callback
+ * obs-scripting: Fix Sparkle delta updates by disabling bytecode caching
+ * libobs,obs-filters: Use common straight alpha math
+ * UI: Fix transform of sources in groups
+ * libobs: Add more files to list of public headers
+ * docs: Fix obs_sceneitem_get_group signature
+ * obs-webrtc: Allow non-CBR rate control with WHIP
+ * linux-pipwire: Pass obs_pw_stream to renegotiation callback
+ * Revert "win-wasapi: Remove 'BETA' from Application Audio Capture name"
+ * obs-qsv11: Migrate target usage settings
+ * plugins: Remove old macOS version ifdefs
+ * win-wasapi: Log source name on initialization
+ * UI: Fix AMF AV1 simple recording presets
+ * mac-virtualcam: Correct device timer firing rate
+ * rtmp-services: Remove defunct servers/services
+ * libobs: Export SIMDe headers unconditionally for plugin development
+ * CI: Update deps to 2023-10-26 release
+ * UI: Remove iCCP data from PNGs
+ * decklink-output-ui: Decouple DeckLink output state
+ * linux-pipewire: Load glad symbols on start
+ * linux-pipewire: Use the format properties for swap r/b
+ * linux-pipewire: Add locks to unsafe pipewire functions
+ * obs-qsv11: Log more QSV settings
+ * mac-avcapture: Replace kCMIOObjectPropertyElementMaster with Main
+ * mac-capture: Replace kAudioObjectPropertyElementMaster with Main
+ * libobs: Replace kAudioObjectPropertyElementMaster with Main
+ * cmake: Explicitly fail if macOS SDK is too old
+ * CI: Update deps to 2023-10-17 release
+ * UI: Add missing NULL check for skipUpdateVer
+ * obs-websocket: Update version to 5.3.3
+ * libobs-d3d11: Log VRAM in GiB
+ * frontend-tools: Remove unused startAtLaunch variable
+ * input-v4l2: always use linear alpha blending
+ * libobs: Fix rendering stats not being logged on output stop
+ * UI: Convert QTStr macro to inline function
+ * CI: Update CEF builds
+ * build-aux: Update Flatpak CEF build
+ * mac-virtualcam: Log when extension replacement is requested
+ * rtmp-services: Remove defunct servers/services
+ * UI: Fix compile error due to use of strlen in constexpr
+ * CI: Fix Steam upload (again)
+ * Update translations from Crowdin
+ * mac-virtualcam: Check result of finished extension installation
+ * mac-virtualcam: Treat extension installation cancellation as error
+ * mac-virtualcam: Always replace camera extension when requested
+ * build-aux: Update Flatpak CEF build
+ * CI: Update CEF builds
+ * cmake: Use dependency hashes to track revisions
+ * CI: Update deps to 2023-10-09 release
+ * win-capture: Add 9 window class auto switch to WGC mode
+ * win-capture: Add and tweak apps in compatibility.json
+ * .editorconfig: Add win-capture json
+ * cmake: Depend entirely on pkg-config if found for VPL
+ * CI: Add support for dependency revisions to Linux CI builds
+ * Revert "CI: Add xclogparser to macOS builds to generate issue report"
+ * Revert "CI: Add build annotation step to macOS arm64 builds"
+ * Revert "CI: Fix condition for annotations in nightly runs"
+ * UI: Enable "Paste Filters" after copying from scenes or mixer
+ * win-wasapi: Remove 'BETA' from Application Audio Capture name
+ * win-wasapi: Handle flags set by GetBuffer
+ * win-wasapi: Use provided timestamp for application audio capture
+ * libobs: Fix hotkeys when reordering sceneitems into/out of groups
+ * libobs: Distinguish sceneitem hotkeys by id
+ * libobs: Specify scene item IDs on creation
+ * UI: Initialize YouTubeAppDock synchronously to fix Qt runloop issues
+ * linux-v4l2: Expand packed values to 4 bytes
+ * rtmp-services: Update OnlyFans streaming service
+ * libobs: Use same ver. in obs-config.h for betas/RCs
+ * UI: Cleanup remaining uses of old version macros
+ * UI: Refactor Windows update check to always use LIBOBS_API_VER
+ * cmake: Fix OBS_COMMIT not being set (Windows only)
+ * cmake/libobs: Only set beta/rc increment
+ * libobs: Fix errors for gs_effect_create
+ * obs-ffmpeg: Readd OBS_ENCODER_CAP_DYN_BITRATE to AMF texture encoders
+ * libobs,obs-filters: Fix NAN when tonemapping
+ * UI: Use std::shared_ptr instead of QSharedPointer
+ * UI: Use C++11 ranged-for instead of Q_FOREACH
+ * obs-qsv11: Use translatable strings for target usage
+ * obs-qsv11: Remove D3D9 fallback
+ * obs-qsv11: Remove D3D9 allocator
+ * Revert "UI: Add workaround for Qt tooltip stylesheet bug"
+ * obs-qsv11: Redo session data releasing for Linux
+ * CI: Update deps to 2023-09-28 release
+ * mac-capture: Don't crash when migrating unknown display IDs
+ * obs-browser: Fix invalid comparison of integer types
+ * obs-browser: Update version to 2.22.1
+ * cmake: Update qrcodegen finder to match target names of CMake package
+ * libobs: Fix duplicate symbol resolution for obs plugins
+ * obs-webrtc: Move libdatachannel code to C++ from C
+ * obs-qsv11: Add license declaration file
+ * decklink: Add license declaration files
+ * libobs: Add license declaration files
+ * deps: Add license declaration files
+ * CI: Update deps to 2023-09-18 release
+ * obs-qsv11: Fix unusual CBR bitrate issues
+ * libobs: Do not skip async frames unless one has been selected
+ * Add Qt UI form spacing in editorconfig
+ * UI: Fix IP settings order
+ * obs-qsv11: Fix target usage migration string comparisons
+ * win-wasapi: Fix arithmetic for WAVEFORMATEX::cbSize
+ * UI: Avoid using newlines in error messages
+ * UI: Don't show native popup for YouTube auth message box
+ * UI: Standardize spelling of closable, fix typo
+ * UI: Add cleanup of stats callback on window close
+ * CI: Fix Steam prerelease detection for releases
+ * cmake: Fix regular expression for beta and RC version detection
+ * UI: Remove unused ExpandCheckBox
+ * CI: Fix condition for annotations in nightly runs
+ * rtmp-services: Rebranding Utreon to Playeur
+ * libobs: Fix obs_output_video and obs_output_audio for encoded output
+ * UI: Create/Delete YouTube Dock when switching profiles
+ * UI: Untangle ifdef'd if-statement to un-confuse Xcode
+ * image-source: Fix slideshow audio rendering buffer overrun
+ * UI: Restrict regex pattern for OAuth secrets
+ * UI: Add workaround for Qt tooltip stylesheet bug
+ * UI: Fix settings Apply button always being enabled
+ * win-dshow: Log source name at error
+ * rtmp-services: Remove defunct servers/services
+ * CI: Add build annotation step to macOS arm64 builds
+ * CI: Add xclogparser to macOS builds to generate issue report
+ * obs-websocket: Update version to 5.3.0
+ * obs-qsv11: Ensure default devices are Intel devices
+ * updater: Remove non-error logging from multithreaded code
+ * libobs: Remove old macOS guards for NSProcessInfo
+ * build-aux,CI: Bump Flatpak KDE Runtime to 6.5
+ * CI: Update flatpak-github-actions to get upstream improvement
+ * UI: Fix ifdef for YouTube dock integration
+ * mac-virtualcam: Switch pixel format of camera extension to BGRA
+ * UI: Increase YouTube API timeout
+ * UI: Fix stream key UI not showing when using stream key
+ * libobs: Fix warnings about implicit integer downcasts in macOS code
+ * obs-outputs: Silence all warnings generated by the FTL SDK
+ * text-freetype2: Fix warning about implicit integer downcast
+ * json11: Suppress warnings about unqualified std::move calls
+ * libobs: Suppress warnings about implicit integer downcasts
+ * plugins: Suppress warnings about implicit integer downcasts
+ * mac-avcapture: Log if portrait or studio light effects are active
+ * obs-ffmpeg: Fix broken mpegts output
+ * build-aux: Add missing build type to Flatpak modules
+ * UI: Fix source enumeration in source select aborting prematurely
+ * CI: Add missing secrets on Flatpak releases
+ * obs-outputs: Fix provision of CA certificates to mbedTLS on macOS
+ * CI: Fix ccache status output for workflow jobs
+ * CI: Fix GitHub Actions JSON runtime error in scheduled workflow
+ * docs: Clarify strlist_split
+ * updater: Static analysis cleanups
+ * obs-ffmpeg: Do not include sys/timeb.h on non-Windows system
+ * UI: Remove unused static functions
+ * obs-ffmpeg: Remove an unused static function
+ * obs-outputs: Remove unused static functions
+ * rtmp-services: Remove an unused static function
+ * mac-avcapture: Remove an unused static function
+ * linux-capture: Remove an unused static function
+ * plugins: Quote program paths used in os_process_pipe_create
+ * libobs: Log if CreateProcessW fails on Windows
+ * obs-qsv11: Fixup session releasing for Linux
+ * obs-qsv11: Use device enumeration for choosing DRM device
+ * obs-qsv11: Mark internal functions static
+ * UI: Increase minimum output resolution to 32x32
+ * UI: Add stream key tooltip in the auto-config wizard
+ * UI: Fix stream key tooltip in the settings page
+ * docs: Add version added to filter index functions
+ * CI: Fix typos in scheduled nightly run workflow
+ * UI: Fix crash in YoutubeAuth
+ * CI: Fix scheduled language file upload
+ * cmake: Restrict FindCEF path to omit default paths on Windows
+ * obs-x264: refactor log callback
+ * obs-x264: Remove unused getparam() function
+ * libobs: Do not hide OBS_NIX_PLATFORM_WAYLAND behind ifdef
+ * CI: Add brute-force workaround for macOS disk image creation failure
+ * Revert "UI: Support DnD overlay in linuxbrowser"
+ * CI: Remove concurrency limits for push workflow
+ * CI: Remove language file upload from push workflow
+ * CI: Add nightly upload of changed language files
+ * UI: Replace remaining enc-amf reference
+ * UI: Fix alignment of status bar message
+ * UI: Center vertical volume control buttons
+ * UI: Use the latest version when dropping files
+ * cmake: Mark source lists in feature files sortable
+ * Add YAML and ZSH spacing in editorconfig
+ * CI: Enforce the use of Ubuntu's CMake
+ * UI: Fix capitalization of "WebSocket"
+ * obs-filters: Add a mutex when running NVIDIA Audio FX
+ * UI: Log if user is ignoring service limits
+ * CI: Specify tag for Steam action on release
+ * cmake: Parse beta/rc version from override/git describe
+ * obs-qsv11: Fix crash in QSV test process
+ * build-aux: Enable QSV encoders on Flatpak
+ * UI: Add timer to NewYouTubeAppDock()
+ * CI: Bump FreeBSD version to supported release: 13.2
+ * UI: Move restart to end of main()
+ * rtmp-services: Remove defunct servers/services
+ * UI: Fix potential null pointer dereference
+ * UI: Fix memory leak in OBSQTDisplay
+ * CI: Fix Sparkle appcast release note generation
+ * obs-qsv11: Drop Windows guards on LowPower settings
+ * CI: Fix Steam Playtest upload
+ * docs: Fix obs_frontend_add_dock deprecation version
+ * obs-filters: Update NVIDIA Effects SDK versions
+ * CI: Update dispatch workflob jobs for documentation updates
+ * CI: Fix checkers tripping over empty GitHub Actions references
+ * CI: Fix push workflow checking for ref name instead of type
+ * CI: Use older compression and file system for macOS disk image
+ * CI: Use more explicit check for valid git reference in check actions
+ * CI: Do not cancel concurrent workflow runs for pushes to master
+ * obs-qsv11: Fix VPL initialization on intel-mediaSDK
+ * obs-qsv11: Fix InitParams low power fallback
+ * libobs: Fix shader fix not working on D3D11
+ * UI: Remove silent OpenGL fallback on Windows
+ * UI: Fix compiling without nlohmann JSON
+ * UI: Fix unnecessary GetCurrentScene() call
+ * libobs: Fix default.effect not working with OpenGL
+ * UI: Hold reference to scene when drawing spacers
+ * UI: Fix possible race condition in DrawSpacingHelpers
+ * libobs: Remove starting_frame_count from obs_output_t
+ * libobs: Fix holding possibly released pointer in obs_output_t
+ * UI: Fix transform shortcuts with multiple items selected
+ * UI: Set advanced audio encoder to invalid if missing
+ * decklink: Reset video capture on format change
+ * decklink: Add HDR playback support
+ * libobs/media-io: Relax color space comparison
+ * libobs: Add DrawAlphaDivide variant shaders
+ * UI: Store dock titles in BrowserDock instead of relying on Qt
+ * UI: Update text for custom browser dock menu items manually
+ * UI: Track custom browser dock names internally
+ * UI: Set browser dock title in constructor
+ * UI: Fix crash at resizing display followed by destruction on macOS
+ * UI: Fix crash at render_display while shutdown on macOS
+ * UI: Removes the workaround of not receiving expose event
+ * docs: Add source-specific procedures
+ * docs: Add source-specific signals
+ * docs: Add decl string for media signals
+ * image-source: Fix slideshow proc decl strings
+ * Update translations from Crowdin
+ * CI: Update obs-crowdin-sync to latest
+ * UI/importers: Ignore empty Streamlabs hotkeys
+ * UI: Show link to release notes in Help menu
+ * sndio: Remove variable-length array usage
+ * UI: Add high frame rate 119.88 fps to capture device properties
+ * UI: Add high frame rates (120, 144, 240) to general video properties
+ * UI: Use QCheckBox::toggled signal for checkbox changes
+ * UI: Don't cap auto-config wizard FPS whole number precision at 2
+ * UI: Use QGroupBox::toggled signal for group changes
+ * UI: Set loading to true when loading accessibility settings
+ * UI: Fix YouTube not saving stream key in auto config
+ * obs-ffmpeg: Set avg_frame_rate for AVStream outputs
+ * linux-pipewire: Replace dynamic arrays with allocations
+ * UI: Use static function instead of macro to set color
+ * .git-blame-ignore-revs: Add clang-format 16 update
+ * updater: Pass through parameters to restarted OBS instance
+ * UI: Copy OBS command line arguments to updater launch
+ * CI: Simplify build scripts for CI-only use
+ * mac-virtualcam: Fix crash on macOS when starting virtualcam output
+ * Update .clang-format rules for ObjC files for version 16
+ * CI: Update to clang-format 16
+ * obs-webrtc: Improve WHIP compliance
+ * obs-webrtc: Follow HTTP redirects
+ * obs-qsv11: Fix adapter enumeration in test app
+ * Revert "obs-outputs: Enable HDR for HEVC over RTMP"
+ * rtmp-services: Add MasterStream.iR to ingest list (#9330)
+ * UI: Make simple mode settings warnings float at bottom of page
+ * obs-qsv11: Fix RepeatPPS bug
+ * obs-qsv11: Remove AVBR, QVBR, and VCM
+ * obs-qsv11: Refactor and tune Look-ahead settings
+ * obs-qsv11: Update Target Usage options
+ * obs-qsv11: Fix bitstream bug
+ * obs-qsv11: Adjust Gop and keyint_sec parameters
+ * obs-qsv11: Adjust Subjective Video Enhancements
+ * obs-qsv11: Add AV1 meta data
+ * obs-qsv11: Improve AV1 quality parameters
+ * libobs/util: Define PRAGMA_WARN_DEPRECATION for MSVC
+ * CI: Update peter-evans/create-pull-request GitHub Action
+ * CI: Pin third-party actions to specific commits
+ * CI: Update deps to 2023-08-08 release
+ * obs-browser: Disable Bluetooth support
+ * CI: Fix services validator being unable to create Pull Requests
+ * obs-qsv11: Remove MSDK headers
+ * obs-qsv11: Add VPL changes
+ * UI: Avoid showing YouTubeAppDock each time settings are updated
+ * UI: Make title bar "SAFE MODE" translatable
+ * libobs: Add local event monitor for hotkey thread
+ * plugins: Update CMake minimum to 3.22
+ * libobs: Update CMake minimum to 3.22
+ * deps: Update CMake minimum to 3.22
+ * UI: Update CMake minimum to 3.22
+ * cmake: Update CMake minimum to 3.22
+ * UI: Fix YouTubeAppDock restore dock state
+ * obs-outputs: Refine certificate selection on macOS
+ * libobs/util: Contain simde diagnostic pragmas
+ * mac-virtualcam: Replace variable-length arrays with NSMutableData
+ * libobs: Remove variable-length array
+ * linux-pipewire: Replace variable-length arrays with dynamic arrays
+ * UI: Don't call obs_source_get_output_flags on a NULL source
+ * CI: Remove optimistic continuation of disk image creation for macOS
+ * CI: Add write permissions to contents scope to service validator
+ * UI: Fix case where cef func may not be present
+ * UI: Use new add dock path for YouTubeAppDock
+ * obs-transitions: Fix stingers lingering on last frame
+ * CI: Add wrapper function for macOS disk image operations
+ * graphics-hook: Handle VkImageViewUsageCreateInfo
+ * UI: Fix build error (forgot macro)
+ * UI: Fix YouTubeAppDock crash
+ * frontend-tools: Disable properties deferring in script dialog
+ * UI: Add func to disable properties view deferring
+ * Revert "UI: Only defer property updates for input and transition sources"
+ * CI: Fix detaching of temporary macOS disk images during image creation
+ * build-aux: Update Flatpak modules
+ * libobs: Make video frame header public
+ * UI: Add "YouTube Control Panel" dock panel
+ * CI: Update deps to 2023-08-02 release
+ * libobs: Profile graphics initialisation and shader compilation
+ * CI: Shorten job and step labels in workflow files
+ * UI: Refactor getting the default encoder for a format
+ * UI: Clean up remaining C-isms in FFmpeg utils
+ * UI: Replace FFmpeg encoder alias with long name
+ * UI: Refactor FFmpeg utilities codec/format enumeration
+ * UI: Fix matching FFmpeg formats/codecs
+ * deps: Remove libff
+ * UI: Migrate from libff
+ * win-wasapi: Add hook signal and proc for process output capture
+ * win-capture: Add hook signal and proc for window capture
+ * win-capture: Add hook signal and proc for game capture
+ * linux-capture: Add hook signal and proc for Xcomposite window capture
+ * UI: Add new scene at current row
+ * deps/libff: Remove unused code and header files
+ * UI: Split toggle preview program hotkey into hotkey pair
+ * decklink: Support 10-bit RGB capture
+ * libobs: Add VIDEO_FORMAT_R10L
+ * libobs-opengl: Support mad/uint2/uint3/uint4
+ * deps,libobs,plugins: Remove in-tree Jansson
+ * libobs: Check if adapter can safely fast clear
+ * libobs: Add function to check fast clear capability
+ * libobs-d3d11: Check if device can perform fast clear on init
+ * libobs: Add obs_source_info.filter_add
+ * build-aux: Add RNNoise Flatpak module
+ * obs-qsv11: Downgrade minimum required CMake version
+ * aja: Ignore return value from aja-common functions
+ * docs: Indicate that refcount is not incremented
+ * CI: Add fixes for tagged release runs and assorted minor issues
+ * UI: Avoid auto config selecting QSV on linux
+ * obs-outputs: Set videocodecid to HEVC/AV1 FourCC in E-RTMP
+ * libobs: Fix GPU scaled video encoder media not being cleared
+ * libobs: Fix flip calculations in bounding box
+ * obs-qsv11: Link against Libva on Linux
+ * UI: Fix crop on flipped sceneitems in bounding boxes
+ * UI: Fix drawing of pixel guides on flipped sceneitems in bounding boxes
+ * UI: Fix draw and find of rot handle with bounding box and flip
+ * UI: Fix rotation handle find angle
+ * win-capture: Fix leaking framebuffers data
+ * UI: Add IPv4 / IPv6 selection setting
+ * obs-outputs: Add log message on successful connection
+ * obs-outputs: Adopt Happy Eyeballs in RTMP
+ * deps: Add Happy Eyeballs (RFC 6555)
+ * rtmp-services: Fix package.json not using correct ver.
+ * rtmp-services: Add "VStream" RTMP service (#9274)
+ * UI: Migrate WhatsNew to nlohmann JSON
+ * UI: Migrate branches to nlohmann JSON
+ * UI: Migrate Windows update check to nlohmann JSON
+ * updater: Update manifest struct for use in UI
+ * cmake,plugins,build-aux: Remove enc-amf
+ * UI: Remove D3D11 shader cache folder creation
+ * libobs-d3d11: Create shader cache directory when creating device
+ * updater: Migrate to nlohmann JSON
+ * docs: Add documentation for filter index functions
+ * build-aux: Add shader cache cleanup to steam uninstall script
+ * libobs-d3d11: Implement shader cache
+ * CI: Fix Python 3.11 installation on macOS 13 runners
+ * CI: Fix steamcmd being unable to find generated build file
+ * updater: Update installed version in registry
+ * UI: Fix remaining status bar nits
+ * UI: Don't clear lastService immediately after setting it
+ * build-aux: Add deps to clang-format and cmake-format
+ * build-aux: Make clang-format ignore libdshowcapture
+ * CI: Fix broken download of nightly build artifacts for Steam uploads
+ * UI: Add Safe Mode
+ * libobs: Add obs_add_safe_module()
+ * CI: Fix broken Flatpak cache generation on CI
+ * CI: Fix random password generation for macOS codesigning
+ * UI: Replace SIGNAL and SLOT macros for HookWidget methods
+ * UI: Replace SIGNAL and SLOT macros for AddProjectorMenuMonitors method
+ * UI: Replace SIGNAL and SLOT macros in aja-/decklink-output-ui
+ * UI: Replace SIGNAL and SLOT macros in frontend-tools
+ * UI: Replace SIGNAL and SLOT macros in settings
+ * UI: Replace SIGNAL and SLOT macros in importer
+ * UI: Replace SIGNAL and SLOT macros in filters
+ * UI: Replace SIGNAL and SLOT macros in window-basic-main
+ * UI: Replace SIGNAL and SLOT macros in auto-config
+ * UI: Replace SIGNAL and SLOT macros in transitions
+ * UI: Replace SIGNAL and SLOT macros in about dialog
+ * UI: Replace SIGNAL and SLOT macros in properties-view
+ * UI: Replace SIGNAL and SLOT macros in obs-app
+ * UI: Replace SIGNAL and SLOT macros in remux
+ * UI: Replace SIGNAL and SLOT macros in projectors
+ * UI: Replace SIGNAL and SLOT macros in missing files
+ * UI: Replace SIGNAL and SLOT macros in media controls
+ * UI: Replace SIGNAL and SLOT macros in custom widgets
+ * UI: Replace SIGNAL and SLOT macros in auth
+ * UI: Replace SIGNAL and SLOT macros in adv-audio-control
+ * updater: Treat mapped file errors as a sharing violation
+ * CI: Switch service availability checks to macOS runners
+ * libobs: Change return type for getting filter index
+ * CI: Remove label triggers from pull request workflow
+ * obs-browser: Update version to 2.22.0
+ * cmake: Copy libdatachannel DLL
+ * build-aux: Update libdatachannel for Flatpak
+ * CI: Fix scheduled Steam builds
+ * UI: Redesign status bar
+ * cmake: Remove Qt version selection and Qt 5 support
+ * libobs: Assume Qt 6, always warn about Qt 5 plugins
+ * UI: Remove remaining Qt 6 ifdef
+ * CI: Fix Qt XML validator attempting to validate non-XML files
+ * obs-ffmpeg: Fix rendezvous mode with SRT
+ * UI: Avoid QT_TO_UTF8(QTStr()) double conversion
+ * obs-outputs: Enable HDR for HEVC over RTMP
+ * obs-webrtc: Add custom User-Agent and randomize SSRCs
+ * README.rst: Fix GitHub Actions status badge target link
+ * CI: Fix updated workflows using outdated Flatpak actions
+ * README.rst: Fix GitHub Actions status badge
+ * CI: Fix team identifier check in macOS codesigning repository action
+ * UI: Adjust size policy for properties view
+ * CI: Delete legacy build and formatting check scripts
+ * CI: Delete legacy workflows for GitHub Actions
+ * CI: Add new reusable workflows for GitHub Actions
+ * CI: Add new repository actions for GitHub
+ * CI: Add new build and packaging scripts for Linux
+ * CI: Add new build and packaging scripts for macOS
+ * CI: Add zsh-based build framework files for macOS
+ * UI: Fix transform shortcuts for audio only sources
+ * obs-ffmpeg: Fix media source always STATE_ENDED
+ * cmake: Fix missing libobs subdirectories in MSVC code navigator
+ * .git-blame-ignore-revs: Add recent clang-format changes
+ * mac-capture: Set correct default type for application data
+ * UI: Destroy the frontend API after OBS_FRONTEND_EVENT_EXIT
+ * docs: Clarify OBS_FRONTEND_EVENT_EXIT intent
+ * linux-pipewire: Explicitly handle NULL format strings
+ * linux-pipewire: Move portal signal subcription to portal.c
+ * linux-pipewire: Add support for YUY2
+ * linux-pipewire: Add support for async sources
+ * linux-pipewire: Store source when creating streams
+ * linux-pipewire: Extend format_data
+ * linux-pipewire: Factor out format data in a struct
+ * linux-pipewire: Move format info to streams
+ * linux-pipewire: Track streams
+ * linux-pipewire: Separate PipeWire core and streams
+ * cmake: Fix missing space between sentences
+ * libobs-d3d11: Left-pad device PCI ID to 4 characters with zeroes
+ * libobs: Fix PROPVARIANT variable has not be freed
+ * win-wasapi: Fix PROPVARIANT variable has not be freed
+ * docs: Add obs_properties_add_button2
+ * UI: Don't set fragmentation movflags in lossless mode
+ * libobs: Don't defer encoder updates if not necessary
+ * obs-ffmpeg: Fix NVENC VBR maxBitRate set to avgBitrate
+ * UI: Localize font picker window title
+ * mac-capture: Remove internal display settings from SCK Audio Capture
+ * libobs: Export more libobs/util headers
+ * CI: Remove syphon-framework exclude from format script
+ * clang-format: Set AllowShortLambdasOnASingleLine to Inline
+ * clang-format: Set AllowAllConstructorInitializersOnNextLine to false
+ * clang-format: Set AllowAllArgumentsOnNextLine to false
+ * .clang-format: Update and cleanup configuration file
+ * UI: Don't call activateWindow() when hidden
+ * win-dshow: Add support for grayscale MJPEG
+ * linux-v4l2: Add support for grayscale MJPEG
+ * UI, libobs: Add RAII wrappers for faders/volume meters
+ * CI,build-aux: Add Libqrcodegencpp on Linux
+ * cmake: Add finder for Libqrcodengencpp
+ * UI: Disable QSV for simple mode on Linux
+ * obs-qsv11: Add adapter checks for Linux
+ * obs-qsv11: Add a Linux implementation
+ * libobs: Fix back-to-back GPU encoder sessions breaking
+ * obs-ffmpeg: Remove legacy FFmpeg compatibility
+ * win-dshow: Remove legacy FFmpeg compatibility
+ * libobs: Remove legacy FFmpeg compatibility
+ * deps/media-playback: Remove legacy FFmpeg compatibility
+ * deps/libff: Remove legacy FFmpeg compatibility
+ * obs-ffmpeg: Remove outdated comment
+ * libobs/util: Remove outdated comment
+ * UI: Remove Qt 5 ifdef guards and code
+ * obs-qsv11: Fix missing ENABLE_HEVC definition for test executable
+ * obs-filters: Fix legacy CMake obs_status for RNNoise
+ * obs-webrtc: Fix CMake 3.0 module disabled path
+ * obs-webrtc: Fix legacy CMake obs_status call
+ * UI: Fix preprocessor directives for platform integrations
+ * libobs: Fix flip not working with stretch to bounds
+ * UI: Soft-delete scene collections
+ * rtmp-services: Remove defunct servers/services
+ * obs-ffmpeg: Increase initial buffer fullness for VAAPI
+ * win-capture: Enable compatibility data updates by default
+ * docs: Fix macro definitions
+ * UI: Fix crash radio list without items
+ * UI: Fix scenes only multiview label position
+ * updater: Fix updating without patch files
+ * UI: Wait for full vcam deactivation to destroy its view
+ * CI: Update macOS and Windows build scripts for OAuth configs via preset
+ * cmake: Add services preset with OAuth configurations
+ * test-input: Update CMakeLists for updated CMake path
+ * libobs: Add use of pause callbacks to CoreAudio monitoring
+ * libobs: Add pause callback support for sources
+ * docs: Add example for DARRAY as function parameter
+ * obs-qsv11: Remove Windows references from common files
+ * obs-qsv11: Simplify tracking of which allocator is used
+ * obs-qsv11: Avoid overwriting encoding parameters
+ * cmake: Disable char8_t when using C++20
+ * mac-virtualcam: Fix use of collection without explicit type
+ * libobs: Allow configuring frame rate divisor for encoders
+ * mac-capture: Use error code constant instead of magic number
+ * mac-capture: Add button to reactivate stopped capture
+ * mac-capture: Remove unneeded debug log
+ * cmake: Fix copy to rundir in Release and MinSizeRel configurations
+ * UI: Fix utf-8 paths in shared updater components
+ * mac-capture: Mark CoreAudio output capture source as deprecated
+ * rtmp-services: Remove Glimesh service
+ * vlc-video: Define media file array type for function parameter lists
+ * image-source: Define image file array type for function parameter lists
+ * libobs: Define DARRAY macro types
+ * libobs/graphics: Remove undefined function declarations
+ * obs-ffmpeg: Define DARRAY macro type
+ * libobs/graphics: Define DARRAY macro types used in effect
+ * libobs/util: Use defined array types on function parameter lists
+ * libobs/util: Remove unnecessary parentheses
+ * libobs/util: Fix operator precedence in dyamic array macros
+ * mac-capture: Add macOS Audio Capture
+ * mac-capture: Rename 'mac-screen-capture.m'
+ * mac-capture: Refactor macOS Screen Capture
+ * UI: Add logging of Program scene changes in studio mode
+ * cmake: Add flags for reproducible builds on Windows
+ * cmake: Remove ObsPluginHelpers.cmake
+ * cmake: Add support for unobfuscated OAuth secrets
+ * cmake: Fix configuration errors with Windows legacy path
+ * CI: Fix call to base64 on macOS
+ * CI: Update main workflow to enable building with macOS 13 runners
+ * CI: Remove legacy Windows build scripts
+ * CI: Update Windows workflow for updated CMake build system and scripts
+ * CI: Add new Windows build scripts
+ * cmake: Add changes for CMake build framework 3.0
+ * cmake: Add Windows component to CMake build framework 3.0
+ * enc-amf: Update submodule to 2.8.0.1
+ * obs-scripting: Fix python save callback Py_BuildValue
+ * UI: Migrate undo/redo to using UUIDs
+ * libobs: Add scene uuid to transform state data
+ * obs-ffmpeg: Enable GPU scaling for AMF texture encoder
+ * obs-qsv11: Allow GPU scaling for texture QSV encoder
+ * obs-ffmpeg: Allow GPU scaling for obs-nvenc
+ * libobs: Add `obs_encoder_enable_gpu_scaling`
+ * libobs: Fix obs_output_get_height2 returning width
+ * rtmp-services: Enforce encoder settings per protocol
+ * UI: Change surround sound warning to signal YouTube support
+ * mac-capture: Improve various Objective-C code
+ * mac-capture: Fix show hidden windows option
+ * obs-ffmpeg: Fix media source playing when inactive
+ * libobs: Detect and log presence of Lenovo Vantage on Windows
+ * docs: Add versionadded directives for 29.1
+ * UI: Fix icon paths of transition buttons
+ * rtmp-services: Update Vindral servers
+ * CI: Remove Ubuntu 20.04 build
+ * obs-ffmpeg: Prevent media source restart
+ * CI: Update deps to 2023-06-22 release
+ * linux-capture: Remove obsolete property swap_redblue
+ * obs-scripting: Add config file functions
+ * UI: Add ability to reorder filters by drag & drop
+ * libobs: Add functions to get/set the index of filters
+ * UI: Add QDataStream opreators for OBSSource
+ * UI: Disable Ok button in Add Source dialog if no source is selected
+ * UI: Reuse StudioMode.Preview translation for virtual camera config
+ * UI: Translate place holder name for new group
+ * UI: Fix changed state of audio settings
+ * UI: Fix changing quick transition to/from fade to black
+ * UI: Fix checked state of source toolbar menu item
+ * text-freetype2: Fix not updating chat log mode property
+ * docs: Fix param name
+ * UI: Capitalize "Full-Height Docks"
+ * rtmp-services: Update Bilibili Live
+ * obs-filters: Don't compile audio delay code in async-delay-filter
+ * docs: Fix da_push_back return type
+ * libobs-d3d11: Log HAGS driver support and status
+ * cmake: Add separate function to set Xcode-based target properties
+ * cmake: Update Framework link definition for macOS builds
+ * cmake: Remove legacy files for macOS builds
+ * cmake: Remove Info.plist template files for macOS builds
+ * cmake: Update macOS compiler configuration
+ * cmake: Fix CMake policy scopes and add include guards
+ * cmake: Update buildspec and presets for macOS
+ * mac-syphon: Remove unused OBSSyphonKVObserver
+ * mac-capture: Fix wrong CFString to NSNumber cast
+ * mac-capture: Add SCStreamDelegate to stream to log capture errors
+ * libobs: Update version to 29.1.3
+ * obs-ffmpeg: Fix logic in one of the AMF preset fallback checks
+ * cmake: Disable automatic sorting of compiler flags
+ * cmake: Fix truncation warning being treated as an error with Ninja
+ * cmake: Enable suggested default Xcode build settings for macOS builds
+ * cmake: Disable Framework code signing at build time
+ * UI: Fix preventing copy elision of a temporary string object
+ * obs-outputs: Silence all ftl-sdk warnings
+ * obs-outputs: Fix clang warnings about unreachable code
+ * mac-virtualcam: Use explicit access to object members in async block
+ * mac-videotoolbox: Remove unreachable code to fix clang warning
+ * mac-capture: Fix clang warning about unreachable code
+ * obs-scripting: Silence clang warnings about unreachable code
+ * UI: Wrap unreachable code in comment to fix clang warnings
+ * obs-outputs: Silence clang warning about questionable use of comma
+ * libobs: Silence clang warnings for empty prototypes without void
+ * UI: Disable warnings emitted by Qt frameworks
+ * obs-websocket: Update version to 5.2.3
+ * mac-syphon: Remove syphon-framework submodule
+ * mac-syphon: Update Syphon, use obs-deps framework
+ * UI: Move WHIP service to the bottom of the visible list
+ * libobs: Set video thread qos class to user interactive on macOS
+ * libobs: Fix null pointer access for video packets
+ * libobs: Add support to obs-outputs for multi video encoders
+ * Update git-blame-ignore-revs to ignore recent ObjC formatting update
+ * clang-format: Update formatting of all ObjC and ObjC++ files
+ * Update clang-format file for ObjC code
+ * text-freetype2: Improve text/file properties UX
+ * UI: Render preview lines above safe areas
+ * libobs: Fix crash when properties are deleted in callback
+ * UI: Assume RTMP if service has no protocol
+ * updater: Refactor and cleanup
+ * UI: Support PCM in MP4
+ * deps/libff: Add ff_supports_pcm_in_mp4()
+ * linux-pipewire: Skip processing video buffer if import failed
+ * obs-webrtc: Use old obs_output functions
+ * UI: Don't show WHIP in stream settings if the protocol isn't registered
+ * UI: Don't update text source when nothing changed
+ * docs: Clarify da_erase_range
+ * UI: Don't create combobox for radio buttons in properties view
+ * libobs,plugins: Remove new obs_output_*2 functions
+ * UI: Change name of ResetProxyStyleSliders function
+ * deps/obs-scripting: Fix crash removing callbacks in script_unload
+ * libobs: Use da_clear() to clear obs_core_data::sources_to_tick
+ * libobs/util: Add da_clear()
+ * libobs: Don't keep the sources mutex in tick_sources
+ * libobs/util: Actually fix use-after-free in da_insert_new
+ * libobs/util: Fix use-after-free in darray_insert_new
+ * mac-capture: Explicitly set clear background for SCK
+ * More copyright/name updates
+ * rtmp-services: Remove extraneous comma in schema
+ * UI: Enable WHIP service in UI
+ * obs-webrtc: Add WHIP output & service
+ * libobs: Add bearer token to obs_service_connect_info
+ * build-aux: Add libdatachannel and deps to flatpak
+ * CI: Update deps to 2023-06-01 release
+ * rtmp-services: Add Livepeer Studio
+ * UI: Remove move_to_xdg
+ * libobs/util: Do not include SIMDe for MinGW targets
+ * win-capture: Skip compat helper matching if properties are null
+ * win-capture: Add Honkai: Star Rail to compatibility list
+ * win-capture: Render nothing if window is iconic
+ * libobs: Remove duplicate debug symbol paths in Windows
+ * UI: Don't trigger a settings update when list is empty To avoid recursive call
+ * obs-ffmpeg: Consider requested throughput in AMF preset fallback
+ * mac-capture: Use system CGDisplayStream.h header on macOS 14 and newer
+ * mac-capture: Sort SCK application and window lists alphabetically
+ * obs-frontend-api,UI,docs: Add API to add custom docks with no toggle
+ * obs-frontend-api,UI,docs: Add dock API that ask for unique object name
+ * UI: Avoid having two dock with the same object name
+ * UI: allow side docks to be tall
+ * UI: Also toggle mixer toolbar in view menu
+ * obs-ffmpeg: Fix AMF encoder reconfiguration
+ * mac-videotoolbox: Remove encoder sorting
+ * UI: Sort encoders alphabetically
+ * UI: Fix filter shortcuts not showing in context menu
+ * UI: Use main video on the virtual camera if program
+ * docs: Clarify source update_properties signal
+ * libobs: Use static library for version string information
+ * text-freetype2: Fix crash after reaching buffer size
+ * UI: Fix menu actions missing shortcuts
+ * linux-alsa: Make 2 strings translatable
+ * CONTRIBUTING.rst: Update Crowdin guide url
+ * libobs: Update version to 29.1.2
+ * libobs: Remove warning log for raw outputs when starting data capture
+ * mac-virtualcam: Release pixel buffer pool for DAL as well
+ * obs-outputs: Remove support for "RTMP Go Away" feature (#8959)
+ * UI: Fix crash on patronJsonThread
+ * deps/media-playback: Just null the first frame pointer on decode
+ * deps/media-playback: Check `is_active` when frame preloading
+ * deps/media-playback: Fix crash when interrupting stingers
+ * mac-virtualcam: Adjust admin privilege strings to use Apple terminology
+ * UI: Don't use ellipses in permissions window title
+ * UI: Disallow exiting settings with no track in advanced mode
+ * UI: Disallow exiting settings with no track in simple mode
+ * UI: Fix crash when receiving multiple SIGINT
+ * mac-virtualcam: Fix admin password locale string
+ * UI: Move saving of scene tree grid mode
+ * UI: Fix compiling error on Ubuntu
+ * obs-ffmpeg: Add option to disable settings logging
+ * win-dshow: Set audio only active when there is audio
+ * UI: Add scene grid mode to view menu
+ * obs-ffmpeg: Add FFmpeg Options for VA-API
+ * UI: Only defer property updates for input and transition sources
+ * UI: Update display capture toolbar dropdown to use uuid field
+ * mac-capture: Switch to UUID-based display management
+ * libobs,UI: Add properties radio button list
+ * libobs: Add properties list boolean format
+ * libobs, plugins: Deprecate obs_output_t functions with flag parameters
+ * libobs: Fix struct type usage before actual include
+ * mac-virtualcam: Omit enqueue result codes
+ * win-dshow: Remove obsolete translation
+ * win-capture: Remove obsolete translation
+ * obs-qsv11: Add missing translation
+ * obs-outputs: Add missing translations
+ * obs-filters: Remove obsolete translation in expander-filter
+ * obs-filters: Add missing translation in chroma-key-filter
+ * obs-ffmpeg: Add missing translations
+ * obs-ffmpeg: Add missing translations
+ * obs-ffmpeg: Remove obsolete translations
+ * mac-videotoolbox: Remove obsolete translation
+ * mac-syphon: Remove obsolete translations
+ * mac-avcapture: Add missing translation
+ * linux-pulseaudio: Add missing translation
+ * linux-capture: Remove obsolete translation
+ * linux-alsa: Add missing translations
+ * UI: Fix missing translations
+ * CI: Enable GPU priority setting for Windows builds
+ * libobs-d3d11: Set priority to high instead of realtime if HAGS enabled
+ * libobs-d3d11: Refactor set_priority to use included header
+ * libobs: Remove registry-based HAGS logging
+ * libobs-d3d11: Log HAGS status
+ * Update copyrights/names
+ * UI: Fix 0,0 size transform bug when resizing sources
+ * libobs: Prevent setting invalid scene item scale values
+ * libobs: Rework logic for detecting monitoring feedback in PulseAudio
+ * libobs: Fix PulseAudio monitoring when device is set to default
+ * mac-videotoolbox: Fix incorrect keyframe interval calculation
+ * UI: Re-raise missing files dialog on macOS after file is selected
+ * UI: Remove tabs for About error statements
+ * cmake: Remove use of CPack and generate packaging AppleScript directly
+ * CI: Update workflow to support provisioning profiles for macOS
+ * UI: Add support for error messages from the Virtual Camera system
+ * mac-virtualcam: Add Camera Extension to main CMake plugin project
+ * mac-virtualcam: Update obs-plugin to support macOS camera extensions
+ * mac-virtualcam: Add macOS camera extension project
+ * linux-pipewire: Support colour format GS_R10G10B10A2
+ * libobs: Adds obs.hpp to exported header files
+ * .gitignore: Add CMakeUserPresets.json
+ * libobs: Add sanity checks to some obs_output_t functions
+ * build-aux: Replace app-id by id in the Flatpak manifest
+ * build-aux,CI: Add format to Flatpak manifest
+ * build-aux,CI: Split Flatpak manifest in multiple files
+ * UI: Redirect Qt log messages to OBS log
+ * obs-ffmpeg,cmake: Replace external folder by obs-deps headers
+ * obs-scripting: Replace macro with plain C code
+ * obs-outputs: Fix keychain API deprecation warnings on macOS
+ * UI: Add ellipses to menu item triggering user choice (per Apple HIG)
+ * UI: Use native ObjectiveC methods to generate data file paths
+ * libobs: Remove support for deprecated MACH task info struct
+ * libobs: Use native ObjectiveC methods to generate data and module paths
+ * mac-capture: Add option to hide OBS windows in desktop capture
+ * UI: Process Qt events once after destroy queue finishes
+ * UI: Only update vcam output if necessary
+ * UI: Reset VCam when clearing scene data
+ * UI: Clean up disabling simpleFlvTracks
+ * deps/obs-scripting: Set file/chunk name when loading lua scripts
+ * CI: Download Qt5 conditionally on Linux
+ * UI: Fix scene grid mode button color
+ * UI: Normalize theme qss files
+ * .editorconfig: Add theme qss
+ * UI: Fix crash when double-clicking projector
+ * obs-ffmpeg: Fix compilation when ENABLE_HEVC is not set
+ * test: Cover all array_output_serializer functions
+ * libobs: Update version to 29.1.1
+ * UI: Fix crash on macOS when closing OAUTH browser panel
+ * UI: Avoid registering CEF OAuth integrations on Wayland
+ * obs-websocket: Update submodule to pull translations
+ * UI: Exit and show error if clearing scene data fails
+ * libobs: Fix luma sampling for packed 4:2:2 sources
+ * docs: Add missing elements in Services API
+ * mac-syphon: Remove macOS 10.15-only code
+ * UI: Make "Portable Mode" translateable
+ * CI: Update ccache cache entries to enable restoration from master branch
+ * mac-capture: Fix possible division by zero error
+ * UI: Do not show unassigned icon for monitored sources
+ * cmake: Enforce -Wmaybe-uninitialized to never turn into an error
+ * obs-ffmpeg: Show error if trying to use AV1 fallback
+ * UI: Fix FLAC missing from builtin codecs list
+ * UI: Relax mc_trans_video_imagescaler.dll DLL block
+ * UI: Fix case inconsistency in translation key
+- Add new deps: libvpl, libdatachannel-devel, QR-Code-generator-devel
+
+-------------------------------------------------------------------
 Fri Jan 19 15:00:06 UTC 2024 - Hans-Peter Jansen <hp@urpla.net>
 
 - Explicitely set CFLAGS/CXXFLAGS for all targets

obs-studio.spec Changed

@@ -15,7 +15,7 @@
 %bcond_without websockets
 
 Name:           obs-studio
-Version:        29.1.3
+Version:        30.0.2
 Release:        0
 Summary:        A recording/broadcasting program
 Group:          Productivity/Multimedia/Video/Editors and Convertors
@@ -43,6 +43,7 @@
 BuildRequires:  libXinerama-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  libcurl-devel
+BuildRequires:  libdatachannel-devel
 BuildRequires:  libjansson-devel
 BuildRequires:  pciutils-devel
 BuildRequires:  pipewire-devel
@@ -83,12 +84,14 @@
 BuildRequires:  pkgconfig(luajit)
 BuildRequires:  pkgconfig(srt) >= 1.4
 BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(vpl)
 %if %{with websockets}
 BuildRequires:  pkgconfig(nlohmann_json) >= 3
 BuildRequires:  pkgconfig(websocketpp) >= 0.8.0
 BuildRequires:  pkgconfig(asio) >= 1.12.1
 %endif
 BuildRequires:  python3-devel
+BuildRequires:  QR-Code-generator-devel
 %if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
 BuildRequires:  speexdsp-devel
 %endif

_service Changed

_servicedata Changed

obs-studio-29.1.3.tar.xz/.github/workflows/clang-format.yml Deleted

obs-studio-29.1.3.tar.xz/.github/workflows/clean-caches.yml Deleted

@@ -1,76 +0,0 @@
-name: Cache Cleanup
-
-on:
-  schedule:
-  - cron: 0 0 * * *
-  workflow_dispatch:
-
-jobs:
-  purge:
-    name: Cache Cleanup
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Python & Modules
-        run: |
-          sudo apt install -y python3.11
-          python3.11 -m pip install requests
-
-      - name: Clean Caches
-        shell: python3.11 {0}
-        run: |
-          import re
-          from datetime import datetime
-          import requests
-          
-          s = requests.session()
-          s.headers'Authorization' = 'Bearer ${{ secrets.GITHUB_TOKEN }}'
-          
-          r = s.get('https://api.github.com/repos/${{ github.repository }}/actions/caches', params=dict(per_page=100))
-          r.raise_for_status()
-          caches = r.json()'actions_caches'
-          
-          print(f'There are {len(caches)} total caches.')
-          
-          # find latest flatpak cache
-          flatpak_last_ts = None
-          flatpak_key = None
-          for cache in caches:
-              if not cache'ref' == 'refs/heads/master' or not cache'key'.startswith('flatpak-builder'):
-                  continue
-              ts = datetime.fromisoformat(cache'created_at')
-              if not flatpak_last_ts or ts > flatpak_last_ts:
-                  flatpak_key = cache'key'
-                  flatpak_last_ts = ts
-          
-          if flatpak_key:
-              print(f'Latest flatpak cache: {flatpak_key}')
-          
-          now = datetime.utcnow()
-          to_be_removed = 
-          for cache in caches:
-              # add merge queue caches
-              if 'gh-readonly-queue' in cache'ref':
-                  to_be_removed.append(cache)
-                  continue
-              
-              if flatpak_key and cache'key'.startswith('flatpak-builder'):
-                  # add non-master flatpak caches that match latest key
-                  if cache'key' == flatpak_key and not cache'ref' == 'refs/heads/master':
-                      to_be_removed.append(cache)
-                      continue
-                  # add master flatpak caches that do not match the latest key    
-                  elif cache'key' != flatpak_key and cache'ref' == 'refs/heads/master':
-                      to_be_removed.append(cache)
-                      continue
-              
-              # add dated caches predating today
-              if (cache_date := re.search('0-9{4}\-0-9{2}\-0-9{2}', cache'key')) is not None:
-                  parsed_date = datetime.strptime(cache_date.group(), '%Y-%m-%d')
-                  if (now - parsed_date).days > 0:
-                      to_be_removed.append(cache)
-          
-          print(f'Removing {len(to_be_removed)} caches...')
-          for cache in to_be_removed:
-              print(f'Deleting cache "{cache"key"}" with ID {cache"id"}...', end=' ')
-              r = s.delete(f'https://api.github.com/repos/${{ github.repository }}/actions/caches/{cache"id"}')
-              print(f'{r.status_code}')

obs-studio-29.1.3.tar.xz/.github/workflows/compat-json.yml Deleted

@@ -1,40 +0,0 @@
-name: Compatibility Data Validator
-
-on:
-  push:
-    paths:
-      - "plugins/win-capture/data/compatibility.json"
-      - "plugins/win-capture/data/package.json"
-  pull_request:
-    paths:
-      - "plugins/win-capture/data/compatibility.json"
-      - "plugins/win-capture/data/package.json"
-
-jobs:
-  schema:
-    name: Schema
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install & Configure Python
-        run: |
-          sudo apt install python3-dev
-          python3 -m pip install jsonschema json_source_map
-
-      - name: Validate Compatibility JSON Schema
-        run: |
-          JSON_FILES=(
-            plugins/win-capture/data/compatibility.json
-            plugins/win-capture/data/package.json
-          )
-          python3 CI/check-jsonschema.py "${JSON_FILES@}"
-
-      - name: Annotate Errors
-        if: failure()
-        uses: yuzutech/annotations-action@v0.4.0
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          title: "Compatibility JSON Errors"
-          input: "./validation_errors.json"

obs-studio-29.1.3.tar.xz/.github/workflows/crowdin-sync-download.yml Deleted

obs-studio-29.1.3.tar.xz/.github/workflows/crowdin-sync-upload.yml Deleted

obs-studio-29.1.3.tar.xz/.github/workflows/docs.yml Deleted

@@ -1,136 +0,0 @@
-name: Generate Documentation
-
-on:
- push:
- paths-ignore:
- - "cmake/**"
- branches: '*'
- tags: '*'
- pull_request:
- paths:
- - "docs/sphinx/**"
- workflow_dispatch:
-
-jobs:
- docs:
- runs-on: ubuntu-latest
- outputs:
- commitHash: ${{ steps.setup.outputs.commitHash }}
- commitBranch: ${{ steps.setup.outputs.commitBranch }}
- fullCommitHash: ${{ steps.setup.outputs.fullCommitHash }}
- env:
- BUILD_CF_ARTIFACT: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }}
- steps:
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Setup Environment
- id: setup
- run: |
- BRANCH=$(git describe --exact-match --tags 2> /dev/null || git branch --show-current)
- # Remove patch version from tag
- BRANCH=$(echo ${BRANCH} | sed -e 's/\.0-9*$//')
- echo "commitBranch=${BRANCH}" >> $GITHUB_OUTPUT
- echo "commitHash=$(git describe --exact-match --tags 2> /dev/null || git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
- echo "fullCommitHash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
- - name: Bump Version Number
- shell: bash
- if: github.event_name != 'pull_request'
- run: |
- VERTEST="\#define\sLIBOBS_API_\w+_VER\s(0-9{1,2})"
- VER=""
- MAJOR=""
- while IFS= read -r l
- do
- if $l =~ $VERTEST ; then
- if $VER = '' ; then MAJOR="${BASH_REMATCH1}"; else VER+="."; fi
- VER+="${BASH_REMATCH1}"
- fi
- done < "libobs/obs-config.h"
-
- SVER="version = '(0-9\.+)'"
- RVER="version = '$VER'"
- SREL="release = '(0-9\.+)'"
- RREL="release = '$VER'"
- SCOPY="copyright = '(A-Za-z0-9, +)'"
- RCOPY="copyright = '2017-$(date +"%Y"), Hugh Bailey'"
- sed -i -E -e "s/${SVER}/${RVER}/g" -e "s/${SREL}/${RREL}/g" -e "s/${SCOPY}/${RCOPY}/g" docs/sphinx/conf.py
-
- - uses: totaldebug/sphinx-publish-action@1.2.0
- with:
- sphinx_src: 'docs/sphinx'
- build_only: True
- target_branch: 'master'
- target_path: '../home/_build'
- pre_build_commands: 'pip install -Iv sphinx==5.1.1'
-
- - name: Disable link extensions
- shell: bash
- if: ${{ env.BUILD_CF_ARTIFACT == 'true' }}
- run: |
- SOPT="html_link_suffix = None"
- ROPT="html_link_suffix = ''"
- sed -i -e "s/${SOPT}/${ROPT}/g" docs/sphinx/conf.py
-
- - uses: totaldebug/sphinx-publish-action@1.2.0
- if: ${{ env.BUILD_CF_ARTIFACT == 'true' }}
- with:
- sphinx_src: 'docs/sphinx'
- build_only: True
- target_branch: 'master'
- target_path: '../home/_build_cf'
- pre_build_commands: 'pip install -Iv sphinx==5.1.1'
-
- - uses: actions/upload-artifact@v3
- with:
- name: 'OBS Studio Docs ${{ steps.setup.outputs.commitHash }}'
- path: |
- ${{ runner.temp }}/_github_home/_build
- !${{ runner.temp }}/_github_home/_build/.doctrees
-
- - uses: actions/upload-artifact@v3
- if: ${{ env.BUILD_CF_ARTIFACT == 'true' }}
- with:
- name: 'CF Pages ${{ steps.setup.outputs.commitHash }}'
- path: |
- ${{ runner.temp }}/_github_home/_build_cf
- !${{ runner.temp }}/_github_home/_build_cf/.doctrees
-
- deploy:
- runs-on: ubuntu-latest
- needs: docs
- if: ${{ github.event_name == 'workflow_dispatch' || (github.repository_owner == 'obsproject' && startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request') }}
- environment:
- name: cf-pages-deploy
- concurrency:
- group: "cf-pages-deployment"
- cancel-in-progress: true
- steps:
- - uses: actions/download-artifact@v3
- with:
- name: 'CF Pages ${{ needs.docs.outputs.commitHash }}'
- path: docs
-
- - name: Setup redirects
- run: |
- echo "/previous/27.2 https://obsproject.com/docs/27.2 302" >> docs/_redirects
- echo "/previous/:major.:minor https://:major-:minor.${{ vars.CF_PAGES_PROJECT }}.pages.dev 302" >> docs/_redirects
-
- - name: Publish to live page
- if: ${{ !contains(needs.docs.outputs.commitBranch, 'beta') && !contains(needs.docs.outputs.commitBranch, 'rc') }}
- uses: cloudflare/wrangler-action@4c10c1822abba527d820b29e6333e7f5dac2cabd
- with:
- workingDirectory: docs
- apiToken: ${{ secrets.CF_API_TOKEN }}
- accountId: ${{ secrets.CF_ACCOUNT_ID }}
- command: pages publish . --project-name=${{ vars.CF_PAGES_PROJECT }} --commit-hash='${{ needs.docs.outputs.fullCommitHash }}'
-
- - name: Publish to tag alias
- if: ${{ startsWith(github.ref, 'refs/tags/') }}
- uses: cloudflare/wrangler-action@4c10c1822abba527d820b29e6333e7f5dac2cabd
- with:
- workingDirectory: docs
- apiToken: ${{ secrets.CF_API_TOKEN }}
- accountId: ${{ secrets.CF_ACCOUNT_ID }}
- command: pages publish . --project-name=${{ vars.CF_PAGES_PROJECT }} --commit-hash='${{ needs.docs.outputs.fullCommitHash }}' --branch='${{ needs.docs.outputs.commitBranch }}'

obs-studio-29.1.3.tar.xz/.github/workflows/flatpak.yml Deleted

@@ -1,123 +0,0 @@
----
-
-name: Flatpak
-
-on:
-  release:
-    types: published
-    branches: master, 'release/**'
-
-env:
-  TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
-  TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
-  RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
-  RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
-  YOUTUBE_CLIENTID: ${{ secrets.YOUTUBE_CLIENTID }}
-  YOUTUBE_CLIENTID_HASH: ${{ secrets.YOUTUBE_CLIENTID_HASH }}
-  YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
-  YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
-
-jobs:
-  check_tag:
-    name: Check release tag
-    runs-on: ubuntu-latest
-    outputs:
-      valid_tag: ${{ steps.check_tag.outputs.valid_tag }}
-      matrix: ${{ steps.check_tag.outputs.matrix }}
-    steps:
-      - name: Check the tag
-        id: check_tag
-        run: |
-          shopt -s extglob
-
-          case ${GITHUB_REF##*/} in
-            +(0-9).+(0-9).+(0-9) )
-              echo 'valid_tag=true' >> $GITHUB_OUTPUT
-              echo 'matrix="beta", "stable"' >> $GITHUB_OUTPUT
-              ;;
-            +(0-9).+(0-9).+(0-9)-@(beta|rc)*(0-9) )
-              echo 'valid_tag=true' >> $GITHUB_OUTPUT
-              echo 'matrix="beta"' >> $GITHUB_OUTPUT
-              ;;
-            * ) echo 'valid_tag=false' >> $GITHUB_OUTPUT ;;
-          esac
-
-  publish:
-    name: Publish to Flathub
-    runs-on: ubuntu-latest
-    needs: check_tag
-    if: fromJSON(needs.check_tag.outputs.valid_tag)
-    env:
-      FLATPAK_BUILD_PATH: flatpak_app/files/share
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.4
-      options: --privileged
-    strategy:
-      matrix:
-        branch: ${{ fromJSON(needs.check_tag.outputs.matrix) }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-
-      - name: 'Setup build environment'
-        id: setup
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CACHE_KEY: flatpak-builder-${{ hashFiles('CI/flatpak/com.obsproject.Studio.json') }}
-        run: |
-          dnf install -y -q gh
-          gh extension install actions/gh-actions-cache
-
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-
-          KEY="$CACHE_KEY-x86_64"
-          CACHE_HIT=$(gh actions-cache list -B master --key $KEY | grep -q $KEY && echo 'true' || echo 'false')
-
-          echo "git_hash=$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT
-          echo "cache_key=$CACHE_KEY" >> $GITHUB_OUTPUT
-          echo "cache_hit=$CACHE_HIT" >> $GITHUB_OUTPUT
-
-      - name: Build Flatpak Manifest
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
-        with:
-          bundle: obs-studio-${{ steps.setup.outputs.git_hash }}.flatpak
-          manifest-path: CI/flatpak/com.obsproject.Studio.json
-          cache: ${{ fromJSON(steps.setup.outputs.cache_hit) }}
-          cache-key: ${{ steps.setup.outputs.cache_key }}
-          mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
-          branch: ${{ matrix.branch }}
-
-      - name: Validate AppStream
-        shell: bash
-        working-directory: ${{ env.FLATPAK_BUILD_PATH }}
-        run: |
-          appstream-util validate appdata/com.obsproject.Studio.appdata.xml
-
-      - name: Verify icon and metadata in app-info
-        shell: bash
-        working-directory: ${{ env.FLATPAK_BUILD_PATH }}
-        run: |
-          test -f app-info/icons/flatpak/128x128/com.obsproject.Studio.png || { echo "Missing 128x128 icon in app-info" ; exit 1; }
-          test -f app-info/xmls/com.obsproject.Studio.xml.gz || { echo "Missing com.obsproject.Studio.xml.gz in app-info" ; exit 1; }
-
-      - name: Commit screenshots to the OSTree repository
-        run: |
-          ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
-
-      - name: Publish to Flathub Beta
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.1
-        if: matrix.branch == 'beta'
-        with:
-          flat-manager-url: https://hub.flathub.org/
-          repository: beta
-          token: ${{ secrets.FLATHUB_BETA_TOKEN }}
-
-      - name: Publish to Flathub
-        uses: flatpak/flatpak-github-actions/flat-manager@v6.1
-        if: matrix.branch == 'stable'
-        with:
-          flat-manager-url: https://hub.flathub.org/
-          repository: stable
-          token: ${{ secrets.FLATHUB_TOKEN }}

obs-studio-29.1.3.tar.xz/.github/workflows/main.yml Deleted

@@ -1,622 +0,0 @@
-name: 'BUILD'
-
-on:
-  push:
-    paths-ignore: '**.md'
-    branches:
-      - master
-      - 'release/**'
-    tags: '*'
-  pull_request:
-    paths-ignore: '**.md'
-    branches: master
-  merge_group:
-    branches: master
-
-env:
-  CACHE_REVISION: '006'
-  CEF_BUILD_VERSION_LINUX: '5060'
-  CEF_BUILD_VERSION_WIN: '5060'
-  QT_VERSION_MAC: '6.4.3'
-  QT_VERSION_WIN: '6.4.3'
-  DEPS_VERSION_WIN: '2023-04-12'
-  VLC_VERSION_WIN: '3.0.0-git'
-  TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
-  TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
-  RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
-  RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
-  YOUTUBE_CLIENTID: ${{ secrets.YOUTUBE_CLIENTID }}
-  YOUTUBE_CLIENTID_HASH: ${{ secrets.YOUTUBE_CLIENTID_HASH }}
-  YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
-  YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
-  GPU_PRIORITY_VAL: ${{ secrets.GPU_PRIORITY_VAL }}
-
-concurrency:
-  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
-  cancel-in-progress: true
-
-jobs:
-  clang_check:
-    name: '01 - Code Format Check'
-    runs-on: ubuntu-22.04
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-
-      - name: 'Install clang-format'
-        run: sudo apt-get install -y clang-format-13
-
-      - name: 'Run clang-format'
-        run: |
-          ./CI/check-format.sh
-          ./CI/check-changes.sh
-
-      - name: 'Install cmake-format'
-        run: sudo pip install cmakelang
-
-      - name: 'Run cmake-format'
-        run: |
-          ./CI/check-cmake.sh
-
-  config:
-    name: '01 - Configure Build Jobs'
-    runs-on: ubuntu-22.04
-    outputs:
-      create_artifacts: ${{ steps.config.outputs.create_artifacts }}
-      cache_date: ${{ steps.config.outputs.cache_date }}
-    steps:
-      - name: 'Configure Build Jobs'
-        id: config
-        run: |
-          if  "${{ github.event_name == 'pull_request' }}" == "true" ; then
-            if test -n "$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -s "${{ github.event.pull_request.url }}" | jq -e '.labels | select(.name == "Seeking Testers")')"; then
-              echo 'create_artifacts=true' >> $GITHUB_OUTPUT
-            else
-              echo 'create_artifacts=false' >> $GITHUB_OUTPUT
-            fi
-          else
-            echo 'create_artifacts=true' >> $GITHUB_OUTPUT
-          fi
-          echo "cache_date=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
-
-  macos_build:
-    name: '02 - macOS'
-    runs-on: macos-12
-    strategy:
-      matrix:
-        arch: 'x86_64', 'arm64'
-    if: always()
-    needs: config, clang_check
-    env:
-      BLOCKED_FORMULAS: 'speexdsp curl php composer'
-      CODESIGN_IDENT: '-'
-      HAVE_CODESIGN_IDENTITY: ${{ secrets.MACOS_SIGNING_IDENTITY != '' && secrets.MACOS_SIGNING_CERT != '' }}
-    defaults:
-      run:
-        shell: bash
-        working-directory: 'obs-studio'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-          path: 'obs-studio'
-          fetch-depth: 0
-
-      - name: 'Check for GitHub Labels'
-        id: github-check
-        run: |
-          if  "${GITHUB_EVENT_NAME}" == 'pull_request' ; then
-            if test -n "$(curl -H "Authorization: Bearer ${{ github.token }}" -s "${{ github.event.pull_request.url }}" | jq -e '.labels | select(.name == "Seeking Testers")')"; then
-              echo "generator=Xcode" >> $GITHUB_OUTPUT
-            else
-              echo "generator=Ninja" >> $GITHUB_OUTPUT
-            fi
-          elif  "${GITHUB_EVENT_NAME}" == 'push' ; then
-            if  ${GITHUB_REF_NAME} =~ 0-9+.0-9+.0-9+(-(rc|beta).+)? ; then
-              echo "generator=Xcode" >> $GITHUB_OUTPUT
-            else
-              echo "generator=Ninja" >> $GITHUB_OUTPUT
-            fi
-          else
-            echo "generator=Ninja" >> $GITHUB_OUTPUT
-          fi
-
-      - name: 'Restore ccache from cache'
-        id: ccache-cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ github.workspace }}/.ccache
-          key: ${{ runner.os }}-ccache-${{ steps.github-check.outputs.generator }}-${{ matrix.arch }}-${{ github.event_name }}-${{ github.head_ref }}
-          restore-keys: |
-            ${{ runner.os }}-ccache-${{ steps.github-check.outputs.generator }}-${{ matrix.arch }}-push-
-
-      - name: 'Setup build environment'
-        id: setup
-        run: |
-          REMOVE_FORMULAS=""
-          for FORMULA in ${{ env.BLOCKED_FORMULAS }}; do
-            if  -d "/usr/local/opt/${FORMULA}" ; then
-              REMOVE_FORMULAS="${REMOVE_FORMULAS}${FORMULA} "
-            fi
-          done
-
-          if  -n "${REMOVE_FORMULAS}" ; then
-            brew uninstall ${REMOVE_FORMULAS}
-          fi
-
-          echo "commitHash=$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT
-
-      - name: 'Install dependencies'
-        run: CI/macos/01_install_dependencies.sh --architecture "${{ matrix.arch }}"
-
-      - name: 'Install Apple Developer Certificate'
-        if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' && env.HAVE_CODESIGN_IDENTITY == 'true' }}
-        uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93
-        with:
-          p12-file-base64: ${{ secrets.MACOS_SIGNING_CERT }}
-          p12-password: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
-
-      - name: 'Set Signing Identity'
-        if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' && env.HAVE_CODESIGN_IDENTITY == 'true' }}
-        run: |
-          echo "CODESIGN_IDENT=${{ secrets.MACOS_SIGNING_IDENTITY }}" >> $GITHUB_ENV
-          echo "BUILD_FOR_DISTRIBUTION=ON" >> $GITHUB_ENV
-
-      - name: 'Build OBS'
-        run: |
-          if  '${{ steps.github-check.outputs.generator }}' == 'Xcode' ; then
-            SEEKING_TESTERS=1 CI/macos/02_build_obs.sh --codesign --architecture "${{ matrix.arch }}"
-          else
-            CI/macos/02_build_obs.sh --codesign --architecture "${{ matrix.arch }}"
-          fi
-
-      - name: 'Create build artifact'
-        if: ${{ fromJSON(needs.config.outputs.create_artifacts) }}
-        run: |
-          : ${PACKAGE:=}
-          case "${GITHUB_EVENT_NAME}" in
-              push) if  ${GITHUB_REF_NAME} =~ 0-9+.0-9+.0-9+(-(rc|beta).+)? ; then PACKAGE=1; fi ;;
-              pull_request) PACKAGE=1 ;;
-          esac
-
-          if  "${PACKAGE}" ; then
-            CI/macos/03_package_obs.sh --codesign --architecture "${{ matrix.arch }}"
-            ARTIFACT_NAME=$(basename $(/usr/bin/find build_${{ matrix.arch }} -type f -name "obs-studio-*.dmg" -depth 1 | head -1))
-            echo "FILE_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
-          fi
-
-      - name: 'Upload build Artifact'
-        if: ${{ fromJSON(needs.config.outputs.create_artifacts) && env.FILE_NAME != '' }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'obs-studio-macos-${{ matrix.arch }}-${{ steps.setup.outputs.commitHash }}'
-          path: '${{ github.workspace }}/obs-studio/build_${{ matrix.arch }}/${{ env.FILE_NAME }}'
-
-  linux_build:
-    name: '02 - Linux'
-    runs-on: ${{ matrix.ubuntu }}
-    strategy:
-      matrix:
-        ubuntu: 'ubuntu-20.04', 'ubuntu-22.04'
-        include:
-          - ubuntu: 'ubuntu-20.04'
-            script_options: '--disable-pipewire'
-    if: always()
-    needs: config, clang_check
-    defaults:
-      run:
-        shell: bash
-        working-directory: 'obs-studio'
-    env:
-      BUILD_FOR_DISTRIBUTION: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' }}
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-          path: 'obs-studio'
-          fetch-depth: 0
-
-      - name: 'Restore ccache from cache'
-        id: ccache-cache
-        uses: actions/cache@v3
-        env:
-          CACHE_NAME: 'ccache-cache'
-        with:
-          path: ${{ github.workspace }}/.ccache
-          key: ${{ runner.os }}-ccache-${{ matrix.ubuntu }}-${{ github.event_name }}-${{ github.head_ref }}
-          restore-keys: |
-            ${{ runner.os }}-ccache-${{ matrix.ubuntu }}-push-
-
-      - name: 'Restore Chromium Embedded Framework from cache'
-        id: cef-cache
-        uses: actions/cache@v3
-        env:
-          CACHE_NAME: 'cef-cache'
-        with:
-          path: ${{ github.workspace }}/obs-build-dependencies/cef_binary_${{ env.CEF_BUILD_VERSION_LINUX }}_linux64
-          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION_LINUX }}-${{ env.CACHE_REVISION }}
-
-      - name: 'Setup build environment'
-        id: setup
-        run: |
-          echo "commitHash=$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT
-
-      - name: 'Install dependencies'
-        env:
-          RESTORED_CEF: ${{ steps.cef-cache.outputs.cache-hit }}
-        run: CI/linux/01_install_dependencies.sh ${{ matrix.script_options }}
-
-      - name: 'Build OBS'
-        run: CI/linux/02_build_obs.sh ${{ matrix.script_options }}
-
-      - name: 'Run tests'
-        if: success()
-        run: cmake --build build -t test
-
-      - name: 'Create build artifact'
-        if: ${{ success() && fromJSON(needs.config.outputs.create_artifacts) }}
-        run: |
-          CI/linux/03_package_obs.sh
-          ARTIFACT_NAME=$(basename $(/usr/bin/find build  -maxdepth 1 -type f -name "obs-studio-*.deb" | sort -rn | head -1))
-          echo "FILE_NAME=${ARTIFACT_NAME}" >> $GITHUB_ENV
-          echo "DEBUG_FILE_NAME=${ARTIFACT_NAME//.deb/-dbgsym.ddeb}" >> $GITHUB_ENV
-
-      - name: 'Upload build Artifact'
-        if: ${{ success() && fromJSON(needs.config.outputs.create_artifacts) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'obs-studio-${{ matrix.ubuntu }}-${{ steps.setup.outputs.commitHash }}'
-          path: '${{ github.workspace }}/obs-studio/build/${{ env.FILE_NAME }}'
-
-      - name: 'Upload debug symbol Artifact'
-        if: ${{ success() && fromJSON(needs.config.outputs.create_artifacts) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'obs-studio-${{ matrix.ubuntu }}-${{ steps.setup.outputs.commitHash }}-dbgsym'
-          path: '${{ github.workspace }}/obs-studio/build/${{ env.DEBUG_FILE_NAME }}'
-
-  windows_build:
-    name: '02 - Windows'
-    runs-on: windows-2022
-    needs: config, clang_check
-    if: always()
-    strategy:
-      matrix:
-        arch: x64, x86
-    env:
-      CMAKE_GENERATOR: 'Visual Studio 17 2022'
-      CMAKE_SYSTEM_VERSION: '10.0.18363.657'
-      VIRTUALCAM-GUID: 'A3FCE0F5-3493-419F-958A-ABA1250EC20B'
-      BUILD_FOR_DISTRIBUTION: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' }}
-    defaults:
-      run:
-        working-directory: 'obs-studio'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-          path: 'obs-studio'
-          fetch-depth: 0
-
-      - name: 'Add msbuild to PATH'
-        uses: microsoft/setup-msbuild@v1.1
-
-      - name: 'Restore VLC dependency from cache'
-        id: vlc-cache
-        uses: actions/cache@v3
-        env:
-          CACHE_NAME: 'vlc-cache'
-        with:
-          path: ${{ github.workspace }}/obs-build-dependencies/vlc-${{ env.VLC_VERSION_WIN }}
-          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.VLC_VERSION_WIN }}-${{ env.CACHE_REVISION }}
-
-      - name: 'Restore Chromium Embedded Framework from cache'
-        id: cef-cache
-        uses: actions/cache@v3
-        env:
-          CACHE_NAME: 'cef-cache'
-        with:
-          path: ${{ github.workspace }}/obs-build-dependencies/cef_binary_${{ env.CEF_BUILD_VERSION_WIN }}_windows_${{ matrix.arch }}
-          key: ${{ runner.os }}-pr-${{ env.CACHE_NAME }}-${{ env.CEF_BUILD_VERSION_WIN }}-${{ matrix.arch }}-${{ env.CACHE_REVISION }}
-
-      - name: Setup Environment
-        id: setup
-        run: |
-          $CommitHash = git rev-parse --short=9 HEAD
-          "commitHash=${CommitHash}" >> $env:GITHUB_OUTPUT
-
-      - name: 'Install dependencies'
-        env:
-          RESTORED_VLC: ${{ steps.vlc-cache.outputs.cache-hit }}
-          RESTORED_CEF: ${{ steps.cef-cache.outputs.cache-hit }}
-        run: CI/windows/01_install_dependencies.ps1 -BuildArch ${{ matrix.arch }}
-
-      - name: 'Build OBS'
-        run: CI/windows/02_build_obs.ps1 -BuildArch ${{ matrix.arch }}
-
-      - name: 'Create build artifact'
-        if: ${{ success() && fromJSON(needs.config.outputs.create_artifacts) }}
-        run: |
-          CI/windows/03_package_obs.ps1 -BuildArch ${{ matrix.arch }} -Package
-          $ArtifactName = Get-ChildItem -filter "obs-studio-*-windows-${{ matrix.arch }}.zip" -File
-          Write-Output "FILE_NAME=${ArtifactName}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-
-      - name: 'Upload build artifact'
-        if: ${{ success() && fromJSON(needs.config.outputs.create_artifacts) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'obs-studio-windows-${{ matrix.arch }}-${{ steps.setup.outputs.commitHash }}'
-          path: '${{ env.FILE_NAME }}'
-
-  linux_package:
-    name: '02 - Flatpak'
-    runs-on: ubuntu-latest
-    needs: config, clang_check
-    defaults:
-      run:
-        shell: bash
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:kde-6.4
-      options: --privileged
-    steps:
-
-      - name: 'Checkout'
-        uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-          fetch-depth: 0
-
-      - name: 'Setup build environment'
-        id: setup
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CACHE_KEY: flatpak-builder-${{ hashFiles('CI/flatpak/com.obsproject.Studio.json') }}
-        run: |
-          dnf install -y -q gh
-          gh extension install actions/gh-actions-cache
-
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-
-          KEY="$CACHE_KEY-x86_64"
-          CACHE_HIT=$(gh actions-cache list -B master --key $KEY | grep -q $KEY && echo 'true' || echo 'false')
-
-          echo "git_hash=$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT
-          echo "cache_key=$CACHE_KEY" >> $GITHUB_OUTPUT
-          echo "cache_hit=$CACHE_HIT" >> $GITHUB_OUTPUT
-
-      - name: Build Flatpak Manifest
-        uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1
-        with:
-          build-bundle: ${{ fromJSON(needs.config.outputs.create_artifacts) }}
-          bundle: obs-studio-flatpak-${{ steps.setup.outputs.git_hash }}.flatpak
-          manifest-path: CI/flatpak/com.obsproject.Studio.json
-          cache: ${{ fromJSON(steps.setup.outputs.cache_hit) || (github.event_name == 'push' && github.ref == 'refs/heads/master') }}
-          restore-cache: ${{ fromJSON(steps.setup.outputs.cache_hit) }}
-          cache-key: ${{ steps.setup.outputs.cache_key }}
-
-  windows_package:
-    name: '03 - Windows Installer'
-    runs-on: windows-latest
-    needs: windows_build
-    if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' }}
-    env:
-      BUILD_FOR_DISTRIBUTION: 'ON'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v3
-
-      - name: Setup Environment
-        id: setup
-        run: |
-          $CommitHash = git rev-parse --short=9 HEAD
-          "commitHash=${CommitHash}" >> $env:GITHUB_OUTPUT
-
-      - name: 'Add msbuild to PATH'
-        uses: microsoft/setup-msbuild@v1.1
-
-      - name: 'Download 64-bit artifact'
-        uses: actions/download-artifact@v3
-        with:
-          name: 'obs-studio-windows-x64-${{ steps.setup.outputs.commitHash }}'
-
-      - name: 'Download 32-bit artifact'
-        uses: actions/download-artifact@v3
-        with:
-          name: 'obs-studio-windows-x86-${{ steps.setup.outputs.commitHash }}'
-
-      - name: 'Unpack Windows build artifacts'
-        id: unpack
-        run: |
-          if (!(Test-Path install_temp)) {
-            $null = New-Item -ItemType Directory -Force -Path install_temp
-          }
-
-          Expand-Archive -Path "$(Get-ChildItem -filter "obs-studio-*-windows-x86.zip" -File)" -DestinationPath install_temp
-          Expand-Archive -Path "$(Get-ChildItem -filter "obs-studio-*-windows-x64.zip" -File)" -Force -DestinationPath install_temp
-
-          CI/windows/03_package_obs.ps1 -CombinedArchs -Package
-
-          $ArtifactName = (Get-ChildItem -filter "obs-studio-*-windows-x86+x64.zip" -File).Name
-          "filename=${ArtifactName}" >> $env:GITHUB_OUTPUT
-
-      - name: 'Upload build artifact'
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'obs-studio-windows-installer'
-          path: '${{ steps.unpack.outputs.filename }}'
-
-  macos_release:
-    name: '03 - macOS notarized image'
-    runs-on: macos-12
-    needs: macos_build
-    env:
-      HAVE_CODESIGN_IDENTITY: ${{ secrets.MACOS_SIGNING_IDENTITY != '' && secrets.MACOS_SIGNING_CERT != '' }}
-      BUILD_FOR_DISTRIBUTION: 'ON'
-      HAVE_SPARKLE_KEY: ${{ secrets.SPARKLE_PRIVATE_KEY != '' }}
-    outputs:
-      run_sparkle: ${{ steps.sparkle_check.outputs.run_sparkle }}
-    if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name != 'pull_request' }}
-    strategy:
-      matrix:
-        arch: 'x86_64', 'arm64'
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: 'Checkout'
-        if: env.HAVE_CODESIGN_IDENTITY == 'true'
-        uses: actions/checkout@v3
-
-      - name: 'Setup build environment'
-        id: setup
-        run: |
-          echo "commitHash=$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT
-
-      - name: 'Determine if Sparkle should run'
-        if: env.HAVE_CODESIGN_IDENTITY == 'true'
-        id: sparkle_check
-        run: |
-          echo 'run_sparkle=${{ env.HAVE_SPARKLE_KEY }}' >> $GITHUB_OUTPUT
-
-      - name: 'Download artifact'
-        if: env.HAVE_CODESIGN_IDENTITY == 'true'
-        uses: actions/download-artifact@v3
-        with:
-          name: 'obs-studio-macos-${{ matrix.arch }}-${{ steps.setup.outputs.commitHash }}'
-
-      - name: 'Install Apple Developer Certificate'
-        if: env.HAVE_CODESIGN_IDENTITY == 'true'
-        uses: apple-actions/import-codesign-certs@8f3fb608891dd2244cdab3d69cd68c0d37a7fe93
-        with:
-          p12-file-base64: ${{ secrets.MACOS_SIGNING_CERT }}
-          p12-password: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
-
-      - name: 'Create disk image for distribution'
-        if: env.HAVE_CODESIGN_IDENTITY == 'true'
-        env:
-          CODESIGN_IDENT: ${{ secrets.MACOS_SIGNING_IDENTITY }}
-          CODESIGN_IDENT_USER: ${{ secrets.MACOS_NOTARIZATION_USERNAME }}
-          CODESIGN_IDENT_PASS: ${{ secrets.MACOS_NOTARIZATION_PASSWORD }}
-        run: |
-          ARTIFACT_NAME=$(/usr/bin/find . -type f -name "obs-studio-*.dmg" -depth 1 | head -1)
-          CI/macos/03_package_obs.sh --notarize-image ${ARTIFACT_NAME}
-
-          echo "FILE_NAME=$(basename ${ARTIFACT_NAME})" >> $GITHUB_ENV
-
-      - name: 'Upload build Artifact'
-        if: env.HAVE_CODESIGN_IDENTITY == 'true'
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'obs-studio-macos-${{ matrix.arch }}-notarized'
-          path: '${{ github.workspace }}/${{ env.FILE_NAME }}'
-
-  macos_sparkle:
-    name: '04 - macOS Sparkle Updates'
-    runs-on: macos-12
-    needs: macos_release
-    if: fromJSON(needs.macos_release.outputs.run_sparkle)
-    strategy:
-      matrix:
-        arch: 'x86_64', 'arm64'
-    env:
-      SPARKLE_VERSION: '2.3.2'
-      SPARKLE_HASH: '2b3fe6918ca20a83729aad34f8f693a678b714a17d33b5f13ca2d25edfa7eed3'
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v3
-        with:
-          path: 'repo'
-          ref: ${{ github.ref }}
-
-      - name: 'Download artifact'
-        uses: actions/download-artifact@v3
-        with:
-          name: 'obs-studio-macos-${{ matrix.arch }}-notarized'
-          path: 'artifacts'
-
-      - name: 'Install Python requirements'
-        run: pip3 install requests xmltodict
-
-      - name: 'Install Brew requirements'
-        run: brew install coreutils pandoc
-
-      - name: 'Setup Sparkle'
-        run: |
-          curl -L "https://github.com/sparkle-project/Sparkle/releases/download/${{ env.SPARKLE_VERSION }}/Sparkle-${{ env.SPARKLE_VERSION }}.tar.xz" -o Sparkle.tar.xz
-
-          if  '${{ env.SPARKLE_HASH }}' != "$(sha256sum Sparkle.tar.xz | cut -d " " -f 1)" ; then
-              echo "Sparkle download hash does not match!"
-              exit 1
-          fi
-
-          mkdir sparkle && cd sparkle
-          tar -xf ../Sparkle.tar.xz
-
-      - name: 'Setup folder structure'
-        run: |
-          mkdir builds
-          mkdir -p output/appcasts/stable
-          mkdir -p output/sparkle_deltas/${{ matrix.arch }}
-
-      - name: 'Determine branch and tag'
-        id: branch
-        run: |
-          pushd repo
-
-          GIT_TAG="$(git describe --tags --abbrev=0)"
-          if  ${GIT_TAG} == *'beta'* || ${GIT_TAG} == *'rc'* ; then
-            echo "branch=beta" >> $GITHUB_OUTPUT
-            echo "deltas=1" >> $GITHUB_OUTPUT
-          else
-            echo "branch=stable" >> $GITHUB_OUTPUT
-            echo "deltas=1" >> $GITHUB_OUTPUT
-          fi
-          # Write tag description to file
-          git tag -l --format='%(contents)' ${GIT_TAG} >> ../notes.rst
-
-      - name: 'Download existing Appcast and builds'
-        run: python3 repo/CI/macos/appcast_download.py --branch "${{ steps.branch.outputs.branch }}" --max-old-versions ${{ steps.branch.outputs.deltas }}
-
-      - name: 'Prepare release notes'
-        run: |
-          # Insert underline at line 2 to turn first line into heading
-          sed -i '' '2i\'$'\n''###################################################' notes.rst
-          pandoc -f rst -t html notes.rst -o output/appcasts/notes_${{ steps.branch.outputs.branch }}.html
-
-      - name: 'Setup Sparkle key'
-        run: echo -n "${{ secrets.SPARKLE_PRIVATE_KEY }}" >> eddsa_private.key
-
-      - name: 'Generate Appcast'
-        run: |
-          mv artifacts/*.dmg builds/
-          ./sparkle/bin/generate_appcast \
-              --verbose \
-              --ed-key-file ./eddsa_private.key \
-              --download-url-prefix "https://cdn-fastly.obsproject.com/downloads/" \
-              --full-release-notes-url "https://obsproject.com/osx_update/notes_${{ steps.branch.outputs.branch }}.html" \
-              --maximum-versions 0 \
-              --maximum-deltas ${{ steps.branch.outputs.deltas }} \
-              --channel "${{ steps.branch.outputs.branch }}" builds/
-          # Move deltas, if any
-          if compgen -G "builds/*.delta" > /dev/null; then
-            mv builds/*.delta output/sparkle_deltas/${{ matrix.arch }}
-          fi
-          # Move appcasts
-          mv builds/*.xml output/appcasts/
-
-      - name: 'Create 1.x Appcast'
-        run: python3 repo/CI/macos/appcast_convert.py
-
-      - name: 'Upload Appcast and Deltas'
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'macos-sparkle-updates'
-          path: '${{ github.workspace }}/output'

obs-studio-29.1.3.tar.xz/.github/workflows/qt-xml.yml Deleted

obs-studio-29.1.3.tar.xz/.github/workflows/services-json.yml Deleted

@@ -1,93 +0,0 @@
-name: Services Validator
-
-on:
- push:
- paths:
- - "plugins/rtmp-services/data/services.json"
- - "plugins/rtmp-services/data/package.json"
- pull_request:
- paths:
- - "plugins/rtmp-services/data/services.json"
- - "plugins/rtmp-services/data/package.json"
- schedule:
- - cron: 0 0 * * *
- workflow_dispatch:
-
-jobs:
- schema:
- name: Schema
- runs-on: ubuntu-20.04
- if: ${{ github.repository_owner == 'obsproject' || github.event_name != 'schedule' }}
- steps:
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Install & Configure Python
- run: |
- sudo apt install python3.9-dev
- python3.9 -m pip install jsonschema json_source_map
-
- - name: Validate Service JSON Schema
- run: |
- JSON_FILES=(
- plugins/rtmp-services/data/services.json
- plugins/rtmp-services/data/package.json
- )
- python3.9 CI/check-jsonschema.py "${JSON_FILES@}"
-
- - name: Annotate Errors
- if: failure()
- uses: yuzutech/annotations-action@v0.4.0
- with:
- repo-token: "${{ secrets.GITHUB_TOKEN }}"
- title: "Service JSON Errors"
- input: "./validation_errors.json"
-
- service_check:
- name: Service Check
- runs-on: macos-latest
- needs: schema
- if: ${{ github.repository_owner == 'obsproject' && github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
-
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- fetch-depth: 0
-
- - name: Restore cache
- uses: actions/cache@v3
- with:
- path: ${{ github.workspace }}/other
- # Workaround to create a new cache every time, since a cache key is immutable:
- # https://github.com/actions/cache/blob/main/workarounds.md#update-a-cache
- key: service-check-${{ github.run_id }}
- restore-keys: service-check
-
- - name: Install & Configure Python
- run: |
- python3 -m pip install requests
-
- - name: Check Services
- id: check
- run: python3 -u CI/check-services.py
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- WORKFLOW_RUN_ID: ${{ github.run_id }}
- REPOSITORY: ${{ github.repository }}
-
- - uses: actions/upload-artifact@v3
- with:
- name: timestamps
- path: ${{ github.workspace }}/other/*
-
- - name: Create Pull Request
- uses: peter-evans/create-pull-request@36a56dac0739df8d3d8ebb9e6e41026ba248ec27
- if: steps.check.outputs.make_pr == 'true'
- with:
- author: "Service Checker <commits@obsproject.com>"
- commit-message: "rtmp-services: Remove defunct servers/services"
- title: "rtmp-services: Remove defunct servers/services"
- branch: "automated/clean-services"
- body: ${{ fromJSON(steps.check.outputs.pr_message) }}
- delete-branch: true

obs-studio-29.1.3.tar.xz/.github/workflows/steam.yml Deleted

@@ -1,266 +0,0 @@
-name: Steam Upload
-
-on:
- release:
- types:
- - published
- workflow_dispatch:
- inputs:
- tag:
- description: 'Tag to fetch and upload (nightly if none)'
- required: false
- win_url_override:
- description: 'Windows build to use (.zip only)'
- required: false
- mac_url_override:
- description: 'Mac build to use (.dmg only)'
- required: false
- mac_arm_url_override:
- description: 'Mac ARM build to use (.dmg only)'
- required: false
-
-env:
- WORKFLOW_ID: 583765
- GIT_NIGHTLY_BRANCH: master
- STEAM_NIGHTLY_BRANCH: nightly
- STEAM_STABLE_BRANCH: staging
- STEAM_BETA_BRANCH: beta_staging
- STEAM_PLAYTEST_BRANCH: staging
-
-jobs:
- upload:
- name: Steam upload
- runs-on: macos-latest
- if: github.repository_owner == 'obsproject'
-
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- path: source
-
- - name: Get build information
- id: build-info
- run: |
- EVENT='${{ github.event_name }}'
- if ${EVENT} == 'release' || ( ${EVENT} == 'workflow_dispatch' && -n '${{ github.event.inputs.tag }}') ; then
- if ${EVENT} == "release" ; then
- DESC='${{ github.event.release.tag_name }}'
- if '${{ github.event.release.prerelease }}' == 'true' ; then
- BRANCH='${{ env.STEAM_BETA_BRANCH }}'
- else
- BRANCH='${{ env.STEAM_STABLE_BRANCH }}'
- fi
- ASSETS_URL='${{ github.event.release.assets_url }}'
- else
- RELEASE="$(curl -s '${{ github.api_url }}/repos/obsproject/obs-studio/releases/tags/${{ github.event.inputs.tag }}')"
-
- DESC="$(jq -r '.tag_name' <<< ${RELEASE})"
- if "$(jq -r '.prerelease' <<< ${RELEASE})" == 'true' ; then
- BRANCH='${{ env.STEAM_BETA_BRANCH }}'
- else
- BRANCH='${{ env.STEAM_STABLE_BRANCH }}'
- fi
- ASSETS_URL="$(jq -r '.assets_url' <<< ${RELEASE})"
- fi
-
- ASSETS="$(curl -s "${ASSETS_URL}")"
- WIN_ASSET_URL="$(jq -r '. | select(.name|test(".*.zip")) .browser_download_url' <<< ${ASSETS})"
- MAC_ASSET_URL="$(jq -r '. | select(.name|test(".*x86_64.*.dmg")) .browser_download_url' <<< ${ASSETS})"
- MAC_ARM_ASSET_URL="$(jq -r '. | select(.name|test(".*arm64.*.dmg")) .browser_download_url' <<< ${ASSETS})"
- TYPE='release'
- else
- BRANCH='${{ env.STEAM_NIGHTLY_BRANCH }}'
- BUILDS="$(curl -s '${{ github.api_url }}/repos/obsproject/obs-studio/actions/workflows/${{ env.WORKFLOW_ID }}/runs?per_page=1&event=push&status=success&branch=${{ env.GIT_NIGHTLY_BRANCH }}')"
- ARTIFACTS_URL="$(jq -r '.workflow_runs.artifacts_url' <<< ${BUILDS})"
- DESC="g$(jq -r '.workflow_runs.head_sha' <<< "${BUILDS}" | cut -c1-9)"
-
- ARTIFACTS="$(curl -s ${ARTIFACTS_URL})"
- WIN_ASSET_URL="$(jq -r '.artifacts | select(.name|test(".*windows-x64.*")) .archive_download_url' <<< ${ARTIFACTS})"
- MAC_ASSET_URL="$(jq -r '.artifacts | select(.name|test(".*macos-x86_64.*")) .archive_download_url' <<< ${ARTIFACTS})"
- MAC_ARM_ASSET_URL="$(jq -r '.artifacts | select(.name|test(".*macos-arm64.*")) .archive_download_url' <<< ${ARTIFACTS})"
- TYPE='nightly'
- fi
-
- # Apply overrides from workflow_dispatch
- if ${EVENT} == 'workflow_dispatch' ; then
- if -n '${{ github.event.inputs.win_url_override }}' ; then
- WIN_ASSET_URL='${{ github.event.inputs.win_url_override }}'
- fi
-
- if -n '${{ github.event.inputs.mac_url_override }}' ; then
- MAC_ASSET_URL='${{ github.event.inputs.mac_url_override }}'
- fi
-
- if -n '${{ github.event.inputs.mac_arm_url_override }}' ; then
- MAC_ARM_ASSET_URL='${{ github.event.inputs.mac_arm_url_override }}'
- fi
- fi
-
- if -z ${WIN_ASSET_URL} || -z ${MAC_ASSET_URL} || -z ${MAC_ARM_ASSET_URL} ; then
- echo "Missing at least one asset URL!"
- exit 1
- fi
-
- # set env variables for subsequent steps
- echo "type=${TYPE}" >> $GITHUB_OUTPUT
- echo "branch=${BRANCH}" >> $GITHUB_OUTPUT
- echo "desc=${DESC}" >> $GITHUB_OUTPUT
- echo "win_url=${WIN_ASSET_URL}" >> $GITHUB_OUTPUT
- echo "mac_intel_url=${MAC_ASSET_URL}" >> $GITHUB_OUTPUT
- echo "mac_arm_url=${MAC_ARM_ASSET_URL}" >> $GITHUB_OUTPUT
-
- - name: Restore build cache
- id: cache
- uses: actions/cache@v3
- with:
- path: ${{ github.workspace }}/steam/build
- key: ${{ steps.build-info.outputs.branch }}-${{ steps.build-info.outputs.desc }}
- # Using "restore-keys" will restore the most recent cache for the branch, even if the exact cache doesn't exist.
- # This doesn't set cache-hit to true so it won't skip the upload for nightlies.
- restore-keys: ${{ steps.build-info.outputs.branch }}
-
- - name: Determine if Steam upload should run
- # If the nightly build has already been uploaded and thus a cache exists skip this and the following steps.
- # Steam does not prevent us from uploading duplicate builds so this would just pollute the dashboard.
- # This is a bit of a hack and can fail to work if our cache has been evicted or we somehow have no commits for 7 days,
- # but it's better than nothing!
- id: should-run
- run: |
- if '${{ steps.build-info.outputs.type }}' == 'release' || '${{ steps.cache.outputs.cache-hit }}' != 'true' ; then
- echo "result=true" >> $GITHUB_OUTPUT
- if '${{ steps.build-info.outputs.branch }}' == '${{ env.STEAM_BETA_BRANCH }}' ; then
- echo "result_playtest=true" >> $GITHUB_OUTPUT
- else
- echo "result_playtest=false" >> $GITHUB_OUTPUT
- fi
- else
- echo "result=false" >> $GITHUB_OUTPUT
- echo "result_playtest=false" >> $GITHUB_OUTPUT
- fi
-
- - name: Download and prepare builds
- if: steps.should-run.outputs.result == 'true'
- run: |
- echo "::group::Download Windows build"
- if '${{ steps.build-info.outputs.win_url }}' == *'api.github.com'* ; then
- curl -L -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' '${{ steps.build-info.outputs.win_url }}' -o windows.zip
- else
- curl -L '${{ steps.build-info.outputs.win_url }}' -o windows.zip
- fi
- echo "::endgroup::"
-
- echo "::group::Download Mac builds"
- if '${{ steps.build-info.outputs.mac_intel_url }}' == *'api.github.com'* ; then
- curl -L -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' '${{ steps.build-info.outputs.mac_intel_url }}' -o mac_x86.dmg.zip
- else
- curl -L '${{ steps.build-info.outputs.mac_intel_url }}' -o mac_x86.dmg
- fi
-
- if '${{ steps.build-info.outputs.mac_arm_url }}' == *'api.github.com'* ; then
- curl -L -H 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' '${{ steps.build-info.outputs.mac_arm_url }}' -o mac_arm64.dmg.zip
- else
- curl -L '${{ steps.build-info.outputs.mac_arm_url }}' -o mac_arm64.dmg
- fi
- echo "::endgroup::"
-
- mkdir -p steam && cd steam
-
- echo "::group::Extract and prepare Win64"
- mkdir steam-windows
- (
- cd steam-windows
- unzip ../../windows.zip
- # CI builds can be double-zipped
- if compgen -G "*.zip" > /dev/null; then
- unzip *.zip
- rm *.zip
- fi
- # copy install scripts and create sentinel file
- cp -r ../../source/CI/steam/scripts_windows scripts
- touch disable_updater
- )
- echo "::endgroup::"
-
- echo "::group::Extract macOS (x86)"
- mkdir -p steam-macos/x86
- # CI builds are zipped
- if -f ../mac_x86.dmg.zip ; then
- unzip ../mac_x86.dmg.zip
- else
- mv ../mac_x86.dmg .
- fi
-
- hdiutil attach -noverify -readonly -noautoopen -mountpoint /Volumes/x86 *.dmg
- cp -R /Volumes/x86/OBS.app steam-macos/x86
- hdiutil unmount /Volumes/x86
- rm *.dmg
- echo "::endgroup::"
-
- echo "::group::Extract and prepare macOS (arm64)"
- mkdir -p steam-macos/arm64
- if -f ../mac_arm64.dmg.zip ; then
- unzip ../mac_arm64.dmg.zip
- else
- mv ../mac_arm64.dmg .
- fi
-
- hdiutil attach -noverify -readonly -noautoopen -mountpoint /Volumes/arm64 *.dmg
- cp -R /Volumes/arm64/OBS.app steam-macos/arm64
- hdiutil unmount /Volumes/arm64
- rm *.dmg
-
- cp ../source/CI/steam/scripts_macos/launch.sh steam-macos/launch.sh
- echo "::endgroup::"
-
- - name: Setup steamcmd
- if: steps.should-run.outputs.result == 'true'
- uses: CyberAndrii/setup-steamcmd@b786e0da44db3d817e66fa3910a9560cb28c9323
-
- - name: Generate Steam auth code
- if: steps.should-run.outputs.result == 'true'
- id: steam-totp
- uses: CyberAndrii/steam-totp@c7f636bc64e77f1b901e0420b7890813141508ee
- with:
- shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
-
- - name: Upload to Steam
- if: steps.should-run.outputs.result == 'true'
- run: |
- cd steam
- echo "::group::Prepare Steam build script"
- # The description in Steamworks for the build will be "github_<branch>-<tag/short hash>", e.g. "github_nightly-gaa73de952"
- sed 's/@@DESC@@/${{ steps.build-info.outputs.branch }}-${{ steps.build-info.outputs.desc }}/;s/@@BRANCH@@/${{ steps.build-info.outputs.branch }}/' ../source/CI/steam/obs_build.vdf > build.vdf
- echo "Generated file:"
- cat build.vdf
- echo "::endgroup::"
- echo "::group::Upload to Steam"
- steamcmd +login '${{ secrets.STEAM_USER }}' '${{ secrets.STEAM_PASSWORD }}' '${{ steps.steam-totp.outputs.code }}' +run_app_build "$(pwd)/build.vdf" +quit
- echo "::endgroup::"
-
- - name: Generate Steam auth code (Playtest)
- if: steps.should-run.outputs.result_playtest == 'true'
- id: steam-totp-playtest
- uses: CyberAndrii/steam-totp@c7f636bc64e77f1b901e0420b7890813141508ee
- with:
- shared_secret: ${{ secrets.STEAM_SHARED_SECRET }}
-
- - name: Upload to Steam (Playtest)
- if: steps.should-run.outputs.result_playtest == 'true'
- run: |
- cd steam
- echo "::group::Prepare Steam build script"
- sed 's/@@DESC@@/${{ steps.build-info.outputs.branch }}-${{ steps.build-info.outputs.desc }}/;s/@@BRANCH@@/${{ env.STEAM_PLAYTEST_BRANCH }}/' ../source/CI/steam/obs_playtest_build.vdf > build_playtest.vdf
- echo "Generated file:"
- cat build_playtest.vdf
- echo "::endgroup::"
- echo "::group::Upload to Steam"
- steamcmd +login '${{ secrets.STEAM_USER }}' '${{ secrets.STEAM_PASSWORD }}' '${{ steps.steam-totp-playtest.outputs.code }}' +run_app_build "$(pwd)/build_playtest.vdf" +quit
- echo "::endgroup::"
-
- - name: Upload Steam build logs
- if: steps.should-run.outputs.result == 'true'
- uses: actions/upload-artifact@v3
- with:
- name: steam-build-logs
- path: ${{ github.workspace }}/steam/build/*.log

obs-studio-29.1.3.tar.xz/CI/build-linux.sh Deleted

@@ -1,105 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Linux full build script
-##############################################################################
-#
-# This script contains all steps necessary to:
-#
-#   * Build OBS with all default plugins and dependencies
-#   * Package a Linux deb package
-#
-# Parameters:
-#   -h, --help                     : Print usage help
-#   -q, --quiet                    : Suppress most build process output
-#   -v, --verbose                  : Enable more verbose build process output
-#   -d, --skip-dependency-checks   : Skip dependency checks (default: off)
-#   -p, --portable                 : Create portable build (default: off)
-#   -pkg, --package                : Create distributable disk image
-#                                    (default: off)
-#   --build-dir                    : Specify alternative build directory
-#                                    (default: build)"
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-## SET UP ENVIRONMENT ##
-_RUN_OBS_BUILD_SCRIPT=TRUE
-PRODUCT_NAME="OBS-Studio"
-
-CHECKOUT_DIR="$(git rev-parse --show-toplevel)"
-DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-source "${CHECKOUT_DIR}/CI/include/build_support_linux.sh"
-
-## DEPENDENCY INSTALLATION
-source "${CHECKOUT_DIR}/CI/linux/01_install_dependencies.sh"
-
-## BUILD OBS ##
-source "${CHECKOUT_DIR}/CI/linux/02_build_obs.sh"
-
-## PACKAGE OBS AND NOTARIZE ##
-source "${CHECKOUT_DIR}/CI/linux/03_package_obs.sh"
-
-## MAIN SCRIPT FUNCTIONS ##
-print_usage() {
-    echo "build-linux.sh - Build script for OBS-Studio\n"
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "-d, --skip-dependency-checks   : Skip dependency checks (default: off)\n" \
-            "-p, --portable                 : Create portable build (default: off)\n" \
-            "-pkg, --package                : Create distributable disk image (default: off)\n" \
-            "--disable-pipewire             : Disable building with PipeWire support (default: off)\n" \
-            "--build-dir                    : Specify alternative build directory (default: build)\n"
-}
-
-obs-build-main() {
-    while true; do
-        case "${1}" in
-            -h | --help ) print_usage; exit 0 ;;
-            -q | --quiet ) export QUIET=TRUE; shift ;;
-            -v | --verbose ) export VERBOSE=TRUE; shift ;;
-            -d | --skip-dependency-checks ) SKIP_DEP_CHECKS=TRUE; shift ;;
-            -p | --portable ) PORTABLE=TRUE; shift ;;
-            -pkg | --package ) PACKAGE=TRUE; shift ;;
-            --disable-pipewire ) DISABLE_PIPEWIRE=TRUE; shift ;;
-            --build-dir ) BUILD_DIR="${2}"; shift 2 ;;
-            -- ) shift; break ;;
-            * ) break ;;
-        esac
-    done
-
-    ensure_dir "${CHECKOUT_DIR}"
-    step "Fetching OBS tags..."
-    git fetch origin --tags
-
-    GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-    GIT_HASH=$(git rev-parse --short HEAD)
-    GIT_TAG=$(git describe --tags --abbrev=0)
-
-    if  "${BUILD_FOR_DISTRIBUTION}" ; then
-        VERSION_STRING="${GIT_TAG}"
-    else
-        VERSION_STRING="${GIT_TAG}-${GIT_HASH}"
-    fi
-
-    FILE_NAME="obs-studio-${VERSION_STRING}-Linux.deb"
-
-    if  -z "${SKIP_DEP_CHECKS}" ; then
-        install_dependencies
-    fi
-
-    build_obs
-
-    if  "${PACKAGE}" ; then
-        package_obs
-    fi
-
-    cleanup
-}
-
-obs-build-main $*

obs-studio-29.1.3.tar.xz/CI/build-macos.sh Deleted

@@ -1,143 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# macOS build script
-##############################################################################
-#
-# This script contains all steps necessary to:
-#
-#   * Build OBS with all default plugins and dependencies
-#   * Create a macOS application bundle
-#   * Codesign the macOS application bundle
-#   * Package a macOS installation image
-#   * Notarize macOS application bundle and/or installation image
-#
-# Parameters:
-#   -h, --help                     : Print usage help
-#   -q, --quiet                    : Suppress most build process output
-#   -v, --verbose                  : Enable more verbose build process output
-#   -d, --skip-dependency-checks   : Skip dependency checks (default: off)
-#   -b, --bundle                   : Create relocatable application bundle
-#                                    (default: off)
-#   -p, --package                  : Create distributable disk image
-#                                    (default: off)
-#   -c, --codesign                 : Codesign OBS and all libraries
-#                                    (default: ad-hoc only)
-#   -n, --notarize                 : Notarize OBS (default: off)
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-## SET UP ENVIRONMENT ##
-_RUN_OBS_BUILD_SCRIPT=TRUE
-PRODUCT_NAME="OBS-Studio"
-
-CHECKOUT_DIR="$(/usr/bin/git rev-parse --show-toplevel)"
-DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-source "${CHECKOUT_DIR}/CI/include/build_support_macos.sh"
-
-## INSTALL DEPENDENCIES ##
-source "${CHECKOUT_DIR}/CI/macos/01_install_dependencies.sh"
-
-## BUILD OBS ##
-source "${CHECKOUT_DIR}/CI/macos/02_build_obs.sh"
-
-## PACKAGE OBS AND NOTARIZE ##
-source "${CHECKOUT_DIR}/CI/macos/03_package_obs.sh"
-
-## MAIN SCRIPT FUNCTIONS ##
-print_usage() {
-    echo "build-macos.sh - Build script for OBS-Studio"
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "-a, --architecture             : Specify build architecture (default: x86_64, alternative: arm64)\n" \
-            "-d, --skip-dependency-checks   : Skip dependency checks (default: off)\n" \
-            "-b, --bundle                   : Create relocatable application bundle (default: off)\n" \
-            "-p, --package                  : Create distributable disk image (default: off)\n" \
-            "-c, --codesign                 : Codesign OBS and all libraries (default: ad-hoc only)\n" \
-            "-n, --notarize                 : Notarize OBS (default: off)\n"
-}
-
-print_deprecation() {
-    echo -e "DEPRECATION ERROR:\n" \
-            "The '${1}' switch has been deprecated!\n"
-
-    if  "${1}" = "-s" ; then
-        echo -e "The macOS build script system has changed:\n" \
-                " - To configure and build OBS, run the script 'CI/macos/02_build_obs.sh'\n" \
-                " - To bundle OBS into a relocatable application bundle, run the script 'CI/macos/02_build_obs.sh --bundle\n" \
-                " - To package OBS, run the script 'CI/macos/03_package_obs.sh'\n" \
-                " - To notarize OBS, run the script 'CI/macos/03_package_obs.sh --notarize'\n"
-    fi
-
-}
-
-obs-build-main() {
-    while true; do
-        case "${1}" in
-            -h | --help ) print_usage; exit 0 ;;
-            -q | --quiet ) export QUIET=TRUE; shift ;;
-            -v | --verbose ) export VERBOSE=TRUE; shift ;;
-            -a | --architecture ) ARCH="${2}"; shift 2 ;;
-            -d | --skip-dependency-checks ) SKIP_DEP_CHECKS=TRUE; shift ;;
-            -p | --package ) PACKAGE=TRUE; shift ;;
-            -c | --codesign ) CODESIGN=TRUE; shift ;;
-            -n | --notarize ) NOTARIZE=TRUE; PACKAGE=TRUE CODESIGN=TRUE; shift ;;
-            -b | --bundle ) BUNDLE=TRUE; shift ;;
-            -s ) print_deprecation ${1}; exit 1 ;;
-            -- ) shift; break ;;
-            * ) break ;;
-        esac
-    done
-
-    ensure_dir "${CHECKOUT_DIR}"
-    check_archs
-    check_macos_version
-    step "Fetching OBS tags..."
-    /usr/bin/git fetch origin --tags
-
-    GIT_BRANCH=$(/usr/bin/git rev-parse --abbrev-ref HEAD)
-    GIT_HASH=$(/usr/bin/git rev-parse --short HEAD)
-    GIT_TAG=$(/usr/bin/git describe --tags --abbrev=0)
-
-    if  "${BUILD_FOR_DISTRIBUTION}" ; then
-        VERSION_STRING="${GIT_TAG}"
-    else
-        VERSION_STRING="${GIT_TAG}-${GIT_HASH}"
-    fi
-
-    if  "${ARCH}" = "arm64" ; then
-        FILE_NAME="obs-studio-${VERSION_STRING}-macOS-Apple.dmg"
-    elif  "${ARCH}" = "universal" ; then
-        FILE_NAME="obs-studio-${VERSION_STRING}-macOS.dmg"
-    else
-        FILE_NAME="obs-studio-${VERSION_STRING}-macOS-Intel.dmg"
-    fi
-
-    if  -z "${SKIP_DEP_CHECKS}" ; then
-        install_dependencies
-    fi
-
-    build_obs
-
-    if  "${BUNDLE}" ; then
-        bundle_obs
-    fi
-
-    if  "${PACKAGE}" ; then
-        package_obs
-    fi
-
-    if  "${NOTARIZE}" ; then
-        notarize_obs
-    fi
-
-    cleanup
-}
-
-obs-build-main $*

obs-studio-29.1.3.tar.xz/CI/build-windows.ps1 Deleted

@@ -1,137 +0,0 @@
-Param(
-    Switch$Help,
-    Switch$Quiet,
-    Switch$Verbose,
-    Switch$Package,
-    Switch$SkipDependencyChecks,
-    Switch$BuildInstaller,
-    Switch$CombinedArchs,
-    String$BuildDirectory = "build",
-    ValidateSet('x86', 'x64')
-    String$BuildArch = ('x86', 'x64')System.Environment::Is64BitOperatingSystem,
-    ValidateSet("Release", "RelWithDebInfo", "MinSizeRel", "Debug")
-    String$BuildConfiguration = "RelWithDebInfo"
-)
-
-##############################################################################
-# Windows OBS build script
-##############################################################################
-#
-# This script contains all steps necessary to:
-#
-#   * Build OBS with all required dependencies
-#   * Create 64-bit and 32-bit variants
-#
-# Parameters:
-#   -Help                   : Print usage help
-#   -Quiet                  : Suppress most build process output
-#   -Verbose                : Enable more verbose build process output
-#   -SkipDependencyChecks   : Skip dependency checks
-#   -BuildDirectory         : Directory to use for builds
-#                             Default: build64 on 64-bit systems
-#                                      build32 on 32-bit systems
-#   -BuildArch              : Build architecture to use (x86 or x64)
-#   -BuildConfiguration     : Build configuration to use
-#                             Default: RelWithDebInfo
-#   -CombinedArchs          : Create combined packages and installer
-#                             (x86 and x64) - Default: off
-#   -Package                : Prepare folder structure for installer creation
-#
-# Environment Variables (optional):
-#  WindowsDepsVersion       : Pre-compiled Windows dependencies version
-#  WindowsQtVersion         : Pre-compiled Qt version
-#
-##############################################################################
-
-$ErrorActionPreference = "Stop"
-
-$_RunObsBuildScript = $true
-$ProductName = "OBS-Studio"
-
-$CheckoutDir = Resolve-Path -Path "$PSScriptRoot\.."
-$DepsBuildDir = "${CheckoutDir}/../obs-build-dependencies"
-$ObsBuildDir = "${CheckoutDir}/../obs-studio"
-
-. ${CheckoutDir}/CI/include/build_support_windows.ps1
-
-# Handle installation of build system components and build dependencies
-. ${CheckoutDir}/CI/windows/01_install_dependencies.ps1
-
-# Handle OBS build configuration
-. ${CheckoutDir}/CI/windows/02_build_obs.ps1
-
-# Handle packaging
-. ${CheckoutDir}/CI/windows/03_package_obs.ps1
-
-function Build-OBS-Main {
-    Ensure-Directory ${CheckoutDir}
-    Write-Step "Fetching version tags..."
-    $null = git fetch origin --tags
-    $GitBranch = git rev-parse --abbrev-ref HEAD
-    $GitHash = git rev-parse --short HEAD
-    $ErrorActionPreference = "SilentlyContinue"
-    $GitTag = git describe --tags --abbrev=0
-    $ErrorActionPreference = "Stop"
-
-    if(Test-Path variable:BUILD_FOR_DISTRIBUTION) {
-        $VersionString = "${GitTag}"
-    } else {
-        $VersionString = "${GitTag}-${GitHash}"
-    }
-
-    $FileName = "${ProductName}-${VersionString}"
-
-    if($CombinedArchs.isPresent) {
-        if (!(Test-Path env:obsInstallerTempDir)) {
-            $Env:obsInstallerTempDir = "${CheckoutDir}/install_temp"
-        }
-
-        if(!($SkipDependencyChecks.isPresent)) {
-            Install-Dependencies -BuildArch x64
-        }
-
-        Build-OBS -BuildArch x64
-
-        if(!($SkipDependencyChecks.isPresent)) {
-            Install-Dependencies -BuildArch x86
-        }
-
-        Build-OBS -BuildArch x86
-    } else {
-        if(!($SkipDependencyChecks.isPresent)) {
-            Install-Dependencies
-        }
-
-        Build-OBS
-    }
-
-    if($Package.isPresent) {
-        Package-OBS -CombinedArchs:$CombinedArchs
-    }
-}
-
-## MAIN SCRIPT FUNCTIONS ##
-function Print-Usage {
-    Write-Host "build-windows.ps1 - Build script for ${ProductName}"
-    $Lines = @(
-        "Usage: ${_ScriptName}",
-        "-Help                    : Print this help",
-        "-Quiet                   : Suppress most build process output"
-        "-Verbose                 : Enable more verbose build process output"
-        "-SkipDependencyChecks    : Skip dependency checks - Default: off",
-        "-BuildDirectory          : Directory to use for builds - Default: build64 on 64-bit systems, build32 on 32-bit systems",
-        "-BuildArch               : Build architecture to use (x86 or x64) - Default: local architecture",
-        "-BuildConfiguration      : Build configuration to use - Default: RelWithDebInfo",
-        "-CombinedArchs           : Create combined packages and installer (64-bit and 32-bit) - Default: off"
-        "-Package                 : Prepare folder structure for installer creation"
-    )
-    $Lines | Write-Host
-}
-
-$_ScriptName = "$($MyInvocation.MyCommand.Name)"
-if($Help.isPresent) {
-    Print-Usage
-    exit 0
-}
-
-Build-OBS-Main

obs-studio-29.1.3.tar.xz/CI/check-changes.sh Deleted

obs-studio-29.1.3.tar.xz/CI/check-cmake.sh Deleted

@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-set -o errexit
-set -o pipefail
-
-if  ${#} -eq 1 -a "${1}" = "VERBOSE" ; then
-    VERBOSITY="-l debug"
-else
-    VERBOSITY=""
-fi
-
-if  "${CI}" ; then
-    MODE="--check"
-else
-    MODE="-i"
-fi
-
-# Runs the formatter in parallel on the code base.
-# Return codes:
-#  - 1 there are files to be formatted
-#  - 0 everything looks fine
-
-# Get CPU count
-OS=$(uname)
-NPROC=1
-if  ${OS} = "Linux"  ; then
-    NPROC=$(nproc)
-elif  ${OS} = "Darwin"  ; then
-    NPROC=$(sysctl -n hw.physicalcpu)
-fi
-
-# Discover clang-format
-if ! type cmake-format 2> /dev/null ; then
-    echo "Required cmake-format not found"
-    exit 1
-fi
-
-find . -type d $ \
-    -path ./.deps -o \
-    -path ./\*build\* -o \
-    -path ./deps/jansson -o \
-    -path ./plugins/decklink/\*/decklink-sdk -o \
-    -path ./plugins/enc-amf -o \
-    -path ./plugins/mac-syphon/syphon-framework -o \
-    -path ./plugins/obs-outputs/ftl-sdk -o \
-    -path ./plugins/obs-vst -o \
-    -path ./plugins/obs-browser -o \
-    -path ./plugins/win-dshow/libdshowcapture -o \
-    -path ./plugins/obs-websocket/deps \
-$ -prune -false -type f -o \
-    -name 'CMakeLists.txt' -or \
-    -name '*.cmake' \
- | xargs -L10 -P ${NPROC} cmake-format ${MODE} ${VERBOSITY}

obs-studio-29.1.3.tar.xz/CI/check-format.sh Deleted

@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-# Original source https://github.com/Project-OSRM/osrm-backend/blob/master/scripts/format.sh
-
-set -o errexit
-set -o pipefail
-set -o nounset
-
-if  ${#} -eq 1 ; then
-    VERBOSITY="--verbose"
-else
-    VERBOSITY=""
-fi
-
-# Runs the Clang Formatter in parallel on the code base.
-# Return codes:
-#  - 1 there are files to be formatted
-#  - 0 everything looks fine
-
-# Get CPU count
-OS=$(uname)
-NPROC=1
-if  ${OS} = "Linux"  ; then
-    NPROC=$(nproc)
-elif  ${OS} = "Darwin"  ; then
-    NPROC=$(sysctl -n hw.physicalcpu)
-fi
-
-# Discover clang-format
-if type clang-format-13 2> /dev/null ; then
-    CLANG_FORMAT=clang-format-13
-elif type clang-format 2> /dev/null ; then
-    # Clang format found, but need to check version
-    CLANG_FORMAT=clang-format
-    V=$(clang-format --version)
-    if  $V != *"version 13.0"* ; then
-        echo "clang-format is not 13.0 (returned ${V})"
-        exit 1
-    fi
-else
-    echo "No appropriate clang-format found (expected clang-format-13.0.0, or clang-format)"
-    exit 1
-fi
-
-find . -type d $ \
-    -path ./.deps -o \
-    -path ./\*build\* -o \
-    -path ./cmake -o \
-    -path ./plugins/decklink/\*/decklink-sdk -o \
-    -path ./plugins/enc-amf -o \
-    -path ./plugins/mac-syphon/syphon-framework -o \
-    -path ./plugins/obs-outputs/ftl-sdk -o \
-    -path ./plugins/obs-websocket/deps \
-$ -prune -false -type f -o \
-    -name '*.h' -or \
-    -name '*.hpp' -or \
-    -name '*.m' -or \
-    -name '*.mm' -or \
-    -name '*.c' -or \
-    -name '*.cpp' \
- | xargs -L100 -P ${NPROC} "${CLANG_FORMAT}" ${VERBOSITY} -i -style=file -fallback-style=none

obs-studio-29.1.3.tar.xz/CI/check-jsonschema.py Deleted

@@ -1,84 +0,0 @@
-import json
-from jsonschema import Draft7Validator
-from json_source_map import calculate
-from json_source_map.errors import InvalidInputError
-import os
-import sys
-
-
-errors = 
-
-
-def main():
- if len(sys.argv) < 2:
- print("JSON path required.")
- return 1
-
- for filename in sys.argv1::
- prep(filename)
-
- try:
- with open('validation_errors.json', 'w') as outfile:
- json.dump(errors, outfile)
- except OSError as e:
- print(f'Failed to write validation output to file: {e}')
- return 1
-
- if errors:
- return 1
-
- return 0
-
-
-def prep(filename):
- try:
- with open(filename) as json_file:
- json_string = json_file.read()
- json_data = json.loads(json_string)
- except OSError as e:
- print(f'Failed to load file "{filename}": {e}')
- return
-
- schema_filename = json_data.get('$schema')
- if not schema_filename:
- print('File has no schema:', filename)
- return
-
- file_path = os.path.split(filename)0
- schema_file = os.path.join(file_path, schema_filename)
-
- try:
- with open(schema_file) as json_file:
- schema = json.load(json_file)
- except OSError as e:
- print(f'Failed to load schema file "{schema_file}": {e}')
- return
-
- validate(filename, json_data, json_string, schema)
-
-
-def validate(filename, json_data, json_string, schema):
- try:
- servicesPaths = calculate(json_string)
- except InvalidInputError as e:
- print("Error with file:", e)
- return
-
- cls = Draft7Validator(schema)
-
- for e in sorted(cls.iter_errors(json_data), key=str):
- print(f'{e}\nIn "{filename}"\n\n')
- errorPath = '/'.join(str(v) for v in e.absolute_path)
- errorEntry = servicesPaths'/' + errorPath
- errors.append({
- "file": filename,
- "start_line": errorEntry.value_start.line + 1,
- "end_line": errorEntry.value_end.line + 1,
- "title": "Validation Error",
- "message": e.message,
- "annotation_level": "failure"
- })
-
-
-if __name__ == '__main__':
- sys.exit(main())

obs-studio-29.1.3.tar.xz/CI/check-services.py Deleted

@@ -1,363 +0,0 @@
-import json
-import socket
-import ssl
-import os
-import time
-import requests
-import sys
-import zipfile
-
-from io import BytesIO
-from random import randbytes
-from urllib.parse import urlparse
-from collections import defaultdict
-
-MINIMUM_PURGE_AGE = 9.75 * 24 * 60 * 60 # slightly less than 10 days
-TIMEOUT = 10
-SKIPPED_SERVICES = {'YouNow', 'SHOWROOM', 'Dacast'}
-SERVICES_FILE = 'plugins/rtmp-services/data/services.json'
-PACKAGE_FILE = 'plugins/rtmp-services/data/package.json'
-CACHE_FILE = 'other/timestamps.json'
-GITHUB_OUTPUT_FILE = os.environ.get('GITHUB_OUTPUT', None)
-
-DO_NOT_PING = {'jp9000'}
-PR_MESSAGE = '''This is an automatically created pull request to remove unresponsive servers and services.
-
-| Service | Action Taken | Author(s) |
-| ------- | ------------ | --------- |
-{table}
-
-If you are not responsible for an affected service and want to be excluded from future pings please let us know.
-
-Created by workflow run: https://github.com/{repository}/actions/runs/{run_id}'''
-
-# GQL is great isn't it
-GQL_QUERY = '''{
- repositoryOwner(login: "obsproject") {
- repository(name: "obs-studio") {
- object(expression: "master") {
- ... on Commit {
- blame(path: "plugins/rtmp-services/data/services.json") {
- ranges {
- startingLine
- endingLine
- commit {
- author {
- user {
- login
- }
- }
- }
- }
- }
- }
- }
- }
- }
-}'''
-
-context = ssl.create_default_context()
-
-
-def check_ftl_server(hostname) -> bool:
- """Check if hostname resolves to a valid address - FTL handshake not implemented"""
- try:
- socket.getaddrinfo(hostname, 8084, proto=socket.IPPROTO_UDP)
- except socket.gaierror as e:
- print(f'⚠️ Could not resolve hostname for server: {hostname} (Exception: {e})')
- return False
- else:
- return True
-
-
-def check_hls_server(uri) -> bool:
- """Check if URL responds with status code < 500 and not 404, indicating that at least there's *something* there"""
- try:
- r = requests.post(uri, timeout=TIMEOUT)
- if r.status_code >= 500 or r.status_code == 404:
- raise Exception(f'Server responded with {r.status_code}')
- except Exception as e:
- print(f'⚠️ Could not connect to HLS server: {uri} (Exception: {e})')
- return False
- else:
- return True
-
-
-def check_rtmp_server(uri) -> bool:
- """Try connecting and sending a RTMP handshake (with SSL if necessary)"""
- parsed = urlparse(uri)
- hostname, port = parsed.netloc.partition(':')::2
-
- if port:
- port = int(port)
- elif parsed.scheme == 'rtmps':
- port = 443
- else:
- port = 1935
-
- try:
- recv = b''
- with socket.create_connection((hostname, port), timeout=TIMEOUT) as sock:
- # RTMP handshake is \x03 + 4 bytes time (can be 0) + 4 zero bytes + 1528 bytes random
- handshake = b'\x03\x00\x00\x00\x00\x00\x00\x00\x00' + randbytes(1528)
- if parsed.scheme == 'rtmps':
- with context.wrap_socket(sock, server_hostname=hostname) as ssock:
- ssock.sendall(handshake)
- while True:
- _tmp = ssock.recv(4096)
- recv += _tmp
- if len(recv) >= 1536 or not _tmp:
- break
- else:
- sock.sendall(handshake)
- while True:
- _tmp = sock.recv(4096)
- recv += _tmp
- if len(recv) >= 1536 or not _tmp:
- break
-
- if len(recv) < 1536 or recv0 != 3:
- raise ValueError('Invalid RTMP handshake received from server')
- except Exception as e:
- print(f'⚠️ Connection to server failed: {uri} (Exception: {e})')
- return False
- else:
- return True
-
-
-def get_last_artifact():
- s = requests.session()
- s.headers'Authorization' = f'Bearer {os.environ"GITHUB_TOKEN"}'
-
- run_id = os.environ'WORKFLOW_RUN_ID'
- repo = os.environ'REPOSITORY'
-
- # fetch run first, get workflow id from there to get workflow runs
- r = s.get(f'https://api.github.com/repos/{repo}/actions/runs/{run_id}')
- r.raise_for_status()
- workflow_id = r.json()'workflow_id'
-
- r = s.get(
- f'https://api.github.com/repos/{repo}/actions/workflows/{workflow_id}/runs',
- params=dict(per_page=1, status='completed', branch='master', conclusion='success', event='schedule'),
- )
- r.raise_for_status()
- runs = r.json()
- if not runs'workflow_runs':
- raise ValueError('No completed workflow runs found')
-
- r = s.get(runs'workflow_runs'0'artifacts_url')
- r.raise_for_status()
-
- for artifact in r.json()'artifacts':
- if artifact'name' == 'timestamps':
- artifact_url = artifact'archive_download_url'
- break
- else:
- raise ValueError('No previous artifact found.')
-
- r = s.get(artifact_url)
- r.raise_for_status()
- zip_data = BytesIO()
- zip_data.write(r.content)
-
- with zipfile.ZipFile(zip_data) as zip_ref:
- for info in zip_ref.infolist():
- if info.filename == 'timestamps.json':
- return json.loads(zip_ref.read(info.filename))
-
-
-def find_people_to_blame(raw_services: str, servers: listtuplestr, str) -> dict:
- if not servers:
- return dict()
-
- # Fetch Blame data from github
- s = requests.session()
- s.headers'Authorization' = f'Bearer {os.environ"GITHUB_TOKEN"}'
-
- r = s.post('https://api.github.com/graphql', json=dict(query=GQL_QUERY, variables=dict()))
- r.raise_for_status()
- j = r.json()
-
- # The file is only ~2600 lines so this isn't too crazy and makes the lookup very easy
- line_author = dict()
- for blame in j'data''repositoryOwner''repository''object''blame''ranges':
- for i in range(blame'startingLine' - 1, blame'endingLine'):
- if user := blame'commit''author''user':
- line_authori = user'login'
-
- service_authors = defaultdict(set)
- for i, line in enumerate(raw_services.splitlines()):
- if '"url":' not in line:
- continue
- for server, service in servers:
- if server in line and (author := line_author.get(i)):
- if author not in DO_NOT_PING:
- service_authorsservice.add(author)
-
- return service_authors
-
-
-def set_output(name, value):
- if not GITHUB_OUTPUT_FILE:
- return
-
- try:
- with open(GITHUB_OUTPUT_FILE, 'a', encoding='utf-8', newline='\n') as f:
- f.write(f'{name}={value}\n')
- except Exception as e:
- print(f'Writing to github output files failed: {e!r}')
-
-
-def main():
- try:
- with open(SERVICES_FILE, encoding='utf-8') as services_file:
- raw_services = services_file.read()
- services = json.loads(raw_services)
- with open(PACKAGE_FILE, encoding='utf-8') as package_file:
- package = json.load(package_file)
- except OSError as e:
- print(f'❌ Could not open services/package file: {e}')
- return 1
-
- # attempt to load last check result cache
- try:
- with open(CACHE_FILE, encoding='utf-8') as check_file:
- fail_timestamps = json.load(check_file)
- except OSError as e:
- # cache might be evicted or not exist yet, so this is non-fatal
- print(f'⚠️ Could not read cache file, trying to get last artifact (Exception: {e})')
-
- try:
- fail_timestamps = get_last_artifact()
- except Exception as e:
- print(f'⚠️ Could not fetch cache file, starting fresh. (Exception: {e})')
- fail_timestamps = dict()
- else:
- print('Fetched cache file from last run artifact.')
- else:
- print('Successfully loaded cache file:', CACHE_FILE)
-
- start_time = int(time.time())
- affected_services = dict()
- removed_servers = list()
-
- # create temporary new list
- new_services = services.copy()
- new_services'services' = 
-
- for service in services'services':
- # skip services that do custom stuff that we can't easily check
- if service'name' in SKIPPED_SERVICES:
- new_services'services'.append(service)
- continue
-
- service_type = service.get('recommended', {}).get('output', 'rtmp_output')
- if service_type not in {'rtmp_output', 'ffmpeg_hls_muxer', 'ftl_output'}:
- print('Unknown service type:', service_type)
- new_services'services'.append(service)
- continue
-
- # create a copy to mess with
- new_service = service.copy()
- new_service'servers' = 
-
- # run checks for all the servers, and store results in timestamp cache
- for server in service'servers':
- if service_type == 'ftl_output':
- is_ok = check_ftl_server(server'url')
- elif service_type == 'ffmpeg_hls_muxer':
- is_ok = check_hls_server(server'url')
- else: # rtmp
- is_ok = check_rtmp_server(server'url')
-
- if not is_ok:
- if ts := fail_timestamps.get(server'url', None):
- if (delta := start_time - ts) >= MINIMUM_PURGE_AGE:
- print(
- f'🗑️ Purging server "{server"url"}", it has been '
- f'unresponsive for {round(delta/60/60/24)} days.'
- )
- removed_servers.append((server'url', service'name'))
- # continuing here means not adding it to the new list, thus dropping it
- continue
- else:
- fail_timestampsserver'url' = start_time
- elif is_ok and server'url' in fail_timestamps:
- # remove timestamp of failed check if server is back
- delta = start_time - fail_timestampsserver'url'
- print(f'💡 Server "{server"url"}" is back after {round(delta/60/60/24)} days!')
- del fail_timestampsserver'url'
-
- new_service'servers'.append(server)
-
- if (diff := len(service'servers') - len(new_service'servers')) > 0:
- print(f'ℹ️ Removed {diff} server(s) from {service"name"}')
- affected_servicesservice'name' = f'{diff} servers removed'
-
- # remove services with no valid servers
- if not new_service'servers':
- print(f'💀 Service "{service"name"}" has no valid servers left, removing!')
- affected_servicesservice'name' = f'Service removed'
- continue
-
- new_services'services'.append(new_service)
-
- # write cache file
- try:
- os.makedirs('other', exist_ok=True)
- with open(CACHE_FILE, 'w', encoding='utf-8') as cache_file:
- json.dump(fail_timestamps, cache_file)
- except OSError as e:
- print(f'❌ Could not write cache file: {e}')
- return 1
- else:
- print('Successfully wrote cache file:', CACHE_FILE)
-
- if removed_servers:
- # increment package version and save that as well
- package'version' += 1
- package'files'0'version' += 1
-
- try:
- with open(SERVICES_FILE, 'w', encoding='utf-8') as services_file:
- json.dump(new_services, services_file, indent=4, ensure_ascii=False)
- services_file.write('\n')
-
- with open(PACKAGE_FILE, 'w', encoding='utf-8') as package_file:
- json.dump(package, package_file, indent=4)
- package_file.write('\n')
- except OSError as e:
- print(f'❌ Could not write services/package file: {e}')
- return 1
- else:
- print(f'Successfully wrote services/package files:\n- {SERVICES_FILE}\n- {PACKAGE_FILE}')
-
- # try to find authors to ping, this is optional and is allowed to fail
- try:
- service_authors = find_people_to_blame(raw_services, removed_servers)
- except Exception as e:
- print(f'⚠ Could not fetch blame for some reason: {e}')
- service_authors = dict()
-
- # set GitHub outputs
- set_output('make_pr', 'true')
- msg = PR_MESSAGE.format(
- repository=os.environ'REPOSITORY',
- run_id=os.environ'WORKFLOW_RUN_ID',
- table='\n'.join(
- '| {name} | {action} | {authors} |'.format(
- name=name.replace('|', '\\|'),
- action=action,
- authors=', '.join(f'@{author}' for author in sorted(service_authors.get(name, ))),
- )
- for name, action in sorted(affected_services.items())
- ),
- )
- set_output('pr_message', json.dumps(msg))
- else:
- set_output('make_pr', 'false')
-
-
-if __name__ == '__main__':
- sys.exit(main())

obs-studio-29.1.3.tar.xz/CI/flatpak Deleted

obs-studio-29.1.3.tar.xz/CI/flatpak/com.obsproject.Studio.json Deleted

@@ -1,515 +0,0 @@
-{
-  "app-id": "com.obsproject.Studio",
-  "runtime": "org.kde.Platform",
-  "runtime-version": "6.4",
-  "sdk": "org.kde.Sdk",
-  "command": "obs",
-  "finish-args": 
-    "--socket=wayland",
-    "--socket=x11",
-    "--socket=pulseaudio",
-    "--device=all",
-    "--share=network",
-    "--share=ipc",
-    "--filesystem=xdg-run/pipewire-0",
-    "--filesystem=host",
-    "--talk-name=org.kde.StatusNotifierWatcher",
-    "--talk-name=org.freedesktop.Flatpak",
-    "--talk-name=org.freedesktop.Notifications",
-    "--talk-name=org.a11y.Bus",
-    "--own-name=org.kde.StatusNotifierItem-2-2",
-    "--system-talk-name=org.freedesktop.Avahi",
-    "--env=VST_PATH=/app/extensions/Plugins/vst"
-  ,
-  "add-extensions": {
-    "com.obsproject.Studio.Plugin": {
-      "directory": "plugins",
-      "subdirectories": true,
-      "add-ld-path": "lib",
-      "merge-dirs": "lib/obs-plugins;share/obs/obs-plugins",
-      "no-autodownload": true,
-      "autodelete": true
-    },
-    "org.freedesktop.LinuxAudio.Plugins": {
-      "directory": "extensions/Plugins",
-      "version": "22.08",
-      "add-ld-path": "lib",
-      "merge-dirs": "vst",
-      "subdirectories": true,
-      "no-autodownload": true
-    }
-  },
-  "cleanup": 
-    "/share/man",
-    "*.la"
-  ,
-  "modules": 
-    {
-      "name": "x264",
-      "config-opts": 
-        "--disable-cli",
-        "--enable-shared"
-      ,
-      "cleanup": 
-        "/include",
-        "/lib/pkgconfig"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://code.videolan.org/videolan/x264.git",
-          "commit": "eaa68fad9e5d201d42fde51665f2d137ae96baf0"
-        }
-      
-    },
-    {
-      "name": "v4l-utils",
-      "config-opts": 
-        "--disable-static",
-        "--disable-doxygen-doc",
-        "--disable-libdvbv5",
-        "--disable-v4l-utils",
-        "--disable-qv4l2",
-        "--with-udevdir=/app/lib/udev/"
-      ,
-      "cleanup": 
-        "/include",
-        "/lib/pkgconfig"
-      ,
-      "sources": 
-        {
-          "type": "archive",
-          "url": "https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.22.0.tar.bz2",
-          "sha256": "1069e5d7909bcc563baeaadc3a5c496f0e658524c413cf7818816e37bfcea344"
-        }
-      
-    },
-    {
-      "name": "nv-codec-headers",
-      "no-autogen": true,
-      "make-install-args": 
-        "PREFIX=/app"
-      ,
-      "cleanup": 
-        "*"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/FFmpeg/nv-codec-headers.git",
-          "tag": "n12.0.16.0",
-          "commit": "c5e4af74850a616c42d39ed45b9b8568b71bf8bf"
-        }
-      
-    },
-    {
-      "name": "srt",
-      "buildsystem": "cmake-ninja",
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DENABLE_STATIC=OFF",
-        "-DENABLE_APPS=OFF",
-        "-DENABLE_LOGGING=OFF"
-      ,
-      "cleanup": 
-        "/include",
-        "/lib/pkgconfig",
-        "/bin"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/Haivision/srt.git",
-          "tag": "v1.5.1",
-          "commit": "0bc3b03202b3159fc9b085b3ae6d66ec071c25d6"
-        }
-      
-    },
-    {
-      "name": "mbedtls",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DCMAKE_POSITION_INDEPENDENT_CODE=ON",
-        "-DUSE_SHARED_MBEDTLS_LIBRARY=ON",
-        "-DUSE_STATIC_MBEDTLS_LIBRARY=OFF",
-        "-DENABLE_TESTING=OFF",
-        "-DENABLE_PROGRAMS=OFF"
-      ,
-      "cleanup": 
-        "/include"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/ARMmbed/mbedtls.git",
-          "commit": "869298bffeea13b205343361b7a7daf2b210e33d",
-          "tag": "v3.2.1"
-        }
-      
-    },
-    {
-      "name": "librist",
-      "buildsystem":"meson",
-      "builddir": true,
-      "config-opts": 
-        "-Duse_mbedtls=true",
-        "-Dtest=false",
-        "-Dbuilt_tools=false",
-        "-Dbuiltin_cjson=true"
-      ,
-      "cleanup": 
-        "/include",
-        "/lib/pkgconfig"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://code.videolan.org/rist/librist.git",
-          "commit": "809390b3b75a259a704079d0fb4d8f1b5f7fa956"
-        }
-      
-    },
-    {
-      "name": "aom",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DBUILD_SHARED_LIBS=ON",
-        "-DENABLE_DOCS=OFF",
-        "-DENABLE_EXAMPLES=OFF",
-        "-DENABLE_TESTDATA=OFF",
-        "-DENABLE_TESTS=OFF",
-        "-DENABLE_TOOLS=OFF "
-      ,
-      "cleanup": 
-        "/include",
-        "/lib/pkgconfig"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://aomedia.googlesource.com/aom.git",
-          "tag": "v3.6.0",
-          "commit": "3c65175b1972da4a1992c1dae2365b48d13f9a8d"
-        }
-      
-    },
-    {
-      "name": "svt-av1",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DBUILD_SHARED_LIBS=ON",
-        "-DBUILD_APPS=OFF",
-        "-DBUILD_DEC=ON",
-        "-DBUILD_ENC=ON",
-        "-DBUILD_TESTING=OFF"
-      ,
-      "cleanup": 
-        "/include",
-        "/lib/pkgconfig"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://gitlab.com/AOMediaCodec/SVT-AV1.git",
-          "tag": "v1.4.1",
-          "commit": "018276d714ce65d9b586f6205ee016cbd8d5425d"
-        }
-      
-    },
-    {
-      "name": "ffmpeg",
-      "config-opts": 
-        "--enable-gpl",
-        "--enable-shared",
-        "--disable-static",
-        "--enable-gnutls",
-        "--disable-doc",
-        "--disable-programs",
-        "--disable-devices",
-        "--enable-libopus",
-        "--enable-libvpx",
-        "--enable-libvorbis",
-        "--enable-libx264",
-        "--enable-nvenc",
-        "--enable-libsrt",
-        "--enable-librist",
-        "--enable-libaom",
-        "--enable-libsvtav1"
-      ,
-      "cleanup": 
-        "/share/ffmpeg"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/FFmpeg/FFmpeg.git",
-          "commit": "a6dc92968a325d331bb6dcf9b3b2248026cd1d6c",
-          "disable-shallow-clone": true
-        },
-        {
-          "type": "git",
-          "dest": "obs-deps",
-          "url": "https://github.com/obsproject/obs-deps.git",
-          "tag": "2023-04-12",
-          "commit": "24e25fd83e6938cfe3cc5020230430b31ba5df59"
-        },
-        {
-          "type": "shell",
-          "commands": 
-            "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0001-flvdec-handle-unknown.patch",
-            "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0002-libaomenc-presets.patch"
-          
-        }
-      
-    },
-    {
-      "name": "luajit",
-      "no-autogen": true,
-      "cleanup": 
-        "/bin",
-        "/include",
-        "/lib/pkgconfig",
-        "*.a"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://luajit.org/git/luajit-2.0.git",
-          "commit": "505e2c03de35e2718eef0d2d3660712e06dadf1f",
-          "disable-shallow-clone": true
-        },
-        {
-          "type": "shell",
-          "commands": 
-            "sed -i 's|/usr/local|/app|' ./Makefile"
-          
-        }
-      
-    },
-    {
-      "name": "swig",
-      "config-opts": 
-        "--without-boost",
-        "--without-pcre",
-        "--without-alllang",
-        "--with-lua=/app/bin/luajit-2.1.0-beta3",
-        "--with-luaincl=/app/include/luajit-2.1",
-        "--with-python3"
-      ,
-      "cleanup": 
-        "*"
-      ,
-      "sources": 
-        {
-          "type": "archive",
-          "url": "https://prdownloads.sourceforge.net/swig/swig-4.0.2.tar.gz",
-          "sha256": "d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc"
-        }
-      
-    },
-    {
-      "name": "pipewire",
-      "buildsystem": "meson",
-      "config-opts": 
-        "-Daudiotestsrc=disabled",
-        "-Droc=disabled",
-        "-Dvideotestsrc=disabled",
-        "-Dvolume=disabled",
-        "-Dvulkan=disabled",
-        "-Ddocs=disabled",
-        "-Dman=disabled",
-        "-Dbluez5-codec-ldac=disabled",
-        "-Dbluez5-codec-aptx=disabled",
-        "-Dlibcamera=disabled",
-        "-Dudevrulesdir=/app/lib/udev/rules.d/",
-        "-Dsession-managers=",
-        "-Dtests=disabled",
-        "-Dexamples=disabled",
-        "-Dpw-cat=disabled"
-      ,
-      "cleanup": 
-        "/bin"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/pipewire/pipewire.git",
-          "tag": "0.3.65",
-          "commit": "9558a5d5e0360d8af822431c76ee858a8c7495ac"
-        }
-      
-    },
-    {
-      "name": "ntv2",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DAJA_BUILD_OPENSOURCE=ON",
-        "-DAJA_BUILD_APPS=OFF",
-        "-DAJA_INSTALL_HEADERS=ON"
-      ,
-      "cleanup": 
-        "/include"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/aja-video/ntv2.git",
-          "tag": "v16.2-bugfix5",
-          "commit": "0acbac70a0b5e6509cca78cfbf69974c73c10db9"
-        }
-      
-    },
-    {
-      "name": "jansson",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DJANSSON_EXAMPLES=OFF",
-        "-DJANSSON_BUILD_DOCS=OFF",
-        "-DJANSSON_BUILD_SHARED_LIBS=ON",
-        "-DJANSSON_WITHOUT_TESTS=ON"
-      ,
-      "cleanup": 
-        "/include",
-        "/lib/pkgconfig"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/akheron/jansson.git",
-          "tag": "v2.14",
-          "commit": "684e18c927e89615c2d501737e90018f4930d6c5"
-        }
-      
-    },
-    {
-      "name": "nlohmann-json",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DJSON_BuildTests=OFF"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/nlohmann/json.git",
-          "tag": "v3.11.2",
-          "commit": "bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d"
-        }
-      
-    },
-    {
-      "name": "websocketpp",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DENABLE_CPP11=ON",
-        "-DBUILD_EXAMPLES=OFF",
-        "-DBUILD_TESTS=OFF"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/zaphoyd/websocketpp.git",
-          "tag": "0.8.2",
-          "commit": "56123c87598f8b1dd471be83ca841ceae07f95ba"
-        }
-      
-    },
-    {
-      "name": "asio",
-      "buildsystem": "simple",
-      "build-commands": 
-        "mkdir -p /app/include",
-        "cp asio/include/asio.hpp /app/include/",
-        "cp -R asio/include/asio /app/include/"
-      ,
-      "sources": 
-        {
-          "type": "git",
-          "url": "https://github.com/chriskohlhoff/asio.git",
-          "tag": "asio-1-12-1",
-          "commit": "b73dc1d2c0ecb9452a87c26544d7f71e24342df6"
-        }
-      
-    },
-    {
-      "name": "cef",
-      "buildsystem": "cmake-ninja",
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release"
-      ,
-      "no-make-install": true,
-      "make-args": 
-        "libcef_dll_wrapper"
-      ,
-      "build-commands": 
-        "mkdir -p /app/cef/libcef_dll_wrapper",
-        "cp -R ./include /app/cef",
-        "cp -R ./Release /app/cef",
-        "cp -R ./Resources /app/cef",
-        "cp -R ./libcef_dll_wrapper/libcef_dll_wrapper.a /app/cef/libcef_dll_wrapper"
-      ,
-      "cleanup": 
-        "*"
-      ,
-      "sources": 
-        {
-          "type": "archive",
-          "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_5060_linux64.tar.bz2",
-          "sha256": "ac4e2a8ebf20700e4e36353e314f876623633dd5b474778a2548bb66bdbea11d"
-        }
-      
-    },
-    {
-      "name": "obs",
-      "buildsystem": "cmake-ninja",
-      "builddir": true,
-      "config-opts": 
-        "-DCMAKE_BUILD_TYPE=Release",
-        "-DENABLE_WAYLAND=ON",
-        "-DENABLE_BROWSER=ON",
-        "-DCEF_ROOT_DIR=/app/cef",
-        "-DUSE_XDG=ON",
-        "-DENABLE_ALSA=OFF",
-        "-DENABLE_PULSEAUDIO=ON",
-        "-DENABLE_JACK=ON",
-        "-DENABLE_RTMPS=ON",
-        "-DENABLE_VLC=OFF",
-        "-DENABLE_AJA=ON",
-        "-DENABLE_LIBFDK=ON"
-      ,
-      "secret-opts": 
-        "-DRESTREAM_CLIENTID=$RESTREAM_CLIENTID",
-        "-DRESTREAM_HASH=$RESTREAM_HASH",
-        "-DTWITCH_CLIENTID=$TWITCH_CLIENTID",
-        "-DTWITCH_HASH=$TWITCH_HASH",
-        "-DYOUTUBE_CLIENTID=$YOUTUBE_CLIENTID",
-        "-DYOUTUBE_CLIENTID_HASH=$YOUTUBE_CLIENTID_HASH",
-        "-DYOUTUBE_SECRET=$YOUTUBE_SECRET",
-        "-DYOUTUBE_SECRET_HASH=$YOUTUBE_SECRET_HASH"
-      ,
-      "post-install": 
-        "install -d /app/plugins",
-        "install -d /app/extensions/Plugins"
-      ,
-      "sources": 
-        {
-          "type": "dir",
-          "path": "../../"
-        }
-      
-    }
-  
-}

obs-studio-29.1.3.tar.xz/CI/include/Brewfile Deleted

obs-studio-29.1.3.tar.xz/CI/include/build_support_linux.sh Deleted

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Linux support functions
-##############################################################################
-#
-# This script file can be included in build scripts for Linux.
-#
-##############################################################################
-
-# Setup build environment
-
-CI_LINUX_CEF_VERSION=$(cat "${CI_WORKFLOW}" | sed -En "s/ +CEF_BUILD_VERSION_LINUX: '(0-9+)'/\1/p")
-
-if  "${TERM-}" -a -z "${CI}" ; then
-    COLOR_RED=$(tput setaf 1)
-    COLOR_GREEN=$(tput setaf 2)
-    COLOR_BLUE=$(tput setaf 4)
-    COLOR_ORANGE=$(tput setaf 3)
-    COLOR_RESET=$(tput sgr0)
-else
-    COLOR_RED=""
-    COLOR_GREEN=""
-    COLOR_BLUE=""
-    COLOR_ORANGE=""
-    COLOR_RESET=""
-fi
-
-if  "${CI}" -o "${QUIET}" ; then
-    export CURLCMD="curl --silent --show-error --location -O"
-else
-    export CURLCMD="curl --progress-bar --location --continue-at - -O"
-fi
-
-_add_ccache_to_path() {
-    if  "${CMAKE_CCACHE_OPTIONS}" ; then
-        PATH="/usr/local/opt/ccache/libexec:${PATH}"
-        status "Compiler Info:"
-        local IFS=$'\n'
-        for COMPILER_INFO in $(type cc c++ gcc g++ clang clang++ || true); do
-            info "${COMPILER_INFO}"
-        done
-    fi
-}

obs-studio-29.1.3.tar.xz/CI/include/build_support_macos.sh Deleted

@@ -1,156 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# macOS support functions
-##############################################################################
-#
-# This script file can be included in build scripts for macOS.
-#
-##############################################################################
-
-# Setup build environment
-WORKFLOW_CONTENT=$(/bin/cat "${CI_WORKFLOW}")
-
-MACOS_VERSION="$(/usr/bin/sw_vers -productVersion)"
-MACOS_MAJOR="$(echo ${MACOS_VERSION} | /usr/bin/cut -d '.' -f 1)"
-MACOS_MINOR="$(echo ${MACOS_VERSION} | /usr/bin/cut -d '.' -f 2)"
-
-if  "${TERM-}" -a -z "${CI}" ; then
-    COLOR_RED=$(/usr/bin/tput setaf 1)
-    COLOR_GREEN=$(/usr/bin/tput setaf 2)
-    COLOR_BLUE=$(/usr/bin/tput setaf 4)
-    COLOR_ORANGE=$(/usr/bin/tput setaf 3)
-    COLOR_RESET=$(/usr/bin/tput sgr0)
-else
-    COLOR_RED=""
-    COLOR_GREEN=""
-    COLOR_BLUE=""
-    COLOR_ORANGE=""
-    COLOR_RESET=""
-fi
-
-## DEFINE UTILITIES ##
-check_macos_version() {
-    ARCH="${ARCH:-${CURRENT_ARCH}}"
-
-    case "${ARCH}" in
-        x86_64) ;;
-        arm64) ;;
-        *) caught_error "Unsupported architecture '${ARCH}' provided" ;;
-    esac
-
-    step "Check macOS version..."
-    MIN_VERSION="11.0"
-    MIN_MAJOR=$(echo ${MIN_VERSION} | /usr/bin/cut -d '.' -f 1)
-    MIN_MINOR=$(echo ${MIN_VERSION} | /usr/bin/cut -d '.' -f 2)
-
-    if  "${MACOS_MAJOR}" -lt "11" -a "${MACOS_MINOR}" -lt "${MIN_MINOR}" ; then
-        error "ERROR: Minimum required macOS version is ${MIN_VERSION}, but running on ${MACOS_VERSION}"
-    fi
-
-    export CODESIGN_LINKER="ON"
-}
-
-install_homebrew_deps() {
-    if ! exists brew; then
-        caught_error "Homebrew not found - please install Homebrew (https://brew.sh)"
-    fi
-
-    brew bundle --file "${CHECKOUT_DIR}/CI/include/Brewfile" ${QUIET:+--quiet}
-
-    check_curl
-}
-
-check_curl() {
-    if  "${MACOS_MAJOR}" -lt "11" -a "${MACOS_MINOR}" -lt "15" ; then
-        if  ! -d /usr/local/opt/curl ; then
-            step "Install Homebrew curl..."
-            brew install curl
-        fi
-
-        CURLCMD="/usr/local/opt/curl/bin/curl"
-    else
-        CURLCMD="curl"
-    fi
-
-    if  "${CI}" -o "${QUIET}" ; then
-        export CURLCMD="${CURLCMD} --silent --show-error --location -O"
-    else
-        export CURLCMD="${CURLCMD} --progress-bar --location --continue-at - -O"
-    fi
-}
-
-check_archs() {
-    step "Check Architecture..."
-    ARCH="${ARCH:-${CURRENT_ARCH}}"
-    if  "${ARCH}" = "universal" ; then
-        CMAKE_ARCHS="x86_64;arm64"
-    elif  "${ARCH}" != "x86_64" -a "${ARCH}" != "arm64" ; then
-        caught_error "Unsupported architecture '${ARCH}' provided"
-    else
-        CMAKE_ARCHS="${ARCH}"
-    fi
-}
-
-_add_ccache_to_path() {
-    if  "${CMAKE_CCACHE_OPTIONS}" ; then
-        if  "${CURRENT_ARCH}" == "arm64" ; then
-            PATH="/opt/homebrew/opt/ccache/libexec:${PATH}"
-        else
-            PATH="/usr/local/opt/ccache/libexec:${PATH}"
-        fi
-        status "Compiler Info:"
-        local IFS=$'\n'
-        for COMPILER_INFO in $(type cc c++ gcc g++ clang clang++ || true); do
-            info "${COMPILER_INFO}"
-        done
-    fi
-}
-
-## SET UP CODE SIGNING AND NOTARIZATION CREDENTIALS ##
-##############################################################################
-# Apple Developer Identity needed:
-#
-#    + Signing the code requires a developer identity in the system's keychain
-#    + codesign will look up and find the identity automatically
-#
-##############################################################################
-read_codesign_ident() {
-    if  -z "${CODESIGN_IDENT}" ; then
-        step "Set up code signing..."
-        read -p "${COLOR_ORANGE}  + Apple developer identity: ${COLOR_RESET}" CODESIGN_IDENT
-    fi
-    CODESIGN_IDENT_SHORT=$(echo "${CODESIGN_IDENT}" | /usr/bin/sed -En "s/.+$(.+)$/\1/p")
-}
-
-##############################################################################
-# Apple Developer credentials necessary:
-#
-#   + Signing for distribution and notarization require an active Apple
-#     Developer membership
-#   + An Apple Development identity is needed for code signing
-#     (i.e. 'Apple Development: YOUR APPLE ID (PROVIDER)')
-#   + Your Apple developer ID is needed for notarization
-#   + An app-specific password is necessary for notarization from CLI
-#   + This password will be stored in your macOS keychain under the identifier
-#     'OBS-Codesign-Password' with access Apple's 'notarytool' only.
-##############################################################################
-
-read_codesign_pass() {
-    step "Set up notarization..."
-
-    if  -z "${CODESIGN_IDENT_USER}" ; then
-        read -p "${COLOR_ORANGE}  + Apple account id: ${COLOR_RESET}" CODESIGN_IDENT_USER
-    fi
-
-    if  -z "${CODESIGN_IDENT_PASS}" ; then
-        CODESIGN_IDENT_PASS=$(stty -echo; read -p "${COLOR_ORANGE}  + Apple developer password: ${COLOR_RESET}" secret; stty echo; echo $secret)
-        echo ""
-    fi
-
-    step "Update notarization keychain..."
-
-    echo -n "${COLOR_ORANGE}"
-    /usr/bin/xcrun notarytool store-credentials "OBS-Codesign-Password" --apple-id "${CODESIGN_IDENT_USER}" --team-id "${CODESIGN_IDENT_SHORT}" --password "${CODESIGN_IDENT_PASS}"
-    echo -n "${COLOR_RESET}"
-}

obs-studio-29.1.3.tar.xz/CI/include/build_support_windows.ps1 Deleted

@@ -1,193 +0,0 @@
-$CIWorkflow = "${CheckoutDir}/.github/workflows/main.yml"
-$WorkflowContent = Get-Content ${CIWorkflow}
-
-$CIDepsVersion = ${WorkflowContent} | Select-String " +DEPS_VERSION_WIN: '(0-9\-+)'" | ForEach-Object{$_.Matches.Groups1.Value}
-$CIQtVersion = ${WorkflowContent} | Select-String " +QT_VERSION_WIN: '(0-9\.+)'" | ForEach-Object{$_.Matches.Groups1.Value}
-$CIVlcVersion = ${WorkflowContent} | Select-String " +VLC_VERSION_WIN: '(.+)'" | ForEach-Object{$_.Matches.Groups1.Value}
-$CICefVersion = ${WorkflowContent} | Select-String " +CEF_BUILD_VERSION_WIN: '(0-9\.+)'" | ForEach-Object{$_.Matches.Groups1.Value}
-$CIGenerator = ${WorkflowContent} | Select-String " +CMAKE_GENERATOR: '(.+)'" | ForEach-Object{$_.Matches.Groups1.Value}
-
-function Write-Status {
- Param(
- Parameter(Mandatory=$true)
- String $Output
- )
-
- if (!($Quiet.isPresent)) {
- if (Test-Path Env:CI) {
- Write-Host "${ProductName} ${Output}"
- } else {
- Write-Host -ForegroundColor blue "${ProductName} ${Output}"
- }
- }
-}
-
-function Write-Info {
- Param(
- Parameter(Mandatory=$true)
- String $Output
- )
-
- if (!($Quiet.isPresent)) {
- if (Test-Path Env:CI) {
- Write-Host " + ${Output}"
- } else {
- Write-Host -ForegroundColor DarkYellow " + ${Output}"
- }
- }
-}
-
-function Write-Step {
- Param(
- Parameter(Mandatory=$true)
- String $Output
- )
-
- if (!($Quiet.isPresent)) {
- if (Test-Path Env:CI) {
- Write-Host " + ${Output}"
- } else {
- Write-Host -ForegroundColor green " + ${Output}"
- }
- }
-}
-
-function Write-Failure {
- Param(
- Parameter(Mandatory=$true)
- String $Output
- )
-
- if (Test-Path Env:CI) {
- Write-Host " + ${Output}"
- } else {
- Write-Host -ForegroundColor red " + ${Output}"
- }
-}
-
-function Test-CommandExists {
- Param(
- Parameter(Mandatory=$true)
- String $Command
- )
-
- $CommandExists = $false
- $OldActionPref = $ErrorActionPreference
- $ErrorActionPreference = "stop"
-
- try {
- if (Get-Command $Command) {
- $CommandExists = $true
- }
- } Catch {
- $CommandExists = $false
- } Finally {
- $ErrorActionPreference = $OldActionPref
- }
-
- return $CommandExists
-}
-
-function Ensure-Directory {
- Param(
- Parameter(Mandatory=$true)
- String $Directory
- )
-
- if (!(Test-Path $Directory)) {
- $null = New-Item -ItemType Directory -Force -Path $Directory
- }
-
- Set-Location -Path $Directory
-}
-
-function Invoke-External {
- <#
- .SYNOPSIS
- Invokes a non-PowerShell command.
- .DESCRIPTION
- Runs a non-PowerShell command, and captures its return code.
- Throws an exception if the command returns non-zero.
- .EXAMPLE
- Invoke-External 7z x $MyArchive
- #>
-
- if ( $args.Count -eq 0 ) {
- throw 'Invoke-External called without arguments.'
- }
-
- $Command = $args0
- $CommandArgs = @()
-
- if ( $args.Count -gt 1) {
- $CommandArgs = $args1..($args.Count - 1)
- }
-
- $_EAP = $ErrorActionPreference
- $ErrorActionPreference = "Continue"
-
- Write-Debug "Invoke-External: ${Command} ${CommandArgs}"
-
- & $command $commandArgs
- $Result = $LASTEXITCODE
-
- $ErrorActionPreference = $_EAP
-
- if ( $Result -ne 0 ) {
- throw "${Command} ${CommandArgs} exited with non-zero code ${Result}."
- }
-}
-
-$BuildDirectory = "$(if (Test-Path Env:BuildDirectory) { $env:BuildDirectory } else { $BuildDirectory })"
-$BuildConfiguration = "$(if (Test-Path Env:BuildConfiguration) { $env:BuildConfiguration } else { $BuildConfiguration })"
-$BuildArch = "$(if (Test-Path Env:BuildArch) { $env:BuildArch } else { $BuildArch })"
-$WindowsDepsVersion = "$(if (Test-Path Env:WindowsDepsVersion ) { $env:WindowsDepsVersion } else { $CIDepsVersion })"
-$WindowsQtVersion = "$(if (Test-Path Env:WindowsQtVersion ) { $env:WindowsQtVersion } else { $CIQtVersion })"
-$WindowsVlcVersion = "$(if (Test-Path Env:WindowsVlcVersion ) { $env:WindowsVlcVersion } else { $CIVlcVersion })"
-$WindowsCefVersion = "$(if (Test-Path Env:WindowsCefVersion ) { $env:WindowsCefVersion } else { $CICefVersion })"
-$CmakeSystemVersion = "$(if (Test-Path Env:CMAKE_SYSTEM_VERSION) { $Env:CMAKE_SYSTEM_VERSION } else { "10.0.18363.657" })"
-$CmakeGenerator = "$(if (Test-Path Env:CmakeGenerator) { $Env:CmakeGenerator } else { $CIGenerator })"
-
-
-function Install-Windows-Dependencies {
- $WingetFile = "$PSScriptRoot/Wingetfile"
-
- $Host64Bit = System.Environment::Is64BitOperatingSystem
-
- $Prefix = (${Env:ProgramFiles(x86)}, $Env:ProgramFiles)$Host64Bit
-
- $Paths = $Env:Path -split System.IO.Path::PathSeparator
-
- $WingetOptions = @('install', '--accept-package-agreements', '--accept-source-agreements')
-
- if ( $script:Quiet ) {
- $WingetOptions += '--silent'
- }
-
- Get-Content $WingetFile | ForEach-Object {
- $_, $Package, $_, $Path, $_, $Binary = $_ -replace ',','' -replace "'", '' -split ' '
-
- $FullPath = "${Prefix}\${Path}"
- if ( ( Test-Path $FullPath ) -and ! ( $Paths -contains $FullPath ) ) {
- $Paths += $FullPath
- $Env:Path = $Paths -join System.IO.Path::PathSeparator
- }
-
- Write-Step "Checking for command ${Binary}"
- $Found = Get-Command -ErrorAction SilentlyContinue $Binary
-
- if ( $Found ) {
- Write-Info "Found dependency ${Binary} as $($Found.Source)"
- } else {
- Write-Info "Installing package ${Package}"
-
- try {
- $Params = $WingetOptions + $Package
-
- winget @Params
- } catch {
- throw "Error while installing winget package ${Package}: $_"
- }
- }
- }
-}

obs-studio-29.1.3.tar.xz/CI/linux Deleted

obs-studio-29.1.3.tar.xz/CI/linux/01_install_dependencies.sh Deleted

@@ -1,148 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Linux dependency management function
-##############################################################################
-#
-# This script file can be included in build scripts for Linux or run directly
-# with the -s/--standalone switch
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-install_build-deps() {
-    shift
-    status "Install OBS build dependencies"
-    trap "caught_error 'install_build-deps'" ERR
-
-    sudo apt-get install --no-install-recommends -y $@
-}
-
-install_obs-deps() {
-    shift
-    status "Install OBS dependencies"
-    trap "caught_error 'install_obs-deps'" ERR
-
-    if  -z "${DISABLE_PIPEWIRE}" ; then
-        sudo apt-get install --no-install-recommends -y $@ libpipewire-0.3-dev
-    else
-        sudo apt-get install --no-install-recommends -y $@
-    fi
-}
-
-install_qt5-deps() {
-    shift
-    status "Install Qt5 dependencies"
-    trap "caught_error 'install_qt5-deps'" ERR
-
-    sudo apt-get install --no-install-recommends -y $@
-}
-
-install_qt6-deps() {
-    shift
-    status "Install Qt6 dependencies"
-    trap "caught_error 'install_qt6-deps'" ERR
-
-    _QT6_AVAILABLE="$(sudo apt-cache madison ${1})"
-    if  "${_QT6_AVAILABLE}" ; then
-        sudo apt-get install --no-install-recommends -y $@
-    fi
-}
-
-install_cef() {
-    shift
-    status "Setup for dependency CEF v${1}"
-    ensure_dir "${DEPS_BUILD_DIR}"
-
-    if  "${CI}" -a "${RESTORED_CEF}" ; then
-        _SKIP=TRUE
-    elif  -d "${DEPS_BUILD_DIR}/cef_binary_${1}_linux64" -a -f "${DEPS_BUILD_DIR}/cef_binary_${1}_linux64/build/libcef_dll_wrapper/libcef_dll_wrapper.a" ; then
-        _SKIP=TRUE
-    fi
-
-    if  -z "${_SKIP}" ; then
-        step "Download..."
-        ${CURLCMD:-curl -O} https://cdn-fastly.obsproject.com/downloads/cef_binary_${1}_linux64.tar.bz2
-        step "Unpack..."
-        tar -xf cef_binary_${1}_linux64.tar.bz2
-    else
-        step "Found existing Chromium Embedded Framework and loader library..."
-    fi
-}
-
-install_plugin-deps() {
-    shift
-    status "Install plugin dependencies"
-    trap "caught_error 'install_plugin-deps'" ERR
-
-    sudo apt-get install --no-install-recommends -y $@
-}
-
-install_dependencies() {
-    status "Set up apt"
-    trap "caught_error 'install_dependencies'" ERR
-
-    BUILD_DEPS=(
-        "build-deps cmake ninja-build pkg-config clang clang-format build-essential curl ccache"
-        "obs-deps libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libswresample-dev \
-         libswscale-dev libx264-dev libcurl4-openssl-dev libmbedtls-dev libgl1-mesa-dev libjansson-dev \
-         libluajit-5.1-dev python3-dev libx11-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-xinerama0-dev \
-         libxcb-composite0-dev libxinerama-dev libxcb1-dev libx11-xcb-dev libxcb-xfixes0-dev swig libcmocka-dev \
-         libpci-dev libxss-dev libglvnd-dev libgles2-mesa libgles2-mesa-dev libwayland-dev libxkbcommon-dev"
-        "qt5-deps qtbase5-dev qtbase5-private-dev libqt5svg5-dev qtwayland5"
-        "qt6-deps qt6-base-dev qt6-base-private-dev libqt6svg6-dev qt6-wayland"
-        "cef ${LINUX_CEF_BUILD_VERSION:-${CI_LINUX_CEF_VERSION}}"
-        "plugin-deps libasound2-dev libfdk-aac-dev libfontconfig-dev libfreetype6-dev libjack-jackd2-dev \
-         libpulse-dev libsndio-dev libspeexdsp-dev libudev-dev libv4l-dev libva-dev libvlc-dev libdrm-dev \
-         nlohmann-json3-dev libwebsocketpp-dev libasio-dev"
-    )
-
-    sudo apt-get -qq update
-
-    for DEPENDENCY in "${BUILD_DEPS@}"; do
-        set -- ${DEPENDENCY}
-        trap "caught_error ${DEPENDENCY}" ERR
-        FUNC_NAME="install_${1}"
-        ${FUNC_NAME} ${@}
-    done
-}
-
-install-dependencies-standalone() {
-    CHECKOUT_DIR="$(/usr/bin/git rev-parse --show-toplevel)"
-    PRODUCT_NAME="OBS-Studio"
-    DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-    source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-    source "${CHECKOUT_DIR}/CI/include/build_support_linux.sh"
-
-    status "Setup of OBS build dependencies"
-    install_dependencies
-}
-
-print_usage() {
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "--disable-pipewire             : Disable building with PipeWire support (default: off)\n"
-}
-
-install-dependencies-main() {
-    if  -z "${_RUN_OBS_BUILD_SCRIPT}" ; then
-        while true; do
-            case "${1}" in
-                -h | --help ) print_usage; exit 0 ;;
-                -q | --quiet ) export QUIET=TRUE; shift ;;
-                -v | --verbose ) export VERBOSE=TRUE; shift ;;
-                --disable-pipewire ) DISABLE_PIPEWIRE=TRUE; shift ;;
-                -- ) shift; break ;;
-                * ) break ;;
-            esac
-        done
-
-        install-dependencies-standalone
-    fi
-}
-
-install-dependencies-main $*

obs-studio-29.1.3.tar.xz/CI/linux/02_build_obs.sh Deleted

@@ -1,128 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Linux build function
-##############################################################################
-#
-# This script file can be included in build scripts for Linux or run directly
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-build_obs() {
-    status "Build OBS"
-    trap "caught_error 'build app'" ERR
-    if  -z "${CI}" ; then
-        _backup_artifacts
-    fi
-
-    step "Configure OBS..."
-    _configure_obs
-
-    ensure_dir "${CHECKOUT_DIR}/"
-    step "Build OBS targets..."
-    cmake --build ${BUILD_DIR}
-}
-
-# Function to configure OBS build
-_configure_obs() {
-    ensure_dir "${CHECKOUT_DIR}"
-    status "Configuration of OBS build system..."
-    trap "caught_error 'configure build'" ERR
-    check_ccache
-
-    if  "${TWITCH_CLIENTID}" -a "${TWITCH_HASH}" ; then
-        TWITCH_OPTIONS="-DTWITCH_CLIENTID='${TWITCH_CLIENTID}' -DTWITCH_HASH='${TWITCH_HASH}'"
-    fi
-
-    if  "${RESTREAM_CLIENTID}" -a "${RESTREAM_HASH}" ; then
-        RESTREAM_OPTIONS="-DRESTREAM_CLIENTID='${RESTREAM_CLIENTID}' -DRESTREAM_HASH='${RESTREAM_HASH}'"
-    fi
-
-    if  "${YOUTUBE_CLIENTID}" -a "${YOUTUBE_CLIENTID_HASH}" -a "${YOUTUBE_SECRET}" -a "{YOUTUBE_SECRET_HASH}" ; then
-        YOUTUBE_OPTIONS="-DYOUTUBE_CLIENTID='${YOUTUBE_CLIENTID}' -DYOUTUBE_CLIENTID_HASH='${YOUTUBE_CLIENTID_HASH}' -DYOUTUBE_SECRET='${YOUTUBE_SECRET}' -DYOUTUBE_SECRET_HASH='${YOUTUBE_SECRET_HASH}'"
-    fi
-
-    if  "${PORTABLE}" ; then
-        PORTABLE_BUILD="ON"
-    fi
-
-    if  "${DISABLE_PIPEWIRE}" ; then
-        PIPEWIRE_OPTION="-DENABLE_PIPEWIRE=OFF"
-    fi
-
-    cmake -S . -B ${BUILD_DIR} -G Ninja \
-        -DCEF_ROOT_DIR="${DEPS_BUILD_DIR}/cef_binary_${LINUX_CEF_BUILD_VERSION:-${CI_LINUX_CEF_VERSION}}_linux64" \
-        -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} \
-        -DLINUX_PORTABLE=${PORTABLE_BUILD:-OFF} \
-        -DENABLE_AJA=OFF \
-        -DENABLE_NEW_MPEGTS_OUTPUT=OFF \
-        ${PIPEWIRE_OPTION} \
-        ${YOUTUBE_OPTIONS} \
-        ${TWITCH_OPTIONS} \
-        ${RESTREAM_OPTIONS} \
-        ${CI:+-DENABLE_UNIT_TESTS=ON -DBUILD_FOR_DISTRIBUTION=${BUILD_FOR_DISTRIBUTION} -DOBS_BUILD_NUMBER=${GITHUB_RUN_ID}} \
-        ${QUIET:+-Wno-deprecated -Wno-dev --log-level=ERROR}
-}
-
-# Function to backup previous build artifacts
-_backup_artifacts() {
-    ensure_dir "${CHECKOUT_DIR}"
-    if  -d ${BUILD_DIR} ; then
-        status "Backup of old OBS build artifacts"
-
-        CUR_DATE=$(date +"%Y-%m-%d@%H%M%S")
-        NIGHTLY_DIR="${CHECKOUT_DIR}/nightly-${CUR_DATE}"
-        PACKAGE_NAME=$(find ${BUILD_DIR} -maxdepth 1 -name "*.deb" | sort -rn | head -1)
-
-        if  "${PACKAGE_NAME}" ; then
-            step "Back up $(basename "${PACKAGE_NAME}")..."
-            ensure_dir "${NIGHTLY_DIR}"
-            mv "../${BUILD_DIR}/$(basename "${PACKAGE_NAME}")" ${NIGHTLY_DIR}/
-            info "You can find ${PACKAGE_NAME} in ${NIGHTLY_DIR}"
-        fi
-    fi
-}
-
-build-obs-standalone() {
-    CHECKOUT_DIR="$(git rev-parse --show-toplevel)"
-    PRODUCT_NAME="OBS-Studio"
-    DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-    source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-    source "${CHECKOUT_DIR}/CI/include/build_support_linux.sh"
-
-    build_obs
-}
-
-print_usage() {
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "-p, --portable                 : Create portable build (default: off)\n" \
-            "--disable-pipewire             : Disable building with PipeWire support (default: off)\n" \
-            "--build-dir                    : Specify alternative build directory (default: build)\n"
-}
-
-build-obs-main() {
-    if  -z "${_RUN_OBS_BUILD_SCRIPT}" ; then
-        while true; do
-            case "${1}" in
-                -h | --help ) print_usage; exit 0 ;;
-                -q | --quiet ) export QUIET=TRUE; shift ;;
-                -v | --verbose ) export VERBOSE=TRUE; shift ;;
-                -p | --portable ) export PORTABLE=TRUE; shift ;;
-                --disable-pipewire ) DISABLE_PIPEWIRE=TRUE; shift ;;
-                --build-dir ) BUILD_DIR="${2}"; shift 2 ;;
-                -- ) shift; break ;;
-                * ) break ;;
-            esac
-        done
-
-        build-obs-standalone
-    fi
-}
-
-build-obs-main $*

obs-studio-29.1.3.tar.xz/CI/linux/03_package_obs.sh Deleted

@@ -1,90 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Linux libobs plugin package function
-##############################################################################
-#
-# This script file can be included in build scripts for Linux or run directly
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-package_obs() {
-    status "Create Linux debian package"
-    trap "caught_error 'package app'" ERR
-
-    ensure_dir "${CHECKOUT_DIR}"
-
-    step "Package OBS..."
-    cmake --build ${BUILD_DIR} -t package
-
-    DEB_NAME=$(find ${BUILD_DIR} -maxdepth 1 -type f -name "obs*.deb" | sort -rn | head -1)
-    DEBUG_NAME="${DEB_NAME//.deb/-dbgsym.ddeb}"
-
-    if  "${DEB_NAME}" ; then
-        mv "${DEB_NAME}" "${BUILD_DIR}/${FILE_NAME}"
-
-        if  "${DEBUG_NAME}" ; then
-            mv "${DEBUG_NAME}" "${BUILD_DIR}/${FILE_NAME//.deb/-dbgsym.ddeb}"
-        fi
-    else
-        error "ERROR No suitable OBS debian package generated"
-    fi
-}
-
-package-obs-standalone() {
-    PRODUCT_NAME="OBS-Studio"
-
-    CHECKOUT_DIR="$(git rev-parse --show-toplevel)"
-    DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-    source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-    source "${CHECKOUT_DIR}/CI/include/build_support_linux.sh"
-
-    if  -z "${CI}" ; then
-        step "Fetch OBS tags..."
-        git fetch --tags origin
-    fi
-
-    GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-    GIT_HASH=$(git rev-parse --short=9 HEAD)
-    GIT_TAG=$(git describe --tags --abbrev=0)
-    UBUNTU_VERSION=$(lsb_release -sr)
-
-    if  "${BUILD_FOR_DISTRIBUTION}" = "true" ; then
-        VERSION_STRING="${GIT_TAG}"
-    else
-        VERSION_STRING="${GIT_TAG}-${GIT_HASH}"
-    fi
-
-    FILE_NAME="obs-studio-${VERSION_STRING}-ubuntu-${UBUNTU_VERSION}.deb"
-    package_obs
-}
-
-print_usage() {
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "--build-dir                    : Specify alternative build directory (default: build)\n"
-}
-
-package-obs-main() {
-    if  -z "${_RUN_OBS_BUILD_SCRIPT}" ; then
-        while true; do
-            case "${1}" in
-                -h | --help ) print_usage; exit 0 ;;
-                -q | --quiet ) export QUIET=TRUE; shift ;;
-                -v | --verbose ) export VERBOSE=TRUE; shift ;;
-                --build-dir ) BUILD_DIR="${2}"; shift 2 ;;
-                -- ) shift; break ;;
-                * ) break ;;
-            esac
-        done
-
-        package-obs-standalone
-    fi
-}
-
-package-obs-main $*

obs-studio-29.1.3.tar.xz/CI/macos Deleted

obs-studio-29.1.3.tar.xz/CI/macos/01_install_dependencies.sh Deleted

@@ -1,60 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# macOS dependency management function
-##############################################################################
-#
-# This script file can be included in build scripts for macOS or run directly.
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-install_dependencies() {
-    status "Install Homebrew dependencies"
-    trap "caught_error 'install_dependencies'" ERR
-
-    install_homebrew_deps
-
-}
-
-install-dependencies-standalone() {
-    CHECKOUT_DIR="$(/usr/bin/git rev-parse --show-toplevel)"
-    PRODUCT_NAME="OBS-Studio"
-    DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-    source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-    source "${CHECKOUT_DIR}/CI/include/build_support_macos.sh"
-
-    status "Setup of OBS build dependencies"
-    check_macos_version
-    check_archs
-    install_dependencies
-}
-
-print_usage() {
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "-a, --architecture             : Specify build architecture (default: x86_64, alternative: arm64)\n"
-}
-
-install-dependencies-main() {
-    if  -z "${_RUN_OBS_BUILD_SCRIPT}" ; then
-        while true; do
-            case "${1}" in
-                -h | --help ) print_usage; exit 0 ;;
-                -q | --quiet ) export QUIET=TRUE; shift ;;
-                -v | --verbose ) export VERBOSE=TRUE; shift ;;
-                -a | --architecture ) ARCH="${2}"; shift 2 ;;
-                -- ) shift; break ;;
-                * ) break ;;
-            esac
-        done
-
-        install-dependencies-standalone
-    fi
-}
-
-install-dependencies-main $*

obs-studio-29.1.3.tar.xz/CI/macos/02_build_obs.sh Deleted

@@ -1,199 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# macOS build function
-##############################################################################
-#
-# This script file can be included in build scripts for macOS or run directly
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-build_obs() {
-    status "Build OBS"
-    trap "caught_error 'build app'" ERR
-
-    if  -z "${CI}" ; then
-        _backup_artifacts
-    fi
-    step "Configure OBS..."
-    _configure_obs
-
-    ensure_dir "${CHECKOUT_DIR}/"
-    step "Build OBS targets..."
-
-    if  "${PRESET}" != "macos-ci-${ARCH}" ; then
-        export NSUnbufferedIO=YES
-
-        : "${PACKAGE:=}"
-        case "${GITHUB_EVENT_NAME}" in
-              push) if  ${GITHUB_REF_NAME} =~ 0-9+.0-9+.0-9+(-(rc|beta).+)? ; then PACKAGE=1; fi ;;
-              pull_request) PACKAGE=1 ;;
-          esac
-
-        pushd "build_${ARCH}" > /dev/null
-
-        if  "${PACKAGE}" && "${CODESIGN_IDENT:--}" != '-' ; then
-            set -o pipefail && xcodebuild -archivePath "obs-studio.xcarchive" -scheme obs-studio -destination "generic/platform=macOS,name=Any Mac'" archive 2>&1 | xcbeautify
-            set -o pipefail && xcodebuild -exportArchive -archivePath "obs-studio.xcarchive" -exportOptionsPlist "exportOptions.plist" -exportPath "." 2>&1 | xcbeautify
-        else
-            set -o pipefail && xcodebuild -scheme obs-studio -destination "generic/platform=macOS,name=Any Mac" -configuration RelWithDebInfo 2>&1 | xcbeautify
-
-            mkdir OBS.app
-            ditto UI/RelWithDebInfo/OBS.app OBS.app
-        fi
-
-        popd > /dev/null
-
-        unset NSUnbufferedIO
-    else
-        cmake --build --preset macos-${ARCH}
-    fi
-}
-
-bundle_obs() {
-    status "Create relocatable macOS application bundle"
-    trap "caught_error 'package app'" ERR
-
-    ensure_dir "${CHECKOUT_DIR}"
-
-    step "Install OBS application bundle..."
-
-    find "build_${ARCH}/UI/${BUILD_CONFIG}" -type d -name "OBS.app" | xargs -I{} cp -r {} "build_${ARCH}"/
-}
-
-# Function to configure OBS build
-_configure_obs() {
-    if  "${CODESIGN}" ; then
-        read_codesign_ident
-    fi
-
-    ensure_dir "${CHECKOUT_DIR}"
-    status "Configure OBS build system..."
-    trap "caught_error 'configure build'" ERR
-    check_ccache
-
-    if  "${TWITCH_CLIENTID}" -a "${TWITCH_HASH}" ; then
-        TWITCH_OPTIONS="-DTWITCH_CLIENTID='${TWITCH_CLIENTID}' -DTWITCH_HASH='${TWITCH_HASH}'"
-    fi
-
-    if  "${RESTREAM_CLIENTID}" -a "${RESTREAM_HASH}" ; then
-        RESTREAM_OPTIONS="-DRESTREAM_CLIENTID='${RESTREAM_CLIENTID}' -DRESTREAM_HASH='${RESTREAM_HASH}'"
-    fi
-
-    if  "${YOUTUBE_CLIENTID}" -a "${YOUTUBE_CLIENTID_HASH}" -a "${YOUTUBE_SECRET}" -a "{YOUTUBE_SECRET_HASH}" ; then
-        YOUTUBE_OPTIONS="-DYOUTUBE_CLIENTID='${YOUTUBE_CLIENTID}' -DYOUTUBE_CLIENTID_HASH='${YOUTUBE_CLIENTID_HASH}' -DYOUTUBE_SECRET='${YOUTUBE_SECRET}' -DYOUTUBE_SECRET_HASH='${YOUTUBE_SECRET_HASH}'"
-    fi
-
-    if  "${SPARKLE_APPCAST_URL}" -a "${SPARKLE_PUBLIC_KEY}" ; then
-        SPARKLE_OPTIONS="-DSPARKLE_APPCAST_URL=\"${SPARKLE_APPCAST_URL}\" -DSPARKLE_PUBLIC_KEY=\"${SPARKLE_PUBLIC_KEY}\""
-    fi
-
-    PRESET="macos-${ARCH}"
-
-    if  "${CI}" ; then
-        case "${GITHUB_EVENT_NAME}" in
-            schedule) PRESET="macos-${ARCH}" ;;
-            push)
-                if  "${GITHUB_REF_TYPE}" == 'tag' ; then
-                    PRESET="macos-release-${ARCH}"
-                else
-                    PRESET="macos-ci-${ARCH}"
-                fi
-                ;;
-            pull_request)
-                if  "${SEEKING_TESTERS}" == '1' ; then
-                    PRESET="macos-${ARCH}"
-                else
-                    PRESET="macos-ci-${ARCH}"
-                fi
-                ;;
-            *) PRESET="macos-ci-${ARCH}" ;;
-        esac
-    fi
-
-    cmake -S . --preset ${PRESET} \
-        -DCMAKE_INSTALL_PREFIX=${BUILD_DIR}/install \
-        -DCMAKE_BUILD_TYPE=${BUILD_CONFIG} \
-        -DOBS_CODESIGN_IDENTITY="${CODESIGN_IDENT:--}" \
-        ${YOUTUBE_OPTIONS} \
-        ${TWITCH_OPTIONS} \
-        ${RESTREAM_OPTIONS} \
-        ${SPARKLE_OPTIONS} \
-        ${QUIET:+-Wno-deprecated -Wno-dev --log-level=ERROR}
-}
-
-# Function to backup previous build artifacts
-_backup_artifacts() {
-    ensure_dir "${CHECKOUT_DIR}"
-    if  -d "${BUILD_DIR}" ; then
-        status "Backup old OBS build artifacts"
-
-        CUR_DATE=$(/bin/date +"%Y-%m-%d@%H%M%S")
-        NIGHTLY_DIR="${CHECKOUT_DIR}/nightly-${CUR_DATE}"
-        PACKAGE_NAME=$(/usr/bin/find "${BUILD_DIR}" -name "*.dmg" -depth 1 | sort -rn | head -1)
-
-        if  -d "${BUILD_DIR}/install/OBS.app" ; then
-            step "Back up OBS.app..."
-            ensure_dir "${NIGHTLY_DIR}"
-            /bin/mv "${CHECKOUT_DIR}/${BUILD_DIR}/install/OBS.app" "${NIGHTLY_DIR}/"
-            info "You can find OBS.app in ${NIGHTLY_DIR}"
-        fi
-
-        if  "${PACKAGE_NAME}" ; then
-            step "Back up $(basename "${PACKAGE_NAME}")..."
-            ensure_dir "${NIGHTLY_DIR}"
-            /bin/mv "../${BUILD_DIR}/$(basename "${PACKAGE_NAME}")" "${NIGHTLY_DIR}/"
-            info "You can find ${PACKAGE_NAME} in ${NIGHTLY_DIR}"
-        fi
-    fi
-}
-
-build-obs-standalone() {
-    CHECKOUT_DIR="$(/usr/bin/git rev-parse --show-toplevel)"
-    PRODUCT_NAME="OBS-Studio"
-    DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-    source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-    source "${CHECKOUT_DIR}/CI/include/build_support_macos.sh"
-
-    check_archs
-    check_macos_version
-    build_obs
-
-    if  "${BUNDLE}" ; then
-        bundle_obs
-    fi
-}
-
-print_usage() {
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "-a, --architecture             : Specify build architecture (default: x86_64, alternative: arm64)\n" \
-            "-c, --codesign                 : Codesign OBS and all libraries (default: ad-hoc only)\n" \
-            "-b, --bundle                   : Create relocatable OBS application bundle in build directory (default: build/install/OBS.app)\n"
-}
-
-build-obs-main() {
-    if  -z "${_RUN_OBS_BUILD_SCRIPT}" ; then
-        while true; do
-            case "${1}" in
-                -h | --help ) print_usage; exit 0 ;;
-                -q | --quiet ) export QUIET=TRUE; shift ;;
-                -v | --verbose ) export VERBOSE=TRUE; shift ;;
-                -a | --architecture ) ARCH="${2}"; shift 2 ;;
-                -c | --codesign ) CODESIGN=TRUE; shift ;;
-                -b | --bundle ) BUNDLE=TRUE; shift ;;
-                -- ) shift; break ;;
-                * ) break ;;
-            esac
-        done
-
-        build-obs-standalone
-    fi
-}
-
-build-obs-main $*

obs-studio-29.1.3.tar.xz/CI/macos/03_package_obs.sh Deleted

@@ -1,182 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# macOS libobs plugin package function
-##############################################################################
-#
-# This script file can be included in build scripts for macOS or run directly
-#
-##############################################################################
-
-# Halt on errors
-set -eE
-
-package_obs() {
-    if  "${CODESIGN}" ; then
-        read_codesign_ident
-    fi
-
-    status "Create macOS disk image"
-    trap "caught_error 'package app'" ERR
-
-    ensure_dir "${CHECKOUT_DIR}"
-
-    step "Package OBS..."
-    BUILD_DIR="build_${ARCH}"
-
-    root_dir="$(pwd)"
-
-    pushd "${BUILD_DIR}" > /dev/null > /dev/null
-
-    mkdir -p "${FILE_NAME//.dmg/}/.background"
-    cp "${root_dir}/cmake/macos/resources/background.tiff" "${FILE_NAME//.dmg/}/.background/"
-    cp "${root_dir}/cmake/macos/resources/AppIcon.icns" "${FILE_NAME//.dmg/}/.VolumeIcon.icns"
-    ln -s /Applications "${FILE_NAME//.dmg/}/Applications"
-
-    mkdir -p "${FILE_NAME//.dmg/}/OBS.app"
-    ditto OBS.app "${FILE_NAME//.dmg/}/OBS.app"
-
-    hdiutil create -volname "${FILE_NAME//.dmg/}" -srcfolder "${FILE_NAME//.dmg/}" -ov -fs APFS -format UDRW temp.dmg
-    hdiutil attach -noverify -readwrite temp.dmg
-    osascript package.applescript "${FILE_NAME//.dmg/}"
-    hdiutil detach "/Volumes/${FILE_NAME//.dmg/}"
-    hdiutil convert -format ULMO -o "${FILE_NAME}" temp.dmg
-
-    rm temp.dmg
-
-    step "Codesign OBS disk image..."
-    /usr/bin/codesign --force --sign "${CODESIGN_IDENT:--}" "${FILE_NAME}"
-
-    rm -rf "${FILE_NAME//.dmg/}"
-    popd > /dev/null
-}
-
-notarize_obs() {
-    status "Notarize OBS"
-    trap "caught_error 'notarizing app'" ERR
-
-    if ! exists brew; then
-        error "ERROR Homebrew not found - please install homebrew (https://brew.sh)"
-        exit 1
-    fi
-
-    ensure_dir "${CHECKOUT_DIR}"
-
-    if  "${NOTARIZE_IMAGE}" ; then
-        trap "_caught_error_hdiutil_verify '${NOTARIZE_IMAGE}'" ERR
-
-        step "Verify OBS disk image ${NOTARIZE_IMAGE}..."
-        hdiutil verify "${NOTARIZE_IMAGE}"
-
-        NOTARIZE_TARGET="${NOTARIZE_IMAGE}"
-    elif  "${NOTARIZE_BUNDLE}" ; then
-        NOTARIZE_TARGET="${NOTARIZE_BUNDLE}"
-    else
-        OBS_IMAGE="${BUILD_DIR}/${FILE_NAME}"
-
-        if  -f "${OBS_IMAGE}" ; then
-            NOTARIZE_TARGET="${OBS_IMAGE}"
-        else
-            error "No notarization application bundle ('OBS.app') or disk image ('${NOTARIZE_IMAGE:-${FILE_NAME}}') found"
-            return
-        fi
-    fi
-
-    if  "$?" -eq 0 ; then
-        read_codesign_ident
-        read_codesign_pass
-
-        step "Notarize ${NOTARIZE_TARGET}..."
-        /usr/bin/xcrun notarytool submit "${NOTARIZE_TARGET}" --keychain-profile "OBS-Codesign-Password" --wait
-
-        step "Staple the ticket to ${NOTARIZE_TARGET}..."
-        /usr/bin/xcrun stapler staple "${NOTARIZE_TARGET}"
-    fi
-}
-
-_caught_error_hdiutil_verify() {
-    error "ERROR during verifying image '${1}'"
-
-    cleanup
-    exit 1
-}
-
-package-obs-standalone() {
-    PRODUCT_NAME="OBS-Studio"
-
-    CHECKOUT_DIR="$(/usr/bin/git rev-parse --show-toplevel)"
-    DEPS_BUILD_DIR="${CHECKOUT_DIR}/../obs-build-dependencies"
-    source "${CHECKOUT_DIR}/CI/include/build_support.sh"
-    source "${CHECKOUT_DIR}/CI/include/build_support_macos.sh"
-
-    check_archs
-    check_macos_version
-
-    if  -z "${CI}" ; then
-        step "Fetch OBS tags..."
-        /usr/bin/git fetch --tags origin
-    fi
-
-    GIT_BRANCH=$(/usr/bin/git rev-parse --abbrev-ref HEAD)
-    GIT_HASH=$(/usr/bin/git rev-parse --short=9 HEAD)
-    GIT_TAG=$(/usr/bin/git describe --tags --abbrev=0)
-
-    if  "${BUILD_FOR_DISTRIBUTION}" ; then
-        VERSION_STRING="${GIT_TAG}"
-    else
-        VERSION_STRING="${GIT_TAG}-${GIT_HASH}"
-    fi
-
-    if  -z "${NOTARIZE_IMAGE}" -a -z "${NOTARIZE_BUNDLE}" ; then
-        if  "${ARCH}" = "arm64" ; then
-            FILE_NAME="obs-studio-${VERSION_STRING}-macos-arm64.dmg"
-        elif  "${ARCH}" = "universal" ; then
-            FILE_NAME="obs-studio-${VERSION_STRING}-macos.dmg"
-        else
-            FILE_NAME="obs-studio-${VERSION_STRING}-macos-x86_64.dmg"
-        fi
-
-        package_obs
-    fi
-
-    if  "${NOTARIZE}" ; then
-        notarize_obs
-    fi
-}
-
-print_usage() {
-    echo -e "Usage: ${0}\n" \
-            "-h, --help                     : Print this help\n" \
-            "-q, --quiet                    : Suppress most build process output\n" \
-            "-v, --verbose                  : Enable more verbose build process output\n" \
-            "-a, --architecture             : Specify build architecture (default: x86_64, alternative: arm64)\n" \
-            "-c, --codesign                 : Codesign OBS and all libraries (default: ad-hoc only)\n" \
-            "-n, --notarize                 : Notarize OBS (default: off)\n" \
-            "--notarize-image IMAGE       : Specify existing OBS disk image for notarization\n" \
-            "--notarize-bundle BUNDLE     : Specify existing OBS application bundle for notarization\n" \
-            "--build-dir                    : Specify alternative build directory (default: build)\n"
-}
-
-package-obs-main() {
-    if  -z "${_RUN_OBS_BUILD_SCRIPT}" ; then
-        while true; do
-            case "${1}" in
-                -h | --help ) print_usage; exit 0 ;;
-                -q | --quiet ) export QUIET=TRUE; shift ;;
-                -v | --verbose ) export VERBOSE=TRUE; shift ;;
-                -a | --architecture ) ARCH="${2}"; shift 2 ;;
-                -c | --codesign ) CODESIGN=TRUE; shift ;;
-                -n | --notarize ) NOTARIZE=TRUE; CODESIGN=TRUE; shift ;;
-                --build-dir ) BUILD_DIR="${2}"; shift 2 ;;
-                --notarize-image ) NOTARIZE_IMAGE="${2}"; NOTARIZE=TRUE; CODESIGN=TRUE; shift 2 ;;
-                --notarize-bundle ) NOTARIZE_BUNDLE="${2}"; NOTARIZE=TRUE; CODESIGN=TRUE; shift 2 ;;
-                -- ) shift; break ;;
-                * ) break ;;
-            esac
-        done
-
-        package-obs-standalone
-    fi
-}
-
-package-obs-main $*

obs-studio-29.1.3.tar.xz/CI/macos/appcast_convert.py Deleted

@@ -1,96 +0,0 @@
-import os
-from copy import deepcopy
-
-import xmltodict
-
-
-DELTA_BASE_URL = "https://cdn-fastly.obsproject.com/downloads/sparkle_deltas"
-
-
-def convert_appcast(filename):
-    print("Converting", filename)
-    in_path = os.path.join("output/appcasts", filename)
-    out_path = os.path.join("output/appcasts/stable", filename.replace("_v2", ""))
-    with open(in_path, "rb") as f:
-        xml_data = f.read()
-    if not xml_data:
-        return
-
-    appcast = xmltodict.parse(xml_data, force_list=("item",))
-    out_appcast = deepcopy(appcast)
-
-    # Remove anything but stable channel items.
-    new_list = 
-    for _item in appcast"rss""channel""item":
-        item = deepcopy(_item)
-        branch = item.pop("sparkle:channel", "stable")
-        if branch != "stable":
-            continue
-        # Remove delta information (incompatible with Sparkle 1.x)
-        item.pop("sparkle:deltas", None)
-        new_list.append(item)
-
-    out_appcast"rss""channel""item" = new_list
-
-    with open(out_path, "wb") as f:
-        xmltodict.unparse(out_appcast, output=f, pretty=True)
-
-    # Also create legacy appcast from x86 version.
-    if "x86" in filename:
-        out_path = os.path.join("output/appcasts/stable", "updates.xml")
-        with open(out_path, "wb") as f:
-            xmltodict.unparse(out_appcast, output=f, pretty=True)
-
-
-def adjust_appcast(filename):
-    print("Adjusting", filename)
-    file_path = os.path.join("output/appcasts", filename)
-    with open(file_path, "rb") as f:
-        xml_data = f.read()
-    if not xml_data:
-        return
-
-    arch = "arm64" if "arm64" in filename else "x86_64"
-    appcast = xmltodict.parse(xml_data, force_list=("item", "enclosure"))
-
-    out_appcast = deepcopy(appcast)
-    out_appcast"rss""channel""title" = "OBS Studio"
-    out_appcast"rss""channel""link" = "https://obsproject.com/"
-
-    new_list = 
-    for _item in appcast"rss""channel""item":
-        item = deepcopy(_item)
-        # Fix changelog URL
-        # Sparkle doesn't allow us to specify the URL for a specific update,
-        # so we set the full release notes link instead and then rewrite the
-        # appcast. Yay.
-        if release_notes_link := item.pop("sparkle:fullReleaseNotesLink", None):
-            item"sparkle:releaseNotesLink" = release_notes_link
-
-        # If deltas exist, update their URLs to match server layout
-        # (generate_appcast doesn't allow this).
-        if deltas := item.get("sparkle:deltas", None):
-            for delta_item in deltas"enclosure":
-                delta_filename = delta_item"@url".rpartition("/")2
-                delta_item"@url" = f"{DELTA_BASE_URL}/{arch}/{delta_filename}"
-
-        new_list.append(item)
-
-    out_appcast"rss""channel""item" = new_list
-
-    with open(file_path, "wb") as f:
-        xmltodict.unparse(out_appcast, output=f, pretty=True)
-
-
-if __name__ == "__main__":
-    for ac_file in os.listdir("output/appcasts"):
-        if ".xml" not in ac_file:
-            continue
-        if "v2" not in ac_file:
-            # generate_appcast may download legacy appcast files and update them as well.
-            # Those generated files are not backwards-compatible, so delete whatever v1
-            # files it may have created and recreate them manually.
-            os.remove(os.path.join("output/appcasts", ac_file))
-            continue
-        adjust_appcast(ac_file)
-        convert_appcast(ac_file)

obs-studio-29.1.3.tar.xz/CI/macos/appcast_download.py Deleted

@@ -1,125 +0,0 @@
-import os
-import sys
-import plistlib
-import glob
-import subprocess
-import argparse
-
-import requests
-import xmltodict
-
-
-def download_build(url):
-    print(f'Downloading build "{url}"...')
-    filename = url.rpartition("/")2
-    r = requests.get(url)
-    if r.status_code == 200:
-        with open(f"artifacts/{filename}", "wb") as f:
-            f.write(r.content)
-    else:
-        print(f"Build download failed, status code: {r.status_code}")
-        sys.exit(1)
-
-
-def read_appcast(url):
-    print(f"Downloading feed {url} ...")
-    r = requests.get(url)
-    if r.status_code != 200:
-        print(f"Appcast download failed, status code: {r.status_code}")
-        sys.exit(1)
-
-    filename = url.rpartition("/")2
-    with open(f"builds/{filename}", "wb") as f:
-        f.write(r.content)
-
-    appcast = xmltodict.parse(r.content, force_list=("item",))
-
-    dl = 0
-    for item in appcast"rss""channel""item":
-        channel = item.get("sparkle:channel", "stable")
-        if channel != target_branch:
-            continue
-
-        if dl == max_old_vers:
-            break
-        download_build(item"enclosure""@url")
-        dl += 1
-
-
-def get_appcast_url(artifact_dir):
-    dmgs = glob.glob(artifact_dir + "/*.dmg")
-    if not dmgs:
-        raise ValueError("No artifacts!")
-    elif len(dmgs) > 1:
-        raise ValueError("Too many artifacts!")
-
-    dmg = dmgs0
-    print(f"Mounting {dmg} ...")
-    out = subprocess.check_output(
-        
-            "hdiutil",
-            "attach",
-            "-readonly",
-            "-noverify",
-            "-noautoopen",
-            "-plist",
-            dmg,
-        
-    )
-    d = plistlib.loads(out)
-
-    mountpoint = ""
-    for item in d"system-entities":
-        if "mount-point" not in item:
-            continue
-        mountpoint = item"mount-point"
-        break
-
-    url = None
-    plist_files = glob.glob(mountpoint + "/*.app/Contents/Info.plist")
-    if plist_files:
-        plist_file = plist_files0
-        print(f"Reading plist {plist_file} ...")
-        plist = plistlib.load(open(plist_file, "rb"))
-        url = plist.get("SUFeedURL", None)
-    else:
-        print("No Plist file found!")
-
-    print(f"Unmounting {mountpoint}")
-    subprocess.check_call("hdiutil", "detach", mountpoint)
-    return url
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--artifacts-dir",
-        dest="artifacts",
-        action="store",
-        default="artifacts",
-        help="Folder containing artifact",
-    )
-    parser.add_argument(
-        "--branch",
-        dest="branch",
-        action="store",
-        default="stable",
-        help="Channel/Branch",
-    )
-    parser.add_argument(
-        "--max-old-versions",
-        dest="max_old_ver",
-        action="store",
-        type=int,
-        default=1,
-        help="Maximum old versions to download",
-    )
-    args = parser.parse_args()
-
-    target_branch = args.branch
-    max_old_vers = args.max_old_ver
-    url = get_appcast_url(args.artifacts)
-    if not url:
-        raise ValueError("Failed to get Sparkle URL from DMG!")
-
-    read_appcast(url)

obs-studio-29.1.3.tar.xz/CI/steam Deleted

obs-studio-29.1.3.tar.xz/CI/steam/scripts_macos Deleted

obs-studio-29.1.3.tar.xz/CI/steam/scripts_macos/launch.sh Deleted

obs-studio-29.1.3.tar.xz/CI/steam/scripts_windows Deleted

obs-studio-29.1.3.tar.xz/CI/steam/scripts_windows/uninstall.bat Deleted

obs-studio-29.1.3.tar.xz/CI/windows Deleted

obs-studio-29.1.3.tar.xz/CI/windows/01_install_dependencies.ps1 Deleted

@@ -1,169 +0,0 @@
-Param(
-    Switch$Help = $(if (Test-Path variable:Help) { $Help }),
-    Switch$Quiet = $(if (Test-Path variable:Quiet) { $Quiet }),
-    Switch$Verbose = $(if (Test-Path variable:Verbose) { $Verbose }),
-    ValidateSet('x86', 'x64')
-    String$BuildArch = $(if (Test-Path variable:BuildArch) { "${BuildArch}" } else { ('x86', 'x64')System.Environment::Is64BitOperatingSystem })
-)
-
-##############################################################################
-# Windows dependency management function
-##############################################################################
-#
-# This script file can be included in build scripts for Windows or run
-# directly
-#
-##############################################################################
-
-$ErrorActionPreference = "Stop"
-
-Function Install-obs-deps {
-    Param(
-        Parameter(Mandatory=$true)
-        String$Version
-    )
-
-    Write-Status "Setup for pre-built Windows OBS dependencies v${Version}"
-    Ensure-Directory $DepsBuildDir
-
-    $ArchSuffix = $BuildArch
-
-    if (!(Test-Path "${DepsBuildDir}/windows-deps-${Version}-${ArchSuffix}")) {
-
-        Write-Step "Download..."
-        curl.exe -Lf "https://github.com/obsproject/obs-deps/releases/download/${Version}/windows-deps-${Version}-${ArchSuffix}.zip" -o "windows-deps-${Version}-${ArchSuffix}.zip" $(if ($Quiet.isPresent) { "-s" })
-
-        Write-Step "Unpack..."
-
-        Expand-Archive -Path "windows-deps-${Version}-${ArchSuffix}.zip" -DestinationPath "${DepsBuildDir}/windows-deps-${Version}-${ArchSuffix}" -Force
-    } else {
-        Write-Step "Found existing pre-built dependencies..."
-    }
-}
-
-function Install-qt-deps {
-    Param(
-        Parameter(Mandatory=$true)
-        String$Version
-    )
-
-    Write-Status "Setup for pre-built dependency Qt v${Version}"
-    Ensure-Directory $DepsBuildDir
-
-    $ArchSuffix = $BuildArch
-
-    if (!(Test-Path "${DepsBuildDir}/windows-deps-${Version}-${ArchSuffix}/mkspecs")) {
-
-        Write-Step "Download..."
-        curl.exe -Lf "https://github.com/obsproject/obs-deps/releases/download/${Version}/windows-deps-qt6-${Version}-${ArchSuffix}.zip" -o "windows-deps-qt6-${Version}-${ArchSuffix}.zip" $(if ($Quiet.isPresent) { "-s" })
-
-        Write-Step "Unpack..."
-
-        Expand-Archive -Path "windows-deps-qt6-${Version}-${ArchSuffix}.zip" -DestinationPath "${DepsBuildDir}/windows-deps-${Version}-${ArchSuffix}" -Force
-    } else {
-        Write-Step "Found existing pre-built Qt..."
-    }
-}
-
-function Install-vlc {
-    Param(
-        Parameter(Mandatory=$true)
-        String$Version
-    )
-
-    Write-Status "Setup for dependency VLC v${Version}"
-    Ensure-Directory $DepsBuildDir
-
-    if (!((Test-Path "$DepsBuildDir/vlc-${Version}") -and (Test-Path "$DepsBuildDir/vlc-${Version}/include/vlc/vlc.h"))) {
-        Write-Step "Download..."
-        curl.exe -Lf "https://cdn-fastly.obsproject.com/downloads/vlc.zip" -o "vlc_${Version}.zip" $(if ($Quiet.isPresent) { "-s" })
-
-        Write-Step "Unpack..."
-        # Expand-Archive -Path "vlc_${Version}.zip"
-        Invoke-Expression "7z x vlc_${Version}.zip -ovlc"
-        Move-Item -Path vlc -Destination "vlc-${Version}"
-    } else {
-        Write-Step "Found existing VLC..."
-    }
-}
-
-function Install-cef {
-    Param(
-        Parameter(Mandatory=$true)
-        String$Version
-    )
-    Write-Status "Setup for dependency CEF v${Version} - ${BuildArch}"
-
-    Ensure-Directory $DepsBuildDir
-    $ArchSuffix = $BuildArch
-
-    if (!((Test-Path "${DepsBuildDir}/cef_binary_${Version}_windows_${ArchSuffix}") -and (Test-Path "${DepsBuildDir}/cef_binary_${Version}_windows_${ArchSuffix}/build/libcef_dll_wrapper/Release/libcef_dll_wrapper.lib"))) {
-        Write-Step "Download..."
-        curl.exe -Lf "https://cdn-fastly.obsproject.com/downloads/cef_binary_${Version}_windows_${ArchSuffix}.zip" -o "cef_binary_${Version}_windows_${ArchSuffix}.zip" $(if ($Quiet.isPresent) { "-s" })
-
-        Write-Step "Unpack..."
-        Expand-Archive -Path "cef_binary_${Version}_windows_${ArchSuffix}.zip" -Force
-    } else {
-        Write-Step "Found existing CEF framework and loader library..."
-    }
-}
-
-function Install-Dependencies {
-    Param(
-        String$BuildArch = $(if (Test-Path variable:BuildArch) { "${BuildArch}" })
-    )
-
-    Install-Windows-Dependencies
-
-    $BuildDependencies = @(
-        @('obs-deps', $WindowsDepsVersion),
-        @('qt-deps', $WindowsDepsVersion),
-        @('vlc', $WindowsVlcVersion),
-        @('cef', $WindowsCefVersion)
-    )
-
-    Foreach($Dependency in ${BuildDependencies}) {
-        $DependencyName = $Dependency0
-        $DependencyVersion = $Dependency1
-
-        $FunctionName = "Install-${DependencyName}"
-        Invoke-Expression "${FunctionName} -Version ${DependencyVersion}"
-    }
-
-    Ensure-Directory ${CheckoutDir}
-}
-
-function Install-Dependencies-Standalone {
-    $ProductName = "OBS-Studio"
-    $CheckoutDir = Resolve-Path -Path "$PSScriptRoot\..\.."
-    $DepsBuildDir = "${CheckoutDir}/../obs-build-dependencies"
-    $ObsBuildDir = "${CheckoutDir}/../obs-studio"
-
-    . ${CheckoutDir}/CI/include/build_support_windows.ps1
-
-    Write-Status "Setup of OBS build dependencies"
-    Install-Dependencies
-}
-
-function Print-Usage {
-    $Lines = @(
-        "Usage: ${_ScriptName}",
-        "-Help                    : Print this help",
-        "-Quiet                   : Suppress most build process output",
-        "-Verbose                 : Enable more verbose build process output",
-        "-Choco                   : Enable automatic dependency installation via Chocolatey - Default: off"
-        "-BuildArch               : Build architecture to use (x86 or x64) - Default: local architecture"
-    )
-
-    $Lines | Write-Host
-}
-
-if(!(Test-Path variable:_RunObsBuildScript)) {
-    $_ScriptName = "$($MyInvocation.MyCommand.Name)"
-    if($Help.isPresent) {
-        Print-Usage
-        exit 0
-    }
-
-    Install-Dependencies-Standalone
-}

obs-studio-29.1.3.tar.xz/CI/windows/02_build_obs.ps1 Deleted

@@ -1,161 +0,0 @@
-Param(
-    Switch$Help = $(if (Test-Path variable:Help) { $Help }),
-    Switch$Quiet = $(if (Test-Path variable:Quiet) { $Quiet }),
-    Switch$Verbose = $(if (Test-Path variable:Verbose) { $Verbose }),
-    String$BuildDirectory = $(if (Test-Path variable:BuildDirectory) { "${BuildDirectory}" } else { "build" }),
-    ValidateSet('x86', 'x64')
-    String$BuildArch = $(if (Test-Path variable:BuildArch) { "${BuildArch}" } else { ('x86', 'x64')System.Environment::Is64BitOperatingSystem }),
-    ValidateSet("Release", "RelWithDebInfo", "MinSizeRel", "Debug")
-    String$BuildConfiguration = $(if (Test-Path variable:BuildConfiguration) { "${BuildConfiguration}" } else { "RelWithDebInfo" })
-)
-
-##############################################################################
-# Windows libobs library build function
-##############################################################################
-#
-# This script file can be included in build scripts for Windows or run
-# directly
-#
-##############################################################################
-
-$ErrorActionPreference = "Stop"
-
-function Build-OBS {
-    Param(
-        String$BuildDirectory = $(if (Test-Path variable:BuildDirectory) { "${BuildDirectory}" }),
-        String$BuildArch = $(if (Test-Path variable:BuildArch) { "${BuildArch}" }),
-        String$BuildConfiguration = $(if (Test-Path variable:BuildConfiguration) { "${BuildConfiguration}" })
-    )
-
-    $NumProcessors = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
-
-    if ( $NumProcessors -gt 1 ) {
-        $env:UseMultiToolTask = $true
-        $env:EnforceProcessCountAcrossBuilds = $true
-    }
-
-    Write-Status "Build OBS"
-
-    Configure-OBS
-
-    Ensure-Directory ${CheckoutDir}
-    Write-Step "Build OBS targets..."
-
-    $BuildDirectoryActual = "${BuildDirectory}$(if (${BuildArch} -eq "x64") { "64" } else { "32" })"
-
-    Invoke-External cmake --build "${BuildDirectoryActual}" --config ${BuildConfiguration}
-}
-
-function Configure-OBS {
-    Ensure-Directory ${CheckoutDir}
-    Write-Status "Configuration of OBS build system..."
-
-    $NumProcessors = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
-
-    if ( $NumProcessors -gt 1 ) {
-        $env:UseMultiToolTask = $true
-        $env:EnforceProcessCountAcrossBuilds = $true
-    }
-
-    # TODO: Clean up archive and directory naming across dependencies
-    $CmakePrefixPath = Resolve-Path -Path "${CheckoutDir}/../obs-build-dependencies/windows-deps-${WindowsDepsVersion}-${BuildArch}"
-    $CefDirectory = Resolve-Path -Path "${CheckoutDir}/../obs-build-dependencies/cef_binary_${WindowsCefVersion}_windows_${BuildArch}"
-    $BuildDirectoryActual = "${BuildDirectory}$(if (${BuildArch} -eq "x64") { "64" } else { "32" })"
-    $GeneratorPlatform = "$(if (${BuildArch} -eq "x64") { "x64" } else { "Win32" })"
-
-    if ( $PSVersionTable.PSVersion -ge '7.3.0' ) {
-        $CmakeCommand = @(
-            "-G", ${CmakeGenerator}
-            "-DCMAKE_GENERATOR_PLATFORM=${GeneratorPlatform}",
-            "-DCMAKE_SYSTEM_VERSION=${CmakeSystemVersion}",
-            "-DCMAKE_PREFIX_PATH:PATH=${CmakePrefixPath}",
-            "-DCEF_ROOT_DIR:PATH=${CefDirectory}",
-            "-DENABLE_BROWSER=ON",
-            "-DVLC_PATH:PATH=${CheckoutDir}/../obs-build-dependencies/vlc-${WindowsVlcVersion}",
-            "-DENABLE_VLC=ON",
-            "-DCMAKE_INSTALL_PREFIX=${BuildDirectoryActual}/install",
-            "-DVIRTUALCAM_GUID=${Env:VIRTUALCAM-GUID}",
-            "-DTWITCH_CLIENTID=${Env:TWITCH_CLIENTID}",
-            "-DTWITCH_HASH=${Env:TWITCH_HASH}",
-            "-DRESTREAM_CLIENTID=${Env:RESTREAM_CLIENTID}",
-            "-DRESTREAM_HASH=${Env:RESTREAM_HASH}",
-            "-DYOUTUBE_CLIENTID=${Env:YOUTUBE_CLIENTID}",
-            "-DYOUTUBE_CLIENTID_HASH=${Env:YOUTUBE_CLIENTID_HASH}",
-            "-DYOUTUBE_SECRET=${Env:YOUTUBE_SECRET}",
-            "-DYOUTUBE_SECRET_HASH=${Env:YOUTUBE_SECRET_HASH}",
-            "-DGPU_PRIORITY_VAL=${Env:GPU_PRIORITY_VAL}",
-            "-DCOPIED_DEPENDENCIES=OFF",
-            "-DCOPY_DEPENDENCIES=ON",
-            "-DBUILD_FOR_DISTRIBUTION=$(if (Test-Path Env:BUILD_FOR_DISTRIBUTION) { "ON" } else { "OFF" })",
-            "$(if (Test-Path Env:CI) { "-DOBS_BUILD_NUMBER=${Env:GITHUB_RUN_ID}" })",
-            "$(if (Test-Path Variable:$Quiet) { "-Wno-deprecated -Wno-dev --log-level=ERROR" })"
-        )
-    } else {
-        $CmakeCommand = @(
-            "-G", ${CmakeGenerator}
-            "-DCMAKE_GENERATOR_PLATFORM=`"${GeneratorPlatform}`"",
-            "-DCMAKE_SYSTEM_VERSION=`"${CmakeSystemVersion}`"",
-            "-DCMAKE_PREFIX_PATH:PATH=`"${CmakePrefixPath}`"",
-            "-DCEF_ROOT_DIR:PATH=`"${CefDirectory}`"",
-            "-DENABLE_BROWSER=ON",
-            "-DVLC_PATH:PATH=`"${CheckoutDir}/../obs-build-dependencies/vlc-${WindowsVlcVersion}`"",
-            "-DENABLE_VLC=ON",
-            "-DCMAKE_INSTALL_PREFIX=`"${BuildDirectoryActual}/install`"",
-            "-DVIRTUALCAM_GUID=`"${Env:VIRTUALCAM-GUID}`"",
-            "-DTWITCH_CLIENTID=`"${Env:TWITCH_CLIENTID}`"",
-            "-DTWITCH_HASH=`"${Env:TWITCH_HASH}`"",
-            "-DRESTREAM_CLIENTID=`"${Env:RESTREAM_CLIENTID}`"",
-            "-DRESTREAM_HASH=`"${Env:RESTREAM_HASH}`"",
-            "-DYOUTUBE_CLIENTID=`"${Env:YOUTUBE_CLIENTID}`"",
-            "-DYOUTUBE_CLIENTID_HASH=`"${Env:YOUTUBE_CLIENTID_HASH}`"",
-            "-DYOUTUBE_SECRET=`"${Env:YOUTUBE_SECRET}`"",
-            "-DYOUTUBE_SECRET_HASH=`"${Env:YOUTUBE_SECRET_HASH}`"",
-            "-DGPU_PRIORITY_VAL=`"${Env:GPU_PRIORITY_VAL}`"",
-            "-DCOPIED_DEPENDENCIES=OFF",
-            "-DCOPY_DEPENDENCIES=ON",
-            "-DBUILD_FOR_DISTRIBUTION=`"$(if (Test-Path Env:BUILD_FOR_DISTRIBUTION) { "ON" } else { "OFF" })`"",
-            "$(if (Test-Path Env:CI) { "-DOBS_BUILD_NUMBER=${Env:GITHUB_RUN_ID}" })",
-            "$(if (Test-Path Variable:$Quiet) { "-Wno-deprecated -Wno-dev --log-level=ERROR" })"
-        )
-    }
-
-    Invoke-External cmake -S . -B  "${BuildDirectoryActual}" @CmakeCommand
-
-    Ensure-Directory ${CheckoutDir}
-}
-
-function Build-OBS-Standalone {
-    $ProductName = "OBS-Studio"
-
-    $CheckoutDir = Resolve-Path -Path "$PSScriptRoot\..\.."
-    $DepsBuildDir = "${CheckoutDir}/../obs-build-dependencies"
-    $ObsBuildDir = "${CheckoutDir}/../obs-studio"
-
-    . ${CheckoutDir}/CI/include/build_support_windows.ps1
-
-    Build-OBS
-}
-
-function Print-Usage {
-    $Lines = @(
-        "Usage: ${_ScriptName}",
-        "-Help                    : Print this help",
-        "-Quiet                   : Suppress most build process output",
-        "-Verbose                 : Enable more verbose build process output",
-        "-BuildDirectory          : Directory to use for builds - Default: build64 on 64-bit systems, build32 on 32-bit systems",
-        "-BuildArch               : Build architecture to use (x86 or x64) - Default: local architecture",
-        "-BuildConfiguration      : Build configuration to use - Default: RelWithDebInfo"
-    )
-
-    $Lines | Write-Host
-}
-
-if(!(Test-Path variable:_RunObsBuildScript)) {
-    $_ScriptName = "$($MyInvocation.MyCommand.Name)"
-    if($Help.isPresent) {
-        Print-Usage
-        exit 0
-    }
-
-    Build-OBS-Standalone
-}

obs-studio-29.1.3.tar.xz/CI/windows/03_package_obs.ps1 Deleted

@@ -1,157 +0,0 @@
-Param(
-    Switch$Help = $(if (Test-Path variable:Help) { $Help }),
-    Switch$Quiet = $(if (Test-Path variable:Quiet) { $Quiet }),
-    Switch$Verbose = $(if (Test-Path variable:Verbose) { $Verbose }),
-    Switch$BuildInstaller = $(if ($BuildInstaller.isPresent) { $BuildInstaller }),
-    Switch$CombinedArchs = $(if ($CombinedArchs.isPresent) { $CombinedArchs }),
-    String$BuildDirectory = $(if (Test-Path variable:BuildDirectory) { "${BuildDirectory}" } else { "build" }),
-    ValidateSet('x86', 'x64')
-    String$BuildArch = $(if (Test-Path variable:BuildArch) { "${BuildArch}" } else { ('x86', 'x64')System.Environment::Is64BitOperatingSystem }),
-    ValidateSet("Release", "RelWithDebInfo", "MinSizeRel", "Debug")
-    String$BuildConfiguration = $(if (Test-Path variable:BuildConfiguration) { "${BuildConfiguration}" } else { "RelWithDebInfo" })
-)
-
-##############################################################################
-# Windows OBS package function
-##############################################################################
-#
-# This script file can be included in build scripts for Windows or run
-# directly
-#
-##############################################################################
-
-$ErrorActionPreference = "Stop"
-
-function Package-OBS {
-    Param(
-        String$BuildDirectory = $(if (Test-Path variable:BuildDirectory) { "${BuildDirectory}" }),
-        String$BuildArch = $(if (Test-Path variable:BuildArch) { "${BuildArch}" }),
-        String$BuildConfiguration = $(if (Test-Path variable:BuildConfiguration) { "${BuildConfiguration}" })
-    )
-
-    Write-Status "Package plugin ${ProductName}"
-    Ensure-Directory ${CheckoutDir}
-
-    if ($CombinedArchs.isPresent) {
-        if (!(Test-Path env:obsInstallerTempDir)) {
-            $Env:obsInstallerTempDir = "${CheckoutDir}/install_temp"
-        }
-
-        if (!(Test-Path ${CheckoutDir}/install_temp/bin/64bit)) {
-            Write-Step "Build 64-bit OBS..."
-            Invoke-Expression "cmake -S . -B `"${BuildDirectory}64`" -DCOPIED_DEPENDENCIES=OFF -DCOPY_DEPENDENCIES=ON"
-            Invoke-Expression "cmake --build `"${BuildDirectory}64`" --config `"${BuildConfiguration}`""
-        }
-
-        if (!(Test-Path ${CheckoutDir}/install_temp/bin/32bit)) {
-            Write-Step "Build 32-bit OBS..."
-            Invoke-Expression "cmake -S . -B `"${BuildDirectory}32`" -DCOPIED_DEPENDENCIES=OFF -DCOPY_DEPENDENCIES=ON"
-            Invoke-Expression "cmake --build `"${BuildDirectory}32`" --config `"${BuildConfiguration}`""
-        }
-
-        Write-Step "Prepare Installer run..."
-        Invoke-Expression "cmake -S . -B build -DINSTALLER_RUN=ON -DCMAKE_INSTALL_PREFIX=`"${CheckoutDir}/build/install`""
-        Write-Step "Execute Installer run..."
-        Invoke-Expression "cmake --build build --config `"${BuildConfiguration}`" -t install"
-
-        $CompressVars = @{
-            Path = "${CheckoutDir}/build/install/*"
-            CompressionLevel = "Optimal"
-            DestinationPath = "${FileName}-x86+x64.zip"
-        }
-
-        Write-Step "Creating zip archive..."
-
-        $ProgressPreference = $(if ($Quiet.isPresent) { 'SilentlyContinue' } else { 'Continue' })
-        Compress-Archive -Force @CompressVars
-        $ProgressPreference = 'Continue'
-
-    } elseif ($BuildArch -eq "x64") {
-        Write-Step "Install 64-bit OBS..."
-        Invoke-Expression "cmake --build `"${BuildDirectory}64`" --config ${BuildConfiguration} -t install"
-
-        $CompressVars = @{
-            Path = "${CheckoutDir}/build64/install/bin", "${CheckoutDir}/build64/install/data", "${CheckoutDir}/build64/install/obs-plugins"
-            CompressionLevel = "Optimal"
-            DestinationPath = "${FileName}-x64.zip"
-        }
-
-        Write-Step "Creating zip archive..."
-
-        $ProgressPreference = $(if ($Quiet.isPresent) { 'SilentlyContinue' } else { 'Continue' })
-        Compress-Archive -Force @CompressVars
-        $ProgressPreference = 'Continue'
-
-    } elseif ($BuildArch -eq "x86") {
-        Write-Step "Install 32-bit OBS..."
-        Invoke-Expression "cmake --build `"${BuildDirectory}32`" --config ${BuildConfiguration} -t install"
-
-        $CompressVars = @{
-            Path = "${CheckoutDir}/build32/install/bin", "${CheckoutDir}/build32/install/data", "${CheckoutDir}/build32/install/obs-plugins"
-            CompressionLevel = "Optimal"
-            DestinationPath = "${FileName}-x86.zip"
-        }
-
-        Write-Step "Creating zip archive..."
-
-        $ProgressPreference = $(if ($Quiet.isPresent) { 'SilentlyContinue' } else { 'Continue' })
-        Compress-Archive -Force @CompressVars
-        $ProgressPreference = 'Continue'
-
-    }
-}
-
-function Package-OBS-Standalone {
-    $ProductName = "OBS-Studio"
-    $CheckoutDir = Resolve-Path -Path "$PSScriptRoot\..\.."
-
-    . ${CheckoutDir}/CI/include/build_support_windows.ps1
-
-    if (!(Test-Path Env:CI)) {
-        Write-Step "Fetch OBS tags..."
-        $null = git fetch --tags origin
-    }
-
-    Ensure-Directory ${CheckoutDir}
-    $GitBranch = git rev-parse --abbrev-ref HEAD
-    $GitHash = git rev-parse --short=9 HEAD
-    $ErrorActionPreference = "SilentlyContinue"
-    $GitTag = git describe --tags --abbrev=0
-    $ErrorActionPreference = "Stop"
-
-    if(Test-Path variable:BUILD_FOR_DISTRIBUTION) {
-        $VersionString = "${GitTag}"
-    } else {
-        $VersionString = "${GitTag}-${GitHash}"
-    }
-
-    $FileName = "obs-studio-${VersionString}-windows"
-
-    Package-OBS
-}
-
-function Print-Usage {
-    $Lines = @(
-        "Usage: ${_ScriptName}",
-        "-Help                    : Print this help",
-        "-Quiet                   : Suppress most build process output",
-        "-Verbose                 : Enable more verbose build process output",
-        "-CombinedArchs           : Create combined architecture package",
-        "-BuildDirectory          : Directory to use for builds - Default: build64 on 64-bit systems, build32 on 32-bit systems",
-        "-BuildArch               : Build architecture to use (x86 or x64) - Default: local architecture",
-        "-BuildConfiguration      : Build configuration to use - Default: RelWithDebInfo"
-    )
-
-    $Lines | Write-Host
-}
-
-
-if(!(Test-Path variable:_RunObsBuildScript)) {
-    $_ScriptName = "$($MyInvocation.MyCommand.Name)"
-    if($Help.isPresent) {
-        Print-Usage
-        exit 0
-    }
-
-    Package-OBS-Standalone
-}

obs-studio-29.1.3.tar.xz/UI/expand-checkbox.hpp Deleted

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-captions/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-captions/cmake/macos/Info.plist.in Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>decklink-captions</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.decklink-captions</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleExecutable</key>
-	<string>decklink-captions</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-output-ui/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-output-ui/cmake/macos/Info.plist.in Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>decklink-output-ui</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.decklink-output-ui</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleExecutable</key>
-	<string>decklink-output-ui</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.icns Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_128x128.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_128x128@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_16x16.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_16x16@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_256x256.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_256x256@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_32x32.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_32x32@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_512x512.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/AppIcon.iconset/icon_512x512@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json Deleted

@@ -1,68 +0,0 @@
-{
-  "images" : 
-    {
-      "filename" : "icon_16x16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "icon_16x16@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "icon_32x32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "icon_32x32@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "icon_128x128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "icon_128x128@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "icon_256x256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "icon_256x256@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "icon_512x512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "icon_512x512@2x.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    }
-  ,
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_128x128.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_16x16.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_256x256.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_32x32.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_512x512.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Assets.xcassets/Contents.json Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Info.plist.in Deleted

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleExecutable</key>
-	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
-	<key>CFBundleIdentifier</key>
-	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleSupportedPlatforms</key>
- 	<array>
- 		<string>MacOSX</string>
- 	</array>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>LSAppNapIsDisabled</key>
-	<true/>
-	<key>NSCameraUsageDescription</key>
- 	<string>OBS needs to access the camera to enable camera sources to work.</string>
- 	<key>NSMicrophoneUsageDescription</key>
- 	<string>OBS needs to access the microphone to enable audio input.</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Plugin-Info.plist.in Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>${MACOSX_PLUGIN_BUNDLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>${MACOSX_PLUGIN_GUI_IDENTIFIER}</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_PLUGIN_BUNDLE_VERSION}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_PLUGIN_SHORT_VERSION_STRING}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleExecutable</key>
-	<string>${MACOSX_PLUGIN_EXECUTABLE_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>${MACOSX_PLUGIN_BUNDLE_TYPE}</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/Virtualcam-Info.plist.in Deleted

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>${MACOSX_PLUGIN_BUNDLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>${MACOSX_PLUGIN_GUI_IDENTIFIER}</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_PLUGIN_BUNDLE_VERSION}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_PLUGIN_SHORT_VERSION_STRING}</string>
-	<key>CFBundleExecutable</key>
-	<string>obs-mac-virtualcam</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>${MACOSX_PLUGIN_BUNDLE_TYPE}</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
-	<key>CFPlugInFactories</key>
-	<dict>
-		<key>7E950B8C-5E49-4B9E-B7D0-B3608A08E8F6</key>
-		<string>PlugInMain</string>
-	</dict>
-	<key>CFPlugInTypes</key>
-	<dict>
-		<key>30010C1C-93BF-11D8-8B5B-000A95AF9C6A</key>
-		<array>
-			<string>7E950B8C-5E49-4B9E-B7D0-B3608A08E8F6</string>
-		</array>
-	</dict>
-	<key>CMIOHardwareAssistantServiceNames</key>
-	<array>
-		<string>com.obsproject.obs-mac-virtualcam.server</string>
-	</array>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/background.tiff Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/bundleutils.cmake Deleted

@@ -1,134 +0,0 @@
-if(POLICY CMP0007)
-  cmake_policy(SET CMP0007 NEW)
-endif()
-if(POLICY CMP0009)
-  cmake_policy(SET CMP0009 NEW)
-endif()
-if(POLICY CMP0011)
-  cmake_policy(SET CMP0011 NEW)
-endif()
-
-# Add additional search paths for dylibbundler
-list(APPEND _FIXUP_BUNDLES "-s \"${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks\"")
-list(APPEND _FIXUP_BUNDLES "-s \"${CMAKE_INSTALL_PREFIX}/lib\"")
-list(APPEND _FIXUP_BUNDLES "-s \"${CMAKE_INSTALL_PREFIX}/Frameworks\"")
-
-foreach(_PREFIX_PATH IN LISTS _DEPENDENCY_PREFIX)
-  list(APPEND _FIXUP_BUNDLES "-s \"${_PREFIX_PATH}/lib\"")
-  file(GLOB _DYLIBS "${_PREFIX_PATH}/lib/*.dylib")
-  file(
-    COPY ${_DYLIBS}
-    DESTINATION ${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks
-    FOLLOW_SYMLINK_CHAIN)
-  unset(_DYLIBS)
-endforeach()
-
-# Unlinked modules need to be supplied manually to dylibbundler
-
-# Find all modules (plugin and standalone)
-file(GLOB _OBS_PLUGINS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/PlugIns/*.plugin")
-file(GLOB _OBS_SCRIPTING_PLUGINS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/PlugIns/*.so")
-
-# Add modules to fixups
-foreach(_OBS_PLUGIN IN LISTS _OBS_PLUGINS)
-  get_filename_component(PLUGIN_NAME "${_OBS_PLUGIN}" NAME_WLE)
-  list(APPEND _FIXUP_BUNDLES "-x \"${_OBS_PLUGIN}/Contents/MacOS/${PLUGIN_NAME}\"")
-endforeach()
-
-if(EXISTS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/MacOS/obs-ffmpeg-mux")
-  list(APPEND _FIXUP_BUNDLES "-x \"${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/MacOS/obs-ffmpeg-mux\"")
-endif()
-
-# Add scripting modules to fixups
-foreach(_OBS_PLUGIN IN LISTS _OBS_SCRIPTING_PLUGINS)
-  list(APPEND _FIXUP_BUNDLES "-x \"${_OBS_PLUGIN}\"")
-endforeach()
-
-# Run dylibbbundler
-if(DEFINED ENV{VERBOSE})
-  set(_VERBOSE_FLAG "--verbose")
-endif()
-
-if(DEFINED ENV{QUIET})
-  set(_QUIET_FLAG "OUTPUT_QUIET")
-endif()
-
-list(REMOVE_DUPLICATES _FIXUP_BUNDLES)
-string(REPLACE ";" " " _FIXUP_BUNDLES "${_FIXUP_BUNDLES}")
-message(STATUS "OBS: Bundle linked libraries and dependencies")
-execute_process(
-  COMMAND
-    /bin/sh -c
-    "${_BUNDLER_COMMAND} -a \"${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}\" -cd -of -q -f ${_FIXUP_BUNDLES} ${_VERBOSE_FLAG}"
-    ${_QUIET_FLAG})
-
-# Find all dylibs, frameworks and other code elements inside bundle
-file(GLOB _DYLIBS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks/*.dylib")
-file(GLOB _FRAMEWORKS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks/*.framework")
-file(GLOB_RECURSE _QT_PLUGINS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/PlugIns/*.dylib")
-
-if(EXISTS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/MacOS/obs-ffmpeg-mux")
-  list(APPEND _OTHER_BINARIES "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/MacOS/obs-ffmpeg-mux")
-endif()
-
-if(EXISTS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Resources/obs-mac-virtualcam.plugin")
-  list(APPEND _OTHER_BINARIES "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Resources/obs-mac-virtualcam.plugin")
-endif()
-
-# Create libobs symlink for legacy plugin support
-execute_process(
-  COMMAND
-    /bin/sh -c
-    "cd \"${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks\" && ln -fs libobs.framework/Versions/Current/libobs libobs.0.dylib && ln -fsv libobs.framework/Versions/Current/libobs libobs.dylib"
-    ${_QUIET_FLAG})
-
-# Python potentially leaves __pycache__ directories inside the bundle which will break codesigning
-if(EXISTS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/PlugIns/__pycache__")
-  file(REMOVE_RECURSE "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/PlugIns/__pycache__")
-endif()
-
-# Codesign all binaries inside-out
-message(STATUS "OBS: Codesign dependencies")
-if(EXISTS "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks/Chromium Embedded Framework.framework")
-  set(CEF_HELPER_OUTPUT_NAME "OBS Helper")
-  set(CEF_HELPER_APP_SUFFIXES ":" " (GPU):.gpu" " (Plugin):.plugin" " (Renderer):.renderer")
-
-  foreach(_SUFFIXES ${CEF_HELPER_APP_SUFFIXES})
-    string(REPLACE ":" ";" _SUFFIXES ${_SUFFIXES})
-    list(GET _SUFFIXES 0 _NAME_SUFFIX)
-    list(GET _SUFFIXES 1 _PLIST_SUFFIX)
-
-    set(_HELPER_OUTPUT_NAME "${CEF_HELPER_OUTPUT_NAME}${_NAME_SUFFIX}")
-    set(_HELPER_ENTITLEMENT_PLIST "entitlements-helper${_PLIST_SUFFIX}.plist")
-
-    execute_process(
-      COMMAND
-        /usr/bin/codesign --remove-signature
-        "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks/OBS Helper${_NAME_SUFFIX}.app" ${_VERBOSE_FLAG}
-        ${_QUIET_FLAG})
-    execute_process(
-      COMMAND
-        /usr/bin/codesign --force --sign "${_CODESIGN_IDENTITY}" --deep --options runtime --entitlements
-        "${_CODESIGN_ENTITLEMENTS}/entitlements-helper${_PLIST_SUFFIX}.plist"
-        "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}/Contents/Frameworks/OBS Helper${_NAME_SUFFIX}.app" ${_VERBOSE_FLAG}
-        ${_QUIET_FLAG})
-  endforeach()
-endif()
-foreach(_DEPENDENCY IN LISTS _OTHER_BINARIES _DYLIBS _FRAMEWORKS _OBS_PLUGINS _OBS_SCRIPTING_PLUGINS _QT_PLUGINS)
-  if(NOT IS_SYMLINK "${_DEPENDENCY}")
-    execute_process(COMMAND /usr/bin/codesign --remove-signature "${_DEPENDENCY}" ${_VERBOSE_FLAG} ${_QUIET_FLAG})
-    execute_process(
-      COMMAND /usr/bin/codesign --force --sign "${_CODESIGN_IDENTITY}" --options runtime --entitlements
-              "${_CODESIGN_ENTITLEMENTS}/entitlements.plist" "${_DEPENDENCY}" ${_VERBOSE_FLAG} ${_QUIET_FLAG})
-  endif()
-endforeach()
-
-# Codesign main app
-message(STATUS "OBS: Codesign main app")
-execute_process(COMMAND /usr/bin/codesign --remove-signature "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}" ${_VERBOSE_FLAG}
-                        ${_QUIET_FLAG})
-execute_process(
-  COMMAND
-    /usr/bin/codesign --force --sign "${_CODESIGN_IDENTITY}" --options runtime --entitlements
-    "${_CODESIGN_ENTITLEMENTS}/entitlements.plist" "${CMAKE_INSTALL_PREFIX}/${_BUNDLENAME}" ${_VERBOSE_FLAG}
-    ${_QUIET_FLAG})

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/dylibbundler Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/entitlements-helper.gpu.plist Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/entitlements-helper.plist Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/entitlements-helper.plugin.plist Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/entitlements-helper.renderer.plist Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/entitlements.plist Deleted

obs-studio-29.1.3.tar.xz/cmake/bundle/macOS/package.applescript.in Deleted

@@ -1,66 +0,0 @@
-on run (volumeName)
-    tell application "Finder"
-        tell disk (volumeName as string)
-            open
-
-            set theXOrigin to @_DMG_WINDOW_X@
-            set theYOrigin to @_DMG_WINDOW_Y@
-            set theWidth to @_DMG_WINDOW_WIDTH@
-            set theHeight to @_DMG_WINDOW_HEIGHT@
-
-            set theBottomRightX to (theXOrigin + theWidth)
-            set theBottomRightY to (theYOrigin + theHeight)
-            set dsStore to "\"" & "/Volumes/" & volumeName & "/" & ".DS_STORE\""
-
-            tell container window
-                set current view to icon view
-                set toolbar visible to false
-                set statusbar visible to false
-                set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
-                set statusbar visible to false
-                set position of every item to {theBottomRightX + 100, 100}
-            end tell
-
-            set opts to the icon view options of container window
-            tell opts
-                set icon size to @_DMG_ICON_SIZE@
-                set text size to @_DMG_TEXT_SIZE@
-                set arrangement to not arranged
-            end tell
-            set background picture of opts to file ".background:@CPACK_DMG_BACKGROUND_FILENAME@"
-            set position of item "@CPACK_PACKAGE_NAME@.app" to {@_DMG_OBS_X@, @_DMG_OBS_Y@}
-            set position of item "Applications" to {@_DMG_APP_LINK_X@, @_DMG_APP_LINK_Y@}
-            close
-            open
-            -- Force saving of the size
-            delay 1
-
-            tell container window
-                set statusbar visible to false
-                set the bounds to {theXOrigin, theYOrigin, theBottomRightX - 10, theBottomRightY - 10}
-            end tell
-        end tell
-
-        delay 1
-
-        tell disk (volumeName as string)
-            tell container window
-                set statusbar visible to false
-                set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
-            end tell
-        end tell
-
-        --give the finder some time to write the .DS_Store file
-        delay 3
-
-        set waitTime to 0
-        set ejectMe to false
-        repeat while ejectMe is false
-            delay 1
-            set waitTime to waitTime + 1
-
-            if (do shell script " -f " & dsStore & " ; echo $?") = "0" then set ejectMe to true
-        end repeat
-        log "waited " & waitTime & " seconds for .DS_STORE to be created."
-    end tell
-end run

obs-studio-29.1.3.tar.xz/cmake/common/.cmake-format.json Deleted

obs-studio-29.1.3.tar.xz/cmake/external Deleted

obs-studio-29.1.3.tar.xz/cmake/external/ObsPluginHelpers.cmake Deleted

@@ -1,675 +0,0 @@
-if(POLICY CMP0087)
- cmake_policy(SET CMP0087 NEW)
-endif()
-
-set(OBS_STANDALONE_PLUGIN_DIR ${CMAKE_SOURCE_DIR}/release)
-
-include(GNUInstallDirs)
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
- set(OS_MACOS ON)
- set(OS_POSIX ON)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|OpenBSD")
- set(OS_POSIX ON)
- string(TOUPPER "${CMAKE_SYSTEM_NAME}" _SYSTEM_NAME_U)
- set(OS_${_SYSTEM_NAME_U} ON)
-elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- set(OS_WINDOWS ON)
- set(OS_POSIX OFF)
-endif()
-
-# Old-Style plugin detected, find "modern" libobs variant instead and set global include directories to fix "bad" plugin
-# behavior
-if(DEFINED LIBOBS_INCLUDE_DIR AND NOT TARGET OBS::libobs)
- message(
- DEPRECATION
- "You are using an outdated method of adding 'libobs' to your project. Refer to the updated wiki on how to build and export 'libobs' and use it in your plugin projects."
- )
- find_package(libobs REQUIRED)
- if(TARGET OBS::libobs)
- set_target_properties(OBS::libobs PROPERTIES IMPORTED_GLOBAL TRUE)
- message(STATUS "OBS: Using modern libobs target")
-
- add_library(libobs ALIAS OBS::libobs)
- if(OS_WINDOWS)
- add_library(w32-pthreads ALIAS OBS::w32-pthreads)
- endif()
- endif()
-endif()
-
-# Set macOS and Windows specific if default value is used
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND (OS_WINDOWS OR OS_MACOS))
- set(CMAKE_INSTALL_PREFIX
- ${OBS_STANDALONE_PLUGIN_DIR}
- CACHE STRING "Directory to install OBS plugin after building" FORCE)
-endif()
-
-# Set default build type to RelWithDebInfo and specify allowed alternative values
-if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE
- "RelWithDebInfo"
- CACHE STRING "OBS build type Release, RelWithDebInfo, Debug, MinSizeRel" FORCE)
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS Release RelWithDebInfo Debug MinSizeRel)
-endif()
-
-# Set default Qt version to AUTO, preferring an available Qt6 with a fallback to Qt5
-if(NOT QT_VERSION)
- set(QT_VERSION
- AUTO
- CACHE STRING "OBS Qt version AUTO, 6, 5" FORCE)
- set_property(CACHE QT_VERSION PROPERTY STRINGS AUTO 6 5)
-endif()
-
-# Macro to find best possible Qt version for use with the project:
-#
-# * Use QT_VERSION value as a hint for desired Qt version
-# * If "AUTO" was specified, prefer Qt6 over Qt5
-# * Creates versionless targets of desired component if none had been created by Qt itself (Qt versions < 5.15)
-#
-macro(find_qt)
- set(multiValueArgs COMPONENTS COMPONENTS_WIN COMPONENTS_MAC COMPONENTS_LINUX)
- cmake_parse_arguments(FIND_QT "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
- # Do not use versionless targets in the first step to avoid Qt::Core being clobbered by later opportunistic
- # find_package runs
- set(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
-
- # Loop until _QT_VERSION is set (or FATAL_ERROR aborts script execution early)
- while(NOT _QT_VERSION)
- if(QT_VERSION STREQUAL AUTO AND NOT _QT_TEST_VERSION)
- set(_QT_TEST_VERSION 6)
- elseif(NOT QT_VERSION STREQUAL AUTO)
- set(_QT_TEST_VERSION ${QT_VERSION})
- endif()
-
- find_package(
- Qt${_QT_TEST_VERSION}
- COMPONENTS Core
- QUIET)
-
- if(TARGET Qt${_QT_TEST_VERSION}::Core)
- set(_QT_VERSION
- ${_QT_TEST_VERSION}
- CACHE INTERNAL "")
- message(STATUS "Qt version found: ${_QT_VERSION}")
- unset(_QT_TEST_VERSION)
- break()
- elseif(QT_VERSION STREQUAL AUTO)
- if(_QT_TEST_VERSION EQUAL 6)
- message(WARNING "Qt6 was not found, falling back to Qt5")
- set(_QT_TEST_VERSION 5)
- continue()
- endif()
- endif()
- message(FATAL_ERROR "Neither Qt6 nor Qt5 found.")
- endwhile()
-
- # Enable versionless targets for the remaining Qt components
- set(QT_NO_CREATE_VERSIONLESS_TARGETS OFF)
-
- set(_QT_COMPONENTS ${FIND_QT_COMPONENTS})
- if(OS_WINDOWS)
- list(APPEND _QT_COMPONENTS ${FIND_QT_COMPONENTS_WIN})
- elseif(OS_MACOS)
- list(APPEND _QT_COMPONENTS ${FIND_QT_COMPONENTS_MAC})
- else()
- list(APPEND _QT_COMPONENTS ${FIND_QT_COMPONENTS_LINUX})
- endif()
-
- find_package(
- Qt${_QT_VERSION}
- COMPONENTS ${_QT_COMPONENTS}
- REQUIRED)
-
- list(APPEND _QT_COMPONENTS Core)
-
- if("Gui" IN_LIST FIND_QT_COMPONENTS_LINUX)
- list(APPEND _QT_COMPONENTS "GuiPrivate")
- endif()
-
- # Check for versionless targets of each requested component and create if necessary
- foreach(_COMPONENT IN LISTS _QT_COMPONENTS)
- if(NOT TARGET Qt::${_COMPONENT} AND TARGET Qt${_QT_VERSION}::${_COMPONENT})
- add_library(Qt::${_COMPONENT} INTERFACE IMPORTED)
- set_target_properties(Qt::${_COMPONENT} PROPERTIES INTERFACE_LINK_LIBRARIES Qt${_QT_VERSION}::${_COMPONENT})
- endif()
- endforeach()
-endmacro()
-
-# Set relative path variables for file configurations
-file(RELATIVE_PATH RELATIVE_INSTALL_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_INSTALL_PREFIX})
-file(RELATIVE_PATH RELATIVE_BUILD_PATH ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
-
-if(OS_POSIX)
- # Set default GCC/clang compile options:
- #
- # * Treat warnings as errors
- # * Enable extra warnings, https://clang.llvm.org/docs/DiagnosticsReference.html#wextra
- # * Warning about usage of variable length array, https://clang.llvm.org/docs/DiagnosticsReference.html#wvla
- # * Warning about bad format specifiers, https://clang.llvm.org/docs/DiagnosticsReference.html#wformat
- # * Warning about non-strings used as format strings,
- # https://clang.llvm.org/docs/DiagnosticsReference.html#wformat-security
- # * Warning about non-exhaustive switch blocks, https://clang.llvm.org/docs/DiagnosticsReference.html#wswitch
- # * Warning about unused parameters, https://clang.llvm.org/docs/DiagnosticsReference.html#wunused-parameter
- # * DISABLE warning about unused functions, https://clang.llvm.org/docs/DiagnosticsReference.html#wunused-function
- # * DISABLE warning about missing field initializers,
- # https://clang.llvm.org/docs/DiagnosticsReference.html#wmissing-field-initializers
- # * DISABLE strict aliasing optimisations
- # * C ONLY - treat implicit function declarations (use before declare) as errors,
- # https://clang.llvm.org/docs/DiagnosticsReference.html#wimplicit-function-declaration
- # * C ONLY - DISABLE warning about missing braces around subobject initalizers,
- # https://clang.llvm.org/docs/DiagnosticsReference.html#wmissing-braces
- # * C ONLY, Clang ONLY - Warning about implicit conversion of NULL to another type,
- # https://clang.llvm.org/docs/DiagnosticsReference.html#wnull-conversion
- # * C & C++, Clang ONLY - Disable warning about integer conversion losing precision,
- # https://clang.llvm.org/docs/DiagnosticsReference.html#wshorten-64-to-32
- # * C++, GCC ONLY - Warning about implicit conversion of NULL to another type
- # * Enable color diagnostics on Clang (CMAKE_COLOR_DIAGNOSTICS available in CMake 3.24)
- target_compile_options(
- ${CMAKE_PROJECT_NAME}
- PRIVATE
- -Werror
- -Wextra
- -Wvla
- -Wformat
- -Wformat-security
- -Wswitch
- -Wunused-parameter
- -Wno-unused-function
- -Wno-missing-field-initializers
- -fno-strict-aliasing
- "$<$<COMPILE_LANGUAGE:C>:-Werror-implicit-function-declaration;-Wno-missing-braces>"
- "$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wnull-conversion;-Wno-error=shorten-64-to-32;-fcolor-diagnostics>"
- "$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wnull-conversion;-Wno-error=shorten-64-to-32;-fcolor-diagnostics>"
- "$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wconversion-null>"
- "$<$<CONFIG:DEBUG>:-DDEBUG=1;-D_DEBUG=1>")
-
- # GCC 12.1.0 has a regression bug which trigger maybe-uninitialized warnings where there is not.
- # (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562)
- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "12.1.0")
- target_compile_options(${CMAKE_PROJECT_NAME} PRIVATE -Wno-error=maybe-uninitialized)
- endif()
-
- if(NOT CCACHE_SET)
- # Try to find and enable ccache
- find_program(CCACHE_PROGRAM "ccache")
- set(CCACHE_SUPPORT
- ON
- CACHE BOOL "Enable ccache support")
- mark_as_advanced(CCACHE_PROGRAM)
- if(CCACHE_PROGRAM AND CCACHE_SUPPORT)
- set(CMAKE_CXX_COMPILER_LAUNCHER
- ${CCACHE_PROGRAM}
- CACHE INTERNAL "")
- set(CMAKE_C_COMPILER_LAUNCHER
- ${CCACHE_PROGRAM}
- CACHE INTERNAL "")
- set(CMAKE_OBJC_COMPILER_LAUNCHER
- ${CCACHE_PROGRAM}
- CACHE INTERNAL "")
- set(CMAKE_OBJCXX_COMPILER_LAUNCHER
- ${CCACHE_PROGRAM}
- CACHE INTERNAL "")
- set(CMAKE_CUDA_COMPILER_LAUNCHER
- ${CCACHE_PROGRAM}
- CACHE INTERNAL "") # CMake 3.9+
- set(CCACHE_SET
- ON
- CACHE INTERNAL "")
- endif()
- endif()
-endif()
-
-# Set required C++ standard to C++17
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Get lowercase host architecture for easier comparison
-if(MSVC_CXX_ARCHITECTURE_ID)
- string(TOLOWER ${MSVC_CXX_ARCHITECTURE_ID} _HOST_ARCH)
-else()
- string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} _HOST_ARCH)
-endif()
-
-if(_HOST_ARCH MATCHES "i3-686|x86|x64|x86_64|amd64" AND NOT CMAKE_OSX_ARCHITECTURES STREQUAL "arm64")
- # Enable MMX, SSE and SSE2 on compatible host systems (assuming no cross-compile)
- set(ARCH_SIMD_FLAGS -mmmx -msse -msse2)
-elseif(_HOST_ARCH MATCHES "arm64|arm64e|aarch64")
- # Enable available built-in SIMD support in Clang and GCC
- if(CMAKE_C_COMPILER_ID MATCHES "^(Apple)?Clang|GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang|GNU")
- include(CheckCCompilerFlag)
- include(CheckCXXCompilerFlag)
-
- check_c_compiler_flag("-fopenmp-simd" C_COMPILER_SUPPORTS_OPENMP_SIMD)
- check_cxx_compiler_flag("-fopenmp-simd" CXX_COMPILER_SUPPORTS_OPENMP_SIMD)
- target_compile_options(
- ${CMAKE_PROJECT_NAME}
- PRIVATE -DSIMDE_ENABLE_OPENMP
- "$<$<AND:$<COMPILE_LANGUAGE:C>,$<BOOL:C_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>"
- "$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:CXX_COMPILER_SUPPORTS_OPENMP_SIMD>>:-fopenmp-simd>")
- endif()
-endif()
-
-# macOS specific settings
-if(OS_MACOS)
- # Set macOS-specific C++ standard library
- target_compile_options(${CMAKE_PROJECT_NAME}
- PRIVATE "$<$<COMPILE_LANG_AND_ID:OBJC,AppleClang,Clang>:-fcolor-diagnostics>" -stdlib=libc++)
-
- # Set build architecture to host architecture by default
- if(NOT CMAKE_OSX_ARCHITECTURES)
- set(CMAKE_OSX_ARCHITECTURES
- ${CMAKE_HOST_SYSTEM_PROCESSOR}
- CACHE STRING "Build architecture for macOS" FORCE)
- endif()
- set_property(CACHE CMAKE_OSX_ARCHITECTURES PROPERTY STRINGS arm64 x86_64 "arm64;x86_64")
-
- # Set deployment target to 11.0 for Apple Silicon or 10.15 for Intel and Universal builds
- if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGETarch=arm64 "11.0")
- set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGETarch=x86_64 "10.15")
-
- if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
- set(_MACOS_DEPLOYMENT_TARGET "11.0")
- else()
- set(_MACOS_DEPLOYMENT_TARGET "10.15")
- endif()
-
- set(CMAKE_OSX_DEPLOYMENT_TARGET
- ${_MACOS_DEPLOYMENT_TARGET}
- CACHE STRING "Minimum macOS version to target for deployment (at runtime); newer APIs weak linked" FORCE)
- unset(_MACOS_DEPLOYMENT_TARGET)
- endif()
-
- set_property(CACHE CMAKE_OSX_DEPLOYMENT_TARGET PROPERTY STRINGS 13.0 12.0 11.0 10.15)
-
- # Override macOS install directory
- if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- set(CMAKE_INSTALL_PREFIX
- ${CMAKE_BINARY_DIR}/install
- CACHE STRING "Directory to install OBS to after building" FORCE)
- endif()
-
- # Set up codesigning for Xcode builds with team IDs or standalone builds with developer identity
- if(NOT OBS_BUNDLE_CODESIGN_TEAM)
- if(NOT OBS_BUNDLE_CODESIGN_IDENTITY)
- set(OBS_BUNDLE_CODESIGN_IDENTITY
- "-"
- CACHE STRING "OBS code signing identity for macOS" FORCE)
- endif()
- set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY ${OBS_BUNDLE_CODESIGN_IDENTITY})
- else()
- # Team ID specified, warn if Xcode generator is not used and fall back to ad-hoc signing
- if(NOT XCODE)
- message(
- WARNING
- "Code signing with a team identifier is only supported with the Xcode generator. Using ad-hoc code signature instead."
- )
- if(NOT OBS_BUNDLE_CODESIGN_IDENTITY)
- set(OBS_BUNDLE_CODESIGN_IDENTITY
- "-"
- CACHE STRING "OBS code signing identity for macOS" FORCE)
- endif()
- else()
- unset(OBS_BUNDLE_CODESIGN_IDENTITY)
- set_property(CACHE OBS_BUNDLE_CODESIGN_TEAM PROPERTY HELPSTRING "OBS code signing team for macOS")
- set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic)
- set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${OBS_BUNDLE_CODESIGN_TEAM})
- endif()
- endif()
-
- # Set path to entitlements property list for codesigning. Entitlements should match the host binary, in this case
- # OBS.app.
- set(OBS_CODESIGN_ENTITLEMENTS
- ${CMAKE_SOURCE_DIR}/cmake/bundle/macos/entitlements.plist
- CACHE INTERNAL "Path to codesign entitlements plist")
- # Enable linker codesigning by default. Building OBS or plugins on host systems older than macOS 10.15 is not
- # supported
- set(OBS_CODESIGN_LINKER
- ON
- CACHE BOOL "Enable linker codesigning on macOS (macOS 11+ required)")
-
- # Tell Xcode to pretend the linker signed binaries so that editing with install_name_tool preserves ad-hoc signatures.
- # This option is supported by codesign on macOS 11 or higher. See CMake Issue 21854:
- # https://gitlab.kitware.com/cmake/cmake/-/issues/21854
- if(OBS_CODESIGN_LINKER)
- set(CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "-o linker-signed")
- endif()
-
- # Set default options for bundling on macOS
- set(CMAKE_MACOSX_RPATH ON)
- set(CMAKE_SKIP_BUILD_RPATH OFF)
- set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
- set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks/")
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH OFF)
-
- # Helper function for plugin targets (macOS version)
- function(setup_plugin_target target)
- # Sanity check for required bundle information
- #
- # * Bundle identifier
- # * Bundle version
- # * Short version string
- if(NOT DEFINED MACOSX_PLUGIN_GUI_IDENTIFIER)
- message(
- FATAL_ERROR
- "No 'MACOSX_PLUGIN_GUI_IDENTIFIER' set, but is required to build plugin bundles on macOS - example: 'com.yourname.pluginname'"
- )
- endif()
-
- if(NOT DEFINED MACOSX_PLUGIN_BUNDLE_VERSION)
- message(
- FATAL_ERROR
- "No 'MACOSX_PLUGIN_BUNDLE_VERSION' set, but is required to build plugin bundles on macOS - example: '25'")
- endif()
-
- if(NOT DEFINED MACOSX_PLUGIN_SHORT_VERSION_STRING)
- message(
- FATAL_ERROR
- "No 'MACOSX_PLUGIN_SHORT_VERSION_STRING' set, but is required to build plugin bundles on macOS - example: '1.0.2'"
- )
- endif()
-
- # Set variables for automatic property list generation
- set(MACOSX_PLUGIN_BUNDLE_NAME
- "${target}"
- PARENT_SCOPE)
- set(MACOSX_PLUGIN_BUNDLE_VERSION
- "${MACOSX_PLUGIN_BUNDLE_VERSION}"
- PARENT_SCOPE)
- set(MACOSX_PLUGIN_SHORT_VERSION_STRING
- "${MACOSX_PLUGIN_SHORT_VERSION_STRING}"
- PARENT_SCOPE)
- set(MACOSX_PLUGIN_EXECUTABLE_NAME
- "${target}"
- PARENT_SCOPE)
- set(MACOSX_PLUGIN_BUNDLE_TYPE
- "BNDL"
- PARENT_SCOPE)
-
- # Set installation target to install prefix root (default for bundles)
- install(
- TARGETS ${target}
- LIBRARY DESTINATION "."
- COMPONENT obs_plugins
- NAMELINK_COMPONENT ${target}_Development)
-
- if(TARGET Qt::Core)
- # Framework version has changed between Qt5 (uses wrong numerical version) and Qt6 (uses correct alphabetical
- # version)
- if(${_QT_VERSION} EQUAL 5)
- set(_QT_FW_VERSION "${QT_VERSION}")
- else()
- set(_QT_FW_VERSION "A")
- endif()
-
- # Set up install-time command to fix Qt library references to point into OBS.app bundle
- set(_COMMAND
- "${CMAKE_INSTALL_NAME_TOOL} \\
- -change ${CMAKE_PREFIX_PATH}/lib/QtWidgets.framework/Versions/${QT_VERSION}/QtWidgets @rpath/QtWidgets.framework/Versions/${_QT_FW_VERSION}/QtWidgets \\
- -change ${CMAKE_PREFIX_PATH}/lib/QtCore.framework/Versions/${QT_VERSION}/QtCore @rpath/QtCore.framework/Versions/${_QT_FW_VERSION}/QtCore \\
- -change ${CMAKE_PREFIX_PATH}/lib/QtGui.framework/Versions/${QT_VERSION}/QtGui @rpath/QtGui.framework/Versions/${_QT_FW_VERSION}/QtGui \\
- \\\"\${CMAKE_INSTALL_PREFIX}/${target}.plugin/Contents/MacOS/${target}\\\"")
- install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")" COMPONENT obs_plugins)
- unset(_QT_FW_VERSION)
- endif()
-
- # Set macOS bundle properties
- set_target_properties(
- ${target}
- PROPERTIES PREFIX ""
- BUNDLE ON
- BUNDLE_EXTENSION "plugin"
- OUTPUT_NAME ${target}
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/Plugin-Info.plist.in"
- XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${MACOSX_PLUGIN_GUI_IDENTIFIER}"
- XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS
- "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/entitlements.plist")
-
- # If not building with Xcode, manually code-sign the plugin
- if(NOT XCODE)
- set(_COMMAND
- "/usr/bin/codesign --force \\
- --sign \\\"${OBS_BUNDLE_CODESIGN_IDENTITY}\\\" \\
- --options runtime \\
- --entitlements \\\"${CMAKE_CURRENT_FUNCTION_LIST_DIR}/bundle/macOS/entitlements.plist\\\" \\
- \\\"\${CMAKE_INSTALL_PREFIX}/${target}.plugin\\\"")
- install(CODE "execute_process(COMMAND /bin/sh -c \"${_COMMAND}\")" COMPONENT obs_plugins)
- endif()
-
- install_bundle_resources(${target})
- endfunction()
-
- # Helper function to add resources from "data" directory as bundle resources
- function(install_bundle_resources target)
- if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/data)
- file(GLOB_RECURSE _DATA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
- foreach(_DATA_FILE IN LISTS _DATA_FILES)
- file(RELATIVE_PATH _RELATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/data/ ${_DATA_FILE})
- get_filename_component(_RELATIVE_PATH ${_RELATIVE_PATH} PATH)
- target_sources(${target} PRIVATE ${_DATA_FILE})
- set_source_files_properties(${_DATA_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/${_RELATIVE_PATH})
- string(REPLACE "\\" "\\\\" _GROUP_NAME ${_RELATIVE_PATH})
- source_group("Resources\\${_GROUP_NAME}" FILES ${_DATA_FILE})
- endforeach()
- endif()
- endfunction()
-else()
- # Check for target architecture (64bit vs 32bit)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(_ARCH_SUFFIX 64)
- else()
- set(_ARCH_SUFFIX 32)
- endif()
- set(OBS_OUTPUT_DIR ${CMAKE_BINARY_DIR}/rundir)
-
- # Unix specific settings
- if(OS_POSIX)
- # Paths to binaries and plugins differ between portable and non-portable builds on Linux
- option(LINUX_PORTABLE "Build portable version (Linux)" ON)
- if(NOT LINUX_PORTABLE)
- set(OBS_LIBRARY_DESTINATION ${CMAKE_INSTALL_LIBDIR})
- set(OBS_PLUGIN_DESTINATION ${OBS_LIBRARY_DESTINATION}/obs-plugins)
- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
- set(OBS_DATA_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/obs)
- else()
- set(OBS_LIBRARY_DESTINATION bin/${_ARCH_SUFFIX}bit)
- set(OBS_PLUGIN_DESTINATION obs-plugins/${_ARCH_SUFFIX}bit)
- set(CMAKE_INSTALL_RPATH "$ORIGIN/" "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}")
- set(OBS_DATA_DESTINATION "data")
- endif()
-
- # Setup Linux-specific CPack values for "deb" package generation
- if(OS_LINUX)
- set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
- set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${LINUX_MAINTAINER_EMAIL}")
- set(CPACK_PACKAGE_VERSION "${CMAKE_PROJECT_VERSION}")
- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-linux-x86_64")
-
- set(CPACK_GENERATOR "DEB")
- set(CPACK_DEBIAN_PACKAGE_DEPENDS
- "obs-studio (>= 27.0.0), libqt5core5a (>= 5.9.0~beta), libqt5gui5 (>= 5.3.0), libqt5widgets5 (>= 5.7.0)")
-
- set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_SOURCE_DIR}/release)
-
- if(NOT LINUX_PORTABLE)
- set(CPACK_SET_DESTDIR ON)
- endif()
- include(CPack)
- endif()
- # Windows specific settings
- else()
- set(OBS_LIBRARY_DESTINATION "bin/${_ARCH_SUFFIX}bit")
- set(OBS_LIBRARY32_DESTINATION "bin/32bit")
- set(OBS_LIBRARY64_DESTINATION "bin/64bit")
- set(OBS_PLUGIN_DESTINATION "obs-plugins/${_ARCH_SUFFIX}bit")
- set(OBS_PLUGIN32_DESTINATION "obs-plugins/32bit")
- set(OBS_PLUGIN64_DESTINATION "obs-plugins/64bit")
-
- set(OBS_DATA_DESTINATION "data")
-
- if(MSVC)
- # Set default Visual Studio CL.exe compile options.
- #
- # * Enable building with multiple processes,
- # https://docs.microsoft.com/en-us/cpp/build/reference/mp-build-with-multiple-processes?view=msvc-170
- # * Enable lint-like warnings,
- # https://docs.microsoft.com/en-us/cpp/build/reference/compiler-option-warning-level?view=msvc-170
- # * Enable treating all warnings as errors,
- # https://docs.microsoft.com/en-us/cpp/build/reference/compiler-option-warning-level?view=msvc-170
- # * RelWithDebInfo ONLY - Enable expanding of all functions not explicitly marked for no inlining,
- # https://docs.microsoft.com/en-us/cpp/build/reference/ob-inline-function-expansion?view=msvc-170
- # * Enable UNICODE support,
- # https://docs.microsoft.com/en-us/windows/win32/learnwin32/working-with-strings#unicode-and-ansi-functions
- # * DISABLE warnings about using POSIX function names,
- # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=msvc-170#posix-function-names
- # * DISABLE warnings about unsafe CRT library functions,
- # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-3-c4996?view=msvc-170#unsafe-crt-library-functions
- # * DISABLE warnings about nonstandard nameless structs/unions,
- # https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/compiler-warning-level-4-c4201?view=msvc-170
- target_compile_options(
- ${CMAKE_PROJECT_NAME}
- PRIVATE /MP
- /W3
- /WX
- /wd4201
- "$<$<CONFIG:RELWITHDEBINFO>:/Ob2>"
- "$<$<CONFIG:DEBUG>:/DDEBUG=1;/D_DEBUG=1>"
- /DUNICODE
- /D_UNICODE
- /D_CRT_SECURE_NO_WARNINGS
- /D_CRT_NONSTDC_NO_WARNINGS)
-
- # Set default Visual Studio linker options.
- #
- # * Enable removal of functions and data that are never used,
- # https://docs.microsoft.com/en-us/cpp/build/reference/opt-optimizations?view=msvc-170
- # * Enable treating all warnings as errors,
- # https://docs.microsoft.com/en-us/cpp/build/reference/wx-treat-linker-warnings-as-errors?view=msvc-170
- # * x64 ONLY - DISABLE creation of table of safe exception handlers,
- # https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers?view=msvc-170
- # * Debug ONLY - DISABLE incremental linking,
- # https://docs.microsoft.com/en-us/cpp/build/reference/incremental-link-incrementally?view=msvc-170
- # * RelWithDebInfo ONLY - Disable incremental linking, but enable COMDAT folding,
- # https://docs.microsoft.com/en-us/cpp/build/reference/opt-optimizations?view=msvc-170
- target_link_options(
- ${CMAKE_PROJECT_NAME}
- PRIVATE
- "LINKER:/OPT:REF"
- "LINKER:/WX"
- "$<$<NOT:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>>:LINKER\:/SAFESEH\:NO>"
- "$<$<CONFIG:DEBUG>:LINKER\:/INCREMENTAL\:NO>"
- "$<$<CONFIG:RELWITHDEBINFO>:LINKER\:/INCREMENTAL\:NO;/OPT\:ICF>")
- endif()
- endif()
-
- # Helper function for plugin targets (Windows and Linux version)
- function(setup_plugin_target target)
- # Set prefix to empty string to avoid automatic naming of generated library, i.e. "lib<YOUR_PLUGIN_NAME>"
- set_target_properties(${target} PROPERTIES PREFIX "")
-
- # Set install directories
- install(
- TARGETS ${target}
- RUNTIME DESTINATION "${OBS_PLUGIN_DESTINATION}" COMPONENT ${target}_Runtime
- LIBRARY DESTINATION "${OBS_PLUGIN_DESTINATION}"
- COMPONENT ${target}_Runtime
- NAMELINK_COMPONENT ${target}_Development)
-
- # Set rundir install directory
- install(
- FILES $<TARGET_FILE:${target}>
- DESTINATION $<CONFIG>/${OBS_PLUGIN_DESTINATION}
- COMPONENT obs_rundir
- EXCLUDE_FROM_ALL)
-
- if(OS_WINDOWS)
- # Set install directory for optional PDB symbol files
- install(
- FILES $<TARGET_PDB_FILE:${target}>
- CONFIGURATIONS "RelWithDebInfo" "Debug"
- DESTINATION ${OBS_PLUGIN_DESTINATION}
- COMPONENT ${target}_Runtime
- OPTIONAL)
-
- # Set rundir install directory for optional PDB symbol files
- install(
- FILES $<TARGET_PDB_FILE:${target}>
- CONFIGURATIONS "RelWithDebInfo" "Debug"
- DESTINATION $<CONFIG>/${OBS_PLUGIN_DESTINATION}
- COMPONENT obs_rundir
- OPTIONAL EXCLUDE_FROM_ALL)
- endif()
-
- # Add resources from data directory
- setup_target_resources(${target} obs-plugins/${target})
-
- # Set up plugin for testing in available OBS build on Windows
- if(OS_WINDOWS AND DEFINED OBS_BUILD_DIR)
- setup_target_for_testing(${target} obs-plugins/${target})
- endif()
-
- # Custom command to install generated plugin into rundir
- add_custom_command(
- TARGET ${target}
- POST_BUILD
- COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_PREFIX=${OBS_OUTPUT_DIR} -DCMAKE_INSTALL_COMPONENT=obs_rundir
- -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
- COMMENT "Installing to plugin rundir"
- VERBATIM)
- endfunction()
-
- # Helper function to add resources from "data" directory
- function(setup_target_resources target destination)
- if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/data)
- install(
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/
- DESTINATION ${OBS_DATA_DESTINATION}/${destination}
- USE_SOURCE_PERMISSIONS
- COMPONENT obs_plugins)
-
- install(
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data
- DESTINATION $<CONFIG>/${OBS_DATA_DESTINATION}/${destination}
- USE_SOURCE_PERMISSIONS
- COMPONENT obs_rundir
- EXCLUDE_FROM_ALL)
- endif()
- endfunction()
-
- if(OS_WINDOWS)
- # Additional Windows-only helper function to copy plugin to existing OBS development directory:
- #
- # Copies plugin with associated PDB symbol files as well as contents of data directory into the OBS rundir as
- # specified by "OBS_BUILD_DIR".
- function(setup_target_for_testing target destination)
- install(
- FILES $<TARGET_FILE:${target}>
- DESTINATION $<CONFIG>/${OBS_PLUGIN_DESTINATION}
- COMPONENT obs_testing
- EXCLUDE_FROM_ALL)
-
- install(
- FILES $<TARGET_PDB_FILE:${target}>
- CONFIGURATIONS "RelWithDebInfo" "Debug"
- DESTINATION $<CONFIG>/${OBS_PLUGIN_DESTINATION}
- COMPONENT obs_testing
- OPTIONAL EXCLUDE_FROM_ALL)
-
- install(
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/
- DESTINATION $<CONFIG>/${OBS_DATA_DESTINATION}/${destination}
- USE_SOURCE_PERMISSIONS
- COMPONENT obs_testing
- EXCLUDE_FROM_ALL)
-
- add_custom_command(
- TARGET ${target}
- POST_BUILD
- COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_PREFIX=${OBS_BUILD_DIR}/rundir -DCMAKE_INSTALL_COMPONENT=obs_testing
- -DCMAKE_INSTALL_CONFIG_NAME=$<CONFIG> -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake
- COMMENT "Installing to OBS test directory"
- VERBATIM)
- endfunction()
- endif()
-endif()

obs-studio-29.1.3.tar.xz/cmake/macos/cpackconfig.cmake Deleted

@@ -1,49 +0,0 @@
-# OBS CMake macOS CPack configuration module
-
-include(cpackconfig_common)
-
-# Set architecture suffix for package file name based on project target
-if(CMAKE_OSX_ARCHITECTURES STREQUAL arm64)
-  set(_cpack_arch_suffix Apple)
-elseif(CMAKE_OSX_ARCHITECTURES STREQUAL x86_64)
-  set(_cpack_arch_suffix Intel)
-else()
-  set(_cpack_arch_suffix Universal)
-endif()
-
-if(ENABLE_RELEASE_BUILD)
-  set(CPACK_PACKAGE_VERSION ${OBS_VERSION_CANONICAL})
-else()
-  set(CPACK_PACKAGE_VERSION ${OBS_VERSION})
-endif()
-
-set(CPACK_PACKAGE_NAME "OBS")
-set(CPACK_PACKAGE_FILE_NAME "obs-studio-${CPACK_PACKAGE_VERSION}-macOS-${_cpack_arch_suffix}")
-set(CPACK_COMPONENTS_ALL Application)
-set(CPACK_COMPONENT_Application_DISPLAY_NAME "OBS Studio")
-
-# Set background image and icon for generated Drag&Drop disk image
-set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/cmake/macos/resources/background.tiff")
-set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/cmake/macos/resources/AppIcon.icns")
-cmake_path(GET CPACK_DMG_BACKGROUND_IMAGE FILENAME _cpack_dmg_background_filename)
-
-set(CPACK_GENERATOR DragNDrop)
-set(CPACK_DMG_FORMAT UDZO)
-set(CPACK_DMG_FILESYSTEM APFS)
-set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${CMAKE_BINARY_DIR}/package.applescript")
-
-set(_dmg_window_x 100)
-set(_dmg_window_y 100)
-set(_dmg_window_width 540)
-set(_dmg_window_height 380)
-set(_dmg_icon_size 96)
-set(_dmg_text_size 16)
-set(_dmg_obs_x 124)
-set(_dmg_obs_y 180)
-set(_dmg_app_link_x 416)
-set(_dmg_app_link_y 180)
-
-configure_file("${CMAKE_SOURCE_DIR}/cmake/macos/resources/package.applescript.in"
-               "${CMAKE_BINARY_DIR}/package.applescript" @ONLY)
-
-include(CPack)

obs-studio-29.1.3.tar.xz/cmake/macos/resources/package.applescript.in Deleted

@@ -1,70 +0,0 @@
-on run (volumeName)
-    tell application "Finder"
-        tell disk (volumeName as string)
-            open
-
-            set theXOrigin to @_dmg_window_x@
-            set theYOrigin to @_dmg_window_y@
-            set theWidth to @_dmg_window_width@
-            set theHeight to @_dmg_window_height@
-
-            set theBottomRightX to (theXOrigin + theWidth)
-            set theBottomRightY to (theYOrigin + theHeight)
-            set dsStore to "\"" & "/Volumes/" & volumeName & "/" & ".DS_STORE\""
-
-            tell container window
-                set current view to icon view
-                set toolbar visible to false
-                set statusbar visible to false
-                set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
-                set statusbar visible to false
-                set position of every item to {theBottomRightX + 100, 100}
-            end tell
-
-            set opts to the icon view options of container window
-            tell opts
-                set icon size to @_dmg_icon_size@
-                set text size to @_dmg_text_size@
-                set arrangement to not arranged
-            end tell
-            set background picture of opts to file ".background:@_cpack_dmg_background_filename@"
-            set position of item "@CPACK_PACKAGE_NAME@.app" to {@_dmg_obs_x@, @_dmg_obs_y@}
-            set position of item "Applications" to {@_dmg_app_link_x@, @_dmg_app_link_y@}
-            close
-            open
-            -- Force saving of the size
-            delay 1
-
-            tell container window
-                set statusbar visible to false
-                set the bounds to {theXOrigin, theYOrigin, theBottomRightX - 10, theBottomRightY - 10}
-            end tell
-        end tell
-
-        delay 1
-
-        tell disk (volumeName as string)
-            tell container window
-                set statusbar visible to false
-                set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
-            end tell
-        end tell
-
-        --give the finder some time to write the .DS_Store file
-        delay 3
-
-        set waitTime to 0
-        set ejectMe to false
-        repeat while ejectMe is false
-            delay 1
-            set waitTime to waitTime + 1
-
-            if (do shell script " -f " & dsStore & " ; echo $?") = "0" then set ejectMe to true
-        end repeat
-        log "waited " & waitTime & " seconds for .DS_STORE to be created."
-
-        tell disk (volumeName as string)
-            close
-        end tell
-    end tell
-end run

obs-studio-29.1.3.tar.xz/cmake/macos/simd.cmake Deleted

obs-studio-29.1.3.tar.xz/deps/jansson Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/.clang-format Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/.gitignore Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/.travis.yml Deleted

@@ -1,22 +0,0 @@
-env:
-  matrix:
-    - JANSSON_BUILD_METHOD=cmake JANSSON_CMAKE_OPTIONS="-DJANSSON_TEST_WITH_VALGRIND=ON" JANSSON_EXTRA_INSTALL="valgrind"
-    - JANSSON_BUILD_METHOD=autotools
-    - JANSSON_BUILD_METHOD=coverage JANSSON_CMAKE_OPTIONS="-DJANSSON_COVERAGE=ON -DJANSSON_COVERALLS=ON -DCMAKE_BUILD_TYPE=Debug" JANSSON_EXTRA_INSTALL="lcov curl"
-language: c
-compiler:
-  - gcc
-  - clang
-matrix:
-  exclude:
-    - compiler: clang
-      env: JANSSON_BUILD_METHOD=coverage JANSSON_CMAKE_OPTIONS="-DJANSSON_COVERAGE=ON -DJANSSON_COVERALLS=ON -DCMAKE_BUILD_TYPE=Debug" JANSSON_EXTRA_INSTALL="lcov curl"
-  allow_failures:
-    - env: JANSSON_BUILD_METHOD=coverage JANSSON_CMAKE_OPTIONS="-DJANSSON_COVERAGE=ON -DJANSSON_COVERALLS=ON -DCMAKE_BUILD_TYPE=Debug" JANSSON_EXTRA_INSTALL="lcov curl"
-install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -qq cmake $JANSSON_EXTRA_INSTALL
-script:
-  - if  "$JANSSON_BUILD_METHOD" = "autotools" ; then autoreconf -f -i && CFLAGS=-Werror ./configure && make check; fi
-  - if  "$JANSSON_BUILD_METHOD" = "cmake" ; then mkdir build && cd build && cmake $JANSSON_CMAKE_OPTIONS .. && cmake --build . && ctest --output-on-failure; fi
-  - if  "$JANSSON_BUILD_METHOD" = "coverage" ; then mkdir build && cd build && cmake $JANSSON_CMAKE_OPTIONS .. && cmake --build . && cmake --build . --target coveralls; fi

obs-studio-29.1.3.tar.xz/deps/jansson/Android.mk Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/CHANGES Deleted

@@ -1,796 +0,0 @@
-Version 2.9
-===========
-
-Released 2016-09-18
-
-* New features:
-
-  - Add ``json_auto_t`` to automatically decref a value that goes out
-    of scope. Available only on GCC and Clang. (#301)
-
-* Build:
-
-  - Fix CMake build (at least on Linux) by removing conflicting
-    jansson_config.h from the distribution (#306)
-
-  - Change CMake install target generation to be optional (#305)
-
-* Documentation:
-
-  - Small documentation fixes.
-
-
-Version 2.8
-===========
-
-Released 2016-08-30
-
-* New features:
-
-  - Always preserve insertion order of object items.
-    `json_object_iter()` and friends, `json_object_foreach()` and
-    `json_dumps()` and friends now always work in the insertion order of
-    object items (#293).
-
-  - Add `json_object_foreach_safe()` macro that allows
-    `json_object_del()` calls during iteration (#230).
-
-  - Add `json_get_alloc_funcs()` to allow reading the allocation
-    functions set by `json_set_alloc_funcs()` (#262, #264).
-
-  - Add `json_pack()` format specifiers s?, o? and O? for values that
-    can be null (#261, #270).
-
-* Bug fixes:
-
-  - Fix a crash when parsing inputs consisting of very deeply nested
-    arrays or objects (#282, #284).
-
-  - Never convert numbers to integers in the parser when
-    JSON_DECODE_INT_AS_REAL is set. This fixes error messages for
-    overflowing numbers when JSON_DECODE_INT_AS_REAL is set (#212).
-
-  - Fix a use-after-free in `json_pack()` error handling.
-
-  - Fix subnormal number parsing on mingw32.
-
-  - Handle out-of-memory situations gracefully in the hashtable
-    implementation (#298).
-
-* Build:
-
-  - Fix build with CMake on all versions of Visual Studio up to 2015
-    (#262, #289).
-
-  - Fix pkgconfig libdir when using CMake (#268).
-
-  - Fix CMake config for static CRT builds on Windows (#206).
-
-  - Fix warnings on LLVM 6.0 targeting iOS arm64 (#208).
-
-  - Add coverlls.io support via Travis for a nice test coverage badge
-    (#211).
-
-  - Don't expect ``jansson_config.h`` to be in the compiler's include
-    path (#209).
-
-  - Add a build-time option to set initial hashtable size (#213).
-
-  - Use snprintf and strncpy in place of sprintf and strcpy to silence
-    linker warnings on OpenBSD (#233).
-
-* Documentation:
-
-  - Fix various typos in documentation, and a broken link (#258).
-
-  - Add an example program in ``examples/`` (#214, #217).
-
-  - Fix building of documentation man pages (#207).
-
-  - Document the fact that copying objects doesn't preserve the
-    insertion order of keys (#237).
-
-* Tests:
-
-  - Don't use the nonstandard __FUNCTION__ macro in tests.
-
-  - Use expr instead of $((...)) in shell scripts for Solaris 10
-    compatibility.
-
-  - Disable Visual Studio warning C4756 when triggered deliberately in
-    tests (#216).
-
-  - Other minor fixes (#221, #248).
-
-* Other changes:
-
-  - List all unrecognized object keys when strict unpacking fails
-    (#263).
-
-  - Alter the order of the members of the hashtable_pair struct for
-    easier debugging.
-
-  - Minor performance improvement to `json_dump()` and friends (#234).
-
-  - Minor style fixes (#255, #257).
-
-
-Version 2.7
-===========
-
-Released 2014-10-02
-
-* New features:
-
-  - `json_pack()` and friends: Add format specifiers ``s%`` and ``+%``
-    for a size_t string length (#141).
-
-  - `json_unpack()` and friends: Add format specifier ``s%`` for
-    unpacking the string length along with the string itself (#141).
-
-  - Add length-aware string constructors `json_stringn()` and
-    `json_stringn_nocheck()`, length-aware string mutators
-    `json_string_setn()` and `json_string_setn_nocheck()`, and a
-    function for getting string's length `json_string_length()` (#141,
-    #143).
-
-  - Support ``\u0000`` escapes in the decoder. The support can be
-    enabled by using the ``JSON_ALLOW_NUL`` decoding flag (#141).
-
-  - Add `json_boolean_value()` as an alias for `json_is_true()`
-    (#146).
-
-  - Add JSON_REAL_PRECISION encoding flag/macro for controlling real
-    number precision (#178).
-
-  - Define the maximum indentation as JSON_MAX_INDENT (#191).
-
-* Bug fixes:
-
-  - Some malformed ``\uNNNN`` escapes could crash the decoder with an
-    assertion failure.
-
-  - Avoid integer overflows with very long strings in UTF-8 decoder and
-    hashtable.
-
-  - Check for *NULL* key in `json_object_get()` and
-    `json_object_del()` (#151).
-
-  - Enhance hashtable seeding on Windows (#162).
-
-  - `json_unpack()`: Allow mixing JSON_STRICT with optional keys
-    (#162, #163).
-
-  - Fix int/int32 mismatch (#142).
-
-  - Parse subnormal numbers correctly (#202).
-
-* Build:
-
-  - Remove VS2010 build files. CMake should be used on Windows instead
-    (#165).
-
-  - Fix CMake build flags for MinGW (#193).
-
-  - Add CMake config files for find_package. Rename config.h to
-    jansson_private_config.h (#157, #159).
-
-  - Make Valgrind checks work with CMake (#160).
-
-  - Fix feature checks to use correct __ATOMIC flags.
-
-  - Fix CMake checks for uint16_t and uint8_t support (#177).
-
-  - Make Jansson build on SmartOS/Solaris (#171).
-
-  - Work around a GCC bug on Solaris (#175).
-
-  - Fix autoreconf on Debian (#182).
-
-  - Don't use GNU make specific export for global AM_CFLAGS (#203,
-    #204).
-
-  - Fix building on Android using the supplied Android.mk (#166,
-    #174).
-
-  - Android.mk: Add -DHAVE_STDINT_H to LOCAL_CFLAGS (#200).
-
-* Documentation:
-
-  - Document JANSSON_BUILD_SHARED_LIBS CMake option (#187).
-
-* Tests:
-
-  - Close file handles correctly (#198).
-
-* Other changes:
-
-  - ``\uNNNN`` escapes are now encoded in upper case for better
-    readability.
-
-  - Enable usage of AddressSanitizer (#180).
-
-
-Version 2.6
-===========
-
-Released 2014-02-11
-
-* Security:
-
-  - CVE-2013-6401: The hash function used by the hashtable
-    implementation has been changed, and is automatically seeded with
-    random data when the first JSON object is created. This prevents
-    an attacker from causing large JSON objects with specially crafted
-    keys perform poorly.
-
-* New features:
-
-  - `json_object_seed()`: Set the seed value of the hash function.
-
-* Bug fixes:
-
-  - Include CMake specific files in the release tarball.
-
-* Documentation:
-
-  - Fix tutorial source to send a User-Agent header, which is now
-    required by the GitHub API.
-
-  - Set all memory to zero in secure_free() example.
-
-
-Version 2.5
-===========
-
-Released 2013-09-19
-
-* New features:
-
-  - `json_pack()` and friends: Add format specifiers ``s#``, ``+`` and
-    ``+#``.
-
-  - Add ``JSON_DECODE_INT_AS_REAL`` decoding flag to treat all numbers
-    as real in the decoder (#123).
-
-  - Add `json_array_foreach()`, paralleling `json_object_foreach()`
-    (#118).
-
-* Bug fixes:
-
-  - `json_dumps()` and friends: Don't crash if json is *NULL* and
-    ``JSON_ENCODE_ANY`` is set.
-
-  - Fix a theoretical integer overflow in `jsonp_strdup()`.
-
-  - Fix `l_isxdigit()` macro (#97).
-
-  - Fix an off-by-one error in `json_array_remove()`.
-
-* Build:
-
-  - Support CMake in addition to GNU Autotools (#106, #107, #112,
-    #115, #120, #127).
-
-  - Support building for Android (#109).
-
-  - Don't use ``-Werror`` by default.
-
-  - Support building and testing with VPATH (#93).
-
-  - Fix compilation when ``NDEBUG`` is defined (#128)
-
-* Tests:
-
-  - Fix a refleak in ``test/bin/json_process.c``.
-
-* Documentation:
-
-  - Clarify the return value of `json_load_callback_t`.
-
-  - Document how to circumvent problems with separate heaps on Windows.
-
-  - Fix memory leaks and warnings in ``github_commits.c``.
-
-  - Use `json_decref()` properly in tutorial.
-
-* Other:
-
-  - Make it possible to forward declare ``struct json_t``.
-
-
-Version 2.4
-===========
-
-Released 2012-09-23
-
-* New features:
-
-  - Add `json_boolean()` macro that returns the JSON true or false
-    value based on its argument (#86).
-
-  - Add `json_load_callback()` that calls a callback function
-    repeatedly to read the JSON input (#57).
-
-  - Add JSON_ESCAPE_SLASH encoding flag to escape all occurences of
-    ``/`` with ``\/``.
-
-* Bug fixes:
-
-  - Check for and reject NaN and Inf values for reals. Encoding these
-    values resulted in invalid JSON.
-
-  - Fix `json_real_set()` to return -1 on error.
-
-* Build:
-
-  - Jansson now builds on Windows with Visual Studio 2010, and
-    includes solution and project files in ``win32/vs2010/``
-    directory.
-
-  - Fix build warnings (#77, #78).
-
-  - Add ``-no-undefined`` to LDFLAGS (#90).
-
-* Tests:
-
-  - Fix the symbol exports test on Linux/PPC64 (#88).
-
-* Documentation:
-
-  - Fix typos (#73, #84).
-
-
-Version 2.3.1
-=============
-
-Released 2012-04-20
-
-* Build issues:
-
-  - Only use ``long long`` if ``strtoll()`` is also available.
-
-* Documentation:
-
-  - Fix the names of library version constants in documentation. (#52)
-
-  - Change the tutorial to use GitHub API v3. (#65)
-
-* Tests:
-
-  - Make some tests locale independent. (#51)
-
-  - Distribute the library exports test in the tarball.
-
-  - Make test run on shells that don't support the ``export FOO=bar``
-    syntax.
-
-
-Version 2.3
-===========
-
-Released 2012-01-27
-
-* New features:
-
-  - `json_unpack()` and friends: Add support for optional object keys
-    with the ``{s?o}`` syntax.
-
-  - Add `json_object_update_existing()` and
-    `json_object_update_missing()`, for updating only existing keys or
-    only adding missing keys to an object. (#37)
-
-  - Add `json_object_foreach()` for more convenient iteration over
-    objects. (#45, #46)
-
-  - When decoding JSON, write the number of bytes that were read from
-    input to ``error.position`` also on success. This is handy with
-    ``JSON_DISABLE_EOF_CHECK``.
-
-  - Add support for decoding any JSON value, not just arrays or
-    objects. The support is enabled with the new ``JSON_DECODE_ANY``
-    flag. Patch by Andrea Marchesini. (#4)
-
-* Bug fixes
-
-  - Avoid problems with object's serial number growing too big. (#40,
-    #41)
-
-  - Decoding functions now return NULL if the first argument is NULL.
-    Patch by Andrea Marchesini.
-
-  - Include ``jansson_config.h.win32`` in the distribution tarball.
-
-  - Remove ``+`` and leading zeros from exponents in the encoder.
-    (#39)
-
-  - Make Jansson build and work on MinGW. (#39, #38)
-
-* Documentation
-
-  - Note that the same JSON values must not be encoded in parallel by
-    separate threads. (#42)
-
-  - Document MinGW support.
-
-
-Version 2.2.1
-=============
-
-Released 2011-10-06
-
-* Bug fixes:
-
-  - Fix real number encoding and decoding under non-C locales. (#32)
-
-  - Fix identifier decoding under non-UTF-8 locales. (#35)
-
-  - `json_load_file()`: Open the input file in binary mode for maximum
-    compatiblity.
-
-* Documentation:
-
-  - Clarify the lifecycle of the result of the ``s`` fromat of
-    `json_unpack()`. (#31)
-
-  - Add some portability info. (#36)
-
-  - Little clarifications here and there.
-
-* Other:
-
-  - Some style fixes, issues detected by static analyzers.
-
-
-Version 2.2
-===========
-
-Released 2011-09-03
-
-* New features:
-
-  - `json_dump_callback()`: Pass the encoder output to a callback
-    function in chunks.
-
-* Bug fixes:
-
-  - `json_string_set()`: Check that target is a string and value is
-    not NULL.
-
-* Other:
-
-  - Documentation typo fixes and clarifications.
-
-
-Version 2.1
-===========
-
-Released 2011-06-10
-
-* New features:
-
-  - `json_loadb()`: Decode a string with a given size, useful if the
-    string is not null terminated.
-
-  - Add ``JSON_ENCODE_ANY`` encoding flag to allow encoding any JSON
-    value. By default, only arrays and objects can be encoded. (#19)
-
-  - Add ``JSON_REJECT_DUPLICATES`` decoding flag to issue a decoding
-    error if any JSON object in the input contins duplicate keys. (#3)
-
-  - Add ``JSON_DISABLE_EOF_CHECK`` decoding flag to stop decoding after a
-    valid JSON input. This allows other data after the JSON data.
-
-* Bug fixes:
-
-  - Fix an additional memory leak when memory allocation fails in
-    `json_object_set()` and friends.
-
-  - Clear errno before calling `strtod()` for better portability. (#27)
-
-* Building:
-
-  - Avoid set-but-not-used warning/error in a test. (#20)
-
-* Other:
-
-  - Minor clarifications to documentation.
-
-
-Version 2.0.1
-=============
-
-Released 2011-03-31
-
-* Bug fixes:
-
-  - Replace a few `malloc()` and `free()` calls with their
-    counterparts that support custom memory management.
-
-  - Fix object key hashing in json_unpack() strict checking mode.
-
-  - Fix the parentheses in ``JANSSON_VERSION_HEX`` macro.
-
-  - Fix `json_object_size()` return value.
-
-  - Fix a few compilation issues.
-
-* Portability:
-
-  - Enhance portability of `va_copy()`.
-
-  - Test framework portability enhancements.
-
-* Documentation:
-
-  - Distribute ``doc/upgrading.rst`` with the source tarball.
-
-  - Build documentation in strict mode in ``make distcheck``.
-
-
-Version 2.0
-===========
-
-Released 2011-02-28
-
-This release is backwards incompatible with the 1.x release series.
-See the chapter "Upgrading from older versions" in documentation for
-details.
-
-* Backwards incompatible changes:
-
-  - Unify unsigned integer usage in the API: All occurences of
-    unsigned int and unsigned long have been replaced with size_t.
-
-  - Change JSON integer's underlying type to the widest signed integer
-    type available, i.e. long long if it's supported, otherwise long.
-    Add a typedef json_int_t that defines the type.
-
-  - Change the maximum indentation depth to 31 spaces in encoder. This
-    frees up bits from the flags parameter of encoding functions
-    `json_dumpf()`, `json_dumps()` and `json_dump_file()`.
-
-  - For future needs, add a flags parameter to all decoding functions
-    `json_loadf()`, `json_loads()` and `json_load_file()`.
-
-* New features
-
-  - `json_pack()`, `json_pack_ex()`, `json_vpack_ex()`: Create JSON
-    values based on a format string.
-
-  - `json_unpack()`, `json_unpack_ex()`, `json_vunpack_ex()`: Simple
-    value extraction and validation functionality based on a format
-    string.
-
-  - Add column, position and source fields to the ``json_error_t``
-    struct.
-
-  - Enhance error reporting in the decoder.
-
-  - ``JANSSON_VERSION`` et al.: Preprocessor constants that define the
-    library version.
-
-  - `json_set_alloc_funcs()`: Set custom memory allocation functions.
-
-* Fix many portability issues, especially on Windows.
-
-* Configuration
-
-  - Add file ``jansson_config.h`` that contains site specific
-    configuration. It's created automatically by the configure script,
-    or can be created by hand if the configure script cannot be used.
-    The file ``jansson_config.h.win32`` can be used without
-    modifications on Windows systems.
-
-  - Add a section to documentation describing how to build Jansson on
-    Windows.
-
-  - Documentation now requires Sphinx 1.0 or newer.
-
-
-Version 1.3
-===========
-
-Released 2010-06-13
-
-* New functions:
-
-  - `json_object_iter_set()`, `json_object_iter_set_new()`: Change
-    object contents while iterating over it.
-
-  - `json_object_iter_at()`: Return an iterator that points to a
-    specific object item.
-
-* New encoding flags:
-
-  - ``JSON_PRESERVE_ORDER``: Preserve the insertion order of object
-    keys.
-
-* Bug fixes:
-
-  - Fix an error that occured when an array or object was first
-    encoded as empty, then populated with some data, and then
-    re-encoded
-
-  - Fix the situation like above, but when the first encoding resulted
-    in an error
-
-* Documentation:
-
-  - Clarify the documentation on reference stealing, providing an
-    example usage pattern
-
-
-Version 1.2.1
-=============
-
-Released 2010-04-03
-
-* Bug fixes:
-
-  - Fix reference counting on ``true``, ``false`` and ``null``
-  - Estimate real number underflows in decoder with 0.0 instead of
-    issuing an error
-
-* Portability:
-
-  - Make ``int32_t`` available on all systems
-  - Support compilers that don't have the ``inline`` keyword
-  - Require Autoconf 2.60 (for ``int32_t``)
-
-* Tests:
-
-  - Print test names correctly when ``VERBOSE=1``
-  - ``test/suites/api``: Fail when a test fails
-  - Enhance tests for iterators
-  - Enhance tests for decoding texts that contain null bytes
-
-* Documentation:
-
-  - Don't remove ``changes.rst`` in ``make clean``
-  - Add a chapter on RFC conformance
-
-
-Version 1.2
-===========
-
-Released 2010-01-21
-
-* New functions:
-
-  - `json_equal()`: Test whether two JSON values are equal
-  - `json_copy()` and `json_deep_copy()`: Make shallow and deep copies
-    of JSON values
-  - Add a version of all functions taking a string argument that
-    doesn't check for valid UTF-8: `json_string_nocheck()`,
-    `json_string_set_nocheck()`, `json_object_set_nocheck()`,
-    `json_object_set_new_nocheck()`
-
-* New encoding flags:
-
-  - ``JSON_SORT_KEYS``: Sort objects by key
-  - ``JSON_ENSURE_ASCII``: Escape all non-ASCII Unicode characters
-  - ``JSON_COMPACT``: Use a compact representation with all unneeded
-    whitespace stripped
-
-* Bug fixes:
-
-  - Revise and unify whitespace usage in encoder: Add spaces between
-    array and object items, never append newline to output.
-  - Remove const qualifier from the ``json_t`` parameter in
-    `json_string_set()`, `json_integer_set()` and `json_real_set`.
-  - Use ``int32_t`` internally for representing Unicode code points
-    (int is not enough on all platforms)
-
-* Other changes:
-
-  - Convert ``CHANGES`` (this file) to reStructured text and add it to
-    HTML documentation
-  - The test system has been refactored. Python is no longer required
-    to run the tests.
-  - Documentation can now be built by invoking ``make html``
-  - Support for pkg-config
-
-
-Version 1.1.3
-=============
-
-Released 2009-12-18
-
-* Encode reals correctly, so that first encoding and then decoding a
-  real always produces the same value
-* Don't export private symbols in ``libjansson.so``
-
-
-Version 1.1.2
-=============
-
-Released 2009-11-08
-
-* Fix a bug where an error message was not produced if the input file
-  could not be opened in `json_load_file()`
-* Fix an assertion failure in decoder caused by a minus sign without a
-  digit after it
-* Remove an unneeded include of ``stdint.h`` in ``jansson.h``
-
-
-Version 1.1.1
-=============
-
-Released 2009-10-26
-
-* All documentation files were not distributed with v1.1; build
-  documentation in make distcheck to prevent this in the future
-* Fix v1.1 release date in ``CHANGES``
-
-
-Version 1.1
-===========
-
-Released 2009-10-20
-
-* API additions and improvements:
-
-  - Extend array and object APIs
-  - Add functions to modify integer, real and string values
-  - Improve argument validation
-  - Use unsigned int instead of ``uint32_t`` for encoding flags
-
-* Enhance documentation
-
-  - Add getting started guide and tutorial
-  - Fix some typos
-  - General clarifications and cleanup
-
-* Check for integer and real overflows and underflows in decoder
-* Make singleton values thread-safe (``true``, ``false`` and ``null``)
-* Enhance circular reference handling
-* Don't define ``-std=c99`` in ``AM_CFLAGS``
-* Add C++ guards to ``jansson.h``
-* Minor performance and portability improvements
-* Expand test coverage
-
-
-Version 1.0.4
-=============
-
-Released 2009-10-11
-
-* Relax Autoconf version requirement to 2.59
-* Make Jansson compile on platforms where plain ``char`` is unsigned
-* Fix API tests for object
-
-
-Version 1.0.3
-=============
-
-Released 2009-09-14
-
-* Check for integer and real overflows and underflows in decoder
-* Use the Python json module for tests, or simplejson if the json
-  module is not found
-* Distribute changelog (this file)
-
-
-Version 1.0.2
-=============
-
-Released 2009-09-08
-
-* Handle EOF correctly in decoder
-
-
-Version 1.0.1
-=============
-
-Released 2009-09-04
-
-* Fixed broken `json_is_boolean()`
-
-
-Version 1.0
-===========
-
-Released 2009-08-25
-
-* Initial release

obs-studio-29.1.3.tar.xz/deps/jansson/CMakeLists.txt Deleted

@@ -1,711 +0,0 @@
-# Notes:
-#
-# Author: Paul Harris, June 2012 Additions: Joakim Soderberg, Febuary 2013
-#
-# Supports: building static/shared, release/debug/etc, can also build html docs
-# and some of the tests. Note that its designed for out-of-tree builds, so it
-# will not pollute your source tree.
-#
-# TODO 1: Finish implementing tests. api tests are working, but the valgrind
-# variants are not flagging problems.
-#
-# TODO 2: There is a check_exports script that would try and incorporate.
-#
-# TODO 3: Consolidate version numbers, currently the version number is written
-# into: * cmake (here) * autotools (the configure) * source code header files.
-# Should not be written directly into header files, autotools/cmake can do that
-# job.
-#
-# Brief intro on how to use cmake: > mkdir build (somewhere - we do out-of-tree
-# builds) > use cmake, ccmake, or cmake-gui to configure the project. for linux,
-# you can only choose one variant: release,debug,etc... and static or shared. >>
-# example: >> cd build >> ccmake -i ../path_to_jansson_dir >>  inside, configure
-# your options. press C until there are no lines with * next to them. >>  note,
-# I like to configure the 'install' path to ../install, so I get self-contained
-# clean installs I can point other projects to. >>  press G to 'generate' the
-# project files. >> make (to build the project) >> make install >> make test (to
-# run the tests, if you enabled them)
-#
-# Brief description on how it works: There is a small heirachy of CMakeLists.txt
-# files which define how the project is built. Header file detection etc is
-# done, and the results are written into config.h and jansson_config.h, which
-# are generated from the corresponding config.h.cmake and jansson_config.h.cmake
-# template files. The generated header files end up in the build directory - not
-# in the source directory. The rest is down to the usual make process.
-
-cmake_minimum_required(VERSION 2.8.12)
-# required for exports? cmake_minimum_required (VERSION 2.8.6)
-project(jansson C)
-
-# Options
-option(JANSSON_BUILD_SHARED_LIBS "Build shared libraries." OFF)
-option(USE_URANDOM "Use /dev/urandom to seed the hash function." ON)
-option(USE_WINDOWS_CRYPTOAPI "Use CryptGenRandom to seed the hash function." ON)
-
-if(MSVC)
-  # This option must match the settings used in your program, in particular if
-  # you are linking statically
-  option(JANSSON_STATIC_CRT "Link the static CRT libraries" ON)
-endif()
-
-# Disabled by OBS
-option(JANSSON_EXAMPLES "Compile example applications" OFF)
-
-if(UNIX)
-  option(
-    JANSSON_COVERAGE
-    "(GCC Only! Requires gcov/lcov to be installed). Include target for doing coverage analysis for the test suite. Note that -DCMAKE_BUILD_TYPE=Debug must be set"
-    OFF)
-  option(JANSSON_COVERALLS "Generate coverage info for Coveralls" OFF)
-  option(JANSSON_COVERALLS_UPLOAD
-         "Upload coverage info to Coveralls (Only works via Travis)" ON)
-endif()
-
-# Set some nicer output dirs.
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-set(JANSSON_TEMP_DIR ${PROJECT_BINARY_DIR}/tmp)
-
-# Give the debug version a different postfix for windows, so both the debug and
-# release version can be built in the same build-tree on Windows (MSVC).
-if(WIN32)
-  set(CMAKE_DEBUG_POSTFIX "_d")
-endif(WIN32)
-
-# This is how I thought it should go set (JANSSON_VERSION "2.3.1") set
-# (JANSSON_SOVERSION 2)
-
-set(JANSSON_DISPLAY_VERSION "2.9")
-
-# This is what is required to match the same numbers as automake's
-set(JANSSON_VERSION "4.9.0")
-set(JANSSON_SOVERSION 4)
-
-# for CheckFunctionKeywords
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-include(CheckCSourceCompiles)
-include(CheckFunctionExists)
-include(CheckFunctionKeywords)
-include(CheckIncludeFiles)
-include(CheckTypeSize)
-
-if(MSVC)
-  # Turn off Microsofts "security" warnings.
-  add_definitions("/W3 /D_CRT_SECURE_NO_WARNINGS /wd4005 /wd4996 /nologo")
-
-  # Disabled by OBS, options already set by top level CMakeLists
-  if(FALSE)
-    if(JANSSON_STATIC_CRT)
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
-      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MTd")
-    endif()
-  endif()
-
-endif()
-
-if(NOT WIN32 AND NOT APPLE)
-  add_definitions("-fPIC")
-endif()
-
-message("C compiler: ${CMAKE_C_COMPILER_ID}")
-
-# Coverage only works with GCC for a debug build.
-if(JANSSON_COVERALLS)
-  set(JANSSON_COVERAGE ON)
-endif()
-
-if(JANSSON_COVERAGE)
-  include(CodeCoverage)
-  include(Coveralls)
-
-  # This adds coverage arguments to gcc/clang.
-  coveralls_turn_on_coverage()
-endif()
-
-check_include_files(endian.h HAVE_ENDIAN_H)
-check_include_files(fcntl.h HAVE_FCNTL_H)
-check_include_files(sched.h HAVE_SCHED_H)
-check_include_files(unistd.h HAVE_UNISTD_H)
-check_include_files(sys/param.h HAVE_SYS_PARAM_H)
-check_include_files(sys/stat.h HAVE_SYS_STAT_H)
-check_include_files(sys/time.h HAVE_SYS_TIME_H)
-check_include_files(sys/time.h HAVE_SYS_TYPES_H)
-
-check_function_exists(close HAVE_CLOSE)
-check_function_exists(getpid HAVE_GETPID)
-check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
-check_function_exists(open HAVE_OPEN)
-check_function_exists(read HAVE_READ)
-check_function_exists(sched_yield HAVE_SCHED_YIELD)
-
-# Check for the int-type includes
-check_include_files(stdint.h HAVE_STDINT_H)
-
-# Check our 64 bit integer sizes
-check_type_size(__int64 __INT64)
-check_type_size(int64_t INT64_T)
-check_type_size("long long" LONG_LONG_INT)
-
-# Check our 32 bit integer sizes
-check_type_size(int32_t INT32_T)
-check_type_size(__int32 __INT32)
-check_type_size("long" LONG_INT)
-check_type_size("int" INT)
-if(HAVE_INT32_T)
-  set(JSON_INT32 int32_t)
-elseif(HAVE___INT32)
-  set(JSON_INT32 __int32)
-elseif(HAVE_LONG_INT AND (${LONG_INT} EQUAL 4))
-  set(JSON_INT32 long)
-elseif(HAVE_INT AND (${INT} EQUAL 4))
-  set(JSON_INT32 int)
-else()
-  message(FATAL_ERROR "Could not detect a valid 32-bit integer type")
-endif()
-
-check_type_size("unsigned long" UNSIGNED_LONG_INT)
-check_type_size("unsigned int" UNSIGNED_INT)
-check_type_size("unsigned short" UNSIGNED_SHORT)
-
-check_type_size(uint32_t UINT32_T)
-check_type_size(__uint32 __UINT32)
-if(HAVE_UINT32_T)
-  set(JSON_UINT32 uint32_t)
-elseif(HAVE___UINT32)
-  set(JSON_UINT32 __uint32)
-elseif(HAVE_UNSIGNED_LONG_INT AND (${UNSIGNED_LONG_INT} EQUAL 4))
-  set(JSON_UINT32 "unsigned long")
-elseif(HAVE_UNSIGNED_INT AND (${UNSIGNED_INT} EQUAL 4))
-  set(JSON_UINT32 "unsigned int")
-else()
-  message(FATAL_ERROR "Could not detect a valid unsigned 32-bit integer type")
-endif()
-
-check_type_size(uint16_t UINT16_T)
-check_type_size(__uint16 __UINT16)
-if(HAVE_UINT16_T)
-  set(JSON_UINT16 uint16_t)
-elseif(HAVE___UINT16)
-  set(JSON_UINT16 __uint16)
-elseif(HAVE_UNSIGNED_INT AND (${UNSIGNED_INT} EQUAL 2))
-  set(JSON_UINT16 "unsigned int")
-elseif(HAVE_UNSIGNED_SHORT AND (${UNSIGNED_SHORT} EQUAL 2))
-  set(JSON_UINT16 "unsigned short")
-else()
-  message(FATAL_ERROR "Could not detect a valid unsigned 16-bit integer type")
-endif()
-
-check_type_size(uint8_t UINT8_T)
-check_type_size(__uint8 __UINT8)
-if(HAVE_UINT8_T)
-  set(JSON_UINT8 uint8_t)
-elseif(HAVE___UINT8)
-  set(JSON_UINT8 __uint8)
-else()
-  set(JSON_UINT8 "unsigned char")
-endif()
-
-# Check for ssize_t and SSIZE_T existance.
-check_type_size(ssize_t SSIZE_T)
-check_type_size(SSIZE_T UPPERCASE_SSIZE_T)
-if(NOT HAVE_SSIZE_T)
-  if(HAVE_UPPERCASE_SSIZE_T)
-    set(JSON_SSIZE SSIZE_T)
-  else()
-    set(JSON_SSIZE int)
-  endif()
-endif()
-set(CMAKE_EXTRA_INCLUDE_FILES "")
-
-# Check for all the variants of strtoll
-check_function_exists(strtoll HAVE_STRTOLL)
-check_function_exists(strtoq HAVE_STRTOQ)
-check_function_exists(_strtoi64 HAVE__STRTOI64)
-
-# Figure out what variant we should use
-if(HAVE_STRTOLL)
-  set(JSON_STRTOINT strtoll)
-elseif(HAVE_STRTOQ)
-  set(JSON_STRTOINT strtoq)
-elseif(HAVE__STRTOI64)
-  set(JSON_STRTOINT _strtoi64)
-else()
-  # fallback to strtol (32 bit) this will set all the required variables
-  set(JSON_STRTOINT strtol)
-  set(JSON_INT_T long)
-  set(JSON_INTEGER_FORMAT "\"ld\"")
-endif()
-
-# if we haven't defined JSON_INT_T, then we have a 64 bit conversion function.
-# detect what to use for the 64 bit type. Note: I will prefer long long if I can
-# get it, as that is what the automake system aimed for.
-if(NOT DEFINED JSON_INT_T)
-  if(HAVE_LONG_LONG_INT AND ((${LONG_LONG_INT}) EQUAL 8))
-    set(JSON_INT_T "long long")
-  elseif(HAVE_INT64_T)
-    set(JSON_INT_T int64_t)
-  elseif(HAVE___INT64)
-    set(JSON_INT_T __int64)
-  else()
-    message(
-      FATAL_ERROR
-        "Could not detect 64 bit type, although I detected the strtoll equivalent"
-    )
-  endif()
-
-  # Apparently, Borland BCC and MSVC wants I64d, Borland BCC could also accept
-  # LD and gcc wants ldd, I am not sure what cygwin will want, so I will assume
-  # I64d
-
-  if(WIN32) # matches both msvc and cygwin
-    set(JSON_INTEGER_FORMAT "\"I64d\"")
-  else()
-    set(JSON_INTEGER_FORMAT "\"lld\"")
-  endif()
-endif()
-
-# If locale.h and localeconv() are available, define to 1, otherwise to 0.
-check_include_files(locale.h HAVE_LOCALE_H)
-check_function_exists(localeconv HAVE_LOCALECONV)
-
-if(HAVE_LOCALECONV AND HAVE_LOCALE_H)
-  set(JSON_HAVE_LOCALECONV 1)
-else()
-  set(JSON_HAVE_LOCALECONV 0)
-endif()
-
-# check if we have setlocale
-check_function_exists(setlocale HAVE_SETLOCALE)
-
-# Check what the inline keyword is. Note that the original JSON_INLINE was
-# always set to just 'inline', so this goes further.
-check_function_keywords("inline")
-check_function_keywords("__inline")
-check_function_keywords("__inline__")
-
-if(HAVE_INLINE)
-  set(JSON_INLINE inline)
-elseif(HAVE___INLINE)
-  set(JSON_INLINE __inline)
-elseif(HAVE___INLINE__)
-  set(JSON_INLINE __inline__)
-else()
-  # no inline on this platform
-  set(JSON_INLINE)
-endif()
-
-check_c_source_compiles(
-  "int main() { unsigned long val; __sync_bool_compare_and_swap(&val, 0, 1); return 0; } "
-  HAVE_SYNC_BUILTINS)
-check_c_source_compiles(
-  "int main() { char l; unsigned long v; __atomic_test_and_set(&l, __ATOMIC_RELAXED); __atomic_store_n(&v, 1, __ATOMIC_RELEASE); __atomic_load_n(&v, __ATOMIC_ACQUIRE); return 0; }"
-  HAVE_ATOMIC_BUILTINS)
-
-set(JANSSON_INITIAL_HASHTABLE_ORDER
-    3
-    CACHE
-      STRING
-      "Number of buckets new object hashtables contain is 2 raised to this power. The default is 3, so empty hashtables contain 2^3 = 8 buckets."
-)
-
-# configure the public config file
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/jansson_config.h.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/include/jansson_config.h)
-
-# Copy the jansson.h file to the public include folder
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/src/jansson.h
-     DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
-
-add_definitions(-DJANSSON_USING_CMAKE)
-
-# configure the private config file
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/jansson_private_config.h.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/private_include/jansson_private_config.h)
-
-# and tell the source code to include it
-add_definitions(-DHAVE_CONFIG_H)
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/private_include)
-
-# Add the lib sources.
-file(GLOB JANSSON_SRC src/*.c)
-
-set(JANSSON_HDR_PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/hashtable.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/jansson_private.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/strbuffer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/utf.h
-    ${CMAKE_CURRENT_BINARY_DIR}/private_include/jansson_private_config.h)
-
-set(JANSSON_HDR_PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/include/jansson_config.h
-                       ${CMAKE_CURRENT_SOURCE_DIR}/src/jansson.h)
-
-source_group("Library Sources" FILES ${JANSSON_SRC})
-source_group("Library Private Headers" FILES ${JANSSON_HDR_PRIVATE})
-source_group("Library Public Headers" FILES ${JANSSON_HDR_PUBLIC})
-
-if(JANSSON_BUILD_SHARED_LIBS)
-  add_library(jansson SHARED ${JANSSON_SRC} ${JANSSON_HDR_PRIVATE}
-                             ${JANSSON_HDR_PUBLIC} src/jansson.def)
-
-  set_target_properties(jansson PROPERTIES VERSION ${JANSSON_VERSION}
-                                           SOVERSION ${JANSSON_SOVERSION})
-else()
-  add_library(jansson ${JANSSON_SRC} ${JANSSON_HDR_PRIVATE}
-                      ${JANSSON_HDR_PUBLIC})
-endif()
-set_target_properties(jansson PROPERTIES FOLDER "deps")
-
-if(JANSSON_EXAMPLES)
-  add_executable(simple_parse "${PROJECT_SOURCE_DIR}/examples/simple_parse.c")
-  target_link_libraries(simple_parse jansson)
-endif()
-
-# For building Documentation (uses Sphinx) Disabled by OBS
-option(JANSSON_BUILD_DOCS "Build documentation (uses python-sphinx)." OFF)
-if(JANSSON_BUILD_DOCS)
-  find_package(Sphinx)
-
-  if(NOT SPHINX_FOUND)
-    message(WARNING "Sphinx not found. Cannot generate documentation!
-      Set -DJANSSON_BUILD_DOCS=OFF to get rid of this message.")
-  else()
-    if(Sphinx_VERSION_STRING VERSION_LESS 1.0)
-      message(
-        WARNING
-          "Your Sphinx version is too old!
-               This project requires Sphinx v1.0 or above to produce
-               proper documentation (you have v${Sphinx_VERSION_STRING}).
-               You will get output but it will have errors.")
-    endif()
-
-    # configured documentation tools and intermediate build results
-    set(BINARY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/_build")
-
-    # Sphinx cache with pickled ReST documents
-    set(SPHINX_CACHE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_doctrees")
-
-    # CMake could be used to build the conf.py file too, eg it could
-    # automatically write the version of the program or change the theme. if(NOT
-    # DEFINED SPHINX_THEME) set(SPHINX_THEME default) endif()
-    #
-    # if(NOT DEFINED SPHINX_THEME_DIR) set(SPHINX_THEME_DIR) endif()
-    #
-    # configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
-    # "${BINARY_BUILD_DIR}/conf.py" @ONLY)
-
-    # TODO: Add support for all sphinx builders:
-    # http://sphinx-doc.org/builders.html
-
-    # Add documentation targets.
-    set(DOC_TARGETS html)
-
-    option(JANSSON_BUILD_MAN "Create a target for building man pages." ON)
-
-    if(JANSSON_BUILD_MAN)
-      if(Sphinx_VERSION_STRING VERSION_LESS 1.0)
-        message(
-          WARNING
-            "Sphinx version 1.0 > is required to build man pages. You have v${Sphinx_VERSION_STRING}."
-        )
-      else()
-        list(APPEND DOC_TARGETS man)
-      endif()
-    endif()
-
-    option(JANSSON_BUILD_LATEX
-           "Create a target for building latex docs (to create PDF)." OFF)
-
-    if(JANSSON_BUILD_LATEX)
-      find_package(LATEX)
-
-      if(NOT LATEX_COMPILER)
-        message("Couldn't find Latex, can't build latex docs using Sphinx")
-      else()
-        message(
-          "Latex found! If you have problems building, see Sphinx documentation for required Latex packages."
-        )
-        list(APPEND DOC_TARGETS latex)
-      endif()
-    endif()
-
-    # The doc target will build all documentation targets.
-    add_custom_target(doc)
-
-    foreach(DOC_TARGET ${DOC_TARGETS})
-      add_custom_target(
-        ${DOC_TARGET}
-        ${SPHINX_EXECUTABLE}
-        # -q   # Enable for quiet mode
-        -b
-        ${DOC_TARGET}
-        -d
-        "${SPHINX_CACHE_DIR}"
-        # -c "${BINARY_BUILD_DIR}" # enable if using cmake-generated conf.py
-        "${CMAKE_CURRENT_SOURCE_DIR}/doc"
-        "${CMAKE_CURRENT_BINARY_DIR}/doc/${DOC_TARGET}"
-        COMMENT "Building ${DOC_TARGET} documentation with Sphinx")
-
-      add_dependencies(doc ${DOC_TARGET})
-    endforeach()
-
-    message("Building documentation enabled for: ${DOC_TARGETS}")
-  endif()
-endif()
-
-# Disabled by OBS
-option(JANSSON_WITHOUT_TESTS "Don't build tests ('make test' to execute tests)"
-       ON)
-
-if(NOT JANSSON_WITHOUT_TESTS)
-  option(JANSSON_TEST_WITH_VALGRIND "Enable valgrind tests." OFF)
-
-  enable_testing()
-
-  if(JANSSON_TEST_WITH_VALGRIND)
-    # TODO: Add FindValgrind.cmake instead of having a hardcoded path.
-
-    add_definitions(-DVALGRIND)
-
-    # enable valgrind
-    set(CMAKE_MEMORYCHECK_COMMAND valgrind)
-    set(CMAKE_MEMORYCHECK_COMMAND_OPTIONS
-        "--error-exitcode=1 --leak-check=full --show-reachable=yes --track-origins=yes -q"
-    )
-
-    set(MEMCHECK_COMMAND
-        "${CMAKE_MEMORYCHECK_COMMAND} ${CMAKE_MEMORYCHECK_COMMAND_OPTIONS}")
-    separate_arguments(MEMCHECK_COMMAND)
-  endif()
-
-  #
-  # Test suites.
-  #
-  if(CMAKE_COMPILER_IS_GNUCC)
-    add_definitions(-Wall -Wextra -Wdeclaration-after-statement)
-  endif()
-
-  set(api_tests
-      test_array
-      test_copy
-      test_dump
-      test_dump_callback
-      test_equal
-      test_load
-      test_loadb
-      test_number
-      test_object
-      test_pack
-      test_simple
-      test_unpack)
-
-  # Doing arithmetic on void pointers is not allowed by Microsofts compiler such
-  # as secure_malloc and secure_free is doing, so exclude it for now.
-  if(NOT MSVC)
-    list(APPEND api_tests test_memory_funcs)
-  endif()
-
-  # Helper macro for building and linking a test program.
-  macro(build_testprog name dir)
-    add_executable(${name} ${dir}/${name}.c)
-    add_dependencies(${name} jansson)
-    target_link_libraries(${name} jansson)
-  endmacro(build_testprog)
-
-  # Create executables and tests/valgrind tests for API tests.
-  foreach(test ${api_tests})
-    build_testprog(${test} ${PROJECT_SOURCE_DIR}/test/suites/api)
-
-    if(JANSSON_TEST_WITH_VALGRIND)
-      add_test(memcheck__${test} ${MEMCHECK_COMMAND}
-               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test}
-               WORKING_DIRECTORY ${JANSSON_TEMP_DIR})
-    else()
-      add_test(${test} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${test}
-               WORKING_DIRECTORY ${JANSSON_TEMP_DIR})
-    endif()
-  endforeach()
-
-  # Test harness for the suites tests.
-  build_testprog(json_process ${PROJECT_SOURCE_DIR}/test/bin)
-
-  set(SUITE_TEST_CMD ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/json_process)
-  set(SUITES encoding-flags valid invalid invalid-unicode)
-  foreach(SUITE ${SUITES})
-    file(GLOB TESTDIRS ${jansson_SOURCE_DIR}/test/suites/${SUITE}/*)
-
-    foreach(TESTDIR ${TESTDIRS})
-      if(IS_DIRECTORY ${TESTDIR})
-        get_filename_component(TNAME ${TESTDIR} NAME)
-
-        if(JANSSON_TEST_WITH_VALGRIND)
-          add_test(memcheck__${SUITE}__${TNAME} ${MEMCHECK_COMMAND}
-                   ${SUITE_TEST_CMD} ${TESTDIR})
-        else()
-          add_test(${SUITE}__${TNAME} ${SUITE_TEST_CMD} ${TESTDIR})
-        endif()
-
-        if((${SUITE} STREQUAL "valid" OR ${SUITE} STREQUAL "invalid")
-           AND NOT EXISTS ${TESTDIR}/nostrip)
-          if(JANSSON_TEST_WITH_VALGRIND)
-            add_test(memcheck__${SUITE}__${TNAME}__strip ${MEMCHECK_COMMAND}
-                     ${SUITE_TEST_CMD} --strip ${TESTDIR})
-          else()
-            add_test(${SUITE}__${TNAME}__strip ${SUITE_TEST_CMD} --strip
-                     ${TESTDIR})
-          endif()
-        endif()
-      endif()
-    endforeach()
-  endforeach()
-
-  if(JANSSON_COVERAGE)
-    setup_target_for_coverage(
-      coverage # Coverage make target "make coverage".
-      coverage # Name of output directory.
-      make # Name of test runner executable.
-      test) # Arguments to the test runner above (make test).
-
-    if(JANSSON_COVERALLS)
-      set(COVERAGE_SRCS ${JANSSON_SRC})
-      coveralls_setup("${COVERAGE_SRCS}" ${JANSSON_COVERALLS_UPLOAD})
-    endif()
-  endif()
-
-  # Enable using "make check" just like the autotools project. By default cmake
-  # creates a target "make test"
-  add_custom_target(
-    check
-    COMMAND ${CMAKE_CTEST_COMMAND}
-    DEPENDS json_process ${api_tests})
-endif()
-
-#
-# Installation preparation.
-#
-
-# Allow the user to override installation directories.
-set(JANSSON_INSTALL_LIB_DIR
-    lib
-    CACHE PATH "Installation directory for libraries")
-set(JANSSON_INSTALL_BIN_DIR
-    bin
-    CACHE PATH "Installation directory for executables")
-set(JANSSON_INSTALL_INCLUDE_DIR
-    include
-    CACHE PATH "Installation directory for header files")
-
-if(WIN32 AND NOT CYGWIN)
-  set(DEF_INSTALL_CMAKE_DIR cmake)
-else()
-  set(DEF_INSTALL_CMAKE_DIR lib/cmake/jansson)
-endif()
-
-set(JANSSON_INSTALL_CMAKE_DIR
-    ${DEF_INSTALL_CMAKE_DIR}
-    CACHE PATH "Installation directory for CMake files")
-
-# Create pkg-conf file. (We use the same files as ./configure does, so we have
-# to defined the same variables used there).
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix ${CMAKE_INSTALL_PREFIX})
-set(libdir ${CMAKE_INSTALL_PREFIX}/${JANSSON_INSTALL_LIB_DIR})
-set(VERSION ${JANSSON_DISPLAY_VERSION})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/jansson.pc.in
-               ${CMAKE_CURRENT_BINARY_DIR}/jansson.pc @ONLY)
-
-# Make sure the paths are absolute.
-foreach(p LIB BIN INCLUDE CMAKE)
-  set(var JANSSON_INSTALL_${p}_DIR)
-  if(NOT IS_ABSOLUTE "${${var}}")
-    set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
-  endif()
-endforeach()
-
-# Export targets (This is used for other CMake projects to easily find the
-# libraries and include files).
-export(TARGETS jansson FILE "${PROJECT_BINARY_DIR}/JanssonTargets.cmake")
-export(PACKAGE jansson)
-
-# Generate the config file for the build-tree.
-set(JANSSON__INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include"
-                          "${PROJECT_BINARY_DIR}/include")
-set(JANSSON_INCLUDE_DIRS
-    ${JANSSON__INCLUDE_DIRS}
-    CACHE PATH "Jansson include directories")
-configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
-               ${PROJECT_BINARY_DIR}/JanssonConfig.cmake @ONLY)
-
-# Generate the config file for the installation tree.
-file(RELATIVE_PATH REL_INCLUDE_DIR "${JANSSON_INSTALL_CMAKE_DIR}"
-     "${JANSSON_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from
-                                       # the Cmake dir.
-
-# Note the EVENT_CMAKE_DIR is defined in JanssonConfig.cmake.in, we escape it
-# here so it's evaluated when it is included instead so that the include dirs
-# are given relative to where the config file is located.
-set(JANSSON__INCLUDE_DIRS "\${JANSSON_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-configure_file(
-  ${PROJECT_SOURCE_DIR}/cmake/JanssonConfig.cmake.in
-  ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake @ONLY)
-
-# Generate version info for both build-tree and install-tree.
-configure_file(${PROJECT_SOURCE_DIR}/cmake/JanssonConfigVersion.cmake.in
-               ${PROJECT_BINARY_DIR}/JanssonConfigVersion.cmake @ONLY)
-
-# Define the public headers.
-set_target_properties(jansson PROPERTIES PUBLIC_HEADER "${JANSSON_HDR_PUBLIC}")
-# TODO: fix this.
-
-#
-# Install targets.
-#
-# Disabled by OBS
-option(JANSSON_INSTALL "Generate installation target" OFF)
-if(JANSSON_INSTALL)
-  install(
-    TARGETS jansson
-    EXPORT JanssonTargets
-    LIBRARY DESTINATION "${JANSSON_INSTALL_LIB_DIR}" COMPONENT lib
-    ARCHIVE DESTINATION "${JANSSON_INSTALL_LIB_DIR}" COMPONENT lib
-    RUNTIME DESTINATION "${JANSSON_INSTALL_BIN_DIR}" COMPONENT lib # Windows
-                                                                   # DLLs
-    PUBLIC_HEADER DESTINATION "${JANSSON_INSTALL_INCLUDE_DIR}" COMPONENT dev)
-
-  # Install the pkg-config.
-  install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/jansson.pc
-    DESTINATION ${JANSSON_INSTALL_LIB_DIR}/pkgconfig
-    COMPONENT dev)
-
-  # Install the configs.
-  install(
-    FILES ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/JanssonConfig.cmake
-          ${PROJECT_BINARY_DIR}/JanssonConfigVersion.cmake
-    DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}"
-    COMPONENT dev)
-
-  # Install exports for the install-tree.
-  install(
-    EXPORT JanssonTargets
-    DESTINATION "${JANSSON_INSTALL_CMAKE_DIR}"
-    COMPONENT dev)
-endif()
-
-# For use when simply using add_library from a parent project to build jansson.
-set(JANSSON_LIBRARIES
-    jansson
-    CACHE STRING "Jansson libraries")
-
-if (NOT MSVC)
-  target_compile_options(jansson PUBLIC
-    -Wno-format-truncation
-    -Wno-implicit-fallthrough)
-endif()
-
-target_include_directories(jansson PUBLIC src
-                                          "${CMAKE_CURRENT_BINARY_DIR}/include")

obs-studio-29.1.3.tar.xz/deps/jansson/CleanSpec.mk Deleted

@@ -1,49 +0,0 @@
-# Copyright (C) 2007 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************

obs-studio-29.1.3.tar.xz/deps/jansson/LICENSE Deleted

@@ -1,19 +0,0 @@
-Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

obs-studio-29.1.3.tar.xz/deps/jansson/Makefile.am Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/README.rst Deleted

@@ -1,68 +0,0 @@
-Jansson README
-==============
-
-.. image:: https://travis-ci.org/akheron/jansson.png
-  :target: https://travis-ci.org/akheron/jansson
-  
-.. image:: https://ci.appveyor.com/api/projects/status/lmhkkc4q8cwc65ko
-  :target: https://ci.appveyor.com/project/akheron/jansson
-
-.. image:: https://coveralls.io/repos/akheron/jansson/badge.png?branch=master
-  :target: https://coveralls.io/r/akheron/jansson?branch=master
-
-Jansson_ is a C library for encoding, decoding and manipulating JSON
-data. Its main features and design principles are:
-
-- Simple and intuitive API and data model
-
-- `Comprehensive documentation`_
-
-- No dependencies on other libraries
-
-- Full Unicode support (UTF-8)
-
-- Extensive test suite
-
-Jansson is licensed under the `MIT license`_; see LICENSE in the
-source distribution for details.
-
-
-Compilation and Installation
-----------------------------
-
-If you obtained a source tarball, just use the standard autotools
-commands::
-
-   $ ./configure
-   $ make
-   $ make install
-
-To run the test suite, invoke::
-
-   $ make check
-
-If the source has been checked out from a Git repository, the
-./configure script has to be generated first. The easiest way is to
-use autoreconf::
-
-   $ autoreconf -i
-
-
-Documentation
--------------
-
-Documentation is available at http://jansson.readthedocs.io/en/latest/.
-
-The documentation source is in the ``doc/`` subdirectory. To generate
-HTML documentation, invoke::
-
-   $ make html
-
-Then, point your browser to ``doc/_build/html/index.html``. Sphinx_
-1.0 or newer is required to generate the documentation.
-
-
-.. _Jansson: http://www.digip.org/jansson/
-.. _`Comprehensive documentation`: http://jansson.readthedocs.io/en/latest/
-.. _`MIT license`: http://www.opensource.org/licenses/mit-license.php
-.. _Sphinx: http://sphinx.pocoo.org/

obs-studio-29.1.3.tar.xz/deps/jansson/android Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/android/jansson_config.h Deleted

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2010-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- *
- *
- * This file specifies a part of the site-specific configuration for
- * Jansson, namely those things that affect the public API in
- * jansson.h.
- *
- * The configure script copies this file to jansson_config.h and
- * replaces @var@ substitutions by values that fit your system. If you
- * cannot run the configure script, you can do the value substitution
- * by hand.
- */
-
-#ifndef JANSSON_CONFIG_H
-#define JANSSON_CONFIG_H
-
-/* If your compiler supports the inline keyword in C, JSON_INLINE is
- defined to `inline', otherwise empty. In C++, the inline is always
- supported. */
-#ifdef __cplusplus
-#define JSON_INLINE inline
-#else
-#define JSON_INLINE inline
-#endif
-
-/* If your compiler supports the `long long` type and the strtoll()
- library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
- otherwise to 0. */
-#define JSON_INTEGER_IS_LONG_LONG 1
-
-/* If locale.h and localeconv() are available, define to 1,
- otherwise to 0. */
-#define JSON_HAVE_LOCALECONV 0
-
-/* Maximum recursion depth for parsing JSON input.
- This limits the depth of e.g. array-within-array constructions. */
-#define JSON_PARSER_MAX_DEPTH 2048
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/appveyor.yml Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/cmake Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/CheckFunctionKeywords.cmake Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/CodeCoverage.cmake Deleted

@@ -1,163 +0,0 @@
-#
-# Boost Software License - Version 1.0 - August 17th, 2003
-#
-# Permission is hereby granted, free of charge, to any person or organization
-# obtaining a copy of the software and accompanying documentation covered by
-# this license (the "Software") to use, reproduce, display, distribute,
-# execute, and transmit the Software, and to prepare derivative works of the
-# Software, and to permit third-parties to whom the Software is furnished to
-# do so, all subject to the following:
-# 
-# The copyright notices in the Software and this entire statement, including
-# the above license grant, this restriction and the following disclaimer,
-# must be included in all copies of the Software, in whole or in part, and
-# all derivative works of the Software, unless such copies or derivative
-# works are solely in the form of machine-executable object code generated by
-# a source language processor.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-# 2012-01-31, Lars Bilke
-# - Enable Code Coverage
-#
-# 2013-09-17, Joakim Söderberg
-# - Added support for Clang.
-# - Some additional usage instructions.
-#
-# USAGE:
-# 1. Copy this file into your cmake modules path.
-#
-# 2. Add the following line to your CMakeLists.txt:
-#      INCLUDE(CodeCoverage)
-#
-# 3. Set compiler flags to turn off optimization and enable coverage: 
-#    SET(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
-#	 SET(CMAKE_C_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
-#  
-# 3. Use the function SETUP_TARGET_FOR_COVERAGE to create a custom make target
-#    which runs your test executable and produces a lcov code coverage report:
-#    Example:
-#	 SETUP_TARGET_FOR_COVERAGE(
-#				my_coverage_target  # Name for custom target.
-#				test_driver         # Name of the test driver executable that runs the tests.
-#									# NOTE! This should always have a ZERO as exit code
-#									# otherwise the coverage generation will not complete.
-#				coverage            # Name of output directory.
-#				)
-#
-# 4. Build a Debug build:
-#	 cmake -DCMAKE_BUILD_TYPE=Debug ..
-#	 make
-#	 make my_coverage_target
-#
-#
-
-# Check prereqs
-FIND_PROGRAM( GCOV_PATH gcov )
-FIND_PROGRAM( LCOV_PATH lcov )
-FIND_PROGRAM( GENHTML_PATH genhtml )
-FIND_PROGRAM( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/tests)
-
-IF(NOT GCOV_PATH)
-	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
-ENDIF() # NOT GCOV_PATH
-
-IF(NOT (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC))
-	# Clang version 3.0.0 and greater now supports gcov as well.
-	MESSAGE(WARNING "Compiler is not GNU gcc! Clang Version 3.0.0 and greater supports gcov as well, but older versions don't.")
-	
-	IF(NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
-		MESSAGE(FATAL_ERROR "Compiler is not GNU gcc or Clang! Aborting...")
-	ENDIF()
-ENDIF() # NOT CMAKE_COMPILER_IS_GNUCXX
-
-IF ( NOT CMAKE_BUILD_TYPE STREQUAL "Debug" )
-  MESSAGE( WARNING "Code coverage results with an optimized (non-Debug) build may be misleading" )
-ENDIF() # NOT CMAKE_BUILD_TYPE STREQUAL "Debug"
-
-
-# Param _targetname     The name of new the custom make target
-# Param _outputname     lcov output is generated as _outputname.info
-#                       HTML report is generated in _outputname/index.html
-# Param _testrunner     The name of the target which runs the tests.
-#						MUST return ZERO always, even on errors. 
-#						If not, no coverage report will be created!
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _outputname _testrunner)
-
-	IF(NOT LCOV_PATH)
-		MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
-	ENDIF() # NOT LCOV_PATH
-
-	IF(NOT GENHTML_PATH)
-		MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
-	ENDIF() # NOT GENHTML_PATH
-
-	# Setup target
-	ADD_CUSTOM_TARGET(${_targetname}
-		
-		# Cleanup lcov
-		${LCOV_PATH} --directory . --zerocounters
-		
-		# Run tests
-		COMMAND ${_testrunner} ${ARGV3}
-		
-		# Capturing lcov counters and generating report
-		COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info
-		COMMAND ${LCOV_PATH} --remove ${_outputname}.info 'tests/*' '/usr/*' --output-file ${_outputname}.info.cleaned
-		COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned
-		COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
-		
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-	)
-	
-	# Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
-		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
-	)
-
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
-
-# Param _targetname     The name of new the custom make target
-# Param _testrunner     The name of the target which runs the tests
-# Param _outputname     cobertura output is generated as _outputname.xml
-# Optional fourth parameter is passed as arguments to _testrunner
-#   Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE_COBERTURA _targetname _testrunner _outputname)
-
-	IF(NOT PYTHON_EXECUTABLE)
-		MESSAGE(FATAL_ERROR "Python not found! Aborting...")
-	ENDIF() # NOT PYTHON_EXECUTABLE
-
-	IF(NOT GCOVR_PATH)
-		MESSAGE(FATAL_ERROR "gcovr not found! Aborting...")
-	ENDIF() # NOT GCOVR_PATH
-
-	ADD_CUSTOM_TARGET(${_targetname}
-
-		# Run tests
-		${_testrunner} ${ARGV3}
-
-		# Running gcovr
-		COMMAND ${GCOVR_PATH} -x -r ${CMAKE_SOURCE_DIR} -e '${CMAKE_SOURCE_DIR}/tests/'  -o ${_outputname}.xml
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Running gcovr to produce Cobertura code coverage report."
-	)
-
-	# Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
-		COMMENT "Cobertura code coverage report saved in ${_outputname}.xml."
-	)
-
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE_COBERTURA
-

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/Coveralls.cmake Deleted

@@ -1,111 +0,0 @@
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# Copyright (C) 2014 Joakim Söderberg <joakim.soderberg@gmail.com>
-#
-
-
-#
-# Param _COVERAGE_SRCS	A list of source files that coverage should be collected for.
-# Param _COVERALLS_UPLOAD Upload the result to coveralls?
-#
-function(coveralls_setup _COVERAGE_SRCS _COVERALLS_UPLOAD)
-	# When passing a CMake list to an external process, the list
-	# will be converted from the format "1;2;3" to "1 2 3".
-	# This means the script we're calling won't see it as a list
-	# of sources, but rather just one long path. We remedy this
-	# by replacing ";" with "*" and then reversing that in the script
-	# that we're calling.
-	# http://cmake.3232098.n2.nabble.com/Passing-a-CMake-list-quot-as-is-quot-to-a-custom-target-td6505681.html
-	set(COVERAGE_SRCS_TMP ${_COVERAGE_SRCS})
-	set(COVERAGE_SRCS "")
-	foreach (COVERAGE_SRC ${COVERAGE_SRCS_TMP})
-		set(COVERAGE_SRCS "${COVERAGE_SRCS}*${COVERAGE_SRC}")
-	endforeach()
-
-	#message("Coverage sources: ${COVERAGE_SRCS}")
-	set(COVERALLS_FILE ${PROJECT_BINARY_DIR}/coveralls.json)
-
-	add_custom_target(coveralls_generate
-
-		# Zero the coverage counters.
-		COMMAND ${CMAKE_COMMAND}
-				-P "${PROJECT_SOURCE_DIR}/cmake/CoverallsClear.cmake"
-
-		# Run regress tests.
-		COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure
-
-		# Generate Gcov and translate it into coveralls JSON.
-		# We do this by executing an external CMake script.
-		# (We don't want this to run at CMake generation time, but after compilation and everything has run).
-		COMMAND ${CMAKE_COMMAND}
-				-DCOVERAGE_SRCS="${COVERAGE_SRCS}" # TODO: This is passed like: "a b c", not "a;b;c"
-				-DCOVERALLS_OUTPUT_FILE="${COVERALLS_FILE}"
-				-DCOV_PATH="${PROJECT_BINARY_DIR}"
-				-DPROJECT_ROOT="${PROJECT_SOURCE_DIR}"
-				-P "${PROJECT_SOURCE_DIR}/cmake/CoverallsGenerateGcov.cmake"
-
-		WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-		COMMENT "Generating coveralls output..."
-		)
-
-	if (_COVERALLS_UPLOAD)
-		message("COVERALLS UPLOAD: ON")
-
-		find_program(CURL_EXECUTABLE curl)
-
-		if (NOT CURL_EXECUTABLE)
-			message(FATAL_ERROR "Coveralls: curl not found! Aborting")
-		endif()
-
-		add_custom_target(coveralls_upload
-			# Upload the JSON to coveralls.
-			COMMAND ${CURL_EXECUTABLE}
-					-S -F json_file=@${COVERALLS_FILE}
-					https://coveralls.io/api/v1/jobs
-
-			DEPENDS coveralls_generate
-
-			WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-			COMMENT "Uploading coveralls output...")
-
-		add_custom_target(coveralls DEPENDS coveralls_upload)
-	else()
-		message("COVERALLS UPLOAD: OFF")
-		add_custom_target(coveralls DEPENDS coveralls_generate)
-	endif()
-
-endfunction()
-
-macro(coveralls_turn_on_coverage)
-	if(NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-		AND (NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang"))
-		message(FATAL_ERROR "Coveralls: Compiler ${CMAKE_C_COMPILER_ID} is not GNU gcc! Aborting... You can set this on the command line using CC=/usr/bin/gcc CXX=/usr/bin/g++ cmake <options> ..")
-	endif()
-
-	if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-		message(FATAL_ERROR "Coveralls: Code coverage results with an optimised (non-Debug) build may be misleading! Add -DCMAKE_BUILD_TYPE=Debug")
-	endif()
-
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage")
-endmacro()
-
-
-

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/CoverallsClear.cmake Deleted

@@ -1,24 +0,0 @@
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# Copyright (C) 2014 Joakim Söderberg <joakim.soderberg@gmail.com>
-#
-
-file(REMOVE_RECURSE ${PROJECT_BINARY_DIR}/*.gcda)
-

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/CoverallsGenerateGcov.cmake Deleted

@@ -1,380 +0,0 @@
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# Copyright (C) 2014 Joakim Söderberg <joakim.soderberg@gmail.com>
-#
-# This is intended to be run by a custom target in a CMake project like this.
-# 0. Compile program with coverage support.
-# 1. Clear coverage data. (Recursively delete *.gcda in build dir)
-# 2. Run the unit tests.
-# 3. Run this script specifying which source files the coverage should be performed on.
-#
-# This script will then use gcov to generate .gcov files in the directory specified
-# via the COV_PATH var. This should probably be the same as your cmake build dir.
-#
-# It then parses the .gcov files to convert them into the Coveralls JSON format:
-# https://coveralls.io/docs/api
-#
-# Example for running as standalone CMake script from the command line:
-# (Note it is important the -P is at the end...)
-# $ cmake -DCOV_PATH=$(pwd) 
-# -DCOVERAGE_SRCS="catcierge_rfid.c;catcierge_timer.c" 
-# -P ../cmake/CoverallsGcovUpload.cmake
-#
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
-
-#
-# Make sure we have the needed arguments.
-#
-if (NOT COVERALLS_OUTPUT_FILE)
-	message(FATAL_ERROR "Coveralls: No coveralls output file specified. Please set COVERALLS_OUTPUT_FILE")
-endif()
-
-if (NOT COV_PATH)
-	message(FATAL_ERROR "Coveralls: Missing coverage directory path where gcov files will be generated. Please set COV_PATH")
-endif()
-
-if (NOT COVERAGE_SRCS)
-	message(FATAL_ERROR "Coveralls: Missing the list of source files that we should get the coverage data for COVERAGE_SRCS")
-endif()
-
-if (NOT PROJECT_ROOT)
-	message(FATAL_ERROR "Coveralls: Missing PROJECT_ROOT.")
-endif()
-
-# Since it's not possible to pass a CMake list properly in the
-# "1;2;3" format to an external process, we have replaced the
-# ";" with "*", so reverse that here so we get it back into the
-# CMake list format.
-string(REGEX REPLACE "\\*" ";" COVERAGE_SRCS ${COVERAGE_SRCS})
-
-find_program(GCOV_EXECUTABLE gcov)
-
-if (NOT GCOV_EXECUTABLE)
-	message(FATAL_ERROR "gcov not found! Aborting...")
-endif()
-
-find_package(Git)
-
-# TODO: Add these git things to the coveralls json.
-if (GIT_FOUND)
-	# Branch.
-	execute_process(
-		COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		OUTPUT_VARIABLE GIT_BRANCH
-		OUTPUT_STRIP_TRAILING_WHITESPACE
-	)
-
-	macro (git_log_format FORMAT_CHARS VAR_NAME)
-		execute_process(
-			COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%${FORMAT_CHARS}
-			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-			OUTPUT_VARIABLE ${VAR_NAME}
-			OUTPUT_STRIP_TRAILING_WHITESPACE
-		)
-	endmacro()
-
-	git_log_format(an GIT_AUTHOR_EMAIL)
-	git_log_format(ae GIT_AUTHOR_EMAIL)
-	git_log_format(cn GIT_COMMITTER_NAME)
-	git_log_format(ce GIT_COMMITTER_EMAIL)
-	git_log_format(B GIT_COMMIT_MESSAGE)
-
-	message("Git exe: ${GIT_EXECUTABLE}")
-	message("Git branch: ${GIT_BRANCH}")
-	message("Git author: ${GIT_AUTHOR_NAME}")
-	message("Git e-mail: ${GIT_AUTHOR_EMAIL}")
-	message("Git commiter name: ${GIT_COMMITTER_NAME}")
-	message("Git commiter e-mail: ${GIT_COMMITTER_EMAIL}")
-	message("Git commit message: ${GIT_COMMIT_MESSAGE}")
-
-endif()
-
-############################# Macros #########################################
-
-#
-# This macro converts from the full path format gcov outputs:
-#
-# /path/to/project/root/build/#path#to#project#root#subdir#the_file.c.gcov
-#
-# to the original source file path the .gcov is for:
-#
-# /path/to/project/root/subdir/the_file.c
-#
-macro(get_source_path_from_gcov_filename _SRC_FILENAME _GCOV_FILENAME)
-
-	# /path/to/project/root/build/#path#to#project#root#subdir#the_file.c.gcov 
-	# -> 
-	# #path#to#project#root#subdir#the_file.c.gcov 
-	get_filename_component(_GCOV_FILENAME_WEXT ${_GCOV_FILENAME} NAME)
-
-	# #path#to#project#root#subdir#the_file.c.gcov -> /path/to/project/root/subdir/the_file.c
-	string(REGEX REPLACE "\\.gcov$" "" SRC_FILENAME_TMP ${_GCOV_FILENAME_WEXT})
-	string(REGEX REPLACE "\#" "/" SRC_FILENAME_TMP ${SRC_FILENAME_TMP})
-	set(${_SRC_FILENAME} "${SRC_FILENAME_TMP}")
-endmacro()
-
-##############################################################################
-
-# Get the coverage data.
-file(GLOB_RECURSE GCDA_FILES "${COV_PATH}/*.gcda")
-message("GCDA files:")
-
-# Get a list of all the object directories needed by gcov
-# (The directories the .gcda files and .o files are found in)
-# and run gcov on those.
-foreach(GCDA ${GCDA_FILES})
-	message("Process: ${GCDA}")
-	message("------------------------------------------------------------------------------")
-	get_filename_component(GCDA_DIR ${GCDA} PATH)
-
-	#
-	# The -p below refers to "Preserve path components",
-	# This means that the generated gcov filename of a source file will
-	# keep the original files entire filepath, but / is replaced with #.
-	# Example:
-	#
-	# /path/to/project/root/build/CMakeFiles/the_file.dir/subdir/the_file.c.gcda
-	# ------------------------------------------------------------------------------
-	# File '/path/to/project/root/subdir/the_file.c'
-	# Lines executed:68.34% of 199
-	# /path/to/project/root/subdir/the_file.c:creating '#path#to#project#root#subdir#the_file.c.gcov'
-	#
-	# If -p is not specified then the file is named only "the_file.c.gcov"
-	#
-	execute_process(
-		COMMAND ${GCOV_EXECUTABLE} -p -o ${GCDA_DIR} ${GCDA}
-		WORKING_DIRECTORY ${COV_PATH}
-	)
-endforeach()
-
-# TODO: Make these be absolute path
-file(GLOB ALL_GCOV_FILES ${COV_PATH}/*.gcov)
-
-# Get only the filenames to use for filtering.
-#set(COVERAGE_SRCS_NAMES "")
-#foreach (COVSRC ${COVERAGE_SRCS})
-#	get_filename_component(COVSRC_NAME ${COVSRC} NAME)
-#	message("${COVSRC} -> ${COVSRC_NAME}")
-#	list(APPEND COVERAGE_SRCS_NAMES "${COVSRC_NAME}")
-#endforeach()
-
-#
-# Filter out all but the gcov files we want.
-#
-# We do this by comparing the list of COVERAGE_SRCS filepaths that the
-# user wants the coverage data for with the paths of the generated .gcov files,
-# so that we only keep the relevant gcov files.
-#
-# Example:
-# COVERAGE_SRCS =
-#				/path/to/project/root/subdir/the_file.c
-#
-# ALL_GCOV_FILES =
-#				/path/to/project/root/build/#path#to#project#root#subdir#the_file.c.gcov
-#				/path/to/project/root/build/#path#to#project#root#subdir#other_file.c.gcov
-# 
-# Result should be:
-# GCOV_FILES = 
-#				/path/to/project/root/build/#path#to#project#root#subdir#the_file.c.gcov
-#
-set(GCOV_FILES "")
-#message("Look in coverage sources: ${COVERAGE_SRCS}")
-message("\nFilter out unwanted GCOV files:")
-message("===============================")
-
-set(COVERAGE_SRCS_REMAINING ${COVERAGE_SRCS})
-
-foreach (GCOV_FILE ${ALL_GCOV_FILES})
-
-	#
-	# /path/to/project/root/build/#path#to#project#root#subdir#the_file.c.gcov 
-	# -> 
-	# /path/to/project/root/subdir/the_file.c 
-	get_source_path_from_gcov_filename(GCOV_SRC_PATH ${GCOV_FILE})
-
-	# Is this in the list of source files?
-	# TODO: We want to match against relative path filenames from the source file root...
-	list(FIND COVERAGE_SRCS ${GCOV_SRC_PATH} WAS_FOUND)
-
-	if (NOT WAS_FOUND EQUAL -1)
-		message("YES: ${GCOV_FILE}")
-		list(APPEND GCOV_FILES ${GCOV_FILE})
-
-		# We remove it from the list, so we don't bother searching for it again.
-		# Also files left in COVERAGE_SRCS_REMAINING after this loop ends should
-		# have coverage data generated from them (no lines are covered).
-		list(REMOVE_ITEM COVERAGE_SRCS_REMAINING ${GCOV_SRC_PATH})
-	else()
-		message("NO: ${GCOV_FILE}")
-	endif()
-endforeach()
-
-# TODO: Enable setting these
-set(JSON_SERVICE_NAME "travis-ci")
-set(JSON_SERVICE_JOB_ID $ENV{TRAVIS_JOB_ID})
-
-set(JSON_TEMPLATE
-"{
- \"service_name\": \"\@JSON_SERVICE_NAME\@\",
- \"service_job_id\": \"\@JSON_SERVICE_JOB_ID\@\",
- \"source_files\": \@JSON_GCOV_FILES\@
-}"
-)
-
-set(SRC_FILE_TEMPLATE
-"{
- \"name\": \"\@GCOV_SRC_REL_PATH\@\",
- \"source\": \"\@GCOV_FILE_SOURCE\@\",
- \"coverage\": \@GCOV_FILE_COVERAGE\@
-}"
-)
-
-message("\nGenerate JSON for files:")
-message("=========================")
-
-set(JSON_GCOV_FILES "")
-
-# Read the GCOV files line by line and get the coverage data.
-foreach (GCOV_FILE ${GCOV_FILES})
-
-	get_source_path_from_gcov_filename(GCOV_SRC_PATH ${GCOV_FILE})
-	file(RELATIVE_PATH GCOV_SRC_REL_PATH "${PROJECT_ROOT}" "${GCOV_SRC_PATH}")
-
-	# Loads the gcov file as a list of lines.
-	file(STRINGS ${GCOV_FILE} GCOV_LINES)
-
-	# Instead of trying to parse the source from the
-	# gcov file, simply read the file contents from the source file.
-	# (Parsing it from the gcov is hard because C-code uses ; in many places
-	# which also happens to be the same as the CMake list delimeter).
-	file(READ ${GCOV_SRC_PATH} GCOV_FILE_SOURCE)
-
-	string(REPLACE "\\" "\\\\" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-	string(REGEX REPLACE "\"" "\\\\\"" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-	string(REPLACE "\t" "\\\\t" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-	string(REPLACE "\r" "\\\\r" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-	string(REPLACE "\n" "\\\\n" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-	# According to http://json.org/ these should be escaped as well.
-	# Don't know how to do that in CMake however...
-	#string(REPLACE "\b" "\\\\b" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-	#string(REPLACE "\f" "\\\\f" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-	#string(REGEX REPLACE "\u(a-fA-F0-9{4})" "\\\\u\\1" GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}")
-
-	# We want a json array of coverage data as a single string
-	# start building them from the contents of the .gcov
-	set(GCOV_FILE_COVERAGE "")
-
-	foreach (GCOV_LINE ${GCOV_LINES})
-		# Example of what we're parsing:
-		# Hitcount |Line | Source
-		# " 8: 26: if (!allowed || (strlen(allowed) == 0))"
-		string(REGEX REPLACE 
-			"^(^:*):(^:*):(.*)$" 
-			"\\1;\\2;\\3"
-			RES
-			"${GCOV_LINE}")
-
-		list(LENGTH RES RES_COUNT)
-		if (RES_COUNT GREATER 2)
-			list(GET RES 0 HITCOUNT)
-			list(GET RES 1 LINE)
-			list(GET RES 2 SOURCE)
-
-			string(STRIP ${HITCOUNT} HITCOUNT)
-			string(STRIP ${LINE} LINE)
-
-			# Lines with 0 line numbers are metadata and can be ignored.
-			if (NOT ${LINE} EQUAL 0)
-				
-				# Translate the hitcount into valid JSON values.
-				if (${HITCOUNT} STREQUAL "#####")
-					set(GCOV_FILE_COVERAGE "${GCOV_FILE_COVERAGE}0, ")
-				elseif (${HITCOUNT} STREQUAL "-")
-					set(GCOV_FILE_COVERAGE "${GCOV_FILE_COVERAGE}null, ")
-				else()
-					set(GCOV_FILE_COVERAGE "${GCOV_FILE_COVERAGE}${HITCOUNT}, ")
-				endif()
-				# TODO: Look for LCOV_EXCL_LINE in SOURCE to get rid of false positives.
-			endif()
-		else()
-			message(WARNING "Failed to properly parse line --> ${GCOV_LINE}")
-		endif()
-	endforeach()
-
-	# Advanced way of removing the trailing comma in the JSON array.
-	# "1, 2, 3, " -> "1, 2, 3"
-	string(REGEX REPLACE ", *$" "" GCOV_FILE_COVERAGE ${GCOV_FILE_COVERAGE})
-
-	# Append the trailing to complete the JSON array.
-	set(GCOV_FILE_COVERAGE "${GCOV_FILE_COVERAGE}")
-
-	# Generate the final JSON for this file.
-	message("Generate JSON for file: ${GCOV_SRC_REL_PATH}...")
-	string(CONFIGURE ${SRC_FILE_TEMPLATE} FILE_JSON)
-
-	set(JSON_GCOV_FILES "${JSON_GCOV_FILES}${FILE_JSON}, ")
-endforeach()
-
-# Loop through all files we couldn't find any coverage for
-# as well, and generate JSON for those as well with 0% coverage.
-foreach(NOT_COVERED_SRC ${COVERAGE_SRCS_REMAINING})
-
-	# Loads the source file as a list of lines.
-	file(STRINGS ${NOT_COVERED_SRC} SRC_LINES)
-
-	set(GCOV_FILE_COVERAGE "")
-	set(GCOV_FILE_SOURCE "")
-
-	foreach (SOURCE ${SRC_LINES})
-		set(GCOV_FILE_COVERAGE "${GCOV_FILE_COVERAGE}0, ")
-
-		string(REPLACE "\\" "\\\\" SOURCE "${SOURCE}")
-		string(REGEX REPLACE "\"" "\\\\\"" SOURCE "${SOURCE}")
-		string(REPLACE "\t" "\\\\t" SOURCE "${SOURCE}")
-		string(REPLACE "\r" "\\\\r" SOURCE "${SOURCE}")
-		set(GCOV_FILE_SOURCE "${GCOV_FILE_SOURCE}${SOURCE}\\n")
-	endforeach()
-
-	# Remove trailing comma, and complete JSON array with 
-	string(REGEX REPLACE ", *$" "" GCOV_FILE_COVERAGE ${GCOV_FILE_COVERAGE})
-	set(GCOV_FILE_COVERAGE "${GCOV_FILE_COVERAGE}")
-
-	# Generate the final JSON for this file.
-	message("Generate JSON for non-gcov file: ${NOT_COVERED_SRC}...")
-	string(CONFIGURE ${SRC_FILE_TEMPLATE} FILE_JSON)
-	set(JSON_GCOV_FILES "${JSON_GCOV_FILES}${FILE_JSON}, ")
-endforeach()
-
-# Get rid of trailing comma.
-string(REGEX REPLACE ", *$" "" JSON_GCOV_FILES ${JSON_GCOV_FILES})
-set(JSON_GCOV_FILES "${JSON_GCOV_FILES}")
-
-# Generate the final complete JSON!
-message("Generate final JSON...")
-string(CONFIGURE ${JSON_TEMPLATE} JSON)
-
-file(WRITE "${COVERALLS_OUTPUT_FILE}" "${JSON}")
-message("###########################################################################")
-message("Generated coveralls JSON containing coverage data:") 
-message("${COVERALLS_OUTPUT_FILE}")
-message("###########################################################################")
-

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/FindSphinx.cmake Deleted

@@ -1,301 +0,0 @@
-#
-# PART B. DOWNLOADING AGREEMENT - LICENSE FROM SBIA WITH RIGHT TO SUBLICENSE ("SOFTWARE LICENSE").
-# ------------------------------------------------------------------------------------------------
-#
-# 1. As used in this Software License, "you" means the individual downloading and/or
-# using, reproducing, modifying, displaying and/or distributing the Software and
-# the institution or entity which employs or is otherwise affiliated with such
-# individual in connection therewith. The Section of Biomedical Image Analysis,
-# Department of Radiology at the Universiy of Pennsylvania ("SBIA") hereby grants
-# you, with right to sublicense, with respect to SBIA's rights in the software,
-# and data, if any, which is the subject of this Software License (collectively,
-# the "Software"), a royalty-free, non-exclusive license to use, reproduce, make
-# derivative works of, display and distribute the Software, provided that:
-# (a) you accept and adhere to all of the terms and conditions of this Software
-# License; (b) in connection with any copy of or sublicense of all or any portion
-# of the Software, all of the terms and conditions in this Software License shall
-# appear in and shall apply to such copy and such sublicense, including without
-# limitation all source and executable forms and on any user documentation,
-# prefaced with the following words: "All or portions of this licensed product
-# (such portions are the "Software") have been obtained under license from the
-# Section of Biomedical Image Analysis, Department of Radiology at the University
-# of Pennsylvania and are subject to the following terms and conditions:"
-# (c) you preserve and maintain all applicable attributions, copyright notices
-# and licenses included in or applicable to the Software; (d) modified versions
-# of the Software must be clearly identified and marked as such, and must not
-# be misrepresented as being the original Software; and (e) you consider making,
-# but are under no obligation to make, the source code of any of your modifications
-# to the Software freely available to others on an open source basis.
-#
-# 2. The license granted in this Software License includes without limitation the
-# right to (i) incorporate the Software into proprietary programs (subject to
-# any restrictions applicable to such programs), (ii) add your own copyright
-# statement to your modifications of the Software, and (iii) provide additional
-# or different license terms and conditions in your sublicenses of modifications
-# of the Software; provided that in each case your use, reproduction or
-# distribution of such modifications otherwise complies with the conditions
-# stated in this Software License.
-#
-# 3. This Software License does not grant any rights with respect to third party
-# software, except those rights that SBIA has been authorized by a third
-# party to grant to you, and accordingly you are solely responsible for
-# (i) obtaining any permissions from third parties that you need to use,
-# reproduce, make derivative works of, display and distribute the Software,
-# and (ii) informing your sublicensees, including without limitation your
-# end-users, of their obligations to secure any such required permissions.
-#
-# 4. The Software has been designed for research purposes only and has not been
-# reviewed or approved by the Food and Drug Administration or by any other
-# agency. YOU ACKNOWLEDGE AND AGREE THAT CLINICAL APPLICATIONS ARE NEITHER
-# RECOMMENDED NOR ADVISED. Any commercialization of the Software is at the
-# sole risk of the party or parties engaged in such commercialization.
-# You further agree to use, reproduce, make derivative works of, display
-# and distribute the Software in compliance with all applicable governmental
-# laws, regulations and orders, including without limitation those relating
-# to export and import control.
-#
-# 5. The Software is provided "AS IS" and neither SBIA nor any contributor to
-# the software (each a "Contributor") shall have any obligation to provide
-# maintenance, support, updates, enhancements or modifications thereto.
-# SBIA AND ALL CONTRIBUTORS SPECIFICALLY DISCLAIM ALL EXPRESS AND IMPLIED
-# WARRANTIES OF ANY KIND INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-# IN NO EVENT SHALL SBIA OR ANY CONTRIBUTOR BE LIABLE TO ANY PARTY FOR
-# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY ARISING IN ANY WAY RELATED
-# TO THE SOFTWARE, EVEN IF SBIA OR ANY CONTRIBUTOR HAS BEEN ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGES. TO THE MAXIMUM EXTENT NOT PROHIBITED BY LAW OR
-# REGULATION, YOU FURTHER ASSUME ALL LIABILITY FOR YOUR USE, REPRODUCTION,
-# MAKING OF DERIVATIVE WORKS, DISPLAY, LICENSE OR DISTRIBUTION OF THE SOFTWARE
-# AND AGREE TO INDEMNIFY AND HOLD HARMLESS SBIA AND ALL CONTRIBUTORS FROM
-# AND AGAINST ANY AND ALL CLAIMS, SUITS, ACTIONS, DEMANDS AND JUDGMENTS ARISING
-# THEREFROM.
-#
-# 6. None of the names, logos or trademarks of SBIA or any of SBIA's affiliates
-# or any of the Contributors, or any funding agency, may be used to endorse
-# or promote products produced in whole or in part by operation of the Software
-# or derived from or based on the Software without specific prior written
-# permission from the applicable party.
-#
-# 7. Any use, reproduction or distribution of the Software which is not in accordance
-# with this Software License shall automatically revoke all rights granted to you
-# under this Software License and render Paragraphs 1 and 2 of this Software
-# License null and void.
-#
-# 8. This Software License does not grant any rights in or to any intellectual
-# property owned by SBIA or any Contributor except those rights expressly
-# granted hereunder.
-#
-#
-# PART C. MISCELLANEOUS
-# ---------------------
-#
-# This Agreement shall be governed by and construed in accordance with the laws
-# of The Commonwealth of Pennsylvania without regard to principles of conflicts
-# of law. This Agreement shall supercede and replace any license terms that you
-# may have agreed to previously with respect to Software from SBIA.
-#
-##############################################################################
-# @file FindSphinx.cmake
-# @brief Find Sphinx documentation build tools.
-#
-# @par Input variables:
-# <table border="0">
-# <tr>
-# @tp @b Sphinx_DIR @endtp
-# <td>Installation directory of Sphinx tools. Can also be set as environment variable.</td>
-# </tr>
-# <tr>
-# @tp @b SPHINX_DIR @endtp
-# <td>Alternative environment variable for @c Sphinx_DIR.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx_FIND_COMPONENTS @endtp
-# <td>Sphinx build tools to look for, i.e., 'apidoc' and/or 'build'.</td>
-# </tr>
-# </table>
-#
-# @par Output variables:
-# <table border="0">
-# <tr>
-# @tp @b Sphinx_FOUND @endtp
-# <td>Whether all or only the requested Sphinx build tools were found.</td>
-# </tr>
-# <tr>
-# @tp @b SPHINX_FOUND @endtp
-# <td>Alias for @c Sphinx_FOUND.<td>
-# </tr>
-# <tr>
-# @tp @b SPHINX_EXECUTABLE @endtp
-# <td>Non-cached alias for @c Sphinx-build_EXECUTABLE.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx_PYTHON_EXECUTABLE @endtp
-# <td>Python executable used to run sphinx-build. This is either the
-# by default found Python interpreter or a specific version as
-# specified by the shebang (#!) of the sphinx-build script.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx_PYTHON_OPTIONS @endtp
-# <td>A list of Python options extracted from the shebang (#!) of the
-# sphinx-build script. The -E option is added by this module
-# if the Python executable is not the system default to avoid
-# problems with a differing setting of the @c PYTHONHOME.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx-build_EXECUTABLE @endtp
-# <td>Absolute path of the found sphinx-build tool.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx-apidoc_EXECUTABLE @endtp
-# <td>Absolute path of the found sphinx-apidoc tool.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx_VERSION_STRING @endtp
-# <td>Sphinx version found e.g. 1.1.2.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx_VERSION_MAJOR @endtp
-# <td>Sphinx major version found e.g. 1.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx_VERSION_MINOR @endtp
-# <td>Sphinx minor version found e.g. 1.</td>
-# </tr>
-# <tr>
-# @tp @b Sphinx_VERSION_PATCH @endtp
-# <td>Sphinx patch version found e.g. 2.</td>
-# </tr>
-# </table>
-#
-# @ingroup CMakeFindModules
-##############################################################################
-
-set (_Sphinx_REQUIRED_VARS)
-
-# ----------------------------------------------------------------------------
-# initialize search
-if (NOT Sphinx_DIR)
- if (NOT $ENV{Sphinx_DIR} STREQUAL "")
- set (Sphinx_DIR "$ENV{Sphinx_DIR}" CACHE PATH "Installation prefix of Sphinx (docutils)." FORCE)
- else ()
- set (Sphinx_DIR "$ENV{SPHINX_DIR}" CACHE PATH "Installation prefix of Sphinx (docutils)." FORCE)
- endif ()
-endif ()
-
-# ----------------------------------------------------------------------------
-# default components to look for
-if (NOT Sphinx_FIND_COMPONENTS)
- set (Sphinx_FIND_COMPONENTS "build")
-elseif (NOT Sphinx_FIND_COMPONENTS MATCHES "^(build|apidoc)$")
- message (FATAL_ERROR "Invalid Sphinx component in: ${Sphinx_FIND_COMPONENTS}")
-endif ()
-
-# ----------------------------------------------------------------------------
-# find components, i.e., build tools
-foreach (_Sphinx_TOOL IN LISTS Sphinx_FIND_COMPONENTS)
- if (Sphinx_DIR)
- find_program (
- Sphinx-${_Sphinx_TOOL}_EXECUTABLE
- NAMES sphinx-${_Sphinx_TOOL} sphinx-${_Sphinx_TOOL}.py
- HINTS "${Sphinx_DIR}"
- PATH_SUFFIXES bin
- DOC "The sphinx-${_Sphinx_TOOL} Python script."
- NO_DEFAULT_PATH
- )
- else ()
- find_program (
- Sphinx-${_Sphinx_TOOL}_EXECUTABLE
- NAMES sphinx-${_Sphinx_TOOL} sphinx-${_Sphinx_TOOL}.py
- DOC "The sphinx-${_Sphinx_TOOL} Python script."
- )
- endif ()
- mark_as_advanced (Sphinx-${_Sphinx_TOOL}_EXECUTABLE)
- list (APPEND _Sphinx_REQUIRED_VARS Sphinx-${_Sphinx_TOOL}_EXECUTABLE)
-endforeach ()
-
-# ----------------------------------------------------------------------------
-# determine Python executable used by Sphinx
-if (Sphinx-build_EXECUTABLE)
- # extract python executable from shebang of sphinx-build
- find_package (PythonInterp QUIET)
- set (Sphinx_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
- set (Sphinx_PYTHON_OPTIONS)
- file (STRINGS "${Sphinx-build_EXECUTABLE}" FIRST_LINE LIMIT_COUNT 1)
- if (FIRST_LINE MATCHES "^#!(.*/python.*)") # does not match "#!/usr/bin/env python" !
- string (REGEX REPLACE "^ +| +$" "" Sphinx_PYTHON_EXECUTABLE "${CMAKE_MATCH_1}")
- if (Sphinx_PYTHON_EXECUTABLE MATCHES "(^ +) (.*)")
- set (Sphinx_PYTHON_EXECUTABLE "${CMAKE_MATCH_1}")
- string (REGEX REPLACE " +" ";" Sphinx_PYTHON_OPTIONS "${CMAKE_MATCH_2}")
- endif ()
- endif ()
- # this is done to avoid problems with multiple Python versions being installed
- # remember: CMake command if(STR EQUAL STR) is bad and may cause many troubles !
- string (REGEX REPLACE "(.+*?^$)" "\\\\\\1" _Sphinx_PYTHON_EXECUTABLE_RE "${PYTHON_EXECUTABLE}")
- list (FIND Sphinx_PYTHON_OPTIONS -E IDX)
- if (IDX EQUAL -1 AND NOT Sphinx_PYTHON_EXECUTABLE MATCHES "^${_Sphinx_PYTHON_EXECUTABLE_RE}$")
- list (INSERT Sphinx_PYTHON_OPTIONS 0 -E)
- endif ()
- unset (_Sphinx_PYTHON_EXECUTABLE_RE)
-endif ()
-
-# ----------------------------------------------------------------------------
-# determine Sphinx version
-if (Sphinx-build_EXECUTABLE)
- # intentionally use invalid -h option here as the help that is shown then
- # will include the Sphinx version information
- if (Sphinx_PYTHON_EXECUTABLE)
- execute_process (
- COMMAND "${Sphinx_PYTHON_EXECUTABLE}" ${Sphinx_PYTHON_OPTIONS} "${Sphinx-build_EXECUTABLE}" -h
- OUTPUT_VARIABLE _Sphinx_VERSION
- ERROR_VARIABLE _Sphinx_VERSION
- )
- elseif (UNIX)
- execute_process (
- COMMAND "${Sphinx-build_EXECUTABLE}" -h
- OUTPUT_VARIABLE _Sphinx_VERSION
- ERROR_VARIABLE _Sphinx_VERSION
- )
- endif ()
-
- # The sphinx version can also contain a "b" instead of the last dot.
- # For example "Sphinx v1.2b1" so we cannot just split on "."
- if (_Sphinx_VERSION MATCHES "Sphinx v(0-9+\\.0-9+(\\.|b)0-9+)")
- set (Sphinx_VERSION_STRING "${CMAKE_MATCH_1}")
- string(REGEX REPLACE "(0-9+)\\.0-9+(\\.|b)0-9+" "\\1" Sphinx_VERSION_MAJOR ${Sphinx_VERSION_STRING})
- string(REGEX REPLACE "0-9+\\.(0-9+)(\\.|b)0-9+" "\\1" Sphinx_VERSION_MINOR ${Sphinx_VERSION_STRING})
- string(REGEX REPLACE "0-9+\\.0-9+(\\.|b)(0-9+)" "\\1" Sphinx_VERSION_PATCH ${Sphinx_VERSION_STRING})
-
- # v1.2.0 -> v1.2
- if (Sphinx_VERSION_PATCH EQUAL 0)
- string (REGEX REPLACE "\\.0$" "" Sphinx_VERSION_STRING "${Sphinx_VERSION_STRING}")
- endif ()
- endif()
-endif ()
-
-# ----------------------------------------------------------------------------
-# compatibility with FindPythonInterp.cmake and FindPerl.cmake
-set (SPHINX_EXECUTABLE "${Sphinx-build_EXECUTABLE}")
-
-# ----------------------------------------------------------------------------
-# handle the QUIETLY and REQUIRED arguments and set SPHINX_FOUND to TRUE if
-# all listed variables are TRUE
-include (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (
- Sphinx
- REQUIRED_VARS
- ${_Sphinx_REQUIRED_VARS}
-# VERSION_VAR # This isn't available until CMake 2.8.8 so don't use it.
- Sphinx_VERSION_STRING
-)
-
-# ----------------------------------------------------------------------------
-# set Sphinx_DIR
-if (NOT Sphinx_DIR AND Sphinx-build_EXECUTABLE)
- get_filename_component (Sphinx_DIR "${Sphinx-build_EXECUTABLE}" PATH)
- string (REGEX REPLACE "/bin/?" "" Sphinx_DIR "${Sphinx_DIR}")
- set (Sphinx_DIR "${Sphinx_DIR}" CACHE PATH "Installation directory of Sphinx tools." FORCE)
-endif ()
-
-unset (_Sphinx_VERSION)
-unset (_Sphinx_REQUIRED_VARS)
\ No newline at end of file

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/JanssonConfig.cmake.in Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/JanssonConfigVersion.cmake.in Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/jansson_config.h.cmake Deleted

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2010-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- *
- *
- * This file specifies a part of the site-specific configuration for
- * Jansson, namely those things that affect the public API in
- * jansson.h.
- *
- * The CMake system will generate the jansson_config.h file and
- * copy it to the build and install directories.
- */
-
-#ifndef JANSSON_CONFIG_H
-#define JANSSON_CONFIG_H
-
-/* Define this so that we can disable scattered automake configuration in source files */
-#ifndef JANSSON_USING_CMAKE
-#define JANSSON_USING_CMAKE
-#endif
-
-/* Note: when using cmake, JSON_INTEGER_IS_LONG_LONG is not defined nor used,
- * as we will also check for __int64 etc types.
- * (the definition was used in the automake system) */
-
-/* Bring in the cmake-detected defines */
-#cmakedefine HAVE_STDINT_H 1
-#cmakedefine HAVE_INTTYPES_H 1
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-/* Include our standard type header for the integer typedef */
-
-#if defined(HAVE_STDINT_H)
-# include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(HAVE_SYS_TYPES_H)
-# include <sys/types.h>
-#endif
-
-
-/* If your compiler supports the inline keyword in C, JSON_INLINE is
- defined to `inline', otherwise empty. In C++, the inline is always
- supported. */
-#ifdef __cplusplus
-#define JSON_INLINE inline
-#else
-#define JSON_INLINE @JSON_INLINE@
-#endif
-
-
-#define json_int_t @JSON_INT_T@
-#define json_strtoint @JSON_STRTOINT@
-#define JSON_INTEGER_FORMAT @JSON_INTEGER_FORMAT@
-
-
-/* If locale.h and localeconv() are available, define to 1, otherwise to 0. */
-#define JSON_HAVE_LOCALECONV @JSON_HAVE_LOCALECONV@
-
-
-/* Maximum recursion depth for parsing JSON input.
- This limits the depth of e.g. array-within-array constructions. */
-#define JSON_PARSER_MAX_DEPTH 2048
-
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/cmake/jansson_private_config.h.cmake Deleted

@@ -1,53 +0,0 @@
-#cmakedefine HAVE_ENDIAN_H 1
-#cmakedefine HAVE_FCNTL_H 1
-#cmakedefine HAVE_SCHED_H 1
-#cmakedefine HAVE_UNISTD_H 1
-#cmakedefine HAVE_SYS_PARAM_H 1
-#cmakedefine HAVE_SYS_STAT_H 1
-#cmakedefine HAVE_SYS_TIME_H 1
-#cmakedefine HAVE_SYS_TYPES_H 1
-#cmakedefine HAVE_STDINT_H 1
-
-#cmakedefine HAVE_CLOSE 1
-#cmakedefine HAVE_GETPID 1
-#cmakedefine HAVE_GETTIMEOFDAY 1
-#cmakedefine HAVE_OPEN 1
-#cmakedefine HAVE_READ 1
-#cmakedefine HAVE_SCHED_YIELD 1
-
-#cmakedefine HAVE_SYNC_BUILTINS 1
-#cmakedefine HAVE_ATOMIC_BUILTINS 1
-
-#cmakedefine HAVE_LOCALE_H 1
-#cmakedefine HAVE_SETLOCALE 1
-
-#cmakedefine HAVE_INT32_T 1
-#ifndef HAVE_INT32_T
-#  define int32_t @JSON_INT32@
-#endif
-
-#cmakedefine HAVE_UINT32_T 1
-#ifndef HAVE_UINT32_T
-#  define uint32_t @JSON_UINT32@
-#endif
-
-#cmakedefine HAVE_UINT16_T 1
-#ifndef HAVE_UINT16_T
-#  define uint16_t @JSON_UINT16@
-#endif
-
-#cmakedefine HAVE_UINT8_T 1
-#ifndef HAVE_UINT8_T
-#  define uint8_t @JSON_UINT8@
-#endif
-
-#cmakedefine HAVE_SSIZE_T 1
-
-#ifndef HAVE_SSIZE_T
-#  define ssize_t @JSON_SSIZE@
-#endif
-
-#cmakedefine USE_URANDOM 1
-#cmakedefine USE_WINDOWS_CRYPTOAPI 1
-
-#define INITIAL_HASHTABLE_ORDER @JANSSON_INITIAL_HASHTABLE_ORDER@

obs-studio-29.1.3.tar.xz/deps/jansson/configure.ac Deleted

@@ -1,118 +0,0 @@
-AC_PREREQ(2.60)
-AC_INIT(jansson, 2.9, petri@digip.org)
-
-AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(1.10 foreign)
-
-AC_CONFIG_SRCDIR(src/value.c)
-AC_CONFIG_HEADERS(jansson_private_config.h)
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AM_CONDITIONAL(GCC, test x$GCC = xyes)
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_CHECK_HEADERS(endian.h fcntl.h locale.h sched.h unistd.h sys/param.h sys/stat.h sys/time.h sys/types.h)
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_INT32_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT8_T
-AC_TYPE_LONG_LONG_INT
-
-AC_C_INLINE
-case $ac_cv_c_inline in
-    yes) json_inline=inline;;
-    no) json_inline=;;
-    *) json_inline=$ac_cv_c_inline;;
-esac
-AC_SUBST(json_inline)
-
-# Checks for library functions.
-AC_CHECK_FUNCS(close getpid gettimeofday localeconv open read sched_yield strtoll)
-
-AC_MSG_CHECKING(for gcc __sync builtins)
-have_sync_builtins=no
-AC_TRY_LINK(
-  , unsigned long val; __sync_bool_compare_and_swap(&val, 0, 1);,
-  have_sync_builtins=yes,
-)
-if test "x$have_sync_builtins" = "xyes"; then
-  AC_DEFINE(HAVE_SYNC_BUILTINS, 1,
-    Define to 1 if gcc's __sync builtins are available)
-fi
-AC_MSG_RESULT($have_sync_builtins)
-
-AC_MSG_CHECKING(for gcc __atomic builtins)
-have_atomic_builtins=no
-AC_TRY_LINK(
-  , char l; unsigned long v; __atomic_test_and_set(&l, __ATOMIC_RELAXED); __atomic_store_n(&v, 1, __ATOMIC_RELEASE); __atomic_load_n(&v, __ATOMIC_ACQUIRE);,
-  have_atomic_builtins=yes,
-)
-if test "x$have_atomic_builtins" = "xyes"; then
-  AC_DEFINE(HAVE_ATOMIC_BUILTINS, 1,
-    Define to 1 if gcc's __atomic builtins are available)
-fi
-AC_MSG_RESULT($have_atomic_builtins)
-
-case "$ac_cv_type_long_long_int$ac_cv_func_strtoll" in
-     yesyes) json_have_long_long=1;;
-     *) json_have_long_long=0;;
-esac
-AC_SUBST(json_have_long_long)
-
-case "$ac_cv_header_locale_h$ac_cv_func_localeconv" in
-     yesyes) json_have_localeconv=1;;
-     *) json_have_localeconv=0;;
-esac
-AC_SUBST(json_have_localeconv)
-
-# Features
-AC_ARG_ENABLE(urandom,
-  AS_HELP_STRING(--disable-urandom,
-    Don't use /dev/urandom to seed the hash function),
-  use_urandom=$enableval, use_urandom=yes)
-
-if test "x$use_urandom" = xyes; then
-AC_DEFINE(USE_URANDOM, 1,
-  Define to 1 if /dev/urandom should be used for seeding the hash function)
-fi
-
-AC_ARG_ENABLE(windows-cryptoapi,
-  AS_HELP_STRING(--disable-windows-cryptoapi,
-    Don't use CryptGenRandom to seed the hash function),
-  use_windows_cryptoapi=$enableval, use_windows_cryptoapi=yes)
-
-if test "x$use_windows_cryptoapi" = xyes; then
-AC_DEFINE(USE_WINDOWS_CRYPTOAPI, 1,
-  Define to 1 if CryptGenRandom should be used for seeding the hash function)
-fi
-
-AC_ARG_ENABLE(initial-hashtable-order,
-  AS_HELP_STRING(--enable-initial-hashtable-order=VAL,
-    Number of buckets new object hashtables contain is 2 raised to this power. The default is 3, so empty hashtables contain 2^3 = 8 buckets.),
-  initial_hashtable_order=$enableval, initial_hashtable_order=3)
-AC_DEFINE_UNQUOTED(INITIAL_HASHTABLE_ORDER, $initial_hashtable_order,
-  Number of buckets new object hashtables contain is 2 raised to this power. E.g. 3 -> 2^3 = 8.)
-
-if test x$GCC = xyes; then
-    AM_CFLAGS="-Wall -Wextra -Wdeclaration-after-statement"
-fi
-AC_SUBST(AM_CFLAGS)
-
-AC_CONFIG_FILES(
-        jansson.pc
-        Makefile
-        doc/Makefile
-        src/Makefile
-        src/jansson_config.h
-        test/Makefile
-        test/bin/Makefile
-        test/suites/Makefile
-        test/suites/api/Makefile
-)
-AC_OUTPUT

obs-studio-29.1.3.tar.xz/deps/jansson/doc Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/doc/.gitignore Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/doc/Makefile.am Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/doc/README Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/doc/apiref.rst Deleted

@@ -1,1632 +0,0 @@
-.. _apiref:
-
-*************
-API Reference
-*************
-
-.. highlight:: c
-
-Preliminaries
-=============
-
-All declarations are in :file:`jansson.h`, so it's enough to
-
-::
-
- #include <jansson.h>
-
-in each source file.
-
-All constants are prefixed with ``JSON_`` (except for those describing
-the library version, prefixed with ``JANSSON_``). Other identifiers
-are prefixed with ``json_``. Type names are suffixed with ``_t`` and
-``typedef``\ 'd so that the ``struct`` keyword need not be used.
-
-
-Library Version
-===============
-
-The Jansson version is of the form *A.B.C*, where *A* is the major
-version, *B* is the minor version and *C* is the micro version. If the
-micro version is zero, it's omitted from the version string, i.e. the
-version string is just *A.B*.
-
-When a new release only fixes bugs and doesn't add new features or
-functionality, the micro version is incremented. When new features are
-added in a backwards compatible way, the minor version is incremented
-and the micro version is set to zero. When there are backwards
-incompatible changes, the major version is incremented and others are
-set to zero.
-
-The following preprocessor constants specify the current version of
-the library:
-
-``JANSSON_MAJOR_VERSION``, ``JANSSON_MINOR_VERSION``, ``JANSSON_MICRO_VERSION``
- Integers specifying the major, minor and micro versions,
- respectively.
-
-``JANSSON_VERSION``
- A string representation of the current version, e.g. ``"1.2.1"`` or
- ``"1.3"``.
-
-``JANSSON_VERSION_HEX``
- A 3-byte hexadecimal representation of the version, e.g.
- ``0x010201`` for version 1.2.1 and ``0x010300`` for version 1.3.
- This is useful in numeric comparisons, e.g.::
-
- #if JANSSON_VERSION_HEX >= 0x010300
- /* Code specific to version 1.3 and above */
- #endif
-
-
-Value Representation
-====================
-
-The JSON specification (:rfc:`4627`) defines the following data types:
-*object*, *array*, *string*, *number*, *boolean*, and *null*. JSON
-types are used dynamically; arrays and objects can hold any other data
-type, including themselves. For this reason, Jansson's type system is
-also dynamic in nature. There's one C type to represent all JSON
-values, and this structure knows the type of the JSON value it holds.
-
-.. type:: json_t
-
- This data structure is used throughout the library to represent all
- JSON values. It always contains the type of the JSON value it holds
- and the value's reference count. The rest depends on the type of the
- value.
-
-Objects of :type:`json_t` are always used through a pointer. There
-are APIs for querying the type, manipulating the reference count, and
-for constructing and manipulating values of different types.
-
-Unless noted otherwise, all API functions return an error value if an
-error occurs. Depending on the function's signature, the error value
-is either *NULL* or -1. Invalid arguments or invalid input are
-apparent sources for errors. Memory allocation and I/O operations may
-also cause errors.
-
-
-Type
-----
-
-.. type:: enum json_type
-
- The type of a JSON value. The following members are defined:
-
- +--------------------+
- | ``JSON_OBJECT`` |
- +--------------------+
- | ``JSON_ARRAY`` |
- +--------------------+
- | ``JSON_STRING`` |
- +--------------------+
- | ``JSON_INTEGER`` |
- +--------------------+
- | ``JSON_REAL`` |
- +--------------------+
- | ``JSON_TRUE`` |
- +--------------------+
- | ``JSON_FALSE`` |
- +--------------------+
- | ``JSON_NULL`` |
- +--------------------+
-
- These correspond to JSON object, array, string, number, boolean and
- null. A number is represented by either a value of the type
- ``JSON_INTEGER`` or of the type ``JSON_REAL``. A true boolean value
- is represented by a value of the type ``JSON_TRUE`` and false by a
- value of the type ``JSON_FALSE``.
-
-.. function:: int json_typeof(const json_t *json)
-
- Return the type of the JSON value (a :type:`json_type` cast to
- :type:`int`). *json* MUST NOT be *NULL*. This function is actually
- implemented as a macro for speed.
-
-.. function:: json_is_object(const json_t *json)
- json_is_array(const json_t *json)
- json_is_string(const json_t *json)
- json_is_integer(const json_t *json)
- json_is_real(const json_t *json)
- json_is_true(const json_t *json)
- json_is_false(const json_t *json)
- json_is_null(const json_t *json)
-
- These functions (actually macros) return true (non-zero) for values
- of the given type, and false (zero) for values of other types and
- for *NULL*.
-
-.. function:: json_is_number(const json_t *json)
-
- Returns true for values of types ``JSON_INTEGER`` and
- ``JSON_REAL``, and false for other types and for *NULL*.
-
-.. function:: json_is_boolean(const json_t *json)
-
- Returns true for types ``JSON_TRUE`` and ``JSON_FALSE``, and false
- for values of other types and for *NULL*.
-
-.. function:: json_boolean_value(const json_t *json)
-
- Alias of :func:`json_is_true()`, i.e. returns 1 for ``JSON_TRUE``
- and 0 otherwise.
-
- .. versionadded:: 2.7
-
-
-.. _apiref-reference-count:
-
-Reference Count
----------------
-
-The reference count is used to track whether a value is still in use
-or not. When a value is created, it's reference count is set to 1. If
-a reference to a value is kept (e.g. a value is stored somewhere for
-later use), its reference count is incremented, and when the value is
-no longer needed, the reference count is decremented. When the
-reference count drops to zero, there are no references left, and the
-value can be destroyed.
-
-.. function:: json_t *json_incref(json_t *json)
-
- Increment the reference count of *json* if it's not *NULL*.
- Returns *json*.
-
-.. function:: void json_decref(json_t *json)
-
- Decrement the reference count of *json*. As soon as a call to
- :func:`json_decref()` drops the reference count to zero, the value
- is destroyed and it can no longer be used.
-
-Functions creating new JSON values set the reference count to 1. These
-functions are said to return a **new reference**. Other functions
-returning (existing) JSON values do not normally increase the
-reference count. These functions are said to return a **borrowed
-reference**. So, if the user will hold a reference to a value returned
-as a borrowed reference, he must call :func:`json_incref`. As soon as
-the value is no longer needed, :func:`json_decref` should be called
-to release the reference.
-
-Normally, all functions accepting a JSON value as an argument will
-manage the reference, i.e. increase and decrease the reference count
-as needed. However, some functions **steal** the reference, i.e. they
-have the same result as if the user called :func:`json_decref()` on
-the argument right after calling the function. These functions are
-suffixed with ``_new`` or have ``_new_`` somewhere in their name.
-
-For example, the following code creates a new JSON array and appends
-an integer to it::
-
- json_t *array, *integer;
-
- array = json_array();
- integer = json_integer(42);
-
- json_array_append(array, integer);
- json_decref(integer);
-
-Note how the caller has to release the reference to the integer value
-by calling :func:`json_decref()`. By using a reference stealing
-function :func:`json_array_append_new()` instead of
-:func:`json_array_append()`, the code becomes much simpler::
-
- json_t *array = json_array();
- json_array_append_new(array, json_integer(42));
-
-In this case, the user doesn't have to explicitly release the
-reference to the integer value, as :func:`json_array_append_new()`
-steals the reference when appending the value to the array.
-
-In the following sections it is clearly documented whether a function
-will return a new or borrowed reference or steal a reference to its
-argument.
-
-
-Circular References
--------------------
-
-A circular reference is created when an object or an array is,
-directly or indirectly, inserted inside itself. The direct case is
-simple::
-
- json_t *obj = json_object();
- json_object_set(obj, "foo", obj);
-
-Jansson will refuse to do this, and :func:`json_object_set()` (and
-all the other such functions for objects and arrays) will return with
-an error status. The indirect case is the dangerous one::
-
- json_t *arr1 = json_array(), *arr2 = json_array();
- json_array_append(arr1, arr2);
- json_array_append(arr2, arr1);
-
-In this example, the array ``arr2`` is contained in the array
-``arr1``, and vice versa. Jansson cannot check for this kind of
-indirect circular references without a performance hit, so it's up to
-the user to avoid them.
-
-If a circular reference is created, the memory consumed by the values
-cannot be freed by :func:`json_decref()`. The reference counts never
-drops to zero because the values are keeping the references to each
-other. Moreover, trying to encode the values with any of the encoding
-functions will fail. The encoder detects circular references and
-returns an error status.
-
-Scope Dereferencing
--------------------
-
-.. versionadded:: 2.9
-
-It is possible to use the ``json_auto_t`` type to automatically
-dereference a value at the end of a scope. For example::
-
- void function(void) {
- json_auto_t *value = NULL;
- value = json_string("foo");
- /* json_decref(value) is automatically called. */
- }
-
-This feature is only available on GCC and Clang. So if your project
-has a portability requirement for other compilers, you should avoid
-this feature.
-
-Additionally, as always, care should be taken when passing values to
-functions that steal references.
-
-True, False and Null
-====================
-
-These three values are implemented as singletons, so the returned
-pointers won't change between invocations of these functions.
-
-.. function:: json_t *json_true(void)
-
- .. refcounting:: new
-
- Returns the JSON true value.
-
-.. function:: json_t *json_false(void)
-
- .. refcounting:: new
-
- Returns the JSON false value.
-
-.. function:: json_t *json_boolean(val)
-
- .. refcounting:: new
-
- Returns JSON false if ``val`` is zero, and JSON true otherwise.
- This is a macro, and equivalent to ``val ? json_true() :
- json_false()``.
-
- .. versionadded:: 2.4
-
-
-.. function:: json_t *json_null(void)
-
- .. refcounting:: new
-
- Returns the JSON null value.
-
-
-String
-======
-
-Jansson uses UTF-8 as the character encoding. All JSON strings must be
-valid UTF-8 (or ASCII, as it's a subset of UTF-8). All Unicode
-codepoints U+0000 through U+10FFFF are allowed, but you must use
-length-aware functions if you wish to embed null bytes in strings.
-
-.. function:: json_t *json_string(const char *value)
-
- .. refcounting:: new
-
- Returns a new JSON string, or *NULL* on error. *value* must be a
- valid null terminated UTF-8 encoded Unicode string.
-
-.. function:: json_t *json_stringn(const char *value, size_t len)
-
- .. refcounting:: new
-
- Like :func:`json_string`, but with explicit length, so *value* may
- contain null characters or not be null terminated.
-
-.. function:: json_t *json_string_nocheck(const char *value)
-
- .. refcounting:: new
-
- Like :func:`json_string`, but doesn't check that *value* is valid
- UTF-8. Use this function only if you are certain that this really
- is the case (e.g. you have already checked it by other means).
-
-.. function:: json_t *json_stringn_nocheck(const char *value, size_t len)
-
- .. refcounting:: new
-
- Like :func:`json_string_nocheck`, but with explicit length, so
- *value* may contain null characters or not be null terminated.
-
-.. function:: const char *json_string_value(const json_t *string)
-
- Returns the associated value of *string* as a null terminated UTF-8
- encoded string, or *NULL* if *string* is not a JSON string.
-
- The returned value is read-only and must not be modified or freed by
- the user. It is valid as long as *string* exists, i.e. as long as
- its reference count has not dropped to zero.
-
-.. function:: size_t json_string_length(const json_t *string)
-
- Returns the length of *string* in its UTF-8 presentation, or zero
- if *string* is not a JSON string.
-
-.. function:: int json_string_set(json_t *string, const char *value)
-
- Sets the associated value of *string* to *value*. *value* must be a
- valid UTF-8 encoded Unicode string. Returns 0 on success and -1 on
- error.
-
-.. function:: int json_string_setn(json_t *string, const char *value, size_t len)
-
- Like :func:`json_string_set`, but with explicit length, so *value*
- may contain null characters or not be null terminated.
-
-.. function:: int json_string_set_nocheck(json_t *string, const char *value)
-
- Like :func:`json_string_set`, but doesn't check that *value* is
- valid UTF-8. Use this function only if you are certain that this
- really is the case (e.g. you have already checked it by other
- means).
-
-.. function:: int json_string_setn_nocheck(json_t *string, const char *value, size_t len)
-
- Like :func:`json_string_set_nocheck`, but with explicit length,
- so *value* may contain null characters or not be null terminated.
-
-
-Number
-======
-
-The JSON specification only contains one numeric type, "number". The C
-programming language has distinct types for integer and floating-point
-numbers, so for practical reasons Jansson also has distinct types for
-the two. They are called "integer" and "real", respectively. For more
-information, see :ref:`rfc-conformance`.
-
-.. type:: json_int_t
-
- This is the C type that is used to store JSON integer values. It
- represents the widest integer type available on your system. In
- practice it's just a typedef of ``long long`` if your compiler
- supports it, otherwise ``long``.
-
- Usually, you can safely use plain ``int`` in place of
- ``json_int_t``, and the implicit C integer conversion handles the
- rest. Only when you know that you need the full 64-bit range, you
- should use ``json_int_t`` explicitly.
-
-``JSON_INTEGER_IS_LONG_LONG``
- This is a preprocessor variable that holds the value 1 if
- :type:`json_int_t` is ``long long``, and 0 if it's ``long``. It
- can be used as follows::
-
- #if JSON_INTEGER_IS_LONG_LONG
- /* Code specific for long long */
- #else
- /* Code specific for long */
- #endif
-
-``JSON_INTEGER_FORMAT``
- This is a macro that expands to a :func:`printf()` conversion
- specifier that corresponds to :type:`json_int_t`, without the
- leading ``%`` sign, i.e. either ``"lld"`` or ``"ld"``. This macro
- is required because the actual type of :type:`json_int_t` can be
- either ``long`` or ``long long``, and :func:`printf()` requires
- different length modifiers for the two.
-
- Example::
-
- json_int_t x = 123123123;
- printf("x is %" JSON_INTEGER_FORMAT "\n", x);
-
-
-.. function:: json_t *json_integer(json_int_t value)
-
- .. refcounting:: new
-
- Returns a new JSON integer, or *NULL* on error.
-
-.. function:: json_int_t json_integer_value(const json_t *integer)
-
- Returns the associated value of *integer*, or 0 if *json* is not a
- JSON integer.
-
-.. function:: int json_integer_set(const json_t *integer, json_int_t value)
-
- Sets the associated value of *integer* to *value*. Returns 0 on
- success and -1 if *integer* is not a JSON integer.
-
-.. function:: json_t *json_real(double value)
-
- .. refcounting:: new
-
- Returns a new JSON real, or *NULL* on error.
-
-.. function:: double json_real_value(const json_t *real)
-
- Returns the associated value of *real*, or 0.0 if *real* is not a
- JSON real.
-
-.. function:: int json_real_set(const json_t *real, double value)
-
- Sets the associated value of *real* to *value*. Returns 0 on
- success and -1 if *real* is not a JSON real.
-
-.. function:: double json_number_value(const json_t *json)
-
- Returns the associated value of the JSON integer or JSON real
- *json*, cast to double regardless of the actual type. If *json* is
- neither JSON real nor JSON integer, 0.0 is returned.
-
-
-Array
-=====
-
-A JSON array is an ordered collection of other JSON values.
-
-.. function:: json_t *json_array(void)
-
- .. refcounting:: new
-
- Returns a new JSON array, or *NULL* on error. Initially, the array
- is empty.
-
-.. function:: size_t json_array_size(const json_t *array)
-
- Returns the number of elements in *array*, or 0 if *array* is NULL
- or not a JSON array.
-
-.. function:: json_t *json_array_get(const json_t *array, size_t index)
-
- .. refcounting:: borrow
-
- Returns the element in *array* at position *index*. The valid range
- for *index* is from 0 to the return value of
- :func:`json_array_size()` minus 1. If *array* is not a JSON array,
- if *array* is *NULL*, or if *index* is out of range, *NULL* is
- returned.
-
-.. function:: int json_array_set(json_t *array, size_t index, json_t *value)
-
- Replaces the element in *array* at position *index* with *value*.
- The valid range for *index* is from 0 to the return value of
- :func:`json_array_size()` minus 1. Returns 0 on success and -1 on
- error.
-
-.. function:: int json_array_set_new(json_t *array, size_t index, json_t *value)
-
- Like :func:`json_array_set()` but steals the reference to *value*.
- This is useful when *value* is newly created and not used after
- the call.
-
-.. function:: int json_array_append(json_t *array, json_t *value)
-
- Appends *value* to the end of *array*, growing the size of *array*
- by 1. Returns 0 on success and -1 on error.
-
-.. function:: int json_array_append_new(json_t *array, json_t *value)
-
- Like :func:`json_array_append()` but steals the reference to
- *value*. This is useful when *value* is newly created and not used
- after the call.
-
-.. function:: int json_array_insert(json_t *array, size_t index, json_t *value)
-
- Inserts *value* to *array* at position *index*, shifting the
- elements at *index* and after it one position towards the end of
- the array. Returns 0 on success and -1 on error.
-
-.. function:: int json_array_insert_new(json_t *array, size_t index, json_t *value)
-
- Like :func:`json_array_insert()` but steals the reference to
- *value*. This is useful when *value* is newly created and not used
- after the call.
-
-.. function:: int json_array_remove(json_t *array, size_t index)
-
- Removes the element in *array* at position *index*, shifting the
- elements after *index* one position towards the start of the array.
- Returns 0 on success and -1 on error. The reference count of the
- removed value is decremented.
-
-.. function:: int json_array_clear(json_t *array)
-
- Removes all elements from *array*. Returns 0 on success and -1 on
- error. The reference count of all removed values are decremented.
-
-.. function:: int json_array_extend(json_t *array, json_t *other_array)
-
- Appends all elements in *other_array* to the end of *array*.
- Returns 0 on success and -1 on error.
-
-.. function:: json_array_foreach(array, index, value)
-
- Iterate over every element of ``array``, running the block
- of code that follows each time with the proper values set to
- variables ``index`` and ``value``, of types :type:`size_t` and
- :type:`json_t *` respectively. Example::
-
- /* array is a JSON array */
- size_t index;
- json_t *value;
-
- json_array_foreach(array, index, value) {
- /* block of code that uses index and value */
- }
-
- The items are returned in increasing index order.
-
- This macro expands to an ordinary ``for`` statement upon
- preprocessing, so its performance is equivalent to that of
- hand-written code using the array access functions.
- The main advantage of this macro is that it abstracts
- away the complexity, and makes for more concise and readable code.
-
- .. versionadded:: 2.5
-
-
-Object
-======
-
-A JSON object is a dictionary of key-value pairs, where the key is a
-Unicode string and the value is any JSON value.
-
-Even though null bytes are allowed in string values, they are not
-allowed in object keys.
-
-.. function:: json_t *json_object(void)
-
- .. refcounting:: new
-
- Returns a new JSON object, or *NULL* on error. Initially, the
- object is empty.
-
-.. function:: size_t json_object_size(const json_t *object)
-
- Returns the number of elements in *object*, or 0 if *object* is not
- a JSON object.
-
-.. function:: json_t *json_object_get(const json_t *object, const char *key)
-
- .. refcounting:: borrow
-
- Get a value corresponding to *key* from *object*. Returns *NULL* if
- *key* is not found and on error.
-
-.. function:: int json_object_set(json_t *object, const char *key, json_t *value)
-
- Set the value of *key* to *value* in *object*. *key* must be a
- valid null terminated UTF-8 encoded Unicode string. If there
- already is a value for *key*, it is replaced by the new value.
- Returns 0 on success and -1 on error.
-
-.. function:: int json_object_set_nocheck(json_t *object, const char *key, json_t *value)
-
- Like :func:`json_object_set`, but doesn't check that *key* is
- valid UTF-8. Use this function only if you are certain that this
- really is the case (e.g. you have already checked it by other
- means).
-
-.. function:: int json_object_set_new(json_t *object, const char *key, json_t *value)
-
- Like :func:`json_object_set()` but steals the reference to
- *value*. This is useful when *value* is newly created and not used
- after the call.
-
-.. function:: int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value)
-
- Like :func:`json_object_set_new`, but doesn't check that *key* is
- valid UTF-8. Use this function only if you are certain that this
- really is the case (e.g. you have already checked it by other
- means).
-
-.. function:: int json_object_del(json_t *object, const char *key)
-
- Delete *key* from *object* if it exists. Returns 0 on success, or
- -1 if *key* was not found. The reference count of the removed value
- is decremented.
-
-.. function:: int json_object_clear(json_t *object)
-
- Remove all elements from *object*. Returns 0 on success and -1 if
- *object* is not a JSON object. The reference count of all removed
- values are decremented.
-
-.. function:: int json_object_update(json_t *object, json_t *other)
-
- Update *object* with the key-value pairs from *other*, overwriting
- existing keys. Returns 0 on success or -1 on error.
-
-.. function:: int json_object_update_existing(json_t *object, json_t *other)
-
- Like :func:`json_object_update()`, but only the values of existing
- keys are updated. No new keys are created. Returns 0 on success or
- -1 on error.
-
- .. versionadded:: 2.3
-
-.. function:: int json_object_update_missing(json_t *object, json_t *other)
-
- Like :func:`json_object_update()`, but only new keys are created.
- The value of any existing key is not changed. Returns 0 on success
- or -1 on error.
-
- .. versionadded:: 2.3
-
-.. function:: json_object_foreach(object, key, value)
-
- Iterate over every key-value pair of ``object``, running the block
- of code that follows each time with the proper values set to
- variables ``key`` and ``value``, of types :type:`const char *` and
- :type:`json_t *` respectively. Example::
-
- /* obj is a JSON object */
- const char *key;
- json_t *value;
-
- json_object_foreach(obj, key, value) {
- /* block of code that uses key and value */
- }
-
- The items are returned in the order they were inserted to the
- object.
-
- **Note:** It's not safe to call ``json_object_del(object, key)``
- during iteration. If you need to, use
- :func:`json_object_foreach_safe` instead.
-
- This macro expands to an ordinary ``for`` statement upon
- preprocessing, so its performance is equivalent to that of
- hand-written iteration code using the object iteration protocol
- (see below). The main advantage of this macro is that it abstracts
- away the complexity behind iteration, and makes for more concise and
- readable code.
-
- .. versionadded:: 2.3
-
-
-.. function:: json_object_foreach_safe(object, tmp, key, value)
-
- Like :func:`json_object_foreach()`, but it's safe to call
- ``json_object_del(object, key)`` during iteration. You need to pass
- an extra ``void *`` parameter ``tmp`` that is used for temporary storage.
-
- .. versionadded:: 2.8
-
-
-The following functions can be used to iterate through all key-value
-pairs in an object. The items are returned in the order they were
-inserted to the object.
-
-.. function:: void *json_object_iter(json_t *object)
-
- Returns an opaque iterator which can be used to iterate over all
- key-value pairs in *object*, or *NULL* if *object* is empty.
-
-.. function:: void *json_object_iter_at(json_t *object, const char *key)
-
- Like :func:`json_object_iter()`, but returns an iterator to the
- key-value pair in *object* whose key is equal to *key*, or NULL if
- *key* is not found in *object*. Iterating forward to the end of
- *object* only yields all key-value pairs of the object if *key*
- happens to be the first key in the underlying hash table.
-
-.. function:: void *json_object_iter_next(json_t *object, void *iter)
-
- Returns an iterator pointing to the next key-value pair in *object*
- after *iter*, or *NULL* if the whole object has been iterated
- through.
-
-.. function:: const char *json_object_iter_key(void *iter)
-
- Extract the associated key from *iter*.
-
-.. function:: json_t *json_object_iter_value(void *iter)
-
- .. refcounting:: borrow
-
- Extract the associated value from *iter*.
-
-.. function:: int json_object_iter_set(json_t *object, void *iter, json_t *value)
-
- Set the value of the key-value pair in *object*, that is pointed to
- by *iter*, to *value*.
-
-.. function:: int json_object_iter_set_new(json_t *object, void *iter, json_t *value)
-
- Like :func:`json_object_iter_set()`, but steals the reference to
- *value*. This is useful when *value* is newly created and not used
- after the call.
-
-.. function:: void *json_object_key_to_iter(const char *key)
-
- Like :func:`json_object_iter_at()`, but much faster. Only works for
- values returned by :func:`json_object_iter_key()`. Using other keys
- will lead to segfaults. This function is used internally to
- implement :func:`json_object_foreach`. Example::
-
- /* obj is a JSON object */
- const char *key;
- json_t *value;
- 
- void *iter = json_object_iter(obj);
- while(iter)
- {
- key = json_object_iter_key(iter);
- value = json_object_iter_value(iter);
- /* use key and value ... */
- iter = json_object_iter_next(obj, iter);
- }
-
- .. versionadded:: 2.3
-
-.. function:: void json_object_seed(size_t seed)
-
- Seed the hash function used in Jansson's hashtable implementation.
- The seed is used to randomize the hash function so that an
- attacker cannot control its output.
-
- If *seed* is 0, Jansson generates the seed itself by reading
- random data from the operating system's entropy sources. If no
- entropy sources are available, falls back to using a combination
- of the current timestamp (with microsecond precision if possible)
- and the process ID.
-
- If called at all, this function must be called before any calls to
- :func:`json_object()`, either explicit or implicit. If this
- function is not called by the user, the first call to
- :func:`json_object()` (either explicit or implicit) seeds the hash
- function. See :ref:`portability-thread-safety` for notes on thread
- safety.
-
- If repeatable results are required, for e.g. unit tests, the hash
- function can be "unrandomized" by calling :func:`json_object_seed`
- with a constant value on program startup, e.g.
- ``json_object_seed(1)``.
-
- .. versionadded:: 2.6
-
-
-Error reporting
-===============
-
-Jansson uses a single struct type to pass error information to the
-user. See sections :ref:`apiref-decoding`, :ref:`apiref-pack` and
-:ref:`apiref-unpack` for functions that pass error information using
-this struct.
-
-.. type:: json_error_t
-
- .. member:: char text
-
- The error message (in UTF-8), or an empty string if a message is
- not available.
-
- .. member:: char source
-
- Source of the error. This can be (a part of) the file name or a
- special identifier in angle brackets (e.g. ``<string>``).
-
- .. member:: int line
-
- The line number on which the error occurred.
-
- .. member:: int column
-
- The column on which the error occurred. Note that this is the
- *character column*, not the byte column, i.e. a multibyte UTF-8
- character counts as one column.
-
- .. member:: int position
-
- The position in bytes from the start of the input. This is
- useful for debugging Unicode encoding problems.
-
-The normal use of :type:`json_error_t` is to allocate it on the stack,
-and pass a pointer to a function. Example::
-
- int main() {
- json_t *json;
- json_error_t error;
-
- json = json_load_file("/path/to/file.json", 0, &error);
- if(!json) {
- /* the error variable contains error information */
- }
- ...
- }
-
-Also note that if the call succeeded (``json != NULL`` in the above
-example), the contents of ``error`` are generally left unspecified.
-The decoding functions write to the ``position`` member also on
-success. See :ref:`apiref-decoding` for more info.
-
-All functions also accept *NULL* as the :type:`json_error_t` pointer,
-in which case no error information is returned to the caller.
-
-
-Encoding
-========
-
-This sections describes the functions that can be used to encode
-values to JSON. By default, only objects and arrays can be encoded
-directly, since they are the only valid *root* values of a JSON text.
-To encode any JSON value, use the ``JSON_ENCODE_ANY`` flag (see
-below).
-
-By default, the output has no newlines, and spaces are used between
-array and object elements for a readable output. This behavior can be
-altered by using the ``JSON_INDENT`` and ``JSON_COMPACT`` flags
-described below. A newline is never appended to the end of the encoded
-JSON data.
-
-Each function takes a *flags* parameter that controls some aspects of
-how the data is encoded. Its default value is 0. The following macros
-can be ORed together to obtain *flags*.
-
-``JSON_INDENT(n)``
- Pretty-print the result, using newlines between array and object
- items, and indenting with *n* spaces. The valid range for *n* is
- between 0 and 31 (inclusive), other values result in an undefined
- output. If ``JSON_INDENT`` is not used or *n* is 0, no newlines are
- inserted between array and object items.
-
- The ``JSON_MAX_INDENT`` constant defines the maximum indentation
- that can be used, and its value is 31.
-
- .. versionchanged:: 2.7
- Added ``JSON_MAX_INDENT``.
-
-``JSON_COMPACT``
- This flag enables a compact representation, i.e. sets the separator
- between array and object items to ``","`` and between object keys
- and values to ``":"``. Without this flag, the corresponding
- separators are ``", "`` and ``": "`` for more readable output.
-
-``JSON_ENSURE_ASCII``
- If this flag is used, the output is guaranteed to consist only of
- ASCII characters. This is achieved by escaping all Unicode
- characters outside the ASCII range.
-
-``JSON_SORT_KEYS``
- If this flag is used, all the objects in output are sorted by key.
- This is useful e.g. if two JSON texts are diffed or visually
- compared.
-
-``JSON_PRESERVE_ORDER``
- **Deprecated since version 2.8:** Order of object keys
- is always preserved.
-
- Prior to version 2.8: If this flag is used, object keys in the
- output are sorted into the same order in which they were first
- inserted to the object. For example, decoding a JSON text and then
- encoding with this flag preserves the order of object keys.
-
-``JSON_ENCODE_ANY``
- Specifying this flag makes it possible to encode any JSON value on
- its own. Without it, only objects and arrays can be passed as the
- *json* value to the encoding functions.
-
- **Note:** Encoding any value may be useful in some scenarios, but
- it's generally discouraged as it violates strict compatibility with
- :rfc:`4627`. If you use this flag, don't expect interoperability
- with other JSON systems.
-
- .. versionadded:: 2.1
-
-``JSON_ESCAPE_SLASH``
- Escape the ``/`` characters in strings with ``\/``.
-
- .. versionadded:: 2.4
-
-``JSON_REAL_PRECISION(n)``
- Output all real numbers with at most *n* digits of precision. The
- valid range for *n* is between 0 and 31 (inclusive), and other
- values result in an undefined behavior.
-
- By default, the precision is 17, to correctly and losslessly encode
- all IEEE 754 double precision floating point numbers.
-
- .. versionadded:: 2.7
-
-These functions output UTF-8:
-
-.. function:: char *json_dumps(const json_t *json, size_t flags)
-
- Returns the JSON representation of *json* as a string, or *NULL* on
- error. *flags* is described above. The return value must be freed
- by the caller using :func:`free()`.
-
-.. function:: int json_dumpf(const json_t *json, FILE *output, size_t flags)
-
- Write the JSON representation of *json* to the stream *output*.
- *flags* is described above. Returns 0 on success and -1 on error.
- If an error occurs, something may have already been written to
- *output*. In this case, the output is undefined and most likely not
- valid JSON.
-
-.. function:: int json_dump_file(const json_t *json, const char *path, size_t flags)
-
- Write the JSON representation of *json* to the file *path*. If
- *path* already exists, it is overwritten. *flags* is described
- above. Returns 0 on success and -1 on error.
-
-.. type:: json_dump_callback_t
-
- A typedef for a function that's called by
- :func:`json_dump_callback()`::
-
- typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
-
- *buffer* points to a buffer containing a chunk of output, *size* is
- the length of the buffer, and *data* is the corresponding
- :func:`json_dump_callback()` argument passed through.
-
- On error, the function should return -1 to stop the encoding
- process. On success, it should return 0.
-
- .. versionadded:: 2.2
-
-.. function:: int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags)
-
- Call *callback* repeatedly, passing a chunk of the JSON
- representation of *json* each time. *flags* is described above.
- Returns 0 on success and -1 on error.
-
- .. versionadded:: 2.2
-
-
-.. _apiref-decoding:
-
-Decoding
-========
-
-This sections describes the functions that can be used to decode JSON
-text to the Jansson representation of JSON data. The JSON
-specification requires that a JSON text is either a serialized array
-or object, and this requirement is also enforced with the following
-functions. In other words, the top level value in the JSON text being
-decoded must be either array or object. To decode any JSON value, use
-the ``JSON_DECODE_ANY`` flag (see below).
-
-See :ref:`rfc-conformance` for a discussion on Jansson's conformance
-to the JSON specification. It explains many design decisions that
-affect especially the behavior of the decoder.
-
-Each function takes a *flags* parameter that can be used to control
-the behavior of the decoder. Its default value is 0. The following
-macros can be ORed together to obtain *flags*.
-
-``JSON_REJECT_DUPLICATES``
- Issue a decoding error if any JSON object in the input text
- contains duplicate keys. Without this flag, the value of the last
- occurrence of each key ends up in the result. Key equivalence is
- checked byte-by-byte, without special Unicode comparison
- algorithms.
-
- .. versionadded:: 2.1
-
-``JSON_DECODE_ANY``
- By default, the decoder expects an array or object as the input.
- With this flag enabled, the decoder accepts any valid JSON value.
-
- **Note:** Decoding any value may be useful in some scenarios, but
- it's generally discouraged as it violates strict compatibility with
- :rfc:`4627`. If you use this flag, don't expect interoperability
- with other JSON systems.
-
- .. versionadded:: 2.3
-
-``JSON_DISABLE_EOF_CHECK``
- By default, the decoder expects that its whole input constitutes a
- valid JSON text, and issues an error if there's extra data after
- the otherwise valid JSON input. With this flag enabled, the decoder
- stops after decoding a valid JSON array or object, and thus allows
- extra data after the JSON text.
-
- Normally, reading will stop when the last ```` or ``}`` in the
- JSON input is encountered. If both ``JSON_DISABLE_EOF_CHECK`` and
- ``JSON_DECODE_ANY`` flags are used, the decoder may read one extra
- UTF-8 code unit (up to 4 bytes of input). For example, decoding
- ``4true`` correctly decodes the integer 4, but also reads the
- ``t``. For this reason, if reading multiple consecutive values that
- are not arrays or objects, they should be separated by at least one
- whitespace character.
-
- .. versionadded:: 2.1
-
-``JSON_DECODE_INT_AS_REAL``
- JSON defines only one number type. Jansson distinguishes between
- ints and reals. For more information see :ref:`real-vs-integer`.
- With this flag enabled the decoder interprets all numbers as real
- values. Integers that do not have an exact double representation
- will silently result in a loss of precision. Integers that cause
- a double overflow will cause an error.
-
- .. versionadded:: 2.5
-
-``JSON_ALLOW_NUL``
- Allow ``\u0000`` escape inside string values. This is a safety
- measure; If you know your input can contain null bytes, use this
- flag. If you don't use this flag, you don't have to worry about null
- bytes inside strings unless you explicitly create themselves by
- using e.g. :func:`json_stringn()` or ``s#`` format specifier for
- :func:`json_pack()`.
-
- Object keys cannot have embedded null bytes even if this flag is
- used.
-
- .. versionadded:: 2.6
-
-Each function also takes an optional :type:`json_error_t` parameter
-that is filled with error information if decoding fails. It's also
-updated on success; the number of bytes of input read is written to
-its ``position`` field. This is especially useful when using
-``JSON_DISABLE_EOF_CHECK`` to read multiple consecutive JSON texts.
-
-.. versionadded:: 2.3
- Number of bytes of input read is written to the ``position`` field
- of the :type:`json_error_t` structure.
-
-If no error or position information is needed, you can pass *NULL*.
-
-.. function:: json_t *json_loads(const char *input, size_t flags, json_error_t *error)
-
- .. refcounting:: new
-
- Decodes the JSON string *input* and returns the array or object it
- contains, or *NULL* on error, in which case *error* is filled with
- information about the error. *flags* is described above.
-
-.. function:: json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error)
-
- .. refcounting:: new
-
- Decodes the JSON string *buffer*, whose length is *buflen*, and
- returns the array or object it contains, or *NULL* on error, in
- which case *error* is filled with information about the error. This
- is similar to :func:`json_loads()` except that the string doesn't
- need to be null-terminated. *flags* is described above.
-
- .. versionadded:: 2.1
-
-.. function:: json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
-
- .. refcounting:: new
-
- Decodes the JSON text in stream *input* and returns the array or
- object it contains, or *NULL* on error, in which case *error* is
- filled with information about the error. *flags* is described
- above.
-
- This function will start reading the input from whatever position
- the input file was, without attempting to seek first. If an error
- occurs, the file position will be left indeterminate. On success,
- the file position will be at EOF, unless ``JSON_DISABLE_EOF_CHECK``
- flag was used. In this case, the file position will be at the first
- character after the last ```` or ``}`` in the JSON input. This
- allows calling :func:`json_loadf()` on the same ``FILE`` object
- multiple times, if the input consists of consecutive JSON texts,
- possibly separated by whitespace.
-
-.. function:: json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
-
- .. refcounting:: new
-
- Decodes the JSON text in file *path* and returns the array or
- object it contains, or *NULL* on error, in which case *error* is
- filled with information about the error. *flags* is described
- above.
-
-.. type:: json_load_callback_t
-
- A typedef for a function that's called by
- :func:`json_load_callback()` to read a chunk of input data::
-
- typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
-
- *buffer* points to a buffer of *buflen* bytes, and *data* is the
- corresponding :func:`json_load_callback()` argument passed through.
-
- On success, the function should return the number of bytes read; a
- returned value of 0 indicates that no data was read and that the
- end of file has been reached. On error, the function should return
- ``(size_t)-1`` to abort the decoding process.
-
- .. versionadded:: 2.4
-
-.. function:: json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error)
-
- .. refcounting:: new
-
- Decodes the JSON text produced by repeated calls to *callback*, and
- returns the array or object it contains, or *NULL* on error, in
- which case *error* is filled with information about the error.
- *data* is passed through to *callback* on each call. *flags* is
- described above.
-
- .. versionadded:: 2.4
-
-
-.. _apiref-pack:
-
-Building Values
-===============
-
-This section describes functions that help to create, or *pack*,
-complex JSON values, especially nested objects and arrays. Value
-building is based on a *format string* that is used to tell the
-functions about the expected arguments.
-
-For example, the format string ``"i"`` specifies a single integer
-value, while the format string ``"ssb"`` or the equivalent ``"s, s,
-b"`` specifies an array value with two strings and a boolean as its
-items::
-
- /* Create the JSON integer 42 */
- json_pack("i", 42);
-
- /* Create the JSON array "foo", "bar", true */
- json_pack("ssb", "foo", "bar", 1);
-
-Here's the full list of format specifiers. The type in parentheses
-denotes the resulting JSON type, and the type in brackets (if any)
-denotes the C type that is expected as the corresponding argument or
-arguments.
-
-``s`` (string) const char \*
- Convert a null terminated UTF-8 string to a JSON string.
-
-``s?`` (string) const char \*
- Like ``s``, but if the argument is *NULL*, output a JSON null
- value.
-
- .. versionadded:: 2.8
-
-``s#`` (string) const char \*, int
- Convert a UTF-8 buffer of a given length to a JSON string.
-
- .. versionadded:: 2.5
-
-``s%`` (string) const char \*, size_t
- Like ``s#`` but the length argument is of type :type:`size_t`.
-
- .. versionadded:: 2.6
-
-``+`` const char \*
- Like ``s``, but concatenate to the previous string. Only valid
- after ``s``, ``s#``, ``+`` or ``+#``.
-
- .. versionadded:: 2.5
-
-``+#`` const char \*, int
- Like ``s#``, but concatenate to the previous string. Only valid
- after ``s``, ``s#``, ``+`` or ``+#``.
-
- .. versionadded:: 2.5
-
-``+%`` (string) const char \*, size_t
- Like ``+#`` but the length argument is of type :type:`size_t`.
-
- .. versionadded:: 2.6
-
-``n`` (null)
- Output a JSON null value. No argument is consumed.
-
-``b`` (boolean) int
- Convert a C :type:`int` to JSON boolean value. Zero is converted
- to ``false`` and non-zero to ``true``.
-
-``i`` (integer) int
- Convert a C :type:`int` to JSON integer.
-
-``I`` (integer) json_int_t
- Convert a C :type:`json_int_t` to JSON integer.
-
-``f`` (real) double
- Convert a C :type:`double` to JSON real.
-
-``o`` (any value) json_t \*
- Output any given JSON value as-is. If the value is added to an
- array or object, the reference to the value passed to ``o`` is
- stolen by the container.
-
-``O`` (any value) json_t \*
- Like ``o``, but the argument's reference count is incremented.
- This is useful if you pack into an array or object and want to
- keep the reference for the JSON value consumed by ``O`` to
- yourself.
-
-``o?``, ``O?`` (any value) json_t \*
- Like ``o`` and ``O?``, respectively, but if the argument is
- *NULL*, output a JSON null value.
-
- .. versionadded:: 2.8
-
-``fmt`` (array)
- Build an array with contents from the inner format string. ``fmt``
- may contain objects and arrays, i.e. recursive value building is
- supported.
-
-``{fmt}`` (object)
- Build an object with contents from the inner format string
- ``fmt``. The first, third, etc. format specifier represent a key,
- and must be a string (see ``s``, ``s#``, ``+`` and ``+#`` above),
- as object keys are always strings. The second, fourth, etc. format
- specifier represent a value. Any value may be an object or array,
- i.e. recursive value building is supported.
-
-Whitespace, ``:`` and ``,`` are ignored.
-
-.. function:: json_t *json_pack(const char *fmt, ...)
-
- .. refcounting:: new
-
- Build a new JSON value according to the format string *fmt*. For
- each format specifier (except for ``{}n``), one or more arguments
- are consumed and used to build the corresponding value. Returns
- *NULL* on error.
-
-.. function:: json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...)
- json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap)
-
- .. refcounting:: new
-
- Like :func:`json_pack()`, but an in the case of an error, an error
- message is written to *error*, if it's not *NULL*. The *flags*
- parameter is currently unused and should be set to 0.
-
- As only the errors in format string (and out-of-memory errors) can
- be caught by the packer, these two functions are most likely only
- useful for debugging format strings.
-
-More examples::
-
- /* Build an empty JSON object */
- json_pack("{}");
-
- /* Build the JSON object {"foo": 42, "bar": 7} */
- json_pack("{sisi}", "foo", 42, "bar", 7);
-
- /* Like above, ':', ',' and whitespace are ignored */
- json_pack("{s:i, s:i}", "foo", 42, "bar", 7);
-
- /* Build the JSON array 1, 2, {"cool": true} */
- json_pack("i,i,{s:b}", 1, 2, "cool", 1);
-
- /* Build a string from a non-null terminated buffer */
- char buffer4 = {'t', 'e', 's', 't'};
- json_pack("s#", buffer, 4);
-
- /* Concatenate strings together to build the JSON string "foobarbaz" */
- json_pack("s++", "foo", "bar", "baz");
-
-
-.. _apiref-unpack:
-
-Parsing and Validating Values
-=============================
-
-This section describes functions that help to validate complex values
-and extract, or *unpack*, data from them. Like :ref:`building values
-<apiref-pack>`, this is also based on format strings.
-
-While a JSON value is unpacked, the type specified in the format
-string is checked to match that of the JSON value. This is the
-validation part of the process. In addition to this, the unpacking
-functions can also check that all items of arrays and objects are
-unpacked. This check be enabled with the format specifier ``!`` or by
-using the flag ``JSON_STRICT``. See below for details.
-
-Here's the full list of format specifiers. The type in parentheses
-denotes the JSON type, and the type in brackets (if any) denotes the C
-type whose address should be passed.
-
-``s`` (string) const char \*
- Convert a JSON string to a pointer to a null terminated UTF-8
- string. The resulting string is extracted by using
- :func:`json_string_value()` internally, so it exists as long as
- there are still references to the corresponding JSON string.
-
-``s%`` (string) const char \*, size_t \*
- Convert a JSON string to a pointer to a null terminated UTF-8
- string and its length.
-
- .. versionadded:: 2.6
-
-``n`` (null)
- Expect a JSON null value. Nothing is extracted.
-
-``b`` (boolean) int
- Convert a JSON boolean value to a C :type:`int`, so that ``true``
- is converted to 1 and ``false`` to 0.
-
-``i`` (integer) int
- Convert a JSON integer to C :type:`int`.
-
-``I`` (integer) json_int_t
- Convert a JSON integer to C :type:`json_int_t`.
-
-``f`` (real) double
- Convert a JSON real to C :type:`double`.
-
-``F`` (integer or real) double
- Convert a JSON number (integer or real) to C :type:`double`.
-
-``o`` (any value) json_t \*
- Store a JSON value with no conversion to a :type:`json_t` pointer.
-
-``O`` (any value) json_t \*
- Like ``O``, but the JSON value's reference count is incremented.
-
-``fmt`` (array)
- Convert each item in the JSON array according to the inner format
- string. ``fmt`` may contain objects and arrays, i.e. recursive
- value extraction is supported.
-
-``{fmt}`` (object)
- Convert each item in the JSON object according to the inner format
- string ``fmt``. The first, third, etc. format specifier represent
- a key, and must be ``s``. The corresponding argument to unpack
- functions is read as the object key. The second fourth, etc.
- format specifier represent a value and is written to the address
- given as the corresponding argument. **Note** that every other
- argument is read from and every other is written to.
-
- ``fmt`` may contain objects and arrays as values, i.e. recursive
- value extraction is supported.
-
- .. versionadded:: 2.3
- Any ``s`` representing a key may be suffixed with a ``?`` to
- make the key optional. If the key is not found, nothing is
- extracted. See below for an example.
-
-``!``
- This special format specifier is used to enable the check that
- all object and array items are accessed, on a per-value basis. It
- must appear inside an array or object as the last format specifier
- before the closing bracket or brace. To enable the check globally,
- use the ``JSON_STRICT`` unpacking flag.
-
-``*``
- This special format specifier is the opposite of ``!``. If the
- ``JSON_STRICT`` flag is used, ``*`` can be used to disable the
- strict check on a per-value basis. It must appear inside an array
- or object as the last format specifier before the closing bracket
- or brace.
-
-Whitespace, ``:`` and ``,`` are ignored.
-
-.. function:: int json_unpack(json_t *root, const char *fmt, ...)
-
- Validate and unpack the JSON value *root* according to the format
- string *fmt*. Returns 0 on success and -1 on failure.
-
-.. function:: int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...)
- int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, va_list ap)
-
- Validate and unpack the JSON value *root* according to the format
- string *fmt*. If an error occurs and *error* is not *NULL*, write
- error information to *error*. *flags* can be used to control the
- behaviour of the unpacker, see below for the flags. Returns 0 on
- success and -1 on failure.
-
-.. note::
-
- The first argument of all unpack functions is ``json_t *root``
- instead of ``const json_t *root``, because the use of ``O`` format
- specifier causes the reference count of ``root``, or some value
- reachable from ``root``, to be increased. Furthermore, the ``o``
- format specifier may be used to extract a value as-is, which allows
- modifying the structure or contents of a value reachable from
- ``root``.
-
- If the ``O`` and ``o`` format specifiers are not used, it's
- perfectly safe to cast a ``const json_t *`` variable to plain
- ``json_t *`` when used with these functions.
-
-The following unpacking flags are available:
-
-``JSON_STRICT``
- Enable the extra validation step checking that all object and
- array items are unpacked. This is equivalent to appending the
- format specifier ``!`` to the end of every array and object in the
- format string.
-
-``JSON_VALIDATE_ONLY``
- Don't extract any data, just validate the JSON value against the
- given format string. Note that object keys must still be specified
- after the format string.
-
-Examples::
-
- /* root is the JSON integer 42 */
- int myint;
- json_unpack(root, "i", &myint);
- assert(myint == 42);
-
- /* root is the JSON object {"foo": "bar", "quux": true} */
- const char *str;
- int boolean;
- json_unpack(root, "{s:s, s:b}", "foo", &str, "quux", &boolean);
- assert(strcmp(str, "bar") == 0 && boolean == 1);
-
- /* root is the JSON array 1, 2, {"baz": null} */
- json_error_t error;
- json_unpack_ex(root, &error, JSON_VALIDATE_ONLY, "i,i, {s:n}", "baz");
- /* returns 0 for validation success, nothing is extracted */
-
- /* root is the JSON array 1, 2, 3, 4, 5 */
- int myint1, myint2;
- json_unpack(root, "ii!", &myint1, &myint2);
- /* returns -1 for failed validation */
-
- /* root is an empty JSON object */
- int myint = 0, myint2 = 0, myint3 = 0;
- json_unpack(root, "{s?i, s?ii}",
- "foo", &myint1,
- "bar", &myint2, &myint3);
- /* myint1, myint2 or myint3 is no touched as "foo" and "bar" don't exist */
-
-
-Equality
-========
-
-Testing for equality of two JSON values cannot, in general, be
-achieved using the ``==`` operator. Equality in the terms of the
-``==`` operator states that the two :type:`json_t` pointers point to
-exactly the same JSON value. However, two JSON values can be equal not
-only if they are exactly the same value, but also if they have equal
-"contents":
-
-* Two integer or real values are equal if their contained numeric
- values are equal. An integer value is never equal to a real value,
- though.
-
-* Two strings are equal if their contained UTF-8 strings are equal,
- byte by byte. Unicode comparison algorithms are not implemented.
-
-* Two arrays are equal if they have the same number of elements and
- each element in the first array is equal to the corresponding
- element in the second array.
-
-* Two objects are equal if they have exactly the same keys and the
- value for each key in the first object is equal to the value of the
- corresponding key in the second object.
-
-* Two true, false or null values have no "contents", so they are equal
- if their types are equal. (Because these values are singletons,
- their equality can actually be tested with ``==``.)
-
-.. function:: int json_equal(json_t *value1, json_t *value2)
-
- Returns 1 if *value1* and *value2* are equal, as defined above.
- Returns 0 if they are unequal or one or both of the pointers are
- *NULL*.
-
-
-Copying
-=======
-
-Because of reference counting, passing JSON values around doesn't
-require copying them. But sometimes a fresh copy of a JSON value is
-needed. For example, if you need to modify an array, but still want to
-use the original afterwards, you should take a copy of it first.
-
-Jansson supports two kinds of copying: shallow and deep. There is a
-difference between these methods only for arrays and objects. Shallow
-copying only copies the first level value (array or object) and uses
-the same child values in the copied value. Deep copying makes a fresh
-copy of the child values, too. Moreover, all the child values are deep
-copied in a recursive fashion.
-
-Copying objects preserves the insertion order of keys.
-
-.. function:: json_t *json_copy(json_t *value)
-
- .. refcounting:: new
-
- Returns a shallow copy of *value*, or *NULL* on error.
-
-.. function:: json_t *json_deep_copy(const json_t *value)
-
- .. refcounting:: new
-
- Returns a deep copy of *value*, or *NULL* on error.
-
-
-.. _apiref-custom-memory-allocation:
-
-Custom Memory Allocation
-========================
-
-By default, Jansson uses :func:`malloc()` and :func:`free()` for
-memory allocation. These functions can be overridden if custom
-behavior is needed.
-
-.. type:: json_malloc_t
-
- A typedef for a function pointer with :func:`malloc()`'s
- signature::
-
- typedef void *(*json_malloc_t)(size_t);
-
-.. type:: json_free_t
-
- A typedef for a function pointer with :func:`free()`'s
- signature::
-
- typedef void (*json_free_t)(void *);
-
-.. function:: void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn)
-
- Use *malloc_fn* instead of :func:`malloc()` and *free_fn* instead
- of :func:`free()`. This function has to be called before any other
- Jansson's API functions to ensure that all memory operations use
- the same functions.
-
-.. function:: void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn)
-
- Fetch the current malloc_fn and free_fn used. Either parameter
- may be NULL.
-
- .. versionadded:: 2.8
-
-**Examples:**
-
-Circumvent problems with different CRT heaps on Windows by using
-application's :func:`malloc()` and :func:`free()`::
-
- json_set_alloc_funcs(malloc, free);
-
-Use the `Boehm's conservative garbage collector`_ for memory
-operations::
-
- json_set_alloc_funcs(GC_malloc, GC_free);
-
-.. _Boehm's conservative garbage collector: http://www.hboehm.info/gc/
-
-Allow storing sensitive data (e.g. passwords or encryption keys) in
-JSON structures by zeroing all memory when freed::
-
- static void *secure_malloc(size_t size)
- {
- /* Store the memory area size in the beginning of the block */
- void *ptr = malloc(size + 8);
- *((size_t *)ptr) = size;
- return ptr + 8;
- }
-
- static void secure_free(void *ptr)
- {
- size_t size;
-
- ptr -= 8;
- size = *((size_t *)ptr);
-
- guaranteed_memset(ptr, 0, size + 8);
- free(ptr);
- }
-
- int main()
- {
- json_set_alloc_funcs(secure_malloc, secure_free);
- /* ... */
- }
-
-For more information about the issues of storing sensitive data in
-memory, see
-http://www.dwheeler.com/secure-programs/Secure-Programs-HOWTO/protect-secrets.html.
-The page also explains the :func:`guaranteed_memset()` function used
-in the example and gives a sample implementation for it.

obs-studio-29.1.3.tar.xz/deps/jansson/doc/changes.rst Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/doc/conf.py Deleted

@@ -1,217 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Jansson documentation build configuration file, created by
-# sphinx-quickstart on Sun Sep 5 21:47:20 2010.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('ext'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = 'refcounting'
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = '_templates'
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Jansson'
-copyright = u'2009-2016, Petri Lehtinen'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '2.9'
-# The full version, including alpha/beta/rc tags.
-release = version
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = '_build'
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-default_role = 'c:func'
-primary_domain = 'c'
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = 
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-#html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = 
-
-# The name for this set of Sphinx documents. If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = '_static'
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it. The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Janssondoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass howto/manual).
-latex_documents = 
- ('index', 'Jansson.tex', u'Jansson Documentation',
- u'Petri Lehtinen', 'manual'),
-
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = 
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = 
- ('index', 'jansson', u'Jansson Documentation',
- u'Petri Lehtinen', 1)
-

obs-studio-29.1.3.tar.xz/deps/jansson/doc/conformance.rst Deleted

@@ -1,120 +0,0 @@
-.. _rfc-conformance:
-
-***************
-RFC Conformance
-***************
-
-JSON is specified in :rfc:`4627`, *"The application/json Media Type
-for JavaScript Object Notation (JSON)"*.
-
-Character Encoding
-==================
-
-Jansson only supports UTF-8 encoded JSON texts. It does not support or
-auto-detect any of the other encodings mentioned in the RFC, namely
-UTF-16LE, UTF-16BE, UTF-32LE or UTF-32BE. Pure ASCII is supported, as
-it's a subset of UTF-8.
-
-Strings
-=======
-
-JSON strings are mapped to C-style null-terminated character arrays,
-and UTF-8 encoding is used internally.
-
-All Unicode codepoints U+0000 through U+10FFFF are allowed in string
-values. However, U+0000 is not allowed in object keys because of API
-restrictions.
-
-Unicode normalization or any other transformation is never performed
-on any strings (string values or object keys). When checking for
-equivalence of strings or object keys, the comparison is performed
-byte by byte between the original UTF-8 representations of the
-strings.
-
-Numbers
-=======
-
-.. _real-vs-integer:
-
-Real vs. Integer
-----------------
-
-JSON makes no distinction between real and integer numbers; Jansson
-does. Real numbers are mapped to the ``double`` type and integers to
-the ``json_int_t`` type, which is a typedef of ``long long`` or
-``long``, depending on whether ``long long`` is supported by your
-compiler or not.
-
-A JSON number is considered to be a real number if its lexical
-representation includes one of ``e``, ``E``, or ``.``; regardless if
-its actual numeric value is a true integer (e.g., all of ``1E6``,
-``3.0``, ``400E-2``, and ``3.14E3`` are mathematical integers, but
-will be treated as real values). With the ``JSON_DECODE_INT_AS_REAL``
-decoder flag set all numbers are interpreted as real.
-
-All other JSON numbers are considered integers.
-
-When encoding to JSON, real values are always represented
-with a fractional part; e.g., the ``double`` value 3.0 will be
-represented in JSON as ``3.0``, not ``3``.
-
-Overflow, Underflow & Precision
--------------------------------
-
-Real numbers whose absolute values are too small to be represented in
-a C ``double`` will be silently estimated with 0.0. Thus, depending on
-platform, JSON numbers very close to zero such as 1E-999 may result in
-0.0.
-
-Real numbers whose absolute values are too large to be represented in
-a C ``double`` will result in an overflow error (a JSON decoding
-error). Thus, depending on platform, JSON numbers like 1E+999 or
--1E+999 may result in a parsing error.
-
-Likewise, integer numbers whose absolute values are too large to be
-represented in the ``json_int_t`` type (see above) will result in an
-overflow error (a JSON decoding error). Thus, depending on platform,
-JSON numbers like 1000000000000000 may result in parsing error.
-
-Parsing JSON real numbers may result in a loss of precision. As long
-as overflow does not occur (i.e. a total loss of precision), the
-rounded approximate value is silently used. Thus the JSON number
-1.000000000000000005 may, depending on platform, result in the
-``double`` value 1.0.
-
-Signed zeros
-------------
-
-JSON makes no statement about what a number means; however Javascript
-(ECMAscript) does state that +0.0 and -0.0 must be treated as being
-distinct values, i.e. -0.0 |not-equal| 0.0. Jansson relies on the
-underlying floating point library in the C environment in which it is
-compiled. Therefore it is platform-dependent whether 0.0 and -0.0 will
-be distinct values. Most platforms that use the IEEE 754
-floating-point standard will support signed zeros.
-
-Note that this only applies to floating-point; neither JSON, C, or
-IEEE support the concept of signed integer zeros.
-
-.. |not-equal| unicode:: U+2260
-
-Types
------
-
-No support is provided in Jansson for any C numeric types other than
-``json_int_t`` and ``double``. This excludes things such as unsigned
-types, ``long double``, etc. Obviously, shorter types like ``short``,
-``int``, ``long`` (if ``json_int_t`` is ``long long``) and ``float``
-are implicitly handled via the ordinary C type coercion rules (subject
-to overflow semantics). Also, no support or hooks are provided for any
-supplemental "bignum" type add-on packages.
-
-Depth of nested values
-----------------------
-
-To avoid stack exhaustion, Jansson currently limits the nesting depth
-for arrays and objects to a certain value (default: 2048), defined as
-a macro ``JSON_PARSER_MAX_DEPTH`` within ``jansson_config.h``.
-
-The limit is allowed to be set by the RFC; there is no recommended value
-or required minimum depth to be supported.

obs-studio-29.1.3.tar.xz/deps/jansson/doc/ext Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/doc/ext/refcounting.py Deleted

@@ -1,60 +0,0 @@
-"""
- refcounting
- ~~~~~~~~~~~
-
- Reference count annotations for C API functions. Has the same
- result as the sphinx.ext.refcounting extension but works for all
- functions regardless of the signature, and the reference counting
- information is written inline with the documentation instead of a
- separate file.
-
- Adds a new directive "refcounting". The directive has no content
- and one required positional parameter:: "new" or "borrow".
-
- Example:
-
- .. cfunction:: json_t *json_object(void)
-
- .. refcounting:: new
-
- <description of the json_object function>
-
- :copyright: Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- :license: MIT, see LICENSE for details.
-"""
-
-from docutils import nodes
-
-class refcounting(nodes.emphasis): pass
-
-def visit(self, node):
- self.visit_emphasis(node)
-
-def depart(self, node):
- self.depart_emphasis(node)
-
-def html_visit(self, node):
- self.body.append(self.starttag(node, 'em', '', CLASS='refcount'))
-
-def html_depart(self, node):
- self.body.append('')
-
-
-def refcounting_directive(name, arguments, options, content, lineno,
- content_offset, block_text, state, state_machine):
- if arguments0 == 'borrow':
- text = 'Return value: Borrowed reference.'
- elif arguments0 == 'new':
- text = 'Return value: New reference.'
- else:
- raise Error('Valid arguments: new, borrow')
-
- return refcounting(text, text)
-
-def setup(app):
- app.add_node(refcounting,
- html=(html_visit, html_depart),
- latex=(visit, depart),
- text=(visit, depart),
- man=(visit, depart))
- app.add_directive('refcounting', refcounting_directive, 0, (1, 0, 0))

obs-studio-29.1.3.tar.xz/deps/jansson/doc/gettingstarted.rst Deleted

@@ -1,228 +0,0 @@
-***************
-Getting Started
-***************
-
-.. highlight:: c
-
-Compiling and Installing Jansson
-================================
-
-The Jansson source is available at
-http://www.digip.org/jansson/releases/.
-
-Unix-like systems (including MinGW)
------------------------------------
-
-Unpack the source tarball and change to the source directory:
-
-.. parsed-literal::
-
- bunzip2 -c jansson-|release|.tar.bz2 | tar xf -
- cd jansson-|release|
-
-The source uses GNU Autotools (autoconf_, automake_, libtool_), so
-compiling and installing is extremely simple::
-
- ./configure
- make
- make check
- make install
-
-To change the destination directory (``/usr/local`` by default), use
-the ``--prefix=DIR`` argument to ``./configure``. See ``./configure
---help`` for the list of all possible configuration options.
-
-The command ``make check`` runs the test suite distributed with
-Jansson. This step is not strictly necessary, but it may find possible
-problems that Jansson has on your platform. If any problems are found,
-please report them.
-
-If you obtained the source from a Git repository (or any other source
-control system), there's no ``./configure`` script as it's not kept in
-version control. To create the script, the build system needs to be
-bootstrapped. There are many ways to do this, but the easiest one is
-to use ``autoreconf``::
-
- autoreconf -fi
-
-This command creates the ``./configure`` script, which can then be
-used as described above.
-
-.. _autoconf: http://www.gnu.org/software/autoconf/
-.. _automake: http://www.gnu.org/software/automake/
-.. _libtool: http://www.gnu.org/software/libtool/
-
-
-.. _build-cmake:
-
-CMake (various platforms, including Windows)
---------------------------------------------
-
-Jansson can be built using CMake_. Create a build directory for an
-out-of-tree build, change to that directory, and run ``cmake`` (or ``ccmake``,
-``cmake-gui``, or similar) to configure the project.
-
-See the examples below for more detailed information.
-
-.. note:: In the below examples ``..`` is used as an argument for ``cmake``.
- This is simply the path to the jansson project root directory.
- In the example it is assumed you've created a sub-directory ``build``
- and are using that. You could use any path you want.
-
-.. _build-cmake-unix:
-
-Unix (Make files)
-^^^^^^^^^^^^^^^^^
-Generating make files on unix:
-
-.. parsed-literal::
-
- bunzip2 -c jansson-|release|.tar.bz2 | tar xf -
- cd jansson-|release|
-
- mkdir build
- cd build
- cmake .. # or ccmake .. for a GUI.
-
-Then to build::
-
- make
- make check
- make install
-
-Windows (Visual Studio)
-^^^^^^^^^^^^^^^^^^^^^^^
-Creating Visual Studio project files from the command line:
-
-.. parsed-literal::
-
- <unpack>
- cd jansson-|release|
-
- md build
- cd build
- cmake -G "Visual Studio 10" ..
-
-You will now have a *Visual Studio Solution* in your build directory.
-To run the unit tests build the ``RUN_TESTS`` project.
-
-If you prefer a GUI the ``cmake`` line in the above example can
-be replaced with::
-
- cmake-gui ..
-
-For command line help (including a list of available generators)
-for CMake_ simply run::
-
- cmake
-
-To list available CMake_ settings (and what they are currently set to)
-for the project, run::
-
- cmake -LH ..
-
-Mac OSX (Xcode)
-^^^^^^^^^^^^^^^
-If you prefer using Xcode instead of make files on OSX,
-do the following. (Use the same steps as
-for :ref:`Unix <build-cmake-unix>`)::
-
- ...
- cmake -G "Xcode" ..
-
-Additional CMake settings
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Shared library
-""""""""""""""
-By default the CMake_ project will generate build files for building the
-static library. To build the shared version use::
-
- ...
- cmake -DJANSSON_BUILD_SHARED_LIBS=1 ..
-
-Changing install directory (same as autoconf --prefix)
-""""""""""""""""""""""""""""""""""""""""""""""""""""""
-Just as with the autoconf_ project you can change the destination directory
-for ``make install``. The equivalent for autoconfs ``./configure --prefix``
-in CMake_ is::
-
- ...
- cmake -DCMAKE_INSTALL_PREFIX:PATH=/some/other/path ..
- make install
-
-.. _CMake: http://www.cmake.org
-
-
-Android
--------
-
-Jansson can be built for Android platforms. Android.mk is in the
-source root directory. The configuration header file is located in the
-``android`` directory in the source distribution.
-
-
-Other Systems
--------------
-
-On non Unix-like systems, you may be unable to run the ``./configure``
-script. In this case, follow these steps. All the files mentioned can
-be found in the ``src/`` directory.
-
-1. Create ``jansson_config.h`` (which has some platform-specific
- parameters that are normally filled in by the ``./configure``
- script). Edit ``jansson_config.h.in``, replacing all ``@variable@``
- placeholders, and rename the file to ``jansson_config.h``.
-
-2. Make ``jansson.h`` and ``jansson_config.h`` available to the
- compiler, so that they can be found when compiling programs that
- use Jansson.
-
-3. Compile all the ``.c`` files (in the ``src/`` directory) into a
- library file. Make the library available to the compiler, as in
- step 2.
-
-
-Building the Documentation
---------------------------
-
-(This subsection describes how to build the HTML documentation you are
-currently reading, so it can be safely skipped.)
-
-Documentation is in the ``doc/`` subdirectory. It's written in
-reStructuredText_ with Sphinx_ annotations. To generate the HTML
-documentation, invoke::
-
- make html
-
-and point your browser to ``doc/_build/html/index.html``. Sphinx_ 1.0
-or newer is required to generate the documentation.
-
-.. _reStructuredText: http://docutils.sourceforge.net/rst.html
-.. _Sphinx: http://sphinx.pocoo.org/
-
-
-Compiling Programs that Use Jansson
-===================================
-
-Jansson involves one C header file, :file:`jansson.h`, so it's enough
-to put the line
-
-::
-
- #include <jansson.h>
-
-in the beginning of every source file that uses Jansson.
-
-There's also just one library to link with, ``libjansson``. Compile and
-link the program as follows::
-
- cc -o prog prog.c -ljansson
-
-Starting from version 1.2, there's also support for pkg-config_:
-
-.. code-block:: shell
-
- cc -o prog prog.c `pkg-config --cflags --libs jansson`
-
-.. _pkg-config: http://pkg-config.freedesktop.org/

obs-studio-29.1.3.tar.xz/deps/jansson/doc/github_commits.c Deleted

@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <jansson.h>
-#include <curl/curl.h>
-
-#define BUFFER_SIZE (256 * 1024) /* 256 KB */
-
-#define URL_FORMAT "https://api.github.com/repos/%s/%s/commits"
-#define URL_SIZE 256
-
-/* Return the offset of the first newline in text or the length of
- text if there's no newline */
-static int newline_offset(const char *text)
-{
- const char *newline = strchr(text, '\n');
- if(!newline)
- return strlen(text);
- else
- return (int)(newline - text);
-}
-
-struct write_result
-{
- char *data;
- int pos;
-};
-
-static size_t write_response(void *ptr, size_t size, size_t nmemb, void *stream)
-{
- struct write_result *result = (struct write_result *)stream;
-
- if(result->pos + size * nmemb >= BUFFER_SIZE - 1)
- {
- fprintf(stderr, "error: too small buffer\n");
- return 0;
- }
-
- memcpy(result->data + result->pos, ptr, size * nmemb);
- result->pos += size * nmemb;
-
- return size * nmemb;
-}
-
-static char *request(const char *url)
-{
- CURL *curl = NULL;
- CURLcode status;
- struct curl_slist *headers = NULL;
- char *data = NULL;
- long code;
-
- curl_global_init(CURL_GLOBAL_ALL);
- curl = curl_easy_init();
- if(!curl)
- goto error;
-
- data = malloc(BUFFER_SIZE);
- if(!data)
- goto error;
-
- struct write_result write_result = {
- .data = data,
- .pos = 0
- };
-
- curl_easy_setopt(curl, CURLOPT_URL, url);
-
- /* GitHub commits API v3 requires a User-Agent header */
- headers = curl_slist_append(headers, "User-Agent: Jansson-Tutorial");
- curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
-
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_response);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, &write_result);
-
- status = curl_easy_perform(curl);
- if(status != 0)
- {
- fprintf(stderr, "error: unable to request data from %s:\n", url);
- fprintf(stderr, "%s\n", curl_easy_strerror(status));
- goto error;
- }
-
- curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
- if(code != 200)
- {
- fprintf(stderr, "error: server responded with code %ld\n", code);
- goto error;
- }
-
- curl_easy_cleanup(curl);
- curl_slist_free_all(headers);
- curl_global_cleanup();
-
- /* zero-terminate the result */
- datawrite_result.pos = '\0';
-
- return data;
-
-error:
- if(data)
- free(data);
- if(curl)
- curl_easy_cleanup(curl);
- if(headers)
- curl_slist_free_all(headers);
- curl_global_cleanup();
- return NULL;
-}
-
-int main(int argc, char *argv)
-{
- size_t i;
- char *text;
- char urlURL_SIZE;
-
- json_t *root;
- json_error_t error;
-
- if(argc != 3)
- {
- fprintf(stderr, "usage: %s USER REPOSITORY\n\n", argv0);
- fprintf(stderr, "List commits at USER's REPOSITORY.\n\n");
- return 2;
- }
-
- snprintf(url, URL_SIZE, URL_FORMAT, argv1, argv2);
-
- text = request(url);
- if(!text)
- return 1;
-
- root = json_loads(text, 0, &error);
- free(text);
-
- if(!root)
- {
- fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
- return 1;
- }
-
- if(!json_is_array(root))
- {
- fprintf(stderr, "error: root is not an array\n");
- json_decref(root);
- return 1;
- }
-
- for(i = 0; i < json_array_size(root); i++)
- {
- json_t *data, *sha, *commit, *message;
- const char *message_text;
-
- data = json_array_get(root, i);
- if(!json_is_object(data))
- {
- fprintf(stderr, "error: commit data %d is not an object\n", (int)(i + 1));
- json_decref(root);
- return 1;
- }
-
- sha = json_object_get(data, "sha");
- if(!json_is_string(sha))
- {
- fprintf(stderr, "error: commit %d: sha is not a string\n", (int)(i + 1));
- return 1;
- }
-
- commit = json_object_get(data, "commit");
- if(!json_is_object(commit))
- {
- fprintf(stderr, "error: commit %d: commit is not an object\n", (int)(i + 1));
- json_decref(root);
- return 1;
- }
-
- message = json_object_get(commit, "message");
- if(!json_is_string(message))
- {
- fprintf(stderr, "error: commit %d: message is not a string\n", (int)(i + 1));
- json_decref(root);
- return 1;
- }
-
- message_text = json_string_value(message);
- printf("%.8s %.*s\n",
- json_string_value(sha),
- newline_offset(message_text),
- message_text);
- }
-
- json_decref(root);
- return 0;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/doc/index.rst Deleted

@@ -1,53 +0,0 @@
-Jansson Documentation
-=====================
-
-This is the documentation for Jansson_ |release|, last updated |today|.
-
-Introduction
-------------
-
-Jansson_ is a C library for encoding, decoding and manipulating JSON
-data. Its main features and design principles are:
-
-- Simple and intuitive API and data model
-
-- Comprehensive documentation
-
-- No dependencies on other libraries
-
-- Full Unicode support (UTF-8)
-
-- Extensive test suite
-
-Jansson is licensed under the `MIT license`_; see LICENSE in the
-source distribution for details.
-
-Jansson is used in production and its API is stable. It works on
-numerous platforms, including numerous Unix like systems and Windows.
-It's suitable for use on any system, including desktop, server, and
-small embedded systems.
-
-
-.. _`MIT license`: http://www.opensource.org/licenses/mit-license.php
-.. _Jansson: http://www.digip.org/jansson/
-
-Contents
---------
-
-.. toctree::
-   :maxdepth: 2
-
-   gettingstarted
-   upgrading
-   tutorial
-   conformance
-   portability
-   apiref
-   changes
-
-
-Indices and Tables
-==================
-
-* :ref:`genindex`
-* :ref:`search`

obs-studio-29.1.3.tar.xz/deps/jansson/doc/portability.rst Deleted

@@ -1,83 +0,0 @@
-***********
-Portability
-***********
-
-.. _portability-thread-safety:
-
-Thread safety
--------------
-
-Jansson is thread safe and has no mutable global state. The only
-exceptions are the hash function seed and memory allocation functions,
-see below.
-
-There's no locking performed inside Jansson's code, so a multithreaded
-program must perform its own locking if JSON values are shared by
-multiple threads. Jansson's reference counting semantics may make this
-a bit harder than it seems, as it's possible to have a reference to a
-value that's also stored inside a list or object. Modifying the
-container (adding or removing values) may trigger concurrent access to
-such values, as containers manage the reference count of their
-contained values. Bugs involving concurrent incrementing or
-decrementing of deference counts may be hard to track.
-
-The encoding functions (:func:`json_dumps()` and friends) track
-reference loops by modifying the internal state of objects and arrays.
-For this reason, encoding functions must not be run on the same JSON
-values in two separate threads at the same time. As already noted
-above, be especially careful if two arrays or objects share their
-contained values with another array or object.
-
-If you want to make sure that two JSON value hierarchies do not
-contain shared values, use :func:`json_deep_copy()` to make copies.
-
-
-Hash function seed
-==================
-
-To prevent an attacker from intentionally causing large JSON objects
-with specially crafted keys to perform very slow, the hash function
-used by Jansson is randomized using a seed value. The seed is
-automatically generated on the first explicit or implicit call to
-:func:`json_object()`, if :func:`json_object_seed()` has not been
-called beforehand.
-
-The seed is generated by using operating system's entropy sources if
-they are available (``/dev/urandom``, ``CryptGenRandom()``). The
-initialization is done in as thread safe manner as possible, by using
-architecture specific lockless operations if provided by the platform
-or the compiler.
-
-If you're using threads, it's recommended to autoseed the hashtable
-explicitly before spawning any threads by calling
-``json_object_seed(0)`` , especially if you're unsure whether the
-initialization is thread safe on your platform.
-
-
-Memory allocation functions
-===========================
-
-Memory allocation functions should be set at most once, and only on
-program startup. See :ref:`apiref-custom-memory-allocation`.
-
-
-Locale
-------
-
-Jansson works fine under any locale.
-
-However, if the host program is multithreaded and uses ``setlocale()``
-to switch the locale in one thread while Jansson is currently encoding
-or decoding JSON data in another thread, the result may be wrong or
-the program may even crash.
-
-Jansson uses locale specific functions for certain string conversions
-in the encoder and decoder, and then converts the locale specific
-values to/from the JSON representation. This fails if the locale
-changes between the string conversion and the locale-to-JSON
-conversion. This can only happen in multithreaded programs that use
-``setlocale()``, because ``setlocale()`` switches the locale for all
-running threads, not only the thread that calls ``setlocale()``.
-
-If your program uses ``setlocale()`` as described above, consider
-using the thread-safe ``uselocale()`` instead.

obs-studio-29.1.3.tar.xz/deps/jansson/doc/tutorial.rst Deleted

@@ -1,288 +0,0 @@
-.. _tutorial:
-
-********
-Tutorial
-********
-
-.. highlight:: c
-
-In this tutorial, we create a program that fetches the latest commits
-of a repository in GitHub_ over the web. `GitHub API`_ uses JSON, so
-the result can be parsed using Jansson.
-
-To stick to the the scope of this tutorial, we will only cover the the
-parts of the program related to handling JSON data. For the best user
-experience, the full source code is available:
-:download:`github_commits.c`. To compile it (on Unix-like systems with
-gcc), use the following command::
-
- gcc -o github_commits github_commits.c -ljansson -lcurl
-
-libcurl_ is used to communicate over the web, so it is required to
-compile the program.
-
-The command line syntax is::
-
- github_commits USER REPOSITORY
-
-``USER`` is a GitHub user ID and ``REPOSITORY`` is the repository
-name. Please note that the GitHub API is rate limited, so if you run
-the program too many times within a short period of time, the sever
-starts to respond with an error.
-
-.. _GitHub: https://github.com/
-.. _GitHub API: http://developer.github.com/
-.. _libcurl: http://curl.haxx.se/
-
-
-.. _tutorial-github-commits-api:
-
-The GitHub Repo Commits API
-===========================
-
-The `GitHub Repo Commits API`_ is used by sending HTTP requests to
-URLs like ``https://api.github.com/repos/USER/REPOSITORY/commits``,
-where ``USER`` and ``REPOSITORY`` are the GitHub user ID and the name
-of the repository whose commits are to be listed, respectively.
-
-GitHub responds with a JSON array of the following form:
-
-.. code-block:: none
-
- 
- {
- "sha": "<the commit ID>",
- "commit": {
- "message": "<the commit message>",
- <more fields, not important to this tutorial...>
- },
- <more fields...>
- },
- {
- "sha": "<the commit ID>",
- "commit": {
- "message": "<the commit message>",
- <more fields...>
- },
- <more fields...>
- },
- <more commits...>
- 
-
-In our program, the HTTP request is sent using the following
-function::
-
- static char *request(const char *url);
-
-It takes the URL as a parameter, preforms a HTTP GET request, and
-returns a newly allocated string that contains the response body. If
-the request fails, an error message is printed to stderr and the
-return value is *NULL*. For full details, refer to :download:`the code
-<github_commits.c>`, as the actual implementation is not important
-here.
-
-.. _GitHub Repo Commits API: http://developer.github.com/v3/repos/commits/
-
-.. _tutorial-the-program:
-
-The Program
-===========
-
-First the includes::
-
- #include <string.h>
- #include <jansson.h>
-
-Like all the programs using Jansson, we need to include
-:file:`jansson.h`.
-
-The following definitions are used to build the GitHub API request
-URL::
-
- #define URL_FORMAT "https://api.github.com/repos/%s/%s/commits"
- #define URL_SIZE 256
-
-The following function is used when formatting the result to find the
-first newline in the commit message::
-
- /* Return the offset of the first newline in text or the length of
- text if there's no newline */
- static int newline_offset(const char *text)
- {
- const char *newline = strchr(text, '\n');
- if(!newline)
- return strlen(text);
- else
- return (int)(newline - text);
- }
-
-The main function follows. In the beginning, we first declare a bunch
-of variables and check the command line parameters::
-
- int main(int argc, char *argv)
- {
- size_t i;
- char *text;
- char urlURL_SIZE;
-
- json_t *root;
- json_error_t error;
-
- if(argc != 3)
- {
- fprintf(stderr, "usage: %s USER REPOSITORY\n\n", argv0);
- fprintf(stderr, "List commits at USER's REPOSITORY.\n\n");
- return 2;
- }
-
-Then we build the request URL using the user and repository names
-given as command line parameters::
-
- snprintf(url, URL_SIZE, URL_FORMAT, argv1, argv2);
-
-This uses the ``URL_SIZE`` and ``URL_FORMAT`` constants defined above.
-Now we're ready to actually request the JSON data over the web::
-
- text = request(url);
- if(!text)
- return 1;
-
-If an error occurs, our function ``request`` prints the error and
-returns *NULL*, so it's enough to just return 1 from the main
-function.
-
-Next we'll call :func:`json_loads()` to decode the JSON text we got
-as a response::
-
- root = json_loads(text, 0, &error);
- free(text);
-
- if(!root)
- {
- fprintf(stderr, "error: on line %d: %s\n", error.line, error.text);
- return 1;
- }
-
-We don't need the JSON text anymore, so we can free the ``text``
-variable right after decoding it. If :func:`json_loads()` fails, it
-returns *NULL* and sets error information to the :type:`json_error_t`
-structure given as the second parameter. In this case, our program
-prints the error information out and returns 1 from the main function.
-
-Now we're ready to extract the data out of the decoded JSON response.
-The structure of the response JSON was explained in section
-:ref:`tutorial-github-commits-api`.
-
-We check that the returned value really is an array::
-
- if(!json_is_array(root))
- {
- fprintf(stderr, "error: root is not an array\n");
- json_decref(root);
- return 1;
- }
-
-Then we proceed to loop over all the commits in the array::
-
- for(i = 0; i < json_array_size(root); i++)
- {
- json_t *data, *sha, *commit, *message;
- const char *message_text;
-
- data = json_array_get(root, i);
- if(!json_is_object(data))
- {
- fprintf(stderr, "error: commit data %d is not an object\n", i + 1);
- json_decref(root);
- return 1;
- }
- ...
-
-The function :func:`json_array_size()` returns the size of a JSON
-array. First, we again declare some variables and then extract the
-i'th element of the ``root`` array using :func:`json_array_get()`.
-We also check that the resulting value is a JSON object.
-
-Next we'll extract the commit ID (a hexadecimal SHA-1 sum),
-intermediate commit info object, and the commit message from that
-object. We also do proper type checks::
-
- sha = json_object_get(data, "sha");
- if(!json_is_string(sha))
- {
- fprintf(stderr, "error: commit %d: sha is not a string\n", i + 1);
- json_decref(root);
- return 1;
- }
-
- commit = json_object_get(data, "commit");
- if(!json_is_object(commit))
- {
- fprintf(stderr, "error: commit %d: commit is not an object\n", i + 1);
- json_decref(root);
- return 1;
- }
-
- message = json_object_get(commit, "message");
- if(!json_is_string(message))
- {
- fprintf(stderr, "error: commit %d: message is not a string\n", i + 1);
- json_decref(root);
- return 1;
- }
- ...
-
-And finally, we'll print the first 8 characters of the commit ID and
-the first line of the commit message. A C-style string is extracted
-from a JSON string using :func:`json_string_value()`::
-
- message_text = json_string_value(message);
- printf("%.8s %.*s\n",
- json_string_value(id),
- newline_offset(message_text),
- message_text);
- }
-
-After sending the HTTP request, we decoded the JSON text using
-:func:`json_loads()`, remember? It returns a *new reference* to the
-JSON value it decodes. When we're finished with the value, we'll need
-to decrease the reference count using :func:`json_decref()`. This way
-Jansson can release the resources::
-
- json_decref(root);
- return 0;
-
-For a detailed explanation of reference counting in Jansson, see
-:ref:`apiref-reference-count` in :ref:`apiref`.
-
-The program's ready, let's test it and view the latest commits in
-Jansson's repository:
-
-.. code-block:: shell
-
- $ ./github_commits akheron jansson
- 1581f26a Merge branch '2.3'
- aabfd493 load: Change buffer_pos to be a size_t
- bd72efbd load: Avoid unexpected behaviour in macro expansion
- e8fd3e30 Document and tweak json_load_callback()
- 873eddaf Merge pull request #60 from rogerz/contrib
- bd2c0c73 Ignore the binary test_load_callback
- 17a51a4b Merge branch '2.3'
- 09c39adc Add json_load_callback to the list of exported symbols
- cbb80baf Merge pull request #57 from rogerz/contrib
- 040bd7b0 Add json_load_callback()
- 2637faa4 Make test stripping locale independent
- <...>
-
-
-Conclusion
-==========
-
-In this tutorial, we implemented a program that fetches the latest
-commits of a GitHub repository using the GitHub Repo Commits API.
-Jansson was used to decode the JSON response and to extract the commit
-data.
-
-This tutorial only covered a small part of Jansson. For example, we
-did not create or manipulate JSON values at all. Proceed to
-:ref:`apiref` to explore all features of Jansson.

obs-studio-29.1.3.tar.xz/deps/jansson/doc/upgrading.rst Deleted

@@ -1,76 +0,0 @@
-.. highlight:: c
-
-******************
-Upgrading from 1.x
-******************
-
-This chapter lists the backwards incompatible changes introduced in
-Jansson 2.0, and the steps that are needed for upgrading your code.
-
-**The incompatibilities are not dramatic.** The biggest change is that
-all decoding functions now require and extra parameter. Most programs
-can be modified to work with 2.0 by adding a ``0`` as the second
-parameter to all calls of :func:`json_loads()`, :func:`json_loadf()`
-and :func:`json_load_file()`.
-
-
-Compatibility
-=============
-
-Jansson 2.0 is backwards incompatible with the Jansson 1.x releases.
-It is ABI incompatible, i.e. all programs dynamically linking to the
-Jansson library need to be recompiled. It's also API incompatible,
-i.e. the source code of programs using Jansson 1.x may need
-modifications to make them compile against Jansson 2.0.
-
-All the 2.x releases are guaranteed to be backwards compatible for
-both ABI and API, so no recompilation or source changes are needed
-when upgrading from 2.x to 2.y.
-
-
-List of Incompatible Changes
-============================
-
-**Decoding flags**
-    For future needs, a ``flags`` parameter was added as the second
-    parameter to all decoding functions, i.e. :func:`json_loads()`,
-    :func:`json_loadf()` and :func:`json_load_file()`. All calls to
-    these functions need to be changed by adding a ``0`` as the second
-    argument. For example::
-
-        /* old code */
-        json_loads(input, &error);
-
-        /* new code */
-        json_loads(input, 0, &error);
-
-
-**Underlying type of JSON integers**
-    The underlying C type of JSON integers has been changed from
-    :type:`int` to the widest available signed integer type, i.e.
-    :type:`long long` or :type:`long`, depending on whether
-    :type:`long long` is supported on your system or not. This makes
-    the whole 64-bit integer range available on most modern systems.
-
-    ``jansson.h`` has a typedef :type:`json_int_t` to the underlying
-    integer type. :type:`int` should still be used in most cases when
-    dealing with smallish JSON integers, as the compiler handles
-    implicit type coercion. Only when the full 64-bit range is needed,
-    :type:`json_int_t` should be explicitly used.
-
-
-**Maximum encoder indentation depth**
-    The maximum argument of the ``JSON_INDENT()`` macro has been
-    changed from 255 to 31, to free up bits from the ``flags``
-    parameter of :func:`json_dumps()`, :func:`json_dumpf()` and
-    :func:`json_dump_file()`. If your code uses a bigger indentation
-    than 31, it needs to be changed.
-
-
-**Unsigned integers in API functions**
-    Version 2.0 unifies unsigned integer usage in the API. All uses of
-    :type:`unsigned int` and :type:`unsigned long` have been replaced
-    with :type:`size_t`. This includes flags, container sizes, etc.
-    This should not require source code changes, as both
-    :type:`unsigned int` and :type:`unsigned long` are usually
-    compatible with :type:`size_t`.

obs-studio-29.1.3.tar.xz/deps/jansson/examples Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/examples/README.rst Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/examples/simple_parse.c Deleted

@@ -1,203 +0,0 @@
-/*
- * Simple example of parsing and printing JSON using jansson.
- *
- * SYNOPSIS:
- * $ examples/simple_parse
- * Type some JSON > true, false, null, 1, 0.0, -0.0, "", {"name": "barney"}
- * JSON Array of 8 elements:
- * JSON True
- * JSON False
- * JSON Null
- * JSON Integer: "1"
- * JSON Real: 0.000000
- * JSON Real: -0.000000
- * JSON String: ""
- * JSON Object of 1 pair:
- * JSON Key: "name"
- * JSON String: "barney"
- *
- * Copyright (c) 2014 Robert Poor <rdpoor@gmail.com>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <jansson.h>
-
-/* forward refs */
-void print_json(json_t *root);
-void print_json_aux(json_t *element, int indent);
-void print_json_indent(int indent);
-const char *json_plural(int count);
-void print_json_object(json_t *element, int indent);
-void print_json_array(json_t *element, int indent);
-void print_json_string(json_t *element, int indent);
-void print_json_integer(json_t *element, int indent);
-void print_json_real(json_t *element, int indent);
-void print_json_true(json_t *element, int indent);
-void print_json_false(json_t *element, int indent);
-void print_json_null(json_t *element, int indent);
-
-void print_json(json_t *root) {
- print_json_aux(root, 0);
-}
-
-void print_json_aux(json_t *element, int indent) {
- switch (json_typeof(element)) {
- case JSON_OBJECT:
- print_json_object(element, indent);
- break;
- case JSON_ARRAY:
- print_json_array(element, indent);
- break;
- case JSON_STRING:
- print_json_string(element, indent);
- break;
- case JSON_INTEGER:
- print_json_integer(element, indent);
- break;
- case JSON_REAL:
- print_json_real(element, indent);
- break;
- case JSON_TRUE:
- print_json_true(element, indent);
- break;
- case JSON_FALSE:
- print_json_false(element, indent);
- break;
- case JSON_NULL:
- print_json_null(element, indent);
- break;
- default:
- fprintf(stderr, "unrecognized JSON type %d\n", json_typeof(element));
- }
-}
-
-void print_json_indent(int indent) {
- int i;
- for (i = 0; i < indent; i++) { putchar(' '); }
-}
-
-const char *json_plural(int count) {
- return count == 1 ? "" : "s";
-}
-
-void print_json_object(json_t *element, int indent) {
- size_t size;
- const char *key;
- json_t *value;
-
- print_json_indent(indent);
- size = json_object_size(element);
-
- printf("JSON Object of %ld pair%s:\n", size, json_plural(size));
- json_object_foreach(element, key, value) {
- print_json_indent(indent + 2);
- printf("JSON Key: \"%s\"\n", key);
- print_json_aux(value, indent + 2);
- }
-
-}
-
-void print_json_array(json_t *element, int indent) {
- size_t i;
- size_t size = json_array_size(element);
- print_json_indent(indent);
-
- printf("JSON Array of %ld element%s:\n", size, json_plural(size));
- for (i = 0; i < size; i++) {
- print_json_aux(json_array_get(element, i), indent + 2);
- }
-}
-
-void print_json_string(json_t *element, int indent) {
- print_json_indent(indent);
- printf("JSON String: \"%s\"\n", json_string_value(element));
-}
-
-void print_json_integer(json_t *element, int indent) {
- print_json_indent(indent);
- printf("JSON Integer: \"%" JSON_INTEGER_FORMAT "\"\n", json_integer_value(element));
-}
-
-void print_json_real(json_t *element, int indent) {
- print_json_indent(indent);
- printf("JSON Real: %f\n", json_real_value(element));
-}
-
-void print_json_true(json_t *element, int indent) {
- (void)element;
- print_json_indent(indent);
- printf("JSON True\n");
-}
-
-void print_json_false(json_t *element, int indent) {
- (void)element;
- print_json_indent(indent);
- printf("JSON False\n");
-}
-
-void print_json_null(json_t *element, int indent) {
- (void)element;
- print_json_indent(indent);
- printf("JSON Null\n");
-}
-
-/*
- * Parse text into a JSON object. If text is valid JSON, returns a
- * json_t structure, otherwise prints and error and returns null.
- */
-json_t *load_json(const char *text) {
- json_t *root;
- json_error_t error;
-
- root = json_loads(text, 0, &error);
-
- if (root) {
- return root;
- } else {
- fprintf(stderr, "json error on line %d: %s\n", error.line, error.text);
- return (json_t *)0;
- }
-}
-
-/*
- * Print a prompt and return (by reference) a null-terminated line of
- * text. Returns NULL on eof or some error.
- */
-char *read_line(char *line, int max_chars) {
- printf("Type some JSON > ");
- fflush(stdout);
- return fgets(line, max_chars, stdin);
-}
-
-/* ================================================================
- * main
- */
-
-#define MAX_CHARS 4096
-
-int main(int argc, char *argv) {
- char lineMAX_CHARS;
-
- if (argc != 1) {
- fprintf(stderr, "Usage: %s\n", argv0);
- exit(-1);
- }
-
- while (read_line(line, MAX_CHARS) != (char *)NULL) {
-
- /* parse text into JSON structure */
- json_t *root = load_json(line);
-
- if (root) {
- /* print and release the JSON structure */
- print_json(root);
- json_decref(root);
- }
- }
-
- return 0;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/jansson.pc.in Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/release.sh Deleted

@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# Use this script to easily make releases of Jansson. It configures
-# the source tree, and builds and signs all tarballs.
-
-die() {
-    echo $1 >&2
-    exit 1
-}
-
-confirm() {
-    local answer
-    read -p "$1 yN: " answer
-     "$answer" = "Y" -o "$answer" = "y"  || exit 0
-}
-
-set -e
- -f configure.ac  || die "Must be run at project root directory"
-
-# Determine version
-v=$(grep AC_INIT configure.ac | sed -r 's/.*, \(.+?)\,.*/\1/')
- -n "$v"  || die "Unable to determine version"
-confirm "Version is $v, proceed?"
-
-# Sanity checks
-vi=$(grep version-info src/Makefile.am | sed 's/^ \t*//g' | cut -d" " -f2)
-confirm "Libtool version-info is $vi, proceed?"
-
-r=$(grep 'Released ' CHANGES | head -n 1)
-confirm "Last CHANGES entry says \"$r\", proceed??"
-
-dv=$(grep ^version doc/conf.py | sed -r "s/.*'(.*)'.*/\1/")
-if  "$dv" != "$v" ; then
-    die "Documentation version ($dv) doesn't match library version"
-fi
-
- -f Makefile  && make distclean || true
-rm -f jansson-$v.tar.*
-rm -rf jansson-$v-doc
-rm -f jansson-$v-doc.tar.*
-
-autoreconf -fi
-./configure
-
-# Run tests and make gz source tarball
-: ${VALGRIND:=1}
-export VALGRIND
-make distcheck
-
-# Make bzip2 source tarball
-make dist-bzip2
-
-# Sign source tarballs
-for s in gz bz2; do
-    gpg --detach-sign --armor jansson-$v.tar.$s
-done
-
-# Build documentation
-make html
-mv doc/_build/html jansson-$v-doc
-
-# Make and sign documentation tarballs
-for s in gz bz2; do
-     $s = gz  && compress=gzip
-     $s = bz2  && compress=bzip2
-    tar cf - jansson-$v-doc | $compress -9 -c > jansson-$v-doc.tar.$s
-    gpg --detach-sign --armor jansson-$v-doc.tar.$s
-done
-
-echo "All done"

obs-studio-29.1.3.tar.xz/deps/jansson/src Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/src/Makefile.am Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/src/dump.c Deleted

@@ -1,447 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <assert.h>
-
-#include "jansson.h"
-#include "jansson_private.h"
-#include "strbuffer.h"
-#include "utf.h"
-
-#define MAX_INTEGER_STR_LENGTH 100
-#define MAX_REAL_STR_LENGTH 100
-
-#define FLAGS_TO_INDENT(f) ((f) & 0x1F)
-#define FLAGS_TO_PRECISION(f) (((f) >> 11) & 0x1F)
-
-static int dump_to_strbuffer(const char *buffer, size_t size, void *data)
-{
- return strbuffer_append_bytes((strbuffer_t *)data, buffer, size);
-}
-
-static int dump_to_file(const char *buffer, size_t size, void *data)
-{
- FILE *dest = (FILE *)data;
- if(fwrite(buffer, size, 1, dest) != 1)
- return -1;
- return 0;
-}
-
-/* 32 spaces (the maximum indentation size) */
-static const char whitespace = " ";
-
-static int dump_indent(size_t flags, int depth, int space, json_dump_callback_t dump, void *data)
-{
- if(FLAGS_TO_INDENT(flags) > 0)
- {
- unsigned int ws_count = FLAGS_TO_INDENT(flags), n_spaces = depth * ws_count;
-
- if(dump("\n", 1, data))
- return -1;
-
- while(n_spaces > 0)
- {
- int cur_n = n_spaces < sizeof whitespace - 1 ? n_spaces : sizeof whitespace - 1;
-
- if(dump(whitespace, cur_n, data))
- return -1;
-
- n_spaces -= cur_n;
- }
- }
- else if(space && !(flags & JSON_COMPACT))
- {
- return dump(" ", 1, data);
- }
- return 0;
-}
-
-static int dump_string(const char *str, size_t len, json_dump_callback_t dump, void *data, size_t flags)
-{
- const char *pos, *end, *lim;
- int32_t codepoint;
-
- if(dump("\"", 1, data))
- return -1;
-
- end = pos = str;
- lim = str + len;
- while(1)
- {
- const char *text;
- char seq13;
- int length;
-
- while(end < lim)
- {
- end = utf8_iterate(pos, lim - pos, &codepoint);
- if(!end)
- return -1;
-
- /* mandatory escape or control char */
- if(codepoint == '\\' || codepoint == '"' || codepoint < 0x20)
- break;
-
- /* slash */
- if((flags & JSON_ESCAPE_SLASH) && codepoint == '/')
- break;
-
- /* non-ASCII */
- if((flags & JSON_ENSURE_ASCII) && codepoint > 0x7F)
- break;
-
- pos = end;
- }
-
- if(pos != str) {
- if(dump(str, pos - str, data))
- return -1;
- }
-
- if(end == pos)
- break;
-
- /* handle \, /, ", and control codes */
- length = 2;
- switch(codepoint)
- {
- case '\\': text = "\\\\"; break;
- case '\"': text = "\\\""; break;
- case '\b': text = "\\b"; break;
- case '\f': text = "\\f"; break;
- case '\n': text = "\\n"; break;
- case '\r': text = "\\r"; break;
- case '\t': text = "\\t"; break;
- case '/': text = "\\/"; break;
- default:
- {
- /* codepoint is in BMP */
- if(codepoint < 0x10000)
- {
- snprintf(seq, sizeof(seq), "\\u%04X", (unsigned int)codepoint);
- length = 6;
- }
-
- /* not in BMP -> construct a UTF-16 surrogate pair */
- else
- {
- int32_t first, last;
-
- codepoint -= 0x10000;
- first = 0xD800 | ((codepoint & 0xffc00) >> 10);
- last = 0xDC00 | (codepoint & 0x003ff);
-
- snprintf(seq, sizeof(seq), "\\u%04X\\u%04X", (unsigned int)first, (unsigned int)last);
- length = 12;
- }
-
- text = seq;
- break;
- }
- }
-
- if(dump(text, length, data))
- return -1;
-
- str = pos = end;
- }
-
- return dump("\"", 1, data);
-}
-
-static int compare_keys(const void *key1, const void *key2)
-{
- return strcmp(*(const char **)key1, *(const char **)key2);
-}
-
-static int do_dump(const json_t *json, size_t flags, int depth,
- json_dump_callback_t dump, void *data)
-{
- if(!json)
- return -1;
-
- switch(json_typeof(json)) {
- case JSON_NULL:
- return dump("null", 4, data);
-
- case JSON_TRUE:
- return dump("true", 4, data);
-
- case JSON_FALSE:
- return dump("false", 5, data);
-
- case JSON_INTEGER:
- {
- char bufferMAX_INTEGER_STR_LENGTH;
- int size;
-
- size = snprintf(buffer, MAX_INTEGER_STR_LENGTH,
- "%" PRId64,
- json_integer_value(json));
- if(size < 0 || size >= MAX_INTEGER_STR_LENGTH)
- return -1;
-
- return dump(buffer, size, data);
- }
-
- case JSON_REAL:
- {
- char bufferMAX_REAL_STR_LENGTH;
- int size;
- double value = json_real_value(json);
-
- size = jsonp_dtostr(buffer, MAX_REAL_STR_LENGTH, value,
- FLAGS_TO_PRECISION(flags));
- if(size < 0)
- return -1;
-
- return dump(buffer, size, data);
- }
-
- case JSON_STRING:
- return dump_string(json_string_value(json), json_string_length(json), dump, data, flags);
-
- case JSON_ARRAY:
- {
- size_t n;
- size_t i;
-
- json_array_t *array;
-
- /* detect circular references */
- array = json_to_array(json);
- if(array->visited)
- goto array_error;
- array->visited = 1;
-
- n = json_array_size(json);
-
- if(dump("", 1, data))
- goto array_error;
- if(n == 0) {
- array->visited = 0;
- return dump("", 1, data);
- }
- if(dump_indent(flags, depth + 1, 0, dump, data))
- goto array_error;
-
- for(i = 0; i < n; ++i) {
- if(do_dump(json_array_get(json, i), flags, depth + 1,
- dump, data))
- goto array_error;
-
- if(i < n - 1)
- {
- if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, 1, dump, data))
- goto array_error;
- }
- else
- {
- if(dump_indent(flags, depth, 0, dump, data))
- goto array_error;
- }
- }
-
- array->visited = 0;
- return dump("", 1, data);
-
- array_error:
- array->visited = 0;
- return -1;
- }
-
- case JSON_OBJECT:
- {
- json_object_t *object;
- void *iter;
- const char *separator;
- int separator_length;
-
- if(flags & JSON_COMPACT) {
- separator = ":";
- separator_length = 1;
- }
- else {
- separator = ": ";
- separator_length = 2;
- }
-
- /* detect circular references */
- object = json_to_object(json);
- if(object->visited)
- goto object_error;
- object->visited = 1;
-
- iter = json_object_iter((json_t *)json);
-
- if(dump("{", 1, data))
- goto object_error;
- if(!iter) {
- object->visited = 0;
- return dump("}", 1, data);
- }
- if(dump_indent(flags, depth + 1, 0, dump, data))
- goto object_error;
-
- if(flags & JSON_SORT_KEYS)
- {
- char **keys;
- size_t size, i;
-
- size = json_object_size(json);
- keys = jsonp_malloc(size * sizeof(const char *));
- if(!keys)
- goto object_error;
-
- i = 0;
- while(iter)
- {
- keysi = (char *)json_object_iter_key(iter);
- iter = json_object_iter_next((json_t *)json, iter);
- i++;
- }
- assert(i == size);
-
- qsort(keys, size, sizeof(const char *), compare_keys);
-
- for(i = 0; i < size; i++)
- {
- const char *key;
- json_t *value;
-
- key = keysi;
- value = json_object_get(json, key);
- assert(value);
-
- dump_string(key, strlen(key), dump, data, flags);
- if(dump(separator, separator_length, data) ||
- do_dump(value, flags, depth + 1, dump, data))
- {
- jsonp_free(keys);
- goto object_error;
- }
-
- if(i < size - 1)
- {
- if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, 1, dump, data))
- {
- jsonp_free(keys);
- goto object_error;
- }
- }
- else
- {
- if(dump_indent(flags, depth, 0, dump, data))
- {
- jsonp_free(keys);
- goto object_error;
- }
- }
- }
-
- jsonp_free(keys);
- }
- else
- {
- /* Don't sort keys */
-
- while(iter)
- {
- void *next = json_object_iter_next((json_t *)json, iter);
- const char *key = json_object_iter_key(iter);
-
- dump_string(key, strlen(key), dump, data, flags);
- if(dump(separator, separator_length, data) ||
- do_dump(json_object_iter_value(iter), flags, depth + 1,
- dump, data))
- goto object_error;
-
- if(next)
- {
- if(dump(",", 1, data) ||
- dump_indent(flags, depth + 1, 1, dump, data))
- goto object_error;
- }
- else
- {
- if(dump_indent(flags, depth, 0, dump, data))
- goto object_error;
- }
-
- iter = next;
- }
- }
-
- object->visited = 0;
- return dump("}", 1, data);
-
- object_error:
- object->visited = 0;
- return -1;
- }
-
- default:
- /* not reached */
- return -1;
- }
-}
-
-char *json_dumps(const json_t *json, size_t flags)
-{
- strbuffer_t strbuff;
- char *result;
-
- if(strbuffer_init(&strbuff))
- return NULL;
-
- if(json_dump_callback(json, dump_to_strbuffer, (void *)&strbuff, flags))
- result = NULL;
- else
- result = jsonp_strdup(strbuffer_value(&strbuff));
-
- strbuffer_close(&strbuff);
- return result;
-}
-
-int json_dumpf(const json_t *json, FILE *output, size_t flags)
-{
- return json_dump_callback(json, dump_to_file, (void *)output, flags);
-}
-
-int json_dump_file(const json_t *json, const char *path, size_t flags)
-{
- int result;
-
- FILE *output = fopen(path, "w");
- if(!output)
- return -1;
-
- result = json_dumpf(json, output, flags);
-
- fclose(output);
- return result;
-}
-
-int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags)
-{
- if(!(flags & JSON_ENCODE_ANY)) {
- if(!json_is_array(json) && !json_is_object(json))
- return -1;
- }
-
- return do_dump(json, flags, 0, callback, data);
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/error.c Deleted

@@ -1,63 +0,0 @@
-#include <string.h>
-#include "jansson_private.h"
-
-void jsonp_error_init(json_error_t *error, const char *source)
-{
- if(error)
- {
- error->text0 = '\0';
- error->line = -1;
- error->column = -1;
- error->position = 0;
- if(source)
- jsonp_error_set_source(error, source);
- else
- error->source0 = '\0';
- }
-}
-
-void jsonp_error_set_source(json_error_t *error, const char *source)
-{
- size_t length;
-
- if(!error || !source)
- return;
-
- length = strlen(source);
- if(length < JSON_ERROR_SOURCE_LENGTH)
- strncpy(error->source, source, length + 1);
- else {
- size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
- strncpy(error->source, "...", 3);
- strncpy(error->source + 3, source + extra, length - extra + 1);
- }
-}
-
-void jsonp_error_set(json_error_t *error, int line, int column,
- size_t position, const char *msg, ...)
-{
- va_list ap;
-
- va_start(ap, msg);
- jsonp_error_vset(error, line, column, position, msg, ap);
- va_end(ap);
-}
-
-void jsonp_error_vset(json_error_t *error, int line, int column,
- size_t position, const char *msg, va_list ap)
-{
- if(!error)
- return;
-
- if(error->text0 != '\0') {
- /* error already set */
- return;
- }
-
- error->line = line;
- error->column = column;
- error->position = (int)position;
-
- vsnprintf(error->text, JSON_ERROR_TEXT_LENGTH, msg, ap);
- error->textJSON_ERROR_TEXT_LENGTH - 1 = '\0';
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/hashtable.c Deleted

@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#if HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#include <jansson_config.h> /* for JSON_INLINE */
-#include "jansson_private.h" /* for container_of() */
-#include "hashtable.h"
-
-#ifndef INITIAL_HASHTABLE_ORDER
-#define INITIAL_HASHTABLE_ORDER 3
-#endif
-
-typedef struct hashtable_list list_t;
-typedef struct hashtable_pair pair_t;
-typedef struct hashtable_bucket bucket_t;
-
-extern volatile uint32_t hashtable_seed;
-
-/* Implementation of the hash function */
-#include "lookup3.h"
-
-#define list_to_pair(list_) container_of(list_, pair_t, list)
-#define ordered_list_to_pair(list_) container_of(list_, pair_t, ordered_list)
-#define hash_str(key) ((size_t)hashlittle((key), strlen(key), hashtable_seed))
-
-static JSON_INLINE void list_init(list_t *list)
-{
- list->next = list;
- list->prev = list;
-}
-
-static JSON_INLINE void list_insert(list_t *list, list_t *node)
-{
- node->next = list;
- node->prev = list->prev;
- list->prev->next = node;
- list->prev = node;
-}
-
-static JSON_INLINE void list_remove(list_t *list)
-{
- list->prev->next = list->next;
- list->next->prev = list->prev;
-}
-
-static JSON_INLINE int bucket_is_empty(hashtable_t *hashtable, bucket_t *bucket)
-{
- return bucket->first == &hashtable->list && bucket->first == bucket->last;
-}
-
-static void insert_to_bucket(hashtable_t *hashtable, bucket_t *bucket,
- list_t *list)
-{
- if(bucket_is_empty(hashtable, bucket))
- {
- list_insert(&hashtable->list, list);
- bucket->first = bucket->last = list;
- }
- else
- {
- list_insert(bucket->first, list);
- bucket->first = list;
- }
-}
-
-static pair_t *hashtable_find_pair(hashtable_t *hashtable, bucket_t *bucket,
- const char *key, size_t hash)
-{
- list_t *list;
- pair_t *pair;
-
- if(bucket_is_empty(hashtable, bucket))
- return NULL;
-
- list = bucket->first;
- while(1)
- {
- pair = list_to_pair(list);
- if(pair->hash == hash && strcmp(pair->key, key) == 0)
- return pair;
-
- if(list == bucket->last)
- break;
-
- list = list->next;
- }
-
- return NULL;
-}
-
-/* returns 0 on success, -1 if key was not found */
-static int hashtable_do_del(hashtable_t *hashtable,
- const char *key, size_t hash)
-{
- pair_t *pair;
- bucket_t *bucket;
- size_t index;
-
- index = hash & hashmask(hashtable->order);
- bucket = &hashtable->bucketsindex;
-
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
- if(!pair)
- return -1;
-
- if(&pair->list == bucket->first && &pair->list == bucket->last)
- bucket->first = bucket->last = &hashtable->list;
-
- else if(&pair->list == bucket->first)
- bucket->first = pair->list.next;
-
- else if(&pair->list == bucket->last)
- bucket->last = pair->list.prev;
-
- list_remove(&pair->list);
- list_remove(&pair->ordered_list);
- json_decref(pair->value);
-
- jsonp_free(pair);
- hashtable->size--;
-
- return 0;
-}
-
-static void hashtable_do_clear(hashtable_t *hashtable)
-{
- list_t *list, *next;
- pair_t *pair;
-
- for(list = hashtable->list.next; list != &hashtable->list; list = next)
- {
- next = list->next;
- pair = list_to_pair(list);
- json_decref(pair->value);
- jsonp_free(pair);
- }
-}
-
-static int hashtable_do_rehash(hashtable_t *hashtable)
-{
- list_t *list, *next;
- pair_t *pair;
- size_t i, index, new_size, new_order;
- struct hashtable_bucket *new_buckets;
-
- new_order = hashtable->order + 1;
- new_size = hashsize(new_order);
-
- new_buckets = jsonp_malloc(new_size * sizeof(bucket_t));
- if(!new_buckets)
- return -1;
-
- jsonp_free(hashtable->buckets);
- hashtable->buckets = new_buckets;
- hashtable->order = new_order;
-
- for(i = 0; i < hashsize(hashtable->order); i++)
- {
- hashtable->bucketsi.first = hashtable->bucketsi.last =
- &hashtable->list;
- }
-
- list = hashtable->list.next;
- list_init(&hashtable->list);
-
- for(; list != &hashtable->list; list = next) {
- next = list->next;
- pair = list_to_pair(list);
- index = pair->hash % new_size;
- insert_to_bucket(hashtable, &hashtable->bucketsindex, &pair->list);
- }
-
- return 0;
-}
-
-
-int hashtable_init(hashtable_t *hashtable)
-{
- size_t i;
-
- hashtable->size = 0;
- hashtable->order = INITIAL_HASHTABLE_ORDER;
- hashtable->buckets = jsonp_malloc(hashsize(hashtable->order) * sizeof(bucket_t));
- if(!hashtable->buckets)
- return -1;
-
- list_init(&hashtable->list);
- list_init(&hashtable->ordered_list);
-
- for(i = 0; i < hashsize(hashtable->order); i++)
- {
- hashtable->bucketsi.first = hashtable->bucketsi.last =
- &hashtable->list;
- }
-
- return 0;
-}
-
-void hashtable_close(hashtable_t *hashtable)
-{
- hashtable_do_clear(hashtable);
- jsonp_free(hashtable->buckets);
-}
-
-int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value)
-{
- pair_t *pair;
- bucket_t *bucket;
- size_t hash, index;
-
- /* rehash if the load ratio exceeds 1 */
- if(hashtable->size >= hashsize(hashtable->order))
- if(hashtable_do_rehash(hashtable))
- return -1;
-
- hash = hash_str(key);
- index = hash & hashmask(hashtable->order);
- bucket = &hashtable->bucketsindex;
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
-
- if(pair)
- {
- json_decref(pair->value);
- pair->value = value;
- }
- else
- {
- /* offsetof(...) returns the size of pair_t without the last,
- flexible member. This way, the correct amount is
- allocated. */
-
- size_t len = strlen(key);
- if(len >= (size_t)-1 - offsetof(pair_t, key)) {
- /* Avoid an overflow if the key is very long */
- return -1;
- }
-
- pair = jsonp_malloc(offsetof(pair_t, key) + len + 1);
- if(!pair)
- return -1;
-
- pair->hash = hash;
- strncpy(pair->key, key, len + 1);
- pair->value = value;
- list_init(&pair->list);
- list_init(&pair->ordered_list);
-
- insert_to_bucket(hashtable, bucket, &pair->list);
- list_insert(&hashtable->ordered_list, &pair->ordered_list);
-
- hashtable->size++;
- }
- return 0;
-}
-
-void *hashtable_get(hashtable_t *hashtable, const char *key)
-{
- pair_t *pair;
- size_t hash;
- bucket_t *bucket;
-
- hash = hash_str(key);
- bucket = &hashtable->bucketshash & hashmask(hashtable->order);
-
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
- if(!pair)
- return NULL;
-
- return pair->value;
-}
-
-int hashtable_del(hashtable_t *hashtable, const char *key)
-{
- size_t hash = hash_str(key);
- return hashtable_do_del(hashtable, key, hash);
-}
-
-void hashtable_clear(hashtable_t *hashtable)
-{
- size_t i;
-
- hashtable_do_clear(hashtable);
-
- for(i = 0; i < hashsize(hashtable->order); i++)
- {
- hashtable->bucketsi.first = hashtable->bucketsi.last =
- &hashtable->list;
- }
-
- list_init(&hashtable->list);
- list_init(&hashtable->ordered_list);
- hashtable->size = 0;
-}
-
-void *hashtable_iter(hashtable_t *hashtable)
-{
- return hashtable_iter_next(hashtable, &hashtable->ordered_list);
-}
-
-void *hashtable_iter_at(hashtable_t *hashtable, const char *key)
-{
- pair_t *pair;
- size_t hash;
- bucket_t *bucket;
-
- hash = hash_str(key);
- bucket = &hashtable->bucketshash & hashmask(hashtable->order);
-
- pair = hashtable_find_pair(hashtable, bucket, key, hash);
- if(!pair)
- return NULL;
-
- return &pair->ordered_list;
-}
-
-void *hashtable_iter_next(hashtable_t *hashtable, void *iter)
-{
- list_t *list = (list_t *)iter;
- if(list->next == &hashtable->ordered_list)
- return NULL;
- return list->next;
-}
-
-void *hashtable_iter_key(void *iter)
-{
- pair_t *pair = ordered_list_to_pair((list_t *)iter);
- return pair->key;
-}
-
-void *hashtable_iter_value(void *iter)
-{
- pair_t *pair = ordered_list_to_pair((list_t *)iter);
- return pair->value;
-}
-
-void hashtable_iter_set(void *iter, json_t *value)
-{
- pair_t *pair = ordered_list_to_pair((list_t *)iter);
-
- json_decref(pair->value);
- pair->value = value;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/hashtable.h Deleted

@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef HASHTABLE_H
-#define HASHTABLE_H
-
-#include <stdlib.h>
-#include "jansson.h"
-
-struct hashtable_list {
- struct hashtable_list *prev;
- struct hashtable_list *next;
-};
-
-/* "pair" may be a bit confusing a name, but think of it as a
- key-value pair. In this case, it just encodes some extra data,
- too */
-struct hashtable_pair {
- struct hashtable_list list;
- struct hashtable_list ordered_list;
- size_t hash;
- json_t *value;
- char key1;
-};
-
-struct hashtable_bucket {
- struct hashtable_list *first;
- struct hashtable_list *last;
-};
-
-typedef struct hashtable {
- size_t size;
- struct hashtable_bucket *buckets;
- size_t order; /* hashtable has pow(2, order) buckets */
- struct hashtable_list list;
- struct hashtable_list ordered_list;
-} hashtable_t;
-
-
-#define hashtable_key_to_iter(key_) \
- (&(container_of(key_, struct hashtable_pair, key)->ordered_list))
-
-
-/**
- * hashtable_init - Initialize a hashtable object
- *
- * @hashtable: The (statically allocated) hashtable object
- *
- * Initializes a statically allocated hashtable object. The object
- * should be cleared with hashtable_close when it's no longer used.
- *
- * Returns 0 on success, -1 on error (out of memory).
- */
-int hashtable_init(hashtable_t *hashtable);
-
-/**
- * hashtable_close - Release all resources used by a hashtable object
- *
- * @hashtable: The hashtable
- *
- * Destroys a statically allocated hashtable object.
- */
-void hashtable_close(hashtable_t *hashtable);
-
-/**
- * hashtable_set - Add/modify value in hashtable
- *
- * @hashtable: The hashtable object
- * @key: The key
- * @serial: For addition order of keys
- * @value: The value
- *
- * If a value with the given key already exists, its value is replaced
- * with the new value. Value is "stealed" in the sense that hashtable
- * doesn't increment its refcount but decreases the refcount when the
- * value is no longer needed.
- *
- * Returns 0 on success, -1 on failure (out of memory).
- */
-int hashtable_set(hashtable_t *hashtable, const char *key, json_t *value);
-
-/**
- * hashtable_get - Get a value associated with a key
- *
- * @hashtable: The hashtable object
- * @key: The key
- *
- * Returns value if it is found, or NULL otherwise.
- */
-void *hashtable_get(hashtable_t *hashtable, const char *key);
-
-/**
- * hashtable_del - Remove a value from the hashtable
- *
- * @hashtable: The hashtable object
- * @key: The key
- *
- * Returns 0 on success, or -1 if the key was not found.
- */
-int hashtable_del(hashtable_t *hashtable, const char *key);
-
-/**
- * hashtable_clear - Clear hashtable
- *
- * @hashtable: The hashtable object
- *
- * Removes all items from the hashtable.
- */
-void hashtable_clear(hashtable_t *hashtable);
-
-/**
- * hashtable_iter - Iterate over hashtable
- *
- * @hashtable: The hashtable object
- *
- * Returns an opaque iterator to the first element in the hashtable.
- * The iterator should be passed to hashtable_iter_* functions.
- * The hashtable items are not iterated over in any particular order.
- *
- * There's no need to free the iterator in any way. The iterator is
- * valid as long as the item that is referenced by the iterator is not
- * deleted. Other values may be added or deleted. In particular,
- * hashtable_iter_next() may be called on an iterator, and after that
- * the key/value pair pointed by the old iterator may be deleted.
- */
-void *hashtable_iter(hashtable_t *hashtable);
-
-/**
- * hashtable_iter_at - Return an iterator at a specific key
- *
- * @hashtable: The hashtable object
- * @key: The key that the iterator should point to
- *
- * Like hashtable_iter() but returns an iterator pointing to a
- * specific key.
- */
-void *hashtable_iter_at(hashtable_t *hashtable, const char *key);
-
-/**
- * hashtable_iter_next - Advance an iterator
- *
- * @hashtable: The hashtable object
- * @iter: The iterator
- *
- * Returns a new iterator pointing to the next element in the
- * hashtable or NULL if the whole hastable has been iterated over.
- */
-void *hashtable_iter_next(hashtable_t *hashtable, void *iter);
-
-/**
- * hashtable_iter_key - Retrieve the key pointed by an iterator
- *
- * @iter: The iterator
- */
-void *hashtable_iter_key(void *iter);
-
-/**
- * hashtable_iter_value - Retrieve the value pointed by an iterator
- *
- * @iter: The iterator
- */
-void *hashtable_iter_value(void *iter);
-
-/**
- * hashtable_iter_set - Set the value pointed by an iterator
- *
- * @iter: The iterator
- * @value: The value to set
- */
-void hashtable_iter_set(void *iter, json_t *value);
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/src/hashtable_seed.c Deleted

@@ -1,277 +0,0 @@
-/* Generate sizeof(uint32_t) bytes of as random data as possible to seed
- the hash function.
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#include <stdio.h>
-#include <time.h>
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SCHED_H
-#include <sched.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#if defined(_WIN32)
-/* For GetModuleHandle(), GetProcAddress() and GetCurrentProcessId() */
-#include <windows.h>
-#endif
-
-#include "jansson.h"
-
-
-static uint32_t buf_to_uint32(char *data) {
- size_t i;
- uint32_t result = 0;
-
- for (i = 0; i < sizeof(uint32_t); i++)
- result = (result << 8) | (unsigned char)datai;
-
- return result;
-}
-
-
-
-/* /dev/urandom */
-#if !defined(_WIN32) && defined(USE_URANDOM)
-static int seed_from_urandom(uint32_t *seed) {
- /* Use unbuffered I/O if we have open(), close() and read(). Otherwise
- fall back to fopen() */
-
- char datasizeof(uint32_t);
- int ok;
-
-#if defined(HAVE_OPEN) && defined(HAVE_CLOSE) && defined(HAVE_READ)
- int urandom;
- urandom = open("/dev/urandom", O_RDONLY);
- if (urandom == -1)
- return 1;
-
- ok = read(urandom, data, sizeof(uint32_t)) == sizeof(uint32_t);
- close(urandom);
-#else
- FILE *urandom;
-
- urandom = fopen("/dev/urandom", "rb");
- if (!urandom)
- return 1;
-
- ok = fread(data, 1, sizeof(uint32_t), urandom) == sizeof(uint32_t);
- fclose(urandom);
-#endif
-
- if (!ok)
- return 1;
-
- *seed = buf_to_uint32(data);
- return 0;
-}
-#endif
-
-/* Windows Crypto API */
-#if defined(_WIN32) && defined(USE_WINDOWS_CRYPTOAPI)
-#include <wincrypt.h>
-
-typedef BOOL (WINAPI *CRYPTACQUIRECONTEXTA)(HCRYPTPROV *phProv, LPCSTR pszContainer, LPCSTR pszProvider, DWORD dwProvType, DWORD dwFlags);
-typedef BOOL (WINAPI *CRYPTGENRANDOM)(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer);
-typedef BOOL (WINAPI *CRYPTRELEASECONTEXT)(HCRYPTPROV hProv, DWORD dwFlags);
-
-static int seed_from_windows_cryptoapi(uint32_t *seed)
-{
- HINSTANCE hAdvAPI32 = NULL;
- CRYPTACQUIRECONTEXTA pCryptAcquireContext = NULL;
- CRYPTGENRANDOM pCryptGenRandom = NULL;
- CRYPTRELEASECONTEXT pCryptReleaseContext = NULL;
- HCRYPTPROV hCryptProv = 0;
- BYTE datasizeof(uint32_t);
- int ok;
-
- hAdvAPI32 = GetModuleHandle(TEXT("advapi32.dll"));
- if(hAdvAPI32 == NULL)
- return 1;
-
- pCryptAcquireContext = (CRYPTACQUIRECONTEXTA)GetProcAddress(hAdvAPI32, "CryptAcquireContextA");
- if (!pCryptAcquireContext)
- return 1;
-
- pCryptGenRandom = (CRYPTGENRANDOM)GetProcAddress(hAdvAPI32, "CryptGenRandom");
- if (!pCryptGenRandom)
- return 1;
-
- pCryptReleaseContext = (CRYPTRELEASECONTEXT)GetProcAddress(hAdvAPI32, "CryptReleaseContext");
- if (!pCryptReleaseContext)
- return 1;
-
- if (!pCryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
- return 1;
-
- ok = pCryptGenRandom(hCryptProv, sizeof(uint32_t), data);
- pCryptReleaseContext(hCryptProv, 0);
-
- if (!ok)
- return 1;
-
- *seed = buf_to_uint32((char *)data);
- return 0;
-}
-#endif
-
-/* gettimeofday() and getpid() */
-static int seed_from_timestamp_and_pid(uint32_t *seed) {
-#ifdef HAVE_GETTIMEOFDAY
- /* XOR of seconds and microseconds */
- struct timeval tv;
- gettimeofday(&tv, NULL);
- *seed = (uint32_t)tv.tv_sec ^ (uint32_t)tv.tv_usec;
-#else
- /* Seconds only */
- *seed = (uint32_t)time(NULL);
-#endif
-
- /* XOR with PID for more randomness */
-#if defined(_WIN32)
- *seed ^= (uint32_t)GetCurrentProcessId();
-#elif defined(HAVE_GETPID)
- *seed ^= (uint32_t)getpid();
-#endif
-
- return 0;
-}
-
-static uint32_t generate_seed() {
- uint32_t seed;
- int done = 0;
-
-#if !defined(_WIN32) && defined(USE_URANDOM)
- if (seed_from_urandom(&seed) == 0)
- done = 1;
-#endif
-
-#if defined(_WIN32) && defined(USE_WINDOWS_CRYPTOAPI)
- if (seed_from_windows_cryptoapi(&seed) == 0)
- done = 1;
-#endif
-
- if (!done) {
- /* Fall back to timestamp and PID if no better randomness is
- available */
- seed_from_timestamp_and_pid(&seed);
- }
-
- /* Make sure the seed is never zero */
- if (seed == 0)
- seed = 1;
-
- return seed;
-}
-
-
-volatile uint32_t hashtable_seed = 0;
-
-#if defined(HAVE_ATOMIC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
-static volatile char seed_initialized = 0;
-
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (__atomic_test_and_set(&seed_initialized, __ATOMIC_RELAXED) == 0) {
- /* Do the seeding ourselves */
- if (new_seed == 0)
- new_seed = generate_seed();
-
- __atomic_store_n(&hashtable_seed, new_seed, __ATOMIC_RELEASE);
- } else {
- /* Wait for another thread to do the seeding */
- do {
-#ifdef HAVE_SCHED_YIELD
- sched_yield();
-#endif
- } while(__atomic_load_n(&hashtable_seed, __ATOMIC_ACQUIRE) == 0);
- }
- }
-}
-#elif defined(HAVE_SYNC_BUILTINS) && (defined(HAVE_SCHED_YIELD) || !defined(_WIN32))
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (new_seed == 0) {
- /* Explicit synchronization fences are not supported by the
- __sync builtins, so every thread getting here has to
- generate the seed value.
- */
- new_seed = generate_seed();
- }
-
- do {
- if (__sync_bool_compare_and_swap(&hashtable_seed, 0, new_seed)) {
- /* We were the first to seed */
- break;
- } else {
- /* Wait for another thread to do the seeding */
-#ifdef HAVE_SCHED_YIELD
- sched_yield();
-#endif
- }
- } while(hashtable_seed == 0);
- }
-}
-#elif defined(_WIN32)
-static long seed_initialized = 0;
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (InterlockedIncrement(&seed_initialized) == 1) {
- /* Do the seeding ourselves */
- if (new_seed == 0)
- new_seed = generate_seed();
-
- hashtable_seed = new_seed;
- } else {
- /* Wait for another thread to do the seeding */
- do {
- SwitchToThread();
- } while (hashtable_seed == 0);
- }
- }
-}
-#else
-/* Fall back to a thread-unsafe version */
-void json_object_seed(size_t seed) {
- uint32_t new_seed = (uint32_t)seed;
-
- if (hashtable_seed == 0) {
- if (new_seed == 0)
- new_seed = generate_seed();
-
- hashtable_seed = new_seed;
- }
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/src/jansson.def Deleted

@@ -1,70 +0,0 @@
-EXPORTS
-    json_delete
-    json_true
-    json_false
-    json_null
-    json_string
-    json_stringn
-    json_string_nocheck
-    json_stringn_nocheck
-    json_string_value
-    json_string_length
-    json_string_set
-    json_string_setn
-    json_string_set_nocheck
-    json_string_setn_nocheck
-    json_integer
-    json_integer_value
-    json_integer_set
-    json_real
-    json_real_value
-    json_real_set
-    json_number_value
-    json_array
-    json_array_size
-    json_array_get
-    json_array_set_new
-    json_array_append_new
-    json_array_insert_new
-    json_array_remove
-    json_array_clear
-    json_array_extend
-    json_object
-    json_object_size
-    json_object_get
-    json_object_set_new
-    json_object_set_new_nocheck
-    json_object_del
-    json_object_clear
-    json_object_update
-    json_object_update_existing
-    json_object_update_missing
-    json_object_iter
-    json_object_iter_at
-    json_object_iter_next
-    json_object_iter_key
-    json_object_iter_value
-    json_object_iter_set_new
-    json_object_key_to_iter
-    json_object_seed
-    json_dumps
-    json_dumpf
-    json_dump_file
-    json_dump_callback
-    json_loads
-    json_loadb
-    json_loadf
-    json_load_file
-    json_load_callback
-    json_equal
-    json_copy
-    json_deep_copy
-    json_pack
-    json_pack_ex
-    json_vpack_ex
-    json_unpack
-    json_unpack_ex
-    json_vunpack_ex
-    json_set_alloc_funcs
-    json_get_alloc_funcs
-

obs-studio-29.1.3.tar.xz/deps/jansson/src/jansson.h Deleted

@@ -1,311 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef JANSSON_H
-#define JANSSON_H
-
-#include <stdio.h>
-#include <stdlib.h> /* for size_t */
-#include <stdarg.h>
-
-#include "jansson_config.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* version */
-
-#define JANSSON_MAJOR_VERSION 2
-#define JANSSON_MINOR_VERSION 9
-#define JANSSON_MICRO_VERSION 0
-
-/* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION "2.9"
-
-/* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
- for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */
-#define JANSSON_VERSION_HEX ((JANSSON_MAJOR_VERSION << 16) | \
- (JANSSON_MINOR_VERSION << 8) | \
- (JANSSON_MICRO_VERSION << 0))
-
-
-/* types */
-
-typedef enum {
- JSON_OBJECT,
- JSON_ARRAY,
- JSON_STRING,
- JSON_INTEGER,
- JSON_REAL,
- JSON_TRUE,
- JSON_FALSE,
- JSON_NULL
-} json_type;
-
-typedef struct json_t {
- json_type type;
- size_t refcount;
-} json_t;
-
-#ifndef JANSSON_USING_CMAKE /* disabled if using cmake */
-#if JSON_INTEGER_IS_LONG_LONG
-#ifdef _WIN32
-#define JSON_INTEGER_FORMAT "I64d"
-#else
-#define JSON_INTEGER_FORMAT "lld"
-#endif
-typedef long long json_int_t;
-#else
-#define JSON_INTEGER_FORMAT "ld"
-typedef long json_int_t;
-#endif /* JSON_INTEGER_IS_LONG_LONG */
-#endif
-
-#define json_typeof(json) ((json)->type)
-#define json_is_object(json) ((json) && json_typeof(json) == JSON_OBJECT)
-#define json_is_array(json) ((json) && json_typeof(json) == JSON_ARRAY)
-#define json_is_string(json) ((json) && json_typeof(json) == JSON_STRING)
-#define json_is_integer(json) ((json) && json_typeof(json) == JSON_INTEGER)
-#define json_is_real(json) ((json) && json_typeof(json) == JSON_REAL)
-#define json_is_number(json) (json_is_integer(json) || json_is_real(json))
-#define json_is_true(json) ((json) && json_typeof(json) == JSON_TRUE)
-#define json_is_false(json) ((json) && json_typeof(json) == JSON_FALSE)
-#define json_boolean_value json_is_true
-#define json_is_boolean(json) (json_is_true(json) || json_is_false(json))
-#define json_is_null(json) ((json) && json_typeof(json) == JSON_NULL)
-
-/* construction, destruction, reference counting */
-
-json_t *json_object(void);
-json_t *json_array(void);
-json_t *json_string(const char *value);
-json_t *json_stringn(const char *value, size_t len);
-json_t *json_string_nocheck(const char *value);
-json_t *json_stringn_nocheck(const char *value, size_t len);
-json_t *json_integer(json_int_t value);
-json_t *json_real(double value);
-json_t *json_true(void);
-json_t *json_false(void);
-#define json_boolean(val) ((val) ? json_true() : json_false())
-json_t *json_null(void);
-
-static JSON_INLINE
-json_t *json_incref(json_t *json)
-{
- if(json && json->refcount != (size_t)-1)
- ++json->refcount;
- return json;
-}
-
-/* do not call json_delete directly */
-void json_delete(json_t *json);
-
-static JSON_INLINE
-void json_decref(json_t *json)
-{
- if(json && json->refcount != (size_t)-1 && --json->refcount == 0)
- json_delete(json);
-}
-
-#if defined(__GNUC__) || defined(__clang__)
-static JSON_INLINE
-void json_decrefp(json_t **json)
-{
- if(json) {
- json_decref(*json);
-	*json = NULL;
- }
-}
-
-#define json_auto_t json_t __attribute__((cleanup(json_decrefp)))
-#endif
-
-
-/* error reporting */
-
-#define JSON_ERROR_TEXT_LENGTH 160
-#define JSON_ERROR_SOURCE_LENGTH 80
-
-typedef struct {
- int line;
- int column;
- int position;
- char sourceJSON_ERROR_SOURCE_LENGTH;
- char textJSON_ERROR_TEXT_LENGTH;
-} json_error_t;
-
-
-/* getters, setters, manipulation */
-
-void json_object_seed(size_t seed);
-size_t json_object_size(const json_t *object);
-json_t *json_object_get(const json_t *object, const char *key);
-int json_object_set_new(json_t *object, const char *key, json_t *value);
-int json_object_set_new_nocheck(json_t *object, const char *key, json_t *value);
-int json_object_del(json_t *object, const char *key);
-int json_object_clear(json_t *object);
-int json_object_update(json_t *object, json_t *other);
-int json_object_update_existing(json_t *object, json_t *other);
-int json_object_update_missing(json_t *object, json_t *other);
-void *json_object_iter(json_t *object);
-void *json_object_iter_at(json_t *object, const char *key);
-void *json_object_key_to_iter(const char *key);
-void *json_object_iter_next(json_t *object, void *iter);
-const char *json_object_iter_key(void *iter);
-json_t *json_object_iter_value(void *iter);
-int json_object_iter_set_new(json_t *object, void *iter, json_t *value);
-
-#define json_object_foreach(object, key, value) \
- for(key = json_object_iter_key(json_object_iter(object)); \
- key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
- key = json_object_iter_key(json_object_iter_next(object, json_object_key_to_iter(key))))
-
-#define json_object_foreach_safe(object, n, key, value) \
- for(key = json_object_iter_key(json_object_iter(object)), \
- n = json_object_iter_next(object, json_object_key_to_iter(key)); \
- key && (value = json_object_iter_value(json_object_key_to_iter(key))); \
- key = json_object_iter_key(n), \
- n = json_object_iter_next(object, json_object_key_to_iter(key)))
-
-#define json_array_foreach(array, index, value) \
-	for(index = 0; \
-		index < json_array_size(array) && (value = json_array_get(array, index)); \
-		index++)
-
-static JSON_INLINE
-int json_object_set(json_t *object, const char *key, json_t *value)
-{
- return json_object_set_new(object, key, json_incref(value));
-}
-
-static JSON_INLINE
-int json_object_set_nocheck(json_t *object, const char *key, json_t *value)
-{
- return json_object_set_new_nocheck(object, key, json_incref(value));
-}
-
-static JSON_INLINE
-int json_object_iter_set(json_t *object, void *iter, json_t *value)
-{
- return json_object_iter_set_new(object, iter, json_incref(value));
-}
-
-size_t json_array_size(const json_t *array);
-json_t *json_array_get(const json_t *array, size_t index);
-int json_array_set_new(json_t *array, size_t index, json_t *value);
-int json_array_append_new(json_t *array, json_t *value);
-int json_array_insert_new(json_t *array, size_t index, json_t *value);
-int json_array_remove(json_t *array, size_t index);
-int json_array_clear(json_t *array);
-int json_array_extend(json_t *array, json_t *other);
-
-static JSON_INLINE
-int json_array_set(json_t *array, size_t ind, json_t *value)
-{
- return json_array_set_new(array, ind, json_incref(value));
-}
-
-static JSON_INLINE
-int json_array_append(json_t *array, json_t *value)
-{
- return json_array_append_new(array, json_incref(value));
-}
-
-static JSON_INLINE
-int json_array_insert(json_t *array, size_t ind, json_t *value)
-{
- return json_array_insert_new(array, ind, json_incref(value));
-}
-
-const char *json_string_value(const json_t *string);
-size_t json_string_length(const json_t *string);
-json_int_t json_integer_value(const json_t *integer);
-double json_real_value(const json_t *real);
-double json_number_value(const json_t *json);
-
-int json_string_set(json_t *string, const char *value);
-int json_string_setn(json_t *string, const char *value, size_t len);
-int json_string_set_nocheck(json_t *string, const char *value);
-int json_string_setn_nocheck(json_t *string, const char *value, size_t len);
-int json_integer_set(json_t *integer, json_int_t value);
-int json_real_set(json_t *real, double value);
-
-/* pack, unpack */
-
-json_t *json_pack(const char *fmt, ...);
-json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...);
-json_t *json_vpack_ex(json_error_t *error, size_t flags, const char *fmt, va_list ap);
-
-#define JSON_VALIDATE_ONLY 0x1
-#define JSON_STRICT 0x2
-
-int json_unpack(json_t *root, const char *fmt, ...);
-int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...);
-int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, va_list ap);
-
-
-/* equality */
-
-int json_equal(json_t *value1, json_t *value2);
-
-
-/* copying */
-
-json_t *json_copy(json_t *value);
-json_t *json_deep_copy(const json_t *value);
-
-
-/* decoding */
-
-#define JSON_REJECT_DUPLICATES 0x1
-#define JSON_DISABLE_EOF_CHECK 0x2
-#define JSON_DECODE_ANY 0x4
-#define JSON_DECODE_INT_AS_REAL 0x8
-#define JSON_ALLOW_NUL 0x10
-
-typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data);
-
-json_t *json_loads(const char *input, size_t flags, json_error_t *error);
-json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error);
-json_t *json_loadf(FILE *input, size_t flags, json_error_t *error);
-json_t *json_load_file(const char *path, size_t flags, json_error_t *error);
-json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error);
-
-
-/* encoding */
-
-#define JSON_MAX_INDENT 0x1F
-#define JSON_INDENT(n) ((n) & JSON_MAX_INDENT)
-#define JSON_COMPACT 0x20
-#define JSON_ENSURE_ASCII 0x40
-#define JSON_SORT_KEYS 0x80
-#define JSON_PRESERVE_ORDER 0x100
-#define JSON_ENCODE_ANY 0x200
-#define JSON_ESCAPE_SLASH 0x400
-#define JSON_REAL_PRECISION(n) (((n) & 0x1F) << 11)
-
-typedef int (*json_dump_callback_t)(const char *buffer, size_t size, void *data);
-
-char *json_dumps(const json_t *json, size_t flags);
-int json_dumpf(const json_t *json, FILE *output, size_t flags);
-int json_dump_file(const json_t *json, const char *path, size_t flags);
-int json_dump_callback(const json_t *json, json_dump_callback_t callback, void *data, size_t flags);
-
-/* custom memory allocation */
-
-typedef void *(*json_malloc_t)(size_t);
-typedef void (*json_free_t)(void *);
-
-void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn);
-void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/src/jansson_config.h.in Deleted

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2010-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- *
- *
- * This file specifies a part of the site-specific configuration for
- * Jansson, namely those things that affect the public API in
- * jansson.h.
- *
- * The configure script copies this file to jansson_config.h and
- * replaces @var@ substitutions by values that fit your system. If you
- * cannot run the configure script, you can do the value substitution
- * by hand.
- */
-
-#ifndef JANSSON_CONFIG_H
-#define JANSSON_CONFIG_H
-
-/* If your compiler supports the inline keyword in C, JSON_INLINE is
- defined to `inline', otherwise empty. In C++, the inline is always
- supported. */
-#ifdef __cplusplus
-#define JSON_INLINE inline
-#else
-#define JSON_INLINE @json_inline@
-#endif
-
-/* If your compiler supports the `long long` type and the strtoll()
- library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
- otherwise to 0. */
-#define JSON_INTEGER_IS_LONG_LONG @json_have_long_long@
-
-/* If locale.h and localeconv() are available, define to 1,
- otherwise to 0. */
-#define JSON_HAVE_LOCALECONV @json_have_localeconv@
-
-/* Maximum recursion depth for parsing JSON input.
- This limits the depth of e.g. array-within-array constructions. */
-#define JSON_PARSER_MAX_DEPTH 2048
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/src/jansson_private.h Deleted

@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef JANSSON_PRIVATE_H
-#define JANSSON_PRIVATE_H
-
-#include <stddef.h>
-#include "jansson.h"
-#include "hashtable.h"
-#include "strbuffer.h"
-
-#define container_of(ptr_, type_, member_) \
- ((type_ *)((char *)ptr_ - offsetof(type_, member_)))
-
-/* On some platforms, max() may already be defined */
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
-
-/* va_copy is a C99 feature. In C89 implementations, it's sometimes
- available as __va_copy. If not, memcpy() should do the trick. */
-#ifndef va_copy
-#ifdef __va_copy
-#define va_copy __va_copy
-#else
-#define va_copy(a, b) memcpy(&(a), &(b), sizeof(va_list))
-#endif
-#endif
-
-typedef struct {
- json_t json;
- hashtable_t hashtable;
- int visited;
-} json_object_t;
-
-typedef struct {
- json_t json;
- size_t size;
- size_t entries;
- json_t **table;
- int visited;
-} json_array_t;
-
-typedef struct {
- json_t json;
- char *value;
- size_t length;
-} json_string_t;
-
-typedef struct {
- json_t json;
- double value;
-} json_real_t;
-
-typedef struct {
- json_t json;
- json_int_t value;
-} json_integer_t;
-
-#define json_to_object(json_) container_of(json_, json_object_t, json)
-#define json_to_array(json_) container_of(json_, json_array_t, json)
-#define json_to_string(json_) container_of(json_, json_string_t, json)
-#define json_to_real(json_) container_of(json_, json_real_t, json)
-#define json_to_integer(json_) container_of(json_, json_integer_t, json)
-
-/* Create a string by taking ownership of an existing buffer */
-json_t *jsonp_stringn_nocheck_own(const char *value, size_t len);
-
-/* Error message formatting */
-void jsonp_error_init(json_error_t *error, const char *source);
-void jsonp_error_set_source(json_error_t *error, const char *source);
-void jsonp_error_set(json_error_t *error, int line, int column,
- size_t position, const char *msg, ...);
-void jsonp_error_vset(json_error_t *error, int line, int column,
- size_t position, const char *msg, va_list ap);
-
-/* Locale independent string<->double conversions */
-int jsonp_strtod(strbuffer_t *strbuffer, double *out);
-int jsonp_dtostr(char *buffer, size_t size, double value, int prec);
-
-/* Wrappers for custom memory functions */
-void* jsonp_malloc(size_t size);
-void jsonp_free(void *ptr);
-char *jsonp_strndup(const char *str, size_t length);
-char *jsonp_strdup(const char *str);
-char *jsonp_strndup(const char *str, size_t len);
-
-
-/* Windows compatibility */
-#if defined(_WIN32) || defined(WIN32)
-# if defined(_MSC_VER) /* MS compiller */
-# if (_MSC_VER < 1900) && !defined(snprintf) /* snprintf not defined yet & not introduced */
-# define snprintf _snprintf
-# endif
-# if (_MSC_VER < 1500) && !defined(vsnprintf) /* vsnprintf not defined yet & not introduced */
-# define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
-# endif
-# else /* Other Windows compiller, old definition */
-# define snprintf _snprintf
-# define vsnprintf _vsnprintf
-# endif
-#endif
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/src/load.c Deleted

@@ -1,1110 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "jansson.h"
-#include "jansson_private.h"
-#include "strbuffer.h"
-#include "utf.h"
-
-#define STREAM_STATE_OK 0
-#define STREAM_STATE_EOF -1
-#define STREAM_STATE_ERROR -2
-
-#define TOKEN_INVALID -1
-#define TOKEN_EOF 0
-#define TOKEN_STRING 256
-#define TOKEN_INTEGER 257
-#define TOKEN_REAL 258
-#define TOKEN_TRUE 259
-#define TOKEN_FALSE 260
-#define TOKEN_NULL 261
-
-/* Locale independent versions of isxxx() functions */
-#define l_isupper(c) ('A' <= (c) && (c) <= 'Z')
-#define l_islower(c) ('a' <= (c) && (c) <= 'z')
-#define l_isalpha(c) (l_isupper(c) || l_islower(c))
-#define l_isdigit(c) ('0' <= (c) && (c) <= '9')
-#define l_isxdigit(c) \
- (l_isdigit(c) || ('A' <= (c) && (c) <= 'F') || ('a' <= (c) && (c) <= 'f'))
-
-/* Read one byte from stream, convert to unsigned char, then int, and
- return. return EOF on end of file. This corresponds to the
- behaviour of fgetc(). */
-typedef int (*get_func)(void *data);
-
-typedef struct {
- get_func get;
- void *data;
- char buffer5;
- size_t buffer_pos;
- int state;
- int line;
- int column, last_column;
- size_t position;
-} stream_t;
-
-typedef struct {
- stream_t stream;
- strbuffer_t saved_text;
- size_t flags;
- size_t depth;
- int token;
- union {
- struct {
- char *val;
- size_t len;
- } string;
- json_int_t integer;
- double real;
- } value;
-} lex_t;
-
-#define stream_to_lex(stream) container_of(stream, lex_t, stream)
-
-
-/*** error reporting ***/
-
-static void error_set(json_error_t *error, const lex_t *lex,
- const char *msg, ...)
-{
- va_list ap;
- char msg_textJSON_ERROR_TEXT_LENGTH;
- char msg_with_contextJSON_ERROR_TEXT_LENGTH;
-
- int line = -1, col = -1;
- size_t pos = 0;
- const char *result = msg_text;
-
- if(!error)
- return;
-
- va_start(ap, msg);
- vsnprintf(msg_text, JSON_ERROR_TEXT_LENGTH, msg, ap);
- msg_textJSON_ERROR_TEXT_LENGTH - 1 = '\0';
- va_end(ap);
-
- if(lex)
- {
- const char *saved_text = strbuffer_value(&lex->saved_text);
-
- line = lex->stream.line;
- col = lex->stream.column;
- pos = lex->stream.position;
-
- if(saved_text && saved_text0)
- {
- if(lex->saved_text.length <= 20) {
- snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
- "%s near '%s'", msg_text, saved_text);
- msg_with_contextJSON_ERROR_TEXT_LENGTH - 1 = '\0';
- result = msg_with_context;
- }
- }
- else
- {
- if(lex->stream.state == STREAM_STATE_ERROR) {
- /* No context for UTF-8 decoding errors */
- result = msg_text;
- }
- else {
- snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
- "%s near end of file", msg_text);
- msg_with_contextJSON_ERROR_TEXT_LENGTH - 1 = '\0';
- result = msg_with_context;
- }
- }
- }
-
- jsonp_error_set(error, line, col, pos, "%s", result);
-}
-
-
-/*** lexical analyzer ***/
-
-static void
-stream_init(stream_t *stream, get_func get, void *data)
-{
- stream->get = get;
- stream->data = data;
- stream->buffer0 = '\0';
- stream->buffer_pos = 0;
-
- stream->state = STREAM_STATE_OK;
- stream->line = 1;
- stream->column = 0;
- stream->position = 0;
-}
-
-static int stream_get(stream_t *stream, json_error_t *error)
-{
- int c;
-
- if(stream->state != STREAM_STATE_OK)
- return stream->state;
-
- if(!stream->bufferstream->buffer_pos)
- {
- c = stream->get(stream->data);
- if(c == EOF) {
- stream->state = STREAM_STATE_EOF;
- return STREAM_STATE_EOF;
- }
-
- stream->buffer0 = c;
- stream->buffer_pos = 0;
-
- if(0x80 <= c && c <= 0xFF)
- {
- /* multi-byte UTF-8 sequence */
- size_t i, count;
-
- count = utf8_check_first(c);
- if(!count)
- goto out;
-
- assert(count >= 2);
-
- for(i = 1; i < count; i++)
- stream->bufferi = stream->get(stream->data);
-
- if(!utf8_check_full(stream->buffer, count, NULL))
- goto out;
-
- stream->buffercount = '\0';
- }
- else
- stream->buffer1 = '\0';
- }
-
- c = stream->bufferstream->buffer_pos++;
-
- stream->position++;
- if(c == '\n') {
- stream->line++;
- stream->last_column = stream->column;
- stream->column = 0;
- }
- else if(utf8_check_first(c)) {
- /* track the Unicode character column, so increment only if
- this is the first character of a UTF-8 sequence */
- stream->column++;
- }
-
- return c;
-
-out:
- stream->state = STREAM_STATE_ERROR;
- error_set(error, stream_to_lex(stream), "unable to decode byte 0x%x", c);
- return STREAM_STATE_ERROR;
-}
-
-static void stream_unget(stream_t *stream, int c)
-{
- if(c == STREAM_STATE_EOF || c == STREAM_STATE_ERROR)
- return;
-
- stream->position--;
- if(c == '\n') {
- stream->line--;
- stream->column = stream->last_column;
- }
- else if(utf8_check_first(c))
- stream->column--;
-
- assert(stream->buffer_pos > 0);
- stream->buffer_pos--;
- assert(stream->bufferstream->buffer_pos == c);
-}
-
-
-static int lex_get(lex_t *lex, json_error_t *error)
-{
- return stream_get(&lex->stream, error);
-}
-
-static void lex_save(lex_t *lex, int c)
-{
- strbuffer_append_byte(&lex->saved_text, c);
-}
-
-static int lex_get_save(lex_t *lex, json_error_t *error)
-{
- int c = stream_get(&lex->stream, error);
- if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR)
- lex_save(lex, c);
- return c;
-}
-
-static void lex_unget(lex_t *lex, int c)
-{
- stream_unget(&lex->stream, c);
-}
-
-static void lex_unget_unsave(lex_t *lex, int c)
-{
- if(c != STREAM_STATE_EOF && c != STREAM_STATE_ERROR) {
- /* Since we treat warnings as errors, when assertions are turned
- * off the "d" variable would be set but never used. Which is
- * treated as an error by GCC.
- */
- #ifndef NDEBUG
- char d;
- #endif
- stream_unget(&lex->stream, c);
- #ifndef NDEBUG
- d =
- #endif
- strbuffer_pop(&lex->saved_text);
- assert(c == d);
- }
-}
-
-static void lex_save_cached(lex_t *lex)
-{
- while(lex->stream.bufferlex->stream.buffer_pos != '\0')
- {
- lex_save(lex, lex->stream.bufferlex->stream.buffer_pos);
- lex->stream.buffer_pos++;
- lex->stream.position++;
- }
-}
-
-static void lex_free_string(lex_t *lex)
-{
- jsonp_free(lex->value.string.val);
- lex->value.string.val = NULL;
- lex->value.string.len = 0;
-}
-
-/* assumes that str points to 'u' plus at least 4 valid hex digits */
-static int32_t decode_unicode_escape(const char *str)
-{
- int i;
- int32_t value = 0;
-
- assert(str0 == 'u');
-
- for(i = 1; i <= 4; i++) {
- char c = stri;
- value <<= 4;
- if(l_isdigit(c))
- value += c - '0';
- else if(l_islower(c))
- value += c - 'a' + 10;
- else if(l_isupper(c))
- value += c - 'A' + 10;
- else
- return -1;
- }
-
- return value;
-}
-
-static void lex_scan_string(lex_t *lex, json_error_t *error)
-{
- int c;
- const char *p;
- char *t;
- int i;
-
- lex->value.string.val = NULL;
- lex->token = TOKEN_INVALID;
-
- c = lex_get_save(lex, error);
-
- while(c != '"') {
- if(c == STREAM_STATE_ERROR)
- goto out;
-
- else if(c == STREAM_STATE_EOF) {
- error_set(error, lex, "premature end of input");
- goto out;
- }
-
- else if(0 <= c && c <= 0x1F) {
- /* control character */
- lex_unget_unsave(lex, c);
- if(c == '\n')
- error_set(error, lex, "unexpected newline");
- else
- error_set(error, lex, "control character 0x%x", c);
- goto out;
- }
-
- else if(c == '\\') {
- c = lex_get_save(lex, error);
- if(c == 'u') {
- c = lex_get_save(lex, error);
- for(i = 0; i < 4; i++) {
- if(!l_isxdigit(c)) {
- error_set(error, lex, "invalid escape");
- goto out;
- }
- c = lex_get_save(lex, error);
- }
- }
- else if(c == '"' || c == '\\' || c == '/' || c == 'b' ||
- c == 'f' || c == 'n' || c == 'r' || c == 't')
- c = lex_get_save(lex, error);
- else {
- error_set(error, lex, "invalid escape");
- goto out;
- }
- }
- else
- c = lex_get_save(lex, error);
- }
-
- /* the actual value is at most of the same length as the source
- string, because:
- - shortcut escapes (e.g. "\t") (length 2) are converted to 1 byte
- - a single \uXXXX escape (length 6) is converted to at most 3 bytes
- - two \uXXXX escapes (length 12) forming an UTF-16 surrogate pair
- are converted to 4 bytes
- */
- t = jsonp_malloc(lex->saved_text.length + 1);
- if(!t) {
- /* this is not very nice, since TOKEN_INVALID is returned */
- goto out;
- }
- lex->value.string.val = t;
-
- /* + 1 to skip the " */
- p = strbuffer_value(&lex->saved_text) + 1;
-
- while(*p != '"') {
- if(*p == '\\') {
- p++;
- if(*p == 'u') {
- size_t length;
- int32_t value;
-
- value = decode_unicode_escape(p);
- if(value < 0) {
- error_set(error, lex, "invalid Unicode escape '%.6s'", p - 1);
- goto out;
- }
- p += 5;
-
- if(0xD800 <= value && value <= 0xDBFF) {
- /* surrogate pair */
- if(*p == '\\' && *(p + 1) == 'u') {
- int32_t value2 = decode_unicode_escape(++p);
- if(value2 < 0) {
- error_set(error, lex, "invalid Unicode escape '%.6s'", p - 1);
- goto out;
- }
- p += 5;
-
- if(0xDC00 <= value2 && value2 <= 0xDFFF) {
- /* valid second surrogate */
- value =
- ((value - 0xD800) << 10) +
- (value2 - 0xDC00) +
- 0x10000;
- }
- else {
- /* invalid second surrogate */
- error_set(error, lex,
- "invalid Unicode '\\u%04X\\u%04X'",
- value, value2);
- goto out;
- }
- }
- else {
- /* no second surrogate */
- error_set(error, lex, "invalid Unicode '\\u%04X'",
- value);
- goto out;
- }
- }
- else if(0xDC00 <= value && value <= 0xDFFF) {
- error_set(error, lex, "invalid Unicode '\\u%04X'", value);
- goto out;
- }
-
- if(utf8_encode(value, t, &length))
- assert(0);
- t += length;
- }
- else {
- switch(*p) {
- case '"': case '\\': case '/':
- *t = *p; break;
- case 'b': *t = '\b'; break;
- case 'f': *t = '\f'; break;
- case 'n': *t = '\n'; break;
- case 'r': *t = '\r'; break;
- case 't': *t = '\t'; break;
- default: assert(0);
- }
- t++;
- p++;
- }
- }
- else
- *(t++) = *(p++);
- }
- *t = '\0';
- lex->value.string.len = t - lex->value.string.val;
- lex->token = TOKEN_STRING;
- return;
-
-out:
- lex_free_string(lex);
-}
-
-#ifndef JANSSON_USING_CMAKE /* disabled if using cmake */
-#if JSON_INTEGER_IS_LONG_LONG
-#ifdef _MSC_VER /* Microsoft Visual Studio */
-#define json_strtoint _strtoi64
-#else
-#define json_strtoint strtoll
-#endif
-#else
-#define json_strtoint strtol
-#endif
-#endif
-
-static int lex_scan_number(lex_t *lex, int c, json_error_t *error)
-{
- const char *saved_text;
- char *end;
- double doubleval;
-
- lex->token = TOKEN_INVALID;
-
- if(c == '-')
- c = lex_get_save(lex, error);
-
- if(c == '0') {
- c = lex_get_save(lex, error);
- if(l_isdigit(c)) {
- lex_unget_unsave(lex, c);
- goto out;
- }
- }
- else if(l_isdigit(c)) {
- do
- c = lex_get_save(lex, error);
- while(l_isdigit(c));
- }
- else {
- lex_unget_unsave(lex, c);
- goto out;
- }
-
- if(!(lex->flags & JSON_DECODE_INT_AS_REAL) &&
- c != '.' && c != 'E' && c != 'e')
- {
- json_int_t intval;
-
- lex_unget_unsave(lex, c);
-
- saved_text = strbuffer_value(&lex->saved_text);
-
- errno = 0;
- intval = json_strtoint(saved_text, &end, 10);
- if(errno == ERANGE) {
- if(intval < 0)
- error_set(error, lex, "too big negative integer");
- else
- error_set(error, lex, "too big integer");
- goto out;
- }
-
- assert(end == saved_text + lex->saved_text.length);
-
- lex->token = TOKEN_INTEGER;
- lex->value.integer = intval;
- return 0;
- }
-
- if(c == '.') {
- c = lex_get(lex, error);
- if(!l_isdigit(c)) {
- lex_unget(lex, c);
- goto out;
- }
- lex_save(lex, c);
-
- do
- c = lex_get_save(lex, error);
- while(l_isdigit(c));
- }
-
- if(c == 'E' || c == 'e') {
- c = lex_get_save(lex, error);
- if(c == '+' || c == '-')
- c = lex_get_save(lex, error);
-
- if(!l_isdigit(c)) {
- lex_unget_unsave(lex, c);
- goto out;
- }
-
- do
- c = lex_get_save(lex, error);
- while(l_isdigit(c));
- }
-
- lex_unget_unsave(lex, c);
-
- if(jsonp_strtod(&lex->saved_text, &doubleval)) {
- error_set(error, lex, "real number overflow");
- goto out;
- }
-
- lex->token = TOKEN_REAL;
- lex->value.real = doubleval;
- return 0;
-
-out:
- return -1;
-}
-
-static int lex_scan(lex_t *lex, json_error_t *error)
-{
- int c;
-
- strbuffer_clear(&lex->saved_text);
-
- if(lex->token == TOKEN_STRING)
- lex_free_string(lex);
-
- do
- c = lex_get(lex, error);
- while(c == ' ' || c == '\t' || c == '\n' || c == '\r');
-
- if(c == STREAM_STATE_EOF) {
- lex->token = TOKEN_EOF;
- goto out;
- }
-
- if(c == STREAM_STATE_ERROR) {
- lex->token = TOKEN_INVALID;
- goto out;
- }
-
- lex_save(lex, c);
-
- if(c == '{' || c == '}' || c == '' || c == '' || c == ':' || c == ',')
- lex->token = c;
-
- else if(c == '"')
- lex_scan_string(lex, error);
-
- else if(l_isdigit(c) || c == '-') {
- if(lex_scan_number(lex, c, error))
- goto out;
- }
-
- else if(l_isalpha(c)) {
- /* eat up the whole identifier for clearer error messages */
- const char *saved_text;
-
- do
- c = lex_get_save(lex, error);
- while(l_isalpha(c));
- lex_unget_unsave(lex, c);
-
- saved_text = strbuffer_value(&lex->saved_text);
-
- if(strcmp(saved_text, "true") == 0)
- lex->token = TOKEN_TRUE;
- else if(strcmp(saved_text, "false") == 0)
- lex->token = TOKEN_FALSE;
- else if(strcmp(saved_text, "null") == 0)
- lex->token = TOKEN_NULL;
- else
- lex->token = TOKEN_INVALID;
- }
-
- else {
- /* save the rest of the input UTF-8 sequence to get an error
- message of valid UTF-8 */
- lex_save_cached(lex);
- lex->token = TOKEN_INVALID;
- }
-
-out:
- return lex->token;
-}
-
-static char *lex_steal_string(lex_t *lex, size_t *out_len)
-{
- char *result = NULL;
- if(lex->token == TOKEN_STRING) {
- result = lex->value.string.val;
- *out_len = lex->value.string.len;
- lex->value.string.val = NULL;
- lex->value.string.len = 0;
- }
- return result;
-}
-
-static int lex_init(lex_t *lex, get_func get, size_t flags, void *data)
-{
- stream_init(&lex->stream, get, data);
- if(strbuffer_init(&lex->saved_text))
- return -1;
-
- lex->flags = flags;
- lex->token = TOKEN_INVALID;
- return 0;
-}
-
-static void lex_close(lex_t *lex)
-{
- if(lex->token == TOKEN_STRING)
- lex_free_string(lex);
- strbuffer_close(&lex->saved_text);
-}
-
-
-/*** parser ***/
-
-static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error);
-
-static json_t *parse_object(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *object = json_object();
- if(!object)
- return NULL;
-
- lex_scan(lex, error);
- if(lex->token == '}')
- return object;
-
- while(1) {
- char *key;
- size_t len;
- json_t *value;
-
- if(lex->token != TOKEN_STRING) {
- error_set(error, lex, "string or '}' expected");
- goto error;
- }
-
- key = lex_steal_string(lex, &len);
- if(!key)
- return NULL;
- if (memchr(key, '\0', len)) {
- jsonp_free(key);
- error_set(error, lex, "NUL byte in object key not supported");
- goto error;
- }
-
- if(flags & JSON_REJECT_DUPLICATES) {
- if(json_object_get(object, key)) {
- jsonp_free(key);
- error_set(error, lex, "duplicate object key");
- goto error;
- }
- }
-
- lex_scan(lex, error);
- if(lex->token != ':') {
- jsonp_free(key);
- error_set(error, lex, "':' expected");
- goto error;
- }
-
- lex_scan(lex, error);
- value = parse_value(lex, flags, error);
- if(!value) {
- jsonp_free(key);
- goto error;
- }
-
- if(json_object_set_nocheck(object, key, value)) {
- jsonp_free(key);
- json_decref(value);
- goto error;
- }
-
- json_decref(value);
- jsonp_free(key);
-
- lex_scan(lex, error);
- if(lex->token != ',')
- break;
-
- lex_scan(lex, error);
- }
-
- if(lex->token != '}') {
- error_set(error, lex, "'}' expected");
- goto error;
- }
-
- return object;
-
-error:
- json_decref(object);
- return NULL;
-}
-
-static json_t *parse_array(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *array = json_array();
- if(!array)
- return NULL;
-
- lex_scan(lex, error);
- if(lex->token == '')
- return array;
-
- while(lex->token) {
- json_t *elem = parse_value(lex, flags, error);
- if(!elem)
- goto error;
-
- if(json_array_append(array, elem)) {
- json_decref(elem);
- goto error;
- }
- json_decref(elem);
-
- lex_scan(lex, error);
- if(lex->token != ',')
- break;
-
- lex_scan(lex, error);
- }
-
- if(lex->token != '') {
- error_set(error, lex, "'' expected");
- goto error;
- }
-
- return array;
-
-error:
- json_decref(array);
- return NULL;
-}
-
-static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *json;
-
- lex->depth++;
- if(lex->depth > JSON_PARSER_MAX_DEPTH) {
- error_set(error, lex, "maximum parsing depth reached");
- return NULL;
- }
-
- switch(lex->token) {
- case TOKEN_STRING: {
- const char *value = lex->value.string.val;
- size_t len = lex->value.string.len;
-
- if(!(flags & JSON_ALLOW_NUL)) {
- if(memchr(value, '\0', len)) {
- error_set(error, lex, "\\u0000 is not allowed without JSON_ALLOW_NUL");
- return NULL;
- }
- }
-
- json = jsonp_stringn_nocheck_own(value, len);
- if(json) {
- lex->value.string.val = NULL;
- lex->value.string.len = 0;
- }
- break;
- }
-
- case TOKEN_INTEGER: {
- json = json_integer(lex->value.integer);
- break;
- }
-
- case TOKEN_REAL: {
- json = json_real(lex->value.real);
- break;
- }
-
- case TOKEN_TRUE:
- json = json_true();
- break;
-
- case TOKEN_FALSE:
- json = json_false();
- break;
-
- case TOKEN_NULL:
- json = json_null();
- break;
-
- case '{':
- json = parse_object(lex, flags, error);
- break;
-
- case '':
- json = parse_array(lex, flags, error);
- break;
-
- case TOKEN_INVALID:
- error_set(error, lex, "invalid token");
- return NULL;
-
- default:
- error_set(error, lex, "unexpected token");
- return NULL;
- }
-
- if(!json)
- return NULL;
-
- lex->depth--;
- return json;
-}
-
-static json_t *parse_json(lex_t *lex, size_t flags, json_error_t *error)
-{
- json_t *result;
-
- lex->depth = 0;
-
- lex_scan(lex, error);
- if(!(flags & JSON_DECODE_ANY)) {
- if(lex->token != '' && lex->token != '{') {
- error_set(error, lex, "'' or '{' expected");
- return NULL;
- }
- }
-
- result = parse_value(lex, flags, error);
- if(!result)
- return NULL;
-
- if(!(flags & JSON_DISABLE_EOF_CHECK)) {
- lex_scan(lex, error);
- if(lex->token != TOKEN_EOF) {
- error_set(error, lex, "end of file expected");
- json_decref(result);
- return NULL;
- }
- }
-
- if(error) {
- /* Save the position even though there was no error */
- error->position = (int)lex->stream.position;
- }
-
- return result;
-}
-
-typedef struct
-{
- const char *data;
- size_t pos;
-} string_data_t;
-
-static int string_get(void *data)
-{
- char c;
- string_data_t *stream = (string_data_t *)data;
- c = stream->datastream->pos;
- if(c == '\0')
- return EOF;
- else
- {
- stream->pos++;
- return (unsigned char)c;
- }
-}
-
-json_t *json_loads(const char *string, size_t flags, json_error_t *error)
-{
- lex_t lex;
- json_t *result;
- string_data_t stream_data;
-
- jsonp_error_init(error, "<string>");
-
- if (string == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- stream_data.data = string;
- stream_data.pos = 0;
-
- if(lex_init(&lex, string_get, flags, (void *)&stream_data))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
-
-typedef struct
-{
- const char *data;
- size_t len;
- size_t pos;
-} buffer_data_t;
-
-static int buffer_get(void *data)
-{
- char c;
- buffer_data_t *stream = data;
- if(stream->pos >= stream->len)
- return EOF;
-
- c = stream->datastream->pos;
- stream->pos++;
- return (unsigned char)c;
-}
-
-json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error)
-{
- lex_t lex;
- json_t *result;
- buffer_data_t stream_data;
-
- jsonp_error_init(error, "<buffer>");
-
- if (buffer == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- stream_data.data = buffer;
- stream_data.pos = 0;
- stream_data.len = buflen;
-
- if(lex_init(&lex, buffer_get, flags, (void *)&stream_data))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
-
-json_t *json_loadf(FILE *input, size_t flags, json_error_t *error)
-{
- lex_t lex;
- const char *source;
- json_t *result;
-
- if(input == stdin)
- source = "<stdin>";
- else
- source = "<stream>";
-
- jsonp_error_init(error, source);
-
- if (input == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- if(lex_init(&lex, (get_func)fgetc, flags, input))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}
-
-json_t *json_load_file(const char *path, size_t flags, json_error_t *error)
-{
- json_t *result;
- FILE *fp;
-
- jsonp_error_init(error, path);
-
- if (path == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- fp = fopen(path, "rb");
- if(!fp)
- {
- error_set(error, NULL, "unable to open %s: %s",
- path, strerror(errno));
- return NULL;
- }
-
- result = json_loadf(fp, flags, error);
-
- fclose(fp);
- return result;
-}
-
-#define MAX_BUF_LEN 1024
-
-typedef struct
-{
- char dataMAX_BUF_LEN;
- size_t len;
- size_t pos;
- json_load_callback_t callback;
- void *arg;
-} callback_data_t;
-
-static int callback_get(void *data)
-{
- char c;
- callback_data_t *stream = data;
-
- if(stream->pos >= stream->len) {
- stream->pos = 0;
- stream->len = stream->callback(stream->data, MAX_BUF_LEN, stream->arg);
- if(stream->len == 0 || stream->len == (size_t)-1)
- return EOF;
- }
-
- c = stream->datastream->pos;
- stream->pos++;
- return (unsigned char)c;
-}
-
-json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error)
-{
- lex_t lex;
- json_t *result;
-
- callback_data_t stream_data;
-
- memset(&stream_data, 0, sizeof(stream_data));
- stream_data.callback = callback;
- stream_data.arg = arg;
-
- jsonp_error_init(error, "<callback>");
-
- if (callback == NULL) {
- error_set(error, NULL, "wrong arguments");
- return NULL;
- }
-
- if(lex_init(&lex, (get_func)callback_get, flags, &stream_data))
- return NULL;
-
- result = parse_json(&lex, flags, error);
-
- lex_close(&lex);
- return result;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/lookup3.h Deleted

@@ -1,381 +0,0 @@
-/*
--------------------------------------------------------------------------------
-lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-
-These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-are externally useful functions. Routines to test the hash are included 
-if SELF_TEST is defined. You can use this free for any purpose. It's in
-the public domain. It has no warranty.
-
-You probably want to use hashlittle(). hashlittle() and hashbig()
-hash byte arrays. hashlittle() is is faster than hashbig() on
-little-endian machines. Intel and AMD are little-endian machines.
-On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one. 
-You could implement hashbig2() if you wanted but I haven't bothered here.
-
-If you want to find a hash of, say, exactly 7 integers, do
- a = i1; b = i2; c = i3;
- mix(a,b,c);
- a += i4; b += i5; c += i6;
- mix(a,b,c);
- a += i7;
- final(a,b,c);
-then use c as the hash value. If you have a variable length array of
-4-byte integers to hash, use hashword(). If you have a byte array (like
-a character string), use hashlittle(). If you have several byte arrays, or
-a mix of things, see the comments above hashlittle(). 
-
-Why is this so big? I read 12 bytes at a time into 3 4-byte integers, 
-then mix those integers. This is fast (you can do a lot more thorough
-mixing with 12*3 instructions on 3 integers than you can with 3 instructions
-on 1 byte), but shoehorning those bytes into integers efficiently is messy.
--------------------------------------------------------------------------------
-*/
-
-#include <stdlib.h>
-
-#ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h> /* defines uint32_t etc */
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h> /* attempt to define endianness */
-#endif
-
-#ifdef HAVE_ENDIAN_H
-# include <endian.h> /* attempt to define endianness */
-#endif
-
-/*
- * My best guess at if you are big-endian or little-endian. This may
- * need adjustment.
- */
-#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
- __BYTE_ORDER == __LITTLE_ENDIAN) || \
- (defined(i386) || defined(__i386__) || defined(__i486__) || \
- defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
-# define HASH_LITTLE_ENDIAN 1
-# define HASH_BIG_ENDIAN 0
-#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
- __BYTE_ORDER == __BIG_ENDIAN) || \
- (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 1
-#else
-# define HASH_LITTLE_ENDIAN 0
-# define HASH_BIG_ENDIAN 0
-#endif
-
-#define hashsize(n) ((size_t)1<<(n))
-#define hashmask(n) (hashsize(n)-1)
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
-/*
--------------------------------------------------------------------------------
-mix -- mix 3 32-bit values reversibly.
-
-This is reversible, so any information in (a,b,c) before mix() is
-still in (a,b,c) after mix().
-
-If four pairs of (a,b,c) inputs are run through mix(), or through
-mix() in reverse, there are at least 32 bits of the output that
-are sometimes the same for one pair and different for another pair.
-This was tested for:
-* pairs that differed by one bit, by two bits, in any combination
- of top bits of (a,b,c), or in any combination of bottom bits of
- (a,b,c).
-* "differ" is defined as +, -, ^, or ~^. For + and -, I transformed
- the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
- is commonly produced by subtraction) look like a single 1-bit
- difference.
-* the base values were pseudorandom, all zero but one bit set, or 
- all zero plus a counter that starts at zero.
-
-Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
-satisfy this are
- 4 6 8 16 19 4
- 9 15 3 18 27 15
- 14 9 3 7 17 3
-Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
-for "differ" defined as + with a one-bit base and a two-bit delta. I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose 
-the operations, constants, and arrangements of the variables.
-
-This does not achieve avalanche. There are input bits of (a,b,c)
-that fail to affect some output bits of (a,b,c), especially of a. The
-most thoroughly mixed value is c, but it doesn't really even achieve
-avalanche in c.
-
-This allows some parallelism. Read-after-writes are good at doubling
-the number of bits affected, so the goal of mixing pulls in the opposite
-direction as the goal of parallelism. I did what I could. Rotates
-seem to cost as much as shifts on every machine I could lay my hands
-on, and rotates are much kinder to the top and bottom bits, so I used
-rotates.
--------------------------------------------------------------------------------
-*/
-#define mix(a,b,c) \
-{ \
- a -= c; a ^= rot(c, 4); c += b; \
- b -= a; b ^= rot(a, 6); a += c; \
- c -= b; c ^= rot(b, 8); b += a; \
- a -= c; a ^= rot(c,16); c += b; \
- b -= a; b ^= rot(a,19); a += c; \
- c -= b; c ^= rot(b, 4); b += a; \
-}
-
-/*
--------------------------------------------------------------------------------
-final -- final mixing of 3 32-bit values (a,b,c) into c
-
-Pairs of (a,b,c) values differing in only a few bits will usually
-produce values of c that look totally different. This was tested for
-* pairs that differed by one bit, by two bits, in any combination
- of top bits of (a,b,c), or in any combination of bottom bits of
- (a,b,c).
-* "differ" is defined as +, -, ^, or ~^. For + and -, I transformed
- the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
- is commonly produced by subtraction) look like a single 1-bit
- difference.
-* the base values were pseudorandom, all zero but one bit set, or 
- all zero plus a counter that starts at zero.
-
-These constants passed:
- 14 11 25 16 4 14 24
- 12 14 25 16 4 14 24
-and these came close:
- 4 8 15 26 3 22 24
- 10 8 15 26 3 22 24
- 11 8 15 26 3 22 24
--------------------------------------------------------------------------------
-*/
-#define final(a,b,c) \
-{ \
- c ^= b; c -= rot(b,14); \
- a ^= c; a -= rot(c,11); \
- b ^= a; b -= rot(a,25); \
- c ^= b; c -= rot(b,16); \
- a ^= c; a -= rot(c,4); \
- b ^= a; b -= rot(a,14); \
- c ^= b; c -= rot(b,24); \
-}
-
-/*
--------------------------------------------------------------------------------
-hashlittle() -- hash a variable-length key into a 32-bit value
- k : the key (the unaligned variable-length array of bytes)
- length : the length of the key, counting by bytes
- initval : can be any 4-byte value
-Returns a 32-bit value. Every bit of the key affects every bit of
-the return value. Two keys differing by one or two bits will have
-totally different hash values.
-
-The best hash table sizes are powers of 2. There is no need to do
-mod a prime (mod is sooo slow!). If you need less than 32 bits,
-use a bitmask. For example, if you need only 10 bits, do
- h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (uint8_t **)k, do it like this:
- for (i=0, h=0; i<n; ++i) h = hashlittle( ki, leni, h);
-
-By Bob Jenkins, 2006. bob_jenkins@burtleburtle.net. You may use this
-code any way you wish, private, educational, or commercial. It's free.
-
-Use for hash table lookup, or anything where one collision in 2^^32 is
-acceptable. Do NOT use for cryptographic purposes.
--------------------------------------------------------------------------------
-*/
-
-static uint32_t hashlittle(const void *key, size_t length, uint32_t initval)
-{
- uint32_t a,b,c; /* internal state */
- union { const void *ptr; size_t i; } u; /* needed for Mac Powerbook G4 */
-
- /* Set up the internal state */
- a = b = c = 0xdeadbeef + ((uint32_t)length) + initval;
-
- u.ptr = key;
- if (HASH_LITTLE_ENDIAN && ((u.i & 0x3) == 0)) {
- const uint32_t *k = (const uint32_t *)key; /* read 32-bit chunks */
-
-/* Detect Valgrind or AddressSanitizer */
-#ifdef VALGRIND
-# define NO_MASKING_TRICK 1
-#else
-# if defined(__has_feature) /* Clang */
-# if __has_feature(address_sanitizer) /* is ASAN enabled? */
-# define NO_MASKING_TRICK 1
-# endif
-# else
-# if defined(__SANITIZE_ADDRESS__) /* GCC 4.8.x, is ASAN enabled? */
-# define NO_MASKING_TRICK 1
-# endif
-# endif
-#endif
-
-#ifdef NO_MASKING_TRICK
- const uint8_t *k8;
-#endif
-
- /*------ all but last block: aligned reads and affect 32 bits of (a,b,c) */
- while (length > 12)
- {
- a += k0;
- b += k1;
- c += k2;
- mix(a,b,c);
- length -= 12;
- k += 3;
- }
-
- /*----------------------------- handle the last (probably partial) block */
- /* 
- * "k2&0xffffff" actually reads beyond the end of the string, but
- * then masks off the part it's not allowed to read. Because the
- * string is aligned, the masked-off tail is in the same word as the
- * rest of the string. Every machine with memory protection I've seen
- * does it on word boundaries, so is OK with this. But VALGRIND will
- * still catch it and complain. The masking trick does make the hash
- * noticably faster for short strings (like English words).
- */
-#ifndef NO_MASKING_TRICK
-
- switch(length)
- {
- case 12: c+=k2; b+=k1; a+=k0; break;
- case 11: c+=k2&0xffffff; b+=k1; a+=k0; break;
- case 10: c+=k2&0xffff; b+=k1; a+=k0; break;
- case 9 : c+=k2&0xff; b+=k1; a+=k0; break;
- case 8 : b+=k1; a+=k0; break;
- case 7 : b+=k1&0xffffff; a+=k0; break;
- case 6 : b+=k1&0xffff; a+=k0; break;
- case 5 : b+=k1&0xff; a+=k0; break;
- case 4 : a+=k0; break;
- case 3 : a+=k0&0xffffff; break;
- case 2 : a+=k0&0xffff; break;
- case 1 : a+=k0&0xff; break;
- case 0 : return c; /* zero length strings require no mixing */
- }
-
-#else /* make valgrind happy */
-
- k8 = (const uint8_t *)k;
- switch(length)
- {
- case 12: c+=k2; b+=k1; a+=k0; break;
- case 11: c+=((uint32_t)k810)<<16; /* fall through */
- case 10: c+=((uint32_t)k89)<<8; /* fall through */
- case 9 : c+=k88; /* fall through */
- case 8 : b+=k1; a+=k0; break;
- case 7 : b+=((uint32_t)k86)<<16; /* fall through */
- case 6 : b+=((uint32_t)k85)<<8; /* fall through */
- case 5 : b+=k84; /* fall through */
- case 4 : a+=k0; break;
- case 3 : a+=((uint32_t)k82)<<16; /* fall through */
- case 2 : a+=((uint32_t)k81)<<8; /* fall through */
- case 1 : a+=k80; break;
- case 0 : return c;
- }
-
-#endif /* !valgrind */
-
- } else if (HASH_LITTLE_ENDIAN && ((u.i & 0x1) == 0)) {
- const uint16_t *k = (const uint16_t *)key; /* read 16-bit chunks */
- const uint8_t *k8;
-
- /*--------------- all but last block: aligned reads and different mixing */
- while (length > 12)
- {
- a += k0 + (((uint32_t)k1)<<16);
- b += k2 + (((uint32_t)k3)<<16);
- c += k4 + (((uint32_t)k5)<<16);
- mix(a,b,c);
- length -= 12;
- k += 6;
- }
-
- /*----------------------------- handle the last (probably partial) block */
- k8 = (const uint8_t *)k;
- switch(length)
- {
- case 12: c+=k4+(((uint32_t)k5)<<16);
- b+=k2+(((uint32_t)k3)<<16);
- a+=k0+(((uint32_t)k1)<<16);
- break;
- case 11: c+=((uint32_t)k810)<<16; /* fall through */
- case 10: c+=k4;
- b+=k2+(((uint32_t)k3)<<16);
- a+=k0+(((uint32_t)k1)<<16);
- break;
- case 9 : c+=k88; /* fall through */
- case 8 : b+=k2+(((uint32_t)k3)<<16);
- a+=k0+(((uint32_t)k1)<<16);
- break;
- case 7 : b+=((uint32_t)k86)<<16; /* fall through */
- case 6 : b+=k2;
- a+=k0+(((uint32_t)k1)<<16);
- break;
- case 5 : b+=k84; /* fall through */
- case 4 : a+=k0+(((uint32_t)k1)<<16);
- break;
- case 3 : a+=((uint32_t)k82)<<16; /* fall through */
- case 2 : a+=k0;
- break;
- case 1 : a+=k80;
- break;
- case 0 : return c; /* zero length requires no mixing */
- }
-
- } else { /* need to read the key one byte at a time */
- const uint8_t *k = (const uint8_t *)key;
-
- /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
- while (length > 12)
- {
- a += k0;
- a += ((uint32_t)k1)<<8;
- a += ((uint32_t)k2)<<16;
- a += ((uint32_t)k3)<<24;
- b += k4;
- b += ((uint32_t)k5)<<8;
- b += ((uint32_t)k6)<<16;
- b += ((uint32_t)k7)<<24;
- c += k8;
- c += ((uint32_t)k9)<<8;
- c += ((uint32_t)k10)<<16;
- c += ((uint32_t)k11)<<24;
- mix(a,b,c);
- length -= 12;
- k += 12;
- }
-
- /*-------------------------------- last block: affect all 32 bits of (c) */
- switch(length) /* all the case statements fall through */
- {
- case 12: c+=((uint32_t)k11)<<24;
- case 11: c+=((uint32_t)k10)<<16;
- case 10: c+=((uint32_t)k9)<<8;
- case 9 : c+=k8;
- case 8 : b+=((uint32_t)k7)<<24;
- case 7 : b+=((uint32_t)k6)<<16;
- case 6 : b+=((uint32_t)k5)<<8;
- case 5 : b+=k4;
- case 4 : a+=((uint32_t)k3)<<24;
- case 3 : a+=((uint32_t)k2)<<16;
- case 2 : a+=((uint32_t)k1)<<8;
- case 1 : a+=k0;
- break;
- case 0 : return c;
- }
- }
-
- final(a,b,c);
- return c;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/memory.c Deleted

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- * Copyright (c) 2011-2012 Basile Starynkevitch <basile@starynkevitch.net>
- *
- * Jansson is free software; you can redistribute it and/or modify it
- * under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "jansson.h"
-#include "jansson_private.h"
-
-/* C89 allows these to be macros */
-#undef malloc
-#undef free
-
-/* memory function pointers */
-static json_malloc_t do_malloc = malloc;
-static json_free_t do_free = free;
-
-void *jsonp_malloc(size_t size)
-{
- if(!size)
- return NULL;
-
- return (*do_malloc)(size);
-}
-
-void jsonp_free(void *ptr)
-{
- if(!ptr)
- return;
-
- (*do_free)(ptr);
-}
-
-char *jsonp_strdup(const char *str)
-{
- return jsonp_strndup(str, strlen(str));
-}
-
-char *jsonp_strndup(const char *str, size_t len)
-{
- char *new_str;
-
- new_str = jsonp_malloc(len + 1);
- if(!new_str)
- return NULL;
-
- memcpy(new_str, str, len);
- new_strlen = '\0';
- return new_str;
-}
-
-void json_set_alloc_funcs(json_malloc_t malloc_fn, json_free_t free_fn)
-{
- do_malloc = malloc_fn;
- do_free = free_fn;
-}
-
-void json_get_alloc_funcs(json_malloc_t *malloc_fn, json_free_t *free_fn)
-{
- if (malloc_fn)
- *malloc_fn = do_malloc;
- if (free_fn)
- *free_fn = do_free;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/pack_unpack.c Deleted

@@ -1,871 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- * Copyright (c) 2011-2012 Graeme Smecher <graeme.smecher@mail.mcgill.ca>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <string.h>
-#include "jansson.h"
-#include "jansson_private.h"
-#include "utf.h"
-
-typedef struct {
- int line;
- int column;
- size_t pos;
- char token;
-} token_t;
-
-typedef struct {
- const char *start;
- const char *fmt;
- token_t prev_token;
- token_t token;
- token_t next_token;
- json_error_t *error;
- size_t flags;
- int line;
- int column;
- size_t pos;
-} scanner_t;
-
-#define token(scanner) ((scanner)->token.token)
-
-static const char * const type_names = {
- "object",
- "array",
- "string",
- "integer",
- "real",
- "true",
- "false",
- "null"
-};
-
-#define type_name(x) type_namesjson_typeof(x)
-
-static const char unpack_value_starters = "{siIbfFOon";
-
-static void scanner_init(scanner_t *s, json_error_t *error,
- size_t flags, const char *fmt)
-{
- s->error = error;
- s->flags = flags;
- s->fmt = s->start = fmt;
- memset(&s->prev_token, 0, sizeof(token_t));
- memset(&s->token, 0, sizeof(token_t));
- memset(&s->next_token, 0, sizeof(token_t));
- s->line = 1;
- s->column = 0;
- s->pos = 0;
-}
-
-static void next_token(scanner_t *s)
-{
- const char *t;
- s->prev_token = s->token;
-
- if(s->next_token.line) {
- s->token = s->next_token;
- s->next_token.line = 0;
- return;
- }
-
- t = s->fmt;
- s->column++;
- s->pos++;
-
- /* skip space and ignored chars */
- while(*t == ' ' || *t == '\t' || *t == '\n' || *t == ',' || *t == ':') {
- if(*t == '\n') {
- s->line++;
- s->column = 1;
- }
- else
- s->column++;
-
- s->pos++;
- t++;
- }
-
- s->token.token = *t;
- s->token.line = s->line;
- s->token.column = s->column;
- s->token.pos = s->pos;
-
- t++;
- s->fmt = t;
-}
-
-static void prev_token(scanner_t *s)
-{
- s->next_token = s->token;
- s->token = s->prev_token;
-}
-
-static void set_error(scanner_t *s, const char *source, const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
-
- jsonp_error_vset(s->error, s->token.line, s->token.column, s->token.pos,
- fmt, ap);
-
- jsonp_error_set_source(s->error, source);
-
- va_end(ap);
-}
-
-static json_t *pack(scanner_t *s, va_list *ap);
-
-
-/* ours will be set to 1 if jsonp_free() must be called for the result
- afterwards */
-static char *read_string(scanner_t *s, va_list *ap,
- const char *purpose, size_t *out_len, int *ours)
-{
- char t;
- strbuffer_t strbuff;
- const char *str;
- size_t length;
-
- next_token(s);
- t = token(s);
- prev_token(s);
-
- if(t != '#' && t != '%' && t != '+') {
- /* Optimize the simple case */
- str = va_arg(*ap, const char *);
-
- if(!str) {
- set_error(s, "<args>", "NULL string argument");
- return NULL;
- }
-
- length = strlen(str);
-
- if(!utf8_check_string(str, length)) {
- set_error(s, "<args>", "Invalid UTF-8 %s", purpose);
- return NULL;
- }
-
- *out_len = length;
- *ours = 0;
- return (char *)str;
- }
-
- strbuffer_init(&strbuff);
-
- while(1) {
- str = va_arg(*ap, const char *);
- if(!str) {
- set_error(s, "<args>", "NULL string argument");
- strbuffer_close(&strbuff);
- return NULL;
- }
-
- next_token(s);
-
- if(token(s) == '#') {
- length = va_arg(*ap, int);
- }
- else if(token(s) == '%') {
- length = va_arg(*ap, size_t);
- }
- else {
- prev_token(s);
- length = strlen(str);
- }
-
- if(strbuffer_append_bytes(&strbuff, str, length) == -1) {
- set_error(s, "<internal>", "Out of memory");
- strbuffer_close(&strbuff);
- return NULL;
- }
-
- next_token(s);
- if(token(s) != '+') {
- prev_token(s);
- break;
- }
- }
-
- if(!utf8_check_string(strbuff.value, strbuff.length)) {
- set_error(s, "<args>", "Invalid UTF-8 %s", purpose);
- strbuffer_close(&strbuff);
- return NULL;
- }
-
- *out_len = strbuff.length;
- *ours = 1;
- return strbuffer_steal_value(&strbuff);
-}
-
-static json_t *pack_object(scanner_t *s, va_list *ap)
-{
- json_t *object = json_object();
- next_token(s);
-
- while(token(s) != '}') {
- char *key;
- size_t len;
- int ours;
- json_t *value;
-
- if(!token(s)) {
- set_error(s, "<format>", "Unexpected end of format string");
- goto error;
- }
-
- if(token(s) != 's') {
- set_error(s, "<format>", "Expected format 's', got '%c'", token(s));
- goto error;
- }
-
- key = read_string(s, ap, "object key", &len, &ours);
- if(!key)
- goto error;
-
- next_token(s);
-
- value = pack(s, ap);
- if(!value) {
- if(ours)
- jsonp_free(key);
-
- goto error;
- }
-
- if(json_object_set_new_nocheck(object, key, value)) {
- set_error(s, "<internal>", "Unable to add key \"%s\"", key);
- if(ours)
- jsonp_free(key);
-
- goto error;
- }
-
- if(ours)
- jsonp_free(key);
-
- next_token(s);
- }
-
- return object;
-
-error:
- json_decref(object);
- return NULL;
-}
-
-static json_t *pack_array(scanner_t *s, va_list *ap)
-{
- json_t *array = json_array();
- next_token(s);
-
- while(token(s) != '') {
- json_t *value;
-
- if(!token(s)) {
- set_error(s, "<format>", "Unexpected end of format string");
- goto error;
- }
-
- value = pack(s, ap);
- if(!value)
- goto error;
-
- if(json_array_append_new(array, value)) {
- set_error(s, "<internal>", "Unable to append to array");
- goto error;
- }
-
- next_token(s);
- }
- return array;
-
-error:
- json_decref(array);
- return NULL;
-}
-
-static json_t *pack_string(scanner_t *s, va_list *ap)
-{
- char *str;
- size_t len;
- int ours;
- int nullable;
-
- next_token(s);
- nullable = token(s) == '?';
- if (!nullable)
- prev_token(s);
-
- str = read_string(s, ap, "string", &len, &ours);
- if (!str) {
- return nullable ? json_null() : NULL;
- } else if (ours) {
- return jsonp_stringn_nocheck_own(str, len);
- } else {
- return json_stringn_nocheck(str, len);
- }
-}
-
-static json_t *pack(scanner_t *s, va_list *ap)
-{
- switch(token(s)) {
- case '{':
- return pack_object(s, ap);
-
- case '':
- return pack_array(s, ap);
-
- case 's': /* string */
- return pack_string(s, ap);
-
- case 'n': /* null */
- return json_null();
-
- case 'b': /* boolean */
- return va_arg(*ap, int) ? json_true() : json_false();
-
- case 'i': /* integer from int */
- return json_integer(va_arg(*ap, int));
-
- case 'I': /* integer from json_int_t */
- return json_integer(va_arg(*ap, json_int_t));
-
- case 'f': /* real */
- return json_real(va_arg(*ap, double));
-
- case 'O': /* a json_t object; increments refcount */
- {
- int nullable;
- json_t *json;
-
- next_token(s);
- nullable = token(s) == '?';
- if (!nullable)
- prev_token(s);
-
- json = va_arg(*ap, json_t *);
- if (!json && nullable) {
- return json_null();
- } else {
- return json_incref(json);
- }
- }
-
- case 'o': /* a json_t object; doesn't increment refcount */
- {
- int nullable;
- json_t *json;
-
- next_token(s);
- nullable = token(s) == '?';
- if (!nullable)
- prev_token(s);
-
- json = va_arg(*ap, json_t *);
- if (!json && nullable) {
- return json_null();
- } else {
- return json;
- }
- }
-
- default:
- set_error(s, "<format>", "Unexpected format character '%c'",
- token(s));
- return NULL;
- }
-}
-
-static int unpack(scanner_t *s, json_t *root, va_list *ap);
-
-static int unpack_object(scanner_t *s, json_t *root, va_list *ap)
-{
- int ret = -1;
- int strict = 0;
- int gotopt = 0;
-
- /* Use a set (emulated by a hashtable) to check that all object
- keys are accessed. Checking that the correct number of keys
- were accessed is not enough, as the same key can be unpacked
- multiple times.
- */
- hashtable_t key_set;
-
- if(hashtable_init(&key_set)) {
- set_error(s, "<internal>", "Out of memory");
- return -1;
- }
-
- if(root && !json_is_object(root)) {
- set_error(s, "<validation>", "Expected object, got %s",
- type_name(root));
- goto out;
- }
- next_token(s);
-
- while(token(s) != '}') {
- const char *key;
- json_t *value;
- int opt = 0;
-
- if(strict != 0) {
- set_error(s, "<format>", "Expected '}' after '%c', got '%c'",
- (strict == 1 ? '!' : '*'), token(s));
- goto out;
- }
-
- if(!token(s)) {
- set_error(s, "<format>", "Unexpected end of format string");
- goto out;
- }
-
- if(token(s) == '!' || token(s) == '*') {
- strict = (token(s) == '!' ? 1 : -1);
- next_token(s);
- continue;
- }
-
- if(token(s) != 's') {
- set_error(s, "<format>", "Expected format 's', got '%c'", token(s));
- goto out;
- }
-
- key = va_arg(*ap, const char *);
- if(!key) {
- set_error(s, "<args>", "NULL object key");
- goto out;
- }
-
- next_token(s);
-
- if(token(s) == '?') {
- opt = gotopt = 1;
- next_token(s);
- }
-
- if(!root) {
- /* skipping */
- value = NULL;
- }
- else {
- value = json_object_get(root, key);
- if(!value && !opt) {
- set_error(s, "<validation>", "Object item not found: %s", key);
- goto out;
- }
- }
-
- if(unpack(s, value, ap))
- goto out;
-
- hashtable_set(&key_set, key, json_null());
- next_token(s);
- }
-
- if(strict == 0 && (s->flags & JSON_STRICT))
- strict = 1;
-
- if(root && strict == 1) {
- /* We need to check that all non optional items have been parsed */
- const char *key;
- int have_unrecognized_keys = 0;
- strbuffer_t unrecognized_keys;
- json_t *value;
- long unpacked = 0;
- if (gotopt) {
- /* We have optional keys, we need to iter on each key */
- json_object_foreach(root, key, value) {
- if(!hashtable_get(&key_set, key)) {
- unpacked++;
-
- /* Save unrecognized keys for the error message */
- if (!have_unrecognized_keys) {
- strbuffer_init(&unrecognized_keys);
- have_unrecognized_keys = 1;
- } else {
- strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
- }
- strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
- }
- }
- } else {
- /* No optional keys, we can just compare the number of items */
- unpacked = (long)json_object_size(root) - (long)key_set.size;
- }
- if (unpacked) {
- if (!gotopt) {
- /* Save unrecognized keys for the error message */
- json_object_foreach(root, key, value) {
- if(!hashtable_get(&key_set, key)) {
- if (!have_unrecognized_keys) {
- strbuffer_init(&unrecognized_keys);
- have_unrecognized_keys = 1;
- } else {
- strbuffer_append_bytes(&unrecognized_keys, ", ", 2);
- }
- strbuffer_append_bytes(&unrecognized_keys, key, strlen(key));
- }
- }
- }
- set_error(s, "<validation>",
- "%li object item(s) left unpacked: %s",
- unpacked, strbuffer_value(&unrecognized_keys));
- strbuffer_close(&unrecognized_keys);
- goto out;
- }
- }
-
- ret = 0;
-
-out:
- hashtable_close(&key_set);
- return ret;
-}
-
-static int unpack_array(scanner_t *s, json_t *root, va_list *ap)
-{
- size_t i = 0;
- int strict = 0;
-
- if(root && !json_is_array(root)) {
- set_error(s, "<validation>", "Expected array, got %s", type_name(root));
- return -1;
- }
- next_token(s);
-
- while(token(s) != '') {
- json_t *value;
-
- if(strict != 0) {
- set_error(s, "<format>", "Expected '' after '%c', got '%c'",
- (strict == 1 ? '!' : '*'),
- token(s));
- return -1;
- }
-
- if(!token(s)) {
- set_error(s, "<format>", "Unexpected end of format string");
- return -1;
- }
-
- if(token(s) == '!' || token(s) == '*') {
- strict = (token(s) == '!' ? 1 : -1);
- next_token(s);
- continue;
- }
-
- if(!strchr(unpack_value_starters, token(s))) {
- set_error(s, "<format>", "Unexpected format character '%c'",
- token(s));
- return -1;
- }
-
- if(!root) {
- /* skipping */
- value = NULL;
- }
- else {
- value = json_array_get(root, i);
- if(!value) {
- set_error(s, "<validation>", "Array index %lu out of range",
- (unsigned long)i);
- return -1;
- }
- }
-
- if(unpack(s, value, ap))
- return -1;
-
- next_token(s);
- i++;
- }
-
- if(strict == 0 && (s->flags & JSON_STRICT))
- strict = 1;
-
- if(root && strict == 1 && i != json_array_size(root)) {
- long diff = (long)json_array_size(root) - (long)i;
- set_error(s, "<validation>", "%li array item(s) left unpacked", diff);
- return -1;
- }
-
- return 0;
-}
-
-static int unpack(scanner_t *s, json_t *root, va_list *ap)
-{
- switch(token(s))
- {
- case '{':
- return unpack_object(s, root, ap);
-
- case '':
- return unpack_array(s, root, ap);
-
- case 's':
- if(root && !json_is_string(root)) {
- set_error(s, "<validation>", "Expected string, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- const char **str_target;
- size_t *len_target = NULL;
-
- str_target = va_arg(*ap, const char **);
- if(!str_target) {
- set_error(s, "<args>", "NULL string argument");
- return -1;
- }
-
- next_token(s);
-
- if(token(s) == '%') {
- len_target = va_arg(*ap, size_t *);
- if(!len_target) {
- set_error(s, "<args>", "NULL string length argument");
- return -1;
- }
- }
- else
- prev_token(s);
-
- if(root) {
- *str_target = json_string_value(root);
- if(len_target)
- *len_target = json_string_length(root);
- }
- }
- return 0;
-
- case 'i':
- if(root && !json_is_integer(root)) {
- set_error(s, "<validation>", "Expected integer, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- int *target = va_arg(*ap, int*);
- if(root)
- *target = (int)json_integer_value(root);
- }
-
- return 0;
-
- case 'I':
- if(root && !json_is_integer(root)) {
- set_error(s, "<validation>", "Expected integer, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- json_int_t *target = va_arg(*ap, json_int_t*);
- if(root)
- *target = json_integer_value(root);
- }
-
- return 0;
-
- case 'b':
- if(root && !json_is_boolean(root)) {
- set_error(s, "<validation>", "Expected true or false, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- int *target = va_arg(*ap, int*);
- if(root)
- *target = json_is_true(root);
- }
-
- return 0;
-
- case 'f':
- if(root && !json_is_real(root)) {
- set_error(s, "<validation>", "Expected real, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- double *target = va_arg(*ap, double*);
- if(root)
- *target = json_real_value(root);
- }
-
- return 0;
-
- case 'F':
- if(root && !json_is_number(root)) {
- set_error(s, "<validation>", "Expected real or integer, got %s",
- type_name(root));
- return -1;
- }
-
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- double *target = va_arg(*ap, double*);
- if(root)
- *target = json_number_value(root);
- }
-
- return 0;
-
- case 'O':
- if(root && !(s->flags & JSON_VALIDATE_ONLY))
- json_incref(root);
- /* Fall through */
-
- case 'o':
- if(!(s->flags & JSON_VALIDATE_ONLY)) {
- json_t **target = va_arg(*ap, json_t**);
- if(root)
- *target = root;
- }
-
- return 0;
-
- case 'n':
- /* Never assign, just validate */
- if(root && !json_is_null(root)) {
- set_error(s, "<validation>", "Expected null, got %s",
- type_name(root));
- return -1;
- }
- return 0;
-
- default:
- set_error(s, "<format>", "Unexpected format character '%c'",
- token(s));
- return -1;
- }
-}
-
-json_t *json_vpack_ex(json_error_t *error, size_t flags,
- const char *fmt, va_list ap)
-{
- scanner_t s;
- va_list ap_copy;
- json_t *value;
-
- if(!fmt || !*fmt) {
- jsonp_error_init(error, "<format>");
- jsonp_error_set(error, -1, -1, 0, "NULL or empty format string");
- return NULL;
- }
- jsonp_error_init(error, NULL);
-
- scanner_init(&s, error, flags, fmt);
- next_token(&s);
-
- va_copy(ap_copy, ap);
- value = pack(&s, &ap_copy);
- va_end(ap_copy);
-
- if(!value)
- return NULL;
-
- next_token(&s);
- if(token(&s)) {
- json_decref(value);
- set_error(&s, "<format>", "Garbage after format string");
- return NULL;
- }
-
- return value;
-}
-
-json_t *json_pack_ex(json_error_t *error, size_t flags, const char *fmt, ...)
-{
- json_t *value;
- va_list ap;
-
- va_start(ap, fmt);
- value = json_vpack_ex(error, flags, fmt, ap);
- va_end(ap);
-
- return value;
-}
-
-json_t *json_pack(const char *fmt, ...)
-{
- json_t *value;
- va_list ap;
-
- va_start(ap, fmt);
- value = json_vpack_ex(NULL, 0, fmt, ap);
- va_end(ap);
-
- return value;
-}
-
-int json_vunpack_ex(json_t *root, json_error_t *error, size_t flags,
- const char *fmt, va_list ap)
-{
- scanner_t s;
- va_list ap_copy;
-
- if(!root) {
- jsonp_error_init(error, "<root>");
- jsonp_error_set(error, -1, -1, 0, "NULL root value");
- return -1;
- }
-
- if(!fmt || !*fmt) {
- jsonp_error_init(error, "<format>");
- jsonp_error_set(error, -1, -1, 0, "NULL or empty format string");
- return -1;
- }
- jsonp_error_init(error, NULL);
-
- scanner_init(&s, error, flags, fmt);
- next_token(&s);
-
- va_copy(ap_copy, ap);
- if(unpack(&s, root, &ap_copy)) {
- va_end(ap_copy);
- return -1;
- }
- va_end(ap_copy);
-
- next_token(&s);
- if(token(&s)) {
- set_error(&s, "<format>", "Garbage after format string");
- return -1;
- }
-
- return 0;
-}
-
-int json_unpack_ex(json_t *root, json_error_t *error, size_t flags, const char *fmt, ...)
-{
- int ret;
- va_list ap;
-
- va_start(ap, fmt);
- ret = json_vunpack_ex(root, error, flags, fmt, ap);
- va_end(ap);
-
- return ret;
-}
-
-int json_unpack(json_t *root, const char *fmt, ...)
-{
- int ret;
- va_list ap;
-
- va_start(ap, fmt);
- ret = json_vunpack_ex(root, NULL, 0, fmt, ap);
- va_end(ap);
-
- return ret;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/strbuffer.c Deleted

@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include "jansson_private.h"
-#include "strbuffer.h"
-
-#define STRBUFFER_MIN_SIZE 16
-#define STRBUFFER_FACTOR 2
-#define STRBUFFER_SIZE_MAX ((size_t)-1)
-
-int strbuffer_init(strbuffer_t *strbuff)
-{
- strbuff->size = STRBUFFER_MIN_SIZE;
- strbuff->length = 0;
-
- strbuff->value = jsonp_malloc(strbuff->size);
- if(!strbuff->value)
- return -1;
-
- /* initialize to empty */
- strbuff->value0 = '\0';
- return 0;
-}
-
-void strbuffer_close(strbuffer_t *strbuff)
-{
- if(strbuff->value)
- jsonp_free(strbuff->value);
-
- strbuff->size = 0;
- strbuff->length = 0;
- strbuff->value = NULL;
-}
-
-void strbuffer_clear(strbuffer_t *strbuff)
-{
- strbuff->length = 0;
- strbuff->value0 = '\0';
-}
-
-const char *strbuffer_value(const strbuffer_t *strbuff)
-{
- return strbuff->value;
-}
-
-char *strbuffer_steal_value(strbuffer_t *strbuff)
-{
- char *result = strbuff->value;
- strbuff->value = NULL;
- return result;
-}
-
-int strbuffer_append_byte(strbuffer_t *strbuff, char byte)
-{
- return strbuffer_append_bytes(strbuff, &byte, 1);
-}
-
-int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, size_t size)
-{
- if(size >= strbuff->size - strbuff->length)
- {
- size_t new_size;
- char *new_value;
-
- /* avoid integer overflow */
- if (strbuff->size > STRBUFFER_SIZE_MAX / STRBUFFER_FACTOR
- || size > STRBUFFER_SIZE_MAX - 1
- || strbuff->length > STRBUFFER_SIZE_MAX - 1 - size)
- return -1;
-
- new_size = max(strbuff->size * STRBUFFER_FACTOR,
- strbuff->length + size + 1);
-
- new_value = jsonp_malloc(new_size);
- if(!new_value)
- return -1;
-
- memcpy(new_value, strbuff->value, strbuff->length);
-
- jsonp_free(strbuff->value);
- strbuff->value = new_value;
- strbuff->size = new_size;
- }
-
- memcpy(strbuff->value + strbuff->length, data, size);
- strbuff->length += size;
- strbuff->valuestrbuff->length = '\0';
-
- return 0;
-}
-
-char strbuffer_pop(strbuffer_t *strbuff)
-{
- if(strbuff->length > 0) {
- char c = strbuff->value--strbuff->length;
- strbuff->valuestrbuff->length = '\0';
- return c;
- }
- else
- return '\0';
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/strbuffer.h Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/src/strconv.c Deleted

@@ -1,145 +0,0 @@
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#ifdef __MINGW32__
-#undef __NO_ISOCEXT /* ensure stdlib.h will declare prototypes for mingw own 'strtod' replacement, called '__strtod' */
-#endif
-#include "jansson_private.h"
-#include "strbuffer.h"
-
-/* need jansson_private_config.h to get the correct snprintf */
-#ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#ifdef __MINGW32__
-#define strtod __strtod
-#endif
-
-#if JSON_HAVE_LOCALECONV
-#include <locale.h>
-
-/*
- - This code assumes that the decimal separator is exactly one
- character.
-
- - If setlocale() is called by another thread between the call to
- localeconv() and the call to sprintf() or strtod(), the result may
- be wrong. setlocale() is not thread-safe and should not be used
- this way. Multi-threaded programs should use uselocale() instead.
-*/
-
-static void to_locale(strbuffer_t *strbuffer)
-{
- const char *point;
- char *pos;
-
- point = localeconv()->decimal_point;
- if(*point == '.') {
- /* No conversion needed */
- return;
- }
-
- pos = strchr(strbuffer->value, '.');
- if(pos)
- *pos = *point;
-}
-
-static void from_locale(char *buffer)
-{
- const char *point;
- char *pos;
-
- point = localeconv()->decimal_point;
- if(*point == '.') {
- /* No conversion needed */
- return;
- }
-
- pos = strchr(buffer, *point);
- if(pos)
- *pos = '.';
-}
-#endif
-
-int jsonp_strtod(strbuffer_t *strbuffer, double *out)
-{
- double value;
- char *end;
-
-#if JSON_HAVE_LOCALECONV
- to_locale(strbuffer);
-#endif
-
- errno = 0;
- value = strtod(strbuffer->value, &end);
- assert(end == strbuffer->value + strbuffer->length);
-
- if((value == HUGE_VAL || value == -HUGE_VAL) && errno == ERANGE) {
- /* Overflow */
- return -1;
- }
-
- *out = value;
- return 0;
-}
-
-int jsonp_dtostr(char *buffer, size_t size, double value, int precision)
-{
- int ret;
- char *start, *end;
- size_t length;
-
- if (precision == 0)
- precision = 17;
-
- ret = snprintf(buffer, size, "%.*g", precision, value);
- if(ret < 0)
- return -1;
-
- length = (size_t)ret;
- if(length >= size)
- return -1;
-
-#if JSON_HAVE_LOCALECONV
- from_locale(buffer);
-#endif
-
- /* Make sure there's a dot or 'e' in the output. Otherwise
- a real is converted to an integer when decoding */
- if(strchr(buffer, '.') == NULL &&
- strchr(buffer, 'e') == NULL)
- {
- if(length + 3 >= size) {
- /* No space to append ".0" */
- return -1;
- }
- bufferlength = '.';
- bufferlength + 1 = '0';
- bufferlength + 2 = '\0';
- length += 2;
- }
-
- /* Remove leading '+' from positive exponent. Also remove leading
- zeros from exponents (added by some printf() implementations) */
- start = strchr(buffer, 'e');
- if(start) {
- start++;
- end = start + 1;
-
- if(*start == '-')
- start++;
-
- while(*end == '0')
- end++;
-
- if(end != start) {
- memmove(start, end, length - (size_t)(end - buffer));
- length -= (size_t)(end - start);
- }
- }
-
- return (int)length;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/utf.c Deleted

@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <string.h>
-#include "utf.h"
-
-int utf8_encode(int32_t codepoint, char *buffer, size_t *size)
-{
- if(codepoint < 0)
- return -1;
- else if(codepoint < 0x80)
- {
- buffer0 = (char)codepoint;
- *size = 1;
- }
- else if(codepoint < 0x800)
- {
- buffer0 = 0xC0 + ((codepoint & 0x7C0) >> 6);
- buffer1 = 0x80 + ((codepoint & 0x03F));
- *size = 2;
- }
- else if(codepoint < 0x10000)
- {
- buffer0 = 0xE0 + ((codepoint & 0xF000) >> 12);
- buffer1 = 0x80 + ((codepoint & 0x0FC0) >> 6);
- buffer2 = 0x80 + ((codepoint & 0x003F));
- *size = 3;
- }
- else if(codepoint <= 0x10FFFF)
- {
- buffer0 = 0xF0 + ((codepoint & 0x1C0000) >> 18);
- buffer1 = 0x80 + ((codepoint & 0x03F000) >> 12);
- buffer2 = 0x80 + ((codepoint & 0x000FC0) >> 6);
- buffer3 = 0x80 + ((codepoint & 0x00003F));
- *size = 4;
- }
- else
- return -1;
-
- return 0;
-}
-
-size_t utf8_check_first(char byte)
-{
- unsigned char u = (unsigned char)byte;
-
- if(u < 0x80)
- return 1;
-
- if(0x80 <= u && u <= 0xBF) {
- /* second, third or fourth byte of a multi-byte
- sequence, i.e. a "continuation byte" */
- return 0;
- }
- else if(u == 0xC0 || u == 0xC1) {
- /* overlong encoding of an ASCII byte */
- return 0;
- }
- else if(0xC2 <= u && u <= 0xDF) {
- /* 2-byte sequence */
- return 2;
- }
-
- else if(0xE0 <= u && u <= 0xEF) {
- /* 3-byte sequence */
- return 3;
- }
- else if(0xF0 <= u && u <= 0xF4) {
- /* 4-byte sequence */
- return 4;
- }
- else { /* u >= 0xF5 */
- /* Restricted (start of 4-, 5- or 6-byte sequence) or invalid
- UTF-8 */
- return 0;
- }
-}
-
-size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint)
-{
- size_t i;
- int32_t value = 0;
- unsigned char u = (unsigned char)buffer0;
-
- if(size == 2)
- {
- value = u & 0x1F;
- }
- else if(size == 3)
- {
- value = u & 0xF;
- }
- else if(size == 4)
- {
- value = u & 0x7;
- }
- else
- return 0;
-
- for(i = 1; i < size; i++)
- {
- u = (unsigned char)bufferi;
-
- if(u < 0x80 || u > 0xBF) {
- /* not a continuation byte */
- return 0;
- }
-
- value = (value << 6) + (u & 0x3F);
- }
-
- if(value > 0x10FFFF) {
- /* not in Unicode range */
- return 0;
- }
-
- else if(0xD800 <= value && value <= 0xDFFF) {
- /* invalid code point (UTF-16 surrogate halves) */
- return 0;
- }
-
- else if((size == 2 && value < 0x80) ||
- (size == 3 && value < 0x800) ||
- (size == 4 && value < 0x10000)) {
- /* overlong encoding */
- return 0;
- }
-
- if(codepoint)
- *codepoint = value;
-
- return 1;
-}
-
-const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint)
-{
- size_t count;
- int32_t value;
-
- if(!bufsize)
- return buffer;
-
- count = utf8_check_first(buffer0);
- if(count <= 0)
- return NULL;
-
- if(count == 1)
- value = (unsigned char)buffer0;
- else
- {
- if(count > bufsize || !utf8_check_full(buffer, count, &value))
- return NULL;
- }
-
- if(codepoint)
- *codepoint = value;
-
- return buffer + count;
-}
-
-int utf8_check_string(const char *string, size_t length)
-{
- size_t i;
-
- for(i = 0; i < length; i++)
- {
- size_t count = utf8_check_first(stringi);
- if(count == 0)
- return 0;
- else if(count > 1)
- {
- if(count > length - i)
- return 0;
-
- if(!utf8_check_full(&stringi, count, NULL))
- return 0;
-
- i += count - 1;
- }
- }
-
- return 1;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/src/utf.h Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/src/value.c Deleted

@@ -1,1045 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#include "jansson.h"
-#include "hashtable.h"
-#include "jansson_private.h"
-#include "utf.h"
-
-/* Work around nonstandard isnan() and isinf() implementations */
-#ifndef isnan
-#ifndef __sun
-static JSON_INLINE int isnan(double x) { return x != x; }
-#endif
-#endif
-#ifndef isinf
-static JSON_INLINE int isinf(double x) { return !isnan(x) && isnan(x - x); }
-#endif
-
-static JSON_INLINE void json_init(json_t *json, json_type type)
-{
- json->type = type;
- json->refcount = 1;
-}
-
-
-/*** object ***/
-
-extern volatile uint32_t hashtable_seed;
-
-json_t *json_object(void)
-{
- json_object_t *object = jsonp_malloc(sizeof(json_object_t));
- if(!object)
- return NULL;
-
- if (!hashtable_seed) {
- /* Autoseed */
- json_object_seed(0);
- }
-
- json_init(&object->json, JSON_OBJECT);
-
- if(hashtable_init(&object->hashtable))
- {
- jsonp_free(object);
- return NULL;
- }
-
- object->visited = 0;
-
- return &object->json;
-}
-
-static void json_delete_object(json_object_t *object)
-{
- hashtable_close(&object->hashtable);
- jsonp_free(object);
-}
-
-size_t json_object_size(const json_t *json)
-{
- json_object_t *object;
-
- if(!json_is_object(json))
- return 0;
-
- object = json_to_object(json);
- return object->hashtable.size;
-}
-
-json_t *json_object_get(const json_t *json, const char *key)
-{
- json_object_t *object;
-
- if(!key || !json_is_object(json))
- return NULL;
-
- object = json_to_object(json);
- return hashtable_get(&object->hashtable, key);
-}
-
-int json_object_set_new_nocheck(json_t *json, const char *key, json_t *value)
-{
- json_object_t *object;
-
- if(!value)
- return -1;
-
- if(!key || !json_is_object(json) || json == value)
- {
- json_decref(value);
- return -1;
- }
- object = json_to_object(json);
-
- if(hashtable_set(&object->hashtable, key, value))
- {
- json_decref(value);
- return -1;
- }
-
- return 0;
-}
-
-int json_object_set_new(json_t *json, const char *key, json_t *value)
-{
- if(!key || !utf8_check_string(key, strlen(key)))
- {
- json_decref(value);
- return -1;
- }
-
- return json_object_set_new_nocheck(json, key, value);
-}
-
-int json_object_del(json_t *json, const char *key)
-{
- json_object_t *object;
-
- if(!key || !json_is_object(json))
- return -1;
-
- object = json_to_object(json);
- return hashtable_del(&object->hashtable, key);
-}
-
-int json_object_clear(json_t *json)
-{
- json_object_t *object;
-
- if(!json_is_object(json))
- return -1;
-
- object = json_to_object(json);
- hashtable_clear(&object->hashtable);
-
- return 0;
-}
-
-int json_object_update(json_t *object, json_t *other)
-{
- const char *key;
- json_t *value;
-
- if(!json_is_object(object) || !json_is_object(other))
- return -1;
-
- json_object_foreach(other, key, value) {
- if(json_object_set_nocheck(object, key, value))
- return -1;
- }
-
- return 0;
-}
-
-int json_object_update_existing(json_t *object, json_t *other)
-{
- const char *key;
- json_t *value;
-
- if(!json_is_object(object) || !json_is_object(other))
- return -1;
-
- json_object_foreach(other, key, value) {
- if(json_object_get(object, key))
- json_object_set_nocheck(object, key, value);
- }
-
- return 0;
-}
-
-int json_object_update_missing(json_t *object, json_t *other)
-{
- const char *key;
- json_t *value;
-
- if(!json_is_object(object) || !json_is_object(other))
- return -1;
-
- json_object_foreach(other, key, value) {
- if(!json_object_get(object, key))
- json_object_set_nocheck(object, key, value);
- }
-
- return 0;
-}
-
-void *json_object_iter(json_t *json)
-{
- json_object_t *object;
-
- if(!json_is_object(json))
- return NULL;
-
- object = json_to_object(json);
- return hashtable_iter(&object->hashtable);
-}
-
-void *json_object_iter_at(json_t *json, const char *key)
-{
- json_object_t *object;
-
- if(!key || !json_is_object(json))
- return NULL;
-
- object = json_to_object(json);
- return hashtable_iter_at(&object->hashtable, key);
-}
-
-void *json_object_iter_next(json_t *json, void *iter)
-{
- json_object_t *object;
-
- if(!json_is_object(json) || iter == NULL)
- return NULL;
-
- object = json_to_object(json);
- return hashtable_iter_next(&object->hashtable, iter);
-}
-
-const char *json_object_iter_key(void *iter)
-{
- if(!iter)
- return NULL;
-
- return hashtable_iter_key(iter);
-}
-
-json_t *json_object_iter_value(void *iter)
-{
- if(!iter)
- return NULL;
-
- return (json_t *)hashtable_iter_value(iter);
-}
-
-int json_object_iter_set_new(json_t *json, void *iter, json_t *value)
-{
- if(!json_is_object(json) || !iter || !value)
- return -1;
-
- hashtable_iter_set(iter, value);
- return 0;
-}
-
-void *json_object_key_to_iter(const char *key)
-{
- if(!key)
- return NULL;
-
- return hashtable_key_to_iter(key);
-}
-
-static int json_object_equal(json_t *object1, json_t *object2)
-{
- const char *key;
- json_t *value1, *value2;
-
- if(json_object_size(object1) != json_object_size(object2))
- return 0;
-
- json_object_foreach(object1, key, value1) {
- value2 = json_object_get(object2, key);
-
- if(!json_equal(value1, value2))
- return 0;
- }
-
- return 1;
-}
-
-static json_t *json_object_copy(json_t *object)
-{
- json_t *result;
-
- const char *key;
- json_t *value;
-
- result = json_object();
- if(!result)
- return NULL;
-
- json_object_foreach(object, key, value)
- json_object_set_nocheck(result, key, value);
-
- return result;
-}
-
-static json_t *json_object_deep_copy(const json_t *object)
-{
- json_t *result;
- void *iter;
-
- result = json_object();
- if(!result)
- return NULL;
-
- /* Cannot use json_object_foreach because object has to be cast
- non-const */
- iter = json_object_iter((json_t *)object);
- while(iter) {
- const char *key;
- const json_t *value;
- key = json_object_iter_key(iter);
- value = json_object_iter_value(iter);
-
- json_object_set_new_nocheck(result, key, json_deep_copy(value));
- iter = json_object_iter_next((json_t *)object, iter);
- }
-
- return result;
-}
-
-
-/*** array ***/
-
-json_t *json_array(void)
-{
- json_array_t *array = jsonp_malloc(sizeof(json_array_t));
- if(!array)
- return NULL;
- json_init(&array->json, JSON_ARRAY);
-
- array->entries = 0;
- array->size = 8;
-
- array->table = jsonp_malloc(array->size * sizeof(json_t *));
- if(!array->table) {
- jsonp_free(array);
- return NULL;
- }
-
- array->visited = 0;
-
- return &array->json;
-}
-
-static void json_delete_array(json_array_t *array)
-{
- size_t i;
-
- for(i = 0; i < array->entries; i++)
- json_decref(array->tablei);
-
- jsonp_free(array->table);
- jsonp_free(array);
-}
-
-size_t json_array_size(const json_t *json)
-{
- if(!json_is_array(json))
- return 0;
-
- return json_to_array(json)->entries;
-}
-
-json_t *json_array_get(const json_t *json, size_t index)
-{
- json_array_t *array;
- if(!json_is_array(json))
- return NULL;
- array = json_to_array(json);
-
- if(index >= array->entries)
- return NULL;
-
- return array->tableindex;
-}
-
-int json_array_set_new(json_t *json, size_t index, json_t *value)
-{
- json_array_t *array;
-
- if(!value)
- return -1;
-
- if(!json_is_array(json) || json == value)
- {
- json_decref(value);
- return -1;
- }
- array = json_to_array(json);
-
- if(index >= array->entries)
- {
- json_decref(value);
- return -1;
- }
-
- json_decref(array->tableindex);
- array->tableindex = value;
-
- return 0;
-}
-
-static void array_move(json_array_t *array, size_t dest,
- size_t src, size_t count)
-{
- memmove(&array->tabledest, &array->tablesrc, count * sizeof(json_t *));
-}
-
-static void array_copy(json_t **dest, size_t dpos,
- json_t **src, size_t spos,
- size_t count)
-{
- memcpy(&destdpos, &srcspos, count * sizeof(json_t *));
-}
-
-static json_t **json_array_grow(json_array_t *array,
- size_t amount,
- int copy)
-{
- size_t new_size;
- json_t **old_table, **new_table;
-
- if(array->entries + amount <= array->size)
- return array->table;
-
- old_table = array->table;
-
- new_size = max(array->size + amount, array->size * 2);
- new_table = jsonp_malloc(new_size * sizeof(json_t *));
- if(!new_table)
- return NULL;
-
- array->size = new_size;
- array->table = new_table;
-
- if(copy) {
- array_copy(array->table, 0, old_table, 0, array->entries);
- jsonp_free(old_table);
- return array->table;
- }
-
- return old_table;
-}
-
-int json_array_append_new(json_t *json, json_t *value)
-{
- json_array_t *array;
-
- if(!value)
- return -1;
-
- if(!json_is_array(json) || json == value)
- {
- json_decref(value);
- return -1;
- }
- array = json_to_array(json);
-
- if(!json_array_grow(array, 1, 1)) {
- json_decref(value);
- return -1;
- }
-
- array->tablearray->entries = value;
- array->entries++;
-
- return 0;
-}
-
-int json_array_insert_new(json_t *json, size_t index, json_t *value)
-{
- json_array_t *array;
- json_t **old_table;
-
- if(!value)
- return -1;
-
- if(!json_is_array(json) || json == value) {
- json_decref(value);
- return -1;
- }
- array = json_to_array(json);
-
- if(index > array->entries) {
- json_decref(value);
- return -1;
- }
-
- old_table = json_array_grow(array, 1, 0);
- if(!old_table) {
- json_decref(value);
- return -1;
- }
-
- if(old_table != array->table) {
- array_copy(array->table, 0, old_table, 0, index);
- array_copy(array->table, index + 1, old_table, index,
- array->entries - index);
- jsonp_free(old_table);
- }
- else
- array_move(array, index + 1, index, array->entries - index);
-
- array->tableindex = value;
- array->entries++;
-
- return 0;
-}
-
-int json_array_remove(json_t *json, size_t index)
-{
- json_array_t *array;
-
- if(!json_is_array(json))
- return -1;
- array = json_to_array(json);
-
- if(index >= array->entries)
- return -1;
-
- json_decref(array->tableindex);
-
- /* If we're removing the last element, nothing has to be moved */
- if(index < array->entries - 1)
- array_move(array, index, index + 1, array->entries - index - 1);
-
- array->entries--;
-
- return 0;
-}
-
-int json_array_clear(json_t *json)
-{
- json_array_t *array;
- size_t i;
-
- if(!json_is_array(json))
- return -1;
- array = json_to_array(json);
-
- for(i = 0; i < array->entries; i++)
- json_decref(array->tablei);
-
- array->entries = 0;
- return 0;
-}
-
-int json_array_extend(json_t *json, json_t *other_json)
-{
- json_array_t *array, *other;
- size_t i;
-
- if(!json_is_array(json) || !json_is_array(other_json))
- return -1;
- array = json_to_array(json);
- other = json_to_array(other_json);
-
- if(!json_array_grow(array, other->entries, 1))
- return -1;
-
- for(i = 0; i < other->entries; i++)
- json_incref(other->tablei);
-
- array_copy(array->table, array->entries, other->table, 0, other->entries);
-
- array->entries += other->entries;
- return 0;
-}
-
-static int json_array_equal(json_t *array1, json_t *array2)
-{
- size_t i, size;
-
- size = json_array_size(array1);
- if(size != json_array_size(array2))
- return 0;
-
- for(i = 0; i < size; i++)
- {
- json_t *value1, *value2;
-
- value1 = json_array_get(array1, i);
- value2 = json_array_get(array2, i);
-
- if(!json_equal(value1, value2))
- return 0;
- }
-
- return 1;
-}
-
-static json_t *json_array_copy(json_t *array)
-{
- json_t *result;
- size_t i;
-
- result = json_array();
- if(!result)
- return NULL;
-
- for(i = 0; i < json_array_size(array); i++)
- json_array_append(result, json_array_get(array, i));
-
- return result;
-}
-
-static json_t *json_array_deep_copy(const json_t *array)
-{
- json_t *result;
- size_t i;
-
- result = json_array();
- if(!result)
- return NULL;
-
- for(i = 0; i < json_array_size(array); i++)
- json_array_append_new(result, json_deep_copy(json_array_get(array, i)));
-
- return result;
-}
-
-/*** string ***/
-
-static json_t *string_create(const char *value, size_t len, int own)
-{
- char *v;
- json_string_t *string;
-
- if(!value)
- return NULL;
-
- if(own)
- v = (char *)value;
- else {
- v = jsonp_strndup(value, len);
- if(!v)
- return NULL;
- }
-
- string = jsonp_malloc(sizeof(json_string_t));
- if(!string) {
- if(!own)
- jsonp_free(v);
- return NULL;
- }
- json_init(&string->json, JSON_STRING);
- string->value = v;
- string->length = len;
-
- return &string->json;
-}
-
-json_t *json_string_nocheck(const char *value)
-{
- if(!value)
- return NULL;
-
- return string_create(value, strlen(value), 0);
-}
-
-json_t *json_stringn_nocheck(const char *value, size_t len)
-{
- return string_create(value, len, 0);
-}
-
-/* this is private; "steal" is not a public API concept */
-json_t *jsonp_stringn_nocheck_own(const char *value, size_t len)
-{
- return string_create(value, len, 1);
-}
-
-json_t *json_string(const char *value)
-{
- if(!value)
- return NULL;
-
- return json_stringn(value, strlen(value));
-}
-
-json_t *json_stringn(const char *value, size_t len)
-{
- if(!value || !utf8_check_string(value, len))
- return NULL;
-
- return json_stringn_nocheck(value, len);
-}
-
-const char *json_string_value(const json_t *json)
-{
- if(!json_is_string(json))
- return NULL;
-
- return json_to_string(json)->value;
-}
-
-size_t json_string_length(const json_t *json)
-{
- if(!json_is_string(json))
- return 0;
-
- return json_to_string(json)->length;
-}
-
-int json_string_set_nocheck(json_t *json, const char *value)
-{
- if(!value)
- return -1;
-
- return json_string_setn_nocheck(json, value, strlen(value));
-}
-
-int json_string_setn_nocheck(json_t *json, const char *value, size_t len)
-{
- char *dup;
- json_string_t *string;
-
- if(!json_is_string(json) || !value)
- return -1;
-
- dup = jsonp_strndup(value, len);
- if(!dup)
- return -1;
-
- string = json_to_string(json);
- jsonp_free(string->value);
- string->value = dup;
- string->length = len;
-
- return 0;
-}
-
-int json_string_set(json_t *json, const char *value)
-{
- if(!value)
- return -1;
-
- return json_string_setn(json, value, strlen(value));
-}
-
-int json_string_setn(json_t *json, const char *value, size_t len)
-{
- if(!value || !utf8_check_string(value, len))
- return -1;
-
- return json_string_setn_nocheck(json, value, len);
-}
-
-static void json_delete_string(json_string_t *string)
-{
- jsonp_free(string->value);
- jsonp_free(string);
-}
-
-static int json_string_equal(json_t *string1, json_t *string2)
-{
- json_string_t *s1, *s2;
-
- if(!json_is_string(string1) || !json_is_string(string2))
- return 0;
-
- s1 = json_to_string(string1);
- s2 = json_to_string(string2);
- return s1->length == s2->length && !memcmp(s1->value, s2->value, s1->length);
-}
-
-static json_t *json_string_copy(const json_t *string)
-{
- json_string_t *s;
-
- if(!json_is_string(string))
- return NULL;
-
- s = json_to_string(string);
- return json_stringn_nocheck(s->value, s->length);
-}
-
-
-/*** integer ***/
-
-json_t *json_integer(json_int_t value)
-{
- json_integer_t *integer = jsonp_malloc(sizeof(json_integer_t));
- if(!integer)
- return NULL;
- json_init(&integer->json, JSON_INTEGER);
-
- integer->value = value;
- return &integer->json;
-}
-
-json_int_t json_integer_value(const json_t *json)
-{
- if(!json_is_integer(json))
- return 0;
-
- return json_to_integer(json)->value;
-}
-
-int json_integer_set(json_t *json, json_int_t value)
-{
- if(!json_is_integer(json))
- return -1;
-
- json_to_integer(json)->value = value;
-
- return 0;
-}
-
-static void json_delete_integer(json_integer_t *integer)
-{
- jsonp_free(integer);
-}
-
-static int json_integer_equal(json_t *integer1, json_t *integer2)
-{
- return json_integer_value(integer1) == json_integer_value(integer2);
-}
-
-static json_t *json_integer_copy(const json_t *integer)
-{
- return json_integer(json_integer_value(integer));
-}
-
-
-/*** real ***/
-
-json_t *json_real(double value)
-{
- json_real_t *real;
-
- if(isnan(value) || isinf(value))
- return NULL;
-
- real = jsonp_malloc(sizeof(json_real_t));
- if(!real)
- return NULL;
- json_init(&real->json, JSON_REAL);
-
- real->value = value;
- return &real->json;
-}
-
-double json_real_value(const json_t *json)
-{
- if(!json_is_real(json))
- return 0;
-
- return json_to_real(json)->value;
-}
-
-int json_real_set(json_t *json, double value)
-{
- if(!json_is_real(json) || isnan(value) || isinf(value))
- return -1;
-
- json_to_real(json)->value = value;
-
- return 0;
-}
-
-static void json_delete_real(json_real_t *real)
-{
- jsonp_free(real);
-}
-
-static int json_real_equal(json_t *real1, json_t *real2)
-{
- return json_real_value(real1) == json_real_value(real2);
-}
-
-static json_t *json_real_copy(const json_t *real)
-{
- return json_real(json_real_value(real));
-}
-
-
-/*** number ***/
-
-double json_number_value(const json_t *json)
-{
- if(json_is_integer(json))
- return (double)json_integer_value(json);
- else if(json_is_real(json))
- return json_real_value(json);
- else
- return 0.0;
-}
-
-
-/*** simple values ***/
-
-json_t *json_true(void)
-{
- static json_t the_true = {JSON_TRUE, (size_t)-1};
- return &the_true;
-}
-
-
-json_t *json_false(void)
-{
- static json_t the_false = {JSON_FALSE, (size_t)-1};
- return &the_false;
-}
-
-
-json_t *json_null(void)
-{
- static json_t the_null = {JSON_NULL, (size_t)-1};
- return &the_null;
-}
-
-
-/*** deletion ***/
-
-void json_delete(json_t *json)
-{
- if (!json)
- return;
-
- switch(json_typeof(json)) {
- case JSON_OBJECT:
- json_delete_object(json_to_object(json));
- break;
- case JSON_ARRAY:
- json_delete_array(json_to_array(json));
- break;
- case JSON_STRING:
- json_delete_string(json_to_string(json));
- break;
- case JSON_INTEGER:
- json_delete_integer(json_to_integer(json));
- break;
- case JSON_REAL:
- json_delete_real(json_to_real(json));
- break;
- default:
- return;
- }
-
- /* json_delete is not called for true, false or null */
-}
-
-
-/*** equality ***/
-
-int json_equal(json_t *json1, json_t *json2)
-{
- if(!json1 || !json2)
- return 0;
-
- if(json_typeof(json1) != json_typeof(json2))
- return 0;
-
- /* this covers true, false and null as they are singletons */
- if(json1 == json2)
- return 1;
-
- switch(json_typeof(json1)) {
- case JSON_OBJECT:
- return json_object_equal(json1, json2);
- case JSON_ARRAY:
- return json_array_equal(json1, json2);
- case JSON_STRING:
- return json_string_equal(json1, json2);
- case JSON_INTEGER:
- return json_integer_equal(json1, json2);
- case JSON_REAL:
- return json_real_equal(json1, json2);
- default:
- return 0;
- }
-}
-
-
-/*** copying ***/
-
-json_t *json_copy(json_t *json)
-{
- if(!json)
- return NULL;
-
- switch(json_typeof(json)) {
- case JSON_OBJECT:
- return json_object_copy(json);
- case JSON_ARRAY:
- return json_array_copy(json);
- case JSON_STRING:
- return json_string_copy(json);
- case JSON_INTEGER:
- return json_integer_copy(json);
- case JSON_REAL:
- return json_real_copy(json);
- case JSON_TRUE:
- case JSON_FALSE:
- case JSON_NULL:
- return json;
- default:
- return NULL;
- }
-
- return NULL;
-}
-
-json_t *json_deep_copy(const json_t *json)
-{
- if(!json)
- return NULL;
-
- switch(json_typeof(json)) {
- case JSON_OBJECT:
- return json_object_deep_copy(json);
- case JSON_ARRAY:
- return json_array_deep_copy(json);
- /* for the rest of the types, deep copying doesn't differ from
- shallow copying */
- case JSON_STRING:
- return json_string_copy(json);
- case JSON_INTEGER:
- return json_integer_copy(json);
- case JSON_REAL:
- return json_real_copy(json);
- case JSON_TRUE:
- case JSON_FALSE:
- case JSON_NULL:
- return (json_t *)json;
- default:
- return NULL;
- }
-
- return NULL;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/.gitignore Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/Makefile.am Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/bin Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/bin/Makefile.am Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/bin/json_process.c Deleted

@@ -1,385 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <jansson.h>
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
- #endif
-
-#if _WIN32
-#include <io.h> /* for _setmode() */
-#include <fcntl.h> /* for _O_BINARY */
-
-static const char dir_sep = '\\';
-#else
-static const char dir_sep = '/';
-#endif
-
-
-struct config {
- int indent;
- int compact;
- int preserve_order;
- int ensure_ascii;
- int sort_keys;
- int strip;
- int use_env;
- int have_hashseed;
- int hashseed;
- int precision;
-} conf;
-
-#define l_isspace(c) ((c) == ' ' || (c) == '\n' || (c) == '\r' || (c) == '\t')
-
-/* Return a pointer to the first non-whitespace character of str.
- Modifies str so that all trailing whitespace characters are
- replaced by '\0'. */
-static const char *strip(char *str)
-{
- size_t length;
- char *result = str;
- while (*result && l_isspace(*result))
- result++;
-
- length = strlen(result);
- if (length == 0)
- return result;
-
- while (l_isspace(resultlength - 1))
- result--length = '\0';
-
- return result;
-}
-
-
-static char *loadfile(FILE *file)
-{
- long fsize, ret;
- char *buf;
-
- fseek(file, 0, SEEK_END);
- fsize = ftell(file);
- fseek(file, 0, SEEK_SET);
-
- buf = malloc(fsize+1);
- ret = fread(buf, 1, fsize, file);
- if (ret != fsize)
- exit(1);
- buffsize = '\0';
-
- return buf;
-}
-
-
-static void read_conf(FILE *conffile)
-{
- char *buffer, *line, *val;
-
- buffer = loadfile(conffile);
- for (line = strtok(buffer, "\r\n"); line; line = strtok(NULL, "\r\n")) {
- if (!strncmp(line, "export ", 7))
- continue;
- val = strchr(line, '=');
- if (!val) {
- printf("invalid configuration line\n");
- break;
- }
- *val++ = '\0';
-
- if (!strcmp(line, "JSON_INDENT"))
- conf.indent = atoi(val);
- if (!strcmp(line, "JSON_COMPACT"))
- conf.compact = atoi(val);
- if (!strcmp(line, "JSON_ENSURE_ASCII"))
- conf.ensure_ascii = atoi(val);
- if (!strcmp(line, "JSON_PRESERVE_ORDER"))
- conf.preserve_order = atoi(val);
- if (!strcmp(line, "JSON_SORT_KEYS"))
- conf.sort_keys = atoi(val);
- if (!strcmp(line, "JSON_REAL_PRECISION"))
- conf.precision = atoi(val);
- if (!strcmp(line, "STRIP"))
- conf.strip = atoi(val);
- if (!strcmp(line, "HASHSEED")) {
- conf.have_hashseed = 1;
- conf.hashseed = atoi(val);
- } else {
- conf.have_hashseed = 0;
- }
- }
-
- free(buffer);
-}
-
-
-static int cmpfile(const char *str, const char *path, const char *fname)
-{
- char filename1024, *buffer;
- int ret;
- FILE *file;
-
- sprintf(filename, "%s%c%s", path, dir_sep, fname);
- file = fopen(filename, "rb");
- if (!file) {
- if (conf.strip)
- strcat(filename, ".strip");
- else
- strcat(filename, ".normal");
- file = fopen(filename, "rb");
- }
- if (!file) {
- printf("Error: test result file could not be opened.\n");
- exit(1);
- }
-
- buffer = loadfile(file);
- if (strcmp(buffer, str) != 0)
- ret = 1;
- else
- ret = 0;
- free(buffer);
- fclose(file);
-
- return ret;
-}
-
-int use_conf(char *test_path)
-{
- int ret;
- size_t flags = 0;
- char filename1024, errstr1024;
- char *buffer;
- FILE *infile, *conffile;
- json_t *json;
- json_error_t error;
-
- sprintf(filename, "%s%cinput", test_path, dir_sep);
- if (!(infile = fopen(filename, "rb"))) {
- fprintf(stderr, "Could not open \"%s\"\n", filename);
- return 2;
- }
-
- sprintf(filename, "%s%cenv", test_path, dir_sep);
- conffile = fopen(filename, "rb");
- if (conffile) {
- read_conf(conffile);
- fclose(conffile);
- }
-
- if (conf.indent < 0 || conf.indent > 31) {
- fprintf(stderr, "invalid value for JSON_INDENT: %d\n", conf.indent);
- fclose(infile);
- return 2;
- }
- if (conf.indent)
- flags |= JSON_INDENT(conf.indent);
-
- if (conf.compact)
- flags |= JSON_COMPACT;
-
- if (conf.ensure_ascii)
- flags |= JSON_ENSURE_ASCII;
-
- if (conf.preserve_order)
- flags |= JSON_PRESERVE_ORDER;
-
- if (conf.sort_keys)
- flags |= JSON_SORT_KEYS;
-
- if (conf.precision < 0 || conf.precision > 31) {
- fprintf(stderr, "invalid value for JSON_REAL_PRECISION: %d\n",
- conf.precision);
- fclose(infile);
- return 2;
- }
- if (conf.precision)
- flags |= JSON_REAL_PRECISION(conf.precision);
-
- if (conf.have_hashseed)
- json_object_seed(conf.hashseed);
-
- if (conf.strip) {
- /* Load to memory, strip leading and trailing whitespace */
- buffer = loadfile(infile);
- json = json_loads(strip(buffer), 0, &error);
- free(buffer);
- }
- else
- json = json_loadf(infile, 0, &error);
-
- fclose(infile);
-
- if (!json) {
- sprintf(errstr, "%d %d %d\n%s\n",
- error.line, error.column, error.position,
- error.text);
-
- ret = cmpfile(errstr, test_path, "error");
- return ret;
- }
-
- buffer = json_dumps(json, flags);
- ret = cmpfile(buffer, test_path, "output");
- free(buffer);
- json_decref(json);
-
- return ret;
-}
-
-static int getenv_int(const char *name)
-{
- char *value, *end;
- long result;
-
- value = getenv(name);
- if(!value)
- return 0;
-
- result = strtol(value, &end, 10);
- if(*end != '\0')
- return 0;
-
- return (int)result;
-}
-
-int use_env()
-{
- int indent, precision;
- size_t flags = 0;
- json_t *json;
- json_error_t error;
-
- #ifdef _WIN32
- /* On Windows, set stdout and stderr to binary mode to avoid
- outputting DOS line terminators */
- _setmode(_fileno(stdout), _O_BINARY);
- _setmode(_fileno(stderr), _O_BINARY);
- #endif
-
- indent = getenv_int("JSON_INDENT");
- if(indent < 0 || indent > 31) {
- fprintf(stderr, "invalid value for JSON_INDENT: %d\n", indent);
- return 2;
- }
- if(indent > 0)
- flags |= JSON_INDENT(indent);
-
- if(getenv_int("JSON_COMPACT") > 0)
- flags |= JSON_COMPACT;
-
- if(getenv_int("JSON_ENSURE_ASCII"))
- flags |= JSON_ENSURE_ASCII;
-
- if(getenv_int("JSON_PRESERVE_ORDER"))
- flags |= JSON_PRESERVE_ORDER;
-
- if(getenv_int("JSON_SORT_KEYS"))
- flags |= JSON_SORT_KEYS;
-
- precision = getenv_int("JSON_REAL_PRECISION");
- if(precision < 0 || precision > 31) {
- fprintf(stderr, "invalid value for JSON_REAL_PRECISION: %d\n",
- precision);
- return 2;
- }
-
- if(getenv("HASHSEED"))
- json_object_seed(getenv_int("HASHSEED"));
-
- if(precision > 0)
- flags |= JSON_REAL_PRECISION(precision);
-
- if(getenv_int("STRIP")) {
- /* Load to memory, strip leading and trailing whitespace */
- size_t size = 0, used = 0;
- char *buffer = NULL, *buf_ck = NULL;
-
- while(1) {
- size_t count;
-
- size = (size == 0 ? 128 : size * 2);
- buf_ck = realloc(buffer, size);
- if(!buf_ck) {
- fprintf(stderr, "Unable to allocate %d bytes\n", (int)size);
- free(buffer);
- return 1;
- }
- buffer = buf_ck;
-
- count = fread(buffer + used, 1, size - used, stdin);
- if(count < size - used) {
- bufferused + count = '\0';
- break;
- }
- used += count;
- }
-
- json = json_loads(strip(buffer), 0, &error);
- free(buffer);
- }
- else
- json = json_loadf(stdin, 0, &error);
-
- if(!json) {
- fprintf(stderr, "%d %d %d\n%s\n",
- error.line, error.column,
- error.position, error.text);
- return 1;
- }
-
- json_dumpf(json, stdout, flags);
- json_decref(json);
-
- return 0;
-}
-
-int main(int argc, char *argv)
-{
- int i;
- char *test_path = NULL;
-
- #ifdef HAVE_SETLOCALE
- setlocale(LC_ALL, "");
- #endif
-
- if (argc < 2) {
- goto usage;
- }
-
- for (i = 1; i < argc; i++) {
- if (!strcmp(argvi, "--strip"))
- conf.strip = 1;
- else if (!strcmp(argvi, "--env"))
- conf.use_env = 1;
- else
- test_path = argvi;
- }
-
- if (conf.use_env)
- return use_env();
- else
- {
- if (!test_path)
- goto usage;
-
- return use_conf(test_path);
- }
-
-usage:
- fprintf(stderr, "argc =%d\n", argc);
- fprintf(stderr, "usage: %s --strip --env test_dir\n", argv0);
- return 2;
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/run-suites Deleted

@@ -1,50 +0,0 @@
-#!/bin/sh
-
-while  -n "$1" ; do
-    suite=$1
-    if  -x $top_srcdir/test/suites/$suite/run ; then
-        SUITES="$SUITES $suite"
-    else
-        echo "No such suite: $suite"
-        exit 1
-    fi
-    shift
-done
-
-if  -z "$SUITES" ; then
-    suitedirs=$top_srcdir/test/suites/*
-    for suitedir in $suitedirs; do
-        if  -d $suitedir ; then
-            SUITES="$SUITES `basename $suitedir`"
-        fi
-    done
-fi
-
- -z "$STOP"  && STOP=0
-
-suites_srcdir=$top_srcdir/test/suites
-suites_builddir=suites
-scriptdir=$top_srcdir/test/scripts
-logdir=logs
-bindir=bin
-export suites_srcdir suites_builddir scriptdir logdir bindir
-
-passed=0
-failed=0
-for suite in $SUITES; do
-    echo "Suite: $suite"
-    if $suites_srcdir/$suite/run $suite; then
-        passed=`expr $passed + 1`
-    else
-        failed=`expr $failed + 1`
-         $STOP -eq 1  && break
-    fi
-done
-
-if  $failed -gt 0 ; then
-    echo "$failed of `expr $passed + $failed` test suites failed"
-    exit 1
-else
-    echo "$passed test suites passed"
-    rm -rf $logdir
-fi

obs-studio-29.1.3.tar.xz/deps/jansson/test/scripts Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/scripts/run-tests.sh Deleted

@@ -1,100 +0,0 @@
-# Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
-#
-# Jansson is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-
-die() {
- echo "$1" >&2
- exit 1
-}
-
- -n "$1" || die "Usage: $0 suite-name"
- -n "$bindir" || die "Set bindir"
- -n "$logdir" || die "Set logdir"
- -n "$scriptdir" || die "Set scriptdir"
- -n "$suites_srcdir" || die "Set suites_srcdir"
- -n "$suites_builddir" || die "Set suites_builddir"
-
-json_process=$bindir/json_process
-
-suite_name=$1
-suite_srcdir=$suites_srcdir/$suite_name
-suite_builddir=$suites_builddir/$suite_name
-suite_log=$logdir/$suite_name
-
- -z "$VERBOSE" && VERBOSE=0
- -z "$STOP" && STOP=0
-
-. $scriptdir/valgrind.sh
-
-rm -rf $suite_log
-mkdir -p $suite_log
-
-for test_path in $suite_srcdir/*; do
- test_name=$(basename $test_path)
- test_builddir=$suite_builddir/$test_name
- test_log=$suite_log/$test_name
-
- "$test_name" = "run" && continue
- is_test || continue
-
- rm -rf $test_log
- mkdir -p $test_log
- if $VERBOSE -eq 1 ; then
- printf '%s... ' "$test_name"
- fi
-
- run_test
- case $? in
- 0)
- # Success
- if $VERBOSE -eq 1 ; then
- printf 'ok\n'
- else
- printf '.'
- fi
- rm -rf $test_log
- ;;
-
- 77)
- # Skip
- if $VERBOSE -eq 1 ; then
- printf 'skipped\n'
- else
- printf 'S'
- fi
- rm -rf $test_log
- ;;
-
- *)
- # Failure
- if $VERBOSE -eq 1 ; then
- printf 'FAILED\n'
- else
- printf 'F'
- fi
-
- $STOP -eq 1 && break
- ;;
- esac
-done
-
-if $VERBOSE -eq 0 ; then
- printf '\n'
-fi
-
-if -n "$(ls -A $suite_log)" ; then
- for test_log in $suite_log/*; do
- test_name=$(basename $test_log)
- test_path=$suite_srcdir/$test_name
- echo "================================================================="
- echo "$suite_name/$test_name"
- echo "================================================================="
- show_error
- echo
- done
- echo "================================================================="
- exit 1
-else
- rm -rf $suite_log
-fi

obs-studio-29.1.3.tar.xz/deps/jansson/test/scripts/valgrind.sh Deleted

@@ -1,35 +0,0 @@
-# Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
-#
-# Jansson is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-
- -z "$VALGRIND" && VALGRIND=0
-
-VALGRIND_CMDLINE="valgrind --leak-check=full --show-reachable=yes --track-origins=yes -q"
-
-if $VALGRIND -eq 1 ; then
- test_runner="$VALGRIND_CMDLINE"
- json_process="$VALGRIND_CMDLINE $json_process"
-else
- test_runner=""
-fi
-
-valgrind_check() {
- if $VALGRIND -eq 1 ; then
- # Check for Valgrind error output. The valgrind option
- # --error-exitcode is not enough because Valgrind doesn't
- # think unfreed allocs are errors.
- if grep -E -q '^==0-9+== ' $1; then
- touch $test_log/valgrind_error
- return 1
- fi
- fi
-}
-
-valgrind_show_error() {
- if $VALGRIND -eq 1 -a -f $test_log/valgrind_error ; then
- echo "valgrind detected an error"
- return 0
- fi
- return 1
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/.gitattributes Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/Makefile.am Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/Makefile.am Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/check-exports Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/run Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_array.c Deleted

@@ -1,432 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include "util.h"
-
-static void test_misc(void)
-{
- json_t *array, *five, *seven, *value;
- size_t i;
-
- array = json_array();
- five = json_integer(5);
- seven = json_integer(7);
-
- if(!array)
- fail("unable to create array");
- if(!five || !seven)
- fail("unable to create integer");
-
- if(json_array_size(array) != 0)
- fail("empty array has nonzero size");
-
- if(!json_array_append(array, NULL))
- fail("able to append NULL");
-
- if(json_array_append(array, five))
- fail("unable to append");
-
- if(json_array_size(array) != 1)
- fail("wrong array size");
-
- value = json_array_get(array, 0);
- if(!value)
- fail("unable to get item");
- if(value != five)
- fail("got wrong value");
-
- if(json_array_append(array, seven))
- fail("unable to append value");
-
- if(json_array_size(array) != 2)
- fail("wrong array size");
-
- value = json_array_get(array, 1);
- if(!value)
- fail("unable to get item");
- if(value != seven)
- fail("got wrong value");
-
- if(json_array_set(array, 0, seven))
- fail("unable to set value");
-
- if(!json_array_set(array, 0, NULL))
- fail("able to set NULL");
-
- if(json_array_size(array) != 2)
- fail("wrong array size");
-
- value = json_array_get(array, 0);
- if(!value)
- fail("unable to get item");
- if(value != seven)
- fail("got wrong value");
-
- if(json_array_get(array, 2) != NULL)
- fail("able to get value out of bounds");
-
- if(!json_array_set(array, 2, seven))
- fail("able to set value out of bounds");
-
- for(i = 2; i < 30; i++) {
- if(json_array_append(array, seven))
- fail("unable to append value");
-
- if(json_array_size(array) != i + 1)
- fail("wrong array size");
- }
-
- for(i = 0; i < 30; i++) {
- value = json_array_get(array, i);
- if(!value)
- fail("unable to get item");
- if(value != seven)
- fail("got wrong value");
- }
-
- if(json_array_set_new(array, 15, json_integer(123)))
- fail("unable to set new value");
-
- value = json_array_get(array, 15);
- if(!json_is_integer(value) || json_integer_value(value) != 123)
- fail("json_array_set_new works incorrectly");
-
- if(!json_array_set_new(array, 15, NULL))
- fail("able to set_new NULL value");
-
- if(json_array_append_new(array, json_integer(321)))
- fail("unable to append new value");
-
- value = json_array_get(array, json_array_size(array) - 1);
- if(!json_is_integer(value) || json_integer_value(value) != 321)
- fail("json_array_append_new works incorrectly");
-
- if(!json_array_append_new(array, NULL))
- fail("able to append_new NULL value");
-
- json_decref(five);
- json_decref(seven);
- json_decref(array);
-}
-
-static void test_insert(void)
-{
- json_t *array, *five, *seven, *eleven, *value;
- int i;
-
- array = json_array();
- five = json_integer(5);
- seven = json_integer(7);
- eleven = json_integer(11);
-
- if(!array)
- fail("unable to create array");
- if(!five || !seven || !eleven)
- fail("unable to create integer");
-
-
- if(!json_array_insert(array, 1, five))
- fail("able to insert value out of bounds");
-
-
- if(json_array_insert(array, 0, five))
- fail("unable to insert value in an empty array");
-
- if(json_array_get(array, 0) != five)
- fail("json_array_insert works incorrectly");
-
- if(json_array_size(array) != 1)
- fail("array size is invalid after insertion");
-
-
- if(json_array_insert(array, 1, seven))
- fail("unable to insert value at the end of an array");
-
- if(json_array_get(array, 0) != five)
- fail("json_array_insert works incorrectly");
-
- if(json_array_get(array, 1) != seven)
- fail("json_array_insert works incorrectly");
-
- if(json_array_size(array) != 2)
- fail("array size is invalid after insertion");
-
-
- if(json_array_insert(array, 1, eleven))
- fail("unable to insert value in the middle of an array");
-
- if(json_array_get(array, 0) != five)
- fail("json_array_insert works incorrectly");
-
- if(json_array_get(array, 1) != eleven)
- fail("json_array_insert works incorrectly");
-
- if(json_array_get(array, 2) != seven)
- fail("json_array_insert works incorrectly");
-
- if(json_array_size(array) != 3)
- fail("array size is invalid after insertion");
-
-
- if(json_array_insert_new(array, 2, json_integer(123)))
- fail("unable to insert value in the middle of an array");
-
- value = json_array_get(array, 2);
- if(!json_is_integer(value) || json_integer_value(value) != 123)
- fail("json_array_insert_new works incorrectly");
-
- if(json_array_size(array) != 4)
- fail("array size is invalid after insertion");
-
-
- for(i = 0; i < 20; i++) {
- if(json_array_insert(array, 0, seven))
- fail("unable to insert value at the begining of an array");
- }
-
- for(i = 0; i < 20; i++) {
- if(json_array_get(array, i) != seven)
- fail("json_aray_insert works incorrectly");
- }
-
- if(json_array_size(array) != 24)
- fail("array size is invalid after loop insertion");
-
- json_decref(five);
- json_decref(seven);
- json_decref(eleven);
- json_decref(array);
-}
-
-static void test_remove(void)
-{
- json_t *array, *five, *seven;
- int i;
-
- array = json_array();
- five = json_integer(5);
- seven = json_integer(7);
-
- if(!array)
- fail("unable to create array");
- if(!five)
- fail("unable to create integer");
- if(!seven)
- fail("unable to create integer");
-
-
- if(!json_array_remove(array, 0))
- fail("able to remove an unexisting index");
-
-
- if(json_array_append(array, five))
- fail("unable to append");
-
- if(!json_array_remove(array, 1))
- fail("able to remove an unexisting index");
-
- if(json_array_remove(array, 0))
- fail("unable to remove");
-
- if(json_array_size(array) != 0)
- fail("array size is invalid after removing");
-
-
- if(json_array_append(array, five) ||
- json_array_append(array, seven) ||
- json_array_append(array, five) ||
- json_array_append(array, seven))
- fail("unable to append");
-
- if(json_array_remove(array, 2))
- fail("unable to remove");
-
- if(json_array_size(array) != 3)
- fail("array size is invalid after removing");
-
- if(json_array_get(array, 0) != five ||
- json_array_get(array, 1) != seven ||
- json_array_get(array, 2) != seven)
- fail("remove works incorrectly");
-
- json_decref(array);
-
- array = json_array();
- for(i = 0; i < 4; i++) {
- json_array_append(array, five);
- json_array_append(array, seven);
- }
- if(json_array_size(array) != 8)
- fail("unable to append 8 items to array");
-
- /* Remove an element from a "full" array. */
- json_array_remove(array, 5);
-
- json_decref(five);
- json_decref(seven);
- json_decref(array);
-}
-
-static void test_clear(void)
-{
- json_t *array, *five, *seven;
- int i;
-
- array = json_array();
- five = json_integer(5);
- seven = json_integer(7);
-
- if(!array)
- fail("unable to create array");
- if(!five || !seven)
- fail("unable to create integer");
-
- for(i = 0; i < 10; i++) {
- if(json_array_append(array, five))
- fail("unable to append");
- }
- for(i = 0; i < 10; i++) {
- if(json_array_append(array, seven))
- fail("unable to append");
- }
-
- if(json_array_size(array) != 20)
- fail("array size is invalid after appending");
-
- if(json_array_clear(array))
- fail("unable to clear");
-
- if(json_array_size(array) != 0)
- fail("array size is invalid after clearing");
-
- json_decref(five);
- json_decref(seven);
- json_decref(array);
-}
-
-static void test_extend(void)
-{
- json_t *array1, *array2, *five, *seven;
- int i;
-
- array1 = json_array();
- array2 = json_array();
- five = json_integer(5);
- seven = json_integer(7);
-
- if(!array1 || !array2)
- fail("unable to create array");
- if(!five || !seven)
- fail("unable to create integer");
-
- for(i = 0; i < 10; i++) {
- if(json_array_append(array1, five))
- fail("unable to append");
- }
- for(i = 0; i < 10; i++) {
- if(json_array_append(array2, seven))
- fail("unable to append");
- }
-
- if(json_array_size(array1) != 10 || json_array_size(array2) != 10)
- fail("array size is invalid after appending");
-
- if(json_array_extend(array1, array2))
- fail("unable to extend");
-
- for(i = 0; i < 10; i++) {
- if(json_array_get(array1, i) != five)
- fail("invalid array contents after extending");
- }
- for(i = 10; i < 20; i++) {
- if(json_array_get(array1, i) != seven)
- fail("invalid array contents after extending");
- }
-
- json_decref(five);
- json_decref(seven);
- json_decref(array1);
- json_decref(array2);
-}
-
-static void test_circular()
-{
- json_t *array1, *array2;
-
- /* the simple cases are checked */
-
- array1 = json_array();
- if(!array1)
- fail("unable to create array");
-
- if(json_array_append(array1, array1) == 0)
- fail("able to append self");
-
- if(json_array_insert(array1, 0, array1) == 0)
- fail("able to insert self");
-
- if(json_array_append_new(array1, json_true()))
- fail("failed to append true");
-
- if(json_array_set(array1, 0, array1) == 0)
- fail("able to set self");
-
- json_decref(array1);
-
-
- /* create circular references */
-
- array1 = json_array();
- array2 = json_array();
- if(!array1 || !array2)
- fail("unable to create array");
-
- if(json_array_append(array1, array2) ||
- json_array_append(array2, array1))
- fail("unable to append");
-
- /* circularity is detected when dumping */
- if(json_dumps(array1, 0) != NULL)
- fail("able to dump circulars");
-
- /* decref twice to deal with the circular references */
- json_decref(array1);
- json_decref(array2);
- json_decref(array1);
-}
-
-static void test_array_foreach()
-{
- size_t index;
- json_t *array1, *array2, *value;
-
- array1 = json_pack("sisisi", "foo", 1, "bar", 2, "baz", 3);
- array2 = json_array();
-
- json_array_foreach(array1, index, value) {
- json_array_append(array2, value);
- }
- 
- if(!json_equal(array1, array2))
- fail("json_array_foreach failed to iterate all elements");
-
- json_decref(array1);
- json_decref(array2);
-}
-
-
-static void run_tests()
-{
- test_misc();
- test_insert();
- test_remove();
- test_clear();
- test_extend();
- test_circular();
- test_array_foreach();
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_copy.c Deleted

@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <string.h>
-#include <jansson.h>
-#include "util.h"
-
-static void test_copy_simple(void)
-{
- json_t *value, *copy;
-
- if(json_copy(NULL))
- fail("copying NULL doesn't return NULL");
-
- /* true */
- value = json_true();
- copy = json_copy(value);
- if(value != copy)
- fail("copying true failed");
- json_decref(value);
- json_decref(copy);
-
- /* false */
- value = json_false();
- copy = json_copy(value);
- if(value != copy)
- fail("copying false failed");
- json_decref(value);
- json_decref(copy);
-
- /* null */
- value = json_null();
- copy = json_copy(value);
- if(value != copy)
- fail("copying null failed");
- json_decref(value);
- json_decref(copy);
-
- /* string */
- value = json_string("foo");
- if(!value)
- fail("unable to create a string");
- copy = json_copy(value);
- if(!copy)
- fail("unable to copy a string");
- if(copy == value)
- fail("copying a string doesn't copy");
- if(!json_equal(copy, value))
- fail("copying a string produces an inequal copy");
- if(value->refcount != 1 || copy->refcount != 1)
- fail("invalid refcounts");
- json_decref(value);
- json_decref(copy);
-
- /* integer */
- value = json_integer(543);
- if(!value)
- fail("unable to create an integer");
- copy = json_copy(value);
- if(!copy)
- fail("unable to copy an integer");
- if(copy == value)
- fail("copying an integer doesn't copy");
- if(!json_equal(copy, value))
- fail("copying an integer produces an inequal copy");
- if(value->refcount != 1 || copy->refcount != 1)
- fail("invalid refcounts");
- json_decref(value);
- json_decref(copy);
-
- /* real */
- value = json_real(123e9);
- if(!value)
- fail("unable to create a real");
- copy = json_copy(value);
- if(!copy)
- fail("unable to copy a real");
- if(copy == value)
- fail("copying a real doesn't copy");
- if(!json_equal(copy, value))
- fail("copying a real produces an inequal copy");
- if(value->refcount != 1 || copy->refcount != 1)
- fail("invalid refcounts");
- json_decref(value);
- json_decref(copy);
-}
-
-static void test_deep_copy_simple(void)
-{
- json_t *value, *copy;
-
- if(json_deep_copy(NULL))
- fail("deep copying NULL doesn't return NULL");
-
- /* true */
- value = json_true();
- copy = json_deep_copy(value);
- if(value != copy)
- fail("deep copying true failed");
- json_decref(value);
- json_decref(copy);
-
- /* false */
- value = json_false();
- copy = json_deep_copy(value);
- if(value != copy)
- fail("deep copying false failed");
- json_decref(value);
- json_decref(copy);
-
- /* null */
- value = json_null();
- copy = json_deep_copy(value);
- if(value != copy)
- fail("deep copying null failed");
- json_decref(value);
- json_decref(copy);
-
- /* string */
- value = json_string("foo");
- if(!value)
- fail("unable to create a string");
- copy = json_deep_copy(value);
- if(!copy)
- fail("unable to deep copy a string");
- if(copy == value)
- fail("deep copying a string doesn't copy");
- if(!json_equal(copy, value))
- fail("deep copying a string produces an inequal copy");
- if(value->refcount != 1 || copy->refcount != 1)
- fail("invalid refcounts");
- json_decref(value);
- json_decref(copy);
-
- /* integer */
- value = json_integer(543);
- if(!value)
- fail("unable to create an integer");
- copy = json_deep_copy(value);
- if(!copy)
- fail("unable to deep copy an integer");
- if(copy == value)
- fail("deep copying an integer doesn't copy");
- if(!json_equal(copy, value))
- fail("deep copying an integer produces an inequal copy");
- if(value->refcount != 1 || copy->refcount != 1)
- fail("invalid refcounts");
- json_decref(value);
- json_decref(copy);
-
- /* real */
- value = json_real(123e9);
- if(!value)
- fail("unable to create a real");
- copy = json_deep_copy(value);
- if(!copy)
- fail("unable to deep copy a real");
- if(copy == value)
- fail("deep copying a real doesn't copy");
- if(!json_equal(copy, value))
- fail("deep copying a real produces an inequal copy");
- if(value->refcount != 1 || copy->refcount != 1)
- fail("invalid refcounts");
- json_decref(value);
- json_decref(copy);
-}
-
-static void test_copy_array(void)
-{
- const char *json_array_text = "1, \"foo\", 3.141592, {\"foo\": \"bar\"}";
-
- json_t *array, *copy;
- size_t i;
-
- array = json_loads(json_array_text, 0, NULL);
- if(!array)
- fail("unable to parse an array");
-
- copy = json_copy(array);
- if(!copy)
- fail("unable to copy an array");
- if(copy == array)
- fail("copying an array doesn't copy");
- if(!json_equal(copy, array))
- fail("copying an array produces an inequal copy");
-
- for(i = 0; i < json_array_size(copy); i++)
- {
- if(json_array_get(array, i) != json_array_get(copy, i))
- fail("copying an array modifies its elements");
- }
-
- json_decref(array);
- json_decref(copy);
-}
-
-static void test_deep_copy_array(void)
-{
- const char *json_array_text = "1, \"foo\", 3.141592, {\"foo\": \"bar\"}";
-
- json_t *array, *copy;
- size_t i;
-
- array = json_loads(json_array_text, 0, NULL);
- if(!array)
- fail("unable to parse an array");
-
- copy = json_deep_copy(array);
- if(!copy)
- fail("unable to deep copy an array");
- if(copy == array)
- fail("deep copying an array doesn't copy");
- if(!json_equal(copy, array))
- fail("deep copying an array produces an inequal copy");
-
- for(i = 0; i < json_array_size(copy); i++)
- {
- if(json_array_get(array, i) == json_array_get(copy, i))
- fail("deep copying an array doesn't copy its elements");
- }
-
- json_decref(array);
- json_decref(copy);
-}
-
-static void test_copy_object(void)
-{
- const char *json_object_text =
- "{\"foo\": \"bar\", \"a\": 1, \"b\": 3.141592, \"c\": 1,2,3,4}";
-
- const char *keys = {"foo", "a", "b", "c"};
- int i;
-
- json_t *object, *copy;
- void *iter;
-
- object = json_loads(json_object_text, 0, NULL);
- if(!object)
- fail("unable to parse an object");
-
- copy = json_copy(object);
- if(!copy)
- fail("unable to copy an object");
- if(copy == object)
- fail("copying an object doesn't copy");
- if(!json_equal(copy, object))
- fail("copying an object produces an inequal copy");
-
- i = 0;
- iter = json_object_iter(object);
- while(iter)
- {
- const char *key;
- json_t *value1, *value2;
-
- key = json_object_iter_key(iter);
- value1 = json_object_iter_value(iter);
- value2 = json_object_get(copy, key);
-
- if(value1 != value2)
- fail("copying an object modifies its items");
-
- if (strcmp(key, keysi) != 0)
- fail("copying an object doesn't preserve key order");
-
- iter = json_object_iter_next(object, iter);
- i++;
- }
-
- json_decref(object);
- json_decref(copy);
-}
-
-static void test_deep_copy_object(void)
-{
- const char *json_object_text =
- "{\"foo\": \"bar\", \"a\": 1, \"b\": 3.141592, \"c\": 1,2,3,4}";
-
- const char *keys = {"foo", "a", "b", "c"};
- int i;
-
- json_t *object, *copy;
- void *iter;
-
- object = json_loads(json_object_text, 0, NULL);
- if(!object)
- fail("unable to parse an object");
-
- copy = json_deep_copy(object);
- if(!copy)
- fail("unable to deep copy an object");
- if(copy == object)
- fail("deep copying an object doesn't copy");
- if(!json_equal(copy, object))
- fail("deep copying an object produces an inequal copy");
-
- i = 0;
- iter = json_object_iter(object);
- while(iter)
- {
- const char *key;
- json_t *value1, *value2;
-
- key = json_object_iter_key(iter);
- value1 = json_object_iter_value(iter);
- value2 = json_object_get(copy, key);
-
- if(value1 == value2)
- fail("deep copying an object doesn't copy its items");
-
- if (strcmp(key, keysi) != 0)
- fail("deep copying an object doesn't preserve key order");
-
- iter = json_object_iter_next(object, iter);
- i++;
- }
-
- json_decref(object);
- json_decref(copy);
-}
-
-static void run_tests()
-{
- test_copy_simple();
- test_deep_copy_simple();
- test_copy_array();
- test_deep_copy_array();
- test_copy_object();
- test_deep_copy_object();
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_dump.c Deleted

@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include <string.h>
-#include "util.h"
-
-static int encode_null_callback(const char *buffer, size_t size, void *data)
-{
- (void)buffer;
- (void)size;
- (void)data;
- return 0;
-}
-
-static void encode_null()
-{
- if(json_dumps(NULL, JSON_ENCODE_ANY) != NULL)
- fail("json_dumps didn't fail for NULL");
-
- if(json_dumpf(NULL, stderr, JSON_ENCODE_ANY) != -1)
- fail("json_dumpf didn't fail for NULL");
-
- /* Don't test json_dump_file to avoid creating a file */
-
- if(json_dump_callback(NULL, encode_null_callback, NULL, JSON_ENCODE_ANY) != -1)
- fail("json_dump_callback didn't fail for NULL");
-}
-
-
-static void encode_twice()
-{
- /* Encode an empty object/array, add an item, encode again */
-
- json_t *json;
- char *result;
-
- json = json_object();
- result = json_dumps(json, 0);
- if(!result || strcmp(result, "{}"))
- fail("json_dumps failed");
- free(result);
-
- json_object_set_new(json, "foo", json_integer(5));
- result = json_dumps(json, 0);
- if(!result || strcmp(result, "{\"foo\": 5}"))
- fail("json_dumps failed");
- free(result);
-
- json_decref(json);
-
- json = json_array();
- result = json_dumps(json, 0);
- if(!result || strcmp(result, ""))
- fail("json_dumps failed");
- free(result);
-
- json_array_append_new(json, json_integer(5));
- result = json_dumps(json, 0);
- if(!result || strcmp(result, "5"))
- fail("json_dumps failed");
- free(result);
-
- json_decref(json);
-}
-
-static void circular_references()
-{
- /* Construct a JSON object/array with a circular reference:
-
- object: {"a": {"b": {"c": <circular reference to $.a>}}}
- array: <circular reference to the $0 array>
-
- Encode it, remove the circular reference and encode again.
- */
-
- json_t *json;
- char *result;
-
- json = json_object();
- json_object_set_new(json, "a", json_object());
- json_object_set_new(json_object_get(json, "a"), "b", json_object());
- json_object_set(json_object_get(json_object_get(json, "a"), "b"), "c",
- json_object_get(json, "a"));
-
- if(json_dumps(json, 0))
- fail("json_dumps encoded a circular reference!");
-
- json_object_del(json_object_get(json_object_get(json, "a"), "b"), "c");
-
- result = json_dumps(json, 0);
- if(!result || strcmp(result, "{\"a\": {\"b\": {}}}"))
- fail("json_dumps failed!");
- free(result);
-
- json_decref(json);
-
- json = json_array();
- json_array_append_new(json, json_array());
- json_array_append_new(json_array_get(json, 0), json_array());
- json_array_append(json_array_get(json_array_get(json, 0), 0),
- json_array_get(json, 0));
-
- if(json_dumps(json, 0))
- fail("json_dumps encoded a circular reference!");
-
- json_array_remove(json_array_get(json_array_get(json, 0), 0), 0);
-
- result = json_dumps(json, 0);
- if(!result || strcmp(result, ""))
- fail("json_dumps failed!");
- free(result);
-
- json_decref(json);
-}
-
-static void encode_other_than_array_or_object()
-{
- /* Encoding anything other than array or object should only
- * succeed if the JSON_ENCODE_ANY flag is used */
-
- json_t *json;
- FILE *fp = NULL;
- char *result;
-
- json = json_string("foo");
- if(json_dumps(json, 0) != NULL)
- fail("json_dumps encoded a string!");
- if(json_dumpf(json, fp, 0) == 0)
- fail("json_dumpf encoded a string!");
-
- result = json_dumps(json, JSON_ENCODE_ANY);
- if(!result || strcmp(result, "\"foo\"") != 0)
- fail("json_dumps failed to encode a string with JSON_ENCODE_ANY");
-
- free(result);
- json_decref(json);
-
- json = json_integer(42);
- if(json_dumps(json, 0) != NULL)
- fail("json_dumps encoded an integer!");
- if(json_dumpf(json, fp, 0) == 0)
- fail("json_dumpf encoded an integer!");
-
- result = json_dumps(json, JSON_ENCODE_ANY);
- if(!result || strcmp(result, "42") != 0)
- fail("json_dumps failed to encode an integer with JSON_ENCODE_ANY");
-
- free(result);
- json_decref(json);
-
-
-}
-
-static void escape_slashes()
-{
- /* Test dump escaping slashes */
-
- json_t *json;
- char *result;
-
- json = json_object();
- json_object_set_new(json, "url", json_string("https://github.com/akheron/jansson"));
-
- result = json_dumps(json, 0);
- if(!result || strcmp(result, "{\"url\": \"https://github.com/akheron/jansson\"}"))
- fail("json_dumps failed to not escape slashes");
-
- free(result);
-
- result = json_dumps(json, JSON_ESCAPE_SLASH);
- if(!result || strcmp(result, "{\"url\": \"https:\\/\\/github.com\\/akheron\\/jansson\"}"))
- fail("json_dumps failed to escape slashes");
-
- free(result);
- json_decref(json);
-}
-
-static void encode_nul_byte()
-{
- json_t *json;
- char *result;
-
- json = json_stringn("nul byte \0 in string", 20);
- result = json_dumps(json, JSON_ENCODE_ANY);
- if(!result || memcmp(result, "\"nul byte \\u0000 in string\"", 27))
- fail("json_dumps failed to dump an embedded NUL byte");
-
- free(result);
- json_decref(json);
-}
-
-static void dump_file()
-{
- json_t *json;
- int result;
-
- result = json_dump_file(NULL, "", 0);
- if (result != -1)
- fail("json_dump_file succeeded with invalid args");
-
- json = json_object();
- result = json_dump_file(json, "json_dump_file.json", 0);
- if (result != 0)
- fail("json_dump_file failed");
-
- json_decref(json);
- remove("json_dump_file.json");
-}
-
-static void run_tests()
-{
- encode_null();
- encode_twice();
- circular_references();
- encode_other_than_array_or_object();
- escape_slashes();
- encode_nul_byte();
- dump_file();
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_dump_callback.c Deleted

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include <string.h>
-#include <stdlib.h>
-#include "util.h"
-
-struct my_sink {
- char *buf;
- size_t off;
- size_t cap;
-};
-
-static int my_writer(const char *buffer, size_t len, void *data) {
- struct my_sink *s = data;
- if (len > s->cap - s->off) {
- return -1;
- }
- memcpy(s->buf + s->off, buffer, len);
- s->off += len;
- return 0;
-}
-
-static void run_tests()
-{
- struct my_sink s;
- json_t *json;
- const char str = "\"A\", {\"B\": \"C\", \"e\": false}, 1, null, \"foo\"";
- char *dumped_to_string;
-
- json = json_loads(str, 0, NULL);
- if(!json) {
- fail("json_loads failed");
- }
-
- dumped_to_string = json_dumps(json, 0);
- if (!dumped_to_string) {
- json_decref(json);
- fail("json_dumps failed");
- }
-
- s.off = 0;
- s.cap = strlen(dumped_to_string);
- s.buf = malloc(s.cap);
- if (!s.buf) {
- json_decref(json);
- free(dumped_to_string);
- fail("malloc failed");
- }
-
- if (json_dump_callback(json, my_writer, &s, 0) == -1) {
- json_decref(json);
- free(dumped_to_string);
- free(s.buf);
- fail("json_dump_callback failed on an exact-length sink buffer");
- }
-
- if (strncmp(dumped_to_string, s.buf, s.off) != 0) {
- json_decref(json);
- free(dumped_to_string);
- free(s.buf);
- fail("json_dump_callback and json_dumps did not produce identical output");
- }
-
- s.off = 1;
- if (json_dump_callback(json, my_writer, &s, 0) != -1) {
- json_decref(json);
- free(dumped_to_string);
- free(s.buf);
- fail("json_dump_callback succeeded on a short buffer when it should have failed");
- }
-
- json_decref(json);
- free(dumped_to_string);
- free(s.buf);
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_equal.c Deleted

@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include "util.h"
-
-static void test_equal_simple()
-{
- json_t *value1, *value2;
-
- if(json_equal(NULL, NULL))
- fail("json_equal fails for two NULLs");
-
- value1 = json_true();
- if(json_equal(value1, NULL) || json_equal(NULL, value1))
- fail("json_equal fails for NULL");
-
- /* this covers true, false and null as they are singletons */
- if(!json_equal(value1, value1))
- fail("identical objects are not equal");
- json_decref(value1);
-
- /* integer */
- value1 = json_integer(1);
- value2 = json_integer(1);
- if(!value1 || !value2)
- fail("unable to create integers");
- if(!json_equal(value1, value2))
- fail("json_equal fails for two equal integers");
- json_decref(value2);
-
- value2 = json_integer(2);
- if(!value2)
- fail("unable to create an integer");
- if(json_equal(value1, value2))
- fail("json_equal fails for two inequal integers");
-
- json_decref(value1);
- json_decref(value2);
-
- /* real */
- value1 = json_real(1.2);
- value2 = json_real(1.2);
- if(!value1 || !value2)
- fail("unable to create reals");
- if(!json_equal(value1, value2))
- fail("json_equal fails for two equal reals");
- json_decref(value2);
-
- value2 = json_real(3.141592);
- if(!value2)
- fail("unable to create an real");
- if(json_equal(value1, value2))
- fail("json_equal fails for two inequal reals");
-
- json_decref(value1);
- json_decref(value2);
-
- /* string */
- value1 = json_string("foo");
- value2 = json_string("foo");
- if(!value1 || !value2)
- fail("unable to create strings");
- if(!json_equal(value1, value2))
- fail("json_equal fails for two equal strings");
- json_decref(value2);
-
- value2 = json_string("bar");
- if(!value2)
- fail("unable to create an string");
- if(json_equal(value1, value2))
- fail("json_equal fails for two inequal strings");
-
- json_decref(value1);
- json_decref(value2);
-}
-
-static void test_equal_array()
-{
- json_t *array1, *array2;
-
- array1 = json_array();
- array2 = json_array();
- if(!array1 || !array2)
- fail("unable to create arrays");
-
- if(!json_equal(array1, array2))
- fail("json_equal fails for two empty arrays");
-
- json_array_append_new(array1, json_integer(1));
- json_array_append_new(array2, json_integer(1));
- json_array_append_new(array1, json_string("foo"));
- json_array_append_new(array2, json_string("foo"));
- json_array_append_new(array1, json_integer(2));
- json_array_append_new(array2, json_integer(2));
- if(!json_equal(array1, array2))
- fail("json_equal fails for two equal arrays");
-
- json_array_remove(array2, 2);
- if(json_equal(array1, array2))
- fail("json_equal fails for two inequal arrays");
-
- json_array_append_new(array2, json_integer(3));
- if(json_equal(array1, array2))
- fail("json_equal fails for two inequal arrays");
-
- json_decref(array1);
- json_decref(array2);
-}
-
-static void test_equal_object()
-{
- json_t *object1, *object2;
-
- object1 = json_object();
- object2 = json_object();
- if(!object1 || !object2)
- fail("unable to create objects");
-
- if(!json_equal(object1, object2))
- fail("json_equal fails for two empty objects");
-
- json_object_set_new(object1, "a", json_integer(1));
- json_object_set_new(object2, "a", json_integer(1));
- json_object_set_new(object1, "b", json_string("foo"));
- json_object_set_new(object2, "b", json_string("foo"));
- json_object_set_new(object1, "c", json_integer(2));
- json_object_set_new(object2, "c", json_integer(2));
- if(!json_equal(object1, object2))
- fail("json_equal fails for two equal objects");
-
- json_object_del(object2, "c");
- if(json_equal(object1, object2))
- fail("json_equal fails for two inequal objects");
-
- json_object_set_new(object2, "c", json_integer(3));
- if(json_equal(object1, object2))
- fail("json_equal fails for two inequal objects");
-
- json_object_del(object2, "c");
- json_object_set_new(object2, "d", json_integer(2));
- if(json_equal(object1, object2))
- fail("json_equal fails for two inequal objects");
-
- json_decref(object1);
- json_decref(object2);
-}
-
-static void test_equal_complex()
-{
- json_t *value1, *value2;
-
- const char *complex_json =
-"{"
-" \"integer\": 1, "
-" \"real\": 3.141592, "
-" \"string\": \"foobar\", "
-" \"true\": true, "
-" \"object\": {"
-" \"array-in-object\": 1,true,\"foo\",{},"
-" \"object-in-object\": {\"foo\": \"bar\"}"
-" },"
-" \"array\": \"foo\", false, null, 1.234"
-"}";
-
- value1 = json_loads(complex_json, 0, NULL);
- value2 = json_loads(complex_json, 0, NULL);
- if(!value1 || !value2)
- fail("unable to parse JSON");
- if(!json_equal(value1, value2))
- fail("json_equal fails for two inequal strings");
-
- json_decref(value1);
- json_decref(value2);
-
- /* TODO: There's no negative test case here */
-}
-
-static void run_tests()
-{
- test_equal_simple();
- test_equal_array();
- test_equal_object();
- test_equal_complex();
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_load.c Deleted

@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include <string.h>
-#include "util.h"
-
-static void file_not_found()
-{
- json_t *json;
- json_error_t error;
- char *pos;
-
- json = json_load_file("/path/to/nonexistent/file.json", 0, &error);
- if(json)
- fail("json_load_file returned non-NULL for a nonexistent file");
- if(error.line != -1)
- fail("json_load_file returned an invalid line number");
-
- /* The error message is locale specific, only check the beginning
- of the error message. */
-
- pos = strchr(error.text, ':');
- if(!pos)
- fail("json_load_file returne an invalid error message");
-
- *pos = '\0';
-
- if(strcmp(error.text, "unable to open /path/to/nonexistent/file.json") != 0)
- fail("json_load_file returned an invalid error message");
-}
-
-static void very_long_file_name() {
- json_t *json;
- json_error_t error;
-
- json = json_load_file("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 0, &error);
- if(json)
- fail("json_load_file returned non-NULL for a nonexistent file");
- if(error.line != -1)
- fail("json_load_file returned an invalid line number");
-
- if (strncmp(error.source, "...aaa", 6) != 0)
- fail("error source was set incorrectly");
-}
-
-static void reject_duplicates()
-{
- json_error_t error;
-
- if(json_loads("{\"foo\": 1, \"foo\": 2}", JSON_REJECT_DUPLICATES, &error))
- fail("json_loads did not detect a duplicate key");
- check_error("duplicate object key near '\"foo\"'", "<string>", 1, 16, 16);
-}
-
-static void disable_eof_check()
-{
- json_error_t error;
- json_t *json;
-
- const char *text = "{\"foo\": 1} garbage";
-
- if(json_loads(text, 0, &error))
- fail("json_loads did not detect garbage after JSON text");
- check_error("end of file expected near 'garbage'", "<string>", 1, 18, 18);
-
- json = json_loads(text, JSON_DISABLE_EOF_CHECK, &error);
- if(!json)
- fail("json_loads failed with JSON_DISABLE_EOF_CHECK");
-
- json_decref(json);
-}
-
-static void decode_any()
-{
- json_t *json;
- json_error_t error;
-
- json = json_loads("\"foo\"", JSON_DECODE_ANY, &error);
- if (!json || !json_is_string(json))
- fail("json_load decoded any failed - string");
- json_decref(json);
-
- json = json_loads("42", JSON_DECODE_ANY, &error);
- if (!json || !json_is_integer(json))
- fail("json_load decoded any failed - integer");
- json_decref(json);
-
- json = json_loads("true", JSON_DECODE_ANY, &error);
- if (!json || !json_is_true(json))
- fail("json_load decoded any failed - boolean");
- json_decref(json);
-
- json = json_loads("null", JSON_DECODE_ANY, &error);
- if (!json || !json_is_null(json))
- fail("json_load decoded any failed - null");
- json_decref(json);
-}
-
-static void decode_int_as_real()
-{
- json_t *json;
- json_error_t error;
-
-#if JSON_INTEGER_IS_LONG_LONG
- const char *imprecise;
- json_int_t expected;
-#endif
-
- char big311;
-
- json = json_loads("42", JSON_DECODE_INT_AS_REAL | JSON_DECODE_ANY, &error);
- if (!json || !json_is_real(json) || json_real_value(json) != 42.0)
- fail("json_load decode int as real failed - int");
- json_decref(json);
-
-#if JSON_INTEGER_IS_LONG_LONG
- /* This number cannot be represented exactly by a double */
- imprecise = "9007199254740993";
- expected = 9007199254740992ll;
-
- json = json_loads(imprecise, JSON_DECODE_INT_AS_REAL | JSON_DECODE_ANY,
- &error);
- if (!json || !json_is_real(json) || expected != (json_int_t)json_real_value(json))
- fail("json_load decode int as real failed - expected imprecision");
- json_decref(json);
-#endif
-
- /* 1E309 overflows. Here we create 1E309 as a decimal number, i.e.
- 1000...(309 zeroes)...0. */
- big0 = '1';
- memset(big + 1, '0', 309);
- big310 = '\0';
-
- json = json_loads(big, JSON_DECODE_INT_AS_REAL | JSON_DECODE_ANY, &error);
- if (json || strcmp(error.text, "real number overflow") != 0)
- fail("json_load decode int as real failed - expected overflow");
- json_decref(json);
-
-}
-
-static void allow_nul()
-{
- const char *text = "\"nul byte \\u0000 in string\"";
- const char *expected = "nul byte \0 in string";
- size_t len = 20;
- json_t *json;
-
- json = json_loads(text, JSON_ALLOW_NUL | JSON_DECODE_ANY, NULL);
- if(!json || !json_is_string(json))
- fail("unable to decode embedded NUL byte");
-
- if(json_string_length(json) != len)
- fail("decoder returned wrong string length");
-
- if(memcmp(json_string_value(json), expected, len + 1))
- fail("decoder returned wrong string content");
-
- json_decref(json);
-}
-
-static void load_wrong_args()
-{
- json_t *json;
- json_error_t error;
-
- json = json_loads(NULL, 0, &error);
- if (json)
- fail("json_loads should return NULL if the first argument is NULL");
-
- json = json_loadb(NULL, 0, 0, &error);
- if (json)
- fail("json_loadb should return NULL if the first argument is NULL");
-
- json = json_loadf(NULL, 0, &error);
- if (json)
- fail("json_loadf should return NULL if the first argument is NULL");
-
- json = json_load_file(NULL, 0, &error);
- if (json)
- fail("json_loadf should return NULL if the first argument is NULL");
-}
-
-static void position()
-{
- json_t *json;
- size_t flags = JSON_DISABLE_EOF_CHECK;
- json_error_t error;
-
- json = json_loads("{\"foo\": \"bar\"}", 0, &error);
- if(error.position != 14)
- fail("json_loads returned a wrong position");
- json_decref(json);
-
- json = json_loads("{\"foo\": \"bar\"} baz quux", flags, &error);
- if(error.position != 14)
- fail("json_loads returned a wrong position");
- json_decref(json);
-}
-
-static void run_tests()
-{
- file_not_found();
- very_long_file_name();
- reject_duplicates();
- disable_eof_check();
- decode_any();
- decode_int_as_real();
- allow_nul();
- load_wrong_args();
- position();
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_load_callback.c Deleted

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2009-2011 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include <string.h>
-#include <stdlib.h>
-#include "util.h"
-
-struct my_source {
- const char *buf;
- size_t off;
- size_t cap;
-};
-
-static const char my_str = "\"A\", {\"B\": \"C\", \"e\": false}, 1, null, \"foo\"";
-
-static size_t greedy_reader(void *buf, size_t buflen, void *arg)
-{
- struct my_source *s = arg;
- if (buflen > s->cap - s->off)
- buflen = s->cap - s->off;
- if (buflen > 0) {
- memcpy(buf, s->buf + s->off, buflen);
- s->off += buflen;
- return buflen;
- } else {
- return 0;
- }
-}
-
-static void run_tests()
-{
- struct my_source s;
- json_t *json;
- json_error_t error;
-
- s.off = 0;
- s.cap = strlen(my_str);
- s.buf = my_str;
-
- json = json_load_callback(greedy_reader, &s, 0, &error);
-
- if (!json)
- fail("json_load_callback failed on a valid callback");
- json_decref(json);
-
- s.off = 0;
- s.cap = strlen(my_str) - 1;
- s.buf = my_str;
-
- json = json_load_callback(greedy_reader, &s, 0, &error);
- if (json) {
- json_decref(json);
- fail("json_load_callback should have failed on an incomplete stream, but it didn't");
- }
- if (strcmp(error.source, "<callback>") != 0) {
- fail("json_load_callback returned an invalid error source");
- }
- if (strcmp(error.text, "'' expected near end of file") != 0) {
- fail("json_load_callback returned an invalid error message for an unclosed top-level array");
- }
-
- json = json_load_callback(NULL, NULL, 0, &error);
- if (json) {
- json_decref(json);
- fail("json_load_callback should have failed on NULL load callback, but it didn't");
- }
- if (strcmp(error.text, "wrong arguments") != 0) {
- fail("json_load_callback returned an invalid error message for a NULL load callback");
- }
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_loadb.c Deleted

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include <string.h>
-#include "util.h"
-
-static void run_tests()
-{
- json_t *json;
- json_error_t error;
- const char str = "\"A\", {\"B\": \"C\"}, 1, 2, 3garbage";
- size_t len = strlen(str) - strlen("garbage");
-
- json = json_loadb(str, len, 0, &error);
- if(!json) {
- fail("json_loadb failed on a valid JSON buffer");
- }
- json_decref(json);
-
- json = json_loadb(str, len - 1, 0, &error);
- if (json) {
- json_decref(json);
- fail("json_loadb should have failed on an incomplete buffer, but it didn't");
- }
- if(error.line != 1) {
- fail("json_loadb returned an invalid line number on fail");
- }
- if(strcmp(error.text, "'' expected near end of file") != 0) {
- fail("json_loadb returned an invalid error message for an unclosed top-level array");
- }
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_memory_funcs.c Deleted

@@ -1,130 +0,0 @@
-#include <string.h>
-#include <jansson.h>
-
-#include "util.h"
-
-static int malloc_called = 0;
-static int free_called = 0;
-static size_t malloc_used = 0;
-
-/* helpers */
-static void create_and_free_complex_object()
-{
- json_t *obj;
-
- obj = json_pack("{s:i,s:n,s:b,s:b,s:{s:s},s:i,i,i}",
- "foo", 42,
- "bar",
- "baz", 1,
- "qux", 0,
- "alice", "bar", "baz",
- "bob", 9, 8, 7);
-
- json_decref(obj);
-}
-
-static void create_and_free_object_with_oom()
-{
- int i;
- char key4;
- json_t *obj = json_object();
-
- for (i = 0; i < 10; i++)
- {
- snprintf(key, sizeof key, "%d", i);
- json_object_set_new(obj, key, json_integer(i));
- }
-
- json_decref(obj);
-}
-
-static void *my_malloc(size_t size)
-{
- malloc_called = 1;
- return malloc(size);
-}
-
-static void my_free(void *ptr)
-{
- free_called = 1;
- free(ptr);
-}
-
-static void test_simple()
-{
- json_malloc_t mfunc = NULL;
- json_free_t ffunc = NULL;
-
- json_set_alloc_funcs(my_malloc, my_free);
- json_get_alloc_funcs(&mfunc, &ffunc);
- create_and_free_complex_object();
-
- if (malloc_called != 1 || free_called != 1
- || mfunc != my_malloc || ffunc != my_free)
- fail("Custom allocation failed");
-}
-
-
-static void *oom_malloc(size_t size)
-{
- if (malloc_used + size > 800)
- return NULL;
-
- malloc_used += size;
- return malloc(size);
-}
-
-static void oom_free(void *ptr)
-{
- free_called++;
- free(ptr);
-}
-
-static void test_oom()
-{
- free_called = 0;
- json_set_alloc_funcs(oom_malloc, oom_free);
- create_and_free_object_with_oom();
-
- if (free_called == 0)
- fail("Allocation with OOM failed");
-}
-
-
-/*
- Test the secure memory functions code given in the API reference
- documentation, but by using plain memset instead of
- guaranteed_memset().
-*/
-
-static void *secure_malloc(size_t size)
-{
- /* Store the memory area size in the beginning of the block */
- void *ptr = malloc(size + 8);
- *((size_t *)ptr) = size;
- return (char *)ptr + 8;
-}
-
-static void secure_free(void *ptr)
-{
- size_t size;
-
- ptr = (char *)ptr - 8;
- size = *((size_t *)ptr);
-
- /*guaranteed_*/memset(ptr, 0, size + 8);
- free(ptr);
-}
-
-static void test_secure_funcs(void)
-{
- json_set_alloc_funcs(secure_malloc, secure_free);
- create_and_free_complex_object();
-}
-
-static void run_tests()
-{
- test_simple();
- test_secure_funcs();
- test_oom();
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_number.c Deleted

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <math.h>
-#include <jansson.h>
-#include "util.h"
-
-#ifdef INFINITY
-// This test triggers "warning C4756: overflow in constant arithmetic"
-// in Visual Studio. This warning is triggered here by design, so disable it.
-// (This can only be done on function level so we keep these tests separate)
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning (disable: 4756)
-#endif
-static void test_inifity()
-{
- json_t *real = json_real(INFINITY);
- if (real != NULL)
- fail("could construct a real from Inf");
-
- real = json_real(1.0);
- if (json_real_set(real, INFINITY) != -1)
-	 fail("could set a real to Inf");
-
- if (json_real_value(real) != 1.0)
- fail("real value changed unexpectedly");
-
- json_decref(real);
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-}
-#endif // INFINITY
-
-static void run_tests()
-{
- json_t *integer, *real;
- json_int_t i;
- double d;
-
- integer = json_integer(5);
- real = json_real(100.1);
-
- if(!integer)
- fail("unable to create integer");
- if(!real)
- fail("unable to create real");
-
- i = json_integer_value(integer);
- if(i != 5)
- fail("wrong integer value");
-
- d = json_real_value(real);
- if(d != 100.1)
- fail("wrong real value");
-
- d = json_number_value(integer);
- if(d != 5.0)
- fail("wrong number value");
- d = json_number_value(real);
- if(d != 100.1)
- fail("wrong number value");
-
- json_decref(integer);
- json_decref(real);
-
-#ifdef NAN
- real = json_real(NAN);
- if(real != NULL)
- fail("could construct a real from NaN");
-
- real = json_real(1.0);
- if(json_real_set(real, NAN) != -1)
- fail("could set a real to NaN");
-
- if(json_real_value(real) != 1.0)
- fail("real value changed unexpectedly");
-
- json_decref(real);
-#endif
-
-#ifdef INFINITY
- test_inifity();
-#endif
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_object.c Deleted

@@ -1,555 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <jansson.h>
-#include <string.h>
-#include "util.h"
-
-static void test_clear()
-{
- json_t *object, *ten;
-
- object = json_object();
- ten = json_integer(10);
-
- if(!object)
- fail("unable to create object");
- if(!ten)
- fail("unable to create integer");
-
- if(json_object_set(object, "a", ten) ||
- json_object_set(object, "b", ten) ||
- json_object_set(object, "c", ten) ||
- json_object_set(object, "d", ten) ||
- json_object_set(object, "e", ten))
- fail("unable to set value");
-
- if(json_object_size(object) != 5)
- fail("invalid size");
-
- json_object_clear(object);
-
- if(json_object_size(object) != 0)
- fail("invalid size after clear");
-
- json_decref(ten);
- json_decref(object);
-}
-
-static void test_update()
-{
- json_t *object, *other, *nine, *ten;
-
- object = json_object();
- other = json_object();
-
- nine = json_integer(9);
- ten = json_integer(10);
-
- if(!object || !other)
- fail("unable to create object");
- if(!nine || !ten)
- fail("unable to create integer");
-
-
- /* update an empty object with an empty object */
-
- if(json_object_update(object, other))
- fail("unable to update an emtpy object with an empty object");
-
- if(json_object_size(object) != 0)
- fail("invalid size after update");
-
- if(json_object_size(other) != 0)
- fail("invalid size for updater after update");
-
-
- /* update an empty object with a nonempty object */
-
- if(json_object_set(other, "a", ten) ||
- json_object_set(other, "b", ten) ||
- json_object_set(other, "c", ten) ||
- json_object_set(other, "d", ten) ||
- json_object_set(other, "e", ten))
- fail("unable to set value");
-
- if(json_object_update(object, other))
- fail("unable to update an empty object");
-
- if(json_object_size(object) != 5)
- fail("invalid size after update");
-
- if(json_object_get(object, "a") != ten ||
- json_object_get(object, "b") != ten ||
- json_object_get(object, "c") != ten ||
- json_object_get(object, "d") != ten ||
- json_object_get(object, "e") != ten)
- fail("update works incorrectly");
-
-
- /* perform the same update again */
-
- if(json_object_update(object, other))
- fail("unable to update a non-empty object");
-
- if(json_object_size(object) != 5)
- fail("invalid size after update");
-
- if(json_object_get(object, "a") != ten ||
- json_object_get(object, "b") != ten ||
- json_object_get(object, "c") != ten ||
- json_object_get(object, "d") != ten ||
- json_object_get(object, "e") != ten)
- fail("update works incorrectly");
-
-
- /* update a nonempty object with a nonempty object with both old
- and new keys */
-
- if(json_object_clear(other))
- fail("clear failed");
-
- if(json_object_set(other, "a", nine) ||
- json_object_set(other, "b", nine) ||
- json_object_set(other, "f", nine) ||
- json_object_set(other, "g", nine) ||
- json_object_set(other, "h", nine))
- fail("unable to set value");
-
- if(json_object_update(object, other))
- fail("unable to update a nonempty object");
-
- if(json_object_size(object) != 8)
- fail("invalid size after update");
-
- if(json_object_get(object, "a") != nine ||
- json_object_get(object, "b") != nine ||
- json_object_get(object, "f") != nine ||
- json_object_get(object, "g") != nine ||
- json_object_get(object, "h") != nine)
- fail("update works incorrectly");
-
- json_decref(nine);
- json_decref(ten);
- json_decref(other);
- json_decref(object);
-}
-
-static void test_set_many_keys()
-{
- json_t *object, *value;
- const char *keys = "abcdefghijklmnopqrstuvwxyz";
- char buf2;
- size_t i;
-
- object = json_object();
- if (!object)
- fail("unable to create object");
-
- value = json_string("a");
- if (!value)
- fail("unable to create string");
-
- buf1 = '\0';
- for (i = 0; i < strlen(keys); i++) {
- buf0 = keysi;
- if (json_object_set(object, buf, value))
- fail("unable to set object key");
- }
-
- json_decref(object);
- json_decref(value);
-}
-
-static void test_conditional_updates()
-{
- json_t *object, *other;
-
- object = json_pack("{sisi}", "foo", 1, "bar", 2);
- other = json_pack("{sisi}", "foo", 3, "baz", 4);
-
- if(json_object_update_existing(object, other))
- fail("json_object_update_existing failed");
-
- if(json_object_size(object) != 2)
- fail("json_object_update_existing added new items");
-
- if(json_integer_value(json_object_get(object, "foo")) != 3)
- fail("json_object_update_existing failed to update existing key");
-
- if(json_integer_value(json_object_get(object, "bar")) != 2)
- fail("json_object_update_existing updated wrong key");
-
- json_decref(object);
-
- object = json_pack("{sisi}", "foo", 1, "bar", 2);
-
- if(json_object_update_missing(object, other))
- fail("json_object_update_missing failed");
-
- if(json_object_size(object) != 3)
- fail("json_object_update_missing didn't add new items");
-
- if(json_integer_value(json_object_get(object, "foo")) != 1)
- fail("json_object_update_missing updated existing key");
-
- if(json_integer_value(json_object_get(object, "bar")) != 2)
- fail("json_object_update_missing updated wrong key");
-
- if(json_integer_value(json_object_get(object, "baz")) != 4)
- fail("json_object_update_missing didn't add new items");
-
- json_decref(object);
- json_decref(other);
-}
-
-static void test_circular()
-{
- json_t *object1, *object2;
-
- object1 = json_object();
- object2 = json_object();
- if(!object1 || !object2)
- fail("unable to create object");
-
- /* the simple case is checked */
- if(json_object_set(object1, "a", object1) == 0)
- fail("able to set self");
-
- /* create circular references */
- if(json_object_set(object1, "a", object2) ||
- json_object_set(object2, "a", object1))
- fail("unable to set value");
-
- /* circularity is detected when dumping */
- if(json_dumps(object1, 0) != NULL)
- fail("able to dump circulars");
-
- /* decref twice to deal with the circular references */
- json_decref(object1);
- json_decref(object2);
- json_decref(object1);
-}
-
-static void test_set_nocheck()
-{
- json_t *object, *string;
-
- object = json_object();
- string = json_string("bar");
-
- if(!object)
- fail("unable to create object");
- if(!string)
- fail("unable to create string");
-
- if(json_object_set_nocheck(object, "foo", string))
- fail("json_object_set_nocheck failed");
- if(json_object_get(object, "foo") != string)
- fail("json_object_get after json_object_set_nocheck failed");
-
- /* invalid UTF-8 in key */
- if(json_object_set_nocheck(object, "a\xefz", string))
- fail("json_object_set_nocheck failed for invalid UTF-8");
- if(json_object_get(object, "a\xefz") != string)
- fail("json_object_get after json_object_set_nocheck failed");
-
- if(json_object_set_new_nocheck(object, "bax", json_integer(123)))
- fail("json_object_set_new_nocheck failed");
- if(json_integer_value(json_object_get(object, "bax")) != 123)
- fail("json_object_get after json_object_set_new_nocheck failed");
-
- /* invalid UTF-8 in key */
- if(json_object_set_new_nocheck(object, "asdf\xfe", json_integer(321)))
- fail("json_object_set_new_nocheck failed for invalid UTF-8");
- if(json_integer_value(json_object_get(object, "asdf\xfe")) != 321)
- fail("json_object_get after json_object_set_new_nocheck failed");
-
- json_decref(string);
- json_decref(object);
-}
-
-static void test_iterators()
-{
- json_t *object, *foo, *bar, *baz;
- void *iter;
-
- if(json_object_iter(NULL))
- fail("able to iterate over NULL");
-
- if(json_object_iter_next(NULL, NULL))
- fail("able to increment an iterator on a NULL object");
-
- object = json_object();
- foo = json_string("foo");
- bar = json_string("bar");
- baz = json_string("baz");
- if(!object || !foo || !bar || !baz)
- fail("unable to create values");
-
- if(json_object_iter_next(object, NULL))
- fail("able to increment a NULL iterator");
-
- if(json_object_set(object, "a", foo) ||
- json_object_set(object, "b", bar) ||
- json_object_set(object, "c", baz))
- fail("unable to populate object");
-
- iter = json_object_iter(object);
- if(!iter)
- fail("unable to get iterator");
- if (strcmp(json_object_iter_key(iter), "a") != 0)
- fail("iterating doesn't yield keys in order");
- if (json_object_iter_value(iter) != foo)
- fail("iterating doesn't yield values in order");
-
- iter = json_object_iter_next(object, iter);
- if(!iter)
- fail("unable to increment iterator");
- if (strcmp(json_object_iter_key(iter), "b") != 0)
- fail("iterating doesn't yield keys in order");
- if (json_object_iter_value(iter) != bar)
- fail("iterating doesn't yield values in order");
-
- iter = json_object_iter_next(object, iter);
- if(!iter)
- fail("unable to increment iterator");
- if (strcmp(json_object_iter_key(iter), "c") != 0)
- fail("iterating doesn't yield keys in order");
- if (json_object_iter_value(iter) != baz)
- fail("iterating doesn't yield values in order");
-
- if(json_object_iter_next(object, iter) != NULL)
- fail("able to iterate over the end");
-
- if(json_object_iter_at(object, "foo"))
- fail("json_object_iter_at() succeeds for non-existent key");
-
- iter = json_object_iter_at(object, "b");
- if(!iter)
- fail("json_object_iter_at() fails for an existing key");
-
- if(strcmp(json_object_iter_key(iter), "b"))
- fail("iterating failed: wrong key");
- if(json_object_iter_value(iter) != bar)
- fail("iterating failed: wrong value");
-
- if(json_object_iter_set(object, iter, baz))
- fail("unable to set value at iterator");
-
- if(strcmp(json_object_iter_key(iter), "b"))
- fail("json_object_iter_key() fails after json_object_iter_set()");
- if(json_object_iter_value(iter) != baz)
- fail("json_object_iter_value() fails after json_object_iter_set()");
- if(json_object_get(object, "b") != baz)
- fail("json_object_get() fails after json_object_iter_set()");
-
- json_decref(object);
- json_decref(foo);
- json_decref(bar);
- json_decref(baz);
-}
-
-static void test_misc()
-{
- json_t *object, *string, *other_string, *value;
-
- object = json_object();
- string = json_string("test");
- other_string = json_string("other");
-
- if(!object)
- fail("unable to create object");
- if(!string || !other_string)
- fail("unable to create string");
-
- if(json_object_get(object, "a"))
- fail("value for nonexisting key");
-
- if(json_object_set(object, "a", string))
- fail("unable to set value");
-
- if(!json_object_set(object, NULL, string))
- fail("able to set NULL key");
-
- if(json_object_del(object, "a"))
- fail("unable to del the only key");
-
- if(json_object_set(object, "a", string))
- fail("unable to set value");
-
- if(!json_object_set(object, "a", NULL))
- fail("able to set NULL value");
-
- /* invalid UTF-8 in key */
- if(!json_object_set(object, "a\xefz", string))
- fail("able to set invalid unicode key");
-
- value = json_object_get(object, "a");
- if(!value)
- fail("no value for existing key");
- if(value != string)
- fail("got different value than what was added");
-
- /* "a", "lp" and "px" collide in a five-bucket hashtable */
- if(json_object_set(object, "b", string) ||
- json_object_set(object, "lp", string) ||
- json_object_set(object, "px", string))
- fail("unable to set value");
-
- value = json_object_get(object, "a");
- if(!value)
- fail("no value for existing key");
- if(value != string)
- fail("got different value than what was added");
-
- if(json_object_set(object, "a", other_string))
- fail("unable to replace an existing key");
-
- value = json_object_get(object, "a");
- if(!value)
- fail("no value for existing key");
- if(value != other_string)
- fail("got different value than what was set");
-
- if(!json_object_del(object, "nonexisting"))
- fail("able to delete a nonexisting key");
-
- if(json_object_del(object, "px"))
- fail("unable to delete an existing key");
-
- if(json_object_del(object, "a"))
- fail("unable to delete an existing key");
-
- if(json_object_del(object, "lp"))
- fail("unable to delete an existing key");
-
-
- /* add many keys to initiate rehashing */
-
- if(json_object_set(object, "a", string))
- fail("unable to set value");
-
- if(json_object_set(object, "lp", string))
- fail("unable to set value");
-
- if(json_object_set(object, "px", string))
- fail("unable to set value");
-
- if(json_object_set(object, "c", string))
- fail("unable to set value");
-
- if(json_object_set(object, "d", string))
- fail("unable to set value");
-
- if(json_object_set(object, "e", string))
- fail("unable to set value");
-
-
- if(json_object_set_new(object, "foo", json_integer(123)))
- fail("unable to set new value");
-
- value = json_object_get(object, "foo");
- if(!json_is_integer(value) || json_integer_value(value) != 123)
- fail("json_object_set_new works incorrectly");
-
- if(!json_object_set_new(object, NULL, json_integer(432)))
- fail("able to set_new NULL key");
-
- if(!json_object_set_new(object, "foo", NULL))
- fail("able to set_new NULL value");
-
- json_decref(string);
- json_decref(other_string);
- json_decref(object);
-}
-
-static void test_preserve_order()
-{
- json_t *object;
- char *result;
-
- const char *expected = "{\"foobar\": 1, \"bazquux\": 6, \"lorem ipsum\": 3, \"sit amet\": 5, \"helicopter\": 7}";
-
- object = json_object();
-
- json_object_set_new(object, "foobar", json_integer(1));
- json_object_set_new(object, "bazquux", json_integer(2));
- json_object_set_new(object, "lorem ipsum", json_integer(3));
- json_object_set_new(object, "dolor", json_integer(4));
- json_object_set_new(object, "sit amet", json_integer(5));
-
- /* changing a value should preserve the order */
- json_object_set_new(object, "bazquux", json_integer(6));
-
- /* deletion shouldn't change the order of others */
- json_object_del(object, "dolor");
-
- /* add a new item just to make sure */
- json_object_set_new(object, "helicopter", json_integer(7));
-
- result = json_dumps(object, JSON_PRESERVE_ORDER);
-
- if(strcmp(expected, result) != 0) {
- fprintf(stderr, "%s != %s", expected, result);
- fail("JSON_PRESERVE_ORDER doesn't work");
- }
-
- free(result);
- json_decref(object);
-}
-
-static void test_object_foreach()
-{
- const char *key;
- json_t *object1, *object2, *value;
-
- object1 = json_pack("{sisisi}", "foo", 1, "bar", 2, "baz", 3);
- object2 = json_object();
-
- json_object_foreach(object1, key, value)
- json_object_set(object2, key, value);
-
- if(!json_equal(object1, object2))
- fail("json_object_foreach failed to iterate all key-value pairs");
-
- json_decref(object1);
- json_decref(object2);
-}
-
-static void test_object_foreach_safe()
-{
- const char *key;
- void *tmp;
- json_t *object, *value;
-
- object = json_pack("{sisisi}", "foo", 1, "bar", 2, "baz", 3);
-
- json_object_foreach_safe(object, tmp, key, value) {
- json_object_del(object, key);
- }
-
- if(json_object_size(object) != 0)
- fail("json_object_foreach_safe failed to iterate all key-value pairs");
-
- json_decref(object);
-}
-
-static void run_tests()
-{
- test_misc();
- test_clear();
- test_update();
- test_set_many_keys();
- test_conditional_updates();
- test_circular();
- test_set_nocheck();
- test_iterators();
- test_preserve_order();
- test_object_foreach();
- test_object_foreach_safe();
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_pack.c Deleted

@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- * Copyright (c) 2010-2012 Graeme Smecher <graeme.smecher@mail.mcgill.ca>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#include <jansson_config.h>
-
-#include <string.h>
-#include <jansson.h>
-#include <stdio.h>
-#include "util.h"
-
-static void run_tests()
-{
- json_t *value;
- int i;
- char buffer4 = {'t', 'e', 's', 't'};
- json_error_t error;
-
- /*
- * Simple, valid json_pack cases
- */
- /* true */
- value = json_pack("b", 1);
- if(!json_is_true(value))
- fail("json_pack boolean failed");
- if(value->refcount != (size_t)-1)
- fail("json_pack boolean refcount failed");
- json_decref(value);
-
- /* false */
- value = json_pack("b", 0);
- if(!json_is_false(value))
- fail("json_pack boolean failed");
- if(value->refcount != (size_t)-1)
- fail("json_pack boolean refcount failed");
- json_decref(value);
-
- /* null */
- value = json_pack("n");
- if(!json_is_null(value))
- fail("json_pack null failed");
- if(value->refcount != (size_t)-1)
- fail("json_pack null refcount failed");
- json_decref(value);
-
- /* integer */
- value = json_pack("i", 1);
- if(!json_is_integer(value) || json_integer_value(value) != 1)
- fail("json_pack integer failed");
- if(value->refcount != (size_t)1)
- fail("json_pack integer refcount failed");
- json_decref(value);
-
- /* integer from json_int_t */
- value = json_pack("I", (json_int_t)555555);
- if(!json_is_integer(value) || json_integer_value(value) != 555555)
- fail("json_pack json_int_t failed");
- if(value->refcount != (size_t)1)
- fail("json_pack integer refcount failed");
- json_decref(value);
-
- /* real */
- value = json_pack("f", 1.0);
- if(!json_is_real(value) || json_real_value(value) != 1.0)
- fail("json_pack real failed");
- if(value->refcount != (size_t)1)
- fail("json_pack real refcount failed");
- json_decref(value);
-
- /* string */
- value = json_pack("s", "test");
- if(!json_is_string(value) || strcmp("test", json_string_value(value)))
- fail("json_pack string failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string refcount failed");
- json_decref(value);
-
- /* nullable string (defined case) */
- value = json_pack("s?", "test");
- if(!json_is_string(value) || strcmp("test", json_string_value(value)))
- fail("json_pack nullable string (defined case) failed");
- if(value->refcount != (size_t)1)
- fail("json_pack nullable string (defined case) refcount failed");
- json_decref(value);
-
- /* nullable string (NULL case) */
- value = json_pack("s?", NULL);
- if(!json_is_null(value))
- fail("json_pack nullable string (NULL case) failed");
- if(value->refcount != (size_t)-1)
- fail("json_pack nullable string (NULL case) refcount failed");
- json_decref(value);
-
- /* string and length (int) */
- value = json_pack("s#", "test asdf", 4);
- if(!json_is_string(value) || strcmp("test", json_string_value(value)))
- fail("json_pack string and length failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string and length refcount failed");
- json_decref(value);
-
- /* string and length (size_t) */
- value = json_pack("s%", "test asdf", (size_t)4);
- if(!json_is_string(value) || strcmp("test", json_string_value(value)))
- fail("json_pack string and length failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string and length refcount failed");
- json_decref(value);
-
- /* string and length (int), non-NUL terminated string */
- value = json_pack("s#", buffer, 4);
- if(!json_is_string(value) || strcmp("test", json_string_value(value)))
- fail("json_pack string and length (int) failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string and length (int) refcount failed");
- json_decref(value);
-
- /* string and length (size_t), non-NUL terminated string */
- value = json_pack("s%", buffer, (size_t)4);
- if(!json_is_string(value) || strcmp("test", json_string_value(value)))
- fail("json_pack string and length (size_t) failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string and length (size_t) refcount failed");
- json_decref(value);
-
- /* string concatenation */
- value = json_pack("s++", "te", "st", "ing");
- if(!json_is_string(value) || strcmp("testing", json_string_value(value)))
- fail("json_pack string concatenation failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string concatenation refcount failed");
- json_decref(value);
-
- /* string concatenation and length (int) */
- value = json_pack("s#+#+", "test", 1, "test", 2, "test");
- if(!json_is_string(value) || strcmp("ttetest", json_string_value(value)))
- fail("json_pack string concatenation and length (int) failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string concatenation and length (int) refcount failed");
- json_decref(value);
-
- /* string concatenation and length (size_t) */
- value = json_pack("s%+%+", "test", (size_t)1, "test", (size_t)2, "test");
- if(!json_is_string(value) || strcmp("ttetest", json_string_value(value)))
- fail("json_pack string concatenation and length (size_t) failed");
- if(value->refcount != (size_t)1)
- fail("json_pack string concatenation and length (size_t) refcount failed");
- json_decref(value);
-
- /* empty object */
- value = json_pack("{}", 1.0);
- if(!json_is_object(value) || json_object_size(value) != 0)
- fail("json_pack empty object failed");
- if(value->refcount != (size_t)1)
- fail("json_pack empty object refcount failed");
- json_decref(value);
-
- /* empty list */
- value = json_pack("", 1.0);
- if(!json_is_array(value) || json_array_size(value) != 0)
- fail("json_pack empty list failed");
- if(value->refcount != (size_t)1)
- fail("json_pack empty list failed");
- json_decref(value);
-
- /* non-incref'd object */
- value = json_pack("o", json_integer(1));
- if(!json_is_integer(value) || json_integer_value(value) != 1)
- fail("json_pack object failed");
- if(value->refcount != (size_t)1)
- fail("json_pack integer refcount failed");
- json_decref(value);
-
- /* non-incref'd nullable object (defined case) */
- value = json_pack("o?", json_integer(1));
- if(!json_is_integer(value) || json_integer_value(value) != 1)
- fail("json_pack nullable object (defined case) failed");
- if(value->refcount != (size_t)1)
- fail("json_pack nullable object (defined case) refcount failed");
- json_decref(value);
-
- /* non-incref'd nullable object (NULL case) */
- value = json_pack("o?", NULL);
- if(!json_is_null(value))
- fail("json_pack nullable object (NULL case) failed");
- if(value->refcount != (size_t)-1)
- fail("json_pack nullable object (NULL case) refcount failed");
- json_decref(value);
-
- /* incref'd object */
- value = json_pack("O", json_integer(1));
- if(!json_is_integer(value) || json_integer_value(value) != 1)
- fail("json_pack object failed");
- if(value->refcount != (size_t)2)
- fail("json_pack integer refcount failed");
- json_decref(value);
- json_decref(value);
-
- /* incref'd nullable object (defined case) */
- value = json_pack("O?", json_integer(1));
- if(!json_is_integer(value) || json_integer_value(value) != 1)
- fail("json_pack incref'd nullable object (defined case) failed");
- if(value->refcount != (size_t)2)
- fail("json_pack incref'd nullable object (defined case) refcount failed");
- json_decref(value);
- json_decref(value);
-
- /* incref'd nullable object (NULL case) */
- value = json_pack("O?", NULL);
- if(!json_is_null(value))
- fail("json_pack incref'd nullable object (NULL case) failed");
- if(value->refcount != (size_t)-1)
- fail("json_pack incref'd nullable object (NULL case) refcount failed");
-
- /* simple object */
- value = json_pack("{s:}", "foo");
- if(!json_is_object(value) || json_object_size(value) != 1)
- fail("json_pack array failed");
- if(!json_is_array(json_object_get(value, "foo")))
- fail("json_pack array failed");
- if(json_object_get(value, "foo")->refcount != (size_t)1)
- fail("json_pack object refcount failed");
- json_decref(value);
-
- /* object with complex key */
- value = json_pack("{s+#+: }", "foo", "barbar", 3, "baz");
- if(!json_is_object(value) || json_object_size(value) != 1)
- fail("json_pack array failed");
- if(!json_is_array(json_object_get(value, "foobarbaz")))
- fail("json_pack array failed");
- if(json_object_get(value, "foobarbaz")->refcount != (size_t)1)
- fail("json_pack object refcount failed");
- json_decref(value);
-
- /* simple array */
- value = json_pack("i,i,i", 0, 1, 2);
- if(!json_is_array(value) || json_array_size(value) != 3)
- fail("json_pack object failed");
- for(i=0; i<3; i++)
- {
- if(!json_is_integer(json_array_get(value, i)) ||
- json_integer_value(json_array_get(value, i)) != i)
-
- fail("json_pack integer array failed");
- }
- json_decref(value);
-
- /* Whitespace; regular string */
- value = json_pack(" s ", "test");
- if(!json_is_string(value) || strcmp("test", json_string_value(value)))
- fail("json_pack string (with whitespace) failed");
- json_decref(value);
-
- /* Whitespace; empty array */
- value = json_pack(" ");
- if(!json_is_array(value) || json_array_size(value) != 0)
- fail("json_pack empty array (with whitespace) failed");
- json_decref(value);
-
- /* Whitespace; array */
- value = json_pack(" i , i, i ", 1, 2, 3);
- if(!json_is_array(value) || json_array_size(value) != 3)
- fail("json_pack array (with whitespace) failed");
- json_decref(value);
-
- /*
- * Invalid cases
- */
-
- /* newline in format string */
- if(json_pack_ex(&error, 0, "{\n\n1"))
- fail("json_pack failed to catch invalid format '1'");
- check_error("Expected format 's', got '1'", "<format>", 3, 1, 4);
-
- /* mismatched open/close array/object */
- if(json_pack_ex(&error, 0, "}"))
- fail("json_pack failed to catch mismatched '}'");
- check_error("Unexpected format character '}'", "<format>", 1, 2, 2);
-
- if(json_pack_ex(&error, 0, "{"))
- fail("json_pack failed to catch mismatched ''");
- check_error("Expected format 's', got ''", "<format>", 1, 2, 2);
-
- /* missing close array */
- if(json_pack_ex(&error, 0, ""))
- fail("json_pack failed to catch missing ''");
- check_error("Unexpected end of format string", "<format>", 1, 2, 2);
-
- /* missing close object */
- if(json_pack_ex(&error, 0, "{"))
- fail("json_pack failed to catch missing '}'");
- check_error("Unexpected end of format string", "<format>", 1, 2, 2);
-
- /* garbage after format string */
- if(json_pack_ex(&error, 0, "ia", 42))
- fail("json_pack failed to catch garbage after format string");
- check_error("Garbage after format string", "<format>", 1, 4, 4);
-
- if(json_pack_ex(&error, 0, "ia", 42))
- fail("json_pack failed to catch garbage after format string");
- check_error("Garbage after format string", "<format>", 1, 2, 2);
-
- /* NULL string */
- if(json_pack_ex(&error, 0, "s", NULL))
- fail("json_pack failed to catch null argument string");
- check_error("NULL string argument", "<args>", 1, 1, 1);
-
- /* + on its own */
- if(json_pack_ex(&error, 0, "+", NULL))
- fail("json_pack failed to a lone +");
- check_error("Unexpected format character '+'", "<format>", 1, 1, 1);
-
- /* NULL format */
- if(json_pack_ex(&error, 0, NULL))
- fail("json_pack failed to catch NULL format string");
- check_error("NULL or empty format string", "<format>", -1, -1, 0);
-
- /* NULL key */
- if(json_pack_ex(&error, 0, "{s:i}", NULL, 1))
- fail("json_pack failed to catch NULL key");
- check_error("NULL string argument", "<args>", 1, 2, 2);
-
- /* More complicated checks for row/columns */
- if(json_pack_ex(&error, 0, "{ {}: s }", "foo"))
- fail("json_pack failed to catch object as key");
- check_error("Expected format 's', got '{'", "<format>", 1, 3, 3);
-
- /* Complex object */
- if(json_pack_ex(&error, 0, "{ s: {}, s:ii{} }", "foo", "bar", 12, 13))
- fail("json_pack failed to catch missing ");
- check_error("Unexpected format character '}'", "<format>", 1, 19, 19);
-
- /* Complex array */
- if(json_pack_ex(&error, 0, " } "))
- fail("json_pack failed to catch extra }");
- check_error("Unexpected format character '}'", "<format>", 1, 21, 21);
-
- /* Invalid UTF-8 in object key */
- if(json_pack_ex(&error, 0, "{s:i}", "\xff\xff", 42))
- fail("json_pack failed to catch invalid UTF-8 in an object key");
- check_error("Invalid UTF-8 object key", "<args>", 1, 2, 2);
-
- /* Invalid UTF-8 in a string */
- if(json_pack_ex(&error, 0, "{s:s}", "foo", "\xff\xff"))
- fail("json_pack failed to catch invalid UTF-8 in a string");
- check_error("Invalid UTF-8 string", "<args>", 1, 4, 4);
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_simple.c Deleted

@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <string.h>
-#include <jansson.h>
-#include "util.h"
-
-/* Call the simple functions not covered by other tests of the public API */
-static void run_tests()
-{
- json_t *value;
-
- value = json_boolean(1);
- if(!json_is_true(value))
- fail("json_boolean(1) failed");
- json_decref(value);
-
- value = json_boolean(-123);
- if(!json_is_true(value))
- fail("json_boolean(-123) failed");
- json_decref(value);
-
- value = json_boolean(0);
- if(!json_is_false(value))
- fail("json_boolean(0) failed");
- if(json_boolean_value(value) != 0)
- fail("json_boolean_value failed");
- json_decref(value);
-
-
- value = json_integer(1);
- if(json_typeof(value) != JSON_INTEGER)
- fail("json_typeof failed");
-
- if(json_is_object(value))
- fail("json_is_object failed");
-
- if(json_is_array(value))
- fail("json_is_array failed");
-
- if(json_is_string(value))
- fail("json_is_string failed");
-
- if(!json_is_integer(value))
- fail("json_is_integer failed");
-
- if(json_is_real(value))
- fail("json_is_real failed");
-
- if(!json_is_number(value))
- fail("json_is_number failed");
-
- if(json_is_true(value))
- fail("json_is_true failed");
-
- if(json_is_false(value))
- fail("json_is_false failed");
-
- if(json_is_boolean(value))
- fail("json_is_boolean failed");
-
- if(json_is_null(value))
- fail("json_is_null failed");
-
- json_decref(value);
-
-
- value = json_string("foo");
- if(!value)
- fail("json_string failed");
- if(strcmp(json_string_value(value), "foo"))
- fail("invalid string value");
- if (json_string_length(value) != 3)
- fail("invalid string length");
-
- if(json_string_set(value, "barr"))
- fail("json_string_set failed");
- if(strcmp(json_string_value(value), "barr"))
- fail("invalid string value");
- if (json_string_length(value) != 4)
- fail("invalid string length");
-
- if(json_string_setn(value, "hi\0ho", 5))
- fail("json_string_set failed");
- if(memcmp(json_string_value(value), "hi\0ho\0", 6))
- fail("invalid string value");
- if (json_string_length(value) != 5)
- fail("invalid string length");
-
- json_decref(value);
-
- value = json_string(NULL);
- if(value)
- fail("json_string(NULL) failed");
-
- /* invalid UTF-8 */
- value = json_string("a\xefz");
- if(value)
- fail("json_string(<invalid utf-8>) failed");
-
- value = json_string_nocheck("foo");
- if(!value)
- fail("json_string_nocheck failed");
- if(strcmp(json_string_value(value), "foo"))
- fail("invalid string value");
- if (json_string_length(value) != 3)
- fail("invalid string length");
-
- if(json_string_set_nocheck(value, "barr"))
- fail("json_string_set_nocheck failed");
- if(strcmp(json_string_value(value), "barr"))
- fail("invalid string value");
- if (json_string_length(value) != 4)
- fail("invalid string length");
-
- if(json_string_setn_nocheck(value, "hi\0ho", 5))
- fail("json_string_set failed");
- if(memcmp(json_string_value(value), "hi\0ho\0", 6))
- fail("invalid string value");
- if (json_string_length(value) != 5)
- fail("invalid string length");
-
- json_decref(value);
-
- /* invalid UTF-8 */
- value = json_string_nocheck("qu\xff");
- if(!value)
- fail("json_string_nocheck failed");
- if(strcmp(json_string_value(value), "qu\xff"))
- fail("invalid string value");
- if (json_string_length(value) != 3)
- fail("invalid string length");
-
- if(json_string_set_nocheck(value, "\xfd\xfe\xff"))
- fail("json_string_set_nocheck failed");
- if(strcmp(json_string_value(value), "\xfd\xfe\xff"))
- fail("invalid string value");
- if (json_string_length(value) != 3)
- fail("invalid string length");
-
- json_decref(value);
-
-
- value = json_integer(123);
- if(!value)
- fail("json_integer failed");
- if(json_integer_value(value) != 123)
- fail("invalid integer value");
- if(json_number_value(value) != 123.0)
- fail("invalid number value");
-
- if(json_integer_set(value, 321))
- fail("json_integer_set failed");
- if(json_integer_value(value) != 321)
- fail("invalid integer value");
- if(json_number_value(value) != 321.0)
- fail("invalid number value");
-
- json_decref(value);
-
- value = json_real(123.123);
- if(!value)
- fail("json_real failed");
- if(json_real_value(value) != 123.123)
- fail("invalid integer value");
- if(json_number_value(value) != 123.123)
- fail("invalid number value");
-
- if(json_real_set(value, 321.321))
- fail("json_real_set failed");
- if(json_real_value(value) != 321.321)
- fail("invalid real value");
- if(json_number_value(value) != 321.321)
- fail("invalid number value");
-
- json_decref(value);
-
- value = json_true();
- if(!value)
- fail("json_true failed");
- json_decref(value);
-
- value = json_false();
- if(!value)
- fail("json_false failed");
- json_decref(value);
-
- value = json_null();
- if(!value)
- fail("json_null failed");
- json_decref(value);
-
- /* Test reference counting on singletons (true, false, null) */
- value = json_true();
- if(value->refcount != (size_t)-1)
- fail("refcounting true works incorrectly");
- json_decref(value);
- if(value->refcount != (size_t)-1)
- fail("refcounting true works incorrectly");
- json_incref(value);
- if(value->refcount != (size_t)-1)
- fail("refcounting true works incorrectly");
-
- value = json_false();
- if(value->refcount != (size_t)-1)
- fail("refcounting false works incorrectly");
- json_decref(value);
- if(value->refcount != (size_t)-1)
- fail("refcounting false works incorrectly");
- json_incref(value);
- if(value->refcount != (size_t)-1)
- fail("refcounting false works incorrectly");
-
- value = json_null();
- if(value->refcount != (size_t)-1)
- fail("refcounting null works incorrectly");
- json_decref(value);
- if(value->refcount != (size_t)-1)
- fail("refcounting null works incorrectly");
- json_incref(value);
- if(value->refcount != (size_t)-1)
- fail("refcounting null works incorrectly");
-
-#ifdef json_auto_t
- value = json_string("foo");
- {
- json_auto_t *test = json_incref(value);
- /* Use test so GCC doesn't complain it is unused. */
- if(!json_is_string(test))
- fail("value type check failed");
- }
- if(value->refcount != 1)
-	fail("automatic decrement failed");
- json_decref(value);
-#endif
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/test_unpack.c Deleted

@@ -1,406 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- * Copyright (c) 2010-2012 Graeme Smecher <graeme.smecher@mail.mcgill.ca>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#include <string.h>
-#include <jansson.h>
-#include <stdio.h>
-#include "util.h"
-
-static void run_tests()
-{
- json_t *j, *j2;
- int i1, i2, i3;
- json_int_t I1;
- int rv;
- size_t z;
- double f;
- char *s;
-
- json_error_t error;
-
- /*
- * Simple, valid json_pack cases
- */
-
- /* true */
- rv = json_unpack(json_true(), "b", &i1);
- if(rv || !i1)
- fail("json_unpack boolean failed");
-
- /* false */
- rv = json_unpack(json_false(), "b", &i1);
- if(rv || i1)
- fail("json_unpack boolean failed");
-
- /* null */
- if(json_unpack(json_null(), "n"))
- fail("json_unpack null failed");
-
- /* integer */
- j = json_integer(42);
- rv = json_unpack(j, "i", &i1);
- if(rv || i1 != 42)
- fail("json_unpack integer failed");
- json_decref(j);
-
- /* json_int_t */
- j = json_integer(5555555);
- rv = json_unpack(j, "I", &I1);
- if(rv || I1 != 5555555)
- fail("json_unpack json_int_t failed");
- json_decref(j);
-
- /* real */
- j = json_real(1.7);
- rv = json_unpack(j, "f", &f);
- if(rv || f != 1.7)
- fail("json_unpack real failed");
- json_decref(j);
-
- /* number */
- j = json_integer(12345);
- rv = json_unpack(j, "F", &f);
- if(rv || f != 12345.0)
- fail("json_unpack (real or) integer failed");
- json_decref(j);
-
- j = json_real(1.7);
- rv = json_unpack(j, "F", &f);
- if(rv || f != 1.7)
- fail("json_unpack real (or integer) failed");
- json_decref(j);
-
- /* string */
- j = json_string("foo");
- rv = json_unpack(j, "s", &s);
- if(rv || strcmp(s, "foo"))
- fail("json_unpack string failed");
- json_decref(j);
-
- /* string with length (size_t) */
- j = json_string("foo");
- rv = json_unpack(j, "s%", &s, &z);
- if(rv || strcmp(s, "foo") || z != 3)
- fail("json_unpack string with length (size_t) failed");
- json_decref(j);
-
- /* empty object */
- j = json_object();
- if(json_unpack(j, "{}"))
- fail("json_unpack empty object failed");
- json_decref(j);
-
- /* empty list */
- j = json_array();
- if(json_unpack(j, ""))
- fail("json_unpack empty list failed");
- json_decref(j);
-
- /* non-incref'd object */
- j = json_object();
- rv = json_unpack(j, "o", &j2);
- if(rv || j2 != j || j->refcount != 1)
- fail("json_unpack object failed");
- json_decref(j);
-
- /* incref'd object */
- j = json_object();
- rv = json_unpack(j, "O", &j2);
- if(rv || j2 != j || j->refcount != 2)
- fail("json_unpack object failed");
- json_decref(j);
- json_decref(j);
-
- /* simple object */
- j = json_pack("{s:i}", "foo", 42);
- rv = json_unpack(j, "{s:i}", "foo", &i1);
- if(rv || i1 != 42)
- fail("json_unpack simple object failed");
- json_decref(j);
-
- /* simple array */
- j = json_pack("iii", 1, 2, 3);
- rv = json_unpack(j, "i,i,i", &i1, &i2, &i3);
- if(rv || i1 != 1 || i2 != 2 || i3 != 3)
- fail("json_unpack simple array failed");
- json_decref(j);
-
- /* object with many items & strict checking */
- j = json_pack("{s:i, s:i, s:i}", "a", 1, "b", 2, "c", 3);
- rv = json_unpack(j, "{s:i, s:i, s:i}", "a", &i1, "b", &i2, "c", &i3);
- if(rv || i1 != 1 || i2 != 2 || i3 != 3)
- fail("json_unpack object with many items failed");
- json_decref(j);
-
- /*
- * Invalid cases
- */
-
- j = json_integer(42);
- if(!json_unpack_ex(j, &error, 0, "z"))
- fail("json_unpack succeeded with invalid format character");
- check_error("Unexpected format character 'z'", "<format>", 1, 1, 1);
-
- if(!json_unpack_ex(NULL, &error, 0, "i"))
- fail("json_unpack succeeded with NULL root");
- check_error("NULL root value", "<root>", -1, -1, 0);
- json_decref(j);
-
- /* mismatched open/close array/object */
- j = json_pack("");
- if(!json_unpack_ex(j, &error, 0, "}"))
- fail("json_unpack failed to catch mismatched ''");
- check_error("Unexpected format character '}'", "<format>", 1, 2, 2);
- json_decref(j);
-
- j = json_pack("{}");
- if(!json_unpack_ex(j, &error, 0, "{"))
- fail("json_unpack failed to catch mismatched '}'");
- check_error("Expected format 's', got ''", "<format>", 1, 2, 2);
- json_decref(j);
-
- /* missing close array */
- j = json_pack("");
- if(!json_unpack_ex(j, &error, 0, ""))
- fail("json_unpack failed to catch missing ''");
- check_error("Unexpected end of format string", "<format>", 1, 2, 2);
- json_decref(j);
-
- /* missing close object */
- j = json_pack("{}");
- if(!json_unpack_ex(j, &error, 0, "{"))
- fail("json_unpack failed to catch missing '}'");
- check_error("Unexpected end of format string", "<format>", 1, 2, 2);
- json_decref(j);
-
- /* garbage after format string */
- j = json_pack("i", 42);
- if(!json_unpack_ex(j, &error, 0, "ia", &i1))
- fail("json_unpack failed to catch garbage after format string");
- check_error("Garbage after format string", "<format>", 1, 4, 4);
- json_decref(j);
-
- j = json_integer(12345);
- if(!json_unpack_ex(j, &error, 0, "ia", &i1))
- fail("json_unpack failed to catch garbage after format string");
- check_error("Garbage after format string", "<format>", 1, 2, 2);
- json_decref(j);
-
- /* NULL format string */
- j = json_pack("");
- if(!json_unpack_ex(j, &error, 0, NULL))
- fail("json_unpack failed to catch null format string");
- check_error("NULL or empty format string", "<format>", -1, -1, 0);
- json_decref(j);
-
- /* NULL string pointer */
- j = json_string("foobie");
- if(!json_unpack_ex(j, &error, 0, "s", NULL))
- fail("json_unpack failed to catch null string pointer");
- check_error("NULL string argument", "<args>", 1, 1, 1);
- json_decref(j);
-
- /* invalid types */
- j = json_integer(42);
- j2 = json_string("foo");
- if(!json_unpack_ex(j, &error, 0, "s"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected string, got integer", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j, &error, 0, "n"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected null, got integer", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j, &error, 0, "b"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected true or false, got integer", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j2, &error, 0, "i"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected integer, got string", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j2, &error, 0, "I"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected integer, got string", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j, &error, 0, "f"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected real, got integer", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j2, &error, 0, "F"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected real or integer, got string", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j, &error, 0, "i"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected array, got integer", "<validation>", 1, 1, 1);
-
- if(!json_unpack_ex(j, &error, 0, "{si}", "foo"))
- fail("json_unpack failed to catch invalid type");
- check_error("Expected object, got integer", "<validation>", 1, 1, 1);
-
- json_decref(j);
- json_decref(j2);
-
- /* Array index out of range */
- j = json_pack("i", 1);
- if(!json_unpack_ex(j, &error, 0, "ii", &i1, &i2))
- fail("json_unpack failed to catch index out of array bounds");
- check_error("Array index 1 out of range", "<validation>", 1, 3, 3);
- json_decref(j);
-
- /* NULL object key */
- j = json_pack("{si}", "foo", 42);
- if(!json_unpack_ex(j, &error, 0, "{si}", NULL, &i1))
- fail("json_unpack failed to catch null string pointer");
- check_error("NULL object key", "<args>", 1, 2, 2);
- json_decref(j);
-
- /* Object key not found */
- j = json_pack("{si}", "foo", 42);
- if(!json_unpack_ex(j, &error, 0, "{si}", "baz", &i1))
- fail("json_unpack failed to catch null string pointer");
- check_error("Object item not found: baz", "<validation>", 1, 3, 3);
- json_decref(j);
-
- /*
- * Strict validation
- */
-
- j = json_pack("iii", 1, 2, 3);
- rv = json_unpack(j, "iii!", &i1, &i2, &i3);
- if(rv || i1 != 1 || i2 != 2 || i3 != 3)
- fail("json_unpack array with strict validation failed");
- json_decref(j);
-
- j = json_pack("iii", 1, 2, 3);
- if(!json_unpack_ex(j, &error, 0, "ii!", &i1, &i2))
- fail("json_unpack array with strict validation failed");
- check_error("1 array item(s) left unpacked", "<validation>", 1, 5, 5);
- json_decref(j);
-
- /* Like above, but with JSON_STRICT instead of '!' format */
- j = json_pack("iii", 1, 2, 3);
- if(!json_unpack_ex(j, &error, JSON_STRICT, "ii", &i1, &i2))
- fail("json_unpack array with strict validation failed");
- check_error("1 array item(s) left unpacked", "<validation>", 1, 4, 4);
- json_decref(j);
-
- j = json_pack("{s:s, s:i}", "foo", "bar", "baz", 42);
- rv = json_unpack(j, "{sssi!}", "foo", &s, "baz", &i1);
- if(rv || strcmp(s, "bar") != 0 || i1 != 42)
- fail("json_unpack object with strict validation failed");
- json_decref(j);
-
- /* Unpack the same item twice */
- j = json_pack("{s:s, s:i, s:b}", "foo", "bar", "baz", 42, "quux", 1);
- if(!json_unpack_ex(j, &error, 0, "{s:s,s:s!}", "foo", &s, "foo", &s))
- fail("json_unpack object with strict validation failed");
- {
- const char *possible_errors = {
- "2 object item(s) left unpacked: baz, quux",
- "2 object item(s) left unpacked: quux, baz"
- };
- check_errors(possible_errors, 2, "<validation>", 1, 10, 10);
- }
- json_decref(j);
-
- j = json_pack("i,{s:i,s:n},i,i", 1, "foo", 2, "bar", 3, 4);
- if(json_unpack_ex(j, NULL, JSON_STRICT | JSON_VALIDATE_ONLY,
- "i{sisn}ii", "foo", "bar"))
- fail("json_unpack complex value with strict validation failed");
- json_decref(j);
-
- /* ! and * must be last */
- j = json_pack("ii", 1, 2);
- if(!json_unpack_ex(j, &error, 0, "i!i", &i1, &i2))
- fail("json_unpack failed to catch ! in the middle of an array");
- check_error("Expected '' after '!', got 'i'", "<format>", 1, 4, 4);
-
- if(!json_unpack_ex(j, &error, 0, "i*i", &i1, &i2))
- fail("json_unpack failed to catch * in the middle of an array");
- check_error("Expected '' after '*', got 'i'", "<format>", 1, 4, 4);
- json_decref(j);
-
- j = json_pack("{sssi}", "foo", "bar", "baz", 42);
- if(!json_unpack_ex(j, &error, 0, "{ss!si}", "foo", &s, "baz", &i1))
- fail("json_unpack failed to catch ! in the middle of an object");
- check_error("Expected '}' after '!', got 's'", "<format>", 1, 5, 5);
-
- if(!json_unpack_ex(j, &error, 0, "{ss*si}", "foo", &s, "baz", &i1))
- fail("json_unpack failed to catch ! in the middle of an object");
- check_error("Expected '}' after '*', got 's'", "<format>", 1, 5, 5);
- json_decref(j);
-
- /* Error in nested object */
- j = json_pack("{s{snsn}}", "foo", "bar", "baz");
- if(!json_unpack_ex(j, &error, 0, "{s{sn!}}", "foo", "bar"))
- fail("json_unpack nested object with strict validation failed");
- check_error("1 object item(s) left unpacked: baz", "<validation>", 1, 7, 7);
- json_decref(j);
-
- /* Error in nested array */
- j = json_pack("ii", 1, 2);
- if(!json_unpack_ex(j, &error, 0, "i!", &i1))
- fail("json_unpack nested array with strict validation failed");
- check_error("1 array item(s) left unpacked", "<validation>", 1, 5, 5);
- json_decref(j);
-
- /* Optional values */
- j = json_object();
- i1 = 0;
- if(json_unpack(j, "{s?i}", "foo", &i1))
- fail("json_unpack failed for optional key");
- if(i1 != 0)
- fail("json_unpack unpacked an optional key");
- json_decref(j);
-
- i1 = 0;
- j = json_pack("{si}", "foo", 42);
- if(json_unpack(j, "{s?i}", "foo", &i1))
- fail("json_unpack failed for an optional value");
- if(i1 != 42)
- fail("json_unpack failed to unpack an optional value");
- json_decref(j);
-
- j = json_object();
- i1 = i2 = i3 = 0;
- if(json_unpack(j, "{s?iis?{s{si}}}",
- "foo", &i1, &i2,
- "bar", "baz", "quux", &i3))
- fail("json_unpack failed for complex optional values");
- if(i1 != 0 || i2 != 0 || i3 != 0)
- fail("json_unpack unexpectedly unpacked something");
- json_decref(j);
-
- j = json_pack("{s{si}}", "foo", "bar", 42);
- if(json_unpack(j, "{s?{s?i}}", "foo", "bar", &i1))
- fail("json_unpack failed for complex optional values");
- if(i1 != 42)
- fail("json_unpack failed to unpack");
- json_decref(j);
-
- /* Combine ? and ! */
- j = json_pack("{si}", "foo", 42);
- i1 = i2 = 0;
- if(json_unpack(j, "{sis?i!}", "foo", &i1, "bar", &i2))
- fail("json_unpack failed for optional values with strict mode");
- if(i1 != 42)
- fail("json_unpack failed to unpack");
- if(i2 != 0)
- fail("json_unpack failed to unpack");
- json_decref(j);
-
- /* But don't compensate a missing key with an optional one. */
- j = json_pack("{sisi}", "foo", 42, "baz", 43);
- i1 = i2 = i3 = 0;
- if(!json_unpack_ex(j, &error, 0, "{sis?i!}", "foo", &i1, "bar", &i2))
- fail("json_unpack failed for optional values with strict mode and compensation");
- check_error("1 object item(s) left unpacked: baz", "<validation>", 1, 8, 8);
- json_decref(j);
-}

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/api/util.h Deleted

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#ifdef HAVE_CONFIG_H
-#include <jansson_private_config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#if HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#include <jansson.h>
-
-#define failhdr fprintf(stderr, "%s:%d: ", __FILE__, __LINE__)
-
-#define fail(msg) \
- do { \
- failhdr; \
- fprintf(stderr, "%s\n", msg); \
- exit(1); \
- } while(0)
-
-/* Assumes json_error_t error */
-#define check_errors(texts_, num_, source_, line_, column_, position_) \
- do { \
- int i_, found_ = 0; \
- for(i_ = 0; i_ < num_; i_++) { \
- if(strcmp(error.text, texts_i_) == 0) { \
- found_ = 1; \
- break; \
- } \
- } \
- if (!found_) { \
- failhdr; \
- if (num_ == 1) { \
- fprintf(stderr, "text: \"%s\" != \"%s\"\n", error.text, texts_0); \
- } else { \
- fprintf(stderr, "text: \"%s\" does not match\n", error.text); \
- } \
- exit(1); \
- } \
- if(strcmp(error.source, source_) != 0) { \
- failhdr; \
- \
- fprintf(stderr, "source: \"%s\" != \"%s\"\n", error.source, source_); \
- exit(1); \
- } \
- if(error.line != line_) { \
- failhdr; \
- fprintf(stderr, "line: %d != %d\n", error.line, line_); \
- exit(1); \
- } \
- if(error.column != column_) { \
- failhdr; \
- fprintf(stderr, "column: %d != %d\n", error.column, column_); \
- exit(1); \
- } \
- if(error.position != position_) { \
- failhdr; \
- fprintf(stderr, "position: %d != %d\n", error.position, position_); \
- exit(1); \
- } \
- } while(0)
-
-
-/* Assumes json_error_t error */
-#define check_error(text_, source_, line_, column_, position_) \
- check_errors(&text_, 1, source_, line_, column_, position_)
-
-
-static void run_tests();
-
-int main() {
-#ifdef HAVE_SETLOCALE
- setlocale(LC_ALL, "");
-#endif
- run_tests();
- return 0;
-}
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/array/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-array/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-array/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-object Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-object/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-object/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/compact-object/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/ensure-ascii Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/ensure-ascii/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/ensure-ascii/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/ensure-ascii/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-array/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-array/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-array/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-array/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-object Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-object/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-object/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-compact-object/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-object Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-object/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-object/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/indent-object/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/object Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/object/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/object/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/object/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/preserve-order Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/preserve-order/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/preserve-order/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/preserve-order/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/real-precision Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/real-precision/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/real-precision/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/real-precision/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/run Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/sort-keys Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/sort-keys/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/sort-keys/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/encoding-flags/sort-keys/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/encoded-surrogate-half Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/encoded-surrogate-half/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/encoded-surrogate-half/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-after-backslash Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-after-backslash/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-after-backslash/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-array/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-bigger-int/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-escape Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-escape/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-escape/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-exponent Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-exponent/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-exponent/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-identifier Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-identifier/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-identifier/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-int Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-int/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-int/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-real-after-e/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-string/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/invalid-utf-8-in-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/lone-invalid-utf-8 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/lone-invalid-utf-8/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/lone-invalid-utf-8/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/lone-utf-8-continuation-byte Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/lone-utf-8-continuation-byte/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/lone-utf-8-continuation-byte/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/not-in-unicode-range Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/not-in-unicode-range/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/not-in-unicode-range/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-3-byte-encoding Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-3-byte-encoding/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-3-byte-encoding/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-4-byte-encoding Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-4-byte-encoding/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-4-byte-encoding/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-ascii-encoding Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-ascii-encoding/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/overlong-ascii-encoding/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/restricted-utf-8 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/restricted-utf-8/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/restricted-utf-8/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/run Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/truncated-utf-8 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/truncated-utf-8/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid-unicode/truncated-utf-8/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/apostrophe Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/apostrophe/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/apostrophe/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/ascii-unicode-identifier Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/ascii-unicode-identifier/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/ascii-unicode-identifier/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/brace-comma Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/brace-comma/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/brace-comma/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/bracket-comma Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/bracket-comma/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/bracket-comma/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/bracket-one-comma Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/bracket-one-comma/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/bracket-one-comma/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/bracket-one-comma/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/empty Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/empty/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/empty/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/extra-comma-in-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/extra-comma-in-array/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/extra-comma-in-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/extra-comma-in-multiline-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/extra-comma-in-multiline-array/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/extra-comma-in-multiline-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/garbage-after-newline Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/garbage-after-newline/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/garbage-after-newline/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/garbage-at-the-end Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/garbage-at-the-end/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/garbage-at-the-end/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/integer-starting-with-zero Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/integer-starting-with-zero/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/integer-starting-with-zero/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-escape Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-escape/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-escape/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-identifier Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-identifier/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-identifier/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-negative-integer Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-negative-integer/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-negative-integer/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-negative-real Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-negative-real/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-negative-real/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-second-surrogate Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-second-surrogate/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-second-surrogate/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-unicode-escape Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-unicode-escape/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/invalid-unicode-escape/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-brace Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-brace/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-brace/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-brace/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-bracket Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-bracket/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-bracket/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-open-bracket/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-second-surrogate Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-second-surrogate/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/lone-second-surrogate/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/minus-sign-without-number Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/minus-sign-without-number/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/minus-sign-without-number/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/negative-integer-starting-with-zero Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/negative-integer-starting-with-zero/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/negative-integer-starting-with-zero/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-in-object-key Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-in-object-key/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-in-object-key/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-in-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-in-string/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-in-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-in-string/nostrip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-outside-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-outside-string/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-outside-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-byte-outside-string/nostrip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-escape-in-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-escape-in-string/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null-escape-in-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/null/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-apostrophes Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-apostrophes/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-apostrophes/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-garbage-at-end Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-garbage-at-end/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-garbage-at-end/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-in-unterminated-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-in-unterminated-array/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-in-unterminated-array/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-in-unterminated-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-colon Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-colon/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-colon/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-colon/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-value Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-value/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-value/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-no-value/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-unterminated-value Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-unterminated-value/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-unterminated-value/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/object-unterminated-value/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-garbage-after-e Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-garbage-after-e/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-garbage-after-e/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-negative-overflow Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-negative-overflow/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-negative-overflow/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-positive-overflow Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-positive-overflow/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-positive-overflow/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-truncated-at-e Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-truncated-at-e/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-truncated-at-e/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-truncated-at-point Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-truncated-at-point/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/real-truncated-at-point/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/recursion-depth Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/recursion-depth/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/recursion-depth/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/run Deleted

@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
-#
-# Jansson is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-
-is_test() {
- test -d $test_path
-}
-
-do_run() {
- variant=$1
- s=".$1"
-
- strip=0
- if "$variant" = "strip" ; then
- # This test should not be stripped
- -f $test_path/nostrip && return
- strip=1
- fi
-
- STRIP=$strip $json_process --env \
- <$test_path/input >$test_log/stdout$s 2>$test_log/stderr$s
- valgrind_check $test_log/stderr$s || return 1
-
- ref=error
- -f $test_path/error$s && ref=error$s
-
- if ! cmp -s $test_path/$ref $test_log/stderr$s; then
- echo $variant > $test_log/variant
- return 1
- fi
-}
-
-run_test() {
- do_run normal && do_run strip
-}
-
-show_error() {
- valgrind_show_error && return
-
- read variant < $test_log/variant
- s=".$variant"
-
- echo "VARIANT: $variant"
-
- echo "EXPECTED ERROR:"
- ref=error
- -f $test_path/error$s && ref=error$s
- nl -bn $test_path/$ref
-
- echo "ACTUAL ERROR:"
- nl -bn $test_log/stderr$s
-}
-
-. $top_srcdir/test/scripts/run-tests.sh

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/tab-character-in-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/tab-character-in-string/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/tab-character-in-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/too-big-negative-integer Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/too-big-negative-integer/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/too-big-negative-integer/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/too-big-positive-integer Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/too-big-positive-integer/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/too-big-positive-integer/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/truncated-unicode-surrogate Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/truncated-unicode-surrogate/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/truncated-unicode-surrogate/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unicode-identifier Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unicode-identifier/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unicode-identifier/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array-and-object Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array-and-object/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array-and-object/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array-and-object/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-empty-key Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-empty-key/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-empty-key/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-empty-key/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-key Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-key/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-key/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-key/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-object-and-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-object-and-array/error Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-object-and-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-string/error.normal Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-string/error.strip Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/invalid/unterminated-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/complex-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/complex-array/env Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/complex-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/complex-array/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-array/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-object Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-object-in-array Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-object-in-array/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-object-in-array/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-object/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-object/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/empty-string/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/escaped-utf-control-char Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/escaped-utf-control-char/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/escaped-utf-control-char/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/false Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/false/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/false/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-int Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-int/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-int/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-one Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-one/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-one/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-zero Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-zero/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/negative-zero/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/null Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/null/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/null/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/one-byte-utf-8 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/one-byte-utf-8/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/one-byte-utf-8/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e-negative-exponent Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e-negative-exponent/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e-negative-exponent/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e-positive-exponent Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e-positive-exponent/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e-positive-exponent/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-capital-e/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-exponent Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-exponent/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-exponent/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-fraction-exponent Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-fraction-exponent/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-fraction-exponent/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-negative-exponent Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-negative-exponent/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-negative-exponent/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-positive-exponent Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-positive-exponent/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-positive-exponent/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-subnormal-number Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-subnormal-number/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-subnormal-number/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-underflow Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-underflow/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/real-underflow/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/run Deleted

@@ -1,56 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
-#
-# Jansson is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-
-JSON_SORT_KEYS=1
-export JSON_SORT_KEYS
-
-is_test() {
- test -d $test_path
-}
-
-do_run() {
- variant=$1
- s=".$1"
-
- strip=0
- "$variant" = "strip" && strip=1
-
- STRIP=$strip $json_process --env \
- <$test_path/input >$test_log/stdout$s 2>$test_log/stderr$s
- valgrind_check $test_log/stderr$s || return 1
-
- ref=output
- -f $test_path/output$s && ref=output$s
-
- if ! cmp -s $test_path/$ref $test_log/stdout$s; then
- echo $variant > $test_log/variant
- return 1
- fi
-}
-
-run_test() {
- do_run normal && do_run strip
-}
-
-show_error() {
- valgrind_show_error && return
-
- read variant < $test_log/variant
- s=".$variant"
-
- echo "VARIANT: $variant"
-
- echo "EXPECTED OUTPUT:"
- ref=output
- -f $test_path/output$s && ref=output$s
- nl -bn $test_path/$ref
-
- echo "ACTUAL OUTPUT:"
- nl -bn $test_log/stdout$s
-}
-
-. $top_srcdir/test/scripts/run-tests.sh

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/short-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/short-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/short-string/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-ascii-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-ascii-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-ascii-string/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-0 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-0/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-0/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-1 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-1/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-1/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-123 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-123/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-int-123/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-object Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-object/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-object/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-real Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-real/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/simple-real/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/string-escapes Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/string-escapes/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/string-escapes/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/three-byte-utf-8 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/three-byte-utf-8/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/three-byte-utf-8/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/true Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/true/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/true/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/two-byte-utf-8 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/two-byte-utf-8/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/two-byte-utf-8/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/utf-8-string Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/utf-8-string/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/utf-8-string/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/utf-surrogate-four-byte-encoding Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/utf-surrogate-four-byte-encoding/input Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/test/suites/valid/utf-surrogate-four-byte-encoding/output Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/win32 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/win32/jansson_config.h Deleted

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2010-2013 Petri Lehtinen <petri@digip.org>
- *
- * Jansson is free software; you can redistribute it and/or modify
- * it under the terms of the MIT license. See LICENSE for details.
- *
- *
- * This file specifies a part of the site-specific configuration for
- * Jansson, namely those things that affect the public API in
- * jansson.h.
- *
- * The configure script copies this file to jansson_config.h and
- * replaces @var@ substitutions by values that fit your system. If you
- * cannot run the configure script, you can do the value substitution
- * by hand.
- */
-
-#ifndef JANSSON_CONFIG_H
-#define JANSSON_CONFIG_H
-
-/* If your compiler supports the inline keyword in C, JSON_INLINE is
- defined to `inline', otherwise empty. In C++, the inline is always
- supported. */
-#ifdef __cplusplus
-#define JSON_INLINE inline
-#else
-#define JSON_INLINE __inline
-#endif
-
-/* If your compiler supports the `long long` type and the strtoll()
- library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
- otherwise to 0. */
-#define JSON_INTEGER_IS_LONG_LONG 1
-
-/* If locale.h and localeconv() are available, define to 1,
- otherwise to 0. */
-#define JSON_HAVE_LOCALECONV 1
-
-#endif

obs-studio-29.1.3.tar.xz/deps/jansson/win32/vs2010 Deleted

obs-studio-29.1.3.tar.xz/deps/jansson/win32/vs2010/jansson.sln Deleted

@@ -1,26 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jansson", "jansson.vcxproj", "{76226D20-1972-4789-A595-EDACC7A76DC3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|Win32.Build.0 = Debug|Win32
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|x64.ActiveCfg = Debug|x64
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Debug|x64.Build.0 = Debug|x64
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Release|Win32.ActiveCfg = Release|Win32
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Release|Win32.Build.0 = Release|Win32
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Release|x64.ActiveCfg = Release|x64
-		{76226D20-1972-4789-A595-EDACC7A76DC3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

obs-studio-29.1.3.tar.xz/deps/jansson/win32/vs2010/jansson.vcxproj Deleted

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\dump.c" />
- <ClCompile Include="..\..\src\error.c" />
- <ClCompile Include="..\..\src\hashtable.c" />
- <ClCompile Include="..\..\src\load.c" />
- <ClCompile Include="..\..\src\memory.c" />
- <ClCompile Include="..\..\src\pack_unpack.c" />
- <ClCompile Include="..\..\src\strbuffer.c" />
- <ClCompile Include="..\..\src\strconv.c" />
- <ClCompile Include="..\..\src\utf.c" />
- <ClCompile Include="..\..\src\value.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\src\hashtable.h" />
- <ClInclude Include="..\..\src\jansson.h" />
- <ClInclude Include="..\..\src\jansson_private.h" />
- <ClInclude Include="..\..\src\strbuffer.h" />
- <ClInclude Include="..\..\src\utf.h" />
- <ClInclude Include="..\jansson_config.h" />
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{76226D20-1972-4789-A595-EDACC7A76DC3}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>jansson_dll</RootNamespace>
- <ProjectName>jansson</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- <OutDir>Output\$(Configuration)\</OutDir>
- <IntDir>Build\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- <OutDir>Output\$(Configuration)\</OutDir>
- <IntDir>Build\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <LinkIncremental>false</LinkIncremental>
- <OutDir>Output\$(Configuration)\</OutDir>
- <IntDir>Build\$(Configuration)\</IntDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- <OutDir>Output\$(Configuration)\</OutDir>
- <IntDir>Build\$(Configuration)\</IntDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ModuleDefinitionFile>../../src/jansson.def</ModuleDefinitionFile>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ModuleDefinitionFile>../../src/jansson.def</ModuleDefinitionFile>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <ModuleDefinitionFile>../../src/jansson.def</ModuleDefinitionFile>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <Optimization>MaxSpeed</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;JANSSON_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..</AdditionalIncludeDirectories>
- <DisableSpecificWarnings>4996</DisableSpecificWarnings>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <ModuleDefinitionFile>../../src/jansson.def</ModuleDefinitionFile>
- </Link>
- </ItemDefinitionGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

obs-studio-29.1.3.tar.xz/deps/jansson/win32/vs2010/jansson.vcxproj.filters Deleted

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\src\dump.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\error.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\hashtable.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\load.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\memory.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\pack_unpack.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\strbuffer.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\strconv.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\utf.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="..\..\src\value.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\src\hashtable.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\jansson.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\jansson_private.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\strbuffer.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\..\src\utf.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="..\jansson_config.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
-</Project>
\ No newline at end of file

obs-studio-29.1.3.tar.xz/deps/jansson/win32/vs2010/jansson.vcxproj.user Deleted

obs-studio-29.1.3.tar.xz/deps/libff Deleted

obs-studio-29.1.3.tar.xz/deps/libff/.clang-format Deleted

obs-studio-29.1.3.tar.xz/deps/libff/CMakeLists.txt Deleted

obs-studio-29.1.3.tar.xz/deps/libff/libff Deleted

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-audio-decoder.c Deleted

@@ -1,205 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-callbacks.h"
-#include "ff-circular-queue.h"
-#include "ff-clock.h"
-#include "ff-decoder.h"
-#include "ff-frame.h"
-#include "ff-packet-queue.h"
-#include "ff-timer.h"
-
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/time.h>
-
-#include <assert.h>
-
-#include "ff-compat.h"
-
-static inline void shrink_packet(struct ff_packet *packet, int packet_length)
-{
-	if (packet_length <= packet->base.size) {
-		int remaining = packet->base.size - packet_length;
-
-		memmove(packet->base.data, &packet->base.datapacket_length,
-		 remaining);
-		av_shrink_packet(&packet->base, remaining);
-	}
-}
-
-static bool handle_reset_packet(struct ff_decoder *decoder,
- struct ff_packet *packet)
-{
-	if (decoder->clock != NULL)
-		ff_clock_release(&decoder->clock);
-	decoder->clock = packet->clock;
-	av_free_packet(&packet->base);
-
-	return true;
-}
-
-static void drop_late_packets(struct ff_decoder *decoder,
- struct ff_packet *packet)
-{
-	int64_t start_time = ff_clock_start_time(decoder->clock);
-	if (start_time != AV_NOPTS_VALUE) {
-		if (ff_decoder_set_frame_drop_state(decoder, start_time,
-		 packet->base.pts))
-			shrink_packet(packet, packet->base.size);
-	}
-}
-
-static int decode_frame(struct ff_decoder *decoder, struct ff_packet *packet,
- AVFrame *frame, bool *frame_complete)
-{
-	int packet_length;
-	int ret;
-
-	while (true) {
-		if (decoder->eof)
-			ret = packet_queue_get(&decoder->packet_queue, packet,
-			 0);
-		else
-			ret = packet_queue_get(&decoder->packet_queue, packet,
-			 1);
-
-		if (ret == FF_PACKET_EMPTY) {
-			return 0;
-		} else if (ret == FF_PACKET_FAIL) {
-			return -1;
-		}
-
-		if (packet->base.data ==
-		 decoder->packet_queue.flush_packet.base.data) {
-			avcodec_flush_buffers(decoder->codec);
-			continue;
-		}
-
-		// Packet has a new clock (reset packet)
-		if (packet->clock != NULL)
-			if (!handle_reset_packet(decoder, packet))
-				return -1;
-
-		while (packet->base.size > 0) {
-			int complete;
-
-			drop_late_packets(decoder, packet);
-
-			packet_length = avcodec_decode_audio4(decoder->codec,
-			 frame, &complete,
-			 &packet->base);
-
-			if (packet_length < 0)
-				break;
-
-			shrink_packet(packet, packet_length);
-
-			if (complete == 0 || frame->nb_samples <= 0)
-				continue;
-
-			*frame_complete = complete != 0;
-
-			return frame->nb_samples *
-			 av_get_bytes_per_sample(frame->format);
-		}
-
-		if (packet->base.data != NULL)
-			av_packet_unref(&packet->base);
-	}
-}
-
-static bool queue_frame(struct ff_decoder *decoder, AVFrame *frame,
- double best_effort_pts)
-{
-	struct ff_frame *queue_frame;
-	bool call_initialize;
-
-	ff_circular_queue_wait_write(&decoder->frame_queue);
-
-	if (decoder->abort) {
-		return false;
-	}
-
-	queue_frame = ff_circular_queue_peek_write(&decoder->frame_queue);
-
-	AVCodecContext *codec = decoder->codec;
-	call_initialize =
-	 (queue_frame->frame == NULL ||
-	 queue_frame->frame->channels != codec->channels ||
-	 queue_frame->frame->sample_rate != codec->sample_rate ||
-	 queue_frame->frame->format != codec->sample_fmt);
-
-	if (queue_frame->frame != NULL) {
-		//FIXME: this shouldn't happen any more!
-		av_frame_free(&queue_frame->frame);
-	}
-
-	queue_frame->frame = av_frame_clone(frame);
-	queue_frame->clock = ff_clock_retain(decoder->clock);
-
-	if (call_initialize)
-		ff_callbacks_frame_initialize(queue_frame, decoder->callbacks);
-
-	queue_frame->pts = best_effort_pts;
-
-	ff_circular_queue_advance_write(&decoder->frame_queue, queue_frame);
-
-	return true;
-}
-
-void *ff_audio_decoder_thread(void *opaque_audio_decoder)
-{
-	struct ff_decoder *decoder = opaque_audio_decoder;
-
-	struct ff_packet packet = {0};
-	bool frame_complete;
-	AVFrame *frame = av_frame_alloc();
-	int ret;
-
-	while (!decoder->abort) {
-		ret = decode_frame(decoder, &packet, frame, &frame_complete);
-		if (ret == 0) {
-			break;
-		} else if (ret < 0) {
-			av_free_packet(&packet.base);
-			continue;
-		}
-
-		// Did we get a audio frame?
-		if (frame_complete) {
-			// If we don't have a good PTS, try to guess based
-			// on last received PTS provided plus prediction
-			// This function returns a pts scaled to stream
-			// time base
-			double best_effort_pts =
-			 ff_decoder_get_best_effort_pts(decoder, frame);
-			queue_frame(decoder, frame, best_effort_pts);
-			av_frame_unref(frame);
-		}
-
-		av_free_packet(&packet.base);
-	}
-
-	if (decoder->clock != NULL)
-		ff_clock_release(&decoder->clock);
-
-	av_frame_free(&frame);
-
-	decoder->finished = true;
-
-	return NULL;
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-callbacks.c Deleted

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-callbacks.h"
-
-bool ff_callbacks_frame(struct ff_callbacks *callbacks, struct ff_frame *frame)
-{
-	if (callbacks->frame == NULL)
-		return true;
-
-	return callbacks->frame(frame, callbacks->opaque);
-}
-
-bool ff_callbacks_format(struct ff_callbacks *callbacks,
- AVCodecContext *codec_context)
-{
-	if (callbacks->format == NULL)
-		return true;
-
-	return callbacks->format(codec_context, callbacks->opaque);
-}
-
-bool ff_callbacks_initialize(struct ff_callbacks *callbacks)
-{
-	if (callbacks->initialize == NULL)
-		return true;
-
-	return callbacks->initialize(callbacks->opaque);
-}
-
-bool ff_callbacks_frame_initialize(struct ff_frame *frame,
- struct ff_callbacks *callbacks)
-{
-	if (callbacks->frame_initialize == NULL)
-		return true;
-
-	return callbacks->frame_initialize(frame, callbacks->opaque);
-}
-
-bool ff_callbacks_frame_free(struct ff_frame *frame,
- struct ff_callbacks *callbacks)
-{
-	if (callbacks->frame_free == NULL)
-		return true;
-
-	return callbacks->frame_free(frame, callbacks->opaque);
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-callbacks.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include "ff-frame.h"
-
-#include <libavcodec/avcodec.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef bool (*ff_callback_frame)(struct ff_frame *frame, void *opaque);
-typedef bool (*ff_callback_format)(AVCodecContext *codec_context, void *opaque);
-typedef bool (*ff_callback_initialize)(void *opaque);
-
-struct ff_callbacks {
-	ff_callback_frame frame;
-	ff_callback_format format;
-	ff_callback_initialize initialize;
-	ff_callback_frame frame_initialize;
-	ff_callback_frame frame_free;
-	void *opaque;
-};
-
-bool ff_callbacks_frame(struct ff_callbacks *callbacks, struct ff_frame *frame);
-bool ff_callbacks_format(struct ff_callbacks *callbacks,
- AVCodecContext *codec_context);
-bool ff_callbacks_initialize(struct ff_callbacks *callbacks);
-bool ff_callbacks_frame_initialize(struct ff_frame *frame,
- struct ff_callbacks *callbacks);
-bool ff_callbacks_frame_free(struct ff_frame *frame,
- struct ff_callbacks *callbacks);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-circular-queue.c Deleted

@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-circular-queue.h"
-
-static void *queue_fetch_or_alloc(struct ff_circular_queue *cq, int index)
-{
-	if (cq->slotsindex == NULL)
-		cq->slotsindex = av_mallocz(cq->item_size);
-
-	return cq->slotsindex;
-}
-
-static void queue_lock(struct ff_circular_queue *cq)
-{
-	pthread_mutex_lock(&cq->mutex);
-}
-
-static void queue_unlock(struct ff_circular_queue *cq)
-{
-	pthread_mutex_unlock(&cq->mutex);
-}
-
-static void queue_signal(struct ff_circular_queue *cq)
-{
-	pthread_cond_signal(&cq->cond);
-}
-
-static void queue_wait(struct ff_circular_queue *cq)
-{
-	pthread_cond_wait(&cq->cond, &cq->mutex);
-}
-
-bool ff_circular_queue_init(struct ff_circular_queue *cq, int item_size,
- int capacity)
-{
-	memset(cq, 0, sizeof(struct ff_circular_queue));
-
-	cq->item_size = item_size;
-	cq->capacity = capacity;
-	cq->abort = false;
-
-	cq->slots = av_mallocz(capacity * sizeof(void *));
-
-	if (cq->slots == NULL)
-		goto fail;
-
-	cq->size = 0;
-	cq->write_index = 0;
-	cq->read_index = 0;
-
-	if (pthread_mutex_init(&cq->mutex, NULL) != 0)
-		goto fail1;
-
-	if (pthread_cond_init(&cq->cond, NULL) != 0)
-		goto fail2;
-
-	return true;
-
-fail2:
-	pthread_mutex_destroy(&cq->mutex);
-fail1:
-	av_free(cq->slots);
-fail:
-	return false;
-}
-
-void ff_circular_queue_abort(struct ff_circular_queue *cq)
-{
-	queue_lock(cq);
-	cq->abort = true;
-	queue_signal(cq);
-	queue_unlock(cq);
-}
-
-void ff_circular_queue_free(struct ff_circular_queue *cq)
-{
-	ff_circular_queue_abort(cq);
-
-	if (cq->slots != NULL)
-		av_free(cq->slots);
-
-	pthread_mutex_destroy(&cq->mutex);
-	pthread_cond_destroy(&cq->cond);
-}
-
-void ff_circular_queue_wait_write(struct ff_circular_queue *cq)
-{
-	queue_lock(cq);
-
-	while (cq->size >= cq->capacity && !cq->abort)
-		queue_wait(cq);
-
-	queue_unlock(cq);
-}
-
-void *ff_circular_queue_peek_write(struct ff_circular_queue *cq)
-{
-	return queue_fetch_or_alloc(cq, cq->write_index);
-}
-
-void ff_circular_queue_advance_write(struct ff_circular_queue *cq, void *item)
-{
-	cq->slotscq->write_index = item;
-	cq->write_index = (cq->write_index + 1) % cq->capacity;
-
-	queue_lock(cq);
-	++cq->size;
-	queue_unlock(cq);
-}
-
-void *ff_circular_queue_peek_read(struct ff_circular_queue *cq)
-{
-	return queue_fetch_or_alloc(cq, cq->read_index);
-}
-
-void ff_circular_queue_advance_read(struct ff_circular_queue *cq)
-{
-	cq->read_index = (cq->read_index + 1) % cq->capacity;
-	queue_lock(cq);
-	--cq->size;
-	queue_signal(cq);
-	queue_unlock(cq);
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-circular-queue.h Deleted

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <pthread.h>
-#include <libavutil/mem.h>
-#include <stdbool.h>
-
-struct ff_circular_queue {
-	pthread_mutex_t mutex;
-	pthread_cond_t cond;
-
-	void **slots;
-
-	int item_size;
-	int capacity;
-	int size;
-
-	int write_index;
-	int read_index;
-
-	bool abort;
-};
-
-typedef struct ff_circular_queue ff_circular_queue_t;
-
-bool ff_circular_queue_init(struct ff_circular_queue *cq, int item_size,
- int capacity);
-void ff_circular_queue_abort(struct ff_circular_queue *cq);
-void ff_circular_queue_free(struct ff_circular_queue *cq);
-
-void ff_circular_queue_wait_write(struct ff_circular_queue *cq);
-void *ff_circular_queue_peek_write(struct ff_circular_queue *cq);
-void ff_circular_queue_advance_write(struct ff_circular_queue *cq, void *item);
-void *ff_circular_queue_peek_read(struct ff_circular_queue *cq);
-void ff_circular_queue_advance_read(struct ff_circular_queue *cq);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-clock.c Deleted

@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-clock.h"
-#include "ff-threading.h"
-
-#include <libavutil/avutil.h>
-#include <libavutil/time.h>
-
-// Amount of microseconds between checks to see if a clock has started
-#define CLOCK_START_CHECK_INTERVAL 100
-
-double ff_get_sync_clock(struct ff_clock *clock)
-{
-	return clock->sync_clock(clock->opaque);
-}
-
-int64_t ff_clock_start_time(struct ff_clock *clock)
-{
-	int64_t start_time = AV_NOPTS_VALUE;
-
-	pthread_mutex_lock(&clock->mutex);
-	if (clock->started)
-		start_time = clock->start_time;
-	pthread_mutex_unlock(&clock->mutex);
-
-	return start_time;
-}
-
-bool ff_clock_start(struct ff_clock *clock, enum ff_av_sync_type sync_type,
- const bool *abort)
-{
-	bool release = false;
-	bool aborted = false;
-
-	if (clock->sync_type == sync_type && !clock->started) {
-		pthread_mutex_lock(&clock->mutex);
-		if (!clock->started) {
-			clock->start_time = av_gettime();
-			clock->started = true;
-		}
-		pthread_cond_signal(&clock->cond);
-		pthread_mutex_unlock(&clock->mutex);
-	} else {
-		while (!clock->started) {
-			pthread_mutex_lock(&clock->mutex);
-			int64_t current_time =
-			 av_gettime() + CLOCK_START_CHECK_INTERVAL;
-			struct timespec sleep_time = {
-			 .tv_sec = current_time / AV_TIME_BASE,
-			 .tv_nsec =
-			 (current_time % AV_TIME_BASE) * 1000};
-			pthread_cond_timedwait(&clock->cond, &clock->mutex,
-			 &sleep_time);
-
-			aborted = *abort;
-
-			// There is no way anyone can signal us since we are
-			// the only reference
-			if (clock->retain == 1)
-				release = true;
-			pthread_mutex_unlock(&clock->mutex);
-
-			if (aborted || release) {
-				av_log(NULL, AV_LOG_ERROR,
-				 "could not start "
-				 "slave clock as master clock "
-				 "was never started before "
-				 "being released or aborted");
-				break;
-			}
-		}
-	}
-
-	if (release)
-		ff_clock_release(&clock);
-
-	return !release && !aborted;
-}
-
-struct ff_clock *ff_clock_init(void)
-{
-	struct ff_clock *clock = av_mallocz(sizeof(struct ff_clock));
-
-	if (clock == NULL)
-		return NULL;
-
-	if (pthread_mutex_init(&clock->mutex, NULL) != 0)
-		goto fail;
-
-	if (pthread_cond_init(&clock->cond, NULL) != 0)
-		goto fail1;
-
-	return clock;
-
-fail1:
-	pthread_mutex_destroy(&clock->mutex);
-fail:
-	av_free(clock);
-
-	return NULL;
-}
-
-struct ff_clock *ff_clock_retain(struct ff_clock *clock)
-{
-	ff_atomic_inc_long(&clock->retain);
-
-	return clock;
-}
-
-struct ff_clock *ff_clock_move(struct ff_clock **clock)
-{
-	struct ff_clock *retained_clock = ff_clock_retain(*clock);
-	ff_clock_release(clock);
-
-	return retained_clock;
-}
-
-void ff_clock_release(struct ff_clock **clock)
-{
-	if (ff_atomic_dec_long(&(*clock)->retain) == 0) {
-		pthread_cond_destroy(&(*clock)->cond);
-		pthread_mutex_destroy(&(*clock)->mutex);
-		av_free(*clock);
-	}
-
-	*clock = NULL;
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-clock.h Deleted

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#define AV_SYNC_THRESHOLD 0.01
-#define AV_NOSYNC_THRESHOLD 10.0
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <pthread.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum ff_av_sync_type {
-	AV_SYNC_AUDIO_MASTER,
-	AV_SYNC_VIDEO_MASTER,
-	AV_SYNC_EXTERNAL_MASTER,
-};
-
-typedef double (*ff_sync_clock)(void *opaque);
-
-struct ff_clock {
-	ff_sync_clock sync_clock;
-	enum ff_av_sync_type sync_type;
-	uint64_t start_time;
-
-	pthread_mutex_t mutex;
-	pthread_cond_t cond;
-	volatile long retain;
-	bool started;
-
-	void *opaque;
-};
-
-typedef struct ff_clock ff_clock_t;
-
-struct ff_clock *ff_clock_init(void);
-double ff_get_sync_clock(struct ff_clock *clock);
-struct ff_clock *ff_clock_retain(struct ff_clock *clock);
-struct ff_clock *ff_clock_move(struct ff_clock **clock);
-void ff_clock_release(struct ff_clock **clock);
-
-int64_t ff_clock_start_time(struct ff_clock *clock);
-bool ff_clock_start(struct ff_clock *clock, enum ff_av_sync_type sync_type,
- const bool *abort);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-compat.h Deleted

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016 Hugh Bailey <obs.jim@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#if LIBAVCODEC_VERSION_MAJOR >= 57
-#define av_free_packet av_packet_unref
-static inline int av_dup_packet_2(AVPacket *pkt)
-{
-	AVPacket tmp = *pkt;
-	int ret = av_packet_ref(pkt, &tmp);
-	av_packet_unref(&tmp);
-	return ret;
-}
-#define av_dup_packet av_dup_packet_2
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-decoder.c Deleted

@@ -1,387 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-decoder.h"
-
-#include <libavutil/time.h>
-#include <assert.h>
-
-typedef void *(*ff_decoder_thread_t)(void *opaque_decoder);
-
-extern void *ff_audio_decoder_thread(void *opaque_audio_decoder);
-extern void *ff_video_decoder_thread(void *opaque_video_decoder);
-
-struct ff_decoder *ff_decoder_init(AVCodecContext *codec_context,
- AVStream *stream,
- unsigned int packet_queue_size,
- unsigned int frame_queue_size)
-{
-	bool success;
-
-	assert(codec_context != NULL);
-	assert(stream != NULL);
-
-	struct ff_decoder *decoder = av_mallocz(sizeof(struct ff_decoder));
-
-	if (decoder == NULL)
-		goto fail;
-
-	decoder->codec = codec_context;
-	decoder->codec->opaque = decoder;
-	decoder->stream = stream;
-	decoder->abort = false;
-	decoder->finished = false;
-
-	decoder->packet_queue_size = packet_queue_size;
-	if (!packet_queue_init(&decoder->packet_queue))
-		goto fail1;
-
-	decoder->timer_next_wake = (double)av_gettime() / 1000000.0;
-	decoder->previous_pts_diff = 40e-3;
-	decoder->current_pts_time = av_gettime();
-	decoder->start_pts = 0;
-	decoder->predicted_pts = 0;
-	decoder->first_frame = true;
-
-	success = ff_timer_init(&decoder->refresh_timer, ff_decoder_refresh,
-	 decoder);
-	if (!success)
-		goto fail2;
-
-	success = ff_circular_queue_init(&decoder->frame_queue,
-	 sizeof(struct ff_frame),
-	 frame_queue_size);
-	if (!success)
-		goto fail3;
-
-	return decoder;
-
-fail3:
-	ff_timer_free(&decoder->refresh_timer);
-fail2:
-	packet_queue_free(&decoder->packet_queue);
-fail1:
-	av_free(decoder);
-fail:
-	return NULL;
-}
-
-bool ff_decoder_start(struct ff_decoder *decoder)
-{
-	assert(decoder != NULL);
-
-	ff_decoder_thread_t decoder_thread;
-	if (decoder->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-		decoder_thread = ff_audio_decoder_thread;
-	} else if (decoder->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-		decoder_thread = ff_video_decoder_thread;
-	} else {
-		av_log(NULL, AV_LOG_ERROR, "no decoder found for type %d",
-		 decoder->codec->codec_type);
-		return false;
-	}
-
-	ff_decoder_schedule_refresh(decoder, 40);
-
-	return (pthread_create(&decoder->decoder_thread, NULL, decoder_thread,
-	 decoder) != 0);
-}
-
-void ff_decoder_free(struct ff_decoder *decoder)
-{
-	void *decoder_thread_result;
-	int i;
-
-	assert(decoder != NULL);
-
-	decoder->abort = true;
-
-	ff_circular_queue_abort(&decoder->frame_queue);
-	packet_queue_abort(&decoder->packet_queue);
-
-	ff_timer_free(&decoder->refresh_timer);
-
-	pthread_join(decoder->decoder_thread, &decoder_thread_result);
-
-	for (i = 0; i < decoder->frame_queue.capacity; i++) {
-		void *item = decoder->frame_queue.slotsi;
-		struct ff_frame *frame = (struct ff_frame *)item;
-
-		ff_callbacks_frame_free(frame, decoder->callbacks);
-
-		if (frame != NULL) {
-			if (frame->frame != NULL)
-				av_frame_unref(frame->frame);
-			if (frame->clock != NULL)
-				ff_clock_release(&frame->clock);
-			av_free(frame);
-		}
-	}
-
-	packet_queue_free(&decoder->packet_queue);
-	ff_circular_queue_free(&decoder->frame_queue);
-
-	avcodec_close(decoder->codec);
-
-	av_free(decoder);
-}
-
-void ff_decoder_schedule_refresh(struct ff_decoder *decoder, int delay)
-{
-	ff_timer_schedule(&decoder->refresh_timer, 1000 * delay);
-}
-
-double ff_decoder_clock(void *opaque)
-{
-	struct ff_decoder *decoder = opaque;
-	double delta = (av_gettime() - decoder->current_pts_time) / 1000000.0;
-	return decoder->current_pts + delta;
-}
-
-static double get_sync_adjusted_pts_diff(struct ff_clock *clock, double pts,
- double pts_diff)
-{
-	double new_pts_diff = pts_diff;
-	double sync_time = ff_get_sync_clock(clock);
-	double diff = pts - sync_time;
-	double sync_threshold;
-
-	sync_threshold = (pts_diff > AV_SYNC_THRESHOLD) ? pts_diff
-	 : AV_SYNC_THRESHOLD;
-
-	if (fabs(diff) < AV_NOSYNC_THRESHOLD) {
-		if (diff <= -sync_threshold) {
-			new_pts_diff = 0;
-
-		} else if (diff >= sync_threshold) {
-			new_pts_diff = 2 * pts_diff;
-		}
-	}
-
-	return new_pts_diff;
-}
-
-void ff_decoder_refresh(void *opaque)
-{
-	struct ff_decoder *decoder = (struct ff_decoder *)opaque;
-
-	struct ff_frame *frame;
-
-	if (decoder->stream) {
-		if (decoder->frame_queue.size == 0) {
-			if (!decoder->eof || !decoder->finished) {
-				// We expected a frame, but there were none
-				// available
-
-				// Schedule another call as soon as possible
-				ff_decoder_schedule_refresh(decoder, 1);
-			} else {
-				ff_callbacks_frame(decoder->callbacks, NULL);
-				decoder->refresh_timer.abort = true;
-				// no more refreshes, we are at the eof
-				av_log(NULL, AV_LOG_INFO,
-				 "refresh timer stopping; eof");
-				return;
-			}
-		} else {
-			double pts_diff;
-			double delay_until_next_wake;
-			bool late_first_frame = false;
-
-			frame = ff_circular_queue_peek_read(
-			 &decoder->frame_queue);
-
-			// Get frame clock and start it if needed
-			ff_clock_t *clock = ff_clock_move(&frame->clock);
-			if (!ff_clock_start(clock, decoder->natural_sync_clock,
-			 &decoder->refresh_timer.abort)) {
-				ff_clock_release(&clock);
-
-				// Our clock was never started and deleted or
-				// aborted
-
-				if (decoder->refresh_timer.abort) {
-					av_log(NULL, AV_LOG_INFO,
-					 "refresh timer aborted");
-					return;
-				}
-
-				// Drop this frame? The only way this can happen
-				// is if one stream finishes before another and
-				// the input is looping or canceled. Until we
-				// get another clock we will unable to continue
-
-				ff_decoder_schedule_refresh(decoder, 100);
-
-				// Drop this frame as we have no way of timing
-				// it
-				ff_circular_queue_advance_read(
-				 &decoder->frame_queue);
-				return;
-			}
-
-			decoder->current_pts = frame->pts;
-			decoder->current_pts_time = av_gettime();
-
-			// the amount of time until we need to display this
-			// frame
-			pts_diff = frame->pts - decoder->previous_pts;
-
-			// if the first frame is a very large value, we've most
-			// likely started mid-stream, and the initial diff
-			// should be ignored.
-			if (decoder->first_frame) {
-				late_first_frame = pts_diff >= 1.0;
-				decoder->first_frame = false;
-			}
-
-			if (pts_diff <= 0 || late_first_frame) {
-				// if diff is invalid, use previous
-				pts_diff = decoder->previous_pts_diff;
-			}
-
-			// save for next time
-			decoder->previous_pts_diff = pts_diff;
-			decoder->previous_pts = frame->pts;
-
-			// if not synced against natural clock
-			if (clock->sync_type != decoder->natural_sync_clock) {
-				pts_diff = get_sync_adjusted_pts_diff(
-				 clock, frame->pts, pts_diff);
-			}
-
-			decoder->timer_next_wake += pts_diff;
-
-			// compute the amount of time until next refresh
-			delay_until_next_wake = decoder->timer_next_wake -
-			 (av_gettime() / 1000000.0L);
-			if (delay_until_next_wake < 0.010L) {
-				delay_until_next_wake = 0.010L;
-			}
-
-			if (delay_until_next_wake > pts_diff)
-				delay_until_next_wake = pts_diff;
-
-			ff_clock_release(&clock);
-			ff_callbacks_frame(decoder->callbacks, frame);
-
-			ff_decoder_schedule_refresh(
-			 decoder,
-			 (int)(delay_until_next_wake * 1000 + 0.5L));
-
-			av_frame_free(&frame->frame);
-
-			ff_circular_queue_advance_read(&decoder->frame_queue);
-		}
-	} else {
-		ff_decoder_schedule_refresh(decoder, 100);
-	}
-}
-
-bool ff_decoder_full(struct ff_decoder *decoder)
-{
-	if (decoder == NULL)
-		return false;
-
-	return (decoder->packet_queue.total_size > decoder->packet_queue_size);
-}
-
-bool ff_decoder_accept(struct ff_decoder *decoder, struct ff_packet *packet)
-{
-	if (decoder && packet->base.stream_index == decoder->stream->index) {
-		packet_queue_put(&decoder->packet_queue, packet);
-		return true;
-	}
-
-	return false;
-}
-
-double ff_decoder_get_best_effort_pts(struct ff_decoder *decoder,
- AVFrame *frame)
-{
-	// this is how long each frame is added to the amount of repeated frames
-	// according to the codec
-	double estimated_frame_delay;
-	int64_t best_effort_pts;
-	double d_pts;
-
-	// This function is ffmpeg only, replace with frame->pkt_pts
-	// if you are trying to compile for libav as a temporary
-	// measure
-	best_effort_pts = av_frame_get_best_effort_timestamp(frame);
-
-	if (best_effort_pts != AV_NOPTS_VALUE) {
-		// Fix the first pts if less than start_pts
-		if (best_effort_pts < decoder->start_pts) {
-			if (decoder->first_frame) {
-				best_effort_pts = decoder->start_pts;
-			} else {
-				av_log(NULL, AV_LOG_WARNING,
-				 "multiple pts < "
-				 "start_pts; setting start pts "
-				 "to 0");
-				decoder->start_pts = 0;
-			}
-		}
-
-		best_effort_pts -= decoder->start_pts;
-
-		// Since the best effort pts came from the stream we use his
-		// time base
-		d_pts = best_effort_pts * av_q2d(decoder->stream->time_base);
-		decoder->predicted_pts = d_pts;
-	} else {
-		d_pts = decoder->predicted_pts;
-	}
-
-	// Update our predicted pts to include the repeated picture count
-	// Our predicted pts clock is based on the codecs time base
-	estimated_frame_delay = av_frame_get_pkt_duration(frame) *
-	 av_q2d(decoder->codec->time_base);
-	// Add repeat frame delay
-	estimated_frame_delay +=
-	 frame->repeat_pict / (1.0L / estimated_frame_delay);
-
-	decoder->predicted_pts += estimated_frame_delay;
-
-	return d_pts;
-}
-
-bool ff_decoder_set_frame_drop_state(struct ff_decoder *decoder,
- int64_t start_time, int64_t pts)
-{
-	if (pts != AV_NOPTS_VALUE) {
-		int64_t rescaled_pts = av_rescale_q(
-		 pts, decoder->stream->time_base, AV_TIME_BASE_Q);
-		int64_t master_clock = av_gettime() - start_time;
-
-		int64_t diff = master_clock - rescaled_pts;
-
-		if (diff > (AV_TIME_BASE / 2)) {
-			decoder->codec->skip_frame = decoder->frame_drop;
-			decoder->codec->skip_idct = decoder->frame_drop;
-			decoder->codec->skip_loop_filter = decoder->frame_drop;
-			return true;
-		} else {
-			decoder->codec->skip_frame = AVDISCARD_DEFAULT;
-			decoder->codec->skip_idct = AVDISCARD_DEFAULT;
-			decoder->codec->skip_loop_filter = AVDISCARD_DEFAULT;
-			return false;
-		}
-	}
-
-	return false;
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-decoder.h Deleted

@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include "ff-callbacks.h"
-#include "ff-circular-queue.h"
-#include "ff-clock.h"
-#include "ff-packet-queue.h"
-#include "ff-timer.h"
-
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ff_decoder {
-	AVCodecContext *codec;
-	AVStream *stream;
-
-	pthread_t decoder_thread;
-	struct ff_timer refresh_timer;
-
-	struct ff_callbacks *callbacks;
-	struct ff_packet_queue packet_queue;
-	struct ff_circular_queue frame_queue;
-	unsigned int packet_queue_size;
-
-	double timer_next_wake;
-	double previous_pts; // previous decoded frame's pts
-	double previous_pts_diff; // previous decoded frame pts delay
-	double predicted_pts; // predicted pts of next frame
-	double current_pts; // pts of the most recently dispatched frame
-	int64_t current_pts_time; // clock time when current_pts was set
-	int64_t start_pts;
-
-	bool hwaccel_decoder;
-	enum AVDiscard frame_drop;
-	struct ff_clock *clock;
-	enum ff_av_sync_type natural_sync_clock;
-
-	bool first_frame;
-	bool eof;
-	bool abort;
-	bool finished;
-};
-
-typedef struct ff_decoder ff_decoder_t;
-
-struct ff_decoder *ff_decoder_init(AVCodecContext *codec_context,
- AVStream *stream,
- unsigned int packet_queue_size,
- unsigned int frame_queue_size);
-bool ff_decoder_start(struct ff_decoder *decoder);
-void ff_decoder_free(struct ff_decoder *decoder);
-
-bool ff_decoder_full(struct ff_decoder *decoder);
-bool ff_decoder_accept(struct ff_decoder *decoder, struct ff_packet *packet);
-
-double ff_decoder_clock(void *opaque);
-
-void ff_decoder_schedule_refresh(struct ff_decoder *decoder, int delay);
-void ff_decoder_refresh(void *opaque);
-
-double ff_decoder_get_best_effort_pts(struct ff_decoder *decoder,
- AVFrame *frame);
-
-bool ff_decoder_set_frame_drop_state(struct ff_decoder *decoder,
- int64_t start_time, int64_t pts);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-demuxer.c Deleted

@@ -1,627 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-demuxer.h"
-
-#include <libavutil/avstring.h>
-#include <libavutil/time.h>
-#include <libavdevice/avdevice.h>
-#include <libavfilter/avfilter.h>
-
-#include <assert.h>
-
-#include "ff-compat.h"
-
-#define DEFAULT_AV_SYNC_TYPE AV_SYNC_VIDEO_MASTER
-
-#define AUDIO_FRAME_QUEUE_SIZE 1
-#define VIDEO_FRAME_QUEUE_SIZE 1
-
-#define AUDIO_PACKET_QUEUE_SIZE (5 * 16 * 1024)
-#define VIDEO_PACKET_QUEUE_SIZE (5 * 256 * 1024)
-
-static void *demux_thread(void *opaque_demuxer);
-
-struct ff_demuxer *ff_demuxer_init()
-{
-	struct ff_demuxer *demuxer;
-
-	av_register_all();
-	avdevice_register_all();
-	avfilter_register_all();
-	avformat_network_init();
-
-	demuxer = av_mallocz(sizeof(struct ff_demuxer));
-	if (demuxer == NULL)
-		return NULL;
-
-	demuxer->clock.sync_type = DEFAULT_AV_SYNC_TYPE;
-	demuxer->options.frame_drop = AVDISCARD_DEFAULT;
-	demuxer->options.audio_frame_queue_size = AUDIO_FRAME_QUEUE_SIZE;
-	demuxer->options.video_frame_queue_size = VIDEO_FRAME_QUEUE_SIZE;
-	demuxer->options.audio_packet_queue_size = AUDIO_PACKET_QUEUE_SIZE;
-	demuxer->options.video_packet_queue_size = VIDEO_PACKET_QUEUE_SIZE;
-	demuxer->options.is_hw_decoding = false;
-
-	return demuxer;
-}
-
-bool ff_demuxer_open(struct ff_demuxer *demuxer, char *input,
- char *input_format)
-{
-	int ret;
-
-	demuxer->input = av_strdup(input);
-	if (input_format != NULL)
-		demuxer->input_format = av_strdup(input_format);
-
-	ret = pthread_create(&demuxer->demuxer_thread, NULL, demux_thread,
-	 demuxer);
-	return ret == 0;
-}
-
-void ff_demuxer_free(struct ff_demuxer *demuxer)
-{
-	void *demuxer_thread_result;
-
-	demuxer->abort = true;
-
-	pthread_join(demuxer->demuxer_thread, &demuxer_thread_result);
-
-	if (demuxer->input != NULL)
-		av_free(demuxer->input);
-
-	if (demuxer->input_format != NULL)
-		av_free(demuxer->input_format);
-
-	if (demuxer->audio_decoder != NULL)
-		ff_decoder_free(demuxer->audio_decoder);
-
-	if (demuxer->video_decoder != NULL)
-		ff_decoder_free(demuxer->video_decoder);
-
-	if (demuxer->format_context)
-		avformat_close_input(&demuxer->format_context);
-
-	av_free(demuxer);
-}
-
-void ff_demuxer_set_callbacks(struct ff_callbacks *callbacks,
- ff_callback_frame frame,
- ff_callback_format format,
- ff_callback_initialize initialize,
- ff_callback_frame frame_initialize,
- ff_callback_frame frame_free, void *opaque)
-{
-	callbacks->opaque = opaque;
-	callbacks->frame = frame;
-	callbacks->format = format;
-	callbacks->initialize = initialize;
-	callbacks->frame_initialize = frame_initialize;
-	callbacks->frame_free = frame_free;
-}
-
-static int demuxer_interrupted_callback(void *opaque)
-{
-	return opaque != NULL && ((struct ff_demuxer *)opaque)->abort;
-}
-
-static double ff_external_clock(void *opaque)
-{
-	(void)opaque;
-
-	return av_gettime() / 1000000.0;
-}
-
-static bool set_clock_sync_type(struct ff_demuxer *demuxer)
-{
-	if (demuxer->video_decoder == NULL) {
-		if (demuxer->clock.sync_type == AV_SYNC_VIDEO_MASTER)
-			demuxer->clock.sync_type = AV_SYNC_AUDIO_MASTER;
-	}
-
-	if (demuxer->audio_decoder == NULL) {
-		if (demuxer->clock.sync_type == AV_SYNC_AUDIO_MASTER)
-			demuxer->clock.sync_type = AV_SYNC_VIDEO_MASTER;
-	}
-
-	switch (demuxer->clock.sync_type) {
-	case AV_SYNC_AUDIO_MASTER:
-		demuxer->clock.sync_clock = ff_decoder_clock;
-		demuxer->clock.opaque = demuxer->audio_decoder;
-		break;
-	case AV_SYNC_VIDEO_MASTER:
-		demuxer->clock.sync_clock = ff_decoder_clock;
-		demuxer->clock.opaque = demuxer->video_decoder;
-		break;
-	case AV_SYNC_EXTERNAL_MASTER:
-		demuxer->clock.sync_clock = ff_external_clock;
-		demuxer->clock.opaque = NULL;
-		break;
-	default:
-		return false;
-	}
-
-	return true;
-}
-
-AVHWAccel *find_hwaccel_codec(AVCodecContext *codec_context)
-{
-	AVHWAccel *hwaccel = NULL;
-
-	while ((hwaccel = av_hwaccel_next(hwaccel)) != NULL) {
-		if (hwaccel->id == codec_context->codec_id &&
-		 (hwaccel->pix_fmt == AV_PIX_FMT_VDA_VLD ||
-		 hwaccel->pix_fmt == AV_PIX_FMT_DXVA2_VLD ||
-		 hwaccel->pix_fmt == AV_PIX_FMT_VAAPI_VLD)) {
-			return hwaccel;
-		}
-	}
-
-	return NULL;
-}
-
-enum AVPixelFormat get_hwaccel_format(struct AVCodecContext *s,
- const enum AVPixelFormat *fmt)
-{
-	(void)s;
-	(void)fmt;
-
-	// for now force output to common denominator
-	return AV_PIX_FMT_YUV420P;
-}
-
-static bool initialize_decoder(struct ff_demuxer *demuxer,
- AVCodecContext *codec_context, AVStream *stream,
- bool hwaccel_decoder)
-{
-	switch (codec_context->codec_type) {
-	case AVMEDIA_TYPE_AUDIO:
-		demuxer->audio_decoder = ff_decoder_init(
-		 codec_context, stream,
-		 demuxer->options.audio_packet_queue_size,
-		 demuxer->options.audio_frame_queue_size);
-
-		demuxer->audio_decoder->hwaccel_decoder = hwaccel_decoder;
-		demuxer->audio_decoder->frame_drop =
-		 demuxer->options.frame_drop;
-		demuxer->audio_decoder->natural_sync_clock =
-		 AV_SYNC_AUDIO_MASTER;
-		demuxer->audio_decoder->callbacks = &demuxer->audio_callbacks;
-
-		if (!ff_callbacks_format(&demuxer->audio_callbacks,
-		 codec_context)) {
-			ff_decoder_free(demuxer->audio_decoder);
-			demuxer->audio_decoder = NULL;
-			return false;
-		}
-
-		demuxer->audio_decoder = demuxer->audio_decoder;
-		return true;
-
-	case AVMEDIA_TYPE_VIDEO:
-		demuxer->video_decoder = ff_decoder_init(
-		 codec_context, stream,
-		 demuxer->options.video_packet_queue_size,
-		 demuxer->options.video_frame_queue_size);
-
-		demuxer->video_decoder->hwaccel_decoder = hwaccel_decoder;
-		demuxer->video_decoder->frame_drop =
-		 demuxer->options.frame_drop;
-		demuxer->video_decoder->natural_sync_clock =
-		 AV_SYNC_VIDEO_MASTER;
-		demuxer->video_decoder->callbacks = &demuxer->video_callbacks;
-
-		if (!ff_callbacks_format(&demuxer->video_callbacks,
-		 codec_context)) {
-			ff_decoder_free(demuxer->video_decoder);
-			demuxer->video_decoder = NULL;
-			return false;
-		}
-
-		return true;
-	default:
-		return false;
-	}
-}
-
-typedef enum AVPixelFormat (*AVGetFormatCb)(struct AVCodecContext *s,
- const enum AVPixelFormat *fmt);
-
-static bool find_decoder(struct ff_demuxer *demuxer, AVStream *stream)
-{
-	AVCodecContext *codec_context = NULL;
-	AVCodec *codec = NULL;
-	AVDictionary *options_dict = NULL;
-	int ret;
-
-	bool hwaccel_decoder = false;
-	codec_context = stream->codec;
-
-	// enable reference counted frames since we may have a buffer size
-	// > 1
-	codec_context->refcounted_frames = 1;
-
-	// png/tiff decoders have serious issues with multiple threads
-	if (codec_context->codec_id == AV_CODEC_ID_PNG ||
-	 codec_context->codec_id == AV_CODEC_ID_TIFF ||
-	 codec_context->codec_id == AV_CODEC_ID_JPEG2000 ||
-	 codec_context->codec_id == AV_CODEC_ID_WEBP)
-		codec_context->thread_count = 1;
-
-	if (demuxer->options.is_hw_decoding) {
-		AVHWAccel *hwaccel = find_hwaccel_codec(codec_context);
-
-		if (hwaccel) {
-			AVCodec *codec_vda =
-			 avcodec_find_decoder_by_name(hwaccel->name);
-
-			if (codec_vda != NULL) {
-				AVGetFormatCb original_get_format =
-				 codec_context->get_format;
-
-				codec_context->get_format = get_hwaccel_format;
-				codec_context->opaque = hwaccel;
-
-				ret = avcodec_open2(codec_context, codec_vda,
-				 &options_dict);
-				if (ret < 0) {
-					av_log(NULL, AV_LOG_WARNING,
-					 "no hardware decoder found for"
-					 " codec with id %d",
-					 codec_context->codec_id);
-					codec_context->get_format =
-					 original_get_format;
-					codec_context->opaque = NULL;
-				} else {
-					codec = codec_vda;
-					hwaccel_decoder = true;
-				}
-			}
-		}
-	}
-
-	if (codec == NULL) {
-		if (codec_context->codec_id == AV_CODEC_ID_VP8)
-			codec = avcodec_find_decoder_by_name("libvpx");
-		else if (codec_context->codec_id == AV_CODEC_ID_VP9)
-			codec = avcodec_find_decoder_by_name("libvpx-vp9");
-
-		if (!codec)
-			codec = avcodec_find_decoder(codec_context->codec_id);
-		if (codec == NULL) {
-			av_log(NULL, AV_LOG_WARNING,
-			 "no decoder found for"
-			 " codec with id %d",
-			 codec_context->codec_id);
-			return false;
-		}
-		if (avcodec_open2(codec_context, codec, &options_dict) < 0) {
-			av_log(NULL, AV_LOG_WARNING,
-			 "unable to open decoder"
-			 " with codec id %d",
-			 codec_context->codec_id);
-			return false;
-		}
-	}
-
-	return initialize_decoder(demuxer, codec_context, stream,
-	 hwaccel_decoder);
-}
-
-void ff_demuxer_flush(struct ff_demuxer *demuxer)
-{
-	if (demuxer->video_decoder != NULL &&
-	 demuxer->video_decoder->stream != NULL) {
-		packet_queue_flush(&demuxer->video_decoder->packet_queue);
-		packet_queue_put_flush_packet(
-		 &demuxer->video_decoder->packet_queue);
-	}
-
-	if (demuxer->audio_decoder != NULL &&
-	 demuxer->audio_decoder->stream != NULL) {
-		packet_queue_flush(&demuxer->audio_decoder->packet_queue);
-		packet_queue_put_flush_packet(
-		 &demuxer->audio_decoder->packet_queue);
-	}
-}
-
-void ff_demuxer_reset(struct ff_demuxer *demuxer)
-{
-	struct ff_packet packet = {0};
-	struct ff_clock *clock = ff_clock_init();
-	clock->sync_type = demuxer->clock.sync_type;
-	clock->sync_clock = demuxer->clock.sync_clock;
-	clock->opaque = demuxer->clock.opaque;
-
-	packet.clock = clock;
-
-	if (demuxer->audio_decoder != NULL) {
-		ff_clock_retain(clock);
-		packet_queue_put(&demuxer->audio_decoder->packet_queue,
-		 &packet);
-	}
-
-	if (demuxer->video_decoder != NULL) {
-		ff_clock_retain(clock);
-		packet_queue_put(&demuxer->video_decoder->packet_queue,
-		 &packet);
-	}
-}
-
-static bool open_input(struct ff_demuxer *demuxer,
- AVFormatContext **format_context)
-{
-	AVInputFormat *input_format = NULL;
-
-	AVIOInterruptCB interrupted_callback;
-	interrupted_callback.callback = demuxer_interrupted_callback;
-	interrupted_callback.opaque = demuxer;
-
-	*format_context = avformat_alloc_context();
-	(*format_context)->interrupt_callback = interrupted_callback;
-
-	if (demuxer->input_format != NULL) {
-		input_format = av_find_input_format(demuxer->input_format);
-		if (input_format == NULL)
-			av_log(NULL, AV_LOG_WARNING,
-			 "unable to find input "
-			 "format %s",
-			 demuxer->input_format);
-	}
-
-	if (avformat_open_input(format_context, demuxer->input, input_format,
-	 &demuxer->options.custom_options) != 0)
-		return false;
-
-	return avformat_find_stream_info(*format_context, NULL) >= 0;
-}
-
-static inline void set_decoder_start_time(struct ff_decoder *decoder,
- int64_t start_time)
-{
-	if (decoder)
-		decoder->start_pts = av_rescale_q(start_time, AV_TIME_BASE_Q,
-		 decoder->stream->time_base);
-}
-
-static bool find_and_initialize_stream_decoders(struct ff_demuxer *demuxer)
-{
-	AVFormatContext *format_context = demuxer->format_context;
-	unsigned int i;
-	AVStream *audio_stream = NULL;
-	AVStream *video_stream = NULL;
-	int64_t start_time = INT64_MAX;
-
-	for (i = 0; i < format_context->nb_streams; i++) {
-		AVCodecContext *codec = format_context->streamsi->codec;
-
-		if (codec->codec_type == AVMEDIA_TYPE_VIDEO && !video_stream)
-			video_stream = format_context->streamsi;
-
-		if (codec->codec_type == AVMEDIA_TYPE_AUDIO && !audio_stream)
-			audio_stream = format_context->streamsi;
-	}
-
-	int default_stream_index =
-	 av_find_default_stream_index(demuxer->format_context);
-
-	if (default_stream_index >= 0) {
-		AVStream *stream =
-		 format_context->streamsdefault_stream_index;
-
-		if (stream->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-			demuxer->clock.sync_type = AV_SYNC_AUDIO_MASTER;
-		else if (stream->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-			demuxer->clock.sync_type = AV_SYNC_VIDEO_MASTER;
-	}
-
-	if (video_stream != NULL)
-		find_decoder(demuxer, video_stream);
-
-	if (audio_stream != NULL)
-		find_decoder(demuxer, audio_stream);
-
-	if (demuxer->video_decoder == NULL && demuxer->audio_decoder == NULL) {
-		return false;
-	}
-
-	if (!set_clock_sync_type(demuxer)) {
-		return false;
-	}
-
-	for (i = 0; i < format_context->nb_streams; i++) {
-		AVStream *st = format_context->streamsi;
-		int64_t st_start_time;
-
-		if (st->discard == AVDISCARD_ALL ||
-		 st->start_time == AV_NOPTS_VALUE) {
-			continue;
-		}
-
-		st_start_time = av_rescale_q(st->start_time, st->time_base,
-		 AV_TIME_BASE_Q);
-		start_time = FFMIN(start_time, st_start_time);
-	}
-
-	if (format_context->start_time != AV_NOPTS_VALUE) {
-		if (start_time > format_context->start_time ||
-		 start_time == INT64_MAX) {
-			start_time = format_context->start_time;
-		}
-	}
-
-	if (start_time != INT64_MAX) {
-		set_decoder_start_time(demuxer->video_decoder, start_time);
-		set_decoder_start_time(demuxer->audio_decoder, start_time);
-	}
-
-	if (demuxer->audio_decoder != NULL) {
-		if (ff_callbacks_initialize(&demuxer->audio_callbacks)) {
-			ff_decoder_start(demuxer->audio_decoder);
-		} else {
-			ff_decoder_free(demuxer->audio_decoder);
-			demuxer->audio_decoder = NULL;
-			if (!set_clock_sync_type(demuxer))
-				return false;
-		}
-	}
-
-	if (demuxer->video_decoder != NULL) {
-		if (ff_callbacks_initialize(&demuxer->video_callbacks)) {
-			ff_decoder_start(demuxer->video_decoder);
-		} else {
-			ff_decoder_free(demuxer->video_decoder);
-			demuxer->video_decoder = NULL;
-			if (!set_clock_sync_type(demuxer))
-				return false;
-		}
-	}
-
-	return set_clock_sync_type(demuxer);
-}
-
-static bool handle_seek(struct ff_demuxer *demuxer)
-{
-	int ret;
-
-	if (demuxer->seek_request) {
-		AVStream *seek_stream = NULL;
-		int64_t seek_target = demuxer->seek_pos;
-
-		if (demuxer->video_decoder != NULL) {
-			seek_stream = demuxer->video_decoder->stream;
-
-		} else if (demuxer->audio_decoder != NULL) {
-			seek_stream = demuxer->audio_decoder->stream;
-		}
-
-		if (seek_stream != NULL &&
-		 demuxer->format_context->duration != AV_NOPTS_VALUE) {
-			seek_target = av_rescale_q(seek_target, AV_TIME_BASE_Q,
-			 seek_stream->time_base);
-		}
-
-		ret = av_seek_frame(demuxer->format_context, 0, seek_target,
-		 demuxer->seek_flags);
-		if (ret < 0) {
-			av_log(NULL, AV_LOG_ERROR, "unable to seek stream: %s",
-			 av_err2str(ret));
-			demuxer->seek_pos = 0;
-			demuxer->seek_request = false;
-			return false;
-
-		} else {
-			if (demuxer->seek_flush)
-				ff_demuxer_flush(demuxer);
-			ff_demuxer_reset(demuxer);
-		}
-
-		demuxer->seek_request = false;
-	}
-	return true;
-}
-
-static void seek_beginning(struct ff_demuxer *demuxer)
-{
-	if (demuxer->format_context->duration == AV_NOPTS_VALUE) {
-		demuxer->seek_flags = AVSEEK_FLAG_FRAME;
-		demuxer->seek_pos = 0;
-	} else {
-		demuxer->seek_flags = AVSEEK_FLAG_BACKWARD;
-		demuxer->seek_pos = demuxer->format_context->start_time;
-	}
-	demuxer->seek_request = true;
-	demuxer->seek_flush = false;
-	av_log(NULL, AV_LOG_VERBOSE, "looping media %s", demuxer->input);
-}
-
-static void *demux_thread(void *opaque)
-{
-	struct ff_demuxer *demuxer = (struct ff_demuxer *)opaque;
-	int result;
-
-	struct ff_packet packet = {0};
-
-	if (!open_input(demuxer, &demuxer->format_context))
-		goto fail;
-
-	av_dump_format(demuxer->format_context, 0, demuxer->input, 0);
-
-	if (!find_and_initialize_stream_decoders(demuxer))
-		goto fail;
-
-	ff_demuxer_reset(demuxer);
-
-	while (!demuxer->abort) {
-		// failed to seek (looping?)
-		if (!handle_seek(demuxer))
-			break;
-
-		if (ff_decoder_full(demuxer->audio_decoder) ||
-		 ff_decoder_full(demuxer->video_decoder)) {
-			av_usleep(10 * 1000); // 10ms
-			continue;
-		}
-
-		result = av_read_frame(demuxer->format_context, &packet.base);
-		if (result < 0) {
-			bool eof = false;
-			if (result == AVERROR_EOF) {
-				eof = true;
-			} else if (demuxer->format_context->pb != NULL) {
-				AVIOContext *io_context =
-				 demuxer->format_context->pb;
-				if (io_context->error == 0) {
-					av_usleep(100 * 1000); // 100ms
-					continue;
-				} else {
-					if (io_context->eof_reached != 0)
-						eof = true;
-				}
-			}
-
-			if (eof) {
-				if (demuxer->options.is_looping) {
-					seek_beginning(demuxer);
-				} else {
-					break;
-				}
-				continue;
-			} else {
-				av_log(NULL, AV_LOG_ERROR,
-				 "av_read_frame() failed: %s",
-				 av_err2str(result));
-				break;
-			}
-		}
-
-		if (ff_decoder_accept(demuxer->video_decoder, &packet))
-			continue;
-		else if (ff_decoder_accept(demuxer->audio_decoder, &packet))
-			continue;
-		else
-			av_free_packet(&packet.base);
-	}
-	if (demuxer->audio_decoder != NULL)
-		demuxer->audio_decoder->eof = true;
-	if (demuxer->video_decoder != NULL)
-		demuxer->video_decoder->eof = true;
-fail:
-	demuxer->abort = true;
-
-	return NULL;
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-demuxer.h Deleted

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include "ff-circular-queue.h"
-#include "ff-decoder.h"
-#include "ff-packet-queue.h"
-
-#include <libavformat/avformat.h>
-
-#define FF_DEMUXER_FAIL -1
-#define FF_DEMUXER_SUCCESS 1
-
-#include "ff-callbacks.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ff_demuxer_options {
-	int audio_packet_queue_size;
-	int video_packet_queue_size;
-	int audio_frame_queue_size;
-	int video_frame_queue_size;
-	bool is_hw_decoding;
-	bool is_looping;
-	enum AVDiscard frame_drop;
-	AVDictionary *custom_options;
-};
-
-typedef struct ff_demuxer_options ff_demuxer_options_t;
-
-struct ff_demuxer {
-	AVIOContext *io_context;
-	AVFormatContext *format_context;
-
-	struct ff_clock clock;
-
-	struct ff_demuxer_options options;
-
-	struct ff_decoder *audio_decoder;
-	struct ff_callbacks audio_callbacks;
-
-	struct ff_decoder *video_decoder;
-	struct ff_callbacks video_callbacks;
-
-	pthread_t demuxer_thread;
-
-	int64_t seek_pos;
-	bool seek_request;
-	int seek_flags;
-	bool seek_flush;
-
-	bool abort;
-
-	char *input;
-	char *input_format;
-};
-
-typedef struct ff_demuxer ff_demuxer_t;
-
-struct ff_demuxer *ff_demuxer_init();
-bool ff_demuxer_open(struct ff_demuxer *demuxer, char *input,
- char *input_format);
-void ff_demuxer_free(struct ff_demuxer *demuxer);
-
-void ff_demuxer_set_callbacks(struct ff_callbacks *callbacks,
- ff_callback_frame frame,
- ff_callback_format format,
- ff_callback_initialize initialize,
- ff_callback_frame frame_initialize,
- ff_callback_frame frame_free, void *opaque);
-
-void ff_demuxer_flush(struct ff_demuxer *demuxer);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-frame.h Deleted

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include "ff-clock.h"
-
-#include <libavcodec/avcodec.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ff_frame {
-	AVFrame *frame;
-	struct ff_clock *clock;
-	double pts;
-	int64_t duration;
-};
-
-typedef struct ff_frame ff_frame_t;
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-packet-queue.c Deleted

@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-packet-queue.h"
-#include "ff-compat.h"
-
-bool packet_queue_init(struct ff_packet_queue *q)
-{
-	memset(q, 0, sizeof(struct ff_packet_queue));
-
-	if (pthread_mutex_init(&q->mutex, NULL) != 0)
-		goto fail;
-
-	if (pthread_cond_init(&q->cond, NULL) != 0)
-		goto fail1;
-
-	av_init_packet(&q->flush_packet.base);
-	q->flush_packet.base.data = (uint8_t *)"FLUSH";
-
-	return true;
-
-fail1:
-	pthread_mutex_destroy(&q->mutex);
-fail:
-	return false;
-}
-
-void packet_queue_abort(struct ff_packet_queue *q)
-{
-	pthread_mutex_lock(&q->mutex);
-	q->abort = true;
-	pthread_cond_signal(&q->cond);
-	pthread_mutex_unlock(&q->mutex);
-}
-
-void packet_queue_free(struct ff_packet_queue *q)
-{
-	packet_queue_flush(q);
-
-	pthread_mutex_destroy(&q->mutex);
-	pthread_cond_destroy(&q->cond);
-
-	av_free_packet(&q->flush_packet.base);
-}
-
-int packet_queue_put(struct ff_packet_queue *q, struct ff_packet *packet)
-{
-	struct ff_packet_list *new_packet;
-
-	new_packet = av_malloc(sizeof(struct ff_packet_list));
-
-	if (new_packet == NULL)
-		return FF_PACKET_FAIL;
-
-	new_packet->packet = *packet;
-	new_packet->next = NULL;
-
-	pthread_mutex_lock(&q->mutex);
-
-	if (q->last_packet == NULL)
-		q->first_packet = new_packet;
-	else
-		q->last_packet->next = new_packet;
-
-	q->last_packet = new_packet;
-
-	q->count++;
-	q->total_size += new_packet->packet.base.size;
-
-	pthread_cond_signal(&q->cond);
-	pthread_mutex_unlock(&q->mutex);
-
-	return FF_PACKET_SUCCESS;
-}
-
-int packet_queue_put_flush_packet(struct ff_packet_queue *q)
-{
-	return packet_queue_put(q, &q->flush_packet);
-}
-
-int packet_queue_get(struct ff_packet_queue *q, struct ff_packet *packet,
- bool block)
-{
-	struct ff_packet_list *potential_packet;
-	int return_status;
-
-	pthread_mutex_lock(&q->mutex);
-
-	while (true) {
-		potential_packet = q->first_packet;
-
-		if (potential_packet != NULL) {
-			q->first_packet = potential_packet->next;
-
-			if (q->first_packet == NULL)
-				q->last_packet = NULL;
-
-			q->count--;
-			q->total_size -= potential_packet->packet.base.size;
-			*packet = potential_packet->packet;
-			av_free(potential_packet);
-			return_status = FF_PACKET_SUCCESS;
-			break;
-
-		} else if (!block) {
-			return_status = FF_PACKET_EMPTY;
-			break;
-
-		} else {
-			pthread_cond_wait(&q->cond, &q->mutex);
-			if (q->abort) {
-				return_status = FF_PACKET_FAIL;
-				break;
-			}
-		}
-	}
-
-	pthread_mutex_unlock(&q->mutex);
-
-	return return_status;
-}
-
-void packet_queue_flush(struct ff_packet_queue *q)
-{
-	struct ff_packet_list *packet;
-
-	pthread_mutex_lock(&q->mutex);
-
-	for (packet = q->first_packet; packet != NULL;
-	 packet = q->first_packet) {
-		q->first_packet = packet->next;
-		av_free_packet(&packet->packet.base);
-		if (packet->packet.clock != NULL)
-			ff_clock_release(&packet->packet.clock);
-		av_freep(&packet);
-	}
-
-	q->last_packet = q->first_packet = NULL;
-	q->count = 0;
-	q->total_size = 0;
-
-	pthread_mutex_unlock(&q->mutex);
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-packet-queue.h Deleted

@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include "ff-clock.h"
-
-#include <libavformat/avformat.h>
-#include <pthread.h>
-#include <stdbool.h>
-
-#define FF_PACKET_FAIL -1
-#define FF_PACKET_EMPTY 0
-#define FF_PACKET_SUCCESS 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ff_packet {
-	AVPacket base;
-	ff_clock_t *clock;
-};
-
-struct ff_packet_list {
-	struct ff_packet packet;
-	struct ff_packet_list *next;
-};
-
-struct ff_packet_queue {
-	struct ff_packet_list *first_packet;
-	struct ff_packet_list *last_packet;
-	pthread_mutex_t mutex;
-	pthread_cond_t cond;
-	struct ff_packet flush_packet;
-	int count;
-	unsigned int total_size;
-	bool abort;
-};
-
-typedef struct ff_packet_queue ff_packet_queue_t;
-
-bool packet_queue_init(struct ff_packet_queue *q);
-void packet_queue_abort(struct ff_packet_queue *q);
-void packet_queue_free(struct ff_packet_queue *q);
-int packet_queue_put(struct ff_packet_queue *q, struct ff_packet *packet);
-int packet_queue_put_flush_packet(struct ff_packet_queue *q);
-int packet_queue_get(struct ff_packet_queue *q, struct ff_packet *packet,
- bool block);
-
-void packet_queue_flush(struct ff_packet_queue *q);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-threading-posix.c Deleted

@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2014 Hugh Bailey <obs.jim@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-threading.h"
-
-long ff_atomic_inc_long(volatile long *val)
-{
-	return __sync_add_and_fetch(val, 1);
-}
-
-long ff_atomic_dec_long(volatile long *val)
-{
-	return __sync_sub_and_fetch(val, 1);
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-threading-windows.c Deleted

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2014 Hugh Bailey <obs.jim@gmail.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-threading.h"
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-long ff_atomic_inc_long(volatile long *val)
-{
-	return InterlockedIncrement(val);
-}
-
-long ff_atomic_dec_long(volatile long *val)
-{
-	return InterlockedDecrement(val);
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-threading.h Deleted

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-long ff_atomic_inc_long(volatile long *val);
-long ff_atomic_dec_long(volatile long *val);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-timer.c Deleted

@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-timer.h"
-
-#include <libavutil/time.h>
-#include <time.h>
-#include <string.h>
-#include <assert.h>
-
-static void *timer_thread(void *opaque)
-{
-	struct ff_timer *timer = (struct ff_timer *)opaque;
-	int ret;
-
-	while (true) {
-		bool callback = false;
-		pthread_mutex_lock(&timer->mutex);
-
-		if (timer->abort) {
-			pthread_mutex_unlock(&timer->mutex);
-			break;
-		}
-
-		uint64_t current_time = av_gettime();
-		if (current_time < timer->next_wake) {
-			struct timespec sleep_time = {
-			 .tv_sec = timer->next_wake / AV_TIME_BASE,
-			 .tv_nsec = (timer->next_wake % AV_TIME_BASE) *
-			 1000};
-
-			ret = pthread_cond_timedwait(
-			 &timer->cond, &timer->mutex, &sleep_time);
-			if (ret != ETIMEDOUT) {
-				// failed to wait, just sleep
-				av_usleep((unsigned)(timer->next_wake -
-				 current_time));
-			}
-
-			pthread_mutex_unlock(&timer->mutex);
-			continue;
-
-			// we can be woken up merely to set a sooner wake time
-
-		} else {
-			// no new next_wake, sleep until we get something
-			av_usleep(1000);
-		}
-
-		// we woke up for some reason
-		current_time = av_gettime();
-		if (timer->next_wake <= current_time || timer->needs_wake) {
-			callback = true;
-			timer->needs_wake = false;
-		}
-
-		pthread_mutex_unlock(&timer->mutex);
-
-		if (callback)
-			timer->callback(timer->opaque);
-	}
-
-	return NULL;
-}
-
-bool ff_timer_init(struct ff_timer *timer, ff_timer_callback callback,
- void *opaque)
-{
-	memset(timer, 0, sizeof(struct ff_timer));
-	timer->abort = false;
-	timer->callback = callback;
-	timer->opaque = opaque;
-
-	if (pthread_mutexattr_init(&timer->mutexattr) != 0)
-		goto fail;
-	if (pthread_mutexattr_settype(&timer->mutexattr,
-	 PTHREAD_MUTEX_RECURSIVE))
-		goto fail1;
-	if (pthread_mutex_init(&timer->mutex, &timer->mutexattr) != 0)
-		goto fail1;
-	if (pthread_cond_init(&timer->cond, NULL) != 0)
-		goto fail2;
-
-	if (pthread_create(&timer->timer_thread, NULL, timer_thread, timer) !=
-	 0)
-		goto fail3;
-
-	return true;
-
-fail3:
-	pthread_cond_destroy(&timer->cond);
-fail2:
-	pthread_mutex_destroy(&timer->mutex);
-fail1:
-	pthread_mutexattr_destroy(&timer->mutexattr);
-fail:
-	return false;
-}
-
-void ff_timer_free(struct ff_timer *timer)
-{
-	void *thread_result;
-
-	assert(timer != NULL);
-
-	pthread_mutex_lock(&timer->mutex);
-	timer->abort = true;
-	pthread_cond_signal(&timer->cond);
-	pthread_mutex_unlock(&timer->mutex);
-
-	pthread_join(timer->timer_thread, &thread_result);
-
-	pthread_mutex_destroy(&timer->mutex);
-	pthread_mutexattr_destroy(&timer->mutexattr);
-	pthread_cond_destroy(&timer->cond);
-}
-
-void ff_timer_schedule(struct ff_timer *timer, uint64_t microseconds)
-{
-	uint64_t cur_time = av_gettime();
-	uint64_t new_wake_time = cur_time + microseconds;
-
-	pthread_mutex_lock(&timer->mutex);
-
-	timer->needs_wake = true;
-	if (new_wake_time < timer->next_wake || cur_time > timer->next_wake)
-		timer->next_wake = new_wake_time;
-
-	pthread_cond_signal(&timer->cond);
-
-	pthread_mutex_unlock(&timer->mutex);
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-timer.h Deleted

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include <libavutil/avutil.h>
-#include <pthread.h>
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef void (*ff_timer_callback)(void *opaque);
-
-struct ff_timer {
-	ff_timer_callback callback;
-	void *opaque;
-
-	pthread_mutex_t mutex;
-	pthread_mutexattr_t mutexattr;
-	pthread_cond_t cond;
-
-	pthread_t timer_thread;
-	uint64_t next_wake;
-	bool needs_wake;
-
-	bool abort;
-};
-
-typedef struct ff_timer ff_timer_t;
-
-bool ff_timer_init(struct ff_timer *timer, ff_timer_callback callback,
- void *opaque);
-void ff_timer_free(struct ff_timer *timer);
-void ff_timer_schedule(struct ff_timer *timer, uint64_t microseconds);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-util.c Deleted

@@ -1,475 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-util.h"
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#pragma warning(disable : 4204)
-#endif
-
-#include <libavcodec/avcodec.h>
-#include <libavdevice/avdevice.h>
-#include <libavformat/avformat.h>
-#include <libavutil/log.h>
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-#include <stdbool.h>
-
-struct ff_format_desc {
-	const char *name;
-	const char *long_name;
-	const char *mime_type;
-	const char *extensions;
-	enum AVCodecID audio_codec;
-	enum AVCodecID video_codec;
-	const struct AVCodecTag *const *codec_tags;
-	const struct ff_format_desc *next;
-};
-
-struct ff_codec_desc {
-	const char *name;
-	const char *long_name;
-	int id;
-	bool alias;
-	const char *base_name;
-	enum ff_codec_type type;
-	const struct ff_codec_desc *next;
-};
-
-void ff_init()
-{
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	av_register_all();
-	//avdevice_register_all();
-	avcodec_register_all();
-#endif
-	avformat_network_init();
-}
-
-const char *ff_codec_name_from_id(int codec_id)
-{
-	const AVCodec *codec = avcodec_find_encoder(codec_id);
-	if (codec != NULL)
-		return codec->name;
-	else
-		return NULL;
-}
-
-static bool get_codecs(const AVCodecDescriptor ***descs, unsigned int *size)
-{
-	const AVCodecDescriptor *desc = NULL;
-	const AVCodecDescriptor **codecs;
-	unsigned int codec_count = 0;
-	unsigned int i = 0;
-
-	while ((desc = avcodec_descriptor_next(desc)) != NULL)
-		codec_count++;
-
-	codecs = av_calloc(codec_count, sizeof(AVCodecDescriptor *));
-
-	if (codecs == NULL) {
-		av_log(NULL, AV_LOG_ERROR,
-		 "unable to allocate sorted codec "
-		 "array with size %d",
-		 codec_count);
-		return false;
-	}
-
-	while ((desc = avcodec_descriptor_next(desc)) != NULL)
-		codecsi++ = desc;
-
-	*size = codec_count;
-	*descs = codecs;
-	return true;
-}
-
-static const AVCodec *next_codec_for_id(enum AVCodecID id, const AVCodec *prev)
-{
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 9, 100)
-	const AVCodec *cur = NULL;
-	void *i = 0;
-	bool found_prev = false;
-
-	while ((cur = av_codec_iterate(&i)) != NULL) {
-		if (cur->id == id && av_codec_is_encoder(cur)) {
-			if (!prev) {
-				return cur;
-			} else if (!found_prev) {
-				if (cur == prev) {
-					found_prev = true;
-				}
-			} else {
-				return cur;
-			}
-		}
-	}
-#else
-	while ((prev = av_codec_next(prev)) != NULL) {
-		if (prev->id == id && av_codec_is_encoder(prev))
-			return prev;
-	}
-#endif
-	return NULL;
-}
-
-static void add_codec_to_list(const struct ff_format_desc *format_desc,
- struct ff_codec_desc **first,
- struct ff_codec_desc **current, enum AVCodecID id,
- const AVCodec *codec, bool ignore_compatability)
-{
-	if (codec == NULL)
-		codec = avcodec_find_encoder(id);
-
-	// No codec, or invalid id
-	if (codec == NULL)
-		return;
-
-	// Not an encoding codec
-	if (!av_codec_is_encoder(codec))
-		return;
-
-	if (!ignore_compatability) {
-		// Format doesn't support this codec
-		unsigned int tag =
-		 av_codec_get_tag(format_desc->codec_tags, codec->id);
-		if (tag == 0)
-			return;
-	}
-
-	struct ff_codec_desc *d = av_mallocz(sizeof(struct ff_codec_desc));
-
-	d->name = codec->name;
-	d->long_name = codec->long_name;
-	d->id = codec->id;
-	const AVCodec *base_codec = avcodec_find_encoder(codec->id);
-	if (strcmp(base_codec->name, codec->name) != 0) {
-		d->alias = true;
-		d->base_name = base_codec->name;
-	}
-
-	switch (codec->type) {
-	case AVMEDIA_TYPE_AUDIO:
-		d->type = FF_CODEC_AUDIO;
-		break;
-	case AVMEDIA_TYPE_VIDEO:
-		d->type = FF_CODEC_VIDEO;
-		break;
-	default:
-		d->type = FF_CODEC_UNKNOWN;
-	}
-
-	if (*current != NULL)
-		(*current)->next = d;
-	else
-		*first = d;
-
-	*current = d;
-}
-
-static void get_codecs_for_id(const struct ff_format_desc *format_desc,
- struct ff_codec_desc **first,
- struct ff_codec_desc **current, enum AVCodecID id,
- bool ignore_compatability)
-{
-	const AVCodec *codec = NULL;
-	while ((codec = next_codec_for_id(id, codec)) != NULL)
-		add_codec_to_list(format_desc, first, current, codec->id, codec,
-		 ignore_compatability);
-}
-
-const struct ff_codec_desc *
-ff_codec_supported(const struct ff_format_desc *format_desc,
- bool ignore_compatability)
-{
-	const AVCodecDescriptor **codecs;
-	unsigned int size;
-	unsigned int i;
-	struct ff_codec_desc *current = NULL;
-	struct ff_codec_desc *first = NULL;
-
-	if (!get_codecs(&codecs, &size))
-		return NULL;
-
-	for (i = 0; i < size; i++) {
-		const AVCodecDescriptor *codec = codecsi;
-		get_codecs_for_id(format_desc, &first, &current, codec->id,
-		 ignore_compatability);
-	}
-
-	av_free((void *)codecs);
-
-	return first;
-}
-
-const char *ff_codec_desc_name(const struct ff_codec_desc *codec_desc)
-{
-	if (codec_desc != NULL)
-		return codec_desc->name;
-	else
-		return NULL;
-}
-
-const char *ff_codec_desc_long_name(const struct ff_codec_desc *codec_desc)
-{
-	if (codec_desc != NULL)
-		return codec_desc->long_name;
-	else
-		return NULL;
-}
-
-bool ff_codec_desc_is_alias(const struct ff_codec_desc *codec_desc)
-{
-	if (codec_desc != NULL)
-		return codec_desc->alias;
-	else
-		return false;
-}
-
-const char *ff_codec_desc_base_name(const struct ff_codec_desc *codec_desc)
-{
-	if (codec_desc != NULL)
-		return codec_desc->base_name;
-	else
-		return NULL;
-}
-
-enum ff_codec_type ff_codec_desc_type(const struct ff_codec_desc *codec_desc)
-{
-	if (codec_desc != NULL)
-		return codec_desc->type;
-	else
-		return FF_CODEC_UNKNOWN;
-}
-
-const struct ff_codec_desc *
-ff_codec_desc_next(const struct ff_codec_desc *codec_desc)
-{
-	if (codec_desc != NULL)
-		return codec_desc->next;
-	else
-		return NULL;
-}
-
-int ff_codec_desc_id(const struct ff_codec_desc *codec_desc)
-{
-	if (codec_desc != NULL)
-		return codec_desc->id;
-	else
-		return AV_CODEC_ID_NONE;
-}
-
-void ff_codec_desc_free(const struct ff_codec_desc *codec_desc)
-{
-	const struct ff_codec_desc *desc = codec_desc;
-	while (desc != NULL) {
-		const struct ff_codec_desc *next = desc->next;
-		av_free((void *)desc);
-		desc = next;
-	}
-}
-
-static inline bool is_output_device(const AVClass *avclass)
-{
-	if (!avclass)
-		return 0;
-
-	switch (avclass->category) {
-	case AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT:
-	case AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT:
-	case AV_CLASS_CATEGORY_DEVICE_OUTPUT:
-		return true;
-	default:
-		return false;
-	}
-}
-
-const struct ff_format_desc *ff_format_supported()
-{
-	const AVOutputFormat *output_format = NULL;
-	struct ff_format_desc *desc = NULL;
-	struct ff_format_desc *current = NULL;
-
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(58, 9, 100)
-	void *i = 0;
-
-	while ((output_format = av_muxer_iterate(&i)) != NULL) {
-#else
-	while ((output_format = av_oformat_next(output_format)) != NULL) {
-#endif
-		struct ff_format_desc *d;
-		if (is_output_device(output_format->priv_class))
-			continue;
-
-		d = av_mallocz(sizeof(struct ff_format_desc));
-
-		d->audio_codec = output_format->audio_codec;
-		d->video_codec = output_format->video_codec;
-		d->name = output_format->name;
-		d->long_name = output_format->long_name;
-		d->mime_type = output_format->mime_type;
-		d->extensions = output_format->extensions;
-		d->codec_tags = output_format->codec_tag;
-
-		if (current != NULL) {
-			current->next = d;
-			current = d;
-		} else {
-			desc = current = d;
-		}
-	}
-
-	return desc;
-}
-
-const char *ff_format_desc_name(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->name;
-	else
-		return NULL;
-}
-
-const char *ff_format_desc_long_name(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->long_name;
-	else
-		return NULL;
-}
-
-const char *ff_format_desc_mime_type(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->mime_type;
-	else
-		return NULL;
-}
-
-const char *ff_format_desc_extensions(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->extensions;
-	else
-		return NULL;
-}
-
-bool ff_format_desc_has_audio(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->audio_codec != AV_CODEC_ID_NONE;
-	else
-		return false;
-}
-
-bool ff_format_desc_has_video(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->video_codec != AV_CODEC_ID_NONE;
-	else
-		return false;
-}
-
-int ff_format_desc_audio(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->audio_codec;
-	else
-		return false;
-}
-
-int ff_format_desc_video(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->video_codec;
-	else
-		return false;
-}
-
-const struct ff_format_desc *
-ff_format_desc_next(const struct ff_format_desc *format_desc)
-{
-	if (format_desc != NULL)
-		return format_desc->next;
-	else
-		return NULL;
-}
-
-static const char *get_encoder_name(const struct ff_format_desc *format_desc,
- enum AVCodecID codec_id)
-{
-	const AVCodec *codec = avcodec_find_encoder(codec_id);
-	if (codec == NULL && codec_id == AV_CODEC_ID_NONE)
-		return NULL;
-	else if (codec == NULL)
-		return format_desc->name;
-	else
-		return codec->name;
-}
-
-const char *
-ff_format_desc_get_default_name(const struct ff_format_desc *format_desc,
- enum ff_codec_type codec_type)
-{
-	switch (codec_type) {
-	case FF_CODEC_AUDIO:
-		return get_encoder_name(format_desc, format_desc->audio_codec);
-	case FF_CODEC_VIDEO:
-		return get_encoder_name(format_desc, format_desc->video_codec);
-	default:
-		return NULL;
-	}
-}
-
-void ff_format_desc_free(const struct ff_format_desc *format_desc)
-{
-	const struct ff_format_desc *desc = format_desc;
-	while (desc != NULL) {
-		const struct ff_format_desc *next = desc->next;
-		av_free((void *)desc);
-		desc = next;
-	}
-}
-
-
-bool ff_format_codec_compatible(const char *codec, const char *format)
-{
-	if (!codec || !format)
-		return false;
-
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)
-	AVOutputFormat *output_format;
-#else
-	const AVOutputFormat *output_format;
-#endif
-	output_format = av_guess_format(format, NULL, NULL);
-	if (!output_format)
-		return false;
-	
-	const AVCodecDescriptor *codec_desc = avcodec_descriptor_get_by_name(codec);
-	if (!codec_desc)
-		return false;
-	
-#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(60, 0, 100)
-	return avformat_query_codec(output_format, codec_desc->id, FF_COMPLIANCE_EXPERIMENTAL) == 1;
-#else
-	return avformat_query_codec(output_format, codec_desc->id, FF_COMPLIANCE_NORMAL) == 1;
-#endif
-}

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-util.h Deleted

@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#pragma once
-
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum ff_codec_type { FF_CODEC_AUDIO, FF_CODEC_VIDEO, FF_CODEC_UNKNOWN };
-
-struct ff_format_desc;
-struct ff_codec_desc;
-
-void ff_init();
-
-const char *ff_codec_name_from_id(int codec_id);
-
-// Codec Description
-const struct ff_codec_desc *
-ff_codec_supported(const struct ff_format_desc *format_desc,
- bool ignore_compatability);
-void ff_codec_desc_free(const struct ff_codec_desc *codec_desc);
-const char *ff_codec_desc_name(const struct ff_codec_desc *codec_desc);
-const char *ff_codec_desc_long_name(const struct ff_codec_desc *codec_desc);
-enum ff_codec_type ff_codec_desc_type(const struct ff_codec_desc *codec_desc);
-bool ff_codec_desc_is_alias(const struct ff_codec_desc *codec_desc);
-const char *ff_codec_desc_base_name(const struct ff_codec_desc *codec_desc);
-int ff_codec_desc_id(const struct ff_codec_desc *codec_desc);
-const struct ff_codec_desc *
-ff_codec_desc_next(const struct ff_codec_desc *codec_desc);
-
-// Format Description
-const struct ff_format_desc *ff_format_supported();
-void ff_format_desc_free(const struct ff_format_desc *format_desc);
-const char *ff_format_desc_name(const struct ff_format_desc *format_desc);
-const char *ff_format_desc_long_name(const struct ff_format_desc *format_desc);
-const char *ff_format_desc_mime_type(const struct ff_format_desc *format_desc);
-const char *ff_format_desc_extensions(const struct ff_format_desc *format_desc);
-bool ff_format_desc_has_audio(const struct ff_format_desc *format_desc);
-bool ff_format_desc_has_video(const struct ff_format_desc *format_desc);
-int ff_format_desc_audio(const struct ff_format_desc *format_desc);
-int ff_format_desc_video(const struct ff_format_desc *format_desc);
-const char *
-ff_format_desc_get_default_name(const struct ff_format_desc *format_desc,
- enum ff_codec_type codec_type);
-const struct ff_format_desc *
-ff_format_desc_next(const struct ff_format_desc *format_desc);
-
-// Utility to check compatibility
-bool ff_format_codec_compatible(const char *codec, const char *format);
-
-#ifdef __cplusplus
-}
-#endif

obs-studio-29.1.3.tar.xz/deps/libff/libff/ff-video-decoder.c Deleted

@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2015 John R. Bradley <jrb@turrettech.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "ff-callbacks.h"
-#include "ff-circular-queue.h"
-#include "ff-clock.h"
-#include "ff-decoder.h"
-#include "ff-frame.h"
-#include "ff-packet-queue.h"
-#include "ff-timer.h"
-
-#include <libavutil/time.h>
-#include <libswscale/swscale.h>
-
-#include <assert.h>
-
-#include "ff-compat.h"
-
-static bool queue_frame(struct ff_decoder *decoder, AVFrame *frame,
- double best_effort_pts)
-{
-	struct ff_frame *queue_frame;
-	bool call_initialize;
-
-	ff_circular_queue_wait_write(&decoder->frame_queue);
-
-	if (decoder->abort) {
-		return false;
-	}
-
-	queue_frame = ff_circular_queue_peek_write(&decoder->frame_queue);
-
-	// Check if we need to communicate a different format has been received
-	// to any callbacks
-	AVCodecContext *codec = decoder->codec;
-	call_initialize = (queue_frame->frame == NULL ||
-	 queue_frame->frame->width != codec->width ||
-	 queue_frame->frame->height != codec->height ||
-	 queue_frame->frame->format != codec->pix_fmt);
-
-	if (queue_frame->frame != NULL) {
-		// This shouldn't happen any more, the frames are freed in
-		// ff_decoder_refresh.
-		av_frame_free(&queue_frame->frame);
-	}
-
-	queue_frame->frame = av_frame_clone(frame);
-	queue_frame->clock = ff_clock_retain(decoder->clock);
-
-	if (call_initialize)
-		ff_callbacks_frame_initialize(queue_frame, decoder->callbacks);
-
-	queue_frame->pts = best_effort_pts;
-
-	ff_circular_queue_advance_write(&decoder->frame_queue, queue_frame);
-
-	return true;
-}
-
-void *ff_video_decoder_thread(void *opaque_video_decoder)
-{
-	struct ff_decoder *decoder = (struct ff_decoder *)opaque_video_decoder;
-
-	struct ff_packet packet = {0};
-	int complete;
-	AVFrame *frame = av_frame_alloc();
-	int ret;
-	bool key_frame;
-
-	while (!decoder->abort) {
-		if (decoder->eof)
-			ret = packet_queue_get(&decoder->packet_queue, &packet,
-			 0);
-		else
-			ret = packet_queue_get(&decoder->packet_queue, &packet,
-			 1);
-
-		if (ret == FF_PACKET_EMPTY || ret == FF_PACKET_FAIL) {
-			// should we just use abort here?
-			break;
-		}
-
-		if (packet.base.data ==
-		 decoder->packet_queue.flush_packet.base.data) {
-			avcodec_flush_buffers(decoder->codec);
-			continue;
-		}
-
-		// We received a reset packet with a new clock
-		if (packet.clock != NULL) {
-			if (decoder->clock != NULL)
-				ff_clock_release(&decoder->clock);
-			decoder->clock = ff_clock_move(&packet.clock);
-			av_free_packet(&packet.base);
-			continue;
-		}
-
-		int64_t start_time = ff_clock_start_time(decoder->clock);
-		key_frame = packet.base.flags & AV_PKT_FLAG_KEY;
-
-		// We can only make decisions on keyframes for
-		// hw decoders (maybe just OSX?)
-		// For now, always make drop decisions on keyframes
-		bool frame_drop_check = key_frame;
-		// Must have a proper packet pts to drop frames here
-		frame_drop_check &= start_time != AV_NOPTS_VALUE;
-
-		if (frame_drop_check)
-			ff_decoder_set_frame_drop_state(decoder, start_time,
-			 packet.base.pts);
-
-		avcodec_decode_video2(decoder->codec, frame, &complete,
-		 &packet.base);
-
-		// Did we get an entire video frame? This doesn't guarantee
-		// there is a picture to show for some codecs, but we still want
-		// to adjust our various internal clocks for the next frame
-		if (complete) {
-			// If we don't have a good PTS, try to guess based
-			// on last received PTS provided plus prediction
-			// This function returns a pts scaled to stream
-			// time base
-			double best_effort_pts =
-			 ff_decoder_get_best_effort_pts(decoder, frame);
-
-			queue_frame(decoder, frame, best_effort_pts);
-			av_frame_unref(frame);
-		}
-
-		av_free_packet(&packet.base);
-	}
-
-	if (decoder->clock != NULL)
-		ff_clock_release(&decoder->clock);
-
-	av_frame_free(&frame);
-
-	decoder->finished = true;
-
-	return NULL;
-}

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-config.h.in Deleted

obs-studio-29.1.3.tar.xz/libobs/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/aja/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/aja/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/coreaudio-encoder/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/coreaudio-encoder/cmake/macos/Info.plist.in Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleName</key>
-	<string>coreaudio-encoder</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.coreaudio-encoder</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleExecutable</key>
-	<string>coreaudio-encoder</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/plugins/decklink/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/decklink/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/image-source/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/image-source/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/cmake/legacy.cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-capture/cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-capture/cmake/legacy.cmake Deleted

@@ -1,38 +0,0 @@
-project(mac-capture)
-
-find_library(COREAUDIO CoreAudio)
-find_library(AUDIOUNIT AudioUnit)
-find_library(COREFOUNDATION CoreFoundation)
-find_library(IOSURF IOSurface)
-find_library(COCOA Cocoa)
-find_library(COREVIDEO CoreVideo)
-find_library(COREMEDIA CoreMedia)
-find_library(SCREENCAPTUREKIT ScreenCaptureKit)
-
-add_library(mac-capture MODULE)
-add_library(OBS::capture ALIAS mac-capture)
-
-target_sources(
-  mac-capture
-  PRIVATE plugin-main.c
-          audio-device-enum.c
-          audio-device-enum.h
-          mac-audio.c
-          mac-display-capture.m
-          mac-screen-capture.m
-          mac-window-capture.m
-          window-utils.m
-          window-utils.h)
-
-target_link_libraries(mac-capture PRIVATE OBS::libobs ${COREAUDIO} ${AUDIOUNIT} ${COREFOUNDATION} ${IOSURF} ${COCOA})
-
-if(SCREENCAPTUREKIT)
-  target_link_libraries(mac-capture PRIVATE OBS::libobs ${COREVIDEO} ${COREMEDIA})
-
-  target_link_options(mac-capture PRIVATE SHELL:-weak_framework ScreenCaptureKit)
-  target_link_options(libobs PRIVATE SHELL:-weak_framework ScreenCaptureKit)
-endif()
-
-set_target_properties(mac-capture PROPERTIES FOLDER "plugins" PREFIX "")
-
-setup_plugin_target(mac-capture)

obs-studio-29.1.3.tar.xz/plugins/mac-capture/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-capture/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-capture/mac-screen-capture.m Deleted

@@ -1,1179 +0,0 @@
-#include <AvailabilityMacros.h>
-#include <Cocoa/Cocoa.h>
-
-bool is_screen_capture_available(void)
-{
-	if (@available(macOS 12.5, *)) {
-		return true;
-	} else {
-		return false;
-	}
-}
-
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120300 // __MAC_12_3
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability-new"
-
-#include <stdlib.h>
-#include <obs-module.h>
-#include <util/threading.h>
-#include <pthread.h>
-
-#include <IOSurface/IOSurface.h>
-#include <ScreenCaptureKit/ScreenCaptureKit.h>
-#include <CoreMedia/CMSampleBuffer.h>
-#include <CoreVideo/CVPixelBuffer.h>
-
-#define MACCAP_LOG(level, msg, ...) \
-	blog(level, " mac-screencapture : " msg, ##__VA_ARGS__)
-#define MACCAP_ERR(msg, ...) MACCAP_LOG(LOG_ERROR, msg, ##__VA_ARGS__)
-
-typedef enum {
-	ScreenCaptureDisplayStream = 0,
-	ScreenCaptureWindowStream = 1,
-	ScreenCaptureApplicationStream = 2,
-} ScreenCaptureStreamType;
-
-@interface ScreenCaptureDelegate : NSObject <SCStreamOutput>
-
-@property struct screen_capture *sc;
-
-@end
-
-struct screen_capture {
-	obs_source_t *source;
-
-	gs_effect_t *effect;
-	gs_texture_t *tex;
-
-	NSRect frame;
-	bool hide_cursor;
-	bool show_hidden_windows;
-	bool show_empty_names;
-
-	SCStream *disp;
-	SCStreamConfiguration *stream_properties;
-	SCShareableContent *shareable_content;
-	ScreenCaptureDelegate *capture_delegate;
-
-	os_event_t *disp_finished;
-	os_event_t *stream_start_completed;
-	os_sem_t *shareable_content_available;
-	IOSurfaceRef current, prev;
-
-	pthread_mutex_t mutex;
-
-	ScreenCaptureStreamType capture_type;
-	CGDirectDisplayID display;
-	CGWindowID window;
-	NSString *application_id;
-};
-
-#pragma mark -
-
-static void destroy_screen_stream(struct screen_capture *sc)
-{
-	if (sc->disp) {
-		sc->disp stopCaptureWithCompletionHandler:^(
-				 NSError *_Nullable error) {
-			if (error && error.code != 3808) {
-				MACCAP_ERR(
-					"destroy_screen_stream: Failed to stop stream with error %s\n",
-					error localizedFailureReason
-						cStringUsingEncoding:
-							NSUTF8StringEncoding);
-			}
-			os_event_signal(sc->disp_finished);
-		};
-		os_event_wait(sc->disp_finished);
-	}
-
-	if (sc->stream_properties) {
-		sc->stream_properties release;
-		sc->stream_properties = NULL;
-	}
-
-	if (sc->tex) {
-		gs_texture_destroy(sc->tex);
-		sc->tex = NULL;
-	}
-
-	if (sc->current) {
-		IOSurfaceDecrementUseCount(sc->current);
-		CFRelease(sc->current);
-		sc->current = NULL;
-	}
-
-	if (sc->prev) {
-		IOSurfaceDecrementUseCount(sc->prev);
-		CFRelease(sc->prev);
-		sc->prev = NULL;
-	}
-
-	if (sc->disp) {
-		sc->disp release;
-		sc->disp = NULL;
-	}
-
-	os_event_destroy(sc->disp_finished);
-	os_event_destroy(sc->stream_start_completed);
-}
-
-static void screen_capture_destroy(void *data)
-{
-	struct screen_capture *sc = data;
-
-	if (!sc)
-		return;
-
-	obs_enter_graphics();
-
-	destroy_screen_stream(sc);
-
-	obs_leave_graphics();
-
-	if (sc->shareable_content) {
-		os_sem_wait(sc->shareable_content_available);
-		sc->shareable_content release;
-		os_sem_destroy(sc->shareable_content_available);
-		sc->shareable_content_available = NULL;
-	}
-
-	if (sc->capture_delegate) {
-		sc->capture_delegate release;
-	}
-	sc->application_id release;
-
-	pthread_mutex_destroy(&sc->mutex);
-	bfree(sc);
-}
-
-static inline void screen_stream_video_update(struct screen_capture *sc,
-					 CMSampleBufferRef sample_buffer)
-{
-	bool frame_detail_errored = false;
-	float scale_factor = 1.0f;
-	CGRect window_rect = {};
-
-	CFArrayRef attachments_array =
-		CMSampleBufferGetSampleAttachmentsArray(sample_buffer, false);
-	if (sc->capture_type == ScreenCaptureWindowStream &&
-	 attachments_array != NULL &&
-	 CFArrayGetCount(attachments_array) > 0) {
-		CFDictionaryRef attachments_dict =
-			CFArrayGetValueAtIndex(attachments_array, 0);
-		if (attachments_dict != NULL) {
-
-			CFTypeRef frame_scale_factor = CFDictionaryGetValue(
-				attachments_dict, SCStreamFrameInfoScaleFactor);
-			if (frame_scale_factor != NULL) {
-				Boolean result = CFNumberGetValue(
-					(CFNumberRef)frame_scale_factor,
-					kCFNumberFloatType, &scale_factor);
-				if (result == false) {
-					scale_factor = 1.0f;
-					frame_detail_errored = true;
-				}
-			}
-
-			CFTypeRef content_rect_dict = CFDictionaryGetValue(
-				attachments_dict, SCStreamFrameInfoContentRect);
-			CFTypeRef content_scale_factor = CFDictionaryGetValue(
-				attachments_dict,
-				SCStreamFrameInfoContentScale);
-			if ((content_rect_dict != NULL) &&
-			 (content_scale_factor != NULL)) {
-				CGRect content_rect = {};
-				float points_to_pixels = 0.0f;
-
-				Boolean result =
-					CGRectMakeWithDictionaryRepresentation(
-						(__bridge CFDictionaryRef)
-							content_rect_dict,
-						&content_rect);
-				if (result == false) {
-					content_rect = CGRectZero;
-					frame_detail_errored = true;
-				}
-				result = CFNumberGetValue(
-					(CFNumberRef)content_scale_factor,
-					kCFNumberFloatType, &points_to_pixels);
-				if (result == false) {
-					points_to_pixels = 1.0f;
-					frame_detail_errored = true;
-				}
-
-				window_rect.origin = content_rect.origin;
-				window_rect.size.width =
-					content_rect.size.width /
-					points_to_pixels * scale_factor;
-				window_rect.size.height =
-					content_rect.size.height /
-					points_to_pixels * scale_factor;
-			}
-		}
-	}
-
-	CVImageBufferRef image_buffer =
-		CMSampleBufferGetImageBuffer(sample_buffer);
-
-	CVPixelBufferLockBaseAddress(image_buffer, 0);
-	IOSurfaceRef frame_surface = CVPixelBufferGetIOSurface(image_buffer);
-	CVPixelBufferUnlockBaseAddress(image_buffer, 0);
-
-	IOSurfaceRef prev_current = NULL;
-
-	if (frame_surface && !pthread_mutex_lock(&sc->mutex)) {
-
-		bool needs_to_update_properties = false;
-
-		if (!frame_detail_errored) {
-			if (sc->capture_type == ScreenCaptureWindowStream) {
-				if ((sc->frame.size.width !=
-				 window_rect.size.width) ||
-				 (sc->frame.size.height !=
-				 window_rect.size.height)) {
-					sc->frame.size.width =
-						window_rect.size.width;
-					sc->frame.size.height =
-						window_rect.size.height;
-					needs_to_update_properties = true;
-				}
-			} else {
-				size_t width =
-					CVPixelBufferGetWidth(image_buffer);
-				size_t height =
-					CVPixelBufferGetHeight(image_buffer);
-
-				if ((sc->frame.size.width != width) ||
-				 (sc->frame.size.height != height)) {
-					sc->frame.size.width = width;
-					sc->frame.size.height = height;
-					needs_to_update_properties = true;
-				}
-			}
-		}
-
-		if (needs_to_update_properties) {
-			sc->stream_properties
-				setWidth:(size_t)sc->frame.size.width;
-			sc->stream_properties
-				setHeight:(size_t)sc->frame.size.height;
-
-			sc->disp
-				updateConfiguration:sc->stream_properties
-				 completionHandler:^(
-					 NSError *_Nullable error) {
-					 if (error) {
-						 MACCAP_ERR(
-							 "screen_stream_video_update: Failed to update stream properties with error %s\n",
-							 error localizedFailureReason
-								 cStringUsingEncoding:
-									 NSUTF8StringEncoding);
-					 }
-				 };
-		}
-
-		prev_current = sc->current;
-		sc->current = frame_surface;
-		CFRetain(sc->current);
-		IOSurfaceIncrementUseCount(sc->current);
-
-		pthread_mutex_unlock(&sc->mutex);
-	}
-
-	if (prev_current) {
-		IOSurfaceDecrementUseCount(prev_current);
-		CFRelease(prev_current);
-	}
-}
-
-static inline void screen_stream_audio_update(struct screen_capture *sc,
-					 CMSampleBufferRef sample_buffer)
-{
-	CMFormatDescriptionRef format_description =
-		CMSampleBufferGetFormatDescription(sample_buffer);
-	const AudioStreamBasicDescription *audio_description =
-		CMAudioFormatDescriptionGetStreamBasicDescription(
-			format_description);
-
-	if (audio_description->mChannelsPerFrame < 1) {
-		MACCAP_ERR(
-			"screen_stream_audio_update: Received sample buffer has less than 1 channel per frame (mChannelsPerFrame set to '%d')\n",
-			audio_description->mChannelsPerFrame);
-		return;
-	}
-
-	char *_Nullable bytes = NULL;
-	CMBlockBufferRef data_buffer =
-		CMSampleBufferGetDataBuffer(sample_buffer);
-	size_t data_buffer_length = CMBlockBufferGetDataLength(data_buffer);
-	CMBlockBufferGetDataPointer(data_buffer, 0, &data_buffer_length, NULL,
-				 &bytes);
-
-	CMTime presentation_time =
-		CMSampleBufferGetOutputPresentationTimeStamp(sample_buffer);
-
-	struct obs_source_audio audio_data = {};
-
-	for (uint32_t channel_idx = 0;
-	 channel_idx < audio_description->mChannelsPerFrame;
-	 ++channel_idx) {
-		uint32_t offset =
-			(uint32_t)(data_buffer_length /
-				 audio_description->mChannelsPerFrame) *
-			channel_idx;
-		audio_data.datachannel_idx = (uint8_t *)bytes + offset;
-	}
-
-	audio_data.frames = (uint32_t)(data_buffer_length /
-				 audio_description->mBytesPerFrame /
-				 audio_description->mChannelsPerFrame);
-	audio_data.speakers = audio_description->mChannelsPerFrame;
-	audio_data.samples_per_sec = (uint32_t)audio_description->mSampleRate;
-	audio_data.timestamp =
-		(uint64_t)(CMTimeGetSeconds(presentation_time) * NSEC_PER_SEC);
-	audio_data.format = AUDIO_FORMAT_FLOAT_PLANAR;
-	obs_source_output_audio(sc->source, &audio_data);
-}
-
-static bool init_screen_stream(struct screen_capture *sc)
-{
-	SCContentFilter *content_filter;
-
-	sc->frame = CGRectZero;
-	sc->stream_properties = SCStreamConfiguration alloc init;
-	os_sem_wait(sc->shareable_content_available);
-
-	SCDisplay * (^get_target_display)() = ^SCDisplay *()
-	{
-		__block SCDisplay *target_display = nil;
-		sc->shareable_content.displays
-			indexOfObjectPassingTest:^BOOL(
-				SCDisplay *_Nonnull display, NSUInteger idx,
-				BOOL *_Nonnull stop) {
-				if (display.displayID == sc->display) {
-					target_display = sc->shareable_content
-								 .displaysidx;
-					*stop = TRUE;
-				}
-				return *stop;
-			};
-		return target_display;
-	};
-
-	void (^set_display_mode)(struct screen_capture *, SCDisplay *) = ^void(
-		struct screen_capture *capture_data,
-		SCDisplay *target_display) {
-		CGDisplayModeRef display_mode =
-			CGDisplayCopyDisplayMode(target_display.displayID);
-		capture_data->stream_properties
-			setWidth:CGDisplayModeGetPixelWidth(display_mode);
-		capture_data->stream_properties
-			setHeight:CGDisplayModeGetPixelHeight(display_mode);
-		CGDisplayModeRelease(display_mode);
-	};
-
-	switch (sc->capture_type) {
-	case ScreenCaptureDisplayStream: {
-		SCDisplay *target_display = get_target_display();
-
-		NSArray *empty = NSArray alloc init;
-		content_filter = SCContentFilter alloc
-			 initWithDisplay:target_display
-			excludingWindows:empty;
-		empty release;
-
-		set_display_mode(sc, target_display);
-	} break;
-	case ScreenCaptureWindowStream: {
-		__block SCWindow *target_window = nil;
-		if (sc->window != 0) {
-			sc->shareable_content.windows
-				indexOfObjectPassingTest:^BOOL(
-					SCWindow *_Nonnull window,
-					NSUInteger idx, BOOL *_Nonnull stop) {
-					if (window.windowID == sc->window) {
-						target_window =
-							sc->shareable_content
-								.windowsidx;
-						*stop = TRUE;
-					}
-					return *stop;
-				};
-		} else {
-			target_window =
-				sc->shareable_content.windows objectAtIndex:0;
-			sc->window = target_window.windowID;
-		}
-		content_filter = SCContentFilter alloc
-			initWithDesktopIndependentWindow:target_window;
-
-		if (target_window) {
-			sc->stream_properties
-				setWidth:(size_t)target_window.frame.size.width;
-			sc->stream_properties
-				setHeight:(size_t)target_window.frame.size
-						 .height;
-		}
-
-	} break;
-	case ScreenCaptureApplicationStream: {
-		SCDisplay *target_display = get_target_display();
-		__block SCRunningApplication *target_application = nil;
-		{
-			sc->shareable_content.applications
-				indexOfObjectPassingTest:^BOOL(
-					SCRunningApplication
-						*_Nonnull application,
-					NSUInteger idx, BOOL *_Nonnull stop) {
-					if (application.bundleIdentifier
-						 isEqualToString:
-							 sc->
-							 application_id) {
-						target_application =
-							sc->shareable_content
-								.applications
-									idx;
-						*stop = TRUE;
-					}
-					return *stop;
-				};
-		}
-		NSArray *target_application_array = NSArray alloc
-			initWithObjects:target_application, nil;
-
-		NSArray *empty_array = NSArray alloc init;
-		content_filter = SCContentFilter alloc
-			 initWithDisplay:target_display
-			includingApplications:target_application_array
-			 exceptingWindows:empty_array;
-		target_application_array release;
-		empty_array release;
-
-		set_display_mode(sc, target_display);
-	} break;
-	}
-	os_sem_post(sc->shareable_content_available);
-
-	CGColorRef background = CGColorGetConstantColor(kCGColorClear);
-	sc->stream_properties setQueueDepth:8;
-	sc->stream_properties setShowsCursor:!sc->hide_cursor;
-	sc->stream_properties setColorSpaceName:kCGColorSpaceDisplayP3;
-	sc->stream_properties setBackgroundColor:background;
-	FourCharCode l10r_type = 0;
-	l10r_type = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
-	sc->stream_properties setPixelFormat:l10r_type;
-
-	if (@available(macOS 13.0, *)) {
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
-		sc->stream_properties setCapturesAudio:TRUE;
-		sc->stream_properties setExcludesCurrentProcessAudio:TRUE;
-		sc->stream_properties setChannelCount:2;
-#endif
-	} else {
-		if (sc->capture_type != ScreenCaptureWindowStream) {
-			sc->disp = NULL;
-			content_filter release;
-			os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL);
-			os_event_init(&sc->stream_start_completed,
-				 OS_EVENT_TYPE_MANUAL);
-			return true;
-		}
-	}
-
-	sc->disp = SCStream alloc initWithFilter:content_filter
-				 configuration:sc->stream_properties
-					 delegate:nil;
-
-	content_filter release;
-
-	NSError *addStreamOutputError = nil;
-	BOOL did_add_output = sc->disp addStreamOutput:sc->capture_delegate
-						 type:SCStreamOutputTypeScreen
-				 sampleHandlerQueue:nil
-						 error:&addStreamOutputError;
-	if (!did_add_output) {
-		MACCAP_ERR(
-			"init_screen_stream: Failed to add stream output with error %s\n",
-			addStreamOutputError localizedFailureReason
-				cStringUsingEncoding:NSUTF8StringEncoding);
-		addStreamOutputError release;
-		return !did_add_output;
-	}
-
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
-	if (@available(macOS 13.0, *)) {
-		did_add_output = sc->disp
-			 addStreamOutput:sc->capture_delegate
-				 type:SCStreamOutputTypeAudio
-			sampleHandlerQueue:nil
-				 error:&addStreamOutputError;
-		if (!did_add_output) {
-			MACCAP_ERR(
-				"init_screen_stream: Failed to add audio stream output with error %s\n",
-				addStreamOutputError localizedFailureReason
-					cStringUsingEncoding:
-						NSUTF8StringEncoding);
-			addStreamOutputError release;
-			return !did_add_output;
-		}
-	}
-#endif
-	os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL);
-	os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL);
-
-	__block BOOL did_stream_start = false;
-	sc->disp startCaptureWithCompletionHandler:^(
-			 NSError *_Nullable error) {
-		did_stream_start = (BOOL)(error == nil);
-		if (!did_stream_start) {
-			MACCAP_ERR(
-				"init_screen_stream: Failed to start capture with error %s\n",
-				error localizedFailureReason
-					cStringUsingEncoding:
-						NSUTF8StringEncoding);
-			// Clean up disp so it isn't stopped
-			sc->disp release;
-			sc->disp = NULL;
-		}
-		os_event_signal(sc->stream_start_completed);
-	};
-	os_event_wait(sc->stream_start_completed);
-
-	return did_stream_start;
-}
-
-static void screen_capture_build_content_list(struct screen_capture *sc,
-					 bool display_capture)
-{
-	typedef void (^shareable_content_callback)(SCShareableContent *,
-						 NSError *);
-	shareable_content_callback new_content_received = ^void(
-		SCShareableContent *shareable_content, NSError *error) {
-		if (error == nil && sc->shareable_content_available != NULL) {
-			sc->shareable_content = shareable_content retain;
-		} else {
-#ifdef DEBUG
-			MACCAP_ERR(
-				"screen_capture_properties: Failed to get shareable content with error %s\n",
-				error localizedFailureReason
-					cStringUsingEncoding:
-						NSUTF8StringEncoding);
-#endif
-			MACCAP_LOG(
-				LOG_WARNING,
-				"Unable to get list of available applications or windows. "
-				"Please check if OBS has necessary screen capture permissions.");
-		}
-		os_sem_post(sc->shareable_content_available);
-	};
-
-	os_sem_wait(sc->shareable_content_available);
-	sc->shareable_content release;
-	SCShareableContent
-		getShareableContentExcludingDesktopWindows:TRUE
-				 onScreenWindowsOnly:
-					 (display_capture
-							? FALSE
-							: !sc->show_hidden_windows)
-				 completionHandler:new_content_received;
-}
-
-static void *screen_capture_create(obs_data_t *settings, obs_source_t *source)
-{
-	struct screen_capture *sc = bzalloc(sizeof(struct screen_capture));
-
-	sc->source = source;
-	sc->hide_cursor = !obs_data_get_bool(settings, "show_cursor");
-	sc->show_empty_names = obs_data_get_bool(settings, "show_empty_names");
-	sc->show_hidden_windows =
-		obs_data_get_bool(settings, "show_hidden_windows");
-	sc->window = (CGWindowID)obs_data_get_int(settings, "window");
-	sc->capture_type = (unsigned int)obs_data_get_int(settings, "type");
-
-	os_sem_init(&sc->shareable_content_available, 1);
-	screen_capture_build_content_list(
-		sc, sc->capture_type == ScreenCaptureDisplayStream);
-
-	sc->capture_delegate = ScreenCaptureDelegate alloc init;
-	sc->capture_delegate.sc = sc;
-
-	sc->effect = obs_get_base_effect(OBS_EFFECT_DEFAULT_RECT);
-	if (!sc->effect)
-		goto fail;
-
-	sc->display = (CGDirectDisplayID)obs_data_get_int(settings, "display");
-	sc->application_id = NSString alloc
-		initWithUTF8String:obs_data_get_string(settings,
-						 "application");
-	pthread_mutex_init(&sc->mutex, NULL);
-
-	if (!init_screen_stream(sc))
-		goto fail;
-
-	return sc;
-
-fail:
-	obs_leave_graphics();
-	screen_capture_destroy(sc);
-	return NULL;
-}
-
-static void screen_capture_video_tick(void *data, float seconds __unused)
-{
-	struct screen_capture *sc = data;
-
-	if (!sc->current)
-		return;
-	if (!obs_source_showing(sc->source))
-		return;
-
-	IOSurfaceRef prev_prev = sc->prev;
-	if (pthread_mutex_lock(&sc->mutex))
-		return;
-	sc->prev = sc->current;
-	sc->current = NULL;
-	pthread_mutex_unlock(&sc->mutex);
-
-	if (prev_prev == sc->prev)
-		return;
-
-	obs_enter_graphics();
-	if (sc->tex)
-		gs_texture_rebind_iosurface(sc->tex, sc->prev);
-	else
-		sc->tex = gs_texture_create_from_iosurface(sc->prev);
-	obs_leave_graphics();
-
-	if (prev_prev) {
-		IOSurfaceDecrementUseCount(prev_prev);
-		CFRelease(prev_prev);
-	}
-}
-
-static void screen_capture_video_render(void *data,
-					gs_effect_t *effect __unused)
-{
-	struct screen_capture *sc = data;
-
-	if (!sc->tex)
-		return;
-
-	const bool previous = gs_framebuffer_srgb_enabled();
-	gs_enable_framebuffer_srgb(true);
-
-	gs_eparam_t *param = gs_effect_get_param_by_name(sc->effect, "image");
-	gs_effect_set_texture(param, sc->tex);
-
-	while (gs_effect_loop(sc->effect, "DrawD65P3"))
-		gs_draw_sprite(sc->tex, 0, 0, 0);
-
-	gs_enable_framebuffer_srgb(previous);
-}
-
-static const char *screen_capture_getname(void *unused __unused)
-{
-	if (@available(macOS 13.0, *))
-		return obs_module_text("SCK.Name");
-	else
-		return obs_module_text("SCK.Name.Beta");
-}
-
-static uint32_t screen_capture_getwidth(void *data)
-{
-	struct screen_capture *sc = data;
-
-	return (uint32_t)sc->frame.size.width;
-}
-
-static uint32_t screen_capture_getheight(void *data)
-{
-	struct screen_capture *sc = data;
-
-	return (uint32_t)sc->frame.size.height;
-}
-
-static void screen_capture_defaults(obs_data_t *settings)
-{
-	CGDirectDisplayID initial_display = 0;
-	{
-		NSScreen *mainScreen = NSScreen mainScreen;
-		if (mainScreen) {
-			NSNumber *screen_num =
-				mainScreen.deviceDescription@"NSScreenNumber";
-			if (screen_num) {
-				initial_display =
-					(CGDirectDisplayID)(uintptr_t)
-						screen_num.pointerValue;
-			}
-		}
-	}
-
-	obs_data_set_default_int(settings, "display", initial_display);
-
-	obs_data_set_default_obj(settings, "application", NULL);
-	obs_data_set_default_int(settings, "type", ScreenCaptureDisplayStream);
-	obs_data_set_default_int(settings, "window", kCGNullWindowID);
-	obs_data_set_default_bool(settings, "show_cursor", true);
-	obs_data_set_default_bool(settings, "show_empty_names", false);
-	obs_data_set_default_bool(settings, "show_hidden_windows", false);
-}
-
-static void screen_capture_update(void *data, obs_data_t *settings)
-{
-	struct screen_capture *sc = data;
-
-	CGWindowID old_window_id = sc->window;
-	CGWindowID new_window_id =
-		(CGWindowID)obs_data_get_int(settings, "window");
-
-	if (new_window_id > 0 && new_window_id != old_window_id)
-		sc->window = new_window_id;
-
-	ScreenCaptureStreamType capture_type =
-		(ScreenCaptureStreamType)obs_data_get_int(settings, "type");
-	CGDirectDisplayID display =
-		(CGDirectDisplayID)obs_data_get_int(settings, "display");
-	NSString *application_id = NSString alloc
-		initWithUTF8String:obs_data_get_string(settings,
-						 "application");
-	bool show_cursor = obs_data_get_bool(settings, "show_cursor");
-	bool show_empty_names = obs_data_get_bool(settings, "show_empty_names");
-	bool show_hidden_windows =
-		obs_data_get_bool(settings, "show_hidden_windows");
-
-	if (capture_type == sc->capture_type) {
-		switch (sc->capture_type) {
-		case ScreenCaptureDisplayStream: {
-			if (sc->display == display &&
-			 sc->hide_cursor != show_cursor) {
-				application_id release;
-				return;
-			}
-		} break;
-		case ScreenCaptureWindowStream: {
-			if (old_window_id == sc->window &&
-			 sc->hide_cursor != show_cursor) {
-				application_id release;
-				return;
-			}
-		} break;
-		case ScreenCaptureApplicationStream: {
-			if (sc->display == display &&
-			 application_id
-				 isEqualToString:sc->application_id &&
-			 sc->hide_cursor != show_cursor) {
-				application_id release;
-				return;
-			}
-		} break;
-		}
-	}
-
-	obs_enter_graphics();
-
-	destroy_screen_stream(sc);
-	sc->capture_type = capture_type;
-	sc->display = display;
-	sc->application_id release;
-	sc->application_id = application_id;
-	sc->hide_cursor = !show_cursor;
-	sc->show_empty_names = show_empty_names;
-	sc->show_hidden_windows = show_hidden_windows;
-	init_screen_stream(sc);
-
-	obs_leave_graphics();
-}
-
-#pragma mark - obs_properties
-
-static bool build_display_list(struct screen_capture *sc,
-			 obs_properties_t *props)
-{
-	os_sem_wait(sc->shareable_content_available);
-
-	obs_property_t *display_list = obs_properties_get(props, "display");
-	obs_property_list_clear(display_list);
-
-	sc->shareable_content.displays enumerateObjectsUsingBlock:^(
-						SCDisplay *_Nonnull display,
-						NSUInteger idx __unused,
-						BOOL *_Nonnull _stop __unused) {
-		NSUInteger screen_index =
-			NSScreen.screens indexOfObjectPassingTest:^BOOL(
-						 NSScreen *_Nonnull screen,
-						 NSUInteger index __unused,
-						 BOOL *_Nonnull stop) {
-				NSNumber *screen_num =
-					screen.deviceDescription
-						@"NSScreenNumber";
-				CGDirectDisplayID screen_display_id =
-					(CGDirectDisplayID)screen_num.intValue;
-				*stop = (screen_display_id ==
-					 display.displayID);
-
-				return *stop;
-			};
-		NSScreen *screen =
-			NSScreen.screens objectAtIndex:screen_index;
-
-		char dimension_buffer412 = {};
-		char name_buffer256 = {};
-		snprintf(dimension_buffer0, sizeof(dimension_buffer0), "%u",
-			 (uint32_t)screen.frame.size.width);
-		snprintf(dimension_buffer1, sizeof(dimension_buffer0), "%u",
-			 (uint32_t)screen.frame.size.height);
-		snprintf(dimension_buffer2, sizeof(dimension_buffer0), "%d",
-			 (int32_t)screen.frame.origin.x);
-		snprintf(dimension_buffer3, sizeof(dimension_buffer0), "%d",
-			 (int32_t)screen.frame.origin.y);
-
-		snprintf(name_buffer, sizeof(name_buffer),
-			 "%.200s: %.12sx%.12s @ %.12s,%.12s",
-			 screen.localizedName.UTF8String, dimension_buffer0,
-			 dimension_buffer1, dimension_buffer2,
-			 dimension_buffer3);
-
-		obs_property_list_add_int(display_list, name_buffer,
-					 display.displayID);
-	};
-
-	os_sem_post(sc->shareable_content_available);
-	return true;
-}
-
-static bool build_window_list(struct screen_capture *sc,
-			 obs_properties_t *props)
-{
-	os_sem_wait(sc->shareable_content_available);
-
-	obs_property_t *window_list = obs_properties_get(props, "window");
-	obs_property_list_clear(window_list);
-
-	sc->shareable_content.windows enumerateObjectsUsingBlock:^(
-					 SCWindow *_Nonnull window,
-					 NSUInteger idx __unused,
-					 BOOL *_Nonnull stop __unused) {
-		NSString *app_name = window.owningApplication.applicationName;
-		NSString *title = window.title;
-
-		if (!sc->show_empty_names) {
-			if (app_name == NULL || title == NULL) {
-				return;
-			} else if (app_name isEqualToString:@"" ||
-				 title isEqualToString:@"") {
-				return;
-			}
-		}
-
-		const char *list_text =
-			NSString stringWithFormat:@"%@ %@", app_name, title
-				UTF8String;
-		obs_property_list_add_int(window_list, list_text,
-					 window.windowID);
-	};
-
-	os_sem_post(sc->shareable_content_available);
-	return true;
-}
-
-static bool build_application_list(struct screen_capture *sc,
-				 obs_properties_t *props)
-{
-	os_sem_wait(sc->shareable_content_available);
-
-	obs_property_t *application_list =
-		obs_properties_get(props, "application");
-	obs_property_list_clear(application_list);
-
-	sc->shareable_content.applications
-		enumerateObjectsUsingBlock:^(
-			SCRunningApplication *_Nonnull application,
-			NSUInteger idx __unused, BOOL *_Nonnull stop __unused) {
-			const char *name =
-				application.applicationName UTF8String;
-			const char *bundle_id =
-				application.bundleIdentifier UTF8String;
-			if (strcmp(name, "") != 0)
-				obs_property_list_add_string(application_list,
-							 name, bundle_id);
-		};
-
-	os_sem_post(sc->shareable_content_available);
-	return true;
-}
-
-static bool content_settings_changed(void *data, obs_properties_t *props,
-				 obs_property_t *list __unused,
-				 obs_data_t *settings)
-{
-	struct screen_capture *sc = data;
-
-	unsigned int capture_type_id =
-		(unsigned int)obs_data_get_int(settings, "type");
-	obs_property_t *display_list = obs_properties_get(props, "display");
-	obs_property_t *window_list = obs_properties_get(props, "window");
-	obs_property_t *app_list = obs_properties_get(props, "application");
-	obs_property_t *empty = obs_properties_get(props, "show_empty_names");
-	obs_property_t *hidden =
-		obs_properties_get(props, "show_hidden_windows");
-
-	obs_property_t *capture_type_error =
-		obs_properties_get(props, "capture_type_info");
-
-	if (sc->capture_type != capture_type_id) {
-		switch (capture_type_id) {
-		case 0: {
-			obs_property_set_visible(display_list, true);
-			obs_property_set_visible(window_list, false);
-			obs_property_set_visible(app_list, false);
-			obs_property_set_visible(empty, false);
-			obs_property_set_visible(hidden, false);
-
-			if (capture_type_error) {
-				obs_property_set_visible(capture_type_error,
-							 true);
-			}
-			break;
-		}
-		case 1: {
-			obs_property_set_visible(display_list, false);
-			obs_property_set_visible(window_list, true);
-			obs_property_set_visible(app_list, false);
-			obs_property_set_visible(empty, true);
-			obs_property_set_visible(hidden, true);
-
-			if (capture_type_error) {
-				obs_property_set_visible(capture_type_error,
-							 false);
-			}
-			break;
-		}
-		case 2: {
-			obs_property_set_visible(display_list, true);
-			obs_property_set_visible(app_list, true);
-			obs_property_set_visible(window_list, false);
-			obs_property_set_visible(empty, false);
-			obs_property_set_visible(hidden, true);
-
-			if (capture_type_error) {
-				obs_property_set_visible(capture_type_error,
-							 true);
-			}
-			break;
-		}
-		}
-	}
-
-	screen_capture_build_content_list(
-		sc, capture_type_id == ScreenCaptureDisplayStream);
-	build_display_list(sc, props);
-	build_window_list(sc, props);
-	build_application_list(sc, props);
-
-	sc->show_empty_names = obs_data_get_bool(settings, "show_empty_names");
-	sc->show_hidden_windows =
-		obs_data_get_bool(settings, "show_hidden_windows");
-
-	return true;
-}
-
-static obs_properties_t *screen_capture_properties(void *data)
-{
-	struct screen_capture *sc = data;
-
-	obs_properties_t *props = obs_properties_create();
-
-	obs_property_t *capture_type = obs_properties_add_list(
-		props, "type", obs_module_text("SCK.Method"),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-
-	obs_property_list_add_int(capture_type,
-				 obs_module_text("DisplayCapture"), 0);
-	obs_property_list_add_int(capture_type,
-				 obs_module_text("WindowCapture"), 1);
-	obs_property_list_add_int(capture_type,
-				 obs_module_text("ApplicationCapture"), 2);
-
-	obs_property_set_modified_callback2(capture_type,
-					 content_settings_changed, data);
-
-	obs_property_t *display_list = obs_properties_add_list(
-		props, "display", obs_module_text("DisplayCapture.Display"),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-
-	obs_property_t *app_list = obs_properties_add_list(
-		props, "application", obs_module_text("Application"),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
-
-	obs_property_t *window_list = obs_properties_add_list(
-		props, "window", obs_module_text("WindowUtils.Window"),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-
-	obs_property_t *empty = obs_properties_add_bool(
-		props, "show_empty_names",
-		obs_module_text("WindowUtils.ShowEmptyNames"));
-
-	obs_property_t *hidden = obs_properties_add_bool(
-		props, "show_hidden_windows",
-		obs_module_text("WindowUtils.ShowHidden"));
-
-	if (sc) {
-		obs_property_set_modified_callback2(
-			hidden, content_settings_changed, sc);
-
-		switch (sc->capture_type) {
-		case 0: {
-			obs_property_set_visible(display_list, true);
-			obs_property_set_visible(window_list, false);
-			obs_property_set_visible(app_list, false);
-			obs_property_set_visible(empty, false);
-			obs_property_set_visible(hidden, false);
-			break;
-		}
-		case 1: {
-			obs_property_set_visible(display_list, false);
-			obs_property_set_visible(window_list, true);
-			obs_property_set_visible(app_list, false);
-			obs_property_set_visible(empty, true);
-			obs_property_set_visible(hidden, true);
-			break;
-		}
-		case 2: {
-			obs_property_set_visible(display_list, true);
-			obs_property_set_visible(app_list, true);
-			obs_property_set_visible(window_list, false);
-			obs_property_set_visible(empty, false);
-			obs_property_set_visible(hidden, true);
-			break;
-		}
-		}
-
-		obs_property_set_modified_callback2(
-			empty, content_settings_changed, sc);
-	}
-
-	obs_properties_add_bool(props, "show_cursor",
-				obs_module_text("DisplayCapture.ShowCursor"));
-
-	if (@available(macOS 13.0, *))
-		;
-	else {
-		obs_property_t *audio_warning = obs_properties_add_text(
-			props, "audio_info",
-			obs_module_text("SCK.AudioUnavailable"), OBS_TEXT_INFO);
-		obs_property_text_set_info_type(audio_warning,
-						OBS_TEXT_INFO_WARNING);
-
-		obs_property_t *capture_type_error = obs_properties_add_text(
-			props, "capture_type_info",
-			obs_module_text("SCK.CaptureTypeUnavailable"),
-			OBS_TEXT_INFO);
-
-		obs_property_text_set_info_type(capture_type_error,
-						OBS_TEXT_INFO_ERROR);
-
-		if (sc) {
-			switch (sc->capture_type) {
-			case ScreenCaptureDisplayStream: {
-				obs_property_set_visible(capture_type_error,
-							 true);
-				break;
-			}
-			case ScreenCaptureWindowStream: {
-				obs_property_set_visible(capture_type_error,
-							 false);
-				break;
-			}
-			case ScreenCaptureApplicationStream: {
-				obs_property_set_visible(capture_type_error,
-							 true);
-				break;
-			}
-			}
-		} else {
-			obs_property_set_visible(capture_type_error, false);
-		}
-	}
-
-	return props;
-}
-
-enum gs_color_space screen_capture_video_get_color_space(
-	void *data, size_t count, const enum gs_color_space *preferred_spaces)
-{
-	UNUSED_PARAMETER(data);
-
-	for (size_t i = 0; i < count; ++i) {
-		if (preferred_spacesi == GS_CS_SRGB_16F)
-			return GS_CS_SRGB_16F;
-	}
-
-	for (size_t i = 0; i < count; ++i) {
-		if (preferred_spacesi == GS_CS_709_EXTENDED)
-			return GS_CS_709_EXTENDED;
-	}
-
-	for (size_t i = 0; i < count; ++i) {
-		if (preferred_spacesi == GS_CS_SRGB)
-			return GS_CS_SRGB;
-	}
-
-	return GS_CS_SRGB_16F;
-}
-
-#pragma mark - obs_source_info
-
-struct obs_source_info screen_capture_info = {
-	.id = "screen_capture",
-	.type = OBS_SOURCE_TYPE_INPUT,
-	.get_name = screen_capture_getname,
-
-	.create = screen_capture_create,
-	.destroy = screen_capture_destroy,
-
-	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
-			OBS_SOURCE_DO_NOT_DUPLICATE | OBS_SOURCE_SRGB |
-			OBS_SOURCE_AUDIO,
-	.video_tick = screen_capture_video_tick,
-	.video_render = screen_capture_video_render,
-
-	.get_width = screen_capture_getwidth,
-	.get_height = screen_capture_getheight,
-
-	.get_defaults = screen_capture_defaults,
-	.get_properties = screen_capture_properties,
-	.update = screen_capture_update,
-	.icon_type = OBS_ICON_TYPE_DESKTOP_CAPTURE,
-	.video_get_color_space = screen_capture_video_get_color_space,
-};
-
-#pragma mark - ScreenCaptureDelegate
-
-@implementation ScreenCaptureDelegate
-
-- (void)stream:(SCStream *)stream
-	didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
-		 ofType:(SCStreamOutputType)type
-{
-	if (self.sc != NULL) {
-		if (type == SCStreamOutputTypeScreen) {
-			screen_stream_video_update(self.sc, sampleBuffer);
-		}
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
-		else if (@available(macOS 13.0, *)) {
-			if (type == SCStreamOutputTypeAudio) {
-				screen_stream_audio_update(self.sc,
-							 sampleBuffer);
-			}
-		}
-#endif
-	}
-}
-
-@end
-
-// "-Wunguarded-availability-new"
-#pragma clang diagnostic pop
-#endif

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/cmake/legacy.cmake Deleted

@@ -1,77 +0,0 @@
-project(mac-syphon)
-
-find_package(OpenGL REQUIRED)
-
-find_library(COCOA Cocoa)
-find_library(IOSURF IOSurface)
-find_library(SCRIPTINGBRIDGE ScriptingBridge)
-
-mark_as_advanced(COCOA IOSURF SCRIPTINGBRIDGE)
-
-add_library(mac-syphon MODULE)
-add_library(OBS::syphon ALIAS mac-syphon)
-
-add_library(syphon-framework STATIC)
-add_library(Syphon::Framework ALIAS syphon-framework)
-
-target_sources(mac-syphon PRIVATE syphon.m plugin-main.c)
-
-target_sources(
-  syphon-framework
-  PRIVATE syphon-framework/Syphon_Prefix.pch
-          syphon-framework/Syphon.h
-          syphon-framework/SyphonBuildMacros.h
-          syphon-framework/SyphonCFMessageReceiver.m
-          syphon-framework/SyphonCFMessageReceiver.h
-          syphon-framework/SyphonCFMessageSender.h
-          syphon-framework/SyphonCFMessageSender.m
-          syphon-framework/SyphonClient.m
-          syphon-framework/SyphonClient.h
-          syphon-framework/SyphonClientConnectionManager.m
-          syphon-framework/SyphonClientConnectionManager.h
-          syphon-framework/SyphonDispatch.c
-          syphon-framework/SyphonDispatch.h
-          syphon-framework/SyphonIOSurfaceImage.m
-          syphon-framework/SyphonIOSurfaceImage.h
-          syphon-framework/SyphonImage.m
-          syphon-framework/SyphonImage.h
-          syphon-framework/SyphonMachMessageReceiver.m
-          syphon-framework/SyphonMachMessageReceiver.h
-          syphon-framework/SyphonMachMessageSender.m
-          syphon-framework/SyphonMachMessageSender.h
-          syphon-framework/SyphonMessageQueue.m
-          syphon-framework/SyphonMessageQueue.h
-          syphon-framework/SyphonMessageReceiver.m
-          syphon-framework/SyphonMessageReceiver.h
-          syphon-framework/SyphonMessageSender.m
-          syphon-framework/SyphonMessageSender.h
-          syphon-framework/SyphonMessaging.m
-          syphon-framework/SyphonMessaging.h
-          syphon-framework/SyphonOpenGLFunctions.c
-          syphon-framework/SyphonOpenGLFunctions.h
-          syphon-framework/SyphonPrivate.m
-          syphon-framework/SyphonPrivate.h
-          syphon-framework/SyphonServer.m
-          syphon-framework/SyphonServer.h
-          syphon-framework/SyphonServerConnectionManager.m
-          syphon-framework/SyphonServerConnectionManager.h
-          syphon-framework/SyphonServerDirectory.m
-          syphon-framework/SyphonServerDirectory.h)
-
-target_link_libraries(mac-syphon PRIVATE OBS::libobs Syphon::Framework ${SCRIPTINGBRIDGE})
-
-target_link_libraries(syphon-framework PUBLIC OpenGL::GL ${COCOA} ${IOSURF})
-
-target_compile_options(mac-syphon PRIVATE -include ${CMAKE_CURRENT_SOURCE_DIR}/syphon-framework/Syphon_Prefix.pch
-                                          -fobjc-arc)
-
-target_compile_options(syphon-framework PRIVATE -include ${CMAKE_CURRENT_SOURCE_DIR}/syphon-framework/Syphon_Prefix.pch
-                                                -Wno-deprecated-declarations)
-
-target_compile_definitions(syphon-framework PUBLIC "SYPHON_UNIQUE_CLASS_NAME_PREFIX=OBS_")
-
-set_target_properties(mac-syphon PROPERTIES FOLDER "plugins" PREFIX "")
-
-set_target_properties(syphon-framework PROPERTIES FOLDER "plugins/mac-syphon" PREFIX "")
-
-setup_plugin_target(mac-syphon)

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/cmake/legacy.cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/cmake/legacy.cmake Deleted

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/Info.plist Deleted

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>obs-mac-virtualcam</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.obs-mac-virtualcam.dal-plugin</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>OBS Virtual Camera</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFPlugInFactories</key>
-	<dict>
-		<key>7E950B8C-5E49-4B9E-B7D0-B3608A08E8F6</key>
-		<string>PlugInMain</string>
-	</dict>
-	<key>CFPlugInTypes</key>
-	<dict>
-		<key>30010C1C-93BF-11D8-8B5B-000A95AF9C6A</key>
-		<array>
-			<string>7E950B8C-5E49-4B9E-B7D0-B3608A08E8F6</string>
-		</array>
-	</dict>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.13</string>
-	<key>CMIOHardwareAssistantServiceNames</key>
-	<array>
-		<string>com.obsproject.obs-mac-virtualcam.server</string>
-	</array>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/cmake/legacy.cmake Deleted

@@ -1,61 +0,0 @@
-project(mac-dal-plugin)
-
-find_library(COCOA Cocoa)
-find_library(COREMEDIA CoreMedia)
-find_library(COREMEDIAIO CoreMediaIO)
-find_library(COREVIDEO CoreVideo)
-find_library(IOSURFACE IOSurface)
-
-mark_as_advanced(COCOA COREMEDIA COREMEDIAIO COREVIDEO IOSURFACE)
-
-add_library(mac-dal-plugin MODULE)
-add_library(OBS::mac-dal-plugin ALIAS mac-dal-plugin)
-
-target_sources(
- mac-dal-plugin
- PRIVATE OBSDALPlugIn.mm
- OBSDALPlugIn.h
- OBSDALPlugInMain.mm
- OBSDALPlugInInterface.mm
- OBSDALPlugInInterface.h
- OBSDALObjectStore.mm
- OBSDALObjectStore.h
- OBSDALDevice.mm
- OBSDALDevice.h
- OBSDALMachClient.mm
- OBSDALMachClient.h
- CMSampleBufferUtils.mm
- OBSDALStream.mm
- OBSDALStream.h
- CMSampleBufferUtils.h
- Defines.h
- Logging.h
- ${CMAKE_CURRENT_SOURCE_DIR}/../common/MachProtocol.h)
-
-target_include_directories(mac-dal-plugin PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../common")
-
-target_compile_options(mac-dal-plugin PRIVATE -fobjc-arc -fobjc-weak)
-
-target_link_libraries(mac-dal-plugin PRIVATE ${COCOA} ${COREMEDIA} ${COREMEDIAIO} ${COREVIDEO} ${IOSURFACE})
-
-set(MACOSX_PLUGIN_BUNDLE_TYPE "BNDL")
-target_sources(mac-dal-plugin PRIVATE placeholder.png)
-set_source_files_properties(placeholder.png PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
-source_group("Resources" FILES placeholder.png)
-
-set_target_properties(
- mac-dal-plugin
- PROPERTIES BUNDLE ON
- BUNDLE_EXTENSION "plugin"
- OUTPUT_NAME "obs-mac-virtualcam"
- FOLDER "plugins"
- VERSION "0"
- SOVERSION "0"
- # Force the DAL plugin to be built for arm64e as well. Note that
- # we cannot build OBS for arm64e, since its libraries are not
- # built for this architecture at the moment.
- OSX_ARCHITECTURES "x86_64;arm64;arm64e"
- LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../"
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/cmake/bundle/macOS/Virtualcam-Info.plist.in")
-
-setup_binary_target(mac-dal-plugin)

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/cmake/legacy.cmake Deleted

@@ -1,29 +0,0 @@
-project(mac-virtualcam)
-
-find_library(APPKIT AppKit)
-find_library(COREVIDEO CoreVideo)
-find_library(IOSURFACE IOSurface)
-
-mark_as_advanced(APPKIT COREVIDEO IOSURFACE)
-
-add_library(mac-virtualcam MODULE)
-add_library(OBS::virtualcam ALIAS mac-virtualcam)
-
-target_sources(mac-virtualcam PRIVATE Defines.h plugin-main.mm OBSDALMachServer.mm OBSDALMachServer.h
- ../common/MachProtocol.h)
-
-target_include_directories(mac-virtualcam PRIVATE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/../common")
-
-target_link_libraries(mac-virtualcam PRIVATE OBS::libobs OBS::frontend-api ${APPKIT} ${COREVIDEO} ${IOSURFACE})
-
-target_compile_features(mac-virtualcam PRIVATE cxx_deleted_functions cxx_rvalue_references cxx_std_17)
-
-target_compile_options(mac-virtualcam PRIVATE -fobjc-arc -fobjc-weak)
-
-set_target_properties(
- mac-virtualcam
- PROPERTIES FOLDER "plugins"
- PREFIX ""
- LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../")
-
-setup_plugin_target(mac-virtualcam)

obs-studio-29.1.3.tar.xz/plugins/obs-browser/deps/json11 Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-browser/deps/json11/.clang-format Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-browser/deps/json11/LICENSE.txt Deleted

@@ -1,19 +0,0 @@
-Copyright (c) 2013 Dropbox, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

obs-studio-29.1.3.tar.xz/plugins/obs-browser/deps/json11/json11.cpp Deleted

@@ -1,788 +0,0 @@
-/* Copyright (c) 2013 Dropbox, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "json11.hpp"
-#include <cassert>
-#include <cmath>
-#include <cstdlib>
-#include <cstdio>
-#include <limits>
-
-namespace json11 {
-
-static const int max_depth = 200;
-
-using std::string;
-using std::vector;
-using std::map;
-using std::make_shared;
-using std::initializer_list;
-using std::move;
-
-/* Helper for representing null - just a do-nothing struct, plus comparison
- * operators so the helpers in JsonValue work. We can't use nullptr_t because
- * it may not be orderable.
- */
-struct NullStruct {
- bool operator==(NullStruct) const { return true; }
- bool operator<(NullStruct) const { return false; }
-};
-
-/* * * * * * * * * * * * * * * * * * * *
- * Serialization
- */
-
-static void dump(NullStruct, string &out) {
- out += "null";
-}
-
-static void dump(double value, string &out) {
- if (std::isfinite(value)) {
- char buf32;
- snprintf(buf, sizeof buf, "%.17g", value);
- out += buf;
- } else {
- out += "null";
- }
-}
-
-static void dump(int value, string &out) {
- char buf32;
- snprintf(buf, sizeof buf, "%d", value);
- out += buf;
-}
-
-static void dump(bool value, string &out) {
- out += value ? "true" : "false";
-}
-
-static void dump(const string &value, string &out) {
- out += '"';
- for (size_t i = 0; i < value.length(); i++) {
- const char ch = valuei;
- if (ch == '\\') {
- out += "\\\\";
- } else if (ch == '"') {
- out += "\\\"";
- } else if (ch == '\b') {
- out += "\\b";
- } else if (ch == '\f') {
- out += "\\f";
- } else if (ch == '\n') {
- out += "\\n";
- } else if (ch == '\r') {
- out += "\\r";
- } else if (ch == '\t') {
- out += "\\t";
- } else if (static_cast<uint8_t>(ch) <= 0x1f) {
- char buf8;
- snprintf(buf, sizeof buf, "\\u%04x", ch);
- out += buf;
- } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(valuei+1) == 0x80
- && static_cast<uint8_t>(valuei+2) == 0xa8) {
- out += "\\u2028";
- i += 2;
- } else if (static_cast<uint8_t>(ch) == 0xe2 && static_cast<uint8_t>(valuei+1) == 0x80
- && static_cast<uint8_t>(valuei+2) == 0xa9) {
- out += "\\u2029";
- i += 2;
- } else {
- out += ch;
- }
- }
- out += '"';
-}
-
-static void dump(const Json::array &values, string &out) {
- bool first = true;
- out += "";
- for (const auto &value : values) {
- if (!first)
- out += ", ";
- value.dump(out);
- first = false;
- }
- out += "";
-}
-
-static void dump(const Json::object &values, string &out) {
- bool first = true;
- out += "{";
- for (const auto &kv : values) {
- if (!first)
- out += ", ";
- dump(kv.first, out);
- out += ": ";
- kv.second.dump(out);
- first = false;
- }
- out += "}";
-}
-
-void Json::dump(string &out) const {
- m_ptr->dump(out);
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Value wrappers
- */
-
-template <Json::Type tag, typename T>
-class Value : public JsonValue {
-protected:
-
- // Constructors
- explicit Value(const T &value) : m_value(value) {}
- explicit Value(T &&value) : m_value(move(value)) {}
-
- // Get type tag
- Json::Type type() const override {
- return tag;
- }
-
- // Comparisons
- bool equals(const JsonValue * other) const override {
- return m_value == static_cast<const Value<tag, T> *>(other)->m_value;
- }
- bool less(const JsonValue * other) const override {
- return m_value < static_cast<const Value<tag, T> *>(other)->m_value;
- }
-
- const T m_value;
- void dump(string &out) const override { json11::dump(m_value, out); }
-};
-
-class JsonDouble final : public Value<Json::NUMBER, double> {
- double number_value() const override { return m_value; }
- int int_value() const override { return static_cast<int>(m_value); }
- bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
- bool less(const JsonValue * other) const override { return m_value < other->number_value(); }
-public:
- explicit JsonDouble(double value) : Value(value) {}
-};
-
-class JsonInt final : public Value<Json::NUMBER, int> {
- double number_value() const override { return m_value; }
- int int_value() const override { return m_value; }
- bool equals(const JsonValue * other) const override { return m_value == other->number_value(); }
- bool less(const JsonValue * other) const override { return m_value < other->number_value(); }
-public:
- explicit JsonInt(int value) : Value(value) {}
-};
-
-class JsonBoolean final : public Value<Json::BOOL, bool> {
- bool bool_value() const override { return m_value; }
-public:
- explicit JsonBoolean(bool value) : Value(value) {}
-};
-
-class JsonString final : public Value<Json::STRING, string> {
- const string &string_value() const override { return m_value; }
-public:
- explicit JsonString(const string &value) : Value(value) {}
- explicit JsonString(string &&value) : Value(move(value)) {}
-};
-
-class JsonArray final : public Value<Json::ARRAY, Json::array> {
- const Json::array &array_items() const override { return m_value; }
- const Json & operator(size_t i) const override;
-public:
- explicit JsonArray(const Json::array &value) : Value(value) {}
- explicit JsonArray(Json::array &&value) : Value(move(value)) {}
-};
-
-class JsonObject final : public Value<Json::OBJECT, Json::object> {
- const Json::object &object_items() const override { return m_value; }
- const Json & operator(const string &key) const override;
-public:
- explicit JsonObject(const Json::object &value) : Value(value) {}
- explicit JsonObject(Json::object &&value) : Value(move(value)) {}
-};
-
-class JsonNull final : public Value<Json::NUL, NullStruct> {
-public:
- JsonNull() : Value({}) {}
-};
-
-/* * * * * * * * * * * * * * * * * * * *
- * Static globals - static-init-safe
- */
-struct Statics {
- const std::shared_ptr<JsonValue> null = make_shared<JsonNull>();
- const std::shared_ptr<JsonValue> t = make_shared<JsonBoolean>(true);
- const std::shared_ptr<JsonValue> f = make_shared<JsonBoolean>(false);
- const string empty_string;
- const vector<Json> empty_vector;
- const map<string, Json> empty_map;
- Statics() {}
-};
-
-static const Statics & statics() {
- static const Statics s {};
- return s;
-}
-
-static const Json & static_null() {
- // This has to be separate, not in Statics, because Json() accesses statics().null.
- static const Json json_null;
- return json_null;
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Constructors
- */
-
-Json::Json() noexcept : m_ptr(statics().null) {}
-Json::Json(std::nullptr_t) noexcept : m_ptr(statics().null) {}
-Json::Json(double value) : m_ptr(make_shared<JsonDouble>(value)) {}
-Json::Json(int value) : m_ptr(make_shared<JsonInt>(value)) {}
-Json::Json(bool value) : m_ptr(value ? statics().t : statics().f) {}
-Json::Json(const string &value) : m_ptr(make_shared<JsonString>(value)) {}
-Json::Json(string &&value) : m_ptr(make_shared<JsonString>(move(value))) {}
-Json::Json(const char * value) : m_ptr(make_shared<JsonString>(value)) {}
-Json::Json(const Json::array &values) : m_ptr(make_shared<JsonArray>(values)) {}
-Json::Json(Json::array &&values) : m_ptr(make_shared<JsonArray>(move(values))) {}
-Json::Json(const Json::object &values) : m_ptr(make_shared<JsonObject>(values)) {}
-Json::Json(Json::object &&values) : m_ptr(make_shared<JsonObject>(move(values))) {}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Accessors
- */
-
-Json::Type Json::type() const { return m_ptr->type(); }
-double Json::number_value() const { return m_ptr->number_value(); }
-int Json::int_value() const { return m_ptr->int_value(); }
-bool Json::bool_value() const { return m_ptr->bool_value(); }
-const string & Json::string_value() const { return m_ptr->string_value(); }
-const vector<Json> & Json::array_items() const { return m_ptr->array_items(); }
-const map<string, Json> & Json::object_items() const { return m_ptr->object_items(); }
-const Json & Json::operator (size_t i) const { return (*m_ptr)i; }
-const Json & Json::operator (const string &key) const { return (*m_ptr)key; }
-
-double JsonValue::number_value() const { return 0; }
-int JsonValue::int_value() const { return 0; }
-bool JsonValue::bool_value() const { return false; }
-const string & JsonValue::string_value() const { return statics().empty_string; }
-const vector<Json> & JsonValue::array_items() const { return statics().empty_vector; }
-const map<string, Json> & JsonValue::object_items() const { return statics().empty_map; }
-const Json & JsonValue::operator (size_t) const { return static_null(); }
-const Json & JsonValue::operator (const string &) const { return static_null(); }
-
-const Json & JsonObject::operator (const string &key) const {
- auto iter = m_value.find(key);
- return (iter == m_value.end()) ? static_null() : iter->second;
-}
-const Json & JsonArray::operator (size_t i) const {
- if (i >= m_value.size()) return static_null();
- else return m_valuei;
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Comparison
- */
-
-bool Json::operator== (const Json &other) const {
- if (m_ptr == other.m_ptr)
- return true;
- if (m_ptr->type() != other.m_ptr->type())
- return false;
-
- return m_ptr->equals(other.m_ptr.get());
-}
-
-bool Json::operator< (const Json &other) const {
- if (m_ptr == other.m_ptr)
- return false;
- if (m_ptr->type() != other.m_ptr->type())
- return m_ptr->type() < other.m_ptr->type();
-
- return m_ptr->less(other.m_ptr.get());
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Parsing
- */
-
-/* esc(c)
- *
- * Format char c suitable for printing in an error message.
- */
-static inline string esc(char c) {
- char buf12;
- if (static_cast<uint8_t>(c) >= 0x20 && static_cast<uint8_t>(c) <= 0x7f) {
- snprintf(buf, sizeof buf, "'%c' (%d)", c, c);
- } else {
- snprintf(buf, sizeof buf, "(%d)", c);
- }
- return string(buf);
-}
-
-static inline bool in_range(long x, long lower, long upper) {
- return (x >= lower && x <= upper);
-}
-
-namespace {
-/* JsonParser
- *
- * Object that tracks all state of an in-progress parse.
- */
-struct JsonParser final {
-
- /* State
- */
- const string &str;
- size_t i;
- string &err;
- bool failed;
- const JsonParse strategy;
-
- /* fail(msg, err_ret = Json())
- *
- * Mark this parse as failed.
- */
- Json fail(string &&msg) {
- return fail(move(msg), Json());
- }
-
- template <typename T>
- T fail(string &&msg, const T err_ret) {
- if (!failed)
- err = std::move(msg);
- failed = true;
- return err_ret;
- }
-
- /* consume_whitespace()
- *
- * Advance until the current character is non-whitespace.
- */
- void consume_whitespace() {
- while (stri == ' ' || stri == '\r' || stri == '\n' || stri == '\t')
- i++;
- }
-
- /* consume_comment()
- *
- * Advance comments (c-style inline and multiline).
- */
- bool consume_comment() {
- bool comment_found = false;
- if (stri == '/') {
- i++;
- if (i == str.size())
- return fail("unexpected end of input after start of comment", false);
- if (stri == '/') { // inline comment
- i++;
- // advance until next line, or end of input
- while (i < str.size() && stri != '\n') {
- i++;
- }
- comment_found = true;
- }
- else if (stri == '*') { // multiline comment
- i++;
- if (i > str.size()-2)
- return fail("unexpected end of input inside multi-line comment", false);
- // advance until closing tokens
- while (!(stri == '*' && stri+1 == '/')) {
- i++;
- if (i > str.size()-2)
- return fail(
- "unexpected end of input inside multi-line comment", false);
- }
- i += 2;
- comment_found = true;
- }
- else
- return fail("malformed comment", false);
- }
- return comment_found;
- }
-
- /* consume_garbage()
- *
- * Advance until the current character is non-whitespace and non-comment.
- */
- void consume_garbage() {
- consume_whitespace();
- if(strategy == JsonParse::COMMENTS) {
- bool comment_found = false;
- do {
- comment_found = consume_comment();
- if (failed) return;
- consume_whitespace();
- }
- while(comment_found);
- }
- }
-
- /* get_next_token()
- *
- * Return the next non-whitespace character. If the end of the input is reached,
- * flag an error and return 0.
- */
- char get_next_token() {
- consume_garbage();
- if (failed) return (char)0;
- if (i == str.size())
- return fail("unexpected end of input", (char)0);
-
- return stri++;
- }
-
- /* encode_utf8(pt, out)
- *
- * Encode pt as UTF-8 and add it to out.
- */
- void encode_utf8(long pt, string & out) {
- if (pt < 0)
- return;
-
- if (pt < 0x80) {
- out += static_cast<char>(pt);
- } else if (pt < 0x800) {
- out += static_cast<char>((pt >> 6) | 0xC0);
- out += static_cast<char>((pt & 0x3F) | 0x80);
- } else if (pt < 0x10000) {
- out += static_cast<char>((pt >> 12) | 0xE0);
- out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
- out += static_cast<char>((pt & 0x3F) | 0x80);
- } else {
- out += static_cast<char>((pt >> 18) | 0xF0);
- out += static_cast<char>(((pt >> 12) & 0x3F) | 0x80);
- out += static_cast<char>(((pt >> 6) & 0x3F) | 0x80);
- out += static_cast<char>((pt & 0x3F) | 0x80);
- }
- }
-
- /* parse_string()
- *
- * Parse a string, starting at the current position.
- */
- string parse_string() {
- string out;
- long last_escaped_codepoint = -1;
- while (true) {
- if (i == str.size())
- return fail("unexpected end of input in string", "");
-
- char ch = stri++;
-
- if (ch == '"') {
- encode_utf8(last_escaped_codepoint, out);
- return out;
- }
-
- if (in_range(ch, 0, 0x1f))
- return fail("unescaped " + esc(ch) + " in string", "");
-
- // The usual case: non-escaped characters
- if (ch != '\\') {
- encode_utf8(last_escaped_codepoint, out);
- last_escaped_codepoint = -1;
- out += ch;
- continue;
- }
-
- // Handle escapes
- if (i == str.size())
- return fail("unexpected end of input in string", "");
-
- ch = stri++;
-
- if (ch == 'u') {
- // Extract 4-byte escape sequence
- string esc = str.substr(i, 4);
- // Explicitly check length of the substring. The following loop
- // relies on std::string returning the terminating NUL when
- // accessing strlength. Checking here reduces brittleness.
- if (esc.length() < 4) {
- return fail("bad \\u escape: " + esc, "");
- }
- for (size_t j = 0; j < 4; j++) {
- if (!in_range(escj, 'a', 'f') && !in_range(escj, 'A', 'F')
- && !in_range(escj, '0', '9'))
- return fail("bad \\u escape: " + esc, "");
- }
-
- long codepoint = strtol(esc.data(), nullptr, 16);
-
- // JSON specifies that characters outside the BMP shall be encoded as a pair
- // of 4-hex-digit \u escapes encoding their surrogate pair components. Check
- // whether we're in the middle of such a beast: the previous codepoint was an
- // escaped lead (high) surrogate, and this is a trail (low) surrogate.
- if (in_range(last_escaped_codepoint, 0xD800, 0xDBFF)
- && in_range(codepoint, 0xDC00, 0xDFFF)) {
- // Reassemble the two surrogate pairs into one astral-plane character, per
- // the UTF-16 algorithm.
- encode_utf8((((last_escaped_codepoint - 0xD800) << 10)
- | (codepoint - 0xDC00)) + 0x10000, out);
- last_escaped_codepoint = -1;
- } else {
- encode_utf8(last_escaped_codepoint, out);
- last_escaped_codepoint = codepoint;
- }
-
- i += 4;
- continue;
- }
-
- encode_utf8(last_escaped_codepoint, out);
- last_escaped_codepoint = -1;
-
- if (ch == 'b') {
- out += '\b';
- } else if (ch == 'f') {
- out += '\f';
- } else if (ch == 'n') {
- out += '\n';
- } else if (ch == 'r') {
- out += '\r';
- } else if (ch == 't') {
- out += '\t';
- } else if (ch == '"' || ch == '\\' || ch == '/') {
- out += ch;
- } else {
- return fail("invalid escape character " + esc(ch), "");
- }
- }
- }
-
- /* parse_number()
- *
- * Parse a double.
- */
- Json parse_number() {
- size_t start_pos = i;
-
- if (stri == '-')
- i++;
-
- // Integer part
- if (stri == '0') {
- i++;
- if (in_range(stri, '0', '9'))
- return fail("leading 0s not permitted in numbers");
- } else if (in_range(stri, '1', '9')) {
- i++;
- while (in_range(stri, '0', '9'))
- i++;
- } else {
- return fail("invalid " + esc(stri) + " in number");
- }
-
- if (stri != '.' && stri != 'e' && stri != 'E'
- && (i - start_pos) <= static_cast<size_t>(std::numeric_limits<int>::digits10)) {
- return std::atoi(str.c_str() + start_pos);
- }
-
- // Decimal part
- if (stri == '.') {
- i++;
- if (!in_range(stri, '0', '9'))
- return fail("at least one digit required in fractional part");
-
- while (in_range(stri, '0', '9'))
- i++;
- }
-
- // Exponent part
- if (stri == 'e' || stri == 'E') {
- i++;
-
- if (stri == '+' || stri == '-')
- i++;
-
- if (!in_range(stri, '0', '9'))
- return fail("at least one digit required in exponent");
-
- while (in_range(stri, '0', '9'))
- i++;
- }
-
- return std::strtod(str.c_str() + start_pos, nullptr);
- }
-
- /* expect(str, res)
- *
- * Expect that 'str' starts at the character that was just read. If it does, advance
- * the input and return res. If not, flag an error.
- */
- Json expect(const string &expected, Json res) {
- assert(i != 0);
- i--;
- if (str.compare(i, expected.length(), expected) == 0) {
- i += expected.length();
- return res;
- } else {
- return fail("parse error: expected " + expected + ", got " + str.substr(i, expected.length()));
- }
- }
-
- /* parse_json()
- *
- * Parse a JSON object.
- */
- Json parse_json(int depth) {
- if (depth > max_depth) {
- return fail("exceeded maximum nesting depth");
- }
-
- char ch = get_next_token();
- if (failed)
- return Json();
-
- if (ch == '-' || (ch >= '0' && ch <= '9')) {
- i--;
- return parse_number();
- }
-
- if (ch == 't')
- return expect("true", true);
-
- if (ch == 'f')
- return expect("false", false);
-
- if (ch == 'n')
- return expect("null", Json());
-
- if (ch == '"')
- return parse_string();
-
- if (ch == '{') {
- map<string, Json> data;
- ch = get_next_token();
- if (ch == '}')
- return data;
-
- while (1) {
- if (ch != '"')
- return fail("expected '\"' in object, got " + esc(ch));
-
- string key = parse_string();
- if (failed)
- return Json();
-
- ch = get_next_token();
- if (ch != ':')
- return fail("expected ':' in object, got " + esc(ch));
-
- datastd::move(key) = parse_json(depth + 1);
- if (failed)
- return Json();
-
- ch = get_next_token();
- if (ch == '}')
- break;
- if (ch != ',')
- return fail("expected ',' in object, got " + esc(ch));
-
- ch = get_next_token();
- }
- return data;
- }
-
- if (ch == '') {
- vector<Json> data;
- ch = get_next_token();
- if (ch == '')
- return data;
-
- while (1) {
- i--;
- data.push_back(parse_json(depth + 1));
- if (failed)
- return Json();
-
- ch = get_next_token();
- if (ch == '')
- break;
- if (ch != ',')
- return fail("expected ',' in list, got " + esc(ch));
-
- ch = get_next_token();
- (void)ch;
- }
- return data;
- }
-
- return fail("expected value, got " + esc(ch));
- }
-};
-}//namespace {
-
-Json Json::parse(const string &in, string &err, JsonParse strategy) {
- JsonParser parser { in, 0, err, false, strategy };
- Json result = parser.parse_json(0);
-
- // Check for any trailing garbage
- parser.consume_garbage();
- if (parser.failed)
- return Json();
- if (parser.i != in.size())
- return parser.fail("unexpected trailing " + esc(inparser.i));
-
- return result;
-}
-
-// Documented in json11.hpp
-vector<Json> Json::parse_multi(const string &in,
- std::string::size_type &parser_stop_pos,
- string &err,
- JsonParse strategy) {
- JsonParser parser { in, 0, err, false, strategy };
- parser_stop_pos = 0;
- vector<Json> json_vec;
- while (parser.i != in.size() && !parser.failed) {
- json_vec.push_back(parser.parse_json(0));
- if (parser.failed)
- break;
-
- // Check for another object
- parser.consume_garbage();
- if (parser.failed)
- break;
- parser_stop_pos = parser.i;
- }
- return json_vec;
-}
-
-/* * * * * * * * * * * * * * * * * * * *
- * Shape-checking
- */
-
-bool Json::has_shape(const shape & types, string & err) const {
- if (!is_object()) {
- err = "expected JSON object, got " + dump();
- return false;
- }
-
- for (auto & item : types) {
- if ((*this)item.first.type() != item.second) {
- err = "bad type for " + item.first + " in " + dump();
- return false;
- }
- }
-
- return true;
-}
-
-} // namespace json11

obs-studio-29.1.3.tar.xz/plugins/obs-browser/deps/json11/json11.hpp Deleted

@@ -1,232 +0,0 @@
-/* json11
- *
- * json11 is a tiny JSON library for C++11, providing JSON parsing and serialization.
- *
- * The core object provided by the library is json11::Json. A Json object represents any JSON
- * value: null, bool, number (int or double), string (std::string), array (std::vector), or
- * object (std::map).
- *
- * Json objects act like values: they can be assigned, copied, moved, compared for equality or
- * order, etc. There are also helper methods Json::dump, to serialize a Json to a string, and
- * Json::parse (static) to parse a std::string as a Json object.
- *
- * Internally, the various types of Json object are represented by the JsonValue class
- * hierarchy.
- *
- * A note on numbers - JSON specifies the syntax of number formatting but not its semantics,
- * so some JSON implementations distinguish between integers and floating-point numbers, while
- * some don't. In json11, we choose the latter. Because some JSON implementations (namely
- * Javascript itself) treat all numbers as the same type, distinguishing the two leads
- * to JSON that will be *silently* changed by a round-trip through those implementations.
- * Dangerous! To avoid that risk, json11 stores all numbers as double internally, but also
- * provides integer helpers.
- *
- * Fortunately, double-precision IEEE754 ('double') can precisely store any integer in the
- * range +/-2^53, which includes every 'int' on most systems. (Timestamps often use int64
- * or long long to avoid the Y2038K problem; a double storing microseconds since some epoch
- * will be exact for +/- 275 years.)
- */
-
-/* Copyright (c) 2013 Dropbox, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
-#include <initializer_list>
-
-#ifdef _MSC_VER
- #if _MSC_VER <= 1800 // VS 2013
- #ifndef noexcept
- #define noexcept throw()
- #endif
-
- #ifndef snprintf
- #define snprintf _snprintf_s
- #endif
- #endif
-#endif
-
-namespace json11 {
-
-enum JsonParse {
- STANDARD, COMMENTS
-};
-
-class JsonValue;
-
-class Json final {
-public:
- // Types
- enum Type {
- NUL, NUMBER, BOOL, STRING, ARRAY, OBJECT
- };
-
- // Array and object typedefs
- typedef std::vector<Json> array;
- typedef std::map<std::string, Json> object;
-
- // Constructors for the various types of JSON value.
- Json() noexcept; // NUL
- Json(std::nullptr_t) noexcept; // NUL
- Json(double value); // NUMBER
- Json(int value); // NUMBER
- Json(bool value); // BOOL
- Json(const std::string &value); // STRING
- Json(std::string &&value); // STRING
- Json(const char * value); // STRING
- Json(const array &values); // ARRAY
- Json(array &&values); // ARRAY
- Json(const object &values); // OBJECT
- Json(object &&values); // OBJECT
-
- // Implicit constructor: anything with a to_json() function.
- template <class T, class = decltype(&T::to_json)>
- Json(const T & t) : Json(t.to_json()) {}
-
- // Implicit constructor: map-like objects (std::map, std::unordered_map, etc)
- template <class M, typename std::enable_if<
- std::is_constructible<std::string, decltype(std::declval<M>().begin()->first)>::value
- && std::is_constructible<Json, decltype(std::declval<M>().begin()->second)>::value,
- int>::type = 0>
- Json(const M & m) : Json(object(m.begin(), m.end())) {}
-
- // Implicit constructor: vector-like objects (std::list, std::vector, std::set, etc)
- template <class V, typename std::enable_if<
- std::is_constructible<Json, decltype(*std::declval<V>().begin())>::value,
- int>::type = 0>
- Json(const V & v) : Json(array(v.begin(), v.end())) {}
-
- // This prevents Json(some_pointer) from accidentally producing a bool. Use
- // Json(bool(some_pointer)) if that behavior is desired.
- Json(void *) = delete;
-
- // Accessors
- Type type() const;
-
- bool is_null() const { return type() == NUL; }
- bool is_number() const { return type() == NUMBER; }
- bool is_bool() const { return type() == BOOL; }
- bool is_string() const { return type() == STRING; }
- bool is_array() const { return type() == ARRAY; }
- bool is_object() const { return type() == OBJECT; }
-
- // Return the enclosed value if this is a number, 0 otherwise. Note that json11 does not
- // distinguish between integer and non-integer numbers - number_value() and int_value()
- // can both be applied to a NUMBER-typed object.
- double number_value() const;
- int int_value() const;
-
- // Return the enclosed value if this is a boolean, false otherwise.
- bool bool_value() const;
- // Return the enclosed string if this is a string, "" otherwise.
- const std::string &string_value() const;
- // Return the enclosed std::vector if this is an array, or an empty vector otherwise.
- const array &array_items() const;
- // Return the enclosed std::map if this is an object, or an empty map otherwise.
- const object &object_items() const;
-
- // Return a reference to arri if this is an array, Json() otherwise.
- const Json & operator(size_t i) const;
- // Return a reference to objkey if this is an object, Json() otherwise.
- const Json & operator(const std::string &key) const;
-
- // Serialize.
- void dump(std::string &out) const;
- std::string dump() const {
- std::string out;
- dump(out);
- return out;
- }
-
- // Parse. If parse fails, return Json() and assign an error message to err.
- static Json parse(const std::string & in,
- std::string & err,
- JsonParse strategy = JsonParse::STANDARD);
- static Json parse(const char * in,
- std::string & err,
- JsonParse strategy = JsonParse::STANDARD) {
- if (in) {
- return parse(std::string(in), err, strategy);
- } else {
- err = "null input";
- return nullptr;
- }
- }
- // Parse multiple objects, concatenated or separated by whitespace
- static std::vector<Json> parse_multi(
- const std::string & in,
- std::string::size_type & parser_stop_pos,
- std::string & err,
- JsonParse strategy = JsonParse::STANDARD);
-
- static inline std::vector<Json> parse_multi(
- const std::string & in,
- std::string & err,
- JsonParse strategy = JsonParse::STANDARD) {
- std::string::size_type parser_stop_pos;
- return parse_multi(in, parser_stop_pos, err, strategy);
- }
-
- bool operator== (const Json &rhs) const;
- bool operator< (const Json &rhs) const;
- bool operator!= (const Json &rhs) const { return !(*this == rhs); }
- bool operator<= (const Json &rhs) const { return !(rhs < *this); }
- bool operator> (const Json &rhs) const { return (rhs < *this); }
- bool operator>= (const Json &rhs) const { return !(*this < rhs); }
-
- /* has_shape(types, err)
- *
- * Return true if this is a JSON object and, for each item in types, has a field of
- * the given type. If not, return false and set err to a descriptive message.
- */
- typedef std::initializer_list<std::pair<std::string, Type>> shape;
- bool has_shape(const shape & types, std::string & err) const;
-
-private:
- std::shared_ptr<JsonValue> m_ptr;
-};
-
-// Internal class hierarchy - JsonValue objects are not exposed to users of this API.
-class JsonValue {
-protected:
- friend class Json;
- friend class JsonInt;
- friend class JsonDouble;
- virtual Json::Type type() const = 0;
- virtual bool equals(const JsonValue * other) const = 0;
- virtual bool less(const JsonValue * other) const = 0;
- virtual void dump(std::string &out) const = 0;
- virtual double number_value() const;
- virtual int int_value() const;
- virtual bool bool_value() const;
- virtual const std::string &string_value() const;
- virtual const Json::array &array_items() const;
- virtual const Json &operator(size_t i) const;
- virtual const Json::object &object_items() const;
- virtual const Json &operator(const std::string &key) const;
- virtual ~JsonValue() {}
-};
-
-} // namespace json11

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/external Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/external/.clang-format Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/external/dynlink_cuda.h Deleted

@@ -1,483 +0,0 @@
-/*
- * This copyright notice applies to this header file only:
- *
- * Copyright (c) 2016
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the software, and to permit persons to whom the
- * software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#if !defined(FFNV_DYNLINK_CUDA_H) && !defined(CUDA_VERSION)
-#define FFNV_DYNLINK_CUDA_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-#define CUDA_VERSION 7050
-
-#if defined(_WIN32) || defined(__CYGWIN__)
-#define CUDAAPI __stdcall
-#else
-#define CUDAAPI
-#endif
-
-#define CU_CTX_SCHED_BLOCKING_SYNC 4
-
-typedef int CUdevice;
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__LP64__) || defined(__aarch64__)
-typedef unsigned long long CUdeviceptr;
-#else
-typedef unsigned int CUdeviceptr;
-#endif
-typedef unsigned long long CUtexObject;
-
-typedef struct CUarray_st *CUarray;
-typedef struct CUctx_st *CUcontext;
-typedef struct CUstream_st *CUstream;
-typedef struct CUevent_st *CUevent;
-typedef struct CUfunc_st *CUfunction;
-typedef struct CUmod_st *CUmodule;
-typedef struct CUmipmappedArray_st *CUmipmappedArray;
-typedef struct CUgraphicsResource_st *CUgraphicsResource;
-typedef struct CUextMemory_st *CUexternalMemory;
-typedef struct CUextSemaphore_st *CUexternalSemaphore;
-typedef struct CUeglStreamConnection_st *CUeglStreamConnection;
-
-typedef struct CUlinkState_st *CUlinkState;
-
-typedef enum cudaError_enum {
- CUDA_SUCCESS = 0,
- CUDA_ERROR_NOT_READY = 600,
- CUDA_ERROR_LAUNCH_TIMEOUT = 702,
- CUDA_ERROR_UNKNOWN = 999
-} CUresult;
-
-/**
- * Device properties (subset)
- */
-typedef enum CUdevice_attribute_enum {
- CU_DEVICE_ATTRIBUTE_CLOCK_RATE = 13,
- CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14,
- CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT = 16,
- CU_DEVICE_ATTRIBUTE_INTEGRATED = 18,
- CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY = 19,
- CU_DEVICE_ATTRIBUTE_COMPUTE_MODE = 20,
- CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31,
- CU_DEVICE_ATTRIBUTE_PCI_BUS_ID = 33,
- CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID = 34,
- CU_DEVICE_ATTRIBUTE_TCC_DRIVER = 35,
- CU_DEVICE_ATTRIBUTE_MEMORY_CLOCK_RATE = 36,
- CU_DEVICE_ATTRIBUTE_GLOBAL_MEMORY_BUS_WIDTH = 37,
- CU_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT = 40,
- CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING = 41,
- CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID = 50,
- CU_DEVICE_ATTRIBUTE_TEXTURE_PITCH_ALIGNMENT = 51,
- CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR = 75,
- CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MINOR = 76,
- CU_DEVICE_ATTRIBUTE_MANAGED_MEMORY = 83,
- CU_DEVICE_ATTRIBUTE_MULTI_GPU_BOARD = 84,
- CU_DEVICE_ATTRIBUTE_MULTI_GPU_BOARD_GROUP_ID = 85,
-} CUdevice_attribute;
-
-typedef enum CUarray_format_enum {
- CU_AD_FORMAT_UNSIGNED_INT8 = 0x01,
- CU_AD_FORMAT_UNSIGNED_INT16 = 0x02,
- CU_AD_FORMAT_UNSIGNED_INT32 = 0x03,
- CU_AD_FORMAT_SIGNED_INT8 = 0x08,
- CU_AD_FORMAT_SIGNED_INT16 = 0x09,
- CU_AD_FORMAT_SIGNED_INT32 = 0x0a,
- CU_AD_FORMAT_HALF = 0x10,
- CU_AD_FORMAT_FLOAT = 0x20
-} CUarray_format;
-
-typedef enum CUmemorytype_enum {
- CU_MEMORYTYPE_HOST = 1,
- CU_MEMORYTYPE_DEVICE = 2,
- CU_MEMORYTYPE_ARRAY = 3
-} CUmemorytype;
-
-typedef enum CUlimit_enum {
- CU_LIMIT_STACK_SIZE = 0,
- CU_LIMIT_PRINTF_FIFO_SIZE = 1,
- CU_LIMIT_MALLOC_HEAP_SIZE = 2,
- CU_LIMIT_DEV_RUNTIME_SYNC_DEPTH = 3,
- CU_LIMIT_DEV_RUNTIME_PENDING_LAUNCH_COUNT = 4
-} CUlimit;
-
-typedef enum CUresourcetype_enum {
- CU_RESOURCE_TYPE_ARRAY = 0x00,
- CU_RESOURCE_TYPE_MIPMAPPED_ARRAY = 0x01,
- CU_RESOURCE_TYPE_LINEAR = 0x02,
- CU_RESOURCE_TYPE_PITCH2D = 0x03
-} CUresourcetype;
-
-typedef enum CUaddress_mode_enum {
- CU_TR_ADDRESS_MODE_WRAP = 0,
- CU_TR_ADDRESS_MODE_CLAMP = 1,
- CU_TR_ADDRESS_MODE_MIRROR = 2,
- CU_TR_ADDRESS_MODE_BORDER = 3
-} CUaddress_mode;
-
-typedef enum CUfilter_mode_enum {
- CU_TR_FILTER_MODE_POINT = 0,
- CU_TR_FILTER_MODE_LINEAR = 1
-} CUfilter_mode;
-
-typedef enum CUgraphicsRegisterFlags_enum {
- CU_GRAPHICS_REGISTER_FLAGS_NONE = 0,
- CU_GRAPHICS_REGISTER_FLAGS_READ_ONLY = 1,
- CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD = 2,
- CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LDST = 4,
- CU_GRAPHICS_REGISTER_FLAGS_TEXTURE_GATHER = 8
-} CUgraphicsRegisterFlags;
-
-typedef enum CUexternalMemoryHandleType_enum {
- CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD = 1,
- CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32 = 2,
- CU_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_KMT = 3,
- CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_HEAP = 4,
- CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE = 5,
-} CUexternalMemoryHandleType;
-
-typedef enum CUexternalSemaphoreHandleType_enum {
- CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD = 1,
- CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32 = 2,
- CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT = 3,
- CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_D3D12_FENCE = 4,
- CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TIMELINE_SEMAPHORE_FD = 9,
- CU_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TIMELINE_SEMAPHORE_WIN32 = 10,
-} CUexternalSemaphoreHandleType;
-
-typedef enum CUjit_option_enum
-{
- CU_JIT_MAX_REGISTERS = 0,
- CU_JIT_THREADS_PER_BLOCK = 1,
- CU_JIT_WALL_TIME = 2,
- CU_JIT_INFO_LOG_BUFFER = 3,
- CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES = 4,
- CU_JIT_ERROR_LOG_BUFFER = 5,
- CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES = 6,
- CU_JIT_OPTIMIZATION_LEVEL = 7,
- CU_JIT_TARGET_FROM_CUCONTEXT = 8,
- CU_JIT_TARGET = 9,
- CU_JIT_FALLBACK_STRATEGY = 10,
- CU_JIT_GENERATE_DEBUG_INFO = 11,
- CU_JIT_LOG_VERBOSE = 12,
- CU_JIT_GENERATE_LINE_INFO = 13,
- CU_JIT_CACHE_MODE = 14,
- CU_JIT_NEW_SM3X_OPT = 15,
- CU_JIT_FAST_COMPILE = 16,
- CU_JIT_GLOBAL_SYMBOL_NAMES = 17,
- CU_JIT_GLOBAL_SYMBOL_ADDRESSES = 18,
- CU_JIT_GLOBAL_SYMBOL_COUNT = 19,
- CU_JIT_NUM_OPTIONS
-} CUjit_option;
-
-typedef enum CUjitInputType_enum
-{
- CU_JIT_INPUT_CUBIN = 0,
- CU_JIT_INPUT_PTX = 1,
- CU_JIT_INPUT_FATBINARY = 2,
- CU_JIT_INPUT_OBJECT = 3,
- CU_JIT_INPUT_LIBRARY = 4,
- CU_JIT_NUM_INPUT_TYPES
-} CUjitInputType;
-
-typedef enum CUeglFrameType
-{
- CU_EGL_FRAME_TYPE_ARRAY = 0,
- CU_EGL_FRAME_TYPE_PITCH = 1,
-} CUeglFrameType;
-
-typedef enum CUeglColorFormat
-{
- CU_EGL_COLOR_FORMAT_YUV420_PLANAR = 0x00,
- CU_EGL_COLOR_FORMAT_YUV420_SEMIPLANAR = 0x01,
- CU_EGL_COLOR_FORMAT_YVU420_SEMIPLANAR = 0x15,
- CU_EGL_COLOR_FORMAT_Y10V10U10_420_SEMIPLANAR = 0x17,
- CU_EGL_COLOR_FORMAT_Y12V12U12_420_SEMIPLANAR = 0x19,
-} CUeglColorFormat;
-
-#ifndef CU_UUID_HAS_BEEN_DEFINED
-#define CU_UUID_HAS_BEEN_DEFINED
-typedef struct CUuuid_st {
- char bytes16;
-} CUuuid;
-#endif
-
-typedef struct CUDA_MEMCPY2D_st {
- size_t srcXInBytes;
- size_t srcY;
- CUmemorytype srcMemoryType;
- const void *srcHost;
- CUdeviceptr srcDevice;
- CUarray srcArray;
- size_t srcPitch;
-
- size_t dstXInBytes;
- size_t dstY;
- CUmemorytype dstMemoryType;
- void *dstHost;
- CUdeviceptr dstDevice;
- CUarray dstArray;
- size_t dstPitch;
-
- size_t WidthInBytes;
- size_t Height;
-} CUDA_MEMCPY2D;
-
-typedef struct CUDA_RESOURCE_DESC_st {
- CUresourcetype resType;
- union {
- struct {
- CUarray hArray;
- } array;
- struct {
- CUmipmappedArray hMipmappedArray;
- } mipmap;
- struct {
- CUdeviceptr devPtr;
- CUarray_format format;
- unsigned int numChannels;
- size_t sizeInBytes;
- } linear;
- struct {
- CUdeviceptr devPtr;
- CUarray_format format;
- unsigned int numChannels;
- size_t width;
- size_t height;
- size_t pitchInBytes;
- } pitch2D;
- struct {
- int reserved32;
- } reserved;
- } res;
- unsigned int flags;
-} CUDA_RESOURCE_DESC;
-
-typedef struct CUDA_TEXTURE_DESC_st {
- CUaddress_mode addressMode3;
- CUfilter_mode filterMode;
- unsigned int flags;
- unsigned int maxAnisotropy;
- CUfilter_mode mipmapFilterMode;
- float mipmapLevelBias;
- float minMipmapLevelClamp;
- float maxMipmapLevelClamp;
- float borderColor4;
- int reserved12;
-} CUDA_TEXTURE_DESC;
-
-/* Unused type */
-typedef struct CUDA_RESOURCE_VIEW_DESC_st CUDA_RESOURCE_VIEW_DESC;
-
-typedef unsigned int GLenum;
-typedef unsigned int GLuint;
-/*
- * Prefix type name to avoid collisions. Clients using these types
- * will include the real headers with real definitions.
- */
-typedef int32_t ffnv_EGLint;
-typedef void *ffnv_EGLStreamKHR;
-
-typedef enum CUGLDeviceList_enum {
- CU_GL_DEVICE_LIST_ALL = 1,
- CU_GL_DEVICE_LIST_CURRENT_FRAME = 2,
- CU_GL_DEVICE_LIST_NEXT_FRAME = 3,
-} CUGLDeviceList;
-
-typedef struct CUDA_EXTERNAL_MEMORY_HANDLE_DESC_st {
- CUexternalMemoryHandleType type;
- union {
- int fd;
- struct {
- void *handle;
- const void *name;
- } win32;
- } handle;
- unsigned long long size;
- unsigned int flags;
- unsigned int reserved16;
-} CUDA_EXTERNAL_MEMORY_HANDLE_DESC;
-
-typedef struct CUDA_EXTERNAL_MEMORY_BUFFER_DESC_st {
- unsigned long long offset;
- unsigned long long size;
- unsigned int flags;
- unsigned int reserved16;
-} CUDA_EXTERNAL_MEMORY_BUFFER_DESC;
-
-typedef struct CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC_st {
- CUexternalSemaphoreHandleType type;
- union {
- int fd;
- struct {
- void *handle;
- const void *name;
- } win32;
- } handle;
- unsigned int flags;
- unsigned int reserved16;
-} CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC;
-
-typedef struct CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS_st {
- struct {
- struct {
- unsigned long long value;
- } fence;
- unsigned int reserved16;
- } params;
- unsigned int flags;
- unsigned int reserved16;
-} CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS;
-
-typedef CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS;
-
-typedef struct CUDA_ARRAY3D_DESCRIPTOR_st {
- size_t Width;
- size_t Height;
- size_t Depth;
-
- CUarray_format Format;
- unsigned int NumChannels;
- unsigned int Flags;
-} CUDA_ARRAY3D_DESCRIPTOR;
-
-typedef struct CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC_st {
- unsigned long long offset;
- CUDA_ARRAY3D_DESCRIPTOR arrayDesc;
- unsigned int numLevels;
- unsigned int reserved16;
-} CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC;
-
-#define CU_EGL_FRAME_MAX_PLANES 3
-typedef struct CUeglFrame_st {
- union {
- CUarray pArrayCU_EGL_FRAME_MAX_PLANES;
- void* pPitchCU_EGL_FRAME_MAX_PLANES;
- } frame;
- unsigned int width;
- unsigned int height;
- unsigned int depth;
- unsigned int pitch;
- unsigned int planeCount;
- unsigned int numChannels;
- CUeglFrameType frameType;
- CUeglColorFormat eglColorFormat;
- CUarray_format cuFormat;
-} CUeglFrame;
-
-#define CU_STREAM_NON_BLOCKING 1
-#define CU_EVENT_BLOCKING_SYNC 1
-#define CU_EVENT_DISABLE_TIMING 2
-#define CU_TRSF_READ_AS_INTEGER 1
-
-typedef void CUDAAPI CUstreamCallback(CUstream hStream, CUresult status, void *userdata);
-
-typedef CUresult CUDAAPI tcuInit(unsigned int Flags);
-typedef CUresult CUDAAPI tcuDeviceGetCount(int *count);
-typedef CUresult CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal);
-typedef CUresult CUDAAPI tcuDeviceGetAttribute(int *pi, CUdevice_attribute attrib, CUdevice dev);
-typedef CUresult CUDAAPI tcuDeviceGetName(char *name, int len, CUdevice dev);
-typedef CUresult CUDAAPI tcuDeviceGetUuid(CUuuid *uuid, CUdevice dev);
-typedef CUresult CUDAAPI tcuDeviceComputeCapability(int *major, int *minor, CUdevice dev);
-typedef CUresult CUDAAPI tcuCtxCreate_v2(CUcontext *pctx, unsigned int flags, CUdevice dev);
-typedef CUresult CUDAAPI tcuCtxSetLimit(CUlimit limit, size_t value);
-typedef CUresult CUDAAPI tcuCtxPushCurrent_v2(CUcontext pctx);
-typedef CUresult CUDAAPI tcuCtxPopCurrent_v2(CUcontext *pctx);
-typedef CUresult CUDAAPI tcuCtxDestroy_v2(CUcontext ctx);
-typedef CUresult CUDAAPI tcuMemAlloc_v2(CUdeviceptr *dptr, size_t bytesize);
-typedef CUresult CUDAAPI tcuMemAllocPitch_v2(CUdeviceptr *dptr, size_t *pPitch, size_t WidthInBytes, size_t Height, unsigned int ElementSizeBytes);
-typedef CUresult CUDAAPI tcuMemAllocManaged(CUdeviceptr *dptr, size_t bytesize, unsigned int flags);
-typedef CUresult CUDAAPI tcuMemsetD8Async(CUdeviceptr dstDevice, unsigned char uc, size_t N, CUstream hStream);
-typedef CUresult CUDAAPI tcuMemFree_v2(CUdeviceptr dptr);
-typedef CUresult CUDAAPI tcuMemcpy(CUdeviceptr dst, CUdeviceptr src, size_t bytesize);
-typedef CUresult CUDAAPI tcuMemcpyAsync(CUdeviceptr dst, CUdeviceptr src, size_t bytesize, CUstream hStream);
-typedef CUresult CUDAAPI tcuMemcpy2D_v2(const CUDA_MEMCPY2D *pcopy);
-typedef CUresult CUDAAPI tcuMemcpy2DAsync_v2(const CUDA_MEMCPY2D *pcopy, CUstream hStream);
-typedef CUresult CUDAAPI tcuMemcpyHtoD_v2(CUdeviceptr dstDevice, const void *srcHost, size_t ByteCount);
-typedef CUresult CUDAAPI tcuMemcpyHtoDAsync_v2(CUdeviceptr dstDevice, const void *srcHost, size_t ByteCount, CUstream hStream);
-typedef CUresult CUDAAPI tcuMemcpyDtoH_v2(void *dstHost, CUdeviceptr srcDevice, size_t ByteCount);
-typedef CUresult CUDAAPI tcuMemcpyDtoHAsync_v2(void *dstHost, CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
-typedef CUresult CUDAAPI tcuMemcpyDtoD_v2(CUdeviceptr dstDevice, CUdeviceptr srcDevice, size_t ByteCount);
-typedef CUresult CUDAAPI tcuMemcpyDtoDAsync_v2(CUdeviceptr dstDevice, CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
-typedef CUresult CUDAAPI tcuGetErrorName(CUresult error, const char** pstr);
-typedef CUresult CUDAAPI tcuGetErrorString(CUresult error, const char** pstr);
-typedef CUresult CUDAAPI tcuCtxGetDevice(CUdevice *device);
-
-typedef CUresult CUDAAPI tcuDevicePrimaryCtxRetain(CUcontext *pctx, CUdevice dev);
-typedef CUresult CUDAAPI tcuDevicePrimaryCtxRelease(CUdevice dev);
-typedef CUresult CUDAAPI tcuDevicePrimaryCtxSetFlags(CUdevice dev, unsigned int flags);
-typedef CUresult CUDAAPI tcuDevicePrimaryCtxGetState(CUdevice dev, unsigned int *flags, int *active);
-typedef CUresult CUDAAPI tcuDevicePrimaryCtxReset(CUdevice dev);
-
-typedef CUresult CUDAAPI tcuStreamCreate(CUstream *phStream, unsigned int flags);
-typedef CUresult CUDAAPI tcuStreamQuery(CUstream hStream);
-typedef CUresult CUDAAPI tcuStreamSynchronize(CUstream hStream);
-typedef CUresult CUDAAPI tcuStreamDestroy_v2(CUstream hStream);
-typedef CUresult CUDAAPI tcuStreamAddCallback(CUstream hStream, CUstreamCallback *callback, void *userdata, unsigned int flags);
-typedef CUresult CUDAAPI tcuEventCreate(CUevent *phEvent, unsigned int flags);
-typedef CUresult CUDAAPI tcuEventDestroy_v2(CUevent hEvent);
-typedef CUresult CUDAAPI tcuEventSynchronize(CUevent hEvent);
-typedef CUresult CUDAAPI tcuEventQuery(CUevent hEvent);
-typedef CUresult CUDAAPI tcuEventRecord(CUevent hEvent, CUstream hStream);
-
-typedef CUresult CUDAAPI tcuLaunchKernel(CUfunction f, unsigned int gridDimX, unsigned int gridDimY, unsigned int gridDimZ, unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ, unsigned int sharedMemBytes, CUstream hStream, void** kernelParams, void** extra);
-typedef CUresult CUDAAPI tcuLinkCreate(unsigned int numOptions, CUjit_option* options, void** optionValues, CUlinkState* stateOut);
-typedef CUresult CUDAAPI tcuLinkAddData(CUlinkState state, CUjitInputType type, void* data, size_t size, const char* name, unsigned int numOptions, CUjit_option* options, void** optionValues);
-typedef CUresult CUDAAPI tcuLinkComplete(CUlinkState state, void** cubinOut, size_t* sizeOut);
-typedef CUresult CUDAAPI tcuLinkDestroy(CUlinkState state);
-typedef CUresult CUDAAPI tcuModuleLoadData(CUmodule* module, const void* image);
-typedef CUresult CUDAAPI tcuModuleUnload(CUmodule hmod);
-typedef CUresult CUDAAPI tcuModuleGetFunction(CUfunction* hfunc, CUmodule hmod, const char* name);
-typedef CUresult CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, size_t *bytes, CUmodule hmod, const char* name);
-typedef CUresult CUDAAPI tcuTexObjectCreate(CUtexObject* pTexObject, const CUDA_RESOURCE_DESC* pResDesc, const CUDA_TEXTURE_DESC* pTexDesc, const CUDA_RESOURCE_VIEW_DESC* pResViewDesc);
-typedef CUresult CUDAAPI tcuTexObjectDestroy(CUtexObject texObject);
-
-typedef CUresult CUDAAPI tcuGLGetDevices_v2(unsigned int* pCudaDeviceCount, CUdevice* pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
-typedef CUresult CUDAAPI tcuGraphicsGLRegisterImage(CUgraphicsResource* pCudaResource, GLuint image, GLenum target, unsigned int Flags);
-typedef CUresult CUDAAPI tcuGraphicsUnregisterResource(CUgraphicsResource resource);
-typedef CUresult CUDAAPI tcuGraphicsMapResources(unsigned int count, CUgraphicsResource* resources, CUstream hStream);
-typedef CUresult CUDAAPI tcuGraphicsUnmapResources(unsigned int count, CUgraphicsResource* resources, CUstream hStream);
-typedef CUresult CUDAAPI tcuGraphicsSubResourceGetMappedArray(CUarray* pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel);
-
-typedef CUresult CUDAAPI tcuImportExternalMemory(CUexternalMemory* extMem_out, const CUDA_EXTERNAL_MEMORY_HANDLE_DESC* memHandleDesc);
-typedef CUresult CUDAAPI tcuDestroyExternalMemory(CUexternalMemory extMem);
-typedef CUresult CUDAAPI tcuExternalMemoryGetMappedBuffer(CUdeviceptr* devPtr, CUexternalMemory extMem, const CUDA_EXTERNAL_MEMORY_BUFFER_DESC* bufferDesc);
-typedef CUresult CUDAAPI tcuExternalMemoryGetMappedMipmappedArray(CUmipmappedArray* mipmap, CUexternalMemory extMem, const CUDA_EXTERNAL_MEMORY_MIPMAPPED_ARRAY_DESC* mipmapDesc);
-typedef CUresult CUDAAPI tcuMipmappedArrayGetLevel(CUarray* pLevelArray, CUmipmappedArray hMipmappedArray, unsigned int level);
-typedef CUresult CUDAAPI tcuMipmappedArrayDestroy(CUmipmappedArray hMipmappedArray);
-
-typedef CUresult CUDAAPI tcuImportExternalSemaphore(CUexternalSemaphore* extSem_out, const CUDA_EXTERNAL_SEMAPHORE_HANDLE_DESC* semHandleDesc);
-typedef CUresult CUDAAPI tcuDestroyExternalSemaphore(CUexternalSemaphore extSem);
-typedef CUresult CUDAAPI tcuSignalExternalSemaphoresAsync(const CUexternalSemaphore* extSemArray, const CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS* paramsArray, unsigned int numExtSems, CUstream stream);
-typedef CUresult CUDAAPI tcuWaitExternalSemaphoresAsync(const CUexternalSemaphore* extSemArray, const CUDA_EXTERNAL_SEMAPHORE_WAIT_PARAMS* paramsArray, unsigned int numExtSems, CUstream stream);
-
-typedef CUresult CUDAAPI tcuArray3DCreate(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR* pAllocateArray);
-typedef CUresult CUDAAPI tcuArrayDestroy(CUarray hArray);
-
-typedef CUresult CUDAAPI tcuEGLStreamProducerConnect (CUeglStreamConnection* conn, ffnv_EGLStreamKHR stream, ffnv_EGLint width, ffnv_EGLint height);
-typedef CUresult CUDAAPI tcuEGLStreamProducerDisconnect (CUeglStreamConnection* conn);
-typedef CUresult CUDAAPI tcuEGLStreamConsumerDisconnect (CUeglStreamConnection* conn);
-typedef CUresult CUDAAPI tcuEGLStreamProducerPresentFrame (CUeglStreamConnection* conn, CUeglFrame eglframe, CUstream* pStream);
-typedef CUresult CUDAAPI tcuEGLStreamProducerReturnFrame (CUeglStreamConnection* conn, CUeglFrame* eglframe, CUstream* pStream);
-#endif

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/external/nvEncodeAPI.h Deleted

@@ -1,4288 +0,0 @@
-/*
- * This copyright notice applies to this header file only:
- *
- * Copyright (c) 2010-2022 NVIDIA Corporation
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the software, and to permit persons to whom the
- * software is furnished to do so, subject to the following
- * conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file nvEncodeAPI.h
- * NVIDIA GPUs - beginning with the Kepler generation - contain a hardware-based encoder
- * (referred to as NVENC) which provides fully-accelerated hardware-based video encoding.
- * NvEncodeAPI provides the interface for NVIDIA video encoder (NVENC).
- * \date 2011-2022
- * This file contains the interface constants, structure definitions and function prototypes.
- */
-
-#ifndef _NV_ENCODEAPI_H_
-#define _NV_ENCODEAPI_H_
-
-#include <stdlib.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#ifdef _MSC_VER
-#ifndef _STDINT
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-#endif
-#else
-#include <stdint.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \addtogroup ENCODER_STRUCTURE NvEncodeAPI Data structures
- * @{
- */
-
-#ifdef _WIN32
-#define NVENCAPI __stdcall
-typedef RECT NVENC_RECT;
-#else
-#define NVENCAPI
-// =========================================================================================
-#ifndef GUID_DEFINED
-#define GUID_DEFINED
-/*!
- * \struct GUID
- * Abstracts the GUID structure for non-windows platforms.
- */
-// =========================================================================================
-typedef struct _GUID
-{
- uint32_t Data1; /**< in: Specifies the first 8 hexadecimal digits of the GUID. */
- uint16_t Data2; /**< in: Specifies the first group of 4 hexadecimal digits. */
- uint16_t Data3; /**< in: Specifies the second group of 4 hexadecimal digits. */
- uint8_t Data48; /**< in: Array of 8 bytes. The first 2 bytes contain the third group of 4 hexadecimal digits.
- The remaining 6 bytes contain the final 12 hexadecimal digits. */
-} GUID, *LPGUID;
-#endif // GUID
-
-/**
- * \struct _NVENC_RECT
- * Defines a Rectangle. Used in ::NV_ENC_PREPROCESS_FRAME.
- */
-typedef struct _NVENC_RECT
-{
- uint32_t left; /**< in: X coordinate of the upper left corner of rectangular area to be specified. */
- uint32_t top; /**< in: Y coordinate of the upper left corner of the rectangular area to be specified. */
- uint32_t right; /**< in: X coordinate of the bottom right corner of the rectangular area to be specified. */
- uint32_t bottom; /**< in: Y coordinate of the bottom right corner of the rectangular area to be specified. */
-} NVENC_RECT;
-
-#endif // _WIN32
-
-/** @} */ /* End of GUID and NVENC_RECT structure grouping*/
-
-typedef void* NV_ENC_INPUT_PTR; /**< NVENCODE API input buffer */
-typedef void* NV_ENC_OUTPUT_PTR; /**< NVENCODE API output buffer*/
-typedef void* NV_ENC_REGISTERED_PTR; /**< A Resource that has been registered with NVENCODE API*/
-typedef void* NV_ENC_CUSTREAM_PTR; /**< Pointer to CUstream*/
-
-#define NVENCAPI_MAJOR_VERSION 12
-#define NVENCAPI_MINOR_VERSION 0
-
-#define NVENCAPI_VERSION (NVENCAPI_MAJOR_VERSION | (NVENCAPI_MINOR_VERSION << 24))
-
-/**
- * Macro to generate per-structure version for use with API.
- */
-#define NVENCAPI_STRUCT_VERSION(ver) ((uint32_t)NVENCAPI_VERSION | ((ver)<<16) | (0x7 << 28))
-
-
-#define NVENC_INFINITE_GOPLENGTH 0xffffffff
-
-#define NV_MAX_SEQ_HDR_LEN (512)
-
-#ifdef __GNUC__
-#define NV_ENC_DEPRECATED __attribute__ ((deprecated("WILL BE REMOVED IN A FUTURE VIDEO CODEC SDK VERSION")))
-#elif defined(_MSC_VER)
-#define NV_ENC_DEPRECATED __declspec(deprecated("WILL BE REMOVED IN A FUTURE VIDEO CODEC SDK VERSION"))
-#endif
-
-// All use of the AV1 encode structures in the source code is guarded by the compilation variable
-// below. Set it to 0 to disable and hide the AV1 driver code.
-#define NVENCAPI_AV1_STRUCTURES_DEFINED 1
-
-// =========================================================================================
-// Encode Codec GUIDS supported by the NvEncodeAPI interface.
-// =========================================================================================
-
-// {6BC82762-4E63-4ca4-AA85-1E50F321F6BF}
-static const GUID NV_ENC_CODEC_H264_GUID =
-{ 0x6bc82762, 0x4e63, 0x4ca4, { 0xaa, 0x85, 0x1e, 0x50, 0xf3, 0x21, 0xf6, 0xbf } };
-
-// {790CDC88-4522-4d7b-9425-BDA9975F7603}
-static const GUID NV_ENC_CODEC_HEVC_GUID =
-{ 0x790cdc88, 0x4522, 0x4d7b, { 0x94, 0x25, 0xbd, 0xa9, 0x97, 0x5f, 0x76, 0x3 } };
-
-// {0A352289-0AA7-4759-862D-5D15CD16D254}
-static const GUID NV_ENC_CODEC_AV1_GUID =
-{ 0x0a352289, 0x0aa7, 0x4759, { 0x86, 0x2d, 0x5d, 0x15, 0xcd, 0x16, 0xd2, 0x54 } };
-
-
-
-// =========================================================================================
-// * Encode Profile GUIDS supported by the NvEncodeAPI interface.
-// =========================================================================================
-
-// {BFD6F8E7-233C-4341-8B3E-4818523803F4}
-static const GUID NV_ENC_CODEC_PROFILE_AUTOSELECT_GUID =
-{ 0xbfd6f8e7, 0x233c, 0x4341, { 0x8b, 0x3e, 0x48, 0x18, 0x52, 0x38, 0x3, 0xf4 } };
-
-// {0727BCAA-78C4-4c83-8C2F-EF3DFF267C6A}
-static const GUID NV_ENC_H264_PROFILE_BASELINE_GUID =
-{ 0x727bcaa, 0x78c4, 0x4c83, { 0x8c, 0x2f, 0xef, 0x3d, 0xff, 0x26, 0x7c, 0x6a } };
-
-// {60B5C1D4-67FE-4790-94D5-C4726D7B6E6D}
-static const GUID NV_ENC_H264_PROFILE_MAIN_GUID =
-{ 0x60b5c1d4, 0x67fe, 0x4790, { 0x94, 0xd5, 0xc4, 0x72, 0x6d, 0x7b, 0x6e, 0x6d } };
-
-// {E7CBC309-4F7A-4b89-AF2A-D537C92BE310}
-static const GUID NV_ENC_H264_PROFILE_HIGH_GUID =
-{ 0xe7cbc309, 0x4f7a, 0x4b89, { 0xaf, 0x2a, 0xd5, 0x37, 0xc9, 0x2b, 0xe3, 0x10 } };
-
-// {7AC663CB-A598-4960-B844-339B261A7D52}
-static const GUID NV_ENC_H264_PROFILE_HIGH_444_GUID =
-{ 0x7ac663cb, 0xa598, 0x4960, { 0xb8, 0x44, 0x33, 0x9b, 0x26, 0x1a, 0x7d, 0x52 } };
-
-// {40847BF5-33F7-4601-9084-E8FE3C1DB8B7}
-static const GUID NV_ENC_H264_PROFILE_STEREO_GUID =
-{ 0x40847bf5, 0x33f7, 0x4601, { 0x90, 0x84, 0xe8, 0xfe, 0x3c, 0x1d, 0xb8, 0xb7 } };
-
-// {B405AFAC-F32B-417B-89C4-9ABEED3E5978}
-static const GUID NV_ENC_H264_PROFILE_PROGRESSIVE_HIGH_GUID =
-{ 0xb405afac, 0xf32b, 0x417b, { 0x89, 0xc4, 0x9a, 0xbe, 0xed, 0x3e, 0x59, 0x78 } };
-
-// {AEC1BD87-E85B-48f2-84C3-98BCA6285072}
-static const GUID NV_ENC_H264_PROFILE_CONSTRAINED_HIGH_GUID =
-{ 0xaec1bd87, 0xe85b, 0x48f2, { 0x84, 0xc3, 0x98, 0xbc, 0xa6, 0x28, 0x50, 0x72 } };
-
-// {B514C39A-B55B-40fa-878F-F1253B4DFDEC}
-static const GUID NV_ENC_HEVC_PROFILE_MAIN_GUID =
-{ 0xb514c39a, 0xb55b, 0x40fa, { 0x87, 0x8f, 0xf1, 0x25, 0x3b, 0x4d, 0xfd, 0xec } };
-
-// {fa4d2b6c-3a5b-411a-8018-0a3f5e3c9be5}
-static const GUID NV_ENC_HEVC_PROFILE_MAIN10_GUID =
-{ 0xfa4d2b6c, 0x3a5b, 0x411a, { 0x80, 0x18, 0x0a, 0x3f, 0x5e, 0x3c, 0x9b, 0xe5 } };
-
-// For HEVC Main 444 8 bit and HEVC Main 444 10 bit profiles only
-// {51ec32b5-1b4c-453c-9cbd-b616bd621341}
-static const GUID NV_ENC_HEVC_PROFILE_FREXT_GUID =
-{ 0x51ec32b5, 0x1b4c, 0x453c, { 0x9c, 0xbd, 0xb6, 0x16, 0xbd, 0x62, 0x13, 0x41 } };
-
-// {5f2a39f5-f14e-4f95-9a9e-b76d568fcf97}
-static const GUID NV_ENC_AV1_PROFILE_MAIN_GUID =
-{ 0x5f2a39f5, 0xf14e, 0x4f95, { 0x9a, 0x9e, 0xb7, 0x6d, 0x56, 0x8f, 0xcf, 0x97 } };
-
-// {7c718f81-abb7-4a0e-afe4-c88bab957997}
-static const GUID NV_ENC_AV1_PROFILE_HIGH_GUID =
-{ 0x7c718f81, 0xabb7, 0x4a0e, { 0xaf, 0xe4, 0xc8, 0x8b, 0xab, 0x95, 0x79, 0x97 } };
-
-// =========================================================================================
-// * Preset GUIDS supported by the NvEncodeAPI interface.
-// =========================================================================================
-// {B2DFB705-4EBD-4C49-9B5F-24A777D3E587}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_DEFAULT_GUID =
-{ 0xb2dfb705, 0x4ebd, 0x4c49, { 0x9b, 0x5f, 0x24, 0xa7, 0x77, 0xd3, 0xe5, 0x87 } };
-
-// {60E4C59F-E846-4484-A56D-CD45BE9FDDF6}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_HP_GUID =
-{ 0x60e4c59f, 0xe846, 0x4484, { 0xa5, 0x6d, 0xcd, 0x45, 0xbe, 0x9f, 0xdd, 0xf6 } };
-
-// {34DBA71D-A77B-4B8F-9C3E-B6D5DA24C012}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_HQ_GUID =
-{ 0x34dba71d, 0xa77b, 0x4b8f, { 0x9c, 0x3e, 0xb6, 0xd5, 0xda, 0x24, 0xc0, 0x12 } };
-
-// {82E3E450-BDBB-4e40-989C-82A90DF9EF32}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_BD_GUID =
-{ 0x82e3e450, 0xbdbb, 0x4e40, { 0x98, 0x9c, 0x82, 0xa9, 0xd, 0xf9, 0xef, 0x32 } };
-
-// {49DF21C5-6DFA-4feb-9787-6ACC9EFFB726}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_LOW_LATENCY_DEFAULT_GUID =
-{ 0x49df21c5, 0x6dfa, 0x4feb, { 0x97, 0x87, 0x6a, 0xcc, 0x9e, 0xff, 0xb7, 0x26 } };
-
-// {C5F733B9-EA97-4cf9-BEC2-BF78A74FD105}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_LOW_LATENCY_HQ_GUID =
-{ 0xc5f733b9, 0xea97, 0x4cf9, { 0xbe, 0xc2, 0xbf, 0x78, 0xa7, 0x4f, 0xd1, 0x5 } };
-
-// {67082A44-4BAD-48FA-98EA-93056D150A58}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_LOW_LATENCY_HP_GUID =
-{ 0x67082a44, 0x4bad, 0x48fa, { 0x98, 0xea, 0x93, 0x5, 0x6d, 0x15, 0xa, 0x58 } };
-
-// {D5BFB716-C604-44e7-9BB8-DEA5510FC3AC}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_LOSSLESS_DEFAULT_GUID =
-{ 0xd5bfb716, 0xc604, 0x44e7, { 0x9b, 0xb8, 0xde, 0xa5, 0x51, 0xf, 0xc3, 0xac } };
-
-// {149998E7-2364-411d-82EF-179888093409}
-NV_ENC_DEPRECATED static const GUID NV_ENC_PRESET_LOSSLESS_HP_GUID =
-{ 0x149998e7, 0x2364, 0x411d, { 0x82, 0xef, 0x17, 0x98, 0x88, 0x9, 0x34, 0x9 } };
-
-// Performance degrades and quality improves as we move from P1 to P7. Presets P3 to P7 for H264 and Presets P2 to P7 for HEVC have B frames enabled by default
-// for HIGH_QUALITY and LOSSLESS tuning info, and will not work with Weighted Prediction enabled. In case Weighted Prediction is required, disable B frames by
-// setting frameIntervalP = 1
-// {FC0A8D3E-45F8-4CF8-80C7-298871590EBF}
-static const GUID NV_ENC_PRESET_P1_GUID =
-{ 0xfc0a8d3e, 0x45f8, 0x4cf8, { 0x80, 0xc7, 0x29, 0x88, 0x71, 0x59, 0xe, 0xbf } };
-
-// {F581CFB8-88D6-4381-93F0-DF13F9C27DAB}
-static const GUID NV_ENC_PRESET_P2_GUID =
-{ 0xf581cfb8, 0x88d6, 0x4381, { 0x93, 0xf0, 0xdf, 0x13, 0xf9, 0xc2, 0x7d, 0xab } };
-
-// {36850110-3A07-441F-94D5-3670631F91F6}
-static const GUID NV_ENC_PRESET_P3_GUID =
-{ 0x36850110, 0x3a07, 0x441f, { 0x94, 0xd5, 0x36, 0x70, 0x63, 0x1f, 0x91, 0xf6 } };
-
-// {90A7B826-DF06-4862-B9D2-CD6D73A08681}
-static const GUID NV_ENC_PRESET_P4_GUID =
-{ 0x90a7b826, 0xdf06, 0x4862, { 0xb9, 0xd2, 0xcd, 0x6d, 0x73, 0xa0, 0x86, 0x81 } };
-
-// {21C6E6B4-297A-4CBA-998F-B6CBDE72ADE3}
-static const GUID NV_ENC_PRESET_P5_GUID =
-{ 0x21c6e6b4, 0x297a, 0x4cba, { 0x99, 0x8f, 0xb6, 0xcb, 0xde, 0x72, 0xad, 0xe3 } };
-
-// {8E75C279-6299-4AB6-8302-0B215A335CF5}
-static const GUID NV_ENC_PRESET_P6_GUID =
-{ 0x8e75c279, 0x6299, 0x4ab6, { 0x83, 0x2, 0xb, 0x21, 0x5a, 0x33, 0x5c, 0xf5 } };
-
-// {84848C12-6F71-4C13-931B-53E283F57974}
-static const GUID NV_ENC_PRESET_P7_GUID =
-{ 0x84848c12, 0x6f71, 0x4c13, { 0x93, 0x1b, 0x53, 0xe2, 0x83, 0xf5, 0x79, 0x74 } };
-
-/**
- * \addtogroup ENCODER_STRUCTURE NvEncodeAPI Data structures
- * @{
- */
-
-/**
- * Input frame encode modes
- */
-typedef enum _NV_ENC_PARAMS_FRAME_FIELD_MODE
-{
- NV_ENC_PARAMS_FRAME_FIELD_MODE_FRAME = 0x01, /**< Frame mode */
- NV_ENC_PARAMS_FRAME_FIELD_MODE_FIELD = 0x02, /**< Field mode */
- NV_ENC_PARAMS_FRAME_FIELD_MODE_MBAFF = 0x03 /**< MB adaptive frame/field */
-} NV_ENC_PARAMS_FRAME_FIELD_MODE;
-
-/**
- * Rate Control Modes
- */
-typedef enum _NV_ENC_PARAMS_RC_MODE
-{
- NV_ENC_PARAMS_RC_CONSTQP = 0x0, /**< Constant QP mode */
- NV_ENC_PARAMS_RC_VBR = 0x1, /**< Variable bitrate mode */
- NV_ENC_PARAMS_RC_CBR = 0x2, /**< Constant bitrate mode */
- NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ = 0x8, /**< Deprecated, use NV_ENC_PARAMS_RC_CBR + NV_ENC_TWO_PASS_QUARTER_RESOLUTION / NV_ENC_TWO_PASS_FULL_RESOLUTION +
- lowDelayKeyFrameScale=1 */
- NV_ENC_PARAMS_RC_CBR_HQ = 0x10, /**< Deprecated, use NV_ENC_PARAMS_RC_CBR + NV_ENC_TWO_PASS_QUARTER_RESOLUTION / NV_ENC_TWO_PASS_FULL_RESOLUTION */
- NV_ENC_PARAMS_RC_VBR_HQ = 0x20 /**< Deprecated, use NV_ENC_PARAMS_RC_VBR + NV_ENC_TWO_PASS_QUARTER_RESOLUTION / NV_ENC_TWO_PASS_FULL_RESOLUTION */
-} NV_ENC_PARAMS_RC_MODE;
-
-/**
- * Multi Pass encoding
- */
-typedef enum _NV_ENC_MULTI_PASS
-{
- NV_ENC_MULTI_PASS_DISABLED = 0x0, /**< Single Pass */
- NV_ENC_TWO_PASS_QUARTER_RESOLUTION = 0x1, /**< Two Pass encoding is enabled where first Pass is quarter resolution */
- NV_ENC_TWO_PASS_FULL_RESOLUTION = 0x2, /**< Two Pass encoding is enabled where first Pass is full resolution */
-} NV_ENC_MULTI_PASS;
-
-/**
- * Emphasis Levels
- */
-typedef enum _NV_ENC_EMPHASIS_MAP_LEVEL
-{
- NV_ENC_EMPHASIS_MAP_LEVEL_0 = 0x0, /**< Emphasis Map Level 0, for zero Delta QP value */
- NV_ENC_EMPHASIS_MAP_LEVEL_1 = 0x1, /**< Emphasis Map Level 1, for very low Delta QP value */
- NV_ENC_EMPHASIS_MAP_LEVEL_2 = 0x2, /**< Emphasis Map Level 2, for low Delta QP value */
- NV_ENC_EMPHASIS_MAP_LEVEL_3 = 0x3, /**< Emphasis Map Level 3, for medium Delta QP value */
- NV_ENC_EMPHASIS_MAP_LEVEL_4 = 0x4, /**< Emphasis Map Level 4, for high Delta QP value */
- NV_ENC_EMPHASIS_MAP_LEVEL_5 = 0x5 /**< Emphasis Map Level 5, for very high Delta QP value */
-} NV_ENC_EMPHASIS_MAP_LEVEL;
-
-/**
- * QP MAP MODE
- */
-typedef enum _NV_ENC_QP_MAP_MODE
-{
- NV_ENC_QP_MAP_DISABLED = 0x0, /**< Value in NV_ENC_PIC_PARAMS::qpDeltaMap have no effect. */
- NV_ENC_QP_MAP_EMPHASIS = 0x1, /**< Value in NV_ENC_PIC_PARAMS::qpDeltaMap will be treated as Emphasis level. Currently this is only supported for H264 */
- NV_ENC_QP_MAP_DELTA = 0x2, /**< Value in NV_ENC_PIC_PARAMS::qpDeltaMap will be treated as QP delta map. */
- NV_ENC_QP_MAP = 0x3, /**< Currently This is not supported. Value in NV_ENC_PIC_PARAMS::qpDeltaMap will be treated as QP value. */
-} NV_ENC_QP_MAP_MODE;
-
-#define NV_ENC_PARAMS_RC_VBR_MINQP (NV_ENC_PARAMS_RC_MODE)0x4 /**< Deprecated */
-#define NV_ENC_PARAMS_RC_2_PASS_QUALITY NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ /**< Deprecated */
-#define NV_ENC_PARAMS_RC_2_PASS_FRAMESIZE_CAP NV_ENC_PARAMS_RC_CBR_HQ /**< Deprecated */
-#define NV_ENC_PARAMS_RC_2_PASS_VBR NV_ENC_PARAMS_RC_VBR_HQ /**< Deprecated */
-#define NV_ENC_PARAMS_RC_CBR2 NV_ENC_PARAMS_RC_CBR /**< Deprecated */
-
-/**
- * Input picture structure
- */
-typedef enum _NV_ENC_PIC_STRUCT
-{
- NV_ENC_PIC_STRUCT_FRAME = 0x01, /**< Progressive frame */
- NV_ENC_PIC_STRUCT_FIELD_TOP_BOTTOM = 0x02, /**< Field encoding top field first */
- NV_ENC_PIC_STRUCT_FIELD_BOTTOM_TOP = 0x03 /**< Field encoding bottom field first */
-} NV_ENC_PIC_STRUCT;
-
-/**
- * Display picture structure
- * Currently, this enum is only used for deciding the number of clock timestamp sets in Picture Timing SEI / Time Code SEI 
- * Otherwise, this has no impact on encoder behavior 
- */
-typedef enum _NV_ENC_DISPLAY_PIC_STRUCT
-{
- NV_ENC_PIC_STRUCT_DISPLAY_FRAME = 0x00, /**< Field encoding top field first */
- NV_ENC_PIC_STRUCT_DISPLAY_FIELD_TOP_BOTTOM = 0x01, /**< Field encoding top field first */
- NV_ENC_PIC_STRUCT_DISPLAY_FIELD_BOTTOM_TOP = 0x02, /**< Field encoding bottom field first */
- NV_ENC_PIC_STRUCT_DISPLAY_FRAME_DOUBLING = 0x03, /**< Frame doubling */
- NV_ENC_PIC_STRUCT_DISPLAY_FRAME_TRIPLING = 0x04 /**< Field tripling */
-} NV_ENC_DISPLAY_PIC_STRUCT;
-
-/**
- * Input picture type
- */
-typedef enum _NV_ENC_PIC_TYPE
-{
- NV_ENC_PIC_TYPE_P = 0x0, /**< Forward predicted */
- NV_ENC_PIC_TYPE_B = 0x01, /**< Bi-directionally predicted picture */
- NV_ENC_PIC_TYPE_I = 0x02, /**< Intra predicted picture */
- NV_ENC_PIC_TYPE_IDR = 0x03, /**< IDR picture */
- NV_ENC_PIC_TYPE_BI = 0x04, /**< Bi-directionally predicted with only Intra MBs */
- NV_ENC_PIC_TYPE_SKIPPED = 0x05, /**< Picture is skipped */
- NV_ENC_PIC_TYPE_INTRA_REFRESH = 0x06, /**< First picture in intra refresh cycle */
- NV_ENC_PIC_TYPE_NONREF_P = 0x07, /**< Non reference P picture */
- NV_ENC_PIC_TYPE_UNKNOWN = 0xFF /**< Picture type unknown */
-} NV_ENC_PIC_TYPE;
-
-/**
- * Motion vector precisions
- */
-typedef enum _NV_ENC_MV_PRECISION
-{
- NV_ENC_MV_PRECISION_DEFAULT = 0x0, /**< Driver selects Quarter-Pel motion vector precision by default */
- NV_ENC_MV_PRECISION_FULL_PEL = 0x01, /**< Full-Pel motion vector precision */
- NV_ENC_MV_PRECISION_HALF_PEL = 0x02, /**< Half-Pel motion vector precision */
- NV_ENC_MV_PRECISION_QUARTER_PEL = 0x03 /**< Quarter-Pel motion vector precision */
-} NV_ENC_MV_PRECISION;
-
-
-/**
- * Input buffer formats
- */
-typedef enum _NV_ENC_BUFFER_FORMAT
-{
- NV_ENC_BUFFER_FORMAT_UNDEFINED = 0x00000000, /**< Undefined buffer format */
-
- NV_ENC_BUFFER_FORMAT_NV12 = 0x00000001, /**< Semi-Planar YUV Y plane followed by interleaved UV plane */
- NV_ENC_BUFFER_FORMAT_YV12 = 0x00000010, /**< Planar YUV Y plane followed by V and U planes */
- NV_ENC_BUFFER_FORMAT_IYUV = 0x00000100, /**< Planar YUV Y plane followed by U and V planes */
- NV_ENC_BUFFER_FORMAT_YUV444 = 0x00001000, /**< Planar YUV Y plane followed by U and V planes */
- NV_ENC_BUFFER_FORMAT_YUV420_10BIT = 0x00010000, /**< 10 bit Semi-Planar YUV Y plane followed by interleaved UV plane. Each pixel of size 2 bytes. Most Significant 10 bits contain pixel data. */
- NV_ENC_BUFFER_FORMAT_YUV444_10BIT = 0x00100000, /**< 10 bit Planar YUV444 Y plane followed by U and V planes. Each pixel of size 2 bytes. Most Significant 10 bits contain pixel data. */
- NV_ENC_BUFFER_FORMAT_ARGB = 0x01000000, /**< 8 bit Packed A8R8G8B8. This is a word-ordered format
- where a pixel is represented by a 32-bit word with B
- in the lowest 8 bits, G in the next 8 bits, R in the
- 8 bits after that and A in the highest 8 bits. */
- NV_ENC_BUFFER_FORMAT_ARGB10 = 0x02000000, /**< 10 bit Packed A2R10G10B10. This is a word-ordered format
- where a pixel is represented by a 32-bit word with B
- in the lowest 10 bits, G in the next 10 bits, R in the
- 10 bits after that and A in the highest 2 bits. */
- NV_ENC_BUFFER_FORMAT_AYUV = 0x04000000, /**< 8 bit Packed A8Y8U8V8. This is a word-ordered format
- where a pixel is represented by a 32-bit word with V
- in the lowest 8 bits, U in the next 8 bits, Y in the
- 8 bits after that and A in the highest 8 bits. */
- NV_ENC_BUFFER_FORMAT_ABGR = 0x10000000, /**< 8 bit Packed A8B8G8R8. This is a word-ordered format
- where a pixel is represented by a 32-bit word with R
- in the lowest 8 bits, G in the next 8 bits, B in the
- 8 bits after that and A in the highest 8 bits. */
- NV_ENC_BUFFER_FORMAT_ABGR10 = 0x20000000, /**< 10 bit Packed A2B10G10R10. This is a word-ordered format
- where a pixel is represented by a 32-bit word with R
- in the lowest 10 bits, G in the next 10 bits, B in the
- 10 bits after that and A in the highest 2 bits. */
- NV_ENC_BUFFER_FORMAT_U8 = 0x40000000, /**< Buffer format representing one-dimensional buffer.
- This format should be used only when registering the
- resource as output buffer, which will be used to write
- the encoded bit stream or H.264 ME only mode output. */
-} NV_ENC_BUFFER_FORMAT;
-
-#define NV_ENC_BUFFER_FORMAT_NV12_PL NV_ENC_BUFFER_FORMAT_NV12
-#define NV_ENC_BUFFER_FORMAT_YV12_PL NV_ENC_BUFFER_FORMAT_YV12
-#define NV_ENC_BUFFER_FORMAT_IYUV_PL NV_ENC_BUFFER_FORMAT_IYUV
-#define NV_ENC_BUFFER_FORMAT_YUV444_PL NV_ENC_BUFFER_FORMAT_YUV444
-
-/**
- * Encoding levels
- */
-typedef enum _NV_ENC_LEVEL
-{
- NV_ENC_LEVEL_AUTOSELECT = 0,
-
- NV_ENC_LEVEL_H264_1 = 10,
- NV_ENC_LEVEL_H264_1b = 9,
- NV_ENC_LEVEL_H264_11 = 11,
- NV_ENC_LEVEL_H264_12 = 12,
- NV_ENC_LEVEL_H264_13 = 13,
- NV_ENC_LEVEL_H264_2 = 20,
- NV_ENC_LEVEL_H264_21 = 21,
- NV_ENC_LEVEL_H264_22 = 22,
- NV_ENC_LEVEL_H264_3 = 30,
- NV_ENC_LEVEL_H264_31 = 31,
- NV_ENC_LEVEL_H264_32 = 32,
- NV_ENC_LEVEL_H264_4 = 40,
- NV_ENC_LEVEL_H264_41 = 41,
- NV_ENC_LEVEL_H264_42 = 42,
- NV_ENC_LEVEL_H264_5 = 50,
- NV_ENC_LEVEL_H264_51 = 51,
- NV_ENC_LEVEL_H264_52 = 52,
- NV_ENC_LEVEL_H264_60 = 60,
- NV_ENC_LEVEL_H264_61 = 61,
- NV_ENC_LEVEL_H264_62 = 62,
-
- NV_ENC_LEVEL_HEVC_1 = 30,
- NV_ENC_LEVEL_HEVC_2 = 60,
- NV_ENC_LEVEL_HEVC_21 = 63,
- NV_ENC_LEVEL_HEVC_3 = 90,
- NV_ENC_LEVEL_HEVC_31 = 93,
- NV_ENC_LEVEL_HEVC_4 = 120,
- NV_ENC_LEVEL_HEVC_41 = 123,
- NV_ENC_LEVEL_HEVC_5 = 150,
- NV_ENC_LEVEL_HEVC_51 = 153,
- NV_ENC_LEVEL_HEVC_52 = 156,
- NV_ENC_LEVEL_HEVC_6 = 180,
- NV_ENC_LEVEL_HEVC_61 = 183,
- NV_ENC_LEVEL_HEVC_62 = 186,
-
- NV_ENC_TIER_HEVC_MAIN = 0,
- NV_ENC_TIER_HEVC_HIGH = 1,
-
- NV_ENC_LEVEL_AV1_2 = 0,
- NV_ENC_LEVEL_AV1_21 = 1,
- NV_ENC_LEVEL_AV1_22 = 2,
- NV_ENC_LEVEL_AV1_23 = 3,
- NV_ENC_LEVEL_AV1_3 = 4,
- NV_ENC_LEVEL_AV1_31 = 5,
- NV_ENC_LEVEL_AV1_32 = 6,
- NV_ENC_LEVEL_AV1_33 = 7,
- NV_ENC_LEVEL_AV1_4 = 8,
- NV_ENC_LEVEL_AV1_41 = 9,
- NV_ENC_LEVEL_AV1_42 = 10,
- NV_ENC_LEVEL_AV1_43 = 11,
- NV_ENC_LEVEL_AV1_5 = 12,
- NV_ENC_LEVEL_AV1_51 = 13,
- NV_ENC_LEVEL_AV1_52 = 14,
- NV_ENC_LEVEL_AV1_53 = 15,
- NV_ENC_LEVEL_AV1_6 = 16,
- NV_ENC_LEVEL_AV1_61 = 17,
- NV_ENC_LEVEL_AV1_62 = 18,
- NV_ENC_LEVEL_AV1_63 = 19,
- NV_ENC_LEVEL_AV1_7 = 20,
- NV_ENC_LEVEL_AV1_71 = 21,
- NV_ENC_LEVEL_AV1_72 = 22,
- NV_ENC_LEVEL_AV1_73 = 23,
- NV_ENC_LEVEL_AV1_AUTOSELECT ,
-
- NV_ENC_TIER_AV1_0 = 0,
- NV_ENC_TIER_AV1_1 = 1
-} NV_ENC_LEVEL;
-
-/**
- * Error Codes
- */
-typedef enum _NVENCSTATUS
-{
- /**
- * This indicates that API call returned with no errors.
- */
- NV_ENC_SUCCESS,
-
- /**
- * This indicates that no encode capable devices were detected.
- */
- NV_ENC_ERR_NO_ENCODE_DEVICE,
-
- /**
- * This indicates that devices pass by the client is not supported.
- */
- NV_ENC_ERR_UNSUPPORTED_DEVICE,
-
- /**
- * This indicates that the encoder device supplied by the client is not
- * valid.
- */
- NV_ENC_ERR_INVALID_ENCODERDEVICE,
-
- /**
- * This indicates that device passed to the API call is invalid.
- */
- NV_ENC_ERR_INVALID_DEVICE,
-
- /**
- * This indicates that device passed to the API call is no longer available and
- * needs to be reinitialized. The clients need to destroy the current encoder
- * session by freeing the allocated input output buffers and destroying the device
- * and create a new encoding session.
- */
- NV_ENC_ERR_DEVICE_NOT_EXIST,
-
- /**
- * This indicates that one or more of the pointers passed to the API call
- * is invalid.
- */
- NV_ENC_ERR_INVALID_PTR,
-
- /**
- * This indicates that completion event passed in ::NvEncEncodePicture() call
- * is invalid.
- */
- NV_ENC_ERR_INVALID_EVENT,
-
- /**
- * This indicates that one or more of the parameter passed to the API call
- * is invalid.
- */
- NV_ENC_ERR_INVALID_PARAM,
-
- /**
- * This indicates that an API call was made in wrong sequence/order.
- */
- NV_ENC_ERR_INVALID_CALL,
-
- /**
- * This indicates that the API call failed because it was unable to allocate
- * enough memory to perform the requested operation.
- */
- NV_ENC_ERR_OUT_OF_MEMORY,
-
- /**
- * This indicates that the encoder has not been initialized with
- * ::NvEncInitializeEncoder() or that initialization has failed.
- * The client cannot allocate input or output buffers or do any encoding
- * related operation before successfully initializing the encoder.
- */
- NV_ENC_ERR_ENCODER_NOT_INITIALIZED,
-
- /**
- * This indicates that an unsupported parameter was passed by the client.
- */
- NV_ENC_ERR_UNSUPPORTED_PARAM,
-
- /**
- * This indicates that the ::NvEncLockBitstream() failed to lock the output
- * buffer. This happens when the client makes a non blocking lock call to
- * access the output bitstream by passing NV_ENC_LOCK_BITSTREAM::doNotWait flag.
- * This is not a fatal error and client should retry the same operation after
- * few milliseconds.
- */
- NV_ENC_ERR_LOCK_BUSY,
-
- /**
- * This indicates that the size of the user buffer passed by the client is
- * insufficient for the requested operation.
- */
- NV_ENC_ERR_NOT_ENOUGH_BUFFER,
-
- /**
- * This indicates that an invalid struct version was used by the client.
- */
- NV_ENC_ERR_INVALID_VERSION,
-
- /**
- * This indicates that ::NvEncMapInputResource() API failed to map the client
- * provided input resource.
- */
- NV_ENC_ERR_MAP_FAILED,
-
- /**
- * This indicates encode driver requires more input buffers to produce an output
- * bitstream. If this error is returned from ::NvEncEncodePicture() API, this
- * is not a fatal error. If the client is encoding with B frames then,
- * ::NvEncEncodePicture() API might be buffering the input frame for re-ordering.
- *
- * A client operating in synchronous mode cannot call ::NvEncLockBitstream()
- * API on the output bitstream buffer if ::NvEncEncodePicture() returned the
- * ::NV_ENC_ERR_NEED_MORE_INPUT error code.
- * The client must continue providing input frames until encode driver returns
- * ::NV_ENC_SUCCESS. After receiving ::NV_ENC_SUCCESS status the client can call
- * ::NvEncLockBitstream() API on the output buffers in the same order in which
- * it has called ::NvEncEncodePicture().
- */
- NV_ENC_ERR_NEED_MORE_INPUT,
-
- /**
- * This indicates that the HW encoder is busy encoding and is unable to encode
- * the input. The client should call ::NvEncEncodePicture() again after few
- * milliseconds.
- */
- NV_ENC_ERR_ENCODER_BUSY,
-
- /**
- * This indicates that the completion event passed in ::NvEncEncodePicture()
- * API has not been registered with encoder driver using ::NvEncRegisterAsyncEvent().
- */
- NV_ENC_ERR_EVENT_NOT_REGISTERD,
-
- /**
- * This indicates that an unknown internal error has occurred.
- */
- NV_ENC_ERR_GENERIC,
-
- /**
- * This indicates that the client is attempting to use a feature
- * that is not available for the license type for the current system.
- */
- NV_ENC_ERR_INCOMPATIBLE_CLIENT_KEY,
-
- /**
- * This indicates that the client is attempting to use a feature
- * that is not implemented for the current version.
- */
- NV_ENC_ERR_UNIMPLEMENTED,
-
- /**
- * This indicates that the ::NvEncRegisterResource API failed to register the resource.
- */
- NV_ENC_ERR_RESOURCE_REGISTER_FAILED,
-
- /**
- * This indicates that the client is attempting to unregister a resource
- * that has not been successfully registered.
- */
- NV_ENC_ERR_RESOURCE_NOT_REGISTERED,
-
- /**
- * This indicates that the client is attempting to unmap a resource
- * that has not been successfully mapped.
- */
- NV_ENC_ERR_RESOURCE_NOT_MAPPED,
-
-} NVENCSTATUS;
-
-/**
- * Encode Picture encode flags.
- */
-typedef enum _NV_ENC_PIC_FLAGS
-{
- NV_ENC_PIC_FLAG_FORCEINTRA = 0x1, /**< Encode the current picture as an Intra picture */
- NV_ENC_PIC_FLAG_FORCEIDR = 0x2, /**< Encode the current picture as an IDR picture.
- This flag is only valid when Picture type decision is taken by the Encoder
- _NV_ENC_INITIALIZE_PARAMS::enablePTD == 1. */
- NV_ENC_PIC_FLAG_OUTPUT_SPSPPS = 0x4, /**< Write the sequence and picture header in encoded bitstream of the current picture */
- NV_ENC_PIC_FLAG_EOS = 0x8, /**< Indicates end of the input stream */
-} NV_ENC_PIC_FLAGS;
-
-/**
- * Memory heap to allocate input and output buffers.
- */
-typedef enum _NV_ENC_MEMORY_HEAP
-{
- NV_ENC_MEMORY_HEAP_AUTOSELECT = 0, /**< Memory heap to be decided by the encoder driver based on the usage */
- NV_ENC_MEMORY_HEAP_VID = 1, /**< Memory heap is in local video memory */
- NV_ENC_MEMORY_HEAP_SYSMEM_CACHED = 2, /**< Memory heap is in cached system memory */
- NV_ENC_MEMORY_HEAP_SYSMEM_UNCACHED = 3 /**< Memory heap is in uncached system memory */
-} NV_ENC_MEMORY_HEAP;
-
-/**
- * B-frame used as reference modes
- */
-typedef enum _NV_ENC_BFRAME_REF_MODE
-{
- NV_ENC_BFRAME_REF_MODE_DISABLED = 0x0, /**< B frame is not used for reference */
- NV_ENC_BFRAME_REF_MODE_EACH = 0x1, /**< Each B-frame will be used for reference */
- NV_ENC_BFRAME_REF_MODE_MIDDLE = 0x2, /**< Only(Number of B-frame)/2 th B-frame will be used for reference */
-} NV_ENC_BFRAME_REF_MODE;
-
-/**
- * H.264 entropy coding modes.
- */
-typedef enum _NV_ENC_H264_ENTROPY_CODING_MODE
-{
- NV_ENC_H264_ENTROPY_CODING_MODE_AUTOSELECT = 0x0, /**< Entropy coding mode is auto selected by the encoder driver */
- NV_ENC_H264_ENTROPY_CODING_MODE_CABAC = 0x1, /**< Entropy coding mode is CABAC */
- NV_ENC_H264_ENTROPY_CODING_MODE_CAVLC = 0x2 /**< Entropy coding mode is CAVLC */
-} NV_ENC_H264_ENTROPY_CODING_MODE;
-
-/**
- * H.264 specific BDirect modes
- */
-typedef enum _NV_ENC_H264_BDIRECT_MODE
-{
- NV_ENC_H264_BDIRECT_MODE_AUTOSELECT = 0x0, /**< BDirect mode is auto selected by the encoder driver */
- NV_ENC_H264_BDIRECT_MODE_DISABLE = 0x1, /**< Disable BDirect mode */
- NV_ENC_H264_BDIRECT_MODE_TEMPORAL = 0x2, /**< Temporal BDirect mode */
- NV_ENC_H264_BDIRECT_MODE_SPATIAL = 0x3 /**< Spatial BDirect mode */
-} NV_ENC_H264_BDIRECT_MODE;
-
-/**
- * H.264 specific FMO usage
- */
-typedef enum _NV_ENC_H264_FMO_MODE
-{
- NV_ENC_H264_FMO_AUTOSELECT = 0x0, /**< FMO usage is auto selected by the encoder driver */
- NV_ENC_H264_FMO_ENABLE = 0x1, /**< Enable FMO */
- NV_ENC_H264_FMO_DISABLE = 0x2, /**< Disable FMO */
-} NV_ENC_H264_FMO_MODE;
-
-/**
- * H.264 specific Adaptive Transform modes
- */
-typedef enum _NV_ENC_H264_ADAPTIVE_TRANSFORM_MODE
-{
- NV_ENC_H264_ADAPTIVE_TRANSFORM_AUTOSELECT = 0x0, /**< Adaptive Transform 8x8 mode is auto selected by the encoder driver*/
- NV_ENC_H264_ADAPTIVE_TRANSFORM_DISABLE = 0x1, /**< Adaptive Transform 8x8 mode disabled */
- NV_ENC_H264_ADAPTIVE_TRANSFORM_ENABLE = 0x2, /**< Adaptive Transform 8x8 mode should be used */
-} NV_ENC_H264_ADAPTIVE_TRANSFORM_MODE;
-
-/**
- * Stereo frame packing modes.
- */
-typedef enum _NV_ENC_STEREO_PACKING_MODE
-{
- NV_ENC_STEREO_PACKING_MODE_NONE = 0x0, /**< No Stereo packing required */
- NV_ENC_STEREO_PACKING_MODE_CHECKERBOARD = 0x1, /**< Checkerboard mode for packing stereo frames */
- NV_ENC_STEREO_PACKING_MODE_COLINTERLEAVE = 0x2, /**< Column Interleave mode for packing stereo frames */
- NV_ENC_STEREO_PACKING_MODE_ROWINTERLEAVE = 0x3, /**< Row Interleave mode for packing stereo frames */
- NV_ENC_STEREO_PACKING_MODE_SIDEBYSIDE = 0x4, /**< Side-by-side mode for packing stereo frames */
- NV_ENC_STEREO_PACKING_MODE_TOPBOTTOM = 0x5, /**< Top-Bottom mode for packing stereo frames */
- NV_ENC_STEREO_PACKING_MODE_FRAMESEQ = 0x6 /**< Frame Sequential mode for packing stereo frames */
-} NV_ENC_STEREO_PACKING_MODE;
-
-/**
- * Input Resource type
- */
-typedef enum _NV_ENC_INPUT_RESOURCE_TYPE
-{
- NV_ENC_INPUT_RESOURCE_TYPE_DIRECTX = 0x0, /**< input resource type is a directx9 surface*/
- NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR = 0x1, /**< input resource type is a cuda device pointer surface*/
- NV_ENC_INPUT_RESOURCE_TYPE_CUDAARRAY = 0x2, /**< input resource type is a cuda array surface.
- This array must be a 2D array and the CUDA_ARRAY3D_SURFACE_LDST
- flag must have been specified when creating it. */
- NV_ENC_INPUT_RESOURCE_TYPE_OPENGL_TEX = 0x3 /**< input resource type is an OpenGL texture */
-} NV_ENC_INPUT_RESOURCE_TYPE;
-
-/**
- * Buffer usage
- */
-typedef enum _NV_ENC_BUFFER_USAGE
-{
- NV_ENC_INPUT_IMAGE = 0x0, /**< Registered surface will be used for input image */
- NV_ENC_OUTPUT_MOTION_VECTOR = 0x1, /**< Registered surface will be used for output of H.264 ME only mode.
- This buffer usage type is not supported for HEVC ME only mode. */
- NV_ENC_OUTPUT_BITSTREAM = 0x2, /**< Registered surface will be used for output bitstream in encoding */
-} NV_ENC_BUFFER_USAGE;
-
-/**
- * Encoder Device type
- */
-typedef enum _NV_ENC_DEVICE_TYPE
-{
- NV_ENC_DEVICE_TYPE_DIRECTX = 0x0, /**< encode device type is a directx9 device */
- NV_ENC_DEVICE_TYPE_CUDA = 0x1, /**< encode device type is a cuda device */
- NV_ENC_DEVICE_TYPE_OPENGL = 0x2 /**< encode device type is an OpenGL device.
- Use of this device type is supported only on Linux */
-} NV_ENC_DEVICE_TYPE;
-
-/**
- * Number of reference frames
- */
-typedef enum _NV_ENC_NUM_REF_FRAMES
-{
- NV_ENC_NUM_REF_FRAMES_AUTOSELECT = 0x0, /**< Number of reference frames is auto selected by the encoder driver */
- NV_ENC_NUM_REF_FRAMES_1 = 0x1, /**< Number of reference frames equal to 1 */
- NV_ENC_NUM_REF_FRAMES_2 = 0x2, /**< Number of reference frames equal to 2 */
- NV_ENC_NUM_REF_FRAMES_3 = 0x3, /**< Number of reference frames equal to 3 */
- NV_ENC_NUM_REF_FRAMES_4 = 0x4, /**< Number of reference frames equal to 4 */
- NV_ENC_NUM_REF_FRAMES_5 = 0x5, /**< Number of reference frames equal to 5 */
- NV_ENC_NUM_REF_FRAMES_6 = 0x6, /**< Number of reference frames equal to 6 */
- NV_ENC_NUM_REF_FRAMES_7 = 0x7 /**< Number of reference frames equal to 7 */
-} NV_ENC_NUM_REF_FRAMES;
-
-/**
- * Encoder capabilities enumeration.
- */
-typedef enum _NV_ENC_CAPS
-{
- /**
- * Maximum number of B-Frames supported.
- */
- NV_ENC_CAPS_NUM_MAX_BFRAMES,
-
- /**
- * Rate control modes supported.
- * \n The API return value is a bitmask of the values in NV_ENC_PARAMS_RC_MODE.
- */
- NV_ENC_CAPS_SUPPORTED_RATECONTROL_MODES,
-
- /**
- * Indicates HW support for field mode encoding.
- * \n 0 : Interlaced mode encoding is not supported.
- * \n 1 : Interlaced field mode encoding is supported.
- * \n 2 : Interlaced frame encoding and field mode encoding are both supported.
- */
- NV_ENC_CAPS_SUPPORT_FIELD_ENCODING,
-
- /**
- * Indicates HW support for monochrome mode encoding.
- * \n 0 : Monochrome mode not supported.
- * \n 1 : Monochrome mode supported.
- */
- NV_ENC_CAPS_SUPPORT_MONOCHROME,
-
- /**
- * Indicates HW support for FMO.
- * \n 0 : FMO not supported.
- * \n 1 : FMO supported.
- */
- NV_ENC_CAPS_SUPPORT_FMO,
-
- /**
- * Indicates HW capability for Quarter pel motion estimation.
- * \n 0 : Quarter-Pel Motion Estimation not supported.
- * \n 1 : Quarter-Pel Motion Estimation supported.
- */
- NV_ENC_CAPS_SUPPORT_QPELMV,
-
- /**
- * H.264 specific. Indicates HW support for BDirect modes.
- * \n 0 : BDirect mode encoding not supported.
- * \n 1 : BDirect mode encoding supported.
- */
- NV_ENC_CAPS_SUPPORT_BDIRECT_MODE,
-
- /**
- * H264 specific. Indicates HW support for CABAC entropy coding mode.
- * \n 0 : CABAC entropy coding not supported.
- * \n 1 : CABAC entropy coding supported.
- */
- NV_ENC_CAPS_SUPPORT_CABAC,
-
- /**
- * Indicates HW support for Adaptive Transform.
- * \n 0 : Adaptive Transform not supported.
- * \n 1 : Adaptive Transform supported.
- */
- NV_ENC_CAPS_SUPPORT_ADAPTIVE_TRANSFORM,
-
- /**
- * Indicates HW support for Multi View Coding.
- * \n 0 : Multi View Coding not supported.
- * \n 1 : Multi View Coding supported.
- */
- NV_ENC_CAPS_SUPPORT_STEREO_MVC,
-
- /**
- * Indicates HW support for encoding Temporal layers.
- * \n 0 : Encoding Temporal layers not supported.
- * \n 1 : Encoding Temporal layers supported.
- */
- NV_ENC_CAPS_NUM_MAX_TEMPORAL_LAYERS,
-
- /**
- * Indicates HW support for Hierarchical P frames.
- * \n 0 : Hierarchical P frames not supported.
- * \n 1 : Hierarchical P frames supported.
- */
- NV_ENC_CAPS_SUPPORT_HIERARCHICAL_PFRAMES,
-
- /**
- * Indicates HW support for Hierarchical B frames.
- * \n 0 : Hierarchical B frames not supported.
- * \n 1 : Hierarchical B frames supported.
- */
- NV_ENC_CAPS_SUPPORT_HIERARCHICAL_BFRAMES,
-
- /**
- * Maximum Encoding level supported (See ::NV_ENC_LEVEL for details).
- */
- NV_ENC_CAPS_LEVEL_MAX,
-
- /**
- * Minimum Encoding level supported (See ::NV_ENC_LEVEL for details).
- */
- NV_ENC_CAPS_LEVEL_MIN,
-
- /**
- * Indicates HW support for separate colour plane encoding.
- * \n 0 : Separate colour plane encoding not supported.
- * \n 1 : Separate colour plane encoding supported.
- */
- NV_ENC_CAPS_SEPARATE_COLOUR_PLANE,
-
- /**
- * Maximum output width supported.
- */
- NV_ENC_CAPS_WIDTH_MAX,
-
- /**
- * Maximum output height supported.
- */
- NV_ENC_CAPS_HEIGHT_MAX,
-
- /**
- * Indicates Temporal Scalability Support.
- * \n 0 : Temporal SVC encoding not supported.
- * \n 1 : Temporal SVC encoding supported.
- */
- NV_ENC_CAPS_SUPPORT_TEMPORAL_SVC,
-
- /**
- * Indicates Dynamic Encode Resolution Change Support.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Dynamic Encode Resolution Change not supported.
- * \n 1 : Dynamic Encode Resolution Change supported.
- */
- NV_ENC_CAPS_SUPPORT_DYN_RES_CHANGE,
-
- /**
- * Indicates Dynamic Encode Bitrate Change Support.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Dynamic Encode bitrate change not supported.
- * \n 1 : Dynamic Encode bitrate change supported.
- */
- NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE,
-
- /**
- * Indicates Forcing Constant QP On The Fly Support.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Forcing constant QP on the fly not supported.
- * \n 1 : Forcing constant QP on the fly supported.
- */
- NV_ENC_CAPS_SUPPORT_DYN_FORCE_CONSTQP,
-
- /**
- * Indicates Dynamic rate control mode Change Support.
- * \n 0 : Dynamic rate control mode change not supported.
- * \n 1 : Dynamic rate control mode change supported.
- */
- NV_ENC_CAPS_SUPPORT_DYN_RCMODE_CHANGE,
-
- /**
- * Indicates Subframe readback support for slice-based encoding. If this feature is supported, it can be enabled by setting enableSubFrameWrite = 1.
- * \n 0 : Subframe readback not supported.
- * \n 1 : Subframe readback supported.
- */
- NV_ENC_CAPS_SUPPORT_SUBFRAME_READBACK,
-
- /**
- * Indicates Constrained Encoding mode support.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Constrained encoding mode not supported.
- * \n 1 : Constrained encoding mode supported.
- * If this mode is supported client can enable this during initialization.
- * Client can then force a picture to be coded as constrained picture where
- * in-loop filtering is disabled across slice boundaries and prediction vectors for inter
- * macroblocks in each slice will be restricted to the slice region.
- */
- NV_ENC_CAPS_SUPPORT_CONSTRAINED_ENCODING,
-
- /**
- * Indicates Intra Refresh Mode Support.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Intra Refresh Mode not supported.
- * \n 1 : Intra Refresh Mode supported.
- */
- NV_ENC_CAPS_SUPPORT_INTRA_REFRESH,
-
- /**
- * Indicates Custom VBV Buffer Size support. It can be used for capping frame size.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Custom VBV buffer size specification from client, not supported.
- * \n 1 : Custom VBV buffer size specification from client, supported.
- */
- NV_ENC_CAPS_SUPPORT_CUSTOM_VBV_BUF_SIZE,
-
- /**
- * Indicates Dynamic Slice Mode Support.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Dynamic Slice Mode not supported.
- * \n 1 : Dynamic Slice Mode supported.
- */
- NV_ENC_CAPS_SUPPORT_DYNAMIC_SLICE_MODE,
-
- /**
- * Indicates Reference Picture Invalidation Support.
- * Support added from NvEncodeAPI version 2.0.
- * \n 0 : Reference Picture Invalidation not supported.
- * \n 1 : Reference Picture Invalidation supported.
- */
- NV_ENC_CAPS_SUPPORT_REF_PIC_INVALIDATION,
-
- /**
- * Indicates support for Pre-Processing.
- * The API return value is a bitmask of the values defined in ::NV_ENC_PREPROC_FLAGS
- */
- NV_ENC_CAPS_PREPROC_SUPPORT,
-
- /**
- * Indicates support Async mode.
- * \n 0 : Async Encode mode not supported.
- * \n 1 : Async Encode mode supported.
- */
- NV_ENC_CAPS_ASYNC_ENCODE_SUPPORT,
-
- /**
- * Maximum MBs per frame supported.
- */
- NV_ENC_CAPS_MB_NUM_MAX,
-
- /**
- * Maximum aggregate throughput in MBs per sec.
- */
- NV_ENC_CAPS_MB_PER_SEC_MAX,
-
- /**
- * Indicates HW support for YUV444 mode encoding.
- * \n 0 : YUV444 mode encoding not supported.
- * \n 1 : YUV444 mode encoding supported.
- */
- NV_ENC_CAPS_SUPPORT_YUV444_ENCODE,
-
- /**
- * Indicates HW support for lossless encoding.
- * \n 0 : lossless encoding not supported.
- * \n 1 : lossless encoding supported.
- */
- NV_ENC_CAPS_SUPPORT_LOSSLESS_ENCODE,
-
- /**
- * Indicates HW support for Sample Adaptive Offset.
- * \n 0 : SAO not supported.
- * \n 1 : SAO encoding supported.
- */
- NV_ENC_CAPS_SUPPORT_SAO,
-
- /**
- * Indicates HW support for Motion Estimation Only Mode.
- * \n 0 : MEOnly Mode not supported.
- * \n 1 : MEOnly Mode supported for I and P frames.
- * \n 2 : MEOnly Mode supported for I, P and B frames.
- */
- NV_ENC_CAPS_SUPPORT_MEONLY_MODE,
-
- /**
- * Indicates HW support for lookahead encoding (enableLookahead=1).
- * \n 0 : Lookahead not supported.
- * \n 1 : Lookahead supported.
- */
- NV_ENC_CAPS_SUPPORT_LOOKAHEAD,
-
- /**
- * Indicates HW support for temporal AQ encoding (enableTemporalAQ=1).
- * \n 0 : Temporal AQ not supported.
- * \n 1 : Temporal AQ supported.
- */
- NV_ENC_CAPS_SUPPORT_TEMPORAL_AQ,
- /**
- * Indicates HW support for 10 bit encoding.
- * \n 0 : 10 bit encoding not supported.
- * \n 1 : 10 bit encoding supported.
- */
- NV_ENC_CAPS_SUPPORT_10BIT_ENCODE,
- /**
- * Maximum number of Long Term Reference frames supported
- */
- NV_ENC_CAPS_NUM_MAX_LTR_FRAMES,
-
- /**
- * Indicates HW support for Weighted Prediction.
- * \n 0 : Weighted Prediction not supported.
- * \n 1 : Weighted Prediction supported.
- */
- NV_ENC_CAPS_SUPPORT_WEIGHTED_PREDICTION,
-
-
- /**
- * On managed (vGPU) platforms (Windows only), this API, in conjunction with other GRID Management APIs, can be used
- * to estimate the residual capacity of the hardware encoder on the GPU as a percentage of the total available encoder capacity.
- * This API can be called at any time; i.e. during the encode session or before opening the encode session.
- * If the available encoder capacity is returned as zero, applications may choose to switch to software encoding
- * and continue to call this API (e.g. polling once per second) until capacity becomes available.
- *
- * On bare metal (non-virtualized GPU) and linux platforms, this API always returns 100.
- */
- NV_ENC_CAPS_DYNAMIC_QUERY_ENCODER_CAPACITY,
-
- /**
- * Indicates B as reference support.
- * \n 0 : B as reference is not supported.
- * \n 1 : each B-Frame as reference is supported.
- * \n 2 : only Middle B-frame as reference is supported.
- */
- NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE,
-
- /**
- * Indicates HW support for Emphasis Level Map based delta QP computation.
- * \n 0 : Emphasis Level Map based delta QP not supported.
- * \n 1 : Emphasis Level Map based delta QP is supported.
- */
- NV_ENC_CAPS_SUPPORT_EMPHASIS_LEVEL_MAP,
-
- /**
- * Minimum input width supported.
- */
- NV_ENC_CAPS_WIDTH_MIN,
-
- /**
- * Minimum input height supported.
- */
- NV_ENC_CAPS_HEIGHT_MIN,
-
- /**
- * Indicates HW support for multiple reference frames.
- */
- NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES,
-
- /**
- * Indicates HW support for HEVC with alpha encoding.
- * \n 0 : HEVC with alpha encoding not supported.
- * \n 1 : HEVC with alpha encoding is supported.
- */
- NV_ENC_CAPS_SUPPORT_ALPHA_LAYER_ENCODING,
-
- /**
- * Indicates number of Encoding engines present on GPU.
- */
- NV_ENC_CAPS_NUM_ENCODER_ENGINES,
-
- /**
- * Indicates single slice intra refresh support.
- */
- NV_ENC_CAPS_SINGLE_SLICE_INTRA_REFRESH,
-
- /**
- * Reserved - Not to be used by clients.
- */
- NV_ENC_CAPS_EXPOSED_COUNT
-
-} NV_ENC_CAPS;
-
-/**
- * HEVC CU SIZE
- */
-typedef enum _NV_ENC_HEVC_CUSIZE
-{
- NV_ENC_HEVC_CUSIZE_AUTOSELECT = 0,
- NV_ENC_HEVC_CUSIZE_8x8 = 1,
- NV_ENC_HEVC_CUSIZE_16x16 = 2,
- NV_ENC_HEVC_CUSIZE_32x32 = 3,
- NV_ENC_HEVC_CUSIZE_64x64 = 4,
-}NV_ENC_HEVC_CUSIZE;
-
-/**
-* AV1 PART SIZE
-*/
-typedef enum _NV_ENC_AV1_PART_SIZE
-{
- NV_ENC_AV1_PART_SIZE_AUTOSELECT = 0,
- NV_ENC_AV1_PART_SIZE_4x4 = 1,
- NV_ENC_AV1_PART_SIZE_8x8 = 2,
- NV_ENC_AV1_PART_SIZE_16x16 = 3,
- NV_ENC_AV1_PART_SIZE_32x32 = 4,
- NV_ENC_AV1_PART_SIZE_64x64 = 5,
-}NV_ENC_AV1_PART_SIZE;
-
-/**
-* Enums related to fields in VUI parameters.
-*/
-typedef enum _NV_ENC_VUI_VIDEO_FORMAT
-{
- NV_ENC_VUI_VIDEO_FORMAT_COMPONENT = 0,
- NV_ENC_VUI_VIDEO_FORMAT_PAL = 1,
- NV_ENC_VUI_VIDEO_FORMAT_NTSC = 2,
- NV_ENC_VUI_VIDEO_FORMAT_SECAM = 3,
- NV_ENC_VUI_VIDEO_FORMAT_MAC = 4,
- NV_ENC_VUI_VIDEO_FORMAT_UNSPECIFIED = 5,
-}NV_ENC_VUI_VIDEO_FORMAT;
-
-typedef enum _NV_ENC_VUI_COLOR_PRIMARIES
-{
- NV_ENC_VUI_COLOR_PRIMARIES_UNDEFINED = 0,
- NV_ENC_VUI_COLOR_PRIMARIES_BT709 = 1,
- NV_ENC_VUI_COLOR_PRIMARIES_UNSPECIFIED = 2,
- NV_ENC_VUI_COLOR_PRIMARIES_RESERVED = 3,
- NV_ENC_VUI_COLOR_PRIMARIES_BT470M = 4,
- NV_ENC_VUI_COLOR_PRIMARIES_BT470BG = 5,
- NV_ENC_VUI_COLOR_PRIMARIES_SMPTE170M = 6,
- NV_ENC_VUI_COLOR_PRIMARIES_SMPTE240M = 7,
- NV_ENC_VUI_COLOR_PRIMARIES_FILM = 8,
- NV_ENC_VUI_COLOR_PRIMARIES_BT2020 = 9,
- NV_ENC_VUI_COLOR_PRIMARIES_SMPTE428 = 10,
- NV_ENC_VUI_COLOR_PRIMARIES_SMPTE431 = 11,
- NV_ENC_VUI_COLOR_PRIMARIES_SMPTE432 = 12,
- NV_ENC_VUI_COLOR_PRIMARIES_JEDEC_P22 = 22,
-}NV_ENC_VUI_COLOR_PRIMARIES;
-
-typedef enum _NV_ENC_VUI_TRANSFER_CHARACTERISTIC
-{
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_UNDEFINED = 0,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_BT709 = 1,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_UNSPECIFIED = 2,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_RESERVED = 3,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_BT470M = 4,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_BT470BG = 5,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_SMPTE170M = 6,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_SMPTE240M = 7,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_LINEAR = 8,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_LOG = 9,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_LOG_SQRT = 10,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_IEC61966_2_4 = 11,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_BT1361_ECG = 12,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_SRGB = 13,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_BT2020_10 = 14,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_BT2020_12 = 15,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_SMPTE2084 = 16,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_SMPTE428 = 17,
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC_ARIB_STD_B67 = 18,
-}NV_ENC_VUI_TRANSFER_CHARACTERISTIC;
-
-typedef enum _NV_ENC_VUI_MATRIX_COEFFS
-{
- NV_ENC_VUI_MATRIX_COEFFS_RGB = 0,
- NV_ENC_VUI_MATRIX_COEFFS_BT709 = 1,
- NV_ENC_VUI_MATRIX_COEFFS_UNSPECIFIED = 2,
- NV_ENC_VUI_MATRIX_COEFFS_RESERVED = 3,
- NV_ENC_VUI_MATRIX_COEFFS_FCC = 4,
- NV_ENC_VUI_MATRIX_COEFFS_BT470BG = 5,
- NV_ENC_VUI_MATRIX_COEFFS_SMPTE170M = 6,
- NV_ENC_VUI_MATRIX_COEFFS_SMPTE240M = 7,
- NV_ENC_VUI_MATRIX_COEFFS_YCGCO = 8,
- NV_ENC_VUI_MATRIX_COEFFS_BT2020_NCL = 9,
- NV_ENC_VUI_MATRIX_COEFFS_BT2020_CL = 10,
- NV_ENC_VUI_MATRIX_COEFFS_SMPTE2085 = 11,
-}NV_ENC_VUI_MATRIX_COEFFS;
-
-/**
- * Input struct for querying Encoding capabilities.
- */
-typedef struct _NV_ENC_CAPS_PARAM
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_CAPS_PARAM_VER */
- NV_ENC_CAPS capsToQuery; /**< in: Specifies the encode capability to be queried. Client should pass a member for ::NV_ENC_CAPS enum. */
- uint32_t reserved62; /**< in: Reserved and must be set to 0 */
-} NV_ENC_CAPS_PARAM;
-
-/** NV_ENC_CAPS_PARAM struct version. */
-#define NV_ENC_CAPS_PARAM_VER NVENCAPI_STRUCT_VERSION(1)
-
-
-/**
- * Encoder Output parameters
- */
-typedef struct _NV_ENC_ENCODE_OUT_PARAMS
-{
- uint32_t version; /**< out: Struct version. */
- uint32_t bitstreamSizeInBytes; /**< out: Encoded bitstream size in bytes */
- uint32_t reserved62; /**< out: Reserved and must be set to 0 */
-} NV_ENC_ENCODE_OUT_PARAMS;
-
-/** NV_ENC_ENCODE_OUT_PARAMS struct version. */
-#define NV_ENC_ENCODE_OUT_PARAMS_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * Creation parameters for input buffer.
- */
-typedef struct _NV_ENC_CREATE_INPUT_BUFFER
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_CREATE_INPUT_BUFFER_VER */
- uint32_t width; /**< in: Input frame width */
- uint32_t height; /**< in: Input frame height */
- NV_ENC_MEMORY_HEAP memoryHeap; /**< in: Deprecated. Do not use */
- NV_ENC_BUFFER_FORMAT bufferFmt; /**< in: Input buffer format */
- uint32_t reserved; /**< in: Reserved and must be set to 0 */
- NV_ENC_INPUT_PTR inputBuffer; /**< out: Pointer to input buffer */
- void* pSysMemBuffer; /**< in: Pointer to existing system memory buffer */
- uint32_t reserved157; /**< in: Reserved and must be set to 0 */
- void* reserved263; /**< in: Reserved and must be set to NULL */
-} NV_ENC_CREATE_INPUT_BUFFER;
-
-/** NV_ENC_CREATE_INPUT_BUFFER struct version. */
-#define NV_ENC_CREATE_INPUT_BUFFER_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * Creation parameters for output bitstream buffer.
- */
-typedef struct _NV_ENC_CREATE_BITSTREAM_BUFFER
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_CREATE_BITSTREAM_BUFFER_VER */
- uint32_t size; /**< in: Deprecated. Do not use */
- NV_ENC_MEMORY_HEAP memoryHeap; /**< in: Deprecated. Do not use */
- uint32_t reserved; /**< in: Reserved and must be set to 0 */
- NV_ENC_OUTPUT_PTR bitstreamBuffer; /**< out: Pointer to the output bitstream buffer */
- void* bitstreamBufferPtr; /**< out: Reserved and should not be used */
- uint32_t reserved158; /**< in: Reserved and should be set to 0 */
- void* reserved264; /**< in: Reserved and should be set to NULL */
-} NV_ENC_CREATE_BITSTREAM_BUFFER;
-
-/** NV_ENC_CREATE_BITSTREAM_BUFFER struct version. */
-#define NV_ENC_CREATE_BITSTREAM_BUFFER_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * Structs needed for ME only mode.
- */
-typedef struct _NV_ENC_MVECTOR
-{
- int16_t mvx; /**< the x component of MV in quarter-pel units */
- int16_t mvy; /**< the y component of MV in quarter-pel units */
-} NV_ENC_MVECTOR;
-
-/**
- * Motion vector structure per macroblock for H264 motion estimation.
- */
-typedef struct _NV_ENC_H264_MV_DATA
-{
- NV_ENC_MVECTOR mv4; /**< up to 4 vectors for 8x8 partition */
- uint8_t mbType; /**< 0 (I), 1 (P), 2 (IPCM), 3 (B) */
- uint8_t partitionType; /**< Specifies the block partition type. 0:16x16, 1:8x8, 2:16x8, 3:8x16 */
- uint16_t reserved; /**< reserved padding for alignment */
- uint32_t mbCost;
-} NV_ENC_H264_MV_DATA;
-
-/**
- * Motion vector structure per CU for HEVC motion estimation.
- */
-typedef struct _NV_ENC_HEVC_MV_DATA
-{
- NV_ENC_MVECTOR mv4; /**< up to 4 vectors within a CU */
- uint8_t cuType; /**< 0 (I), 1(P) */
- uint8_t cuSize; /**< 0: 8x8, 1: 16x16, 2: 32x32, 3: 64x64 */
- uint8_t partitionMode; /**< The CU partition mode
- 0 (2Nx2N), 1 (2NxN), 2(Nx2N), 3 (NxN),
- 4 (2NxnU), 5 (2NxnD), 6(nLx2N), 7 (nRx2N) */
- uint8_t lastCUInCTB; /**< Marker to separate CUs in the current CTB from CUs in the next CTB */
-} NV_ENC_HEVC_MV_DATA;
-
-/**
- * Creation parameters for output motion vector buffer for ME only mode.
- */
-typedef struct _NV_ENC_CREATE_MV_BUFFER
-{
- uint32_t version; /**< in: Struct version. Must be set to NV_ENC_CREATE_MV_BUFFER_VER */
- NV_ENC_OUTPUT_PTR mvBuffer; /**< out: Pointer to the output motion vector buffer */
- uint32_t reserved1255; /**< in: Reserved and should be set to 0 */
- void* reserved263; /**< in: Reserved and should be set to NULL */
-} NV_ENC_CREATE_MV_BUFFER;
-
-/** NV_ENC_CREATE_MV_BUFFER struct version*/
-#define NV_ENC_CREATE_MV_BUFFER_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * QP value for frames
- */
-typedef struct _NV_ENC_QP
-{
- uint32_t qpInterP; /**< in: Specifies QP value for P-frame. Even though this field is uint32_t for legacy reasons, the client should treat this as a signed parameter(int32_t) for cases in which negative QP values are to be specified. */
- uint32_t qpInterB; /**< in: Specifies QP value for B-frame. Even though this field is uint32_t for legacy reasons, the client should treat this as a signed parameter(int32_t) for cases in which negative QP values are to be specified. */
- uint32_t qpIntra; /**< in: Specifies QP value for Intra Frame. Even though this field is uint32_t for legacy reasons, the client should treat this as a signed parameter(int32_t) for cases in which negative QP values are to be specified. */
-} NV_ENC_QP;
-
-/**
- * Rate Control Configuration Parameters
- */
- typedef struct _NV_ENC_RC_PARAMS
- {
- uint32_t version;
- NV_ENC_PARAMS_RC_MODE rateControlMode; /**< in: Specifies the rate control mode. Check support for various rate control modes using ::NV_ENC_CAPS_SUPPORTED_RATECONTROL_MODES caps. */
- NV_ENC_QP constQP; /**< in: Specifies the initial QP to be used for encoding, these values would be used for all frames if in Constant QP mode. */
- uint32_t averageBitRate; /**< in: Specifies the average bitrate(in bits/sec) used for encoding. */
- uint32_t maxBitRate; /**< in: Specifies the maximum bitrate for the encoded output. This is used for VBR and ignored for CBR mode. */
- uint32_t vbvBufferSize; /**< in: Specifies the VBV(HRD) buffer size. in bits. Set 0 to use the default VBV buffer size. */
- uint32_t vbvInitialDelay; /**< in: Specifies the VBV(HRD) initial delay in bits. Set 0 to use the default VBV initial delay .*/
- uint32_t enableMinQP :1; /**< in: Set this to 1 if minimum QP used for rate control. */
- uint32_t enableMaxQP :1; /**< in: Set this to 1 if maximum QP used for rate control. */
- uint32_t enableInitialRCQP :1; /**< in: Set this to 1 if user supplied initial QP is used for rate control. */
- uint32_t enableAQ :1; /**< in: Set this to 1 to enable adaptive quantization (Spatial). */
- uint32_t reservedBitField1 :1; /**< in: Reserved bitfields and must be set to 0. */
- uint32_t enableLookahead :1; /**< in: Set this to 1 to enable lookahead with depth <lookaheadDepth> (if lookahead is enabled, input frames must remain available to the encoder until encode completion) */
- uint32_t disableIadapt :1; /**< in: Set this to 1 to disable adaptive I-frame insertion at scene cuts (only has an effect when lookahead is enabled) */
- uint32_t disableBadapt :1; /**< in: Set this to 1 to disable adaptive B-frame decision (only has an effect when lookahead is enabled) */
- uint32_t enableTemporalAQ :1; /**< in: Set this to 1 to enable temporal AQ */
- uint32_t zeroReorderDelay :1; /**< in: Set this to 1 to indicate zero latency operation (no reordering delay, num_reorder_frames=0) */
- uint32_t enableNonRefP :1; /**< in: Set this to 1 to enable automatic insertion of non-reference P-frames (no effect if enablePTD=0) */
- uint32_t strictGOPTarget :1; /**< in: Set this to 1 to minimize GOP-to-GOP rate fluctuations */
- uint32_t aqStrength :4; /**< in: When AQ (Spatial) is enabled (i.e. NV_ENC_RC_PARAMS::enableAQ is set), this field is used to specify AQ strength. AQ strength scale is from 1 (low) - 15 (aggressive).
- If not set, strength is auto selected by driver. */
- uint32_t reservedBitFields :16; /**< in: Reserved bitfields and must be set to 0 */
- NV_ENC_QP minQP; /**< in: Specifies the minimum QP used for rate control. Client must set NV_ENC_CONFIG::enableMinQP to 1. */
- NV_ENC_QP maxQP; /**< in: Specifies the maximum QP used for rate control. Client must set NV_ENC_CONFIG::enableMaxQP to 1. */
- NV_ENC_QP initialRCQP; /**< in: Specifies the initial QP used for rate control. Client must set NV_ENC_CONFIG::enableInitialRCQP to 1. */
- uint32_t temporallayerIdxMask; /**< in: Specifies the temporal layers (as a bitmask) whose QPs have changed. Valid max bitmask is 2^NV_ENC_CAPS_NUM_MAX_TEMPORAL_LAYERS - 1.
- Applicable only for constant QP mode (NV_ENC_RC_PARAMS::rateControlMode = NV_ENC_PARAMS_RC_CONSTQP). */
- uint8_t temporalLayerQP8; /**< in: Specifies the temporal layer QPs used for rate control. Temporal layer index is used as the array index.
- Applicable only for constant QP mode (NV_ENC_RC_PARAMS::rateControlMode = NV_ENC_PARAMS_RC_CONSTQP). */
- uint8_t targetQuality; /**< in: Target CQ (Constant Quality) level for VBR mode (range 0-51 with 0-automatic) */
- uint8_t targetQualityLSB; /**< in: Fractional part of target quality (as 8.8 fixed point format) */
- uint16_t lookaheadDepth; /**< in: Maximum depth of lookahead with range 0-(31 - number of B frames).
- lookaheadDepth is only used if enableLookahead=1.*/
- uint8_t lowDelayKeyFrameScale; /**< in: Specifies the ratio of I frame bits to P frame bits in case of single frame VBV and CBR rate control mode,
- is set to 2 by default for low latency tuning info and 1 by default for ultra low latency tuning info */
- int8_t yDcQPIndexOffset; /**< in: Specifies the value of 'deltaQ_y_dc' in AV1.*/
- int8_t uDcQPIndexOffset; /**< in: Specifies the value of 'deltaQ_u_dc' in AV1.*/
- int8_t vDcQPIndexOffset; /**< in: Specifies the value of 'deltaQ_v_dc' in AV1 (for future use only - deltaQ_v_dc is currently always internally set to same value as deltaQ_u_dc). */
- NV_ENC_QP_MAP_MODE qpMapMode; /**< in: This flag is used to interpret values in array specified by NV_ENC_PIC_PARAMS::qpDeltaMap.
- Set this to NV_ENC_QP_MAP_EMPHASIS to treat values specified by NV_ENC_PIC_PARAMS::qpDeltaMap as Emphasis Level Map.
- Emphasis Level can be assigned any value specified in enum NV_ENC_EMPHASIS_MAP_LEVEL.
- Emphasis Level Map is used to specify regions to be encoded at varying levels of quality.
- The hardware encoder adjusts the quantization within the image as per the provided emphasis map,
- by adjusting the quantization parameter (QP) assigned to each macroblock. This adjustment is commonly called “Delta QP”.
- The adjustment depends on the absolute QP decided by the rate control algorithm, and is applied after the rate control has decided each macroblock’s QP.
- Since the Delta QP overrides rate control, enabling Emphasis Level Map may violate bitrate and VBV buffer size constraints.
- Emphasis Level Map is useful in situations where client has a priori knowledge of the image complexity (e.g. via use of NVFBC's Classification feature) and encoding those high-complexity areas at higher quality (lower QP) is important, even at the possible cost of violating bitrate/VBV buffer size constraints
- This feature is not supported when AQ( Spatial/Temporal) is enabled.
- This feature is only supported for H264 codec currently.
-
- Set this to NV_ENC_QP_MAP_DELTA to treat values specified by NV_ENC_PIC_PARAMS::qpDeltaMap as QP Delta. This specifies QP modifier to be applied on top of the QP chosen by rate control
-
- Set this to NV_ENC_QP_MAP_DISABLED to ignore NV_ENC_PIC_PARAMS::qpDeltaMap values. In this case, qpDeltaMap should be set to NULL.
-
- Other values are reserved for future use.*/
- NV_ENC_MULTI_PASS multiPass; /**< in: This flag is used to enable multi-pass encoding for a given ::NV_ENC_PARAMS_RC_MODE. This flag is not valid for H264 and HEVC MEOnly mode */
- uint32_t alphaLayerBitrateRatio; /**< in: Specifies the ratio in which bitrate should be split between base and alpha layer. A value 'x' for this field will split the target bitrate in a ratio of x : 1 between base and alpha layer.
- The default split ratio is 15.*/
- int8_t cbQPIndexOffset; /**< in: Specifies the value of 'chroma_qp_index_offset' in H264 / 'pps_cb_qp_offset' in HEVC / 'deltaQ_u_ac' in AV1.*/
- int8_t crQPIndexOffset; /**< in: Specifies the value of 'second_chroma_qp_index_offset' in H264 / 'pps_cr_qp_offset' in HEVC / 'deltaQ_v_ac' in AV1 (for future use only - deltaQ_v_ac is currently always internally set to same value as deltaQ_u_ac). */
- uint16_t reserved2;
- uint32_t reserved4;
- } NV_ENC_RC_PARAMS;
-
-/** macro for constructing the version field of ::_NV_ENC_RC_PARAMS */
-#define NV_ENC_RC_PARAMS_VER NVENCAPI_STRUCT_VERSION(1)
-
-#define MAX_NUM_CLOCK_TS 3
-
-/**
-* Clock Timestamp set parameters
-* For H264, this structure is used to populate Picture Timing SEI when NV_ENC_CONFIG_H264::enableTimeCode is set to 1.
-* For HEVC, this structure is used to populate Time Code SEI when NV_ENC_CONFIG_HEVC::enableTimeCodeSEI is set to 1.
-* For more details, refer to Annex D of ITU-T Specification. 
-*/
-
-typedef struct _NV_ENC_CLOCK_TIMESTAMP_SET
-{
- uint32_t countingType : 1; /**< in Specifies the 'counting_type' */
- uint32_t discontinuityFlag : 1; /**< in Specifies the 'discontinuity_flag' */
- uint32_t cntDroppedFrames : 1; /**< in Specifies the 'cnt_dropped_flag' */
- uint32_t nFrames : 8; /**< in Specifies the value of 'n_frames' */
- uint32_t secondsValue : 6; /**< in Specifies the 'seconds_value' */
- uint32_t minutesValue : 6; /**< in Specifies the 'minutes_value' */
- uint32_t hoursValue : 5; /**< in Specifies the 'hours_value' */
- uint32_t reserved2 : 4; /**< in Reserved and must be set to 0 */
- uint32_t timeOffset; /**< in Specifies the 'time_offset_value' */
-} NV_ENC_CLOCK_TIMESTAMP_SET;
-
-typedef struct _NV_ENC_TIME_CODE
-{
- NV_ENC_DISPLAY_PIC_STRUCT displayPicStruct; /**< in Display picStruct */
- NV_ENC_CLOCK_TIMESTAMP_SET clockTimestampMAX_NUM_CLOCK_TS; /**< in Clock Timestamp set */
-} NV_ENC_TIME_CODE;
-
-
-/**
- * \struct _NV_ENC_CONFIG_H264_VUI_PARAMETERS
- * H264 Video Usability Info parameters
- */
-typedef struct _NV_ENC_CONFIG_H264_VUI_PARAMETERS
-{
- uint32_t overscanInfoPresentFlag; /**< in: If set to 1 , it specifies that the overscanInfo is present */
- uint32_t overscanInfo; /**< in: Specifies the overscan info(as defined in Annex E of the ITU-T Specification). */
- uint32_t videoSignalTypePresentFlag; /**< in: If set to 1, it specifies that the videoFormat, videoFullRangeFlag and colourDescriptionPresentFlag are present. */
- NV_ENC_VUI_VIDEO_FORMAT videoFormat; /**< in: Specifies the source video format(as defined in Annex E of the ITU-T Specification).*/
- uint32_t videoFullRangeFlag; /**< in: Specifies the output range of the luma and chroma samples(as defined in Annex E of the ITU-T Specification). */
- uint32_t colourDescriptionPresentFlag; /**< in: If set to 1, it specifies that the colourPrimaries, transferCharacteristics and colourMatrix are present. */
- NV_ENC_VUI_COLOR_PRIMARIES colourPrimaries; /**< in: Specifies color primaries for converting to RGB(as defined in Annex E of the ITU-T Specification) */
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC transferCharacteristics; /**< in: Specifies the opto-electronic transfer characteristics to use (as defined in Annex E of the ITU-T Specification) */
- NV_ENC_VUI_MATRIX_COEFFS colourMatrix; /**< in: Specifies the matrix coefficients used in deriving the luma and chroma from the RGB primaries (as defined in Annex E of the ITU-T Specification). */
- uint32_t chromaSampleLocationFlag; /**< in: If set to 1 , it specifies that the chromaSampleLocationTop and chromaSampleLocationBot are present.*/
- uint32_t chromaSampleLocationTop; /**< in: Specifies the chroma sample location for top field(as defined in Annex E of the ITU-T Specification) */
- uint32_t chromaSampleLocationBot; /**< in: Specifies the chroma sample location for bottom field(as defined in Annex E of the ITU-T Specification) */
- uint32_t bitstreamRestrictionFlag; /**< in: If set to 1, it specifies the bitstream restriction parameters are present in the bitstream.*/
- uint32_t timingInfoPresentFlag; /**< in: If set to 1, it specifies that the timingInfo is present and the 'numUnitInTicks' and 'timeScale' fields are specified by the application. */
- /**< in: If not set, the timingInfo may still be present with timing related fields calculated internally basedon the frame rate specified by the application. */
- uint32_t numUnitInTicks; /**< in: Specifies the number of time units of the clock(as defined in Annex E of the ITU-T Specification). */
- uint32_t timeScale; /**< in: Specifies the frquency of the clock(as defined in Annex E of the ITU-T Specification). */ 
- uint32_t reserved12; /**< in: Reserved and must be set to 0 */
-}NV_ENC_CONFIG_H264_VUI_PARAMETERS;
-
-typedef NV_ENC_CONFIG_H264_VUI_PARAMETERS NV_ENC_CONFIG_HEVC_VUI_PARAMETERS;
-
-/**
- * \struct _NVENC_EXTERNAL_ME_HINT_COUNTS_PER_BLOCKTYPE
- * External motion vector hint counts per block type.
- * H264 and AV1 support multiple hint while HEVC supports one hint for each valid candidate.
- */
-typedef struct _NVENC_EXTERNAL_ME_HINT_COUNTS_PER_BLOCKTYPE
-{
- uint32_t numCandsPerBlk16x16 : 4; /**< in: Supported for H264, HEVC. It Specifies the number of candidates per 16x16 block. */
- uint32_t numCandsPerBlk16x8 : 4; /**< in: Supported for H264 only. Specifies the number of candidates per 16x8 block. */
- uint32_t numCandsPerBlk8x16 : 4; /**< in: Supported for H264 only. Specifies the number of candidates per 8x16 block. */
- uint32_t numCandsPerBlk8x8 : 4; /**< in: Supported for H264, HEVC. Specifies the number of candidates per 8x8 block. */
- uint32_t numCandsPerSb : 8; /**< in: Supported for AV1 only. Specifies the number of candidates per SB. */
- uint32_t reserved : 8; /**< in: Reserved for padding. */
- uint32_t reserved13; /**< in: Reserved for future use. */
-} NVENC_EXTERNAL_ME_HINT_COUNTS_PER_BLOCKTYPE;
-
-
-/**
- * \struct _NVENC_EXTERNAL_ME_HINT
- * External Motion Vector hint structure for H264 and HEVC.
- */
-typedef struct _NVENC_EXTERNAL_ME_HINT
-{
- int32_t mvx : 12; /**< in: Specifies the x component of integer pixel MV (relative to current MB) S12.0. */
- int32_t mvy : 10; /**< in: Specifies the y component of integer pixel MV (relative to current MB) S10.0 .*/
- int32_t refidx : 5; /**< in: Specifies the reference index (31=invalid). Current we support only 1 reference frame per direction for external hints, so \p refidx must be 0. */
- int32_t dir : 1; /**< in: Specifies the direction of motion estimation . 0=L0 1=L1.*/
- int32_t partType : 2; /**< in: Specifies the block partition type.0=16x16 1=16x8 2=8x16 3=8x8 (blocks in partition must be consecutive).*/
- int32_t lastofPart : 1; /**< in: Set to 1 for the last MV of (sub) partition */
- int32_t lastOfMB : 1; /**< in: Set to 1 for the last MV of macroblock. */
-} NVENC_EXTERNAL_ME_HINT;
-
-/**
- * \struct _NVENC_EXTERNAL_ME_SB_HINT
- * External Motion Vector SB hint structure for AV1
- */
-typedef struct _NVENC_EXTERNAL_ME_SB_HINT
-{
- int16_t refidx : 5; /**< in: Specifies the reference index (31=invalid) */
- int16_t direction : 1; /**< in: Specifies the direction of motion estimation . 0=L0 1=L1.*/
- int16_t bi : 1; /**< in: Specifies reference mode 0=single mv, 1=compound mv */
- int16_t partition_type : 3; /**< in: Specifies the partition type: 0: 2NX2N, 1:2NxN, 2:Nx2N. reserved 3bits for future modes */
- int16_t x8 : 3; /**< in: Specifies the current partition's top left x position in 8 pixel unit */
- int16_t last_of_cu : 1; /**< in: Set to 1 for the last MV current CU */
- int16_t last_of_sb : 1; /**< in: Set to 1 for the last MV of current SB */
- int16_t reserved0 : 1; /**< in: Reserved and must be set to 0 */
- int16_t mvx : 14; /**< in: Specifies the x component of integer pixel MV (relative to current MB) S12.2. */
- int16_t cu_size : 2; /**< in: Specifies the CU size: 0: 8x8, 1: 16x16, 2:32x32, 3:64x64 */
- int16_t mvy : 12; /**< in: Specifies the y component of integer pixel MV (relative to current MB) S10.2 .*/
- int16_t y8 : 3; /**< in: Specifies the current partition's top left y position in 8 pixel unit */
- int16_t reserved1 : 1; /**< in: Reserved and must be set to 0 */
-} NVENC_EXTERNAL_ME_SB_HINT;
-
-/**
- * \struct _NV_ENC_CONFIG_H264
- * H264 encoder configuration parameters
- */
-typedef struct _NV_ENC_CONFIG_H264
-{
- uint32_t enableTemporalSVC :1; /**< in: Set to 1 to enable SVC temporal*/
- uint32_t enableStereoMVC :1; /**< in: Set to 1 to enable stereo MVC*/
- uint32_t hierarchicalPFrames :1; /**< in: Set to 1 to enable hierarchical P Frames */
- uint32_t hierarchicalBFrames :1; /**< in: Set to 1 to enable hierarchical B Frames */
- uint32_t outputBufferingPeriodSEI :1; /**< in: Set to 1 to write SEI buffering period syntax in the bitstream */
- uint32_t outputPictureTimingSEI :1; /**< in: Set to 1 to write SEI picture timing syntax in the bitstream. */
- uint32_t outputAUD :1; /**< in: Set to 1 to write access unit delimiter syntax in bitstream */
- uint32_t disableSPSPPS :1; /**< in: Set to 1 to disable writing of Sequence and Picture parameter info in bitstream */
- uint32_t outputFramePackingSEI :1; /**< in: Set to 1 to enable writing of frame packing arrangement SEI messages to bitstream */
- uint32_t outputRecoveryPointSEI :1; /**< in: Set to 1 to enable writing of recovery point SEI message */
- uint32_t enableIntraRefresh :1; /**< in: Set to 1 to enable gradual decoder refresh or intra refresh. If the GOP structure uses B frames this will be ignored */
- uint32_t enableConstrainedEncoding :1; /**< in: Set this to 1 to enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices.
- Constrained encoding works only with rectangular slices.
- Check support for constrained encoding using ::NV_ENC_CAPS_SUPPORT_CONSTRAINED_ENCODING caps. */
- uint32_t repeatSPSPPS :1; /**< in: Set to 1 to enable writing of Sequence and Picture parameter for every IDR frame */
- uint32_t enableVFR :1; /**< in: Setting enableVFR=1 currently only sets the fixed_frame_rate_flag=0 in the VUI but otherwise
- has no impact on the encoder behavior. For more details please refer to E.1 VUI syntax of H.264 standard. Note, however, that NVENC does not support VFR encoding and rate control. */
- uint32_t enableLTR :1; /**< in: Set to 1 to enable LTR (Long Term Reference) frame support. LTR can be used in two modes: "LTR Trust" mode and "LTR Per Picture" mode.
- LTR Trust mode: In this mode, ltrNumFrames pictures after IDR are automatically marked as LTR. This mode is enabled by setting ltrTrustMode = 1.
- Use of LTR Trust mode is strongly discouraged as this mode may be deprecated in future.
- LTR Per Picture mode: In this mode, client can control whether the current picture should be marked as LTR. Enable this mode by setting
- ltrTrustMode = 0 and ltrMarkFrame = 1 for the picture to be marked as LTR. This is the preferred mode
- for using LTR.
- Note that LTRs are not supported if encoding session is configured with B-frames */
- uint32_t qpPrimeYZeroTransformBypassFlag :1; /**< in: To enable lossless encode set this to 1, set QP to 0 and RC_mode to NV_ENC_PARAMS_RC_CONSTQP and profile to HIGH_444_PREDICTIVE_PROFILE.
- Check support for lossless encoding using ::NV_ENC_CAPS_SUPPORT_LOSSLESS_ENCODE caps. */
- uint32_t useConstrainedIntraPred :1; /**< in: Set 1 to enable constrained intra prediction. */
- uint32_t enableFillerDataInsertion :1; /**< in: Set to 1 to enable insertion of filler data in the bitstream.
- This flag will take effect only when one of the CBR rate
- control modes (NV_ENC_PARAMS_RC_CBR, NV_ENC_PARAMS_RC_CBR_HQ,
- NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) is in use and both
- NV_ENC_INITIALIZE_PARAMS::frameRateNum and
- NV_ENC_INITIALIZE_PARAMS::frameRateDen are set to non-zero
- values. Setting this field when
- NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is also set
- is currently not supported and will make ::NvEncInitializeEncoder()
- return an error. */
- uint32_t disableSVCPrefixNalu :1; /**< in: Set to 1 to disable writing of SVC Prefix NALU preceding each slice in bitstream.
- Applicable only when temporal SVC is enabled (NV_ENC_CONFIG_H264::enableTemporalSVC = 1). */
- uint32_t enableScalabilityInfoSEI :1; /**< in: Set to 1 to enable writing of Scalability Information SEI message preceding each IDR picture in bitstream
- Applicable only when temporal SVC is enabled (NV_ENC_CONFIG_H264::enableTemporalSVC = 1). */
- uint32_t singleSliceIntraRefresh :1; /**< in: Set to 1 to maintain single slice in frames during intra refresh.
- Check support for single slice intra refresh using ::NV_ENC_CAPS_SINGLE_SLICE_INTRA_REFRESH caps.
- This flag will be ignored if the value returned for ::NV_ENC_CAPS_SINGLE_SLICE_INTRA_REFRESH caps is false. */
- uint32_t enableTimeCode :1; /**< in: Set to 1 to enable writing of clock timestamp sets in picture timing SEI. Note that this flag will be ignored for D3D12 interface. */
- uint32_t reservedBitFields :10; /**< in: Reserved bitfields and must be set to 0 */
- uint32_t level; /**< in: Specifies the encoding level. Client is recommended to set this to NV_ENC_LEVEL_AUTOSELECT in order to enable the NvEncodeAPI interface to select the correct level. */
- uint32_t idrPeriod; /**< in: Specifies the IDR interval. If not set, this is made equal to gopLength in NV_ENC_CONFIG.Low latency application client can set IDR interval to NVENC_INFINITE_GOPLENGTH so that IDR frames are not inserted automatically. */
- uint32_t separateColourPlaneFlag; /**< in: Set to 1 to enable 4:4:4 separate colour planes */
- uint32_t disableDeblockingFilterIDC; /**< in: Specifies the deblocking filter mode. Permissible value range: 0,2. This flag corresponds
- to the flag disable_deblocking_filter_idc specified in section 7.4.3 of H.264 specification,
- which specifies whether the operation of the deblocking filter shall be disabled across some
- block edges of the slice and specifies for which edges the filtering is disabled. See section
- 7.4.3 of H.264 specification for more details.*/
- uint32_t numTemporalLayers; /**< in: Specifies number of temporal layers to be used for hierarchical coding / temporal SVC. Valid value range is 1,::NV_ENC_CAPS_NUM_MAX_TEMPORAL_LAYERS */
- uint32_t spsId; /**< in: Specifies the SPS id of the sequence header */
- uint32_t ppsId; /**< in: Specifies the PPS id of the picture header */
- NV_ENC_H264_ADAPTIVE_TRANSFORM_MODE adaptiveTransformMode; /**< in: Specifies the AdaptiveTransform Mode. Check support for AdaptiveTransform mode using ::NV_ENC_CAPS_SUPPORT_ADAPTIVE_TRANSFORM caps. */
- NV_ENC_H264_FMO_MODE fmoMode; /**< in: Specified the FMO Mode. Check support for FMO using ::NV_ENC_CAPS_SUPPORT_FMO caps. */
- NV_ENC_H264_BDIRECT_MODE bdirectMode; /**< in: Specifies the BDirect mode. Check support for BDirect mode using ::NV_ENC_CAPS_SUPPORT_BDIRECT_MODE caps.*/
- NV_ENC_H264_ENTROPY_CODING_MODE entropyCodingMode; /**< in: Specifies the entropy coding mode. Check support for CABAC mode using ::NV_ENC_CAPS_SUPPORT_CABAC caps. */
- NV_ENC_STEREO_PACKING_MODE stereoMode; /**< in: Specifies the stereo frame packing mode which is to be signaled in frame packing arrangement SEI */
- uint32_t intraRefreshPeriod; /**< in: Specifies the interval between successive intra refresh if enableIntrarefresh is set. Requires enableIntraRefresh to be set.
- Will be disabled if NV_ENC_CONFIG::gopLength is not set to NVENC_INFINITE_GOPLENGTH. */
- uint32_t intraRefreshCnt; /**< in: Specifies the length of intra refresh in number of frames for periodic intra refresh. This value should be smaller than intraRefreshPeriod */
- uint32_t maxNumRefFrames; /**< in: Specifies the DPB size used for encoding. Setting it to 0 will let driver use the default DPB size.
- The low latency application which wants to invalidate reference frame as an error resilience tool
- is recommended to use a large DPB size so that the encoder can keep old reference frames which can be used if recent
- frames are invalidated. */
- uint32_t sliceMode; /**< in: This parameter in conjunction with sliceModeData specifies the way in which the picture is divided into slices
- sliceMode = 0 MB based slices, sliceMode = 1 Byte based slices, sliceMode = 2 MB row based slices, sliceMode = 3 numSlices in Picture.
- When forceIntraRefreshWithFrameCnt is set it will have priority over sliceMode setting
- When sliceMode == 0 and sliceModeData == 0 whole picture will be coded with one slice */
- uint32_t sliceModeData; /**< in: Specifies the parameter needed for sliceMode. For:
- sliceMode = 0, sliceModeData specifies # of MBs in each slice (except last slice)
- sliceMode = 1, sliceModeData specifies maximum # of bytes in each slice (except last slice)
- sliceMode = 2, sliceModeData specifies # of MB rows in each slice (except last slice)
- sliceMode = 3, sliceModeData specifies number of slices in the picture. Driver will divide picture into slices optimally */
- NV_ENC_CONFIG_H264_VUI_PARAMETERS h264VUIParameters; /**< in: Specifies the H264 video usability info parameters */
- uint32_t ltrNumFrames; /**< in: Specifies the number of LTR frames. This parameter has different meaning in two LTR modes.
- In "LTR Trust" mode (ltrTrustMode = 1), encoder will mark the first ltrNumFrames base layer reference frames within each IDR interval as LTR.
- In "LTR Per Picture" mode (ltrTrustMode = 0 and ltrMarkFrame = 1), ltrNumFrames specifies maximum number of LTR frames in DPB. */
- uint32_t ltrTrustMode; /**< in: Specifies the LTR operating mode. See comments near NV_ENC_CONFIG_H264::enableLTR for description of the two modes.
- Set to 1 to use "LTR Trust" mode of LTR operation. Clients are discouraged to use "LTR Trust" mode as this mode may
- be deprecated in future releases.
- Set to 0 when using "LTR Per Picture" mode of LTR operation. */
- uint32_t chromaFormatIDC; /**< in: Specifies the chroma format. Should be set to 1 for yuv420 input, 3 for yuv444 input.
- Check support for YUV444 encoding using ::NV_ENC_CAPS_SUPPORT_YUV444_ENCODE caps.*/
- uint32_t maxTemporalLayers; /**< in: Specifies the max temporal layer used for temporal SVC / hierarchical coding.
- Defaut value of this field is NV_ENC_CAPS::NV_ENC_CAPS_NUM_MAX_TEMPORAL_LAYERS. Note that the value NV_ENC_CONFIG_H264::maxNumRefFrames should
- be greater than or equal to (NV_ENC_CONFIG_H264::maxTemporalLayers - 2) * 2, for NV_ENC_CONFIG_H264::maxTemporalLayers >= 2.*/
- NV_ENC_BFRAME_REF_MODE useBFramesAsRef; /**< in: Specifies the B-Frame as reference mode. Check support for useBFramesAsRef mode using ::NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE caps.*/
- NV_ENC_NUM_REF_FRAMES numRefL0; /**< in: Specifies max number of reference frames in reference picture list L0, that can be used by hardware for prediction of a frame.
- Check support for numRefL0 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
- NV_ENC_NUM_REF_FRAMES numRefL1; /**< in: Specifies max number of reference frames in reference picture list L1, that can be used by hardware for prediction of a frame.
- Check support for numRefL1 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
-
- uint32_t reserved1267; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_CONFIG_H264;
-
-/**
- * \struct _NV_ENC_CONFIG_HEVC
- * HEVC encoder configuration parameters to be set during initialization.
- */
-typedef struct _NV_ENC_CONFIG_HEVC
-{
- uint32_t level; /**< in: Specifies the level of the encoded bitstream.*/
- uint32_t tier; /**< in: Specifies the level tier of the encoded bitstream.*/
- NV_ENC_HEVC_CUSIZE minCUSize; /**< in: Specifies the minimum size of luma coding unit.*/
- NV_ENC_HEVC_CUSIZE maxCUSize; /**< in: Specifies the maximum size of luma coding unit. Currently NVENC SDK only supports maxCUSize equal to NV_ENC_HEVC_CUSIZE_32x32.*/
- uint32_t useConstrainedIntraPred :1; /**< in: Set 1 to enable constrained intra prediction. */
- uint32_t disableDeblockAcrossSliceBoundary :1; /**< in: Set 1 to disable in loop filtering across slice boundary.*/
- uint32_t outputBufferingPeriodSEI :1; /**< in: Set 1 to write SEI buffering period syntax in the bitstream */
- uint32_t outputPictureTimingSEI :1; /**< in: Set 1 to write SEI picture timing syntax in the bitstream */
- uint32_t outputAUD :1; /**< in: Set 1 to write Access Unit Delimiter syntax. */
- uint32_t enableLTR :1; /**< in: Set to 1 to enable LTR (Long Term Reference) frame support. LTR can be used in two modes: "LTR Trust" mode and "LTR Per Picture" mode.
- LTR Trust mode: In this mode, ltrNumFrames pictures after IDR are automatically marked as LTR. This mode is enabled by setting ltrTrustMode = 1.
- Use of LTR Trust mode is strongly discouraged as this mode may be deprecated in future releases.
- LTR Per Picture mode: In this mode, client can control whether the current picture should be marked as LTR. Enable this mode by setting
- ltrTrustMode = 0 and ltrMarkFrame = 1 for the picture to be marked as LTR. This is the preferred mode
- for using LTR.
- Note that LTRs are not supported if encoding session is configured with B-frames */
- uint32_t disableSPSPPS :1; /**< in: Set 1 to disable VPS, SPS and PPS signaling in the bitstream. */
- uint32_t repeatSPSPPS :1; /**< in: Set 1 to output VPS,SPS and PPS for every IDR frame.*/
- uint32_t enableIntraRefresh :1; /**< in: Set 1 to enable gradual decoder refresh or intra refresh. If the GOP structure uses B frames this will be ignored */
- uint32_t chromaFormatIDC :2; /**< in: Specifies the chroma format. Should be set to 1 for yuv420 input, 3 for yuv444 input.*/
- uint32_t pixelBitDepthMinus8 :3; /**< in: Specifies pixel bit depth minus 8. Should be set to 0 for 8 bit input, 2 for 10 bit input.*/
- uint32_t enableFillerDataInsertion :1; /**< in: Set to 1 to enable insertion of filler data in the bitstream.
- This flag will take effect only when one of the CBR rate
- control modes (NV_ENC_PARAMS_RC_CBR, NV_ENC_PARAMS_RC_CBR_HQ,
- NV_ENC_PARAMS_RC_CBR_LOWDELAY_HQ) is in use and both
- NV_ENC_INITIALIZE_PARAMS::frameRateNum and
- NV_ENC_INITIALIZE_PARAMS::frameRateDen are set to non-zero
- values. Setting this field when
- NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is also set
- is currently not supported and will make ::NvEncInitializeEncoder()
- return an error. */
- uint32_t enableConstrainedEncoding :1; /**< in: Set this to 1 to enable constrainedFrame encoding where each slice in the constrained picture is independent of other slices.
- Constrained encoding works only with rectangular slices.
- Check support for constrained encoding using ::NV_ENC_CAPS_SUPPORT_CONSTRAINED_ENCODING caps. */
- uint32_t enableAlphaLayerEncoding :1; /**< in: Set this to 1 to enable HEVC encode with alpha layer. */
- uint32_t singleSliceIntraRefresh :1; /**< in: Set this to 1 to maintain single slice frames during intra refresh.
- Check support for single slice intra refresh using ::NV_ENC_CAPS_SINGLE_SLICE_INTRA_REFRESH caps.
- This flag will be ignored if the value returned for ::NV_ENC_CAPS_SINGLE_SLICE_INTRA_REFRESH caps is false. */
- uint32_t outputRecoveryPointSEI :1; /**< in: Set to 1 to enable writing of recovery point SEI message */
- uint32_t outputTimeCodeSEI :1; /**< in: Set 1 to write SEI time code syntax in the bitstream. Note that this flag will be ignored for D3D12 interface.*/
- uint32_t reserved :12; /**< in: Reserved bitfields.*/
- uint32_t idrPeriod; /**< in: Specifies the IDR interval. If not set, this is made equal to gopLength in NV_ENC_CONFIG. Low latency application client can set IDR interval to NVENC_INFINITE_GOPLENGTH so that IDR frames are not inserted automatically. */
- uint32_t intraRefreshPeriod; /**< in: Specifies the interval between successive intra refresh if enableIntrarefresh is set. Requires enableIntraRefresh to be set.
- Will be disabled if NV_ENC_CONFIG::gopLength is not set to NVENC_INFINITE_GOPLENGTH. */
- uint32_t intraRefreshCnt; /**< in: Specifies the length of intra refresh in number of frames for periodic intra refresh. This value should be smaller than intraRefreshPeriod */
- uint32_t maxNumRefFramesInDPB; /**< in: Specifies the maximum number of references frames in the DPB.*/
- uint32_t ltrNumFrames; /**< in: This parameter has different meaning in two LTR modes.
- In "LTR Trust" mode (ltrTrustMode = 1), encoder will mark the first ltrNumFrames base layer reference frames within each IDR interval as LTR.
- In "LTR Per Picture" mode (ltrTrustMode = 0 and ltrMarkFrame = 1), ltrNumFrames specifies maximum number of LTR frames in DPB.
- These ltrNumFrames acts as a guidance to the encoder and are not necessarily honored. To achieve a right balance between the encoding
- quality and keeping LTR frames in the DPB queue, the encoder can internally limit the number of LTR frames.
- The number of LTR frames actually used depends upon the encoding preset being used; Faster encoding presets will use fewer LTR frames.*/
- uint32_t vpsId; /**< in: Specifies the VPS id of the video parameter set */
- uint32_t spsId; /**< in: Specifies the SPS id of the sequence header */
- uint32_t ppsId; /**< in: Specifies the PPS id of the picture header */
- uint32_t sliceMode; /**< in: This parameter in conjunction with sliceModeData specifies the way in which the picture is divided into slices
- sliceMode = 0 CTU based slices, sliceMode = 1 Byte based slices, sliceMode = 2 CTU row based slices, sliceMode = 3, numSlices in Picture
- When sliceMode == 0 and sliceModeData == 0 whole picture will be coded with one slice */
- uint32_t sliceModeData; /**< in: Specifies the parameter needed for sliceMode. For:
- sliceMode = 0, sliceModeData specifies # of CTUs in each slice (except last slice)
- sliceMode = 1, sliceModeData specifies maximum # of bytes in each slice (except last slice)
- sliceMode = 2, sliceModeData specifies # of CTU rows in each slice (except last slice)
- sliceMode = 3, sliceModeData specifies number of slices in the picture. Driver will divide picture into slices optimally */
- uint32_t maxTemporalLayersMinus1; /**< in: Specifies the max temporal layer used for hierarchical coding. */
- NV_ENC_CONFIG_HEVC_VUI_PARAMETERS hevcVUIParameters; /**< in: Specifies the HEVC video usability info parameters */
- uint32_t ltrTrustMode; /**< in: Specifies the LTR operating mode. See comments near NV_ENC_CONFIG_HEVC::enableLTR for description of the two modes.
- Set to 1 to use "LTR Trust" mode of LTR operation. Clients are discouraged to use "LTR Trust" mode as this mode may
- be deprecated in future releases.
- Set to 0 when using "LTR Per Picture" mode of LTR operation. */
- NV_ENC_BFRAME_REF_MODE useBFramesAsRef; /**< in: Specifies the B-Frame as reference mode. Check support for useBFramesAsRef mode using ::NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE caps.*/
- NV_ENC_NUM_REF_FRAMES numRefL0; /**< in: Specifies max number of reference frames in reference picture list L0, that can be used by hardware for prediction of a frame.
- Check support for numRefL0 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
- NV_ENC_NUM_REF_FRAMES numRefL1; /**< in: Specifies max number of reference frames in reference picture list L1, that can be used by hardware for prediction of a frame.
- Check support for numRefL1 using ::NV_ENC_CAPS_SUPPORT_MULTIPLE_REF_FRAMES caps. */
- uint32_t reserved1214; /**< in: Reserved and must be set to 0.*/
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_CONFIG_HEVC;
-
-#define NV_MAX_TILE_COLS_AV1 64
-#define NV_MAX_TILE_ROWS_AV1 64
-
-/**
- * \struct _NV_ENC_FILM_GRAIN_PARAMS_AV1
- * AV1 Film Grain Parameters structure
- */
-
-typedef struct _NV_ENC_FILM_GRAIN_PARAMS_AV1
-{
- uint32_t applyGrain :1; /**< in: Set to 1 to specify film grain should be added to frame */
- uint32_t chromaScalingFromLuma :1; /**< in: Set to 1 to specify the chroma scaling is inferred from luma scaling */
- uint32_t overlapFlag :1; /**< in: Set to 1 to indicate that overlap between film grain blocks should be applied*/
- uint32_t clipToRestrictedRange :1; /**< in: Set to 1 to clip values to restricted (studio) range after adding film grain */
- uint32_t grainScalingMinus8 :2; /**< in: Represents the shift - 8 applied to the values of the chroma component */
- uint32_t arCoeffLag :2; /**< in: Specifies the number of auto-regressive coefficients for luma and chroma */
- uint32_t numYPoints :4; /**< in: Specifies the number of points for the piecewise linear scaling function of the luma component */
- uint32_t numCbPoints :4; /**< in: Specifies the number of points for the piecewise linear scaling function of the cb component */
- uint32_t numCrPoints :4; /**< in: Specifies the number of points for the piecewise linear scaling function of the cr component */
- uint32_t arCoeffShiftMinus6 :2; /**< in: specifies the range of the auto-regressive coefficients */
- uint32_t grainScaleShift :2; /**< in: Specifies how much the Gaussian random numbers should be scaled down during the grain synthesi process */
- uint32_t reserved1 :8; /**< in: Reserved bits field - should be set to 0 */
- uint8_t pointYValue14; /**< in: pointYValuei: x coordinate for i-th point of luma piecewise linear scaling function. Values on a scale of 0...255 */
- uint8_t pointYScaling14; /**< in: pointYScalingi: i-th point output value of luma piecewise linear scaling function */
- uint8_t pointCbValue10; /**< in: pointCbValuei: x coordinate for i-th point of cb piecewise linear scaling function. Values on a scale of 0...255 */
- uint8_t pointCbScaling10; /**< in: pointCbScalingi: i-th point output value of cb piecewise linear scaling function */
- uint8_t pointCrValue10; /**< in: pointCrValuei: x coordinate for i-th point of cr piecewise linear scaling function. Values on a scale of 0...255 */
- uint8_t pointCrScaling10; /**< in: pointCrScalingi: i-th point output value of cr piecewise linear scaling function */
- uint8_t arCoeffsYPlus12824; /**< in: Specifies auto-regressive coefficients used for the Y plane */
- uint8_t arCoeffsCbPlus12825; /**< in: Specifies auto-regressive coefficients used for the U plane */
- uint8_t arCoeffsCrPlus12825; /**< in: Specifies auto-regressive coefficients used for the V plane */
- uint8_t reserved22; /**< in: Reserved bytes - should be set to 0 */
- uint8_t cbMult; /**< in: Represents a multiplier for the cb component used in derivation of the input index to the cb component scaling function */
- uint8_t cbLumaMult; /**< in: represents a multiplier for the average luma component used in derivation of the input index to the cb component scaling function. */
- uint16_t cbOffset; /**< in: Represents an offset used in derivation of the input index to the cb component scaling function */
- uint8_t crMult; /**< in: Represents a multiplier for the cr component used in derivation of the input index to the cr component scaling function */
- uint8_t crLumaMult; /**< in: represents a multiplier for the average luma component used in derivation of the input index to the cr component scaling function. */
- uint16_t crOffset; /**< in: Represents an offset used in derivation of the input index to the cr component scaling function */
-} NV_ENC_FILM_GRAIN_PARAMS_AV1;
-
-/**
-* \struct _NV_ENC_CONFIG_AV1
-* AV1 encoder configuration parameters to be set during initialization.
-*/
-typedef struct _NV_ENC_CONFIG_AV1
-{
- uint32_t level; /**< in: Specifies the level of the encoded bitstream.*/
- uint32_t tier; /**< in: Specifies the level tier of the encoded bitstream.*/
- NV_ENC_AV1_PART_SIZE minPartSize; /**< in: Specifies the minimum size of luma coding block partition.*/
- NV_ENC_AV1_PART_SIZE maxPartSize; /**< in: Specifies the maximum size of luma coding block partition.*/
- uint32_t outputAnnexBFormat : 1; /**< in: Set 1 to use Annex B format for bitstream output.*/
- uint32_t enableTimingInfo : 1; /**< in: Set 1 to write Timing Info into sequence/frame headers */
- uint32_t enableDecoderModelInfo : 1; /**< in: Set 1 to write Decoder Model Info into sequence/frame headers */
- uint32_t enableFrameIdNumbers : 1; /**< in: Set 1 to write Frame id numbers in bitstream */
- uint32_t disableSeqHdr : 1; /**< in: Set 1 to disable Sequence Header signaling in the bitstream. */
- uint32_t repeatSeqHdr : 1; /**< in: Set 1 to output Sequence Header for every Key frame.*/
- uint32_t enableIntraRefresh : 1; /**< in: Set 1 to enable gradual decoder refresh or intra refresh. If the GOP structure uses B frames this will be ignored */
- uint32_t chromaFormatIDC : 2; /**< in: Specifies the chroma format. Should be set to 1 for yuv420 input (yuv444 input currently not supported).*/
- uint32_t enableBitstreamPadding : 1; /**< in: Set 1 to enable bitstream padding. */
- uint32_t enableCustomTileConfig : 1; /**< in: Set 1 to enable custom tile configuration: numTileColumns and numTileRows must have non zero values and tileWidths and tileHeights must point to a valid address */
- uint32_t enableFilmGrainParams : 1; /**< in: Set 1 to enable custom film grain parameters: filmGrainParams must point to a valid address */
- uint32_t inputPixelBitDepthMinus8 : 3; /**< in: Specifies pixel bit depth minus 8 of video input. Should be set to 0 for 8 bit input, 2 for 10 bit input.*/
- uint32_t pixelBitDepthMinus8 : 3; /**< in: Specifies pixel bit depth minus 8 of encoded video. Should be set to 0 for 8 bit, 2 for 10 bit.
- HW will do the bitdepth conversion internally from inputPixelBitDepthMinus8 -> pixelBitDepthMinus8 if bit dpeths differ
- Support for 8 bit input to 10 bit encode conversion only */
- uint32_t reserved : 14; /**< in: Reserved bitfields.*/
- uint32_t idrPeriod; /**< in: Specifies the IDR/Key frame interval. If not set, this is made equal to gopLength in NV_ENC_CONFIG.Low latency application client can set IDR interval to NVENC_INFINITE_GOPLENGTH so that IDR frames are not inserted automatically. */
- uint32_t intraRefreshPeriod; /**< in: Specifies the interval between successive intra refresh if enableIntrarefresh is set. Requires enableIntraRefresh to be set.
- Will be disabled if NV_ENC_CONFIG::gopLength is not set to NVENC_INFINITE_GOPLENGTH. */
- uint32_t intraRefreshCnt; /**< in: Specifies the length of intra refresh in number of frames for periodic intra refresh. This value should be smaller than intraRefreshPeriod */
- uint32_t maxNumRefFramesInDPB; /**< in: Specifies the maximum number of references frames in the DPB.*/
- uint32_t numTileColumns; /**< in: This parameter in conjunction with the flag enableCustomTileConfig and the array tileWidths specifies the way in which the picture is divided into tile columns.
- When enableCustomTileConfig == 0, the picture will be uniformly divided into numTileColumns tile columns. If numTileColumns is not a power of 2,
- it will be rounded down to the next power of 2 value. If numTileColumns == 0, the picture will be coded with the smallest number of vertical tiles as allowed by standard.
- When enableCustomTileConfig == 1, numTileColumns must be > 0 and <= NV_MAX_TILE_COLS_AV1 and tileWidths must point to a valid array of numTileColumns entries.
- Entry i specifies the width in 64x64 CTU unit of tile colum i. The sum of all the entries should be equal to the picture width in 64x64 CTU units. */
- uint32_t numTileRows; /**< in: This parameter in conjunction with the flag enableCustomTileConfig and the array tileHeights specifies the way in which the picture is divided into tiles rows
- When enableCustomTileConfig == 0, the picture will be uniformly divided into numTileRows tile rows. If numTileRows is not a power of 2,
- it will be rounded down to the next power of 2 value. If numTileRows == 0, the picture will be coded with the smallest number of horizontal tiles as allowed by standard.
- When enableCustomTileConfig == 1, numTileRows must be > 0 and <= NV_MAX_TILE_ROWS_AV1 and tileHeights must point to a valid array of numTileRows entries.
- Entry i specifies the height in 64x64 CTU unit of tile row i. The sum of all the entries should be equal to the picture hieght in 64x64 CTU units. */
- uint32_t *tileWidths; /**< in: If enableCustomTileConfig == 1, tileWidthsi specifies the width of tile column i in 64x64 CTU unit, with 0 <= i <= numTileColumns -1. */
- uint32_t *tileHeights; /**< in: If enableCustomTileConfig == 1, tileHeightsi specifies the height of tile row i in 64x64 CTU unit, with 0 <= i <= numTileRows -1. */
- uint32_t maxTemporalLayersMinus1; /**< in: Specifies the max temporal layer used for hierarchical coding. */
- NV_ENC_VUI_COLOR_PRIMARIES colorPrimaries; /**< in: as defined in section of ISO/IEC 23091-4/ITU-T H.273 */
- NV_ENC_VUI_TRANSFER_CHARACTERISTIC transferCharacteristics; /**< in: as defined in section of ISO/IEC 23091-4/ITU-T H.273 */
- NV_ENC_VUI_MATRIX_COEFFS matrixCoefficients; /**< in: as defined in section of ISO/IEC 23091-4/ITU-T H.273 */
- uint32_t colorRange; /**< in: 0: studio swing representation - 1: full swing representation */
- uint32_t chromaSamplePosition; /**< in: 0: unknown
- 1: Horizontally collocated with luma (0,0) sample, between two vertical samples
- 2: Co-located with luma (0,0) sample */
- NV_ENC_BFRAME_REF_MODE useBFramesAsRef; /**< in: Specifies the B-Frame as reference mode. Check support for useBFramesAsRef mode using ::NV_ENC_CAPS_SUPPORT_BFRAME_REF_MODE caps.*/
- NV_ENC_FILM_GRAIN_PARAMS_AV1 *filmGrainParams; /**< in: If enableFilmGrainParams == 1, filmGrainParams must point to a valid NV_ENC_FILM_GRAIN_PARAMS_AV1 structure */
- NV_ENC_NUM_REF_FRAMES numFwdRefs; /**< in: Specifies max number of forward reference frame used for prediction of a frame. It must be in range 1-4 (Last, Last2, last3 and Golden). It's a suggestive value not necessarily be honored always. */
- NV_ENC_NUM_REF_FRAMES numBwdRefs; /**< in: Specifies max number of L1 list reference frame used for prediction of a frame. It must be in range 1-3 (Backward, Altref2, Altref). It's a suggestive value not necessarily be honored always. */
- uint32_t reserved1235; /**< in: Reserved and must be set to 0.*/
- void* reserved262; /**< in: Reserved and must be set to NULL */
-} NV_ENC_CONFIG_AV1;
-
-/**
- * \struct _NV_ENC_CONFIG_H264_MEONLY
- * H264 encoder configuration parameters for ME only Mode
- *
- */
-typedef struct _NV_ENC_CONFIG_H264_MEONLY
-{
- uint32_t disablePartition16x16 :1; /**< in: Disable Motion Estimation on 16x16 blocks*/
- uint32_t disablePartition8x16 :1; /**< in: Disable Motion Estimation on 8x16 blocks*/
- uint32_t disablePartition16x8 :1; /**< in: Disable Motion Estimation on 16x8 blocks*/
- uint32_t disablePartition8x8 :1; /**< in: Disable Motion Estimation on 8x8 blocks*/
- uint32_t disableIntraSearch :1; /**< in: Disable Intra search during Motion Estimation*/
- uint32_t bStereoEnable :1; /**< in: Enable Stereo Mode for Motion Estimation where each view is independently executed*/
- uint32_t reserved :26; /**< in: Reserved and must be set to 0 */
- uint32_t reserved1 255; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_CONFIG_H264_MEONLY;
-
-
-/**
- * \struct _NV_ENC_CONFIG_HEVC_MEONLY
- * HEVC encoder configuration parameters for ME only Mode
- *
- */
-typedef struct _NV_ENC_CONFIG_HEVC_MEONLY
-{
- uint32_t reserved 256; /**< in: Reserved and must be set to 0 */
- void* reserved164; /**< in: Reserved and must be set to NULL */
-} NV_ENC_CONFIG_HEVC_MEONLY;
-
-/**
- * \struct _NV_ENC_CODEC_CONFIG
- * Codec-specific encoder configuration parameters to be set during initialization.
- */
-typedef union _NV_ENC_CODEC_CONFIG
-{
- NV_ENC_CONFIG_H264 h264Config; /**< in: Specifies the H.264-specific encoder configuration. */
- NV_ENC_CONFIG_HEVC hevcConfig; /**< in: Specifies the HEVC-specific encoder configuration. */
- NV_ENC_CONFIG_AV1 av1Config; /**< in: Specifies the AV1-specific encoder configuration. */
- NV_ENC_CONFIG_H264_MEONLY h264MeOnlyConfig; /**< in: Specifies the H.264-specific ME only encoder configuration. */
- NV_ENC_CONFIG_HEVC_MEONLY hevcMeOnlyConfig; /**< in: Specifies the HEVC-specific ME only encoder configuration. */
- uint32_t reserved320; /**< in: Reserved and must be set to 0 */
-} NV_ENC_CODEC_CONFIG;
-
-
-/**
- * \struct _NV_ENC_CONFIG
- * Encoder configuration parameters to be set during initialization.
- */
-typedef struct _NV_ENC_CONFIG
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_CONFIG_VER. */
- GUID profileGUID; /**< in: Specifies the codec profile GUID. If client specifies \p NV_ENC_CODEC_PROFILE_AUTOSELECT_GUID the NvEncodeAPI interface will select the appropriate codec profile. */
- uint32_t gopLength; /**< in: Specifies the number of pictures in one GOP. Low latency application client can set goplength to NVENC_INFINITE_GOPLENGTH so that keyframes are not inserted automatically. */
- int32_t frameIntervalP; /**< in: Specifies the GOP pattern as follows: \p frameIntervalP = 0: I, 1: IPP, 2: IBP, 3: IBBP If goplength is set to NVENC_INFINITE_GOPLENGTH \p frameIntervalP should be set to 1. */
- uint32_t monoChromeEncoding; /**< in: Set this to 1 to enable monochrome encoding for this session. */
- NV_ENC_PARAMS_FRAME_FIELD_MODE frameFieldMode; /**< in: Specifies the frame/field mode.
- Check support for field encoding using ::NV_ENC_CAPS_SUPPORT_FIELD_ENCODING caps.
- Using a frameFieldMode other than NV_ENC_PARAMS_FRAME_FIELD_MODE_FRAME for RGB input is not supported. */
- NV_ENC_MV_PRECISION mvPrecision; /**< in: Specifies the desired motion vector prediction precision. */
- NV_ENC_RC_PARAMS rcParams; /**< in: Specifies the rate control parameters for the current encoding session. */
- NV_ENC_CODEC_CONFIG encodeCodecConfig; /**< in: Specifies the codec specific config parameters through this union. */
- uint32_t reserved 278; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_CONFIG;
-
-/** macro for constructing the version field of ::_NV_ENC_CONFIG */
-#define NV_ENC_CONFIG_VER (NVENCAPI_STRUCT_VERSION(8) | ( 1<<31 ))
-
-/**
- * Tuning information of NVENC encoding (TuningInfo is not applicable to H264 and HEVC MEOnly mode).
- */
-typedef enum NV_ENC_TUNING_INFO
-{
- NV_ENC_TUNING_INFO_UNDEFINED = 0, /**< Undefined tuningInfo. Invalid value for encoding. */
- NV_ENC_TUNING_INFO_HIGH_QUALITY = 1, /**< Tune presets for latency tolerant encoding.*/
- NV_ENC_TUNING_INFO_LOW_LATENCY = 2, /**< Tune presets for low latency streaming.*/
- NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY = 3, /**< Tune presets for ultra low latency streaming.*/
- NV_ENC_TUNING_INFO_LOSSLESS = 4, /**< Tune presets for lossless encoding.*/
- NV_ENC_TUNING_INFO_COUNT /**< Count number of tuningInfos. Invalid value. */
-}NV_ENC_TUNING_INFO;
-
-/**
- * \struct _NV_ENC_INITIALIZE_PARAMS
- * Encode Session Initialization parameters.
- */
-typedef struct _NV_ENC_INITIALIZE_PARAMS
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_INITIALIZE_PARAMS_VER. */
- GUID encodeGUID; /**< in: Specifies the Encode GUID for which the encoder is being created. ::NvEncInitializeEncoder() API will fail if this is not set, or set to unsupported value. */
- GUID presetGUID; /**< in: Specifies the preset for encoding. If the preset GUID is set then , the preset configuration will be applied before any other parameter. */
- uint32_t encodeWidth; /**< in: Specifies the encode width. If not set ::NvEncInitializeEncoder() API will fail. */
- uint32_t encodeHeight; /**< in: Specifies the encode height. If not set ::NvEncInitializeEncoder() API will fail. */
- uint32_t darWidth; /**< in: Specifies the display aspect ratio Width. */
- uint32_t darHeight; /**< in: Specifies the display aspect ratio height. */
- uint32_t frameRateNum; /**< in: Specifies the numerator for frame rate used for encoding in frames per second ( Frame rate = frameRateNum / frameRateDen ). */
- uint32_t frameRateDen; /**< in: Specifies the denominator for frame rate used for encoding in frames per second ( Frame rate = frameRateNum / frameRateDen ). */
- uint32_t enableEncodeAsync; /**< in: Set this to 1 to enable asynchronous mode and is expected to use events to get picture completion notification. */
- uint32_t enablePTD; /**< in: Set this to 1 to enable the Picture Type Decision is be taken by the NvEncodeAPI interface. */
- uint32_t reportSliceOffsets :1; /**< in: Set this to 1 to enable reporting slice offsets in ::_NV_ENC_LOCK_BITSTREAM. NV_ENC_INITIALIZE_PARAMS::enableEncodeAsync must be set to 0 to use this feature. Client must set this to 0 if NV_ENC_CONFIG_H264::sliceMode is 1 on Kepler GPUs */
- uint32_t enableSubFrameWrite :1; /**< in: Set this to 1 to write out available bitstream to memory at subframe intervals.
- If enableSubFrameWrite = 1, then the hardware encoder returns data as soon as a slice (H264/HEVC) or tile (AV1) has completed encoding.
- This results in better encoding latency, but the downside is that the application has to keep polling via a call to nvEncLockBitstream API continuously to see if any encoded slice/tile data is available.
- Use this mode if you feel that the marginal reduction in latency from sub-frame encoding is worth the increase in complexity due to CPU-based polling. */
- uint32_t enableExternalMEHints :1; /**< in: Set to 1 to enable external ME hints for the current frame. For NV_ENC_INITIALIZE_PARAMS::enablePTD=1 with B frames, programming L1 hints is optional for B frames since Client doesn't know internal GOP structure.
- NV_ENC_PIC_PARAMS::meHintRefPicDist should preferably be set with enablePTD=1. */
- uint32_t enableMEOnlyMode :1; /**< in: Set to 1 to enable ME Only Mode .*/
- uint32_t enableWeightedPrediction :1; /**< in: Set this to 1 to enable weighted prediction. Not supported if encode session is configured for B-Frames (i.e. NV_ENC_CONFIG::frameIntervalP > 1 or preset >=P3 when tuningInfo = ::NV_ENC_TUNING_INFO_HIGH_QUALITY or
- tuningInfo = ::NV_ENC_TUNING_INFO_LOSSLESS. This is because preset >=p3 internally enables B frames when tuningInfo = ::NV_ENC_TUNING_INFO_HIGH_QUALITY or ::NV_ENC_TUNING_INFO_LOSSLESS). */
- uint32_t enableOutputInVidmem :1; /**< in: Set this to 1 to enable output of NVENC in video memory buffer created by application. This feature is not supported for HEVC ME only mode. */
- uint32_t reservedBitFields :26; /**< in: Reserved bitfields and must be set to 0 */
- uint32_t privDataSize; /**< in: Reserved private data buffer size and must be set to 0 */
- void* privData; /**< in: Reserved private data buffer and must be set to NULL */
- NV_ENC_CONFIG* encodeConfig; /**< in: Specifies the advanced codec specific structure. If client has sent a valid codec config structure, it will override parameters set by the NV_ENC_INITIALIZE_PARAMS::presetGUID parameter. If set to NULL the NvEncodeAPI interface will use the NV_ENC_INITIALIZE_PARAMS::presetGUID to set the codec specific parameters.
- Client can also optionally query the NvEncodeAPI interface to get codec specific parameters for a presetGUID using ::NvEncGetEncodePresetConfig() API. It can then modify (if required) some of the codec config parameters and send down a custom config structure as part of ::_NV_ENC_INITIALIZE_PARAMS.
- Even in this case client is recommended to pass the same preset guid it has used in ::NvEncGetEncodePresetConfig() API to query the config structure; as NV_ENC_INITIALIZE_PARAMS::presetGUID. This will not override the custom config structure but will be used to determine other Encoder HW specific parameters not exposed in the API. */
- uint32_t maxEncodeWidth; /**< in: Maximum encode width to be used for current Encode session.
- Client should allocate output buffers according to this dimension for dynamic resolution change. If set to 0, Encoder will not allow dynamic resolution change. */
- uint32_t maxEncodeHeight; /**< in: Maximum encode height to be allowed for current Encode session.
- Client should allocate output buffers according to this dimension for dynamic resolution change. If set to 0, Encode will not allow dynamic resolution change. */
- NVENC_EXTERNAL_ME_HINT_COUNTS_PER_BLOCKTYPE maxMEHintCountsPerBlock2; /**< in: If Client wants to pass external motion vectors in NV_ENC_PIC_PARAMS::meExternalHints buffer it must specify the maximum number of hint candidates per block per direction for the encode session.
- The NV_ENC_INITIALIZE_PARAMS::maxMEHintCountsPerBlock0 is for L0 predictors and NV_ENC_INITIALIZE_PARAMS::maxMEHintCountsPerBlock1 is for L1 predictors.
- This client must also set NV_ENC_INITIALIZE_PARAMS::enableExternalMEHints to 1. */
- NV_ENC_TUNING_INFO tuningInfo; /**< in: Tuning Info of NVENC encoding(TuningInfo is not applicable to H264 and HEVC meonly mode). */
- NV_ENC_BUFFER_FORMAT bufferFormat; /**< in: Input buffer format. Used only when DX12 interface type is used */
- uint32_t reserved 287; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_INITIALIZE_PARAMS;
-
-/** macro for constructing the version field of ::_NV_ENC_INITIALIZE_PARAMS */
-#define NV_ENC_INITIALIZE_PARAMS_VER (NVENCAPI_STRUCT_VERSION(5) | ( 1<<31 ))
-
-
-/**
- * \struct _NV_ENC_RECONFIGURE_PARAMS
- * Encode Session Reconfigured parameters.
- */
-typedef struct _NV_ENC_RECONFIGURE_PARAMS
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_RECONFIGURE_PARAMS_VER. */
- NV_ENC_INITIALIZE_PARAMS reInitEncodeParams; /**< in: Encoder session re-initialization parameters.
- If reInitEncodeParams.encodeConfig is NULL and
- reInitEncodeParams.presetGUID is the same as the preset
- GUID specified on the call to NvEncInitializeEncoder(),
- EncodeAPI will continue to use the existing encode
- configuration.
- If reInitEncodeParams.encodeConfig is NULL and
- reInitEncodeParams.presetGUID is different from the preset
- GUID specified on the call to NvEncInitializeEncoder(),
- EncodeAPI will try to use the default configuration for
- the preset specified by reInitEncodeParams.presetGUID.
- In this case, reconfiguration may fail if the new
- configuration is incompatible with the existing
- configuration (e.g. the new configuration results in
- a change in the GOP structure). */
- uint32_t resetEncoder :1; /**< in: This resets the rate control states and other internal encoder states. This should be used only with an IDR frame.
- If NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1, encoder will force the frame type to IDR */
- uint32_t forceIDR :1; /**< in: Encode the current picture as an IDR picture. This flag is only valid when Picture type decision is taken by the Encoder
- _NV_ENC_INITIALIZE_PARAMS::enablePTD == 1. */
- uint32_t reserved :30;
-
-}NV_ENC_RECONFIGURE_PARAMS;
-
-/** macro for constructing the version field of ::_NV_ENC_RECONFIGURE_PARAMS */
-#define NV_ENC_RECONFIGURE_PARAMS_VER (NVENCAPI_STRUCT_VERSION(1) | ( 1<<31 ))
-
-/**
- * \struct _NV_ENC_PRESET_CONFIG
- * Encoder preset config
- */
-typedef struct _NV_ENC_PRESET_CONFIG
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_PRESET_CONFIG_VER. */
- NV_ENC_CONFIG presetCfg; /**< out: preset config returned by the Nvidia Video Encoder interface. */
- uint32_t reserved1255; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-}NV_ENC_PRESET_CONFIG;
-
-/** macro for constructing the version field of ::_NV_ENC_PRESET_CONFIG */
-#define NV_ENC_PRESET_CONFIG_VER (NVENCAPI_STRUCT_VERSION(4) | ( 1<<31 ))
-
-
-/**
- * \struct _NV_ENC_PIC_PARAMS_MVC
- * MVC-specific parameters to be sent on a per-frame basis.
- */
-typedef struct _NV_ENC_PIC_PARAMS_MVC
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_PIC_PARAMS_MVC_VER. */
- uint32_t viewID; /**< in: Specifies the view ID associated with the current input view. */
- uint32_t temporalID; /**< in: Specifies the temporal ID associated with the current input view. */
- uint32_t priorityID; /**< in: Specifies the priority ID associated with the current input view. Reserved and ignored by the NvEncodeAPI interface. */
- uint32_t reserved112; /**< in: Reserved and must be set to 0. */
- void* reserved28; /**< in: Reserved and must be set to NULL. */
-}NV_ENC_PIC_PARAMS_MVC;
-
-/** macro for constructing the version field of ::_NV_ENC_PIC_PARAMS_MVC */
-#define NV_ENC_PIC_PARAMS_MVC_VER NVENCAPI_STRUCT_VERSION(1)
-
-
-/**
- * \union _NV_ENC_PIC_PARAMS_H264_EXT
- * H264 extension picture parameters
- */
-typedef union _NV_ENC_PIC_PARAMS_H264_EXT
-{
- NV_ENC_PIC_PARAMS_MVC mvcPicParams; /**< in: Specifies the MVC picture parameters. */
- uint32_t reserved132; /**< in: Reserved and must be set to 0. */
-}NV_ENC_PIC_PARAMS_H264_EXT;
-
-/**
- * \struct _NV_ENC_SEI_PAYLOAD
- * User SEI message
- */
-typedef struct _NV_ENC_SEI_PAYLOAD
-{
- uint32_t payloadSize; /**< in SEI payload size in bytes. SEI payload must be byte aligned, as described in Annex D */
- uint32_t payloadType; /**< in SEI payload types and syntax can be found in Annex D of the H.264 Specification. */
- uint8_t *payload; /**< in pointer to user data */
-} NV_ENC_SEI_PAYLOAD;
-
-#define NV_ENC_H264_SEI_PAYLOAD NV_ENC_SEI_PAYLOAD
-
-/**
- * \struct _NV_ENC_PIC_PARAMS_H264
- * H264 specific enc pic params. sent on a per frame basis.
- */
-typedef struct _NV_ENC_PIC_PARAMS_H264
-{
- uint32_t displayPOCSyntax; /**< in: Specifies the display POC syntax This is required to be set if client is handling the picture type decision. */
- uint32_t reserved3; /**< in: Reserved and must be set to 0 */
- uint32_t refPicFlag; /**< in: Set to 1 for a reference picture. This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t colourPlaneId; /**< in: Specifies the colour plane ID associated with the current input. */
- uint32_t forceIntraRefreshWithFrameCnt; /**< in: Forces an intra refresh with duration equal to intraRefreshFrameCnt.
- When outputRecoveryPointSEI is set this is value is used for recovery_frame_cnt in recovery point SEI message
- forceIntraRefreshWithFrameCnt cannot be used if B frames are used in the GOP structure specified */
- uint32_t constrainedFrame :1; /**< in: Set to 1 if client wants to encode this frame with each slice completely independent of other slices in the frame.
- NV_ENC_INITIALIZE_PARAMS::enableConstrainedEncoding should be set to 1 */
- uint32_t sliceModeDataUpdate :1; /**< in: Set to 1 if client wants to change the sliceModeData field to specify new sliceSize Parameter
- When forceIntraRefreshWithFrameCnt is set it will have priority over sliceMode setting */
- uint32_t ltrMarkFrame :1; /**< in: Set to 1 if client wants to mark this frame as LTR */
- uint32_t ltrUseFrames :1; /**< in: Set to 1 if client allows encoding this frame using the LTR frames specified in ltrFrameBitmap */
- uint32_t reservedBitFields :28; /**< in: Reserved bit fields and must be set to 0 */
- uint8_t* sliceTypeData; /**< in: Deprecated. */
- uint32_t sliceTypeArrayCnt; /**< in: Deprecated. */
- uint32_t seiPayloadArrayCnt; /**< in: Specifies the number of elements allocated in seiPayloadArray array. */
- NV_ENC_SEI_PAYLOAD* seiPayloadArray; /**< in: Array of SEI payloads which will be inserted for this frame. */
- uint32_t sliceMode; /**< in: This parameter in conjunction with sliceModeData specifies the way in which the picture is divided into slices
- sliceMode = 0 MB based slices, sliceMode = 1 Byte based slices, sliceMode = 2 MB row based slices, sliceMode = 3, numSlices in Picture
- When forceIntraRefreshWithFrameCnt is set it will have priority over sliceMode setting
- When sliceMode == 0 and sliceModeData == 0 whole picture will be coded with one slice */
- uint32_t sliceModeData; /**< in: Specifies the parameter needed for sliceMode. For:
- sliceMode = 0, sliceModeData specifies # of MBs in each slice (except last slice)
- sliceMode = 1, sliceModeData specifies maximum # of bytes in each slice (except last slice)
- sliceMode = 2, sliceModeData specifies # of MB rows in each slice (except last slice)
- sliceMode = 3, sliceModeData specifies number of slices in the picture. Driver will divide picture into slices optimally */
- uint32_t ltrMarkFrameIdx; /**< in: Specifies the long term referenceframe index to use for marking this frame as LTR.*/
- uint32_t ltrUseFrameBitmap; /**< in: Specifies the associated bitmap of LTR frame indices to use when encoding this frame. */
- uint32_t ltrUsageMode; /**< in: Not supported. Reserved for future use and must be set to 0. */
- uint32_t forceIntraSliceCount; /**< in: Specifies the number of slices to be forced to Intra in the current picture.
- This option along with forceIntraSliceIdx array needs to be used with sliceMode = 3 only */
- uint32_t *forceIntraSliceIdx; /**< in: Slice indices to be forced to intra in the current picture. Each slice index should be <= num_slices_in_picture -1. Index starts from 0 for first slice.
- The number of entries in this array should be equal to forceIntraSliceCount */
- NV_ENC_PIC_PARAMS_H264_EXT h264ExtPicParams; /**< in: Specifies the H264 extension config parameters using this config. */
- NV_ENC_TIME_CODE timeCode; /**< in: Specifies the clock timestamp sets used in picture timing SEI. Applicable only when NV_ENC_CONFIG_H264::enableTimeCode is set to 1. */
- uint32_t reserved 203; /**< in: Reserved and must be set to 0. */
- void* reserved261; /**< in: Reserved and must be set to NULL. */
-} NV_ENC_PIC_PARAMS_H264;
-
-/**
- * \struct _NV_ENC_PIC_PARAMS_HEVC
- * HEVC specific enc pic params. sent on a per frame basis.
- */
-typedef struct _NV_ENC_PIC_PARAMS_HEVC
-{
- uint32_t displayPOCSyntax; /**< in: Specifies the display POC syntax This is required to be set if client is handling the picture type decision. */
- uint32_t refPicFlag; /**< in: Set to 1 for a reference picture. This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t temporalId; /**< in: Specifies the temporal id of the picture */
- uint32_t forceIntraRefreshWithFrameCnt; /**< in: Forces an intra refresh with duration equal to intraRefreshFrameCnt.
- When outputRecoveryPointSEI is set this is value is used for recovery_frame_cnt in recovery point SEI message
- forceIntraRefreshWithFrameCnt cannot be used if B frames are used in the GOP structure specified */
- uint32_t constrainedFrame :1; /**< in: Set to 1 if client wants to encode this frame with each slice completely independent of other slices in the frame.
- NV_ENC_INITIALIZE_PARAMS::enableConstrainedEncoding should be set to 1 */
- uint32_t sliceModeDataUpdate :1; /**< in: Set to 1 if client wants to change the sliceModeData field to specify new sliceSize Parameter
- When forceIntraRefreshWithFrameCnt is set it will have priority over sliceMode setting */
- uint32_t ltrMarkFrame :1; /**< in: Set to 1 if client wants to mark this frame as LTR */
- uint32_t ltrUseFrames :1; /**< in: Set to 1 if client allows encoding this frame using the LTR frames specified in ltrFrameBitmap */
- uint32_t reservedBitFields :28; /**< in: Reserved bit fields and must be set to 0 */
- uint8_t* sliceTypeData; /**< in: Array which specifies the slice type used to force intra slice for a particular slice. Currently supported only for NV_ENC_CONFIG_H264::sliceMode == 3.
- Client should allocate array of size sliceModeData where sliceModeData is specified in field of ::_NV_ENC_CONFIG_H264
- Array element with index n corresponds to nth slice. To force a particular slice to intra client should set corresponding array element to NV_ENC_SLICE_TYPE_I
- all other array elements should be set to NV_ENC_SLICE_TYPE_DEFAULT */
- uint32_t sliceTypeArrayCnt; /**< in: Client should set this to the number of elements allocated in sliceTypeData array. If sliceTypeData is NULL then this should be set to 0 */
- uint32_t sliceMode; /**< in: This parameter in conjunction with sliceModeData specifies the way in which the picture is divided into slices
- sliceMode = 0 CTU based slices, sliceMode = 1 Byte based slices, sliceMode = 2 CTU row based slices, sliceMode = 3, numSlices in Picture
- When forceIntraRefreshWithFrameCnt is set it will have priority over sliceMode setting
- When sliceMode == 0 and sliceModeData == 0 whole picture will be coded with one slice */
- uint32_t sliceModeData; /**< in: Specifies the parameter needed for sliceMode. For:
- sliceMode = 0, sliceModeData specifies # of CTUs in each slice (except last slice)
- sliceMode = 1, sliceModeData specifies maximum # of bytes in each slice (except last slice)
- sliceMode = 2, sliceModeData specifies # of CTU rows in each slice (except last slice)
- sliceMode = 3, sliceModeData specifies number of slices in the picture. Driver will divide picture into slices optimally */
- uint32_t ltrMarkFrameIdx; /**< in: Specifies the long term reference frame index to use for marking this frame as LTR.*/
- uint32_t ltrUseFrameBitmap; /**< in: Specifies the associated bitmap of LTR frame indices to use when encoding this frame. */
- uint32_t ltrUsageMode; /**< in: Not supported. Reserved for future use and must be set to 0. */
- uint32_t seiPayloadArrayCnt; /**< in: Specifies the number of elements allocated in seiPayloadArray array. */
- uint32_t reserved; /**< in: Reserved and must be set to 0. */
- NV_ENC_SEI_PAYLOAD* seiPayloadArray; /**< in: Array of SEI payloads which will be inserted for this frame. */
- NV_ENC_TIME_CODE timeCode; /**< in: Specifies the clock timestamp sets used in time code SEI. Applicable only when NV_ENC_CONFIG_HEVC::enableTimeCodeSEI is set to 1. */
- uint32_t reserved2 237; /**< in: Reserved and must be set to 0. */
- void* reserved361; /**< in: Reserved and must be set to NULL. */
-} NV_ENC_PIC_PARAMS_HEVC;
-
-#define NV_ENC_AV1_OBU_PAYLOAD NV_ENC_SEI_PAYLOAD
-
-/**
-* \struct _NV_ENC_PIC_PARAMS_AV1
-* AV1 specific enc pic params. sent on a per frame basis.
-*/
-typedef struct _NV_ENC_PIC_PARAMS_AV1
-{
- uint32_t displayPOCSyntax; /**< in: Specifies the display POC syntax This is required to be set if client is handling the picture type decision. */
- uint32_t refPicFlag; /**< in: Set to 1 for a reference picture. This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t temporalId; /**< in: Specifies the temporal id of the picture */
- uint32_t forceIntraRefreshWithFrameCnt; /**< in: Forces an intra refresh with duration equal to intraRefreshFrameCnt.
- forceIntraRefreshWithFrameCnt cannot be used if B frames are used in the GOP structure specified */
- uint32_t goldenFrameFlag : 1; /**< in: Encode frame as Golden Frame. This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t arfFrameFlag : 1; /**< in: Encode frame as Alternate Reference Frame. This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t arf2FrameFlag : 1; /**< in: Encode frame as Alternate Reference 2 Frame. This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t bwdFrameFlag : 1; /**< in: Encode frame as Backward Reference Frame. This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t overlayFrameFlag : 1; /**< in: Encode frame as overlay frame. A previously encoded frame with the same displayPOCSyntax value should be present in reference frame buffer.
- This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t showExistingFrameFlag : 1; /**< in: When ovelayFrameFlag is set to 1, this flag controls the value of the show_existing_frame syntax element associated with the overlay frame.
- This flag is added to the interface as a placeholder. Its value is ignored for now and always assumed to be set to 1.
- This is ignored if NV_ENC_INITIALIZE_PARAMS::enablePTD is set to 1. */
- uint32_t errorResilientModeFlag : 1; /**< in: encode frame independently from previously encoded frames */
-
- uint32_t tileConfigUpdate : 1; /**< in: Set to 1 if client wants to overwrite the default tile configuration with the tile parameters specified below
- When forceIntraRefreshWithFrameCnt is set it will have priority over tileConfigUpdate setting */
- uint32_t enableCustomTileConfig : 1; /**< in: Set 1 to enable custom tile configuration: numTileColumns and numTileRows must have non zero values and tileWidths and tileHeights must point to a valid address */
- uint32_t filmGrainParamsUpdate : 1; /**< in: Set to 1 if client wants to update previous film grain parameters: filmGrainParams must point to a valid address and encoder must have been configured with film grain enabled */
- uint32_t reservedBitFields : 22; /**< in: Reserved bitfields and must be set to 0 */
- uint32_t numTileColumns; /**< in: This parameter in conjunction with the flag enableCustomTileConfig and the array tileWidths specifies the way in which the picture is divided into tile columns.
- When enableCustomTileConfig == 0, the picture will be uniformly divided into numTileColumns tile columns. If numTileColumns is not a power of 2,
- it will be rounded down to the next power of 2 value. If numTileColumns == 0, the picture will be coded with the smallest number of vertical tiles as allowed by standard.
- When enableCustomTileConfig == 1, numTileColumns must be > 0 and <= NV_MAX_TILE_COLS_AV1 and tileWidths must point to a valid array of numTileColumns entries.
- Entry i specifies the width in 64x64 CTU unit of tile colum i. The sum of all the entries should be equal to the picture width in 64x64 CTU units. */
- uint32_t numTileRows; /**< in: This parameter in conjunction with the flag enableCustomTileConfig and the array tileHeights specifies the way in which the picture is divided into tiles rows
- When enableCustomTileConfig == 0, the picture will be uniformly divided into numTileRows tile rows. If numTileRows is not a power of 2,
- it will be rounded down to the next power of 2 value. If numTileRows == 0, the picture will be coded with the smallest number of horizontal tiles as allowed by standard.
- When enableCustomTileConfig == 1, numTileRows must be > 0 and <= NV_MAX_TILE_ROWS_AV1 and tileHeights must point to a valid array of numTileRows entries.
- Entry i specifies the height in 64x64 CTU unit of tile row i. The sum of all the entries should be equal to the picture hieght in 64x64 CTU units. */
- uint32_t *tileWidths; /**< in: If enableCustomTileConfig == 1, tileWidthsi specifies the width of tile column i in 64x64 CTU unit, with 0 <= i <= numTileColumns -1. */
- uint32_t *tileHeights; /**< in: If enableCustomTileConfig == 1, tileHeightsi specifies the height of tile row i in 64x64 CTU unit, with 0 <= i <= numTileRows -1. */
- uint32_t obuPayloadArrayCnt; /**< in: Specifies the number of elements allocated in obuPayloadArray array. */
- uint32_t reserved; /**< in: Reserved and must be set to 0. */
- NV_ENC_AV1_OBU_PAYLOAD* obuPayloadArray; /**< in: Array of OBU payloads which will be inserted for this frame. */
- NV_ENC_FILM_GRAIN_PARAMS_AV1 *filmGrainParams; /**< in: If filmGrainParamsUpdate == 1, filmGrainParams must point to a valid NV_ENC_FILM_GRAIN_PARAMS_AV1 structure */
- uint32_t reserved2247; /**< in: Reserved and must be set to 0. */
- void* reserved361; /**< in: Reserved and must be set to NULL. */
-} NV_ENC_PIC_PARAMS_AV1;
-
-/**
- * Codec specific per-picture encoding parameters.
- */
-typedef union _NV_ENC_CODEC_PIC_PARAMS
-{
- NV_ENC_PIC_PARAMS_H264 h264PicParams; /**< in: H264 encode picture params. */
- NV_ENC_PIC_PARAMS_HEVC hevcPicParams; /**< in: HEVC encode picture params. */
- NV_ENC_PIC_PARAMS_AV1 av1PicParams; /**< in: AV1 encode picture params. */
- uint32_t reserved256; /**< in: Reserved and must be set to 0. */
-} NV_ENC_CODEC_PIC_PARAMS;
-
-
-/**
- * \struct _NV_ENC_PIC_PARAMS
- * Encoding parameters that need to be sent on a per frame basis.
- */
-typedef struct _NV_ENC_PIC_PARAMS
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_PIC_PARAMS_VER. */
- uint32_t inputWidth; /**< in: Specifies the input frame width */
- uint32_t inputHeight; /**< in: Specifies the input frame height */
- uint32_t inputPitch; /**< in: Specifies the input buffer pitch. If pitch value is not known, set this to inputWidth. */
- uint32_t encodePicFlags; /**< in: Specifies bit-wise OR of encode picture flags. See ::NV_ENC_PIC_FLAGS enum. */
- uint32_t frameIdx; /**< in: Specifies the frame index associated with the input frame optional. */
- uint64_t inputTimeStamp; /**< in: Specifies opaque data which is associated with the encoded frame, but not actually encoded in the output bitstream.
- This opaque data can be used later to uniquely refer to the corresponding encoded frame. For example, it can be used
- for identifying the frame to be invalidated in the reference picture buffer, if lost at the client. */
- uint64_t inputDuration; /**< in: Specifies duration of the input picture */
- NV_ENC_INPUT_PTR inputBuffer; /**< in: Specifies the input buffer pointer. Client must use a pointer obtained from ::NvEncCreateInputBuffer() or ::NvEncMapInputResource() APIs.*/
- NV_ENC_OUTPUT_PTR outputBitstream; /**< in: Specifies the output buffer pointer.
- If NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is set to 0, specifies the pointer to output buffer. Client should use a pointer obtained from ::NvEncCreateBitstreamBuffer() API.
- If NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is set to 1, client should allocate buffer in video memory for NV_ENC_ENCODE_OUT_PARAMS struct and encoded bitstream data. Client
- should use a pointer obtained from ::NvEncMapInputResource() API, when mapping this output buffer and assign it to NV_ENC_PIC_PARAMS::outputBitstream.
- First 256 bytes of this buffer should be interpreted as NV_ENC_ENCODE_OUT_PARAMS struct followed by encoded bitstream data. Recommended size for output buffer is sum of size of
- NV_ENC_ENCODE_OUT_PARAMS struct and twice the input frame size for lower resolution eg. CIF and 1.5 times the input frame size for higher resolutions. If encoded bitstream size is
- greater than the allocated buffer size for encoded bitstream, then the output buffer will have encoded bitstream data equal to buffer size. All CUDA operations on this buffer must use
- the default stream. */
- void* completionEvent; /**< in: Specifies an event to be signaled on completion of encoding of this Frame only if operating in Asynchronous mode. Each output buffer should be associated with a distinct event pointer. */
- NV_ENC_BUFFER_FORMAT bufferFmt; /**< in: Specifies the input buffer format. */
- NV_ENC_PIC_STRUCT pictureStruct; /**< in: Specifies structure of the input picture. */
- NV_ENC_PIC_TYPE pictureType; /**< in: Specifies input picture type. Client required to be set explicitly by the client if the client has not set NV_ENC_INITALIZE_PARAMS::enablePTD to 1 while calling NvInitializeEncoder. */
- NV_ENC_CODEC_PIC_PARAMS codecPicParams; /**< in: Specifies the codec specific per-picture encoding parameters. */
- NVENC_EXTERNAL_ME_HINT_COUNTS_PER_BLOCKTYPE meHintCountsPerBlock2; /**< in: For H264 and Hevc, specifies the number of hint candidates per block per direction for the current frame. meHintCountsPerBlock0 is for L0 predictors and meHintCountsPerBlock1 is for L1 predictors.
- The candidate count in NV_ENC_PIC_PARAMS::meHintCountsPerBlocklx must never exceed NV_ENC_INITIALIZE_PARAMS::maxMEHintCountsPerBlocklx provided during encoder initialization. */
- NVENC_EXTERNAL_ME_HINT *meExternalHints; /**< in: For H264 and Hevc, Specifies the pointer to ME external hints for the current frame. The size of ME hint buffer should be equal to number of macroblocks * the total number of candidates per macroblock.
- The total number of candidates per MB per direction = 1*meHintCountsPerBlockLx.numCandsPerBlk16x16 + 2*meHintCountsPerBlockLx.numCandsPerBlk16x8 + 2*meHintCountsPerBlockLx.numCandsPerBlk8x8
- + 4*meHintCountsPerBlockLx.numCandsPerBlk8x8. For frames using bidirectional ME , the total number of candidates for single macroblock is sum of total number of candidates per MB for each direction (L0 and L1) */
- uint32_t reserved16; /**< in: Reserved and must be set to 0 */
- void* reserved22; /**< in: Reserved and must be set to NULL */
- int8_t *qpDeltaMap; /**< in: Specifies the pointer to signed byte array containing value per MB for H264, per CTB for HEVC and per SB for AV1 in raster scan order for the current picture, which will be interpreted depending on NV_ENC_RC_PARAMS::qpMapMode.
- If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_DELTA, qpDeltaMap specifies QP modifier per MB for H264, per CTB for HEVC and per SB for AV1. This QP modifier will be applied on top of the QP chosen by rate control.
- If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_EMPHASIS, qpDeltaMap specifies Emphasis Level Map per MB for H264. This level value along with QP chosen by rate control is used to
- compute the QP modifier, which in turn is applied on top of QP chosen by rate control.
- If NV_ENC_RC_PARAMS::qpMapMode is NV_ENC_QP_MAP_DISABLED, value in qpDeltaMap will be ignored.*/
- uint32_t qpDeltaMapSize; /**< in: Specifies the size in bytes of qpDeltaMap surface allocated by client and pointed to by NV_ENC_PIC_PARAMS::qpDeltaMap. Surface (array) should be picWidthInMbs * picHeightInMbs for H264, picWidthInCtbs * picHeightInCtbs for HEVC and 
- picWidthInSbs * picHeightInSbs for AV1 */
- uint32_t reservedBitFields; /**< in: Reserved bitfields and must be set to 0 */
- uint16_t meHintRefPicDist2; /**< in: Specifies temporal distance for reference picture (NVENC_EXTERNAL_ME_HINT::refidx = 0) used during external ME with NV_ENC_INITALIZE_PARAMS::enablePTD = 1 . meHintRefPicDist0 is for L0 hints and meHintRefPicDist1 is for L1 hints.
- If not set, will internally infer distance of 1. Ignored for NV_ENC_INITALIZE_PARAMS::enablePTD = 0 */
- NV_ENC_INPUT_PTR alphaBuffer; /**< in: Specifies the input alpha buffer pointer. Client must use a pointer obtained from ::NvEncCreateInputBuffer() or ::NvEncMapInputResource() APIs.
- Applicable only when encoding hevc with alpha layer is enabled. */
- NVENC_EXTERNAL_ME_SB_HINT *meExternalSbHints; /**< in: For AV1,Specifies the pointer to ME external SB hints for the current frame. The size of ME hint buffer should be equal to meSbHintsCount. */
- uint32_t meSbHintsCount; /**< in: For AV1, specifies the total number of external ME SB hint candidates for the frame
- NV_ENC_PIC_PARAMS::meSbHintsCount must never exceed the total number of SBs in frame * the max number of candidates per SB provided during encoder initialization.
- The max number of candidates per SB is maxMeHintCountsPerBlock0.numCandsPerSb + maxMeHintCountsPerBlock1.numCandsPerSb */
- uint32_t reserved3285; /**< in: Reserved and must be set to 0 */
- void* reserved458; /**< in: Reserved and must be set to NULL */
-} NV_ENC_PIC_PARAMS;
-
-/** Macro for constructing the version field of ::_NV_ENC_PIC_PARAMS */
-#define NV_ENC_PIC_PARAMS_VER (NVENCAPI_STRUCT_VERSION(6) | ( 1<<31 ))
-
-
-/**
- * \struct _NV_ENC_MEONLY_PARAMS
- * MEOnly parameters that need to be sent on a per motion estimation basis.
- * NV_ENC_MEONLY_PARAMS::meExternalHints is supported for H264 only.
- */
-typedef struct _NV_ENC_MEONLY_PARAMS
-{
- uint32_t version; /**< in: Struct version. Must be set to NV_ENC_MEONLY_PARAMS_VER.*/
- uint32_t inputWidth; /**< in: Specifies the input frame width */
- uint32_t inputHeight; /**< in: Specifies the input frame height */
- NV_ENC_INPUT_PTR inputBuffer; /**< in: Specifies the input buffer pointer. Client must use a pointer obtained from NvEncCreateInputBuffer() or NvEncMapInputResource() APIs. */
- NV_ENC_INPUT_PTR referenceFrame; /**< in: Specifies the reference frame pointer */
- NV_ENC_OUTPUT_PTR mvBuffer; /**< in: Specifies the output buffer pointer.
- If NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is set to 0, specifies the pointer to motion vector data buffer allocated by NvEncCreateMVBuffer.
- Client must lock mvBuffer using ::NvEncLockBitstream() API to get the motion vector data.
- If NV_ENC_INITIALIZE_PARAMS::enableOutputInVidmem is set to 1, client should allocate buffer in video memory for storing the motion vector data. The size of this buffer must
- be equal to total number of macroblocks multiplied by size of NV_ENC_H264_MV_DATA struct. Client should use a pointer obtained from ::NvEncMapInputResource() API, when mapping this
- output buffer and assign it to NV_ENC_MEONLY_PARAMS::mvBuffer. All CUDA operations on this buffer must use the default stream. */
- NV_ENC_BUFFER_FORMAT bufferFmt; /**< in: Specifies the input buffer format. */
- void* completionEvent; /**< in: Specifies an event to be signaled on completion of motion estimation
- of this Frame only if operating in Asynchronous mode.
- Each output buffer should be associated with a distinct event pointer. */
- uint32_t viewID; /**< in: Specifies left or right viewID if NV_ENC_CONFIG_H264_MEONLY::bStereoEnable is set.
- viewID can be 0,1 if bStereoEnable is set, 0 otherwise. */
- NVENC_EXTERNAL_ME_HINT_COUNTS_PER_BLOCKTYPE
- meHintCountsPerBlock2; /**< in: Specifies the number of hint candidates per block for the current frame. meHintCountsPerBlock0 is for L0 predictors.
- The candidate count in NV_ENC_PIC_PARAMS::meHintCountsPerBlocklx must never exceed NV_ENC_INITIALIZE_PARAMS::maxMEHintCountsPerBlocklx provided during encoder initialization. */
- NVENC_EXTERNAL_ME_HINT *meExternalHints; /**< in: Specifies the pointer to ME external hints for the current frame. The size of ME hint buffer should be equal to number of macroblocks * the total number of candidates per macroblock.
- The total number of candidates per MB per direction = 1*meHintCountsPerBlockLx.numCandsPerBlk16x16 + 2*meHintCountsPerBlockLx.numCandsPerBlk16x8 + 2*meHintCountsPerBlockLx.numCandsPerBlk8x8
- + 4*meHintCountsPerBlockLx.numCandsPerBlk8x8. For frames using bidirectional ME , the total number of candidates for single macroblock is sum of total number of candidates per MB for each direction (L0 and L1) */
- uint32_t reserved1243; /**< in: Reserved and must be set to 0 */
- void* reserved259; /**< in: Reserved and must be set to NULL */
-} NV_ENC_MEONLY_PARAMS;
-
-/** NV_ENC_MEONLY_PARAMS struct version*/
-#define NV_ENC_MEONLY_PARAMS_VER NVENCAPI_STRUCT_VERSION(3)
-
-
-/**
- * \struct _NV_ENC_LOCK_BITSTREAM
- * Bitstream buffer lock parameters.
- */
-typedef struct _NV_ENC_LOCK_BITSTREAM
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_LOCK_BITSTREAM_VER. */
- uint32_t doNotWait :1; /**< in: If this flag is set, the NvEncodeAPI interface will return buffer pointer even if operation is not completed. If not set, the call will block until operation completes. */
- uint32_t ltrFrame :1; /**< out: Flag indicating this frame is marked as LTR frame */
- uint32_t getRCStats :1; /**< in: If this flag is set then lockBitstream call will add additional intra-inter MB count and average MVX, MVY */
- uint32_t reservedBitFields :29; /**< in: Reserved bit fields and must be set to 0 */
- void* outputBitstream; /**< in: Pointer to the bitstream buffer being locked. */
- uint32_t* sliceOffsets; /**< in, out: Array which receives the slice (H264/HEVC) or tile (AV1) offsets. This is not supported if NV_ENC_CONFIG_H264::sliceMode is 1 on Kepler GPUs. Array size must be equal to size of frame in MBs. */
- uint32_t frameIdx; /**< out: Frame no. for which the bitstream is being retrieved. */
- uint32_t hwEncodeStatus; /**< out: The NvEncodeAPI interface status for the locked picture. */
- uint32_t numSlices; /**< out: Number of slices (H264/HEVC) or tiles (AV1) in the encoded picture. Will be reported only if NV_ENC_INITIALIZE_PARAMS::reportSliceOffsets set to 1. */
- uint32_t bitstreamSizeInBytes; /**< out: Actual number of bytes generated and copied to the memory pointed by bitstreamBufferPtr.
- When HEVC alpha layer encoding is enabled, this field reports the total encoded size in bytes i.e it is the encoded size of the base plus the alpha layer. 
- For AV1 when enablePTD is set, this field reports the total encoded size in bytes of all the encoded frames packed into the current output surface i.e. show frame plus all preceding no-show frames */
- uint64_t outputTimeStamp; /**< out: Presentation timestamp associated with the encoded output. */
- uint64_t outputDuration; /**< out: Presentation duration associates with the encoded output. */
- void* bitstreamBufferPtr; /**< out: Pointer to the generated output bitstream.
- For MEOnly mode _NV_ENC_LOCK_BITSTREAM::bitstreamBufferPtr should be typecast to
- NV_ENC_H264_MV_DATA/NV_ENC_HEVC_MV_DATA pointer respectively for H264/HEVC */
- NV_ENC_PIC_TYPE pictureType; /**< out: Picture type of the encoded picture. */
- NV_ENC_PIC_STRUCT pictureStruct; /**< out: Structure of the generated output picture. */
- uint32_t frameAvgQP; /**< out: Average QP of the frame. */
- uint32_t frameSatd; /**< out: Total SATD cost for whole frame. */
- uint32_t ltrFrameIdx; /**< out: Frame index associated with this LTR frame. */
- uint32_t ltrFrameBitmap; /**< out: Bitmap of LTR frames indices which were used for encoding this frame. Value of 0 if no LTR frames were used. */
- uint32_t temporalId; /**< out: TemporalId value of the frame when using temporalSVC encoding */
- uint32_t reserved12; /**< in: Reserved and must be set to 0 */
- uint32_t intraMBCount; /**< out: For H264, Number of Intra MBs in the encoded frame. For HEVC, Number of Intra CTBs in the encoded frame. For AV1, Number of Intra SBs in the encoded show frame. Supported only if _NV_ENC_LOCK_BITSTREAM::getRCStats set to 1. */
- uint32_t interMBCount; /**< out: For H264, Number of Inter MBs in the encoded frame, includes skip MBs. For HEVC, Number of Inter CTBs in the encoded frame. For AV1, Number of Inter SBs in the encoded show frame. Supported only if _NV_ENC_LOCK_BITSTREAM::getRCStats set to 1. */
- int32_t averageMVX; /**< out: Average Motion Vector in X direction for the encoded frame. Supported only if _NV_ENC_LOCK_BITSTREAM::getRCStats set to 1. */
- int32_t averageMVY; /**< out: Average Motion Vector in y direction for the encoded frame. Supported only if _NV_ENC_LOCK_BITSTREAM::getRCStats set to 1. */
- uint32_t alphaLayerSizeInBytes; /**< out: Number of bytes generated for the alpha layer in the encoded output. Applicable only when HEVC with alpha encoding is enabled. */
-
- uint32_t reserved1218; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_LOCK_BITSTREAM;
-
-/** Macro for constructing the version field of ::_NV_ENC_LOCK_BITSTREAM */
-#define NV_ENC_LOCK_BITSTREAM_VER NVENCAPI_STRUCT_VERSION(2)
-
-
-/**
- * \struct _NV_ENC_LOCK_INPUT_BUFFER
- * Uncompressed Input Buffer lock parameters.
- */
-typedef struct _NV_ENC_LOCK_INPUT_BUFFER
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_LOCK_INPUT_BUFFER_VER. */
- uint32_t doNotWait :1; /**< in: Set to 1 to make ::NvEncLockInputBuffer() a unblocking call. If the encoding is not completed, driver will return ::NV_ENC_ERR_ENCODER_BUSY error code. */
- uint32_t reservedBitFields :31; /**< in: Reserved bitfields and must be set to 0 */
- NV_ENC_INPUT_PTR inputBuffer; /**< in: Pointer to the input buffer to be locked, client should pass the pointer obtained from ::NvEncCreateInputBuffer() or ::NvEncMapInputResource API. */
- void* bufferDataPtr; /**< out: Pointed to the locked input buffer data. Client can only access input buffer using the \p bufferDataPtr. */
- uint32_t pitch; /**< out: Pitch of the locked input buffer. */
- uint32_t reserved1251; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_LOCK_INPUT_BUFFER;
-
-/** Macro for constructing the version field of ::_NV_ENC_LOCK_INPUT_BUFFER */
-#define NV_ENC_LOCK_INPUT_BUFFER_VER NVENCAPI_STRUCT_VERSION(1)
-
-
-/**
- * \struct _NV_ENC_MAP_INPUT_RESOURCE
- * Map an input resource to a Nvidia Encoder Input Buffer
- */
-typedef struct _NV_ENC_MAP_INPUT_RESOURCE
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_MAP_INPUT_RESOURCE_VER. */
- uint32_t subResourceIndex; /**< in: Deprecated. Do not use. */
- void* inputResource; /**< in: Deprecated. Do not use. */
- NV_ENC_REGISTERED_PTR registeredResource; /**< in: The Registered resource handle obtained by calling NvEncRegisterInputResource. */
- NV_ENC_INPUT_PTR mappedResource; /**< out: Mapped pointer corresponding to the registeredResource. This pointer must be used in NV_ENC_PIC_PARAMS::inputBuffer parameter in ::NvEncEncodePicture() API. */
- NV_ENC_BUFFER_FORMAT mappedBufferFmt; /**< out: Buffer format of the outputResource. This buffer format must be used in NV_ENC_PIC_PARAMS::bufferFmt if client using the above mapped resource pointer. */
- uint32_t reserved1251; /**< in: Reserved and must be set to 0. */
- void* reserved263; /**< in: Reserved and must be set to NULL */
-} NV_ENC_MAP_INPUT_RESOURCE;
-
-/** Macro for constructing the version field of ::_NV_ENC_MAP_INPUT_RESOURCE */
-#define NV_ENC_MAP_INPUT_RESOURCE_VER NVENCAPI_STRUCT_VERSION(4)
-
-/**
- * \struct _NV_ENC_INPUT_RESOURCE_OPENGL_TEX
- * NV_ENC_REGISTER_RESOURCE::resourceToRegister must be a pointer to a variable of this type,
- * when NV_ENC_REGISTER_RESOURCE::resourceType is NV_ENC_INPUT_RESOURCE_TYPE_OPENGL_TEX
- */
-typedef struct _NV_ENC_INPUT_RESOURCE_OPENGL_TEX
-{
- uint32_t texture; /**< in: The name of the texture to be used. */
- uint32_t target; /**< in: Accepted values are GL_TEXTURE_RECTANGLE and GL_TEXTURE_2D. */
-} NV_ENC_INPUT_RESOURCE_OPENGL_TEX;
-
-/** \struct NV_ENC_FENCE_POINT_D3D12
-* Fence and fence value for synchronization.
-*/
-typedef struct _NV_ENC_FENCE_POINT_D3D12
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_FENCE_POINT_D3D12_VER. */
- uint32_t reserved; /**< in: Reserved and must be set to 0. */
- void* pFence; /**< in: Pointer to ID3D12Fence. This fence object is used for synchronization. */
- uint64_t waitValue; /**< in: Fence value to reach or exceed before the GPU operation. */
- uint64_t signalValue; /**< in: Fence value to set the fence to, after the GPU operation. */
- uint32_t bWait:1; /**< in: Wait on 'waitValue' if bWait is set to 1, before starting GPU operation. */
- uint32_t bSignal:1; /**< in: Signal on 'signalValue' if bSignal is set to 1, after GPU operation is complete. */
- uint32_t reservedBitField:30; /**< in: Reserved and must be set to 0. */
- uint32_t reserved17; /**< in: Reserved and must be set to 0. */
-} NV_ENC_FENCE_POINT_D3D12;
-
-#define NV_ENC_FENCE_POINT_D3D12_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * \struct _NV_ENC_INPUT_RESOURCE_D3D12
- * NV_ENC_PIC_PARAMS::inputBuffer and NV_ENC_PIC_PARAMS::alphaBuffer must be a pointer to a struct of this type,
- * when D3D12 interface is used
- */
-typedef struct _NV_ENC_INPUT_RESOURCE_D3D12
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_INPUT_RESOURCE_D3D12_VER. */
- uint32_t reserved; /**< in: Reserved and must be set to 0. */
- NV_ENC_INPUT_PTR pInputBuffer; /**< in: Specifies the input surface pointer. Client must use a pointer obtained from NvEncMapInputResource() in NV_ENC_MAP_INPUT_RESOURCE::mappedResource
- when mapping the input surface. */
- NV_ENC_FENCE_POINT_D3D12 inputFencePoint; /**< in: Specifies the fence and corresponding fence values to do GPU wait and signal. */
- uint32_t reserved116; /**< in: Reserved and must be set to 0. */
- void* reserved216; /**< in: Reserved and must be set to NULL. */
-} NV_ENC_INPUT_RESOURCE_D3D12;
-
-#define NV_ENC_INPUT_RESOURCE_D3D12_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * \struct _NV_ENC_OUTPUT_RESOURCE_D3D12
- * NV_ENC_PIC_PARAMS::outputBitstream and NV_ENC_LOCK_BITSTREAM::outputBitstream must be a pointer to a struct of this type,
- * when D3D12 interface is used
- */
-typedef struct _NV_ENC_OUTPUT_RESOURCE_D3D12
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_OUTPUT_RESOURCE_D3D12_VER. */
- uint32_t reserved; /**< in: Reserved and must be set to 0. */
- NV_ENC_INPUT_PTR pOutputBuffer; /**< in: Specifies the output buffer pointer. Client must use a pointer obtained from NvEncMapInputResource() in NV_ENC_MAP_INPUT_RESOURCE::mappedResource
- when mapping output bitstream buffer */
- NV_ENC_FENCE_POINT_D3D12 outputFencePoint; /**< in: Specifies the fence and corresponding fence values to do GPU wait and signal.*/
- uint32_t reserved116; /**< in: Reserved and must be set to 0. */
- void* reserved216; /**< in: Reserved and must be set to NULL. */
-} NV_ENC_OUTPUT_RESOURCE_D3D12;
-
-#define NV_ENC_OUTPUT_RESOURCE_D3D12_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * \struct _NV_ENC_REGISTER_RESOURCE
- * Register a resource for future use with the Nvidia Video Encoder Interface.
- */
-typedef struct _NV_ENC_REGISTER_RESOURCE
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_REGISTER_RESOURCE_VER. */
- NV_ENC_INPUT_RESOURCE_TYPE resourceType; /**< in: Specifies the type of resource to be registered.
- Supported values are
- ::NV_ENC_INPUT_RESOURCE_TYPE_DIRECTX,
- ::NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR,
- ::NV_ENC_INPUT_RESOURCE_TYPE_OPENGL_TEX */
- uint32_t width; /**< in: Input frame width. */
- uint32_t height; /**< in: Input frame height. */
- uint32_t pitch; /**< in: Input buffer pitch.
- For ::NV_ENC_INPUT_RESOURCE_TYPE_DIRECTX resources, set this to 0.
- For ::NV_ENC_INPUT_RESOURCE_TYPE_CUDADEVICEPTR resources, set this to
- the pitch as obtained from cuMemAllocPitch(), or to the width in
- bytes (if this resource was created by using cuMemAlloc()). This
- value must be a multiple of 4.
- For ::NV_ENC_INPUT_RESOURCE_TYPE_CUDAARRAY resources, set this to the
- width of the allocation in bytes (i.e.
- CUDA_ARRAY3D_DESCRIPTOR::Width * CUDA_ARRAY3D_DESCRIPTOR::NumChannels).
- For ::NV_ENC_INPUT_RESOURCE_TYPE_OPENGL_TEX resources, set this to the
- texture width multiplied by the number of components in the texture
- format. */
- uint32_t subResourceIndex; /**< in: Subresource Index of the DirectX resource to be registered. Should be set to 0 for other interfaces. */
- void* resourceToRegister; /**< in: Handle to the resource that is being registered. */
- NV_ENC_REGISTERED_PTR registeredResource; /**< out: Registered resource handle. This should be used in future interactions with the Nvidia Video Encoder Interface. */
- NV_ENC_BUFFER_FORMAT bufferFormat; /**< in: Buffer format of resource to be registered. */
- NV_ENC_BUFFER_USAGE bufferUsage; /**< in: Usage of resource to be registered. */
- NV_ENC_FENCE_POINT_D3D12* pInputFencePoint; /**< in: Specifies the input fence and corresponding fence values to do GPU wait and signal.
- To be used only when NV_ENC_REGISTER_RESOURCE::resourceToRegister represents D3D12 surface and
- NV_ENC_BUFFER_USAGE::bufferUsage is NV_ENC_INPUT_IMAGE.
- The fence NV_ENC_FENCE_POINT_D3D12::pFence and NV_ENC_FENCE_POINT_D3D12::waitValue will be used to do GPU wait 
- before starting GPU operation, if NV_ENC_FENCE_POINT_D3D12::bWait is set. 
- The fence NV_ENC_FENCE_POINT_D3D12::pFence and NV_ENC_FENCE_POINT_D3D12::signalValue will be used to do GPU signal 
- when GPU operation finishes, if NV_ENC_FENCE_POINT_D3D12::bSignal is set. */
- uint32_t reserved1247; /**< in: Reserved and must be set to 0. */
- void* reserved261; /**< in: Reserved and must be set to NULL. */
-} NV_ENC_REGISTER_RESOURCE;
-
-/** Macro for constructing the version field of ::_NV_ENC_REGISTER_RESOURCE */
-#define NV_ENC_REGISTER_RESOURCE_VER NVENCAPI_STRUCT_VERSION(4)
-
-/**
- * \struct _NV_ENC_STAT
- * Encode Stats structure.
- */
-typedef struct _NV_ENC_STAT
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_STAT_VER. */
- uint32_t reserved; /**< in: Reserved and must be set to 0 */
- NV_ENC_OUTPUT_PTR outputBitStream; /**< out: Specifies the pointer to output bitstream. */
- uint32_t bitStreamSize; /**< out: Size of generated bitstream in bytes. */
- uint32_t picType; /**< out: Picture type of encoded picture. See ::NV_ENC_PIC_TYPE. */
- uint32_t lastValidByteOffset; /**< out: Offset of last valid bytes of completed bitstream */
- uint32_t sliceOffsets16; /**< out: Offsets of each slice */
- uint32_t picIdx; /**< out: Picture number */
- uint32_t frameAvgQP; /**< out: Average QP of the frame. */
- uint32_t ltrFrame :1; /**< out: Flag indicating this frame is marked as LTR frame */
- uint32_t reservedBitFields :31; /**< in: Reserved bit fields and must be set to 0 */
- uint32_t ltrFrameIdx; /**< out: Frame index associated with this LTR frame. */
- uint32_t intraMBCount; /**< out: For H264, Number of Intra MBs in the encoded frame. For HEVC, Number of Intra CTBs in the encoded frame. */
- uint32_t interMBCount; /**< out: For H264, Number of Inter MBs in the encoded frame, includes skip MBs. For HEVC, Number of Inter CTBs in the encoded frame. */
- int32_t averageMVX; /**< out: Average Motion Vector in X direction for the encoded frame. */
- int32_t averageMVY; /**< out: Average Motion Vector in y direction for the encoded frame. */
- uint32_t reserved1226; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_STAT;
-
-/** Macro for constructing the version field of ::_NV_ENC_STAT */
-#define NV_ENC_STAT_VER NVENCAPI_STRUCT_VERSION(1)
-
-
-/**
- * \struct _NV_ENC_SEQUENCE_PARAM_PAYLOAD
- * Sequence and picture paramaters payload.
- */
-typedef struct _NV_ENC_SEQUENCE_PARAM_PAYLOAD
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_INITIALIZE_PARAMS_VER. */
- uint32_t inBufferSize; /**< in: Specifies the size of the spsppsBuffer provided by the client */
- uint32_t spsId; /**< in: Specifies the SPS id to be used in sequence header. Default value is 0. */
- uint32_t ppsId; /**< in: Specifies the PPS id to be used in picture header. Default value is 0. */
- void* spsppsBuffer; /**< in: Specifies bitstream header pointer of size NV_ENC_SEQUENCE_PARAM_PAYLOAD::inBufferSize.
- It is the client's responsibility to manage this memory. */
- uint32_t* outSPSPPSPayloadSize; /**< out: Size of the sequence and picture header in bytes. */
- uint32_t reserved 250; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_SEQUENCE_PARAM_PAYLOAD;
-
-/** Macro for constructing the version field of ::_NV_ENC_SEQUENCE_PARAM_PAYLOAD */
-#define NV_ENC_SEQUENCE_PARAM_PAYLOAD_VER NVENCAPI_STRUCT_VERSION(1)
-
-
-/**
- * Event registration/unregistration parameters.
- */
-typedef struct _NV_ENC_EVENT_PARAMS
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_EVENT_PARAMS_VER. */
- uint32_t reserved; /**< in: Reserved and must be set to 0 */
- void* completionEvent; /**< in: Handle to event to be registered/unregistered with the NvEncodeAPI interface. */
- uint32_t reserved1253; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_EVENT_PARAMS;
-
-/** Macro for constructing the version field of ::_NV_ENC_EVENT_PARAMS */
-#define NV_ENC_EVENT_PARAMS_VER NVENCAPI_STRUCT_VERSION(1)
-
-/**
- * Encoder Session Creation parameters
- */
-typedef struct _NV_ENC_OPEN_ENCODE_SESSIONEX_PARAMS
-{
- uint32_t version; /**< in: Struct version. Must be set to ::NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER. */
- NV_ENC_DEVICE_TYPE deviceType; /**< in: Specified the device Type */
- void* device; /**< in: Pointer to client device. */
- void* reserved; /**< in: Reserved and must be set to 0. */
- uint32_t apiVersion; /**< in: API version. Should be set to NVENCAPI_VERSION. */
- uint32_t reserved1253; /**< in: Reserved and must be set to 0 */
- void* reserved264; /**< in: Reserved and must be set to NULL */
-} NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS;
-/** Macro for constructing the version field of ::_NV_ENC_OPEN_ENCODE_SESSIONEX_PARAMS */
-#define NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER NVENCAPI_STRUCT_VERSION(1)
-
-/** @} */ /* END ENCODER_STRUCTURE */
-
-
-/**
- * \addtogroup ENCODE_FUNC NvEncodeAPI Functions
- * @{
- */
-
-// NvEncOpenEncodeSession
-/**
- * \brief Opens an encoding session.
- *
- * Deprecated.
- *
- * \return
- * ::NV_ENC_ERR_INVALID_CALL\n
- *
- */
-NVENCSTATUS NVENCAPI NvEncOpenEncodeSession (void* device, uint32_t deviceType, void** encoder);
-
-// NvEncGetEncodeGuidCount
-/**
- * \brief Retrieves the number of supported encode GUIDs.
- *
- * The function returns the number of codec GUIDs supported by the NvEncodeAPI
- * interface.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param out encodeGUIDCount
- * Number of supported encode GUIDs.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodeGUIDCount (void* encoder, uint32_t* encodeGUIDCount);
-
-
-// NvEncGetEncodeGUIDs
-/**
- * \brief Retrieves an array of supported encoder codec GUIDs.
- *
- * The function returns an array of codec GUIDs supported by the NvEncodeAPI interface.
- * The client must allocate an array where the NvEncodeAPI interface can
- * fill the supported GUIDs and pass the pointer in \p *GUIDs parameter.
- * The size of the array can be determined by using ::NvEncGetEncodeGUIDCount() API.
- * The Nvidia Encoding interface returns the number of codec GUIDs it has actually
- * filled in the GUID array in the \p GUIDCount parameter.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in guidArraySize
- * Number of GUIDs to retrieved. Should be set to the number retrieved using
- * ::NvEncGetEncodeGUIDCount.
- * \param out GUIDs
- * Array of supported Encode GUIDs.
- * \param out GUIDCount
- * Number of supported Encode GUIDs.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodeGUIDs (void* encoder, GUID* GUIDs, uint32_t guidArraySize, uint32_t* GUIDCount);
-
-
-// NvEncGetEncodeProfileGuidCount
-/**
- * \brief Retrieves the number of supported profile GUIDs.
- *
- * The function returns the number of profile GUIDs supported for a given codec.
- * The client must first enumerate the codec GUIDs supported by the NvEncodeAPI
- * interface. After determining the codec GUID, it can query the NvEncodeAPI
- * interface to determine the number of profile GUIDs supported for a particular
- * codec GUID.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * The codec GUID for which the profile GUIDs are being enumerated.
- * \param out encodeProfileGUIDCount
- * Number of encode profiles supported for the given encodeGUID.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodeProfileGUIDCount (void* encoder, GUID encodeGUID, uint32_t* encodeProfileGUIDCount);
-
-
-// NvEncGetEncodeProfileGUIDs
-/**
- * \brief Retrieves an array of supported encode profile GUIDs.
- *
- * The function returns an array of supported profile GUIDs for a particular
- * codec GUID. The client must allocate an array where the NvEncodeAPI interface
- * can populate the profile GUIDs. The client can determine the array size using
- * ::NvEncGetEncodeProfileGUIDCount() API. The client must also validiate that the
- * NvEncodeAPI interface supports the GUID the client wants to pass as \p encodeGUID
- * parameter.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * The encode GUID whose profile GUIDs are being enumerated.
- * \param in guidArraySize
- * Number of GUIDs to be retrieved. Should be set to the number retrieved using
- * ::NvEncGetEncodeProfileGUIDCount.
- * \param out profileGUIDs
- * Array of supported Encode Profile GUIDs
- * \param out GUIDCount
- * Number of valid encode profile GUIDs in \p profileGUIDs array.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodeProfileGUIDs (void* encoder, GUID encodeGUID, GUID* profileGUIDs, uint32_t guidArraySize, uint32_t* GUIDCount);
-
-// NvEncGetInputFormatCount
-/**
- * \brief Retrieve the number of supported Input formats.
- *
- * The function returns the number of supported input formats. The client must
- * query the NvEncodeAPI interface to determine the supported input formats
- * before creating the input surfaces.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * Encode GUID, corresponding to which the number of supported input formats
- * is to be retrieved.
- * \param out inputFmtCount
- * Number of input formats supported for specified Encode GUID.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- */
-NVENCSTATUS NVENCAPI NvEncGetInputFormatCount (void* encoder, GUID encodeGUID, uint32_t* inputFmtCount);
-
-
-// NvEncGetInputFormats
-/**
- * \brief Retrieves an array of supported Input formats
- *
- * Returns an array of supported input formats The client must use the input
- * format to create input surface using ::NvEncCreateInputBuffer() API.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * Encode GUID, corresponding to which the number of supported input formats
- * is to be retrieved.
- *\param in inputFmtArraySize
- * Size input format count array passed in \p inputFmts.
- *\param out inputFmts
- * Array of input formats supported for this Encode GUID.
- *\param out inputFmtCount
- * The number of valid input format types returned by the NvEncodeAPI
- * interface in \p inputFmts array.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetInputFormats (void* encoder, GUID encodeGUID, NV_ENC_BUFFER_FORMAT* inputFmts, uint32_t inputFmtArraySize, uint32_t* inputFmtCount);
-
-
-// NvEncGetEncodeCaps
-/**
- * \brief Retrieves the capability value for a specified encoder attribute.
- *
- * The function returns the capability value for a given encoder attribute. The
- * client must validate the encodeGUID using ::NvEncGetEncodeGUIDs() API before
- * calling this function. The encoder attribute being queried are enumerated in
- * ::NV_ENC_CAPS_PARAM enum.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * Encode GUID, corresponding to which the capability attribute is to be retrieved.
- * \param in capsParam
- * Used to specify attribute being queried. Refer ::NV_ENC_CAPS_PARAM for more
- * details.
- * \param out capsVal
- * The value corresponding to the capability attribute being queried.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodeCaps (void* encoder, GUID encodeGUID, NV_ENC_CAPS_PARAM* capsParam, int* capsVal);
-
-
-// NvEncGetEncodePresetCount
-/**
- * \brief Retrieves the number of supported preset GUIDs.
- *
- * The function returns the number of preset GUIDs available for a given codec.
- * The client must validate the codec GUID using ::NvEncGetEncodeGUIDs() API
- * before calling this function.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * Encode GUID, corresponding to which the number of supported presets is to
- * be retrieved.
- * \param out encodePresetGUIDCount
- * Receives the number of supported preset GUIDs.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodePresetCount (void* encoder, GUID encodeGUID, uint32_t* encodePresetGUIDCount);
-
-
-// NvEncGetEncodePresetGUIDs
-/**
- * \brief Receives an array of supported encoder preset GUIDs.
- *
- * The function returns an array of encode preset GUIDs available for a given codec.
- * The client can directly use one of the preset GUIDs based upon the use case
- * or target device. The preset GUID chosen can be directly used in
- * NV_ENC_INITIALIZE_PARAMS::presetGUID parameter to ::NvEncEncodePicture() API.
- * Alternately client can also use the preset GUID to retrieve the encoding config
- * parameters being used by NvEncodeAPI interface for that given preset, using
- * ::NvEncGetEncodePresetConfig() API. It can then modify preset config parameters
- * as per its use case and send it to NvEncodeAPI interface as part of
- * NV_ENC_INITIALIZE_PARAMS::encodeConfig parameter for NvEncInitializeEncoder()
- * API.
- *
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * Encode GUID, corresponding to which the list of supported presets is to be
- * retrieved.
- * \param in guidArraySize
- * Size of array of preset GUIDs passed in \p preset GUIDs
- * \param out presetGUIDs
- * Array of supported Encode preset GUIDs from the NvEncodeAPI interface
- * to client.
- * \param out encodePresetGUIDCount
- * Receives the number of preset GUIDs returned by the NvEncodeAPI
- * interface.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodePresetGUIDs (void* encoder, GUID encodeGUID, GUID* presetGUIDs, uint32_t guidArraySize, uint32_t* encodePresetGUIDCount);
-
-
-// NvEncGetEncodePresetConfig
-/**
- * \brief Returns a preset config structure supported for given preset GUID.
- *
- * The function returns a preset config structure for a given preset GUID.
- * NvEncGetEncodePresetConfig() API is not applicable to AV1.
- * Before using this function the client must enumerate the preset GUIDs available for
- * a given codec. The preset config structure can be modified by the client depending
- * upon its use case and can be then used to initialize the encoder using
- * ::NvEncInitializeEncoder() API. The client can use this function only if it
- * wants to modify the NvEncodeAPI preset configuration, otherwise it can
- * directly use the preset GUID.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * Encode GUID, corresponding to which the list of supported presets is to be
- * retrieved.
- * \param in presetGUID
- * Preset GUID, corresponding to which the Encoding configurations is to be
- * retrieved.
- * \param out presetConfig
- * The requested Preset Encoder Attribute set. Refer ::_NV_ENC_CONFIG for
-* more details.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodePresetConfig (void* encoder, GUID encodeGUID, GUID presetGUID, NV_ENC_PRESET_CONFIG* presetConfig);
-
-// NvEncGetEncodePresetConfigEx
-/**
- * \brief Returns a preset config structure supported for given preset GUID.
- *
- * The function returns a preset config structure for a given preset GUID and tuning info.
- * NvEncGetEncodePresetConfigEx() API is not applicable to H264 and HEVC meonly mode.
- * Before using this function the client must enumerate the preset GUIDs available for
- * a given codec. The preset config structure can be modified by the client depending
- * upon its use case and can be then used to initialize the encoder using
- * ::NvEncInitializeEncoder() API. The client can use this function only if it
- * wants to modify the NvEncodeAPI preset configuration, otherwise it can
- * directly use the preset GUID.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encodeGUID
- * Encode GUID, corresponding to which the list of supported presets is to be
- * retrieved.
- * \param in presetGUID
- * Preset GUID, corresponding to which the Encoding configurations is to be
- * retrieved.
- * \param in tuningInfo
- * tuning info, corresponding to which the Encoding configurations is to be
- * retrieved.
- * \param out presetConfig
- * The requested Preset Encoder Attribute set. Refer ::_NV_ENC_CONFIG for
- * more details.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodePresetConfigEx (void* encoder, GUID encodeGUID, GUID presetGUID, NV_ENC_TUNING_INFO tuningInfo, NV_ENC_PRESET_CONFIG* presetConfig);
-
-// NvEncInitializeEncoder
-/**
- * \brief Initialize the encoder.
- *
- * This API must be used to initialize the encoder. The initialization parameter
- * is passed using \p *createEncodeParams The client must send the following
- * fields of the _NV_ENC_INITIALIZE_PARAMS structure with a valid value.
- * - NV_ENC_INITIALIZE_PARAMS::encodeGUID
- * - NV_ENC_INITIALIZE_PARAMS::encodeWidth
- * - NV_ENC_INITIALIZE_PARAMS::encodeHeight
- *
- * The client can pass a preset GUID directly to the NvEncodeAPI interface using
- * NV_ENC_INITIALIZE_PARAMS::presetGUID field. If the client doesn't pass
- * NV_ENC_INITIALIZE_PARAMS::encodeConfig structure, the codec specific parameters
- * will be selected based on the preset GUID. The preset GUID must have been
- * validated by the client using ::NvEncGetEncodePresetGUIDs() API.
- * If the client passes a custom ::_NV_ENC_CONFIG structure through
- * NV_ENC_INITIALIZE_PARAMS::encodeConfig , it will override the codec specific parameters
- * based on the preset GUID. It is recommended that even if the client passes a custom config,
- * it should also send a preset GUID. In this case, the preset GUID passed by the client
- * will not override any of the custom config parameters programmed by the client,
- * it is only used as a hint by the NvEncodeAPI interface to determine certain encoder parameters
- * which are not exposed to the client.
- *
- * There are two modes of operation for the encoder namely:
- * - Asynchronous mode
- * - Synchronous mode
- *
- * The client can select asynchronous or synchronous mode by setting the \p
- * enableEncodeAsync field in ::_NV_ENC_INITIALIZE_PARAMS to 1 or 0 respectively.
- *\par Asynchronous mode of operation:
- * The Asynchronous mode can be enabled by setting NV_ENC_INITIALIZE_PARAMS::enableEncodeAsync to 1.
- * The client operating in asynchronous mode must allocate completion event object
- * for each output buffer and pass the completion event object in the
- * ::NvEncEncodePicture() API. The client can create another thread and wait on
- * the event object to be signaled by NvEncodeAPI interface on completion of the
- * encoding process for the output frame. This should unblock the main thread from
- * submitting work to the encoder. When the event is signaled the client can call
- * NvEncodeAPI interfaces to copy the bitstream data using ::NvEncLockBitstream()
- * API. This is the preferred mode of operation.
- *
- * NOTE: Asynchronous mode is not supported on Linux.
- *
- *\par Synchronous mode of operation:
- * The client can select synchronous mode by setting NV_ENC_INITIALIZE_PARAMS::enableEncodeAsync to 0.
- * The client working in synchronous mode can work in a single threaded or multi
- * threaded mode. The client need not allocate any event objects. The client can
- * only lock the bitstream data after NvEncodeAPI interface has returned
- * ::NV_ENC_SUCCESS from encode picture. The NvEncodeAPI interface can return
- * ::NV_ENC_ERR_NEED_MORE_INPUT error code from ::NvEncEncodePicture() API. The
- * client must not lock the output buffer in such case but should send the next
- * frame for encoding. The client must keep on calling ::NvEncEncodePicture() API
- * until it returns ::NV_ENC_SUCCESS. \n
- * The client must always lock the bitstream data in order in which it has submitted.
- * This is true for both asynchronous and synchronous mode.
- *
- *\par Picture type decision:
- * If the client is taking the picture type decision and it must disable the picture
- * type decision module in NvEncodeAPI by setting NV_ENC_INITIALIZE_PARAMS::enablePTD
- * to 0. In this case the client is required to send the picture in encoding
- * order to NvEncodeAPI by doing the re-ordering for B frames. \n
- * If the client doesn't want to take the picture type decision it can enable
- * picture type decision module in the NvEncodeAPI interface by setting
- * NV_ENC_INITIALIZE_PARAMS::enablePTD to 1 and send the input pictures in display
- * order.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in createEncodeParams
- * Refer ::_NV_ENC_INITIALIZE_PARAMS for details.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncInitializeEncoder (void* encoder, NV_ENC_INITIALIZE_PARAMS* createEncodeParams);
-
-
-// NvEncCreateInputBuffer
-/**
- * \brief Allocates Input buffer.
- *
- * This function is used to allocate an input buffer. The client must enumerate
- * the input buffer format before allocating the input buffer resources. The
- * NV_ENC_INPUT_PTR returned by the NvEncodeAPI interface in the
- * NV_ENC_CREATE_INPUT_BUFFER::inputBuffer field can be directly used in
- * ::NvEncEncodePicture() API. The number of input buffers to be allocated by the
- * client must be at least 4 more than the number of B frames being used for encoding.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out createInputBufferParams
- * Pointer to the ::NV_ENC_CREATE_INPUT_BUFFER structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncCreateInputBuffer (void* encoder, NV_ENC_CREATE_INPUT_BUFFER* createInputBufferParams);
-
-
-// NvEncDestroyInputBuffer
-/**
- * \brief Release an input buffers.
- *
- * This function is used to free an input buffer. If the client has allocated
- * any input buffer using ::NvEncCreateInputBuffer() API, it must free those
- * input buffers by calling this function. The client must release the input
- * buffers before destroying the encoder using ::NvEncDestroyEncoder() API.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in inputBuffer
- * Pointer to the input buffer to be released.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncDestroyInputBuffer (void* encoder, NV_ENC_INPUT_PTR inputBuffer);
-
-// NvEncSetIOCudaStreams
-/**
- * \brief Set input and output CUDA stream for specified encoder attribute.
- *
- * Encoding may involve CUDA pre-processing on the input and post-processing on encoded output.
- * This function is used to set input and output CUDA streams to pipeline the CUDA pre-processing
- * and post-processing tasks. Clients should call this function before the call to
- * NvEncUnlockInputBuffer(). If this function is not called, the default CUDA stream is used for
- * input and output processing. After a successful call to this function, the streams specified
- * in that call will replace the previously-used streams.
- * This API is supported for NVCUVID interface only.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in inputStream
- * Pointer to CUstream which is used to process ::NV_ENC_PIC_PARAMS::inputFrame for encode.
- * In case of ME-only mode, inputStream is used to process ::NV_ENC_MEONLY_PARAMS::inputBuffer and
- * ::NV_ENC_MEONLY_PARAMS::referenceFrame
- * \param in outputStream
- * Pointer to CUstream which is used to process ::NV_ENC_PIC_PARAMS::outputBuffer for encode.
- * In case of ME-only mode, outputStream is used to process ::NV_ENC_MEONLY_PARAMS::mvBuffer
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_GENERIC \n
- */
-NVENCSTATUS NVENCAPI NvEncSetIOCudaStreams (void* encoder, NV_ENC_CUSTREAM_PTR inputStream, NV_ENC_CUSTREAM_PTR outputStream);
-
-
-// NvEncCreateBitstreamBuffer
-/**
- * \brief Allocates an output bitstream buffer
- *
- * This function is used to allocate an output bitstream buffer and returns a
- * NV_ENC_OUTPUT_PTR to bitstream buffer to the client in the
- * NV_ENC_CREATE_BITSTREAM_BUFFER::bitstreamBuffer field.
- * The client can only call this function after the encoder session has been
- * initialized using ::NvEncInitializeEncoder() API. The minimum number of output
- * buffers allocated by the client must be at least 4 more than the number of B
- * B frames being used for encoding. The client can only access the output
- * bitstream data by locking the \p bitstreamBuffer using the ::NvEncLockBitstream()
- * function.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out createBitstreamBufferParams
- * Pointer ::NV_ENC_CREATE_BITSTREAM_BUFFER for details.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncCreateBitstreamBuffer (void* encoder, NV_ENC_CREATE_BITSTREAM_BUFFER* createBitstreamBufferParams);
-
-
-// NvEncDestroyBitstreamBuffer
-/**
- * \brief Release a bitstream buffer.
- *
- * This function is used to release the output bitstream buffer allocated using
- * the ::NvEncCreateBitstreamBuffer() function. The client must release the output
- * bitstreamBuffer using this function before destroying the encoder session.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in bitstreamBuffer
- * Pointer to the bitstream buffer being released.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncDestroyBitstreamBuffer (void* encoder, NV_ENC_OUTPUT_PTR bitstreamBuffer);
-
-// NvEncEncodePicture
-/**
- * \brief Submit an input picture for encoding.
- *
- * This function is used to submit an input picture buffer for encoding. The
- * encoding parameters are passed using \p *encodePicParams which is a pointer
- * to the ::_NV_ENC_PIC_PARAMS structure.
- *
- * If the client has set NV_ENC_INITIALIZE_PARAMS::enablePTD to 0, then it must
- * send a valid value for the following fields.
- * - NV_ENC_PIC_PARAMS::pictureType
- * - NV_ENC_PIC_PARAMS_H264::displayPOCSyntax (H264 only)
- * - NV_ENC_PIC_PARAMS_H264::frameNumSyntax(H264 only)
- * - NV_ENC_PIC_PARAMS_H264::refPicFlag(H264 only)
- *
- *\par MVC Encoding:
- * For MVC encoding the client must call encode picture API for each view separately
- * and must pass valid view id in NV_ENC_PIC_PARAMS_MVC::viewID field. Currently
- * NvEncodeAPI only support stereo MVC so client must send viewID as 0 for base
- * view and view ID as 1 for dependent view.
- *
- *\par Asynchronous Encoding
- * If the client has enabled asynchronous mode of encoding by setting
- * NV_ENC_INITIALIZE_PARAMS::enableEncodeAsync to 1 in the ::NvEncInitializeEncoder()
- * API ,then the client must send a valid NV_ENC_PIC_PARAMS::completionEvent.
- * Incase of asynchronous mode of operation, client can queue the ::NvEncEncodePicture()
- * API commands from the main thread and then queue output buffers to be processed
- * to a secondary worker thread. Before the locking the output buffers in the
- * secondary thread , the client must wait on NV_ENC_PIC_PARAMS::completionEvent
- * it has queued in ::NvEncEncodePicture() API call. The client must always process
- * completion event and the output buffer in the same order in which they have been
- * submitted for encoding. The NvEncodeAPI interface is responsible for any
- * re-ordering required for B frames and will always ensure that encoded bitstream
- * data is written in the same order in which output buffer is submitted.
- * The NvEncodeAPI interface may return ::NV_ENC_ERR_NEED_MORE_INPUT error code for
- * some ::NvEncEncodePicture() API calls but the client must not treat it as a fatal error.
- * The NvEncodeAPI interface might not be able to submit an input picture buffer for encoding
- * immediately due to re-ordering for B frames.
- *\code
- The below example shows how asynchronous encoding in case of 1 B frames
- ------------------------------------------------------------------------
- Suppose the client allocated 4 input buffers(I1,I2..), 4 output buffers(O1,O2..)
- and 4 completion events(E1, E2, ...). The NvEncodeAPI interface will need to
- keep a copy of the input buffers for re-ordering and it allocates following
- internal buffers (NvI1, NvI2...). These internal buffers are managed by NvEncodeAPI
- and the client is not responsible for the allocating or freeing the memory of
- the internal buffers.
-
- a) The client main thread will queue the following encode frame calls.
- Note the picture type is unknown to the client, the decision is being taken by
- NvEncodeAPI interface. The client should pass ::_NV_ENC_PIC_PARAMS parameter
- consisting of allocated input buffer, output buffer and output events in successive
- ::NvEncEncodePicture() API calls along with other required encode picture params.
- For example:
- 1st EncodePicture parameters - (I1, O1, E1)
- 2nd EncodePicture parameters - (I2, O2, E2)
- 3rd EncodePicture parameters - (I3, O3, E3)
-
- b) NvEncodeAPI SW will receive the following encode Commands from the client.
- The left side shows input from client in the form (Input buffer, Output Buffer,
- Output Event). The right hand side shows a possible picture type decision take by
- the NvEncodeAPI interface.
- (I1, O1, E1) ---P1 Frame
- (I2, O2, E2) ---B2 Frame
- (I3, O3, E3) ---P3 Frame
-
- c) NvEncodeAPI interface will make a copy of the input buffers to its internal
- buffers for re-ordering. These copies are done as part of nvEncEncodePicture
- function call from the client and NvEncodeAPI interface is responsible for
- synchronization of copy operation with the actual encoding operation.
- I1 --> NvI1
- I2 --> NvI2
- I3 --> NvI3
-
- d) The NvEncodeAPI encodes I1 as P frame and submits I1 to encoder HW and returns ::NV_ENC_SUCCESS.
- The NvEncodeAPI tries to encode I2 as B frame and fails with ::NV_ENC_ERR_NEED_MORE_INPUT error code.
- The error is not fatal and it notifies client that I2 is not submitted to encoder immediately.
- The NvEncodeAPI encodes I3 as P frame and submits I3 for encoding which will be used as backward
- reference frame for I2. The NvEncodeAPI then submits I2 for encoding and returns ::NV_ENC_SUCESS.
- Both the submission are part of the same ::NvEncEncodePicture() function call.
-
- e) After returning from ::NvEncEncodePicture() call , the client must queue the output
- bitstream processing work to the secondary thread. The output bitstream processing
- for asynchronous mode consist of first waiting on completion event(E1, E2..)
- and then locking the output bitstream buffer(O1, O2..) for reading the encoded
- data. The work queued to the secondary thread by the client is in the following order
- (I1, O1, E1)
- (I2, O2, E2)
- (I3, O3, E3)
- Note they are in the same order in which client calls ::NvEncEncodePicture() API
- in \p step a).
-
- f) NvEncodeAPI interface will do the re-ordering such that Encoder HW will receive
- the following encode commands:
- (NvI1, O1, E1) ---P1 Frame
- (NvI3, O2, E2) ---P3 Frame
- (NvI2, O3, E3) ---B2 frame
-
- g) After the encoding operations are completed, the events will be signaled
- by NvEncodeAPI interface in the following order :
- (O1, E1) ---P1 Frame ,output bitstream copied to O1 and event E1 signaled.
- (O2, E2) ---P3 Frame ,output bitstream copied to O2 and event E2 signaled.
- (O3, E3) ---B2 Frame ,output bitstream copied to O3 and event E3 signaled.
-
- h) The client must lock the bitstream data using ::NvEncLockBitstream() API in
- the order O1,O2,O3 to read the encoded data, after waiting for the events
- to be signaled in the same order i.e E1, E2 and E3.The output processing is
- done in the secondary thread in the following order:
- Waits on E1, copies encoded bitstream from O1
- Waits on E2, copies encoded bitstream from O2
- Waits on E3, copies encoded bitstream from O3
-
- -Note the client will receive the events signaling and output buffer in the
- same order in which they have submitted for encoding.
- -Note the LockBitstream will have picture type field which will notify the
- output picture type to the clients.
- -Note the input, output buffer and the output completion event are free to be
- reused once NvEncodeAPI interfaced has signaled the event and the client has
- copied the data from the output buffer.
-
- * \endcode
- *
- *\par Synchronous Encoding
- * The client can enable synchronous mode of encoding by setting
- * NV_ENC_INITIALIZE_PARAMS::enableEncodeAsync to 0 in ::NvEncInitializeEncoder() API.
- * The NvEncodeAPI interface may return ::NV_ENC_ERR_NEED_MORE_INPUT error code for
- * some ::NvEncEncodePicture() API calls when NV_ENC_INITIALIZE_PARAMS::enablePTD
- * is set to 1, but the client must not treat it as a fatal error. The NvEncodeAPI
- * interface might not be able to submit an input picture buffer for encoding
- * immediately due to re-ordering for B frames. The NvEncodeAPI interface cannot
- * submit the input picture which is decided to be encoded as B frame as it waits
- * for backward reference from temporally subsequent frames. This input picture
- * is buffered internally and waits for more input picture to arrive. The client
- * must not call ::NvEncLockBitstream() API on the output buffers whose
- * ::NvEncEncodePicture() API returns ::NV_ENC_ERR_NEED_MORE_INPUT. The client must
- * wait for the NvEncodeAPI interface to return ::NV_ENC_SUCCESS before locking the
- * output bitstreams to read the encoded bitstream data. The following example
- * explains the scenario with synchronous encoding with 2 B frames.
- *\code
- The below example shows how synchronous encoding works in case of 1 B frames
- -----------------------------------------------------------------------------
- Suppose the client allocated 4 input buffers(I1,I2..), 4 output buffers(O1,O2..)
- and 4 completion events(E1, E2, ...). The NvEncodeAPI interface will need to
- keep a copy of the input buffers for re-ordering and it allocates following
- internal buffers (NvI1, NvI2...). These internal buffers are managed by NvEncodeAPI
- and the client is not responsible for the allocating or freeing the memory of
- the internal buffers.
-
- The client calls ::NvEncEncodePicture() API with input buffer I1 and output buffer O1.
- The NvEncodeAPI decides to encode I1 as P frame and submits it to encoder
- HW and returns ::NV_ENC_SUCCESS.
- The client can now read the encoded data by locking the output O1 by calling
- NvEncLockBitstream API.
-
- The client calls ::NvEncEncodePicture() API with input buffer I2 and output buffer O2.
- The NvEncodeAPI decides to encode I2 as B frame and buffers I2 by copying it
- to internal buffer and returns ::NV_ENC_ERR_NEED_MORE_INPUT.
- The error is not fatal and it notifies client that it cannot read the encoded
- data by locking the output O2 by calling ::NvEncLockBitstream() API without submitting
- more work to the NvEncodeAPI interface.
-
- The client calls ::NvEncEncodePicture() with input buffer I3 and output buffer O3.
- The NvEncodeAPI decides to encode I3 as P frame and it first submits I3 for
- encoding which will be used as backward reference frame for I2.
- The NvEncodeAPI then submits I2 for encoding and returns ::NV_ENC_SUCESS. Both
- the submission are part of the same ::NvEncEncodePicture() function call.
- The client can now read the encoded data for both the frames by locking the output
- O2 followed by O3 ,by calling ::NvEncLockBitstream() API.
-
- The client must always lock the output in the same order in which it has submitted
- to receive the encoded bitstream in correct encoding order.
-
- * \endcode
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out encodePicParams
- * Pointer to the ::_NV_ENC_PIC_PARAMS structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_ENCODER_BUSY \n
- * ::NV_ENC_ERR_NEED_MORE_INPUT \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncEncodePicture (void* encoder, NV_ENC_PIC_PARAMS* encodePicParams);
-
-
-// NvEncLockBitstream
-/**
- * \brief Lock output bitstream buffer
- *
- * This function is used to lock the bitstream buffer to read the encoded data.
- * The client can only access the encoded data by calling this function.
- * The pointer to client accessible encoded data is returned in the
- * NV_ENC_LOCK_BITSTREAM::bitstreamBufferPtr field. The size of the encoded data
- * in the output buffer is returned in the NV_ENC_LOCK_BITSTREAM::bitstreamSizeInBytes
- * The NvEncodeAPI interface also returns the output picture type and picture structure
- * of the encoded frame in NV_ENC_LOCK_BITSTREAM::pictureType and
- * NV_ENC_LOCK_BITSTREAM::pictureStruct fields respectively. If the client has
- * set NV_ENC_LOCK_BITSTREAM::doNotWait to 1, the function might return
- * ::NV_ENC_ERR_LOCK_BUSY if client is operating in synchronous mode. This is not
- * a fatal failure if NV_ENC_LOCK_BITSTREAM::doNotWait is set to 1. In the above case the client can
- * retry the function after few milliseconds.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out lockBitstreamBufferParams
- * Pointer to the ::_NV_ENC_LOCK_BITSTREAM structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_LOCK_BUSY \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncLockBitstream (void* encoder, NV_ENC_LOCK_BITSTREAM* lockBitstreamBufferParams);
-
-
-// NvEncUnlockBitstream
-/**
- * \brief Unlock the output bitstream buffer
- *
- * This function is used to unlock the output bitstream buffer after the client
- * has read the encoded data from output buffer. The client must call this function
- * to unlock the output buffer which it has previously locked using ::NvEncLockBitstream()
- * function. Using a locked bitstream buffer in ::NvEncEncodePicture() API will cause
- * the function to fail.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out bitstreamBuffer
- * bitstream buffer pointer being unlocked
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncUnlockBitstream (void* encoder, NV_ENC_OUTPUT_PTR bitstreamBuffer);
-
-
-// NvLockInputBuffer
-/**
- * \brief Locks an input buffer
- *
- * This function is used to lock the input buffer to load the uncompressed YUV
- * pixel data into input buffer memory. The client must pass the NV_ENC_INPUT_PTR
- * it had previously allocated using ::NvEncCreateInputBuffer()in the
- * NV_ENC_LOCK_INPUT_BUFFER::inputBuffer field.
- * The NvEncodeAPI interface returns pointer to client accessible input buffer
- * memory in NV_ENC_LOCK_INPUT_BUFFER::bufferDataPtr field.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out lockInputBufferParams
- * Pointer to the ::_NV_ENC_LOCK_INPUT_BUFFER structure
- *
- * \return
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_LOCK_BUSY \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncLockInputBuffer (void* encoder, NV_ENC_LOCK_INPUT_BUFFER* lockInputBufferParams);
-
-
-// NvUnlockInputBuffer
-/**
- * \brief Unlocks the input buffer
- *
- * This function is used to unlock the input buffer memory previously locked for
- * uploading YUV pixel data. The input buffer must be unlocked before being used
- * again for encoding, otherwise NvEncodeAPI will fail the ::NvEncEncodePicture()
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in inputBuffer
- * Pointer to the input buffer that is being unlocked.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- *
- */
-NVENCSTATUS NVENCAPI NvEncUnlockInputBuffer (void* encoder, NV_ENC_INPUT_PTR inputBuffer);
-
-
-// NvEncGetEncodeStats
-/**
- * \brief Get encoding statistics.
- *
- * This function is used to retrieve the encoding statistics.
- * This API is not supported when encode device type is CUDA.
- * Note that this API will be removed in future Video Codec SDK release.
- * Clients should use NvEncLockBitstream() API to retrieve the encoding statistics.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out encodeStats
- * Pointer to the ::_NV_ENC_STAT structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetEncodeStats (void* encoder, NV_ENC_STAT* encodeStats);
-
-
-// NvEncGetSequenceParams
-/**
- * \brief Get encoded sequence and picture header.
- *
- * This function can be used to retrieve the sequence and picture header out of
- * band. The client must call this function only after the encoder has been
- * initialized using ::NvEncInitializeEncoder() function. The client must
- * allocate the memory where the NvEncodeAPI interface can copy the bitstream
- * header and pass the pointer to the memory in NV_ENC_SEQUENCE_PARAM_PAYLOAD::spsppsBuffer.
- * The size of buffer is passed in the field NV_ENC_SEQUENCE_PARAM_PAYLOAD::inBufferSize.
- * The NvEncodeAPI interface will copy the bitstream header payload and returns
- * the actual size of the bitstream header in the field
- * NV_ENC_SEQUENCE_PARAM_PAYLOAD::outSPSPPSPayloadSize.
- * The client must call ::NvEncGetSequenceParams() function from the same thread which is
- * being used to call ::NvEncEncodePicture() function.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out sequenceParamPayload
- * Pointer to the ::_NV_ENC_SEQUENCE_PARAM_PAYLOAD structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetSequenceParams (void* encoder, NV_ENC_SEQUENCE_PARAM_PAYLOAD* sequenceParamPayload);
-
-// NvEncGetSequenceParamEx
-/**
- * \brief Get sequence and picture header.
- *
- * This function can be used to retrieve the sequence and picture header out of band, even when
- * encoder has not been initialized using ::NvEncInitializeEncoder() function.
- * The client must allocate the memory where the NvEncodeAPI interface can copy the bitstream
- * header and pass the pointer to the memory in NV_ENC_SEQUENCE_PARAM_PAYLOAD::spsppsBuffer.
- * The size of buffer is passed in the field NV_ENC_SEQUENCE_PARAM_PAYLOAD::inBufferSize.
- * If encoder has not been initialized using ::NvEncInitializeEncoder() function, client must
- * send NV_ENC_INITIALIZE_PARAMS as input. The NV_ENC_INITIALIZE_PARAMS passed must be same as the
- * one which will be used for initializing encoder using ::NvEncInitializeEncoder() function later.
- * If encoder is already initialized using ::NvEncInitializeEncoder() function, the provided
- * NV_ENC_INITIALIZE_PARAMS structure is ignored. The NvEncodeAPI interface will copy the bitstream
- * header payload and returns the actual size of the bitstream header in the field
- * NV_ENC_SEQUENCE_PARAM_PAYLOAD::outSPSPPSPayloadSize. The client must call ::NvEncGetSequenceParamsEx()
- * function from the same thread which is being used to call ::NvEncEncodePicture() function.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in encInitParams
- * Pointer to the _NV_ENC_INITIALIZE_PARAMS structure.
- * \param in,out sequenceParamPayload
- * Pointer to the ::_NV_ENC_SEQUENCE_PARAM_PAYLOAD structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncGetSequenceParamEx (void* encoder, NV_ENC_INITIALIZE_PARAMS* encInitParams, NV_ENC_SEQUENCE_PARAM_PAYLOAD* sequenceParamPayload);
-
-// NvEncRegisterAsyncEvent
-/**
- * \brief Register event for notification to encoding completion.
- *
- * This function is used to register the completion event with NvEncodeAPI
- * interface. The event is required when the client has configured the encoder to
- * work in asynchronous mode. In this mode the client needs to send a completion
- * event with every output buffer. The NvEncodeAPI interface will signal the
- * completion of the encoding process using this event. Only after the event is
- * signaled the client can get the encoded data using ::NvEncLockBitstream() function.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in eventParams
- * Pointer to the ::_NV_ENC_EVENT_PARAMS structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncRegisterAsyncEvent (void* encoder, NV_ENC_EVENT_PARAMS* eventParams);
-
-
-// NvEncUnregisterAsyncEvent
-/**
- * \brief Unregister completion event.
- *
- * This function is used to unregister completion event which has been previously
- * registered using ::NvEncRegisterAsyncEvent() function. The client must unregister
- * all events before destroying the encoder using ::NvEncDestroyEncoder() function.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in eventParams
- * Pointer to the ::_NV_ENC_EVENT_PARAMS structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncUnregisterAsyncEvent (void* encoder, NV_ENC_EVENT_PARAMS* eventParams);
-
-
-// NvEncMapInputResource
-/**
- * \brief Map an externally created input resource pointer for encoding.
- *
- * Maps an externally allocated input resource using and returns a NV_ENC_INPUT_PTR
- * which can be used for encoding in the ::NvEncEncodePicture() function. The
- * mapped resource is returned in the field NV_ENC_MAP_INPUT_RESOURCE::outputResourcePtr.
- * The NvEncodeAPI interface also returns the buffer format of the mapped resource
- * in the field NV_ENC_MAP_INPUT_RESOURCE::outbufferFmt.
- * This function provides synchronization guarantee that any graphics work submitted
- * on the input buffer is completed before the buffer is used for encoding. This is
- * also true for compute (i.e. CUDA) work, provided that the previous workload using
- * the input resource was submitted to the default stream.
- * The client should not access any input buffer while they are mapped by the encoder.
- * For D3D12 interface type, this function does not provide synchronization guarantee.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out mapInputResParams
- * Pointer to the ::_NV_ENC_MAP_INPUT_RESOURCE structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_RESOURCE_NOT_REGISTERED \n
- * ::NV_ENC_ERR_MAP_FAILED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncMapInputResource (void* encoder, NV_ENC_MAP_INPUT_RESOURCE* mapInputResParams);
-
-
-// NvEncUnmapInputResource
-/**
- * \brief UnMaps a NV_ENC_INPUT_PTR which was mapped for encoding
- *
- *
- * UnMaps an input buffer which was previously mapped using ::NvEncMapInputResource()
- * API. The mapping created using ::NvEncMapInputResource() should be invalidated
- * using this API before the external resource is destroyed by the client. The client
- * must unmap the buffer after ::NvEncLockBitstream() API returns successfully for encode
- * work submitted using the mapped input buffer.
- *
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in mappedInputBuffer
- * Pointer to the NV_ENC_INPUT_PTR
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_RESOURCE_NOT_REGISTERED \n
- * ::NV_ENC_ERR_RESOURCE_NOT_MAPPED \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncUnmapInputResource (void* encoder, NV_ENC_INPUT_PTR mappedInputBuffer);
-
-// NvEncDestroyEncoder
-/**
- * \brief Destroy Encoding Session
- *
- * Destroys the encoder session previously created using ::NvEncOpenEncodeSession()
- * function. The client must flush the encoder before freeing any resources. In order
- * to flush the encoder the client must pass a NULL encode picture packet and either
- * wait for the ::NvEncEncodePicture() function to return in synchronous mode or wait
- * for the flush event to be signaled by the encoder in asynchronous mode.
- * The client must free all the input and output resources created using the
- * NvEncodeAPI interface before destroying the encoder. If the client is operating
- * in asynchronous mode, it must also unregister the completion events previously
- * registered.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncDestroyEncoder (void* encoder);
-
-// NvEncInvalidateRefFrames
-/**
- * \brief Invalidate reference frames
- *
- * Invalidates reference frame based on the time stamp provided by the client.
- * The encoder marks any reference frames or any frames which have been reconstructed
- * using the corrupt frame as invalid for motion estimation and uses older reference
- * frames for motion estimation. The encoder forces the current frame to be encoded
- * as an intra frame if no reference frames are left after invalidation process.
- * This is useful for low latency application for error resiliency. The client
- * is recommended to set NV_ENC_CONFIG_H264::maxNumRefFrames to a large value so
- * that encoder can keep a backup of older reference frames in the DPB and can use them
- * for motion estimation when the newer reference frames have been invalidated.
- * This API can be called multiple times.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in invalidRefFrameTimeStamp
- * Timestamp of the invalid reference frames which needs to be invalidated.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncInvalidateRefFrames(void* encoder, uint64_t invalidRefFrameTimeStamp);
-
-// NvEncOpenEncodeSessionEx
-/**
- * \brief Opens an encoding session.
- *
- * Opens an encoding session and returns a pointer to the encoder interface in
- * the \p **encoder parameter. The client should start encoding process by calling
- * this API first.
- * The client must pass a pointer to IDirect3DDevice9 device or CUDA context in the \p *device parameter.
- * For the OpenGL interface, \p device must be NULL. An OpenGL context must be current when
- * calling all NvEncodeAPI functions.
- * If the creation of encoder session fails, the client must call ::NvEncDestroyEncoder API
- * before exiting.
- *
- * \param in openSessionExParams
- * Pointer to a ::NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS structure.
- * \param out encoder
- * Encode Session pointer to the NvEncodeAPI interface.
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_NO_ENCODE_DEVICE \n
- * ::NV_ENC_ERR_UNSUPPORTED_DEVICE \n
- * ::NV_ENC_ERR_INVALID_DEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncOpenEncodeSessionEx (NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS *openSessionExParams, void** encoder);
-
-// NvEncRegisterResource
-/**
- * \brief Registers a resource with the Nvidia Video Encoder Interface.
- *
- * Registers a resource with the Nvidia Video Encoder Interface for book keeping.
- * The client is expected to pass the registered resource handle as well, while calling ::NvEncMapInputResource API.
- *
- * \param in encoder
- * Pointer to the NVEncodeAPI interface.
- *
- * \param in registerResParams
- * Pointer to a ::_NV_ENC_REGISTER_RESOURCE structure
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_RESOURCE_REGISTER_FAILED \n
- * ::NV_ENC_ERR_GENERIC \n
- * ::NV_ENC_ERR_UNIMPLEMENTED \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncRegisterResource (void* encoder, NV_ENC_REGISTER_RESOURCE* registerResParams);
-
-// NvEncUnregisterResource
-/**
- * \brief Unregisters a resource previously registered with the Nvidia Video Encoder Interface.
- *
- * Unregisters a resource previously registered with the Nvidia Video Encoder Interface.
- * The client is expected to unregister any resource that it has registered with the
- * Nvidia Video Encoder Interface before destroying the resource.
- *
- * \param in encoder
- * Pointer to the NVEncodeAPI interface.
- *
- * \param in registeredResource
- * The registered resource pointer that was returned in ::NvEncRegisterResource.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_RESOURCE_NOT_REGISTERED \n
- * ::NV_ENC_ERR_GENERIC \n
- * ::NV_ENC_ERR_UNIMPLEMENTED \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncUnregisterResource (void* encoder, NV_ENC_REGISTERED_PTR registeredResource);
-
-// NvEncReconfigureEncoder
-/**
- * \brief Reconfigure an existing encoding session.
- *
- * Reconfigure an existing encoding session.
- * The client should call this API to change/reconfigure the parameter passed during
- * NvEncInitializeEncoder API call.
- * Currently Reconfiguration of following are not supported.
- * Change in GOP structure.
- * Change in sync-Async mode.
- * Change in MaxWidth & MaxHeight.
- * Change in PTD mode.
- *
- * Resolution change is possible only if maxEncodeWidth & maxEncodeHeight of NV_ENC_INITIALIZE_PARAMS
- * is set while creating encoder session.
- *
- * \param in encoder
- * Pointer to the NVEncodeAPI interface.
- *
- * \param in reInitEncodeParams
- * Pointer to a ::NV_ENC_RECONFIGURE_PARAMS structure.
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_NO_ENCODE_DEVICE \n
- * ::NV_ENC_ERR_UNSUPPORTED_DEVICE \n
- * ::NV_ENC_ERR_INVALID_DEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_GENERIC \n
- *
- */
-NVENCSTATUS NVENCAPI NvEncReconfigureEncoder (void *encoder, NV_ENC_RECONFIGURE_PARAMS* reInitEncodeParams);
-
-
-
-// NvEncCreateMVBuffer
-/**
- * \brief Allocates output MV buffer for ME only mode.
- *
- * This function is used to allocate an output MV buffer. The size of the mvBuffer is
- * dependent on the frame height and width of the last ::NvEncCreateInputBuffer() call.
- * The NV_ENC_OUTPUT_PTR returned by the NvEncodeAPI interface in the
- * ::NV_ENC_CREATE_MV_BUFFER::mvBuffer field should be used in
- * ::NvEncRunMotionEstimationOnly() API.
- * Client must lock ::NV_ENC_CREATE_MV_BUFFER::mvBuffer using ::NvEncLockBitstream() API to get the motion vector data.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in,out createMVBufferParams
- * Pointer to the ::NV_ENC_CREATE_MV_BUFFER structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_GENERIC \n
- */
-NVENCSTATUS NVENCAPI NvEncCreateMVBuffer (void* encoder, NV_ENC_CREATE_MV_BUFFER* createMVBufferParams);
-
-
-// NvEncDestroyMVBuffer
-/**
- * \brief Release an output MV buffer for ME only mode.
- *
- * This function is used to release the output MV buffer allocated using
- * the ::NvEncCreateMVBuffer() function. The client must release the output
- * mvBuffer using this function before destroying the encoder session.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in mvBuffer
- * Pointer to the mvBuffer being released.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- */
-NVENCSTATUS NVENCAPI NvEncDestroyMVBuffer (void* encoder, NV_ENC_OUTPUT_PTR mvBuffer);
-
-
-// NvEncRunMotionEstimationOnly
-/**
- * \brief Submit an input picture and reference frame for motion estimation in ME only mode.
- *
- * This function is used to submit the input frame and reference frame for motion
- * estimation. The ME parameters are passed using *meOnlyParams which is a pointer
- * to ::_NV_ENC_MEONLY_PARAMS structure.
- * Client must lock ::NV_ENC_CREATE_MV_BUFFER::mvBuffer using ::NvEncLockBitstream() API to get the motion vector data.
- * to get motion vector data.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- * \param in meOnlyParams
- * Pointer to the ::_NV_ENC_MEONLY_PARAMS structure.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- * ::NV_ENC_ERR_INVALID_ENCODERDEVICE \n
- * ::NV_ENC_ERR_DEVICE_NOT_EXIST \n
- * ::NV_ENC_ERR_UNSUPPORTED_PARAM \n
- * ::NV_ENC_ERR_OUT_OF_MEMORY \n
- * ::NV_ENC_ERR_INVALID_PARAM \n
- * ::NV_ENC_ERR_INVALID_VERSION \n
- * ::NV_ENC_ERR_NEED_MORE_INPUT \n
- * ::NV_ENC_ERR_ENCODER_NOT_INITIALIZED \n
- * ::NV_ENC_ERR_GENERIC \n
- */
-NVENCSTATUS NVENCAPI NvEncRunMotionEstimationOnly (void* encoder, NV_ENC_MEONLY_PARAMS* meOnlyParams);
-
-// NvEncodeAPIGetMaxSupportedVersion
-/**
- * \brief Get the largest NvEncodeAPI version supported by the driver.
- *
- * This function can be used by clients to determine if the driver supports
- * the NvEncodeAPI header the application was compiled with.
- *
- * \param out version
- * Pointer to the requested value. The 4 least significant bits in the returned
- * indicate the minor version and the rest of the bits indicate the major
- * version of the largest supported version.
- *
- * \return
- * ::NV_ENC_SUCCESS \n
- * ::NV_ENC_ERR_INVALID_PTR \n
- */
-NVENCSTATUS NVENCAPI NvEncodeAPIGetMaxSupportedVersion (uint32_t* version);
-
-
-// NvEncGetLastErrorString
-/**
- * \brief Get the description of the last error reported by the API.
- *
- * This function returns a null-terminated string that can be used by clients to better understand the reason
- * for failure of a previous API call.
- *
- * \param in encoder
- * Pointer to the NvEncodeAPI interface.
- *
- * \return
- * Pointer to buffer containing the details of the last error encountered by the API.
- */
-const char * NVENCAPI NvEncGetLastErrorString (void* encoder);
-
-
-/// \cond API PFN
-/*
- * Defines API function pointers
- */
-typedef NVENCSTATUS (NVENCAPI* PNVENCOPENENCODESESSION) (void* device, uint32_t deviceType, void** encoder);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEGUIDCOUNT) (void* encoder, uint32_t* encodeGUIDCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEGUIDS) (void* encoder, GUID* GUIDs, uint32_t guidArraySize, uint32_t* GUIDCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEPROFILEGUIDCOUNT) (void* encoder, GUID encodeGUID, uint32_t* encodeProfileGUIDCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEPROFILEGUIDS) (void* encoder, GUID encodeGUID, GUID* profileGUIDs, uint32_t guidArraySize, uint32_t* GUIDCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETINPUTFORMATCOUNT) (void* encoder, GUID encodeGUID, uint32_t* inputFmtCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETINPUTFORMATS) (void* encoder, GUID encodeGUID, NV_ENC_BUFFER_FORMAT* inputFmts, uint32_t inputFmtArraySize, uint32_t* inputFmtCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODECAPS) (void* encoder, GUID encodeGUID, NV_ENC_CAPS_PARAM* capsParam, int* capsVal);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEPRESETCOUNT) (void* encoder, GUID encodeGUID, uint32_t* encodePresetGUIDCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEPRESETGUIDS) (void* encoder, GUID encodeGUID, GUID* presetGUIDs, uint32_t guidArraySize, uint32_t* encodePresetGUIDCount);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEPRESETCONFIG) (void* encoder, GUID encodeGUID, GUID presetGUID, NV_ENC_PRESET_CONFIG* presetConfig);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODEPRESETCONFIGEX) (void* encoder, GUID encodeGUID, GUID presetGUID, NV_ENC_TUNING_INFO tuningInfo, NV_ENC_PRESET_CONFIG* presetConfig);
-typedef NVENCSTATUS (NVENCAPI* PNVENCINITIALIZEENCODER) (void* encoder, NV_ENC_INITIALIZE_PARAMS* createEncodeParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCCREATEINPUTBUFFER) (void* encoder, NV_ENC_CREATE_INPUT_BUFFER* createInputBufferParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCDESTROYINPUTBUFFER) (void* encoder, NV_ENC_INPUT_PTR inputBuffer);
-typedef NVENCSTATUS (NVENCAPI* PNVENCCREATEBITSTREAMBUFFER) (void* encoder, NV_ENC_CREATE_BITSTREAM_BUFFER* createBitstreamBufferParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCDESTROYBITSTREAMBUFFER) (void* encoder, NV_ENC_OUTPUT_PTR bitstreamBuffer);
-typedef NVENCSTATUS (NVENCAPI* PNVENCENCODEPICTURE) (void* encoder, NV_ENC_PIC_PARAMS* encodePicParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCLOCKBITSTREAM) (void* encoder, NV_ENC_LOCK_BITSTREAM* lockBitstreamBufferParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCUNLOCKBITSTREAM) (void* encoder, NV_ENC_OUTPUT_PTR bitstreamBuffer);
-typedef NVENCSTATUS (NVENCAPI* PNVENCLOCKINPUTBUFFER) (void* encoder, NV_ENC_LOCK_INPUT_BUFFER* lockInputBufferParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCUNLOCKINPUTBUFFER) (void* encoder, NV_ENC_INPUT_PTR inputBuffer);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETENCODESTATS) (void* encoder, NV_ENC_STAT* encodeStats);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETSEQUENCEPARAMS) (void* encoder, NV_ENC_SEQUENCE_PARAM_PAYLOAD* sequenceParamPayload);
-typedef NVENCSTATUS (NVENCAPI* PNVENCREGISTERASYNCEVENT) (void* encoder, NV_ENC_EVENT_PARAMS* eventParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCUNREGISTERASYNCEVENT) (void* encoder, NV_ENC_EVENT_PARAMS* eventParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCMAPINPUTRESOURCE) (void* encoder, NV_ENC_MAP_INPUT_RESOURCE* mapInputResParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCUNMAPINPUTRESOURCE) (void* encoder, NV_ENC_INPUT_PTR mappedInputBuffer);
-typedef NVENCSTATUS (NVENCAPI* PNVENCDESTROYENCODER) (void* encoder);
-typedef NVENCSTATUS (NVENCAPI* PNVENCINVALIDATEREFFRAMES) (void* encoder, uint64_t invalidRefFrameTimeStamp);
-typedef NVENCSTATUS (NVENCAPI* PNVENCOPENENCODESESSIONEX) (NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS *openSessionExParams, void** encoder);
-typedef NVENCSTATUS (NVENCAPI* PNVENCREGISTERRESOURCE) (void* encoder, NV_ENC_REGISTER_RESOURCE* registerResParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCUNREGISTERRESOURCE) (void* encoder, NV_ENC_REGISTERED_PTR registeredRes);
-typedef NVENCSTATUS (NVENCAPI* PNVENCRECONFIGUREENCODER) (void* encoder, NV_ENC_RECONFIGURE_PARAMS* reInitEncodeParams);
-
-typedef NVENCSTATUS (NVENCAPI* PNVENCCREATEMVBUFFER) (void* encoder, NV_ENC_CREATE_MV_BUFFER* createMVBufferParams);
-typedef NVENCSTATUS (NVENCAPI* PNVENCDESTROYMVBUFFER) (void* encoder, NV_ENC_OUTPUT_PTR mvBuffer);
-typedef NVENCSTATUS (NVENCAPI* PNVENCRUNMOTIONESTIMATIONONLY) (void* encoder, NV_ENC_MEONLY_PARAMS* meOnlyParams);
-typedef const char * (NVENCAPI* PNVENCGETLASTERROR) (void* encoder);
-typedef NVENCSTATUS (NVENCAPI* PNVENCSETIOCUDASTREAMS) (void* encoder, NV_ENC_CUSTREAM_PTR inputStream, NV_ENC_CUSTREAM_PTR outputStream);
-typedef NVENCSTATUS (NVENCAPI* PNVENCGETSEQUENCEPARAMEX) (void* encoder, NV_ENC_INITIALIZE_PARAMS* encInitParams, NV_ENC_SEQUENCE_PARAM_PAYLOAD* sequenceParamPayload);
-
-
-/// \endcond
-
-
-/** @} */ /* END ENCODE_FUNC */
-
-/**
- * \ingroup ENCODER_STRUCTURE
- * NV_ENCODE_API_FUNCTION_LIST
- */
-typedef struct _NV_ENCODE_API_FUNCTION_LIST
-{
- uint32_t version; /**< in: Client should pass NV_ENCODE_API_FUNCTION_LIST_VER. */
- uint32_t reserved; /**< in: Reserved and should be set to 0. */
- PNVENCOPENENCODESESSION nvEncOpenEncodeSession; /**< out: Client should access ::NvEncOpenEncodeSession() API through this pointer. */
- PNVENCGETENCODEGUIDCOUNT nvEncGetEncodeGUIDCount; /**< out: Client should access ::NvEncGetEncodeGUIDCount() API through this pointer. */
- PNVENCGETENCODEPRESETCOUNT nvEncGetEncodeProfileGUIDCount; /**< out: Client should access ::NvEncGetEncodeProfileGUIDCount() API through this pointer.*/
- PNVENCGETENCODEPRESETGUIDS nvEncGetEncodeProfileGUIDs; /**< out: Client should access ::NvEncGetEncodeProfileGUIDs() API through this pointer. */
- PNVENCGETENCODEGUIDS nvEncGetEncodeGUIDs; /**< out: Client should access ::NvEncGetEncodeGUIDs() API through this pointer. */
- PNVENCGETINPUTFORMATCOUNT nvEncGetInputFormatCount; /**< out: Client should access ::NvEncGetInputFormatCount() API through this pointer. */
- PNVENCGETINPUTFORMATS nvEncGetInputFormats; /**< out: Client should access ::NvEncGetInputFormats() API through this pointer. */
- PNVENCGETENCODECAPS nvEncGetEncodeCaps; /**< out: Client should access ::NvEncGetEncodeCaps() API through this pointer. */
- PNVENCGETENCODEPRESETCOUNT nvEncGetEncodePresetCount; /**< out: Client should access ::NvEncGetEncodePresetCount() API through this pointer. */
- PNVENCGETENCODEPRESETGUIDS nvEncGetEncodePresetGUIDs; /**< out: Client should access ::NvEncGetEncodePresetGUIDs() API through this pointer. */
- PNVENCGETENCODEPRESETCONFIG nvEncGetEncodePresetConfig; /**< out: Client should access ::NvEncGetEncodePresetConfig() API through this pointer. */
- PNVENCINITIALIZEENCODER nvEncInitializeEncoder; /**< out: Client should access ::NvEncInitializeEncoder() API through this pointer. */
- PNVENCCREATEINPUTBUFFER nvEncCreateInputBuffer; /**< out: Client should access ::NvEncCreateInputBuffer() API through this pointer. */
- PNVENCDESTROYINPUTBUFFER nvEncDestroyInputBuffer; /**< out: Client should access ::NvEncDestroyInputBuffer() API through this pointer. */
- PNVENCCREATEBITSTREAMBUFFER nvEncCreateBitstreamBuffer; /**< out: Client should access ::NvEncCreateBitstreamBuffer() API through this pointer. */
- PNVENCDESTROYBITSTREAMBUFFER nvEncDestroyBitstreamBuffer; /**< out: Client should access ::NvEncDestroyBitstreamBuffer() API through this pointer. */
- PNVENCENCODEPICTURE nvEncEncodePicture; /**< out: Client should access ::NvEncEncodePicture() API through this pointer. */
- PNVENCLOCKBITSTREAM nvEncLockBitstream; /**< out: Client should access ::NvEncLockBitstream() API through this pointer. */
- PNVENCUNLOCKBITSTREAM nvEncUnlockBitstream; /**< out: Client should access ::NvEncUnlockBitstream() API through this pointer. */
- PNVENCLOCKINPUTBUFFER nvEncLockInputBuffer; /**< out: Client should access ::NvEncLockInputBuffer() API through this pointer. */
- PNVENCUNLOCKINPUTBUFFER nvEncUnlockInputBuffer; /**< out: Client should access ::NvEncUnlockInputBuffer() API through this pointer. */
- PNVENCGETENCODESTATS nvEncGetEncodeStats; /**< out: Client should access ::NvEncGetEncodeStats() API through this pointer. */
- PNVENCGETSEQUENCEPARAMS nvEncGetSequenceParams; /**< out: Client should access ::NvEncGetSequenceParams() API through this pointer. */
- PNVENCREGISTERASYNCEVENT nvEncRegisterAsyncEvent; /**< out: Client should access ::NvEncRegisterAsyncEvent() API through this pointer. */
- PNVENCUNREGISTERASYNCEVENT nvEncUnregisterAsyncEvent; /**< out: Client should access ::NvEncUnregisterAsyncEvent() API through this pointer. */
- PNVENCMAPINPUTRESOURCE nvEncMapInputResource; /**< out: Client should access ::NvEncMapInputResource() API through this pointer. */
- PNVENCUNMAPINPUTRESOURCE nvEncUnmapInputResource; /**< out: Client should access ::NvEncUnmapInputResource() API through this pointer. */
- PNVENCDESTROYENCODER nvEncDestroyEncoder; /**< out: Client should access ::NvEncDestroyEncoder() API through this pointer. */
- PNVENCINVALIDATEREFFRAMES nvEncInvalidateRefFrames; /**< out: Client should access ::NvEncInvalidateRefFrames() API through this pointer. */
- PNVENCOPENENCODESESSIONEX nvEncOpenEncodeSessionEx; /**< out: Client should access ::NvEncOpenEncodeSession() API through this pointer. */
- PNVENCREGISTERRESOURCE nvEncRegisterResource; /**< out: Client should access ::NvEncRegisterResource() API through this pointer. */
- PNVENCUNREGISTERRESOURCE nvEncUnregisterResource; /**< out: Client should access ::NvEncUnregisterResource() API through this pointer. */
- PNVENCRECONFIGUREENCODER nvEncReconfigureEncoder; /**< out: Client should access ::NvEncReconfigureEncoder() API through this pointer. */
- void* reserved1;
- PNVENCCREATEMVBUFFER nvEncCreateMVBuffer; /**< out: Client should access ::NvEncCreateMVBuffer API through this pointer. */
- PNVENCDESTROYMVBUFFER nvEncDestroyMVBuffer; /**< out: Client should access ::NvEncDestroyMVBuffer API through this pointer. */
- PNVENCRUNMOTIONESTIMATIONONLY nvEncRunMotionEstimationOnly; /**< out: Client should access ::NvEncRunMotionEstimationOnly API through this pointer. */
- PNVENCGETLASTERROR nvEncGetLastErrorString; /**< out: Client should access ::nvEncGetLastErrorString API through this pointer. */
- PNVENCSETIOCUDASTREAMS nvEncSetIOCudaStreams; /**< out: Client should access ::nvEncSetIOCudaStreams API through this pointer. */
- PNVENCGETENCODEPRESETCONFIGEX nvEncGetEncodePresetConfigEx; /**< out: Client should access ::NvEncGetEncodePresetConfigEx() API through this pointer. */
- PNVENCGETSEQUENCEPARAMEX nvEncGetSequenceParamEx; /**< out: Client should access ::NvEncGetSequenceParamEx() API through this pointer. */
- void* reserved2277; /**< in: Reserved and must be set to NULL */
-} NV_ENCODE_API_FUNCTION_LIST;
-
-/** Macro for constructing the version field of ::_NV_ENCODEAPI_FUNCTION_LIST. */
-#define NV_ENCODE_API_FUNCTION_LIST_VER NVENCAPI_STRUCT_VERSION(2)
-
-// NvEncodeAPICreateInstance
-/**
- * \ingroup ENCODE_FUNC
- * Entry Point to the NvEncodeAPI interface.
- *
- * Creates an instance of the NvEncodeAPI interface, and populates the
- * pFunctionList with function pointers to the API routines implemented by the
- * NvEncodeAPI interface.
- *
- * \param out functionList
- *
- * \return
- * ::NV_ENC_SUCCESS
- * ::NV_ENC_ERR_INVALID_PTR
- */
-NVENCSTATUS NVENCAPI NvEncodeAPICreateInstance(NV_ENCODE_API_FUNCTION_LIST *functionList);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif
-

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/jim-nvenc-helpers.c Deleted

@@ -1,337 +0,0 @@
-#include "jim-nvenc.h"
-#include <util/platform.h>
-#include <util/threading.h>
-#include <util/config-file.h>
-#include <util/windows/device-enum.h>
-#include <util/dstr.h>
-#include <util/pipe.h>
-
-static void *nvenc_lib = NULL;
-static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER;
-NV_ENCODE_API_FUNCTION_LIST nv = {NV_ENCODE_API_FUNCTION_LIST_VER};
-NV_CREATE_INSTANCE_FUNC nv_create_instance = NULL;
-
-#define error(format, ...) blog(LOG_ERROR, "jim-nvenc " format, ##__VA_ARGS__)
-
-bool nv_fail2(obs_encoder_t *encoder, void *session, const char *format, ...)
-{
-	struct dstr message = {0};
-	struct dstr error_message = {0};
-
-	va_list args;
-	va_start(args, format);
-	dstr_vprintf(&message, format, args);
-	va_end(args);
-
-	dstr_printf(&error_message, "NVENC Error: %s", message.array);
-	obs_encoder_set_last_error(encoder, error_message.array);
-	error("%s", error_message.array);
-
-	dstr_free(&error_message);
-	dstr_free(&message);
-
-	return true;
-}
-
-bool nv_failed2(obs_encoder_t *encoder, void *session, NVENCSTATUS err,
-		const char *func, const char *call)
-{
-	struct dstr error_message = {0};
-	const char *nvenc_error = NULL;
-
-	if (err == NV_ENC_SUCCESS)
-		return false;
-
-	if (session) {
-		nvenc_error = nv.nvEncGetLastErrorString(session);
-		if (nvenc_error) {
-			// Some NVENC errors begin with :: which looks
-			// odd to users. Strip it off.
-			while (*nvenc_error == ':')
-				nvenc_error++;
-		}
-	}
-
-	switch (err) {
-	case NV_ENC_ERR_OUT_OF_MEMORY:
-		obs_encoder_set_last_error(
-			encoder, obs_module_text("NVENC.TooManySessions"));
-		break;
-
-	case NV_ENC_ERR_NO_ENCODE_DEVICE:
-	case NV_ENC_ERR_UNSUPPORTED_DEVICE:
-		obs_encoder_set_last_error(
-			encoder, obs_module_text("NVENC.UnsupportedDevice"));
-		break;
-
-	case NV_ENC_ERR_INVALID_VERSION:
-		obs_encoder_set_last_error(
-			encoder, obs_module_text("NVENC.OutdatedDriver"));
-		break;
-
-	default:
-		if (nvenc_error && *nvenc_error) {
-			dstr_printf(&error_message, "NVENC Error: %s (%s)",
-				 nvenc_error, nv_error_name(err));
-		} else {
-
-			dstr_printf(&error_message,
-				 "NVENC Error: %s: %s failed: %d (%s)", func,
-				 call, (int)err, nv_error_name(err));
-		}
-		obs_encoder_set_last_error(encoder, error_message.array);
-		dstr_free(&error_message);
-		break;
-	}
-
-	if (nvenc_error && *nvenc_error) {
-		error("%s: %s failed: %d (%s): %s", func, call, (int)err,
-		 nv_error_name(err), nvenc_error);
-	} else {
-		error("%s: %s failed: %d (%s)", func, call, (int)err,
-		 nv_error_name(err));
-	}
-	return true;
-}
-
-#define NV_FAILED(e, x) nv_failed2(e, NULL, x, __FUNCTION__, #x)
-
-bool load_nvenc_lib(void)
-{
-	const char *const file = (sizeof(void *) == 8) ? "nvEncodeAPI64.dll"
-						 : "nvEncodeAPI.dll";
-	nvenc_lib = os_dlopen(file);
-	return nvenc_lib != NULL;
-}
-
-static void *load_nv_func(const char *func)
-{
-	void *func_ptr = os_dlsym(nvenc_lib, func);
-	if (!func_ptr) {
-		error("Could not load function: %s", func);
-	}
-	return func_ptr;
-}
-
-typedef NVENCSTATUS(NVENCAPI *NV_MAX_VER_FUNC)(uint32_t *);
-
-uint32_t get_nvenc_ver()
-{
-	static NV_MAX_VER_FUNC nv_max_ver = NULL;
-	static bool failed = false;
-
-	if (!nv_max_ver) {
-		if (failed)
-			return 0;
-
-		nv_max_ver = (NV_MAX_VER_FUNC)load_nv_func(
-			"NvEncodeAPIGetMaxSupportedVersion");
-		if (!nv_max_ver) {
-			failed = true;
-			return 0;
-		}
-	}
-
-	uint32_t ver = 0;
-	if (nv_max_ver(&ver) != NV_ENC_SUCCESS) {
-		return 0;
-	}
-	return ver;
-}
-
-const char *nv_error_name(NVENCSTATUS err)
-{
-#define RETURN_CASE(x) \
-	case x: \
-		return #x
-
-	switch (err) {
-		RETURN_CASE(NV_ENC_SUCCESS);
-		RETURN_CASE(NV_ENC_ERR_NO_ENCODE_DEVICE);
-		RETURN_CASE(NV_ENC_ERR_UNSUPPORTED_DEVICE);
-		RETURN_CASE(NV_ENC_ERR_INVALID_ENCODERDEVICE);
-		RETURN_CASE(NV_ENC_ERR_INVALID_DEVICE);
-		RETURN_CASE(NV_ENC_ERR_DEVICE_NOT_EXIST);
-		RETURN_CASE(NV_ENC_ERR_INVALID_PTR);
-		RETURN_CASE(NV_ENC_ERR_INVALID_EVENT);
-		RETURN_CASE(NV_ENC_ERR_INVALID_PARAM);
-		RETURN_CASE(NV_ENC_ERR_INVALID_CALL);
-		RETURN_CASE(NV_ENC_ERR_OUT_OF_MEMORY);
-		RETURN_CASE(NV_ENC_ERR_ENCODER_NOT_INITIALIZED);
-		RETURN_CASE(NV_ENC_ERR_UNSUPPORTED_PARAM);
-		RETURN_CASE(NV_ENC_ERR_LOCK_BUSY);
-		RETURN_CASE(NV_ENC_ERR_NOT_ENOUGH_BUFFER);
-		RETURN_CASE(NV_ENC_ERR_INVALID_VERSION);
-		RETURN_CASE(NV_ENC_ERR_MAP_FAILED);
-		RETURN_CASE(NV_ENC_ERR_NEED_MORE_INPUT);
-		RETURN_CASE(NV_ENC_ERR_ENCODER_BUSY);
-		RETURN_CASE(NV_ENC_ERR_EVENT_NOT_REGISTERD);
-		RETURN_CASE(NV_ENC_ERR_GENERIC);
-		RETURN_CASE(NV_ENC_ERR_INCOMPATIBLE_CLIENT_KEY);
-		RETURN_CASE(NV_ENC_ERR_UNIMPLEMENTED);
-		RETURN_CASE(NV_ENC_ERR_RESOURCE_REGISTER_FAILED);
-		RETURN_CASE(NV_ENC_ERR_RESOURCE_NOT_REGISTERED);
-		RETURN_CASE(NV_ENC_ERR_RESOURCE_NOT_MAPPED);
-	}
-#undef RETURN_CASE
-
-	return "Unknown Error";
-}
-
-static inline bool init_nvenc_internal(obs_encoder_t *encoder)
-{
-	static bool initialized = false;
-	static bool success = false;
-
-	if (initialized)
-		return success;
-	initialized = true;
-
-	uint32_t ver = get_nvenc_ver();
-	if (ver == 0) {
-		obs_encoder_set_last_error(
-			encoder,
-			"Missing NvEncodeAPIGetMaxSupportedVersion, check "
-			"your video card drivers are up to date.");
-		return false;
-	}
-
-	uint32_t supported_ver = (NVENC_COMPAT_MAJOR_VER << 4) |
-				 NVENC_COMPAT_MINOR_VER;
-	if (supported_ver > ver) {
-		obs_encoder_set_last_error(
-			encoder, obs_module_text("NVENC.OutdatedDriver"));
-
-		error("Current driver version does not support this NVENC "
-		 "version, please upgrade your driver");
-		return false;
-	}
-
-	nv_create_instance = (NV_CREATE_INSTANCE_FUNC)load_nv_func(
-		"NvEncodeAPICreateInstance");
-	if (!nv_create_instance) {
-		obs_encoder_set_last_error(
-			encoder, "Missing NvEncodeAPICreateInstance, check "
-				 "your video card drivers are up to date.");
-		return false;
-	}
-
-	if (NV_FAILED(encoder, nv_create_instance(&nv))) {
-		return false;
-	}
-
-	success = true;
-	return true;
-}
-
-bool init_nvenc(obs_encoder_t *encoder)
-{
-	bool success;
-
-	pthread_mutex_lock(&init_mutex);
-	success = init_nvenc_internal(encoder);
-	pthread_mutex_unlock(&init_mutex);
-
-	return success;
-}
-
-extern struct obs_encoder_info h264_nvenc_info;
-#ifdef ENABLE_HEVC
-extern struct obs_encoder_info hevc_nvenc_info;
-#endif
-extern struct obs_encoder_info av1_nvenc_info;
-
-static bool enum_luids(void *param, uint32_t idx, uint64_t luid)
-{
-	struct dstr *cmd = param;
-	dstr_catf(cmd, " %llX", luid);
-	UNUSED_PARAMETER(idx);
-	return true;
-}
-
-static bool av1_supported(void)
-{
-	char *test_exe = os_get_executable_path_ptr("obs-nvenc-test.exe");
-	struct dstr cmd = {0};
-	struct dstr caps_str = {0};
-	bool av1_supported = false;
-	config_t *config = NULL;
-
-	dstr_copy(&cmd, test_exe);
-	enum_graphics_device_luids(enum_luids, &cmd);
-
-	os_process_pipe_t *pp = os_process_pipe_create(cmd.array, "r");
-	if (!pp) {
-		blog(LOG_WARNING, "NVENC Failed to launch the NVENC "
-				 "test process I guess");
-		goto fail;
-	}
-
-	for (;;) {
-		char data2048;
-		size_t len =
-			os_process_pipe_read(pp, (uint8_t *)data, sizeof(data));
-		if (!len)
-			break;
-
-		dstr_ncat(&caps_str, data, len);
-	}
-
-	os_process_pipe_destroy(pp);
-
-	if (dstr_is_empty(&caps_str)) {
-		blog(LOG_WARNING,
-		 "NVENC Seems the NVENC test subprocess crashed. "
-		 "Better there than here I guess. Let's just "
-		 "skip NVENC AV1 detection then I suppose.");
-		goto fail;
-	}
-
-	if (config_open_string(&config, caps_str.array) != 0) {
-		blog(LOG_WARNING, "NVENC Failed to open config string");
-		goto fail;
-	}
-
-	const char *error = config_get_string(config, "error", "string");
-	if (error) {
-		blog(LOG_WARNING, "NVENC AV1 test process failed: %s", error);
-		goto fail;
-	}
-
-	uint32_t adapter_count = (uint32_t)config_num_sections(config);
-	bool avc_supported = false;
-	bool hevc_supported = false;
-
-	/* for now, just check AV1 support on device 0 */
-	av1_supported = config_get_bool(config, "0", "supports_av1");
-
-fail:
-	if (config)
-		config_close(config);
-	dstr_free(&caps_str);
-	dstr_free(&cmd);
-	if (test_exe)
-		bfree(test_exe);
-
-	return av1_supported;
-}
-
-void jim_nvenc_load(bool h264, bool hevc, bool av1)
-{
-	pthread_mutex_init(&init_mutex, NULL);
-	if (h264)
-		obs_register_encoder(&h264_nvenc_info);
-#ifdef ENABLE_HEVC
-	if (hevc)
-		obs_register_encoder(&hevc_nvenc_info);
-#endif
-	if (av1 && av1_supported())
-		obs_register_encoder(&av1_nvenc_info);
-	else
-		blog(LOG_WARNING, "NVENC AV1 is not supported");
-}
-
-void jim_nvenc_unload(void)
-{
-	pthread_mutex_destroy(&init_mutex);
-}

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/jim-nvenc.c Deleted

@@ -1,1569 +0,0 @@
-#include "jim-nvenc.h"
-#include <util/circlebuf.h>
-#include <util/darray.h>
-#include <util/dstr.h>
-#include <obs-avc.h>
-#include <libavutil/rational.h>
-#define INITGUID
-#include <dxgi.h>
-#include <d3d11.h>
-#include <d3d11_1.h>
-#include <obs-hevc.h>
-
-/* ========================================================================= */
-/* a hack of the ages: nvenc backward compatibility */
-
-#define CONFIGURED_NVENC_MAJOR 12
-#define CONFIGURED_NVENC_MINOR 0
-#define CONFIGURED_NVENC_VER \
-	(CONFIGURED_NVENC_MAJOR | (CONFIGURED_NVENC_MINOR << 24))
-
-/* we cannot guarantee structures haven't changed, so purposely break on
- * version change to force the programmer to update or remove backward
- * compatibility NVENC code. */
-#if CONFIGURED_NVENC_VER != NVENCAPI_VERSION
-#error NVENC version changed, update or remove NVENC compatibility code
-#endif
-
-#undef NVENCAPI_STRUCT_VERSION
-#define NVENCAPI_STRUCT_VERSION(ver) \
-	((uint32_t)(enc->codec == CODEC_AV1 ? NVENCAPI_VERSION \
-					 : NVENC_COMPAT_VER) | \
-	 ((ver) << 16) | (0x7 << 28))
-
-#define NV_ENC_CONFIG_COMPAT_VER (NVENCAPI_STRUCT_VERSION(7) | (1 << 31))
-#define NV_ENC_PIC_PARAMS_COMPAT_VER (NVENCAPI_STRUCT_VERSION(4) | (1 << 31))
-#define NV_ENC_LOCK_BITSTREAM_COMPAT_VER NVENCAPI_STRUCT_VERSION(1)
-#define NV_ENC_REGISTER_RESOURCE_COMPAT_VER NVENCAPI_STRUCT_VERSION(3)
-
-/* ========================================================================= */
-
-#define EXTRA_BUFFERS 5
-
-#define do_log(level, format, ...) \
-	blog(level, "jim-nvenc: '%s' " format, \
-	 obs_encoder_get_name(enc->encoder), ##__VA_ARGS__)
-
-#define error(format, ...) do_log(LOG_ERROR, format, ##__VA_ARGS__)
-#define warn(format, ...) do_log(LOG_WARNING, format, ##__VA_ARGS__)
-#define info(format, ...) do_log(LOG_INFO, format, ##__VA_ARGS__)
-#define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
-
-#define error_hr(msg) error("%s: %s: 0x%08lX", __FUNCTION__, msg, (uint32_t)hr);
-
-struct nv_bitstream;
-struct nv_texture;
-
-struct handle_tex {
-	uint32_t handle;
-	ID3D11Texture2D *tex;
-	IDXGIKeyedMutex *km;
-};
-
-/* ------------------------------------------------------------------------- */
-/* Main Implementation Structure */
-
-enum codec_type {
-	CODEC_H264,
-	CODEC_HEVC,
-	CODEC_AV1,
-};
-
-static const char *get_codec_name(enum codec_type type)
-{
-	switch (type) {
-	case CODEC_H264:
-		return "H264";
-	case CODEC_HEVC:
-		return "HEVC";
-	case CODEC_AV1:
-		return "AV1";
-	}
-
-	return "Unknown";
-}
-
-struct nvenc_data {
-	obs_encoder_t *encoder;
-	enum codec_type codec;
-	GUID codec_guid;
-
-	void *session;
-	NV_ENC_INITIALIZE_PARAMS params;
-	NV_ENC_CONFIG config;
-	int rc_lookahead;
-	int buf_count;
-	int output_delay;
-	int buffers_queued;
-	size_t next_bitstream;
-	size_t cur_bitstream;
-	bool encode_started;
-	bool first_packet;
-	bool can_change_bitrate;
-	int32_t bframes;
-
-	DARRAY(struct nv_bitstream) bitstreams;
-	DARRAY(struct nv_texture) textures;
-	DARRAY(struct handle_tex) input_textures;
-	struct circlebuf dts_list;
-
-	DARRAY(uint8_t) packet_data;
-	int64_t packet_pts;
-	bool packet_keyframe;
-
-	ID3D11Device *device;
-	ID3D11DeviceContext *context;
-
-	uint32_t cx;
-	uint32_t cy;
-
-	uint8_t *header;
-	size_t header_size;
-
-	uint8_t *sei;
-	size_t sei_size;
-};
-
-/* ------------------------------------------------------------------------- */
-/* Bitstream Buffer */
-
-struct nv_bitstream {
-	void *ptr;
-};
-
-#define NV_FAIL(format, ...) nv_fail(enc->encoder, format, ##__VA_ARGS__)
-#define NV_FAILED(x) nv_failed(enc->encoder, x, __FUNCTION__, #x)
-
-static bool nv_bitstream_init(struct nvenc_data *enc, struct nv_bitstream *bs)
-{
-	NV_ENC_CREATE_BITSTREAM_BUFFER buf = {
-		NV_ENC_CREATE_BITSTREAM_BUFFER_VER};
-
-	if (NV_FAILED(nv.nvEncCreateBitstreamBuffer(enc->session, &buf))) {
-		return false;
-	}
-
-	bs->ptr = buf.bitstreamBuffer;
-	return true;
-}
-
-static void nv_bitstream_free(struct nvenc_data *enc, struct nv_bitstream *bs)
-{
-	if (bs->ptr) {
-		nv.nvEncDestroyBitstreamBuffer(enc->session, bs->ptr);
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-/* Texture Resource */
-
-struct nv_texture {
-	void *res;
-	ID3D11Texture2D *tex;
-	void *mapped_res;
-};
-
-static bool nv_texture_init(struct nvenc_data *enc, struct nv_texture *nvtex)
-{
-	const bool p010 = obs_p010_tex_active();
-
-	D3D11_TEXTURE2D_DESC desc = {0};
-	desc.Width = enc->cx;
-	desc.Height = enc->cy;
-	desc.MipLevels = 1;
-	desc.ArraySize = 1;
-	desc.Format = p010 ? DXGI_FORMAT_P010 : DXGI_FORMAT_NV12;
-	desc.SampleDesc.Count = 1;
-	desc.BindFlags = D3D11_BIND_RENDER_TARGET;
-
-	ID3D11Device *const device = enc->device;
-	ID3D11Texture2D *tex;
-	HRESULT hr = device->lpVtbl->CreateTexture2D(device, &desc, NULL, &tex);
-	if (FAILED(hr)) {
-		error_hr("Failed to create texture");
-		return false;
-	}
-
-	tex->lpVtbl->SetEvictionPriority(tex, DXGI_RESOURCE_PRIORITY_MAXIMUM);
-
-	uint32_t struct_ver = enc->codec == CODEC_AV1
-				 ? NV_ENC_REGISTER_RESOURCE_VER
-				 : NV_ENC_REGISTER_RESOURCE_COMPAT_VER;
-
-	NV_ENC_REGISTER_RESOURCE res = {struct_ver};
-	res.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_DIRECTX;
-	res.resourceToRegister = tex;
-	res.width = enc->cx;
-	res.height = enc->cy;
-	res.bufferFormat = p010 ? NV_ENC_BUFFER_FORMAT_YUV420_10BIT
-				: NV_ENC_BUFFER_FORMAT_NV12;
-
-	if (NV_FAILED(nv.nvEncRegisterResource(enc->session, &res))) {
-		tex->lpVtbl->Release(tex);
-		return false;
-	}
-
-	nvtex->res = res.registeredResource;
-	nvtex->tex = tex;
-	nvtex->mapped_res = NULL;
-	return true;
-}
-
-static void nv_texture_free(struct nvenc_data *enc, struct nv_texture *nvtex)
-{
-	if (nvtex->res) {
-		if (nvtex->mapped_res) {
-			nv.nvEncUnmapInputResource(enc->session,
-						 nvtex->mapped_res);
-		}
-		nv.nvEncUnregisterResource(enc->session, nvtex->res);
-		nvtex->tex->lpVtbl->Release(nvtex->tex);
-	}
-}
-
-/* ------------------------------------------------------------------------- */
-/* Implementation */
-
-static const char *h264_nvenc_get_name(void *type_data)
-{
-	UNUSED_PARAMETER(type_data);
-	return "NVIDIA NVENC H.264";
-}
-
-#ifdef ENABLE_HEVC
-static const char *hevc_nvenc_get_name(void *type_data)
-{
-	UNUSED_PARAMETER(type_data);
-	return "NVIDIA NVENC HEVC";
-}
-#endif
-
-static const char *av1_nvenc_get_name(void *type_data)
-{
-	UNUSED_PARAMETER(type_data);
-	return "NVIDIA NVENC AV1";
-}
-
-static inline int nv_get_cap(struct nvenc_data *enc, NV_ENC_CAPS cap)
-{
-	if (!enc->session)
-		return 0;
-
-	NV_ENC_CAPS_PARAM param = {NV_ENC_CAPS_PARAM_VER};
-	int v;
-
-	param.capsToQuery = cap;
-	nv.nvEncGetEncodeCaps(enc->session, enc->codec_guid, &param, &v);
-	return v;
-}
-
-static bool nvenc_update(void *data, obs_data_t *settings)
-{
-	struct nvenc_data *enc = data;
-
-	/* Only support reconfiguration of CBR bitrate */
-	if (enc->can_change_bitrate) {
-		int bitrate = (int)obs_data_get_int(settings, "bitrate");
-
-		enc->config.rcParams.averageBitRate = bitrate * 1000;
-		enc->config.rcParams.maxBitRate = bitrate * 1000;
-
-		NV_ENC_RECONFIGURE_PARAMS params = {0};
-		params.version = NV_ENC_RECONFIGURE_PARAMS_VER;
-		params.reInitEncodeParams = enc->params;
-		params.resetEncoder = 1;
-		params.forceIDR = 1;
-
-		if (NV_FAILED(nv.nvEncReconfigureEncoder(enc->session,
-							 &params))) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-static HANDLE get_lib(struct nvenc_data *enc, const char *lib)
-{
-	HMODULE mod = GetModuleHandleA(lib);
-	if (mod)
-		return mod;
-
-	mod = LoadLibraryA(lib);
-	if (!mod)
-		error("Failed to load %s", lib);
-	return mod;
-}
-
-typedef HRESULT(WINAPI *CREATEDXGIFACTORY1PROC)(REFIID, void **);
-
-static bool init_d3d11(struct nvenc_data *enc, obs_data_t *settings)
-{
-	HMODULE dxgi = get_lib(enc, "DXGI.dll");
-	HMODULE d3d11 = get_lib(enc, "D3D11.dll");
-	CREATEDXGIFACTORY1PROC create_dxgi;
-	PFN_D3D11_CREATE_DEVICE create_device;
-	IDXGIFactory1 *factory;
-	IDXGIAdapter *adapter;
-	ID3D11Device *device;
-	ID3D11DeviceContext *context;
-	HRESULT hr;
-
-	if (!dxgi || !d3d11) {
-		return false;
-	}
-
-	create_dxgi = (CREATEDXGIFACTORY1PROC)GetProcAddress(
-		dxgi, "CreateDXGIFactory1");
-	create_device = (PFN_D3D11_CREATE_DEVICE)GetProcAddress(
-		d3d11, "D3D11CreateDevice");
-
-	if (!create_dxgi || !create_device) {
-		error("Failed to load D3D11/DXGI procedures");
-		return false;
-	}
-
-	hr = create_dxgi(&IID_IDXGIFactory1, &factory);
-	if (FAILED(hr)) {
-		error_hr("CreateDXGIFactory1 failed");
-		return false;
-	}
-
-	hr = factory->lpVtbl->EnumAdapters(factory, 0, &adapter);
-	factory->lpVtbl->Release(factory);
-	if (FAILED(hr)) {
-		error_hr("EnumAdapters failed");
-		return false;
-	}
-
-	hr = create_device(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, 0, NULL, 0,
-			 D3D11_SDK_VERSION, &device, NULL, &context);
-	adapter->lpVtbl->Release(adapter);
-	if (FAILED(hr)) {
-		error_hr("D3D11CreateDevice failed");
-		return false;
-	}
-
-	enc->device = device;
-	enc->context = context;
-	return true;
-}
-
-static bool init_session(struct nvenc_data *enc)
-{
-	NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS params = {
-		NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER};
-	params.device = enc->device;
-	params.deviceType = NV_ENC_DEVICE_TYPE_DIRECTX;
-	params.apiVersion = enc->codec == CODEC_AV1 ? NVENCAPI_VERSION
-						 : NVENC_COMPAT_VER;
-
-	if (NV_FAILED(nv.nvEncOpenEncodeSessionEx(&params, &enc->session))) {
-		return false;
-	}
-	return true;
-}
-
-static void initialize_params(struct nvenc_data *enc, const GUID *nv_preset,
-			 NV_ENC_TUNING_INFO nv_tuning, uint32_t width,
-			 uint32_t height, uint32_t fps_num,
-			 uint32_t fps_den)
-{
-	int darWidth, darHeight;
-	av_reduce(&darWidth, &darHeight, width, height, 1024 * 1024);
-
-	NV_ENC_INITIALIZE_PARAMS *params = &enc->params;
-	memset(params, 0, sizeof(*params));
-	params->version = NV_ENC_INITIALIZE_PARAMS_VER;
-	params->encodeGUID = enc->codec_guid;
-	params->presetGUID = *nv_preset;
-	params->encodeWidth = width;
-	params->encodeHeight = height;
-	params->darWidth = enc->codec == CODEC_AV1 ? width : darWidth;
-	params->darHeight = enc->codec == CODEC_AV1 ? height : darHeight;
-	params->frameRateNum = fps_num;
-	params->frameRateDen = fps_den;
-	params->enableEncodeAsync = 0;
-	params->enablePTD = 1;
-	params->encodeConfig = &enc->config;
-	params->tuningInfo = nv_tuning;
-}
-
-static inline GUID get_nv_preset2(const char *preset2)
-{
-	if (astrcmpi(preset2, "p1") == 0) {
-		return NV_ENC_PRESET_P1_GUID;
-	} else if (astrcmpi(preset2, "p2") == 0) {
-		return NV_ENC_PRESET_P2_GUID;
-	} else if (astrcmpi(preset2, "p3") == 0) {
-		return NV_ENC_PRESET_P3_GUID;
-	} else if (astrcmpi(preset2, "p4") == 0) {
-		return NV_ENC_PRESET_P4_GUID;
-	} else if (astrcmpi(preset2, "p6") == 0) {
-		return NV_ENC_PRESET_P6_GUID;
-	} else if (astrcmpi(preset2, "p7") == 0) {
-		return NV_ENC_PRESET_P7_GUID;
-	} else {
-		return NV_ENC_PRESET_P5_GUID;
-	}
-}
-
-static inline NV_ENC_TUNING_INFO get_nv_tuning(const char *tuning)
-{
-	if (astrcmpi(tuning, "ll") == 0) {
-		return NV_ENC_TUNING_INFO_LOW_LATENCY;
-	} else if (astrcmpi(tuning, "ull") == 0) {
-		return NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY;
-	} else {
-		return NV_ENC_TUNING_INFO_HIGH_QUALITY;
-	}
-}
-
-static inline NV_ENC_MULTI_PASS get_nv_multipass(const char *multipass)
-{
-	if (astrcmpi(multipass, "qres") == 0) {
-		return NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
-	} else if (astrcmpi(multipass, "fullres") == 0) {
-		return NV_ENC_TWO_PASS_FULL_RESOLUTION;
-	} else {
-		return NV_ENC_MULTI_PASS_DISABLED;
-	}
-}
-
-static bool init_encoder_base(struct nvenc_data *enc, obs_data_t *settings,
-			 int bf, bool compatibility, bool *lossless)
-{
-	const char *rc = obs_data_get_string(settings, "rate_control");
-	int bitrate = (int)obs_data_get_int(settings, "bitrate");
-	int max_bitrate = (int)obs_data_get_int(settings, "max_bitrate");
-	int cqp = (int)obs_data_get_int(settings, "cqp");
-	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
-	const char *preset = obs_data_get_string(settings, "preset");
-	const char *preset2 = obs_data_get_string(settings, "preset2");
-	const char *tuning = obs_data_get_string(settings, "tune");
-	const char *multipass = obs_data_get_string(settings, "multipass");
-	const char *profile = obs_data_get_string(settings, "profile");
-	bool lookahead = obs_data_get_bool(settings, "lookahead");
-	bool vbr = astrcmpi(rc, "VBR") == 0;
-	bool psycho_aq = !compatibility &&
-			 obs_data_get_bool(settings, "psycho_aq");
-	NVENCSTATUS err;
-
-	video_t *video = obs_encoder_video(enc->encoder);
-	const struct video_output_info *voi = video_output_get_info(video);
-
-	enc->cx = voi->width;
-	enc->cy = voi->height;
-
-	/* -------------------------- */
-	/* get preset */
-
-	GUID nv_preset = get_nv_preset2(preset2);
-	NV_ENC_TUNING_INFO nv_tuning = get_nv_tuning(tuning);
-	NV_ENC_MULTI_PASS nv_multipass = compatibility
-						 ? NV_ENC_MULTI_PASS_DISABLED
-						 : get_nv_multipass(multipass);
-
-	if (obs_data_has_user_value(settings, "preset") &&
-	 !obs_data_has_user_value(settings, "preset2") &&
-	 enc->codec == CODEC_H264) {
-		if (astrcmpi(preset, "mq") == 0) {
-			nv_preset = NV_ENC_PRESET_P5_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
-
-		} else if (astrcmpi(preset, "hq") == 0) {
-			nv_preset = NV_ENC_PRESET_P5_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "default") == 0) {
-			nv_preset = NV_ENC_PRESET_P3_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "hp") == 0) {
-			nv_preset = NV_ENC_PRESET_P1_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "ll") == 0) {
-			nv_preset = NV_ENC_PRESET_P3_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "llhq") == 0) {
-			nv_preset = NV_ENC_PRESET_P4_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "llhp") == 0) {
-			nv_preset = NV_ENC_PRESET_P2_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-		}
-	} else if (obs_data_has_user_value(settings, "preset") &&
-		 !obs_data_has_user_value(settings, "preset2") &&
-		 enc->codec == CODEC_HEVC) {
-		if (astrcmpi(preset, "mq") == 0) {
-			nv_preset = NV_ENC_PRESET_P6_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
-
-		} else if (astrcmpi(preset, "hq") == 0) {
-			nv_preset = NV_ENC_PRESET_P6_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "default") == 0) {
-			nv_preset = NV_ENC_PRESET_P5_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "hp") == 0) {
-			nv_preset = NV_ENC_PRESET_P1_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "ll") == 0) {
-			nv_preset = NV_ENC_PRESET_P3_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "llhq") == 0) {
-			nv_preset = NV_ENC_PRESET_P4_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-
-		} else if (astrcmpi(preset, "llhp") == 0) {
-			nv_preset = NV_ENC_PRESET_P2_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-		}
-	}
-
-	const bool rc_lossless = astrcmpi(rc, "lossless") == 0;
-	*lossless = rc_lossless;
-	if (rc_lossless) {
-		*lossless =
-			nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_LOSSLESS_ENCODE);
-		if (*lossless) {
-			nv_tuning = NV_ENC_TUNING_INFO_LOSSLESS;
-			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
-		} else {
-			warn("lossless encode is not supported, ignoring");
-			nv_preset = NV_ENC_PRESET_P5_GUID;
-			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
-			nv_multipass = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
-		}
-	}
-
-	/* -------------------------- */
-	/* get preset default config */
-
-	uint32_t config_ver = enc->codec == CODEC_AV1
-				 ? NV_ENC_CONFIG_VER
-				 : NV_ENC_CONFIG_COMPAT_VER;
-
-	NV_ENC_PRESET_CONFIG preset_config = {NV_ENC_PRESET_CONFIG_VER,
-					 {config_ver}};
-
-	err = nv.nvEncGetEncodePresetConfigEx(enc->session, enc->codec_guid,
-					 nv_preset, nv_tuning,
-					 &preset_config);
-	if (nv_failed(enc->encoder, err, __FUNCTION__,
-		 "nvEncGetEncodePresetConfig")) {
-		return false;
-	}
-
-	/* -------------------------- */
-	/* main configuration */
-
-	enc->config = preset_config.presetCfg;
-
-	uint32_t gop_size =
-		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
-
-	NV_ENC_CONFIG *config = &enc->config;
-
-	initialize_params(enc, &nv_preset, nv_tuning, voi->width, voi->height,
-			 voi->fps_num, voi->fps_den);
-
-	config->gopLength = gop_size;
-	config->frameIntervalP = 1 + bf;
-
-	enc->bframes = bf;
-
-	/* lookahead */
-	const bool use_profile_lookahead = config->rcParams.enableLookahead;
-	lookahead = nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_LOOKAHEAD) &&
-		 (lookahead || use_profile_lookahead);
-	if (lookahead) {
-		enc->rc_lookahead = use_profile_lookahead
-					 ? config->rcParams.lookaheadDepth
-					 : 8;
-	}
-
-	int buf_count = max(4, config->frameIntervalP * 2 * 2);
-	if (lookahead) {
-		buf_count = max(buf_count, config->frameIntervalP +
-						 enc->rc_lookahead +
-						 EXTRA_BUFFERS);
-	}
-
-	buf_count = min(64, buf_count);
-	enc->buf_count = buf_count;
-
-	const int output_delay = buf_count - 1;
-	enc->output_delay = output_delay;
-
-	if (lookahead) {
-		const int lkd_bound = output_delay - config->frameIntervalP - 4;
-		if (lkd_bound >= 0) {
-			config->rcParams.enableLookahead = 1;
-			config->rcParams.lookaheadDepth =
-				max(enc->rc_lookahead, lkd_bound);
-			config->rcParams.disableIadapt = 0;
-			config->rcParams.disableBadapt = 0;
-		} else {
-			lookahead = false;
-		}
-	}
-
-	/* psycho aq */
-	if (!compatibility) {
-		if (nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_TEMPORAL_AQ)) {
-			config->rcParams.enableAQ = psycho_aq;
-			config->rcParams.aqStrength = 8;
-			config->rcParams.enableTemporalAQ = psycho_aq;
-		} else {
-			warn("Ignoring Psycho Visual Tuning request since GPU is not capable");
-		}
-	}
-
-	/* -------------------------- */
-	/* rate control */
-
-	enc->can_change_bitrate =
-		nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE);
-
-	config->rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR;
-
-	if (astrcmpi(rc, "cqp") == 0 || rc_lossless) {
-		if (*lossless)
-			cqp = 0;
-
-		int cqp_val = enc->codec == CODEC_AV1 ? cqp * 4 : cqp;
-
-		config->rcParams.rateControlMode = NV_ENC_PARAMS_RC_CONSTQP;
-		config->rcParams.constQP.qpInterP = cqp_val;
-		config->rcParams.constQP.qpInterB = cqp_val;
-		config->rcParams.constQP.qpIntra = cqp_val;
-		enc->can_change_bitrate = false;
-
-		bitrate = 0;
-		max_bitrate = 0;
-
-	} else if (astrcmpi(rc, "vbr") != 0) { /* CBR by default */
-		config->rcParams.rateControlMode = NV_ENC_PARAMS_RC_CBR;
-	}
-
-	config->rcParams.averageBitRate = bitrate * 1000;
-	config->rcParams.maxBitRate = vbr ? max_bitrate * 1000 : bitrate * 1000;
-	config->rcParams.vbvBufferSize = bitrate * 1000;
-	config->rcParams.multiPass = nv_multipass;
-
-	/* -------------------------- */
-	/* initialize */
-
-	info("settings:\n"
-	 "\tcodec: %s\n"
-	 "\trate_control: %s\n"
-	 "\tbitrate: %d\n"
-	 "\tcqp: %d\n"
-	 "\tkeyint: %d\n"
-	 "\tpreset: %s\n"
-	 "\ttuning: %s\n"
-	 "\tmultipass: %s\n"
-	 "\tprofile: %s\n"
-	 "\twidth: %d\n"
-	 "\theight: %d\n"
-	 "\tb-frames: %d\n"
-	 "\tlookahead: %s\n"
-	 "\tpsycho_aq: %s\n",
-	 get_codec_name(enc->codec), rc, bitrate, cqp, gop_size, preset2,
-	 tuning, multipass, profile, enc->cx, enc->cy, bf,
-	 lookahead ? "true" : "false", psycho_aq ? "true" : "false");
-
-	return true;
-}
-
-static bool init_encoder_h264(struct nvenc_data *enc, obs_data_t *settings,
-			 int bf, bool compatibility)
-{
-	const char *rc = obs_data_get_string(settings, "rate_control");
-	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
-	const char *profile = obs_data_get_string(settings, "profile");
-	bool lossless;
-
-	if (!init_encoder_base(enc, settings, bf, compatibility, &lossless)) {
-		return false;
-	}
-
-	NV_ENC_CONFIG *config = &enc->config;
-	NV_ENC_CONFIG_H264 *h264_config = &config->encodeCodecConfig.h264Config;
-	NV_ENC_CONFIG_H264_VUI_PARAMETERS *vui_params =
-		&h264_config->h264VUIParameters;
-
-	video_t *video = obs_encoder_video(enc->encoder);
-	const struct video_output_info *voi = video_output_get_info(video);
-	uint32_t gop_size =
-		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
-
-	h264_config->idrPeriod = gop_size;
-
-	bool repeat_headers = obs_data_get_bool(settings, "repeat_headers");
-	if (repeat_headers) {
-		h264_config->repeatSPSPPS = 1;
-		h264_config->disableSPSPPS = 0;
-		h264_config->outputAUD = 1;
-	}
-
-	h264_config->sliceMode = 3;
-	h264_config->sliceModeData = 1;
-
-	h264_config->useBFramesAsRef = NV_ENC_BFRAME_REF_MODE_DISABLED;
-
-	/* Enable CBR padding */
-	if (config->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR)
-		h264_config->enableFillerDataInsertion = 1;
-
-	vui_params->videoSignalTypePresentFlag = 1;
-	vui_params->videoFullRangeFlag = (voi->range == VIDEO_RANGE_FULL);
-	vui_params->colourDescriptionPresentFlag = 1;
-
-	switch (voi->colorspace) {
-	case VIDEO_CS_601:
-		vui_params->colourPrimaries = 6;
-		vui_params->transferCharacteristics = 6;
-		vui_params->colourMatrix = 6;
-		break;
-	case VIDEO_CS_DEFAULT:
-	case VIDEO_CS_709:
-		vui_params->colourPrimaries = 1;
-		vui_params->transferCharacteristics = 1;
-		vui_params->colourMatrix = 1;
-		break;
-	case VIDEO_CS_SRGB:
-		vui_params->colourPrimaries = 1;
-		vui_params->transferCharacteristics = 13;
-		vui_params->colourMatrix = 1;
-		break;
-	}
-
-	if (astrcmpi(rc, "lossless") == 0) {
-		h264_config->qpPrimeYZeroTransformBypassFlag = 1;
-	} else if (astrcmpi(rc, "vbr") != 0) { /* CBR */
-		h264_config->outputBufferingPeriodSEI = 1;
-	}
-
-	h264_config->outputPictureTimingSEI = 1;
-
-	/* -------------------------- */
-	/* profile */
-
-	if (astrcmpi(profile, "main") == 0) {
-		config->profileGUID = NV_ENC_H264_PROFILE_MAIN_GUID;
-	} else if (astrcmpi(profile, "baseline") == 0) {
-		config->profileGUID = NV_ENC_H264_PROFILE_BASELINE_GUID;
-	} else if (!lossless) {
-		config->profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
-	}
-
-	if (NV_FAILED(nv.nvEncInitializeEncoder(enc->session, &enc->params))) {
-		return false;
-	}
-
-	return true;
-}
-
-static bool init_encoder_hevc(struct nvenc_data *enc, obs_data_t *settings,
-			 int bf, bool compatibility)
-{
-	const char *rc = obs_data_get_string(settings, "rate_control");
-	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
-	const char *profile = obs_data_get_string(settings, "profile");
-	bool lossless;
-
-	if (!init_encoder_base(enc, settings, bf, compatibility, &lossless)) {
-		return false;
-	}
-
-	NV_ENC_CONFIG *config = &enc->config;
-	NV_ENC_CONFIG_HEVC *hevc_config = &config->encodeCodecConfig.hevcConfig;
-	NV_ENC_CONFIG_HEVC_VUI_PARAMETERS *vui_params =
-		&hevc_config->hevcVUIParameters;
-
-	video_t *video = obs_encoder_video(enc->encoder);
-	const struct video_output_info *voi = video_output_get_info(video);
-	uint32_t gop_size =
-		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
-
-	hevc_config->idrPeriod = gop_size;
-
-	bool repeat_headers = obs_data_get_bool(settings, "repeat_headers");
-	if (repeat_headers) {
-		hevc_config->repeatSPSPPS = 1;
-		hevc_config->disableSPSPPS = 0;
-		hevc_config->outputAUD = 1;
-	}
-
-	hevc_config->sliceMode = 3;
-	hevc_config->sliceModeData = 1;
-
-	hevc_config->useBFramesAsRef = NV_ENC_BFRAME_REF_MODE_DISABLED;
-
-	/* Enable CBR padding */
-	if (config->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR)
-		hevc_config->enableFillerDataInsertion = 1;
-
-	vui_params->videoSignalTypePresentFlag = 1;
-	vui_params->videoFullRangeFlag = (voi->range == VIDEO_RANGE_FULL);
-	vui_params->colourDescriptionPresentFlag = 1;
-
-	switch (voi->colorspace) {
-	case VIDEO_CS_601:
-		vui_params->colourPrimaries = 6;
-		vui_params->transferCharacteristics = 6;
-		vui_params->colourMatrix = 6;
-		break;
-	case VIDEO_CS_DEFAULT:
-	case VIDEO_CS_709:
-		vui_params->colourPrimaries = 1;
-		vui_params->transferCharacteristics = 1;
-		vui_params->colourMatrix = 1;
-		break;
-	case VIDEO_CS_SRGB:
-		vui_params->colourPrimaries = 1;
-		vui_params->transferCharacteristics = 13;
-		vui_params->colourMatrix = 1;
-		break;
-	case VIDEO_CS_2100_PQ:
-		vui_params->colourPrimaries = 9;
-		vui_params->transferCharacteristics = 16;
-		vui_params->colourMatrix = 9;
-		vui_params->chromaSampleLocationFlag = 1;
-		vui_params->chromaSampleLocationTop = 2;
-		vui_params->chromaSampleLocationBot = 2;
-		break;
-	case VIDEO_CS_2100_HLG:
-		vui_params->colourPrimaries = 9;
-		vui_params->transferCharacteristics = 18;
-		vui_params->colourMatrix = 9;
-		vui_params->chromaSampleLocationFlag = 1;
-		vui_params->chromaSampleLocationTop = 2;
-		vui_params->chromaSampleLocationBot = 2;
-	}
-
-	hevc_config->pixelBitDepthMinus8 = obs_p010_tex_active() ? 2 : 0;
-
-	if (astrcmpi(rc, "cbr") == 0) {
-		hevc_config->outputBufferingPeriodSEI = 1;
-	}
-
-	hevc_config->outputPictureTimingSEI = 1;
-
-	/* -------------------------- */
-	/* profile */
-
-	if (astrcmpi(profile, "main10") == 0) {
-		config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN10_GUID;
-	} else if (obs_p010_tex_active()) {
-		blog(LOG_WARNING, "jim-nvenc Forcing main10 for P010");
-		config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN10_GUID;
-	} else {
-		config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID;
-	}
-
-	if (NV_FAILED(nv.nvEncInitializeEncoder(enc->session, &enc->params))) {
-		return false;
-	}
-
-	return true;
-}
-
-static bool init_encoder_av1(struct nvenc_data *enc, obs_data_t *settings,
-			 int bf, bool compatibility)
-{
-	const char *rc = obs_data_get_string(settings, "rate_control");
-	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
-	bool lossless;
-
-	if (!init_encoder_base(enc, settings, bf, compatibility, &lossless)) {
-		return false;
-	}
-
-	NV_ENC_INITIALIZE_PARAMS *params = &enc->params;
-	NV_ENC_CONFIG *config = &enc->config;
-	NV_ENC_CONFIG_AV1 *av1_config = &config->encodeCodecConfig.av1Config;
-
-	video_t *video = obs_encoder_video(enc->encoder);
-	const struct video_output_info *voi = video_output_get_info(video);
-	uint32_t gop_size =
-		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
-
-	av1_config->idrPeriod = gop_size;
-
-	av1_config->useBFramesAsRef = NV_ENC_BFRAME_REF_MODE_DISABLED;
-
-	av1_config->colorRange = (voi->range == VIDEO_RANGE_FULL);
-
-	/* Enable CBR padding */
-	if (config->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR)
-		av1_config->enableBitstreamPadding = 1;
-
-	switch (voi->colorspace) {
-	case VIDEO_CS_601:
-		av1_config->colorPrimaries = 6;
-		av1_config->transferCharacteristics = 6;
-		av1_config->matrixCoefficients = 6;
-		break;
-	case VIDEO_CS_DEFAULT:
-	case VIDEO_CS_709:
-		av1_config->colorPrimaries = 1;
-		av1_config->transferCharacteristics = 1;
-		av1_config->matrixCoefficients = 1;
-		break;
-	case VIDEO_CS_SRGB:
-		av1_config->colorPrimaries = 1;
-		av1_config->transferCharacteristics = 13;
-		av1_config->matrixCoefficients = 1;
-		break;
-	case VIDEO_CS_2100_PQ:
-		av1_config->colorPrimaries = 9;
-		av1_config->transferCharacteristics = 16;
-		av1_config->matrixCoefficients = 9;
-		break;
-	case VIDEO_CS_2100_HLG:
-		av1_config->colorPrimaries = 9;
-		av1_config->transferCharacteristics = 18;
-		av1_config->matrixCoefficients = 9;
-	}
-
-	/* -------------------------- */
-	/* profile */
-
-	config->profileGUID = NV_ENC_AV1_PROFILE_MAIN_GUID;
-	av1_config->tier = NV_ENC_TIER_AV1_0;
-
-	av1_config->level = NV_ENC_LEVEL_AV1_AUTOSELECT;
-	av1_config->chromaFormatIDC = 1;
-	av1_config->pixelBitDepthMinus8 = obs_p010_tex_active() ? 2 : 0;
-	av1_config->inputPixelBitDepthMinus8 = av1_config->pixelBitDepthMinus8;
-	av1_config->numFwdRefs = 1;
-	av1_config->numBwdRefs = 1;
-	av1_config->repeatSeqHdr = 1;
-
-	if (NV_FAILED(nv.nvEncInitializeEncoder(enc->session, &enc->params))) {
-		return false;
-	}
-
-	return true;
-}
-
-static bool init_bitstreams(struct nvenc_data *enc)
-{
-	da_reserve(enc->bitstreams, enc->buf_count);
-	for (int i = 0; i < enc->buf_count; i++) {
-		struct nv_bitstream bitstream;
-		if (!nv_bitstream_init(enc, &bitstream)) {
-			return false;
-		}
-
-		da_push_back(enc->bitstreams, &bitstream);
-	}
-
-	return true;
-}
-
-static bool init_textures(struct nvenc_data *enc)
-{
-	da_reserve(enc->textures, enc->buf_count);
-	for (int i = 0; i < enc->buf_count; i++) {
-		struct nv_texture texture;
-		if (!nv_texture_init(enc, &texture)) {
-			return false;
-		}
-
-		da_push_back(enc->textures, &texture);
-	}
-
-	return true;
-}
-
-static void nvenc_destroy(void *data);
-
-static bool init_specific_encoder(struct nvenc_data *enc, obs_data_t *settings,
-				 int bf, bool compatibility)
-{
-	switch (enc->codec) {
-	case CODEC_HEVC:
-		return init_encoder_hevc(enc, settings, bf, compatibility);
-	case CODEC_H264:
-		return init_encoder_h264(enc, settings, bf, compatibility);
-	case CODEC_AV1:
-		return init_encoder_av1(enc, settings, bf, compatibility);
-	}
-
-	return false;
-}
-
-static bool init_encoder(struct nvenc_data *enc, enum codec_type codec,
-			 obs_data_t *settings, obs_encoder_t *encoder)
-{
-	int bf = (int)obs_data_get_int(settings, "bf");
-	const bool support_10bit =
-		nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_10BIT_ENCODE);
-	const int bf_max = nv_get_cap(enc, NV_ENC_CAPS_NUM_MAX_BFRAMES);
-
-	if (obs_p010_tex_active() && !support_10bit) {
-		NV_FAIL(obs_module_text("NVENC.10bitUnsupported"));
-		return false;
-	}
-
-	video_t *video = obs_encoder_video(enc->encoder);
-	const struct video_output_info *voi = video_output_get_info(video);
-	switch (voi->format) {
-	case VIDEO_FORMAT_I010:
-	case VIDEO_FORMAT_P010:
-		break;
-	default:
-		switch (voi->colorspace) {
-		case VIDEO_CS_2100_PQ:
-		case VIDEO_CS_2100_HLG:
-			NV_FAIL(obs_module_text("NVENC.8bitUnsupportedHdr"));
-			return false;
-		}
-	}
-
-	if (bf > bf_max) {
-		blog(LOG_WARNING,
-		 "jim-nvenc Max B-frames setting (%d) is more than encoder supports (%d).\n"
-		 "Setting B-frames to %d",
-		 bf, bf_max, bf_max);
-		bf = bf_max;
-	}
-
-	if (!init_specific_encoder(enc, settings, bf, false)) {
-		blog(LOG_WARNING, "jim-nvenc init_specific_encoder failed, "
-				 "trying again with compatibility options");
-
-		nv.nvEncDestroyEncoder(enc->session);
-		enc->session = NULL;
-
-		if (!init_session(enc)) {
-			return false;
-		}
-		/* try without multipass and psycho aq */
-		if (!init_specific_encoder(enc, settings, bf, true)) {
-			return false;
-		}
-	}
-
-	return true;
-}
-
-static void *nvenc_create_internal(enum codec_type codec, obs_data_t *settings,
-				 obs_encoder_t *encoder)
-{
-	struct nvenc_data *enc = bzalloc(sizeof(*enc));
-	enc->encoder = encoder;
-	enc->codec = codec;
-	enc->first_packet = true;
-
-	NV_ENCODE_API_FUNCTION_LIST init = {NV_ENCODE_API_FUNCTION_LIST_VER};
-
-	switch (enc->codec) {
-	case CODEC_H264:
-		enc->codec_guid = NV_ENC_CODEC_H264_GUID;
-		break;
-	case CODEC_HEVC:
-		enc->codec_guid = NV_ENC_CODEC_HEVC_GUID;
-		break;
-	case CODEC_AV1:
-		enc->codec_guid = NV_ENC_CODEC_AV1_GUID;
-		break;
-	}
-
-	if (!init_nvenc(encoder)) {
-		goto fail;
-	}
-	if (NV_FAILED(nv_create_instance(&init))) {
-		goto fail;
-	}
-	if (!init_d3d11(enc, settings)) {
-		goto fail;
-	}
-	if (!init_session(enc)) {
-		goto fail;
-	}
-	if (!init_encoder(enc, codec, settings, encoder)) {
-		goto fail;
-	}
-	if (!init_bitstreams(enc)) {
-		goto fail;
-	}
-	if (!init_textures(enc)) {
-		goto fail;
-	}
-
-#ifdef ENABLE_HEVC
-	enc->codec = codec;
-#endif
-	return enc;
-
-fail:
-	nvenc_destroy(enc);
-	return NULL;
-}
-
-static void *nvenc_create_base(enum codec_type codec, obs_data_t *settings,
-			 obs_encoder_t *encoder)
-{
-	/* this encoder requires shared textures, this cannot be used on a
-	 * gpu other than the one OBS is currently running on. */
-	const int gpu = (int)obs_data_get_int(settings, "gpu");
-	if (gpu != 0) {
-		blog(LOG_INFO,
-		 "jim-nvenc different GPU selected by user, falling back to ffmpeg");
-		goto reroute;
-	}
-
-	if (obs_encoder_scaling_enabled(encoder)) {
-		blog(LOG_INFO,
-		 "jim-nvenc scaling enabled, falling back to ffmpeg");
-		goto reroute;
-	}
-
-	if (!obs_p010_tex_active() && !obs_nv12_tex_active()) {
-		blog(LOG_INFO,
-		 "jim-nvenc nv12/p010 not active, falling back to ffmpeg");
-		goto reroute;
-	}
-
-	struct nvenc_data *enc =
-		nvenc_create_internal(codec, settings, encoder);
-
-	if (enc) {
-		return enc;
-	}
-
-reroute:
-	switch (codec) {
-	case CODEC_H264:
-		return obs_encoder_create_rerouted(encoder, "ffmpeg_nvenc");
-	case CODEC_HEVC:
-		return obs_encoder_create_rerouted(encoder,
-						 "ffmpeg_hevc_nvenc");
-	case CODEC_AV1:
-		obs_encoder_set_last_error(
-			encoder,
-			obs_module_text("NVENC.NoAV1FallbackPossible"));
-		break;
-	}
-
-	return NULL;
-}
-
-static void *h264_nvenc_create(obs_data_t *settings, obs_encoder_t *encoder)
-{
-	return nvenc_create_base(CODEC_H264, settings, encoder);
-}
-
-#ifdef ENABLE_HEVC
-static void *hevc_nvenc_create(obs_data_t *settings, obs_encoder_t *encoder)
-{
-	return nvenc_create_base(CODEC_HEVC, settings, encoder);
-}
-#endif
-
-static void *av1_nvenc_create(obs_data_t *settings, obs_encoder_t *encoder)
-{
-	return nvenc_create_base(CODEC_AV1, settings, encoder);
-}
-
-static bool get_encoded_packet(struct nvenc_data *enc, bool finalize);
-
-static void nvenc_destroy(void *data)
-{
-	struct nvenc_data *enc = data;
-
-	if (enc->encode_started) {
-		size_t next_bitstream = enc->next_bitstream;
-
-		uint32_t struct_ver = enc->codec == CODEC_AV1
-					 ? NV_ENC_PIC_PARAMS_VER
-					 : NV_ENC_PIC_PARAMS_COMPAT_VER;
-		NV_ENC_PIC_PARAMS params = {struct_ver};
-		params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;
-		nv.nvEncEncodePicture(enc->session, &params);
-		get_encoded_packet(enc, true);
-	}
-	for (size_t i = 0; i < enc->textures.num; i++) {
-		nv_texture_free(enc, &enc->textures.arrayi);
-	}
-	for (size_t i = 0; i < enc->bitstreams.num; i++) {
-		nv_bitstream_free(enc, &enc->bitstreams.arrayi);
-	}
-	if (enc->session) {
-		nv.nvEncDestroyEncoder(enc->session);
-	}
-	for (size_t i = 0; i < enc->input_textures.num; i++) {
-		ID3D11Texture2D *tex = enc->input_textures.arrayi.tex;
-		IDXGIKeyedMutex *km = enc->input_textures.arrayi.km;
-		tex->lpVtbl->Release(tex);
-		km->lpVtbl->Release(km);
-	}
-	if (enc->context) {
-		enc->context->lpVtbl->Release(enc->context);
-	}
-	if (enc->device) {
-		enc->device->lpVtbl->Release(enc->device);
-	}
-
-	bfree(enc->header);
-	bfree(enc->sei);
-	circlebuf_free(&enc->dts_list);
-	da_free(enc->textures);
-	da_free(enc->bitstreams);
-	da_free(enc->input_textures);
-	da_free(enc->packet_data);
-	bfree(enc);
-}
-
-static ID3D11Texture2D *get_tex_from_handle(struct nvenc_data *enc,
-					 uint32_t handle,
-					 IDXGIKeyedMutex **km_out)
-{
-	ID3D11Device *device = enc->device;
-	IDXGIKeyedMutex *km;
-	ID3D11Texture2D *input_tex;
-	HRESULT hr;
-
-	for (size_t i = 0; i < enc->input_textures.num; i++) {
-		struct handle_tex *ht = &enc->input_textures.arrayi;
-		if (ht->handle == handle) {
-			*km_out = ht->km;
-			return ht->tex;
-		}
-	}
-
-	hr = device->lpVtbl->OpenSharedResource(device,
-						(HANDLE)(uintptr_t)handle,
-						&IID_ID3D11Texture2D,
-						&input_tex);
-	if (FAILED(hr)) {
-		error_hr("OpenSharedResource failed");
-		return NULL;
-	}
-
-	hr = input_tex->lpVtbl->QueryInterface(input_tex, &IID_IDXGIKeyedMutex,
-					 &km);
-	if (FAILED(hr)) {
-		error_hr("QueryInterface(IDXGIKeyedMutex) failed");
-		input_tex->lpVtbl->Release(input_tex);
-		return NULL;
-	}
-
-	input_tex->lpVtbl->SetEvictionPriority(input_tex,
-					 DXGI_RESOURCE_PRIORITY_MAXIMUM);
-
-	*km_out = km;
-
-	struct handle_tex new_ht = {handle, input_tex, km};
-	da_push_back(enc->input_textures, &new_ht);
-	return input_tex;
-}
-
-static bool get_encoded_packet(struct nvenc_data *enc, bool finalize)
-{
-	void *s = enc->session;
-
-	da_resize(enc->packet_data, 0);
-
-	if (!enc->buffers_queued)
-		return true;
-	if (!finalize && enc->buffers_queued < enc->output_delay)
-		return true;
-
-	size_t count = finalize ? enc->buffers_queued : 1;
-
-	for (size_t i = 0; i < count; i++) {
-		size_t cur_bs_idx = enc->cur_bitstream;
-		struct nv_bitstream *bs = &enc->bitstreams.arraycur_bs_idx;
-		struct nv_texture *nvtex = &enc->textures.arraycur_bs_idx;
-
-		/* ---------------- */
-
-		uint32_t struct_ver =
-			enc->codec == CODEC_AV1
-				? NV_ENC_LOCK_BITSTREAM_VER
-				: NV_ENC_LOCK_BITSTREAM_COMPAT_VER;
-
-		NV_ENC_LOCK_BITSTREAM lock = {struct_ver};
-		lock.outputBitstream = bs->ptr;
-		lock.doNotWait = false;
-
-		if (NV_FAILED(nv.nvEncLockBitstream(s, &lock))) {
-			return false;
-		}
-
-		if (enc->first_packet) {
-			NV_ENC_SEQUENCE_PARAM_PAYLOAD payload = {0};
-			uint8_t buf256;
-			uint32_t size = 0;
-
-			payload.version = NV_ENC_SEQUENCE_PARAM_PAYLOAD_VER;
-			payload.spsppsBuffer = buf;
-			payload.inBufferSize = sizeof(buf);
-			payload.outSPSPPSPayloadSize = &size;
-
-			nv.nvEncGetSequenceParams(s, &payload);
-			enc->header = bmemdup(buf, size);
-			enc->header_size = size;
-			enc->first_packet = false;
-		}
-
-		da_copy_array(enc->packet_data, lock.bitstreamBufferPtr,
-			 lock.bitstreamSizeInBytes);
-
-		enc->packet_pts = (int64_t)lock.outputTimeStamp;
-		enc->packet_keyframe = lock.pictureType == NV_ENC_PIC_TYPE_IDR;
-
-		if (NV_FAILED(nv.nvEncUnlockBitstream(s, bs->ptr))) {
-			return false;
-		}
-
-		/* ---------------- */
-
-		if (nvtex->mapped_res) {
-			NVENCSTATUS err;
-			err = nv.nvEncUnmapInputResource(s, nvtex->mapped_res);
-			if (nv_failed(enc->encoder, err, __FUNCTION__,
-				 "unmap")) {
-				return false;
-			}
-			nvtex->mapped_res = NULL;
-		}
-
-		/* ---------------- */
-
-		if (++enc->cur_bitstream == enc->buf_count)
-			enc->cur_bitstream = 0;
-
-		enc->buffers_queued--;
-	}
-
-	return true;
-}
-
-static bool nvenc_encode_tex(void *data, uint32_t handle, int64_t pts,
-			 uint64_t lock_key, uint64_t *next_key,
-			 struct encoder_packet *packet,
-			 bool *received_packet)
-{
-	struct nvenc_data *enc = data;
-	ID3D11Device *device = enc->device;
-	ID3D11DeviceContext *context = enc->context;
-	ID3D11Texture2D *input_tex;
-	ID3D11Texture2D *output_tex;
-	IDXGIKeyedMutex *km;
-	struct nv_texture *nvtex;
-	struct nv_bitstream *bs;
-	NVENCSTATUS err;
-
-	if (handle == GS_INVALID_HANDLE) {
-		error("Encode failed: bad texture handle");
-		*next_key = lock_key;
-		return false;
-	}
-
-	bs = &enc->bitstreams.arrayenc->next_bitstream;
-	nvtex = &enc->textures.arrayenc->next_bitstream;
-
-	input_tex = get_tex_from_handle(enc, handle, &km);
-	output_tex = nvtex->tex;
-
-	if (!input_tex) {
-		*next_key = lock_key;
-		return false;
-	}
-
-	circlebuf_push_back(&enc->dts_list, &pts, sizeof(pts));
-
-	/* ------------------------------------ */
-	/* copy to output tex */
-
-	km->lpVtbl->AcquireSync(km, lock_key, INFINITE);
-
-	context->lpVtbl->CopyResource(context, (ID3D11Resource *)output_tex,
-				 (ID3D11Resource *)input_tex);
-
-	km->lpVtbl->ReleaseSync(km, *next_key);
-
-	/* ------------------------------------ */
-	/* map output tex so nvenc can use it */
-
-	NV_ENC_MAP_INPUT_RESOURCE map = {NV_ENC_MAP_INPUT_RESOURCE_VER};
-	map.registeredResource = nvtex->res;
-	if (NV_FAILED(nv.nvEncMapInputResource(enc->session, &map))) {
-		return false;
-	}
-
-	nvtex->mapped_res = map.mappedResource;
-
-	/* ------------------------------------ */
-	/* do actual encode call */
-
-	NV_ENC_PIC_PARAMS params = {0};
-	params.version = enc->codec == CODEC_AV1 ? NV_ENC_PIC_PARAMS_VER
-						 : NV_ENC_PIC_PARAMS_COMPAT_VER;
-	params.pictureStruct = NV_ENC_PIC_STRUCT_FRAME;
-	params.inputBuffer = nvtex->mapped_res;
-	params.bufferFmt = obs_p010_tex_active()
-				 ? NV_ENC_BUFFER_FORMAT_YUV420_10BIT
-				 : NV_ENC_BUFFER_FORMAT_NV12;
-	params.inputTimeStamp = (uint64_t)pts;
-	params.inputWidth = enc->cx;
-	params.inputHeight = enc->cy;
-	params.inputPitch = enc->cx;
-	params.outputBitstream = bs->ptr;
-
-	err = nv.nvEncEncodePicture(enc->session, &params);
-	if (err != NV_ENC_SUCCESS && err != NV_ENC_ERR_NEED_MORE_INPUT) {
-		nv_failed(enc->encoder, err, __FUNCTION__,
-			 "nvEncEncodePicture");
-		return false;
-	}
-
-	enc->encode_started = true;
-	enc->buffers_queued++;
-
-	if (++enc->next_bitstream == enc->buf_count) {
-		enc->next_bitstream = 0;
-	}
-
-	/* ------------------------------------ */
-	/* check for encoded packet and parse */
-
-	if (!get_encoded_packet(enc, false)) {
-		return false;
-	}
-
-	/* ------------------------------------ */
-	/* output encoded packet */
-
-	if (enc->packet_data.num) {
-		int64_t dts;
-		circlebuf_pop_front(&enc->dts_list, &dts, sizeof(dts));
-
-		/* subtract bframe delay from dts */
-		dts -= (int64_t)enc->bframes * packet->timebase_num;
-
-		*received_packet = true;
-		packet->data = enc->packet_data.array;
-		packet->size = enc->packet_data.num;
-		packet->type = OBS_ENCODER_VIDEO;
-		packet->pts = enc->packet_pts;
-		packet->dts = dts;
-		packet->keyframe = enc->packet_keyframe;
-	} else {
-		*received_packet = false;
-	}
-
-	return true;
-}
-
-extern void h264_nvenc_defaults(obs_data_t *settings);
-extern obs_properties_t *h264_nvenc_properties(void *unused);
-#ifdef ENABLE_HEVC
-extern void hevc_nvenc_defaults(obs_data_t *settings);
-extern obs_properties_t *hevc_nvenc_properties(void *unused);
-#endif
-extern obs_properties_t *av1_nvenc_properties(void *unused);
-extern void av1_nvenc_defaults(obs_data_t *settings);
-
-static bool nvenc_extra_data(void *data, uint8_t **header, size_t *size)
-{
-	struct nvenc_data *enc = data;
-
-	if (!enc->header) {
-		return false;
-	}
-
-	*header = enc->header;
-	*size = enc->header_size;
-	return true;
-}
-
-static bool nvenc_sei_data(void *data, uint8_t **sei, size_t *size)
-{
-	struct nvenc_data *enc = data;
-
-	if (!enc->sei) {
-		return false;
-	}
-
-	*sei = enc->sei;
-	*size = enc->sei_size;
-	return true;
-}
-
-struct obs_encoder_info h264_nvenc_info = {
-	.id = "jim_nvenc",
-	.codec = "h264",
-	.type = OBS_ENCODER_VIDEO,
-	.caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_DYN_BITRATE,
-	.get_name = h264_nvenc_get_name,
-	.create = h264_nvenc_create,
-	.destroy = nvenc_destroy,
-	.update = nvenc_update,
-	.encode_texture = nvenc_encode_tex,
-	.get_defaults = h264_nvenc_defaults,
-	.get_properties = h264_nvenc_properties,
-	.get_extra_data = nvenc_extra_data,
-	.get_sei_data = nvenc_sei_data,
-};
-
-#ifdef ENABLE_HEVC
-struct obs_encoder_info hevc_nvenc_info = {
-	.id = "jim_hevc_nvenc",
-	.codec = "hevc",
-	.type = OBS_ENCODER_VIDEO,
-	.caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_DYN_BITRATE,
-	.get_name = hevc_nvenc_get_name,
-	.create = hevc_nvenc_create,
-	.destroy = nvenc_destroy,
-	.update = nvenc_update,
-	.encode_texture = nvenc_encode_tex,
-	.get_defaults = hevc_nvenc_defaults,
-	.get_properties = hevc_nvenc_properties,
-	.get_extra_data = nvenc_extra_data,
-	.get_sei_data = nvenc_sei_data,
-};
-#endif
-
-struct obs_encoder_info av1_nvenc_info = {
-	.id = "jim_av1_nvenc",
-	.codec = "av1",
-	.type = OBS_ENCODER_VIDEO,
-	.caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_DYN_BITRATE,
-	.get_name = av1_nvenc_get_name,
-	.create = av1_nvenc_create,
-	.destroy = nvenc_destroy,
-	.update = nvenc_update,
-	.encode_texture = nvenc_encode_tex,
-	.get_defaults = av1_nvenc_defaults,
-	.get_properties = av1_nvenc_properties,
-	.get_extra_data = nvenc_extra_data,
-};

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/jim-nvenc.h Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-nvenc-test/jim-nvenc-test.c Deleted

@@ -1,234 +0,0 @@
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "../external/nvEncodeAPI.h"
-#include "../jim-nvenc-ver.h"
-
-#include <dxgi.h>
-#include <d3d11.h>
-#include <d3d11_1.h>
-
-__declspec(dllexport) DWORD NvOptimusEnablement = 1;
-NV_ENCODE_API_FUNCTION_LIST nv = {NV_ENCODE_API_FUNCTION_LIST_VER};
-static void *nvenc_lib = NULL;
-static bool av1_supported = false;
-
-#define NVIDIA_VENDOR_ID 0x10DE
-
-struct nvenc_info {
-	bool is_nvidia;
-	bool supports_av1;
-};
-
-#define MAX_CAPS 10
-static uint32_t luid_count = 0;
-static uint64_t luid_orderMAX_CAPS = {0};
-static struct nvenc_info adapter_infoMAX_CAPS = {0};
-
-bool load_nvenc_lib(void)
-{
-	const char *const file = (sizeof(void *) == 8) ? "nvEncodeAPI64.dll"
-						 : "nvEncodeAPI.dll";
-	nvenc_lib = LoadLibraryA(file);
-	return nvenc_lib != NULL;
-}
-
-static inline void *load_nv_func(const char *func)
-{
-	void *func_ptr = (void *)GetProcAddress(nvenc_lib, func);
-	return func_ptr;
-}
-
-static inline uint32_t get_adapter_idx(uint32_t adapter_idx, LUID luid)
-{
-	for (uint32_t i = 0; i < luid_count; i++) {
-		if (luid_orderi == *(uint64_t *)&luid) {
-			return i;
-		}
-	}
-
-	return adapter_idx;
-}
-
-static bool get_adapter_caps(IDXGIFactory *factory, uint32_t adapter_idx)
-{
-	struct nvenc_info *caps;
-	IDXGIAdapter *adapter = NULL;
-	ID3D11Device *device = NULL;
-	ID3D11DeviceContext *context = NULL;
-	GUID *guids = NULL;
-	void *session = NULL;
-	HRESULT hr;
-
-	if (adapter_idx == MAX_CAPS)
-		return false;
-
-	hr = factory->lpVtbl->EnumAdapters(factory, adapter_idx, &adapter);
-	if (FAILED(hr))
-		return false;
-
-	DXGI_ADAPTER_DESC desc;
-	adapter->lpVtbl->GetDesc(adapter, &desc);
-
-	caps = &adapter_infoget_adapter_idx(adapter_idx, desc.AdapterLuid);
-	if (desc.VendorId != NVIDIA_VENDOR_ID)
-		return true;
-
-	caps->is_nvidia = true;
-
-	hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, 0, NULL,
-			 0, D3D11_SDK_VERSION, &device, NULL, &context);
-	if (FAILED(hr))
-		goto finish;
-
-	/* ---------------------------------------------------------------- */
-
-	NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS params = {
-		NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER};
-	params.device = device;
-	params.deviceType = NV_ENC_DEVICE_TYPE_DIRECTX;
-	params.apiVersion = NVENCAPI_VERSION;
-
-	NVENCSTATUS stat = nv.nvEncOpenEncodeSessionEx(&params, &session);
-	if (stat != NV_ENC_SUCCESS)
-		goto finish;
-
-	uint32_t guid_count = 0;
-	if (nv.nvEncGetEncodeGUIDCount(session, &guid_count) != NV_ENC_SUCCESS)
-		goto finish;
-
-	guids = malloc(guid_count * sizeof(GUID));
-	stat = nv.nvEncGetEncodeGUIDs(session, guids, guid_count, &guid_count);
-	if (stat != NV_ENC_SUCCESS)
-		goto finish;
-
-	for (uint32_t i = 0; i < guid_count; i++) {
-		GUID *guid = &guidsi;
-
-		if (memcmp(guid, &NV_ENC_CODEC_AV1_GUID, sizeof(GUID)) == 0) {
-			caps->supports_av1 = true;
-			break;
-		}
-	}
-
-finish:
-	if (guids)
-		free(guids);
-	if (session)
-		nv.nvEncDestroyEncoder(session);
-	if (context)
-		context->lpVtbl->Release(context);
-	if (device)
-		device->lpVtbl->Release(device);
-	if (adapter)
-		adapter->lpVtbl->Release(adapter);
-	return true;
-}
-
-typedef NVENCSTATUS(NVENCAPI *NV_MAX_VER_FUNC)(uint32_t *);
-typedef NVENCSTATUS(NVENCAPI *NV_CREATE_INSTANCE_FUNC)(
-	NV_ENCODE_API_FUNCTION_LIST *);
-
-static inline uint32_t get_nvenc_ver(void)
-{
-	NV_MAX_VER_FUNC nv_max_ver = (NV_MAX_VER_FUNC)load_nv_func(
-		"NvEncodeAPIGetMaxSupportedVersion");
-	if (!nv_max_ver) {
-		return 0;
-	}
-
-	uint32_t ver = 0;
-	if (nv_max_ver(&ver) != NV_ENC_SUCCESS) {
-		return 0;
-	}
-	return ver;
-}
-
-static inline bool init_nvenc_internal(void)
-{
-	if (!load_nvenc_lib())
-		return false;
-
-	uint32_t ver = get_nvenc_ver();
-	if (ver == 0)
-		return false;
-
-	uint32_t supported_ver = (NVENC_COMPAT_MAJOR_VER << 4) |
-				 NVENC_COMPAT_MINOR_VER;
-	if (supported_ver > ver)
-		return false;
-
-	NV_CREATE_INSTANCE_FUNC nv_create_instance =
-		(NV_CREATE_INSTANCE_FUNC)load_nv_func(
-			"NvEncodeAPICreateInstance");
-	if (!nv_create_instance)
-		return false;
-
-	return nv_create_instance(&nv) == NV_ENC_SUCCESS;
-}
-
-DWORD WINAPI TimeoutThread(LPVOID param)
-{
-	HANDLE hMainThread = (HANDLE)param;
-
-	DWORD ret = WaitForSingleObject(hMainThread, 2500);
-	if (ret == WAIT_TIMEOUT)
-		TerminateProcess(GetCurrentProcess(), STATUS_TIMEOUT);
-
-	CloseHandle(hMainThread);
-	return 0;
-}
-
-int main(int argc, char *argv)
-{
-	IDXGIFactory *factory = NULL;
-	HRESULT hr;
-
-	HANDLE hMainThread;
-	DuplicateHandle(GetCurrentProcess(), GetCurrentThread(),
-			GetCurrentProcess(), &hMainThread, 0, FALSE,
-			DUPLICATE_SAME_ACCESS);
-	DWORD threadId;
-	HANDLE hThread;
-	hThread =
-		CreateThread(NULL, 0, TimeoutThread, hMainThread, 0, &threadId);
-	CloseHandle(hThread);
-
-	/* --------------------------------------------------------- */
-	/* try initializing nvenc, I guess */
-
-	if (!init_nvenc_internal())
-		return 0;
-
-	/* --------------------------------------------------------- */
-	/* parse expected LUID order */
-
-	luid_count = argc - 1;
-	for (int i = 1; i < argc; i++) {
-		luid_orderi - 1 = strtoull(argvi, NULL, 16);
-	}
-
-	/* --------------------------------------------------------- */
-	/* obtain adapter compatibility information */
-
-	hr = CreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&factory);
-	if (FAILED(hr))
-		return 0;
-
-	uint32_t idx = 0;
-	while (get_adapter_caps(factory, idx++))
-		;
-
-	for (uint32_t i = 0; i < idx; i++) {
-		struct nvenc_info caps = adapter_infoi;
-
-		printf("%u\n", i);
-		printf("is_nvidia=%s\n", caps.is_nvidia ? "true" : "false");
-		printf("supports_av1=%s\n",
-		 caps.supports_av1 ? "true" : "false");
-	}
-
-	factory->lpVtbl->Release(factory);
-	return 0;
-}

obs-studio-29.1.3.tar.xz/plugins/obs-filters/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-filters/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/common_directx9.cpp Deleted

@@ -1,461 +0,0 @@
-#include "common_directx9.h"
-#include "device_directx9.h"
-
-#include <objbase.h>
-#include <initguid.h>
-#include <d3d9.h>
-#include <map>
-#include <atlbase.h>
-
-#define D3DFMT_NV12 (D3DFORMAT) MAKEFOURCC('N', 'V', '1', '2')
-#define D3DFMT_YV12 (D3DFORMAT) MAKEFOURCC('Y', 'V', '1', '2')
-#define D3DFMT_P010 (D3DFORMAT) MAKEFOURCC('P', '0', '1', '0')
-#define MSDK_SAFE_FREE(X) \
-	{ \
-		if (X) { \
-			free(X); \
-			X = NULL; \
-		} \
-	}
-
-std::map<mfxMemId *, mfxHDL> dx9_allocResponses;
-std::map<mfxHDL, mfxFrameAllocResponse> dx9_allocDecodeResponses;
-std::map<mfxHDL, int> dx9_allocDecodeRefCount;
-
-CComPtr<IDirect3DDeviceManager9> m_manager;
-CComPtr<IDirectXVideoDecoderService> m_decoderService;
-CComPtr<IDirectXVideoProcessorService> m_processorService;
-HANDLE m_hDecoder;
-HANDLE m_hProcessor;
-DWORD m_surfaceUsage;
-
-CD3D9Device *g_hwdevice;
-
-const struct {
-	mfxIMPL impl; // actual implementation
-	mfxU32 adapterID; // device adapter number
-} implTypes = {{MFX_IMPL_HARDWARE, 0},
-		 {MFX_IMPL_HARDWARE2, 1},
-		 {MFX_IMPL_HARDWARE3, 2},
-		 {MFX_IMPL_HARDWARE4, 3}};
-
-struct mfxAllocatorParams {
-	virtual ~mfxAllocatorParams(){};
-};
-
-struct D3DAllocatorParams : mfxAllocatorParams {
-	IDirect3DDeviceManager9 *pManager;
-	DWORD surfaceUsage;
-
-	D3DAllocatorParams() : pManager(), surfaceUsage() {}
-};
-
-mfxStatus DX9_Alloc_Init(D3DAllocatorParams *pParams)
-{
-	D3DAllocatorParams *pd3dParams = 0;
-	pd3dParams = dynamic_cast<D3DAllocatorParams *>(pParams);
-	if (!pd3dParams)
-		return MFX_ERR_NOT_INITIALIZED;
-
-	m_manager = pd3dParams->pManager;
-	m_surfaceUsage = pd3dParams->surfaceUsage;
-
-	return MFX_ERR_NONE;
-}
-
-mfxStatus DX9_CreateHWDevice(mfxSession session, mfxHDL *deviceHandle, HWND,
-			 bool)
-{
-	mfxStatus result;
-
-	g_hwdevice = new CD3D9Device;
-	mfxU32 adapterNum = 0;
-	mfxIMPL impl;
-
-	MFXQueryIMPL(session, &impl);
-
-	mfxIMPL baseImpl = MFX_IMPL_BASETYPE(
-		impl); // Extract Media SDK base implementation type
-
-	// get corresponding adapter number
-	for (mfxU8 i = 0; i < sizeof(implTypes) / sizeof(implTypes0); i++) {
-		if (implTypesi.impl == baseImpl) {
-			adapterNum = implTypesi.adapterID;
-			break;
-		}
-	}
-
-	POINT point = {0, 0};
-	HWND window = WindowFromPoint(point);
-
-	result = g_hwdevice->Init(window, 0, adapterNum);
-	if (result != MFX_ERR_NONE) {
-		return result;
-	}
-
-	g_hwdevice->GetHandle(MFX_HANDLE_D3D9_DEVICE_MANAGER, deviceHandle);
-
-	D3DAllocatorParams dx9_allocParam;
-	dx9_allocParam.pManager =
-		reinterpret_cast<IDirect3DDeviceManager9 *>(*deviceHandle);
-	DX9_Alloc_Init(&dx9_allocParam);
-	return MFX_ERR_NONE;
-}
-
-void DX9_CleanupHWDevice()
-{
-	if (g_hwdevice) {
-		// g_hwdevice->Close();
-		delete g_hwdevice;
-		g_hwdevice = NULL;
-	}
-	if (m_manager && m_hDecoder) {
-		m_manager->CloseDeviceHandle(m_hDecoder);
-		m_manager = NULL;
-		m_hDecoder = NULL;
-	}
-
-	if (m_manager && m_hProcessor) {
-		m_manager->CloseDeviceHandle(m_hProcessor);
-		m_manager = NULL;
-		m_hProcessor = NULL;
-	}
-
-	if (m_decoderService) {
-		// delete m_decoderService;
-		m_decoderService = NULL;
-	}
-
-	if (m_processorService) {
-		// delete m_processorService;
-		m_processorService = NULL;
-	}
-}
-
-D3DFORMAT ConvertMfxFourccToD3dFormat(mfxU32 fourcc)
-{
-	switch (fourcc) {
-	case MFX_FOURCC_NV12:
-		return D3DFMT_NV12;
-	case MFX_FOURCC_YV12:
-		return D3DFMT_YV12;
-	case MFX_FOURCC_YUY2:
-		return D3DFMT_YUY2;
-	case MFX_FOURCC_RGB3:
-		return D3DFMT_R8G8B8;
-	case MFX_FOURCC_RGB4:
-		return D3DFMT_A8R8G8B8;
-	case MFX_FOURCC_P8:
-		return D3DFMT_P8;
-	case MFX_FOURCC_P010:
-		return D3DFMT_P010;
-	case MFX_FOURCC_A2RGB10:
-		return D3DFMT_A2R10G10B10;
-	default:
-		return D3DFMT_UNKNOWN;
-	}
-}
-
-mfxStatus dx9_simple_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
-{
-	pthis; // To suppress warning for this unused parameter
-
-	if (!ptr || !mid)
-		return MFX_ERR_NULL_PTR;
-
-	mfxHDLPair *dxmid = (mfxHDLPair *)mid;
-	IDirect3DSurface9 *pSurface =
-		static_cast<IDirect3DSurface9 *>(dxmid->first);
-	if (pSurface == 0)
-		return MFX_ERR_INVALID_HANDLE;
-
-	D3DSURFACE_DESC desc;
-	HRESULT hr = pSurface->GetDesc(&desc);
-	if (FAILED(hr))
-		return MFX_ERR_LOCK_MEMORY;
-
-	if (desc.Format != D3DFMT_NV12 && desc.Format != D3DFMT_YV12 &&
-	 desc.Format != D3DFMT_YUY2 && desc.Format != D3DFMT_R8G8B8 &&
-	 desc.Format != D3DFMT_A8R8G8B8 && desc.Format != D3DFMT_P8 &&
-	 desc.Format != D3DFMT_P010 && desc.Format != D3DFMT_A2R10G10B10)
-		return MFX_ERR_LOCK_MEMORY;
-
-	D3DLOCKED_RECT locked;
-
-	hr = pSurface->LockRect(&locked, 0, D3DLOCK_NOSYSLOCK);
-	if (FAILED(hr))
-		return MFX_ERR_LOCK_MEMORY;
-
-	switch (desc.Format) {
-	case D3DFMT_NV12:
-		ptr->Pitch = (mfxU16)locked.Pitch;
-		ptr->Y = (mfxU8 *)locked.pBits;
-		ptr->U = (mfxU8 *)locked.pBits + desc.Height * locked.Pitch;
-		ptr->V = ptr->U + 1;
-		break;
-	case D3DFMT_YV12:
-		ptr->Pitch = (mfxU16)locked.Pitch;
-		ptr->Y = (mfxU8 *)locked.pBits;
-		ptr->V = ptr->Y + desc.Height * locked.Pitch;
-		ptr->U = ptr->V + (desc.Height * locked.Pitch) / 4;
-		break;
-	case D3DFMT_YUY2:
-		ptr->Pitch = (mfxU16)locked.Pitch;
-		ptr->Y = (mfxU8 *)locked.pBits;
-		ptr->U = ptr->Y + 1;
-		ptr->V = ptr->Y + 3;
-		break;
-	case D3DFMT_R8G8B8:
-		ptr->Pitch = (mfxU16)locked.Pitch;
-		ptr->B = (mfxU8 *)locked.pBits;
-		ptr->G = ptr->B + 1;
-		ptr->R = ptr->B + 2;
-		break;
-	case D3DFMT_A8R8G8B8:
-	case D3DFMT_A2R10G10B10:
-		ptr->Pitch = (mfxU16)locked.Pitch;
-		ptr->B = (mfxU8 *)locked.pBits;
-		ptr->G = ptr->B + 1;
-		ptr->R = ptr->B + 2;
-		ptr->A = ptr->B + 3;
-		break;
-	case D3DFMT_P8:
-		ptr->Pitch = (mfxU16)locked.Pitch;
-		ptr->Y = (mfxU8 *)locked.pBits;
-		ptr->U = 0;
-		ptr->V = 0;
-		break;
-	case D3DFMT_P010:
-		ptr->PitchHigh = (mfxU16)(locked.Pitch / (1 << 16));
-		ptr->PitchLow = (mfxU16)(locked.Pitch % (1 << 16));
-		ptr->Y = (mfxU8 *)locked.pBits;
-		ptr->U = (mfxU8 *)locked.pBits + desc.Height * locked.Pitch;
-		ptr->V = ptr->U + 1;
-		break;
-	}
-
-	return MFX_ERR_NONE;
-}
-
-mfxStatus dx9_simple_unlock(mfxHDL, mfxMemId mid, mfxFrameData *ptr)
-{
-	if (!mid)
-		return MFX_ERR_NULL_PTR;
-
-	mfxHDLPair *dxmid = (mfxHDLPair *)mid;
-	IDirect3DSurface9 *pSurface =
-		static_cast<IDirect3DSurface9 *>(dxmid->first);
-	if (pSurface == 0)
-		return MFX_ERR_INVALID_HANDLE;
-
-	pSurface->UnlockRect();
-
-	if (NULL != ptr) {
-		ptr->Pitch = 0;
-		ptr->Y = 0;
-		ptr->U = 0;
-		ptr->V = 0;
-	}
-
-	return MFX_ERR_NONE;
-}
-
-mfxStatus dx9_simple_gethdl(mfxHDL, mfxMemId mid, mfxHDL *handle)
-{
-	if (!mid || !handle)
-		return MFX_ERR_NULL_PTR;
-
-	mfxHDLPair *dxMid = (mfxHDLPair *)mid;
-	*handle = dxMid->first;
-	return MFX_ERR_NONE;
-}
-
-mfxStatus _dx9_simple_free(mfxFrameAllocResponse *response)
-{
-	if (!response)
-		return MFX_ERR_NULL_PTR;
-
-	mfxStatus sts = MFX_ERR_NONE;
-
-	if (response->mids) {
-		for (mfxU32 i = 0; i < response->NumFrameActual; i++) {
-			if (response->midsi) {
-				mfxHDLPair *dxMids =
-					(mfxHDLPair *)response->midsi;
-				static_cast<IDirect3DSurface9 *>(dxMids->first)
-					->Release();
-			}
-		}
-		MSDK_SAFE_FREE(response->mids0);
-	}
-	MSDK_SAFE_FREE(response->mids);
-
-	return sts;
-}
-
-mfxStatus dx9_simple_free(mfxHDL pthis, mfxFrameAllocResponse *response)
-{
-	if (NULL == response)
-		return MFX_ERR_NULL_PTR;
-
-	if (dx9_allocResponses.find(response->mids) ==
-	 dx9_allocResponses.end()) {
-		// Decode free response handling
-		if (--dx9_allocDecodeRefCountpthis == 0) {
-			_dx9_simple_free(response);
-			dx9_allocDecodeResponses.erase(pthis);
-			dx9_allocDecodeRefCount.erase(pthis);
-		}
-	} else {
-		// Encode and VPP free response handling
-		dx9_allocResponses.erase(response->mids);
-		_dx9_simple_free(response);
-	}
-
-	return MFX_ERR_NONE;
-}
-
-mfxStatus _dx9_simple_alloc(mfxFrameAllocRequest *request,
-			 mfxFrameAllocResponse *response)
-{
-	HRESULT hr;
-
-	MSDK_CHECK_POINTER(request, MFX_ERR_NULL_PTR);
-	if (request->NumFrameSuggested == 0)
-		return MFX_ERR_UNKNOWN;
-
-	D3DFORMAT format = ConvertMfxFourccToD3dFormat(request->Info.FourCC);
-
-	if (format == D3DFMT_UNKNOWN)
-		return MFX_ERR_UNSUPPORTED;
-
-	DWORD target;
-
-	if (MFX_MEMTYPE_DXVA2_DECODER_TARGET & request->Type) {
-		target = DXVA2_VideoDecoderRenderTarget;
-	} else if (MFX_MEMTYPE_DXVA2_PROCESSOR_TARGET & request->Type) {
-		target = DXVA2_VideoProcessorRenderTarget;
-	} else
-		return MFX_ERR_UNSUPPORTED;
-
-	IDirectXVideoAccelerationService *videoService = NULL;
-
-	if (target == DXVA2_VideoProcessorRenderTarget) {
-		if (!m_hProcessor) {
-			hr = m_manager->OpenDeviceHandle(&m_hProcessor);
-			if (FAILED(hr))
-				return MFX_ERR_MEMORY_ALLOC;
-
-			hr = m_manager->GetVideoService(
-				m_hProcessor, IID_IDirectXVideoProcessorService,
-				(void **)&m_processorService);
-			if (FAILED(hr))
-				return MFX_ERR_MEMORY_ALLOC;
-		}
-		videoService = m_processorService;
-	} else {
-		if (!m_hDecoder) {
-			hr = m_manager->OpenDeviceHandle(&m_hDecoder);
-			if (FAILED(hr))
-				return MFX_ERR_MEMORY_ALLOC;
-
-			hr = m_manager->GetVideoService(
-				m_hDecoder, IID_IDirectXVideoDecoderService,
-				(void **)&m_decoderService);
-			if (FAILED(hr))
-				return MFX_ERR_MEMORY_ALLOC;
-		}
-		videoService = m_decoderService;
-	}
-
-	mfxHDLPair *dxMids = NULL, **dxMidPtrs = NULL;
-	dxMids = (mfxHDLPair *)calloc(request->NumFrameSuggested,
-				 sizeof(mfxHDLPair));
-	dxMidPtrs = (mfxHDLPair **)calloc(request->NumFrameSuggested,
-					 sizeof(mfxHDLPair *));
-
-	if (!dxMids || !dxMidPtrs) {
-		MSDK_SAFE_FREE(dxMids);
-		MSDK_SAFE_FREE(dxMidPtrs);
-		return MFX_ERR_MEMORY_ALLOC;
-	}
-
-	response->mids = (mfxMemId *)dxMidPtrs;
-	response->NumFrameActual = request->NumFrameSuggested;
-
-	if (request->Type & MFX_MEMTYPE_EXTERNAL_FRAME) {
-		for (int i = 0; i < request->NumFrameSuggested; i++) {
-			hr = videoService->CreateSurface(
-				request->Info.Width, request->Info.Height, 0,
-				format, D3DPOOL_DEFAULT, m_surfaceUsage, target,
-				(IDirect3DSurface9 **)&dxMidsi.first,
-				&dxMidsi.second);
-			if (FAILED(hr)) {
-				_dx9_simple_free(response);
-				MSDK_SAFE_FREE(dxMids);
-				return MFX_ERR_MEMORY_ALLOC;
-			}
-			dxMidPtrsi = &dxMidsi;
-		}
-	} else {
-		safe_array<IDirect3DSurface9 *> dxSrf(
-			new IDirect3DSurface9 *request->NumFrameSuggested);
-		if (!dxSrf.get()) {
-			MSDK_SAFE_FREE(dxMids);
-			MSDK_SAFE_FREE(dxMidPtrs);
-			return MFX_ERR_MEMORY_ALLOC;
-		}
-		hr = videoService->CreateSurface(
-			request->Info.Width, request->Info.Height,
-			request->NumFrameSuggested - 1, format, D3DPOOL_DEFAULT,
-			m_surfaceUsage, target, dxSrf.get(), NULL);
-		if (FAILED(hr)) {
-			MSDK_SAFE_FREE(dxMids);
-			MSDK_SAFE_FREE(dxMidPtrs);
-			return MFX_ERR_MEMORY_ALLOC;
-		}
-
-		for (int i = 0; i < request->NumFrameSuggested; i++) {
-			dxMidsi.first = dxSrf.get()i;
-			dxMidPtrsi = &dxMidsi;
-		}
-	}
-	return MFX_ERR_NONE;
-}
-
-mfxStatus dx9_simple_alloc(mfxHDL pthis, mfxFrameAllocRequest *request,
-			 mfxFrameAllocResponse *response)
-{
-	mfxStatus sts = MFX_ERR_NONE;
-
-	if (request->Type & MFX_MEMTYPE_SYSTEM_MEMORY)
-		return MFX_ERR_UNSUPPORTED;
-
-	if (dx9_allocDecodeResponses.find(pthis) !=
-		 dx9_allocDecodeResponses.end() &&
-	 MFX_MEMTYPE_EXTERNAL_FRAME & request->Type &&
-	 MFX_MEMTYPE_FROM_DECODE & request->Type) {
-		// Memory for this request was already allocated during manual allocation stage. Return saved response
-		// When decode acceleration device (DXVA) is created it requires a list of d3d surfaces to be passed.
-		// Therefore Media SDK will ask for the surface info/mids again at Init() stage, thus requiring us to return the saved response
-		// (No such restriction applies to Encode or VPP)
-		*response = dx9_allocDecodeResponsespthis;
-		dx9_allocDecodeRefCountpthis++;
-	} else {
-		sts = _dx9_simple_alloc(request, response);
-
-		if (MFX_ERR_NONE == sts) {
-			if (MFX_MEMTYPE_EXTERNAL_FRAME & request->Type &&
-			 MFX_MEMTYPE_FROM_DECODE & request->Type) {
-				// Decode alloc response handling
-				dx9_allocDecodeResponsespthis = *response;
-				dx9_allocDecodeRefCountpthis++;
-			} else {
-				// Encode and VPP alloc response handling
-				dx9_allocResponsesresponse->mids = pthis;
-			}
-		}
-	}
-
-	return sts;
-}

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/common_directx9.h Deleted

@@ -1,58 +0,0 @@
-#pragma once
-
-#include "common_utils.h"
-#include <initguid.h>
-#include <d3d9.h>
-#include <dxva2api.h>
-#include <dxva.h>
-#include <windows.h>
-
-#define VIDEO_MAIN_FORMAT D3DFMT_YUY2
-
-class IGFXS3DControl;
-
-/** Direct3D 9 device implementation.
-@note Can be initialized for only 1 or two 2 views. Handle to
-MFX_HANDLE_GFXS3DCONTROL must be set prior if initializing for 2 views.
-
-@note Device always set D3DPRESENT_PARAMETERS::Windowed to TRUE.
-*/
-template<class T> class safe_array {
-public:
-	safe_array(T *ptr = 0)
-		: m_ptr(ptr){
-			 // construct from object pointer
-		 };
-	~safe_array() { reset(0); }
-	T *get()
-	{ // return wrapped pointer
-		return m_ptr;
-	}
-	T *release()
-	{ // return wrapped pointer and give up ownership
-		T *ptr = m_ptr;
-		m_ptr = 0;
-		return ptr;
-	}
-	void reset(T *ptr)
-	{ // destroy designated object and store new pointer
-		if (m_ptr) {
-			delete m_ptr;
-		}
-		m_ptr = ptr;
-	}
-
-protected:
-	T *m_ptr; // the wrapped object pointer
-};
-
-mfxStatus dx9_simple_alloc(mfxHDL pthis, mfxFrameAllocRequest *request,
-			 mfxFrameAllocResponse *response);
-mfxStatus dx9_simple_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr);
-mfxStatus dx9_simple_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr);
-mfxStatus dx9_simple_gethdl(mfxHDL pthis, mfxMemId mid, mfxHDL *handle);
-mfxStatus dx9_simple_free(mfxHDL pthis, mfxFrameAllocResponse *response);
-
-mfxStatus DX9_CreateHWDevice(mfxSession session, mfxHDL *deviceHandle,
-			 HWND hWnd, bool bCreateSharedHandles);
-void DX9_CleanupHWDevice();

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/device_directx9.cpp Deleted

@@ -1,428 +0,0 @@
-// #include "mfx_samples_config.h"
-
-#if defined(WIN32) || defined(WIN64)
-
-//prefast signature used in combaseapi.h
-#ifndef _PREFAST_
-#pragma warning(disable : 4068)
-#endif
-
-#include "device_directx9.h"
-// #include "igfx_s3dcontrol.h"
-
-#include "atlbase.h"
-
-// Macros
-#define MSDK_ZERO_MEMORY(VAR) \
-	{ \
-		memset(&VAR, 0, sizeof(VAR)); \
-	}
-#define MSDK_MEMCPY_VAR(dstVarName, src, count) \
-	memcpy_s(&(dstVarName), sizeof(dstVarName), (src), (count))
-
-CD3D9Device::CD3D9Device()
-{
-	m_pD3D9 = NULL;
-	m_pD3DD9 = NULL;
-	m_pDeviceManager9 = NULL;
-	MSDK_ZERO_MEMORY(m_D3DPP);
-	m_resetToken = 0;
-
-	m_nViews = 0;
-	m_pS3DControl = NULL;
-
-	MSDK_ZERO_MEMORY(m_backBufferDesc);
-	m_pDXVAVPS = NULL;
-	m_pDXVAVP_Left = NULL;
-	m_pDXVAVP_Right = NULL;
-
-	MSDK_ZERO_MEMORY(m_targetRect);
-
-	MSDK_ZERO_MEMORY(m_VideoDesc);
-	MSDK_ZERO_MEMORY(m_BltParams);
-	MSDK_ZERO_MEMORY(m_Sample);
-
-	// Initialize DXVA structures
-
-	DXVA2_AYUVSample16 color = {
-		0x8000, // Cr
-		0x8000, // Cb
-		0x1000, // Y
-		0xffff // Alpha
-	};
-
-	DXVA2_ExtendedFormat format = {
-		// DestFormat
-		DXVA2_SampleProgressiveFrame, // SampleFormat
-		DXVA2_VideoChromaSubsampling_MPEG2, // VideoChromaSubsampling
-		DXVA_NominalRange_0_255, // NominalRange
-		DXVA2_VideoTransferMatrix_BT709, // VideoTransferMatrix
-		DXVA2_VideoLighting_bright, // VideoLighting
-		DXVA2_VideoPrimaries_BT709, // VideoPrimaries
-		DXVA2_VideoTransFunc_709 // VideoTransferFunction
-	};
-
-	// init m_VideoDesc structure
-	MSDK_MEMCPY_VAR(m_VideoDesc.SampleFormat, &format,
-			sizeof(DXVA2_ExtendedFormat));
-	m_VideoDesc.SampleWidth = 0;
-	m_VideoDesc.SampleHeight = 0;
-	m_VideoDesc.InputSampleFreq.Numerator = 60;
-	m_VideoDesc.InputSampleFreq.Denominator = 1;
-	m_VideoDesc.OutputFrameFreq.Numerator = 60;
-	m_VideoDesc.OutputFrameFreq.Denominator = 1;
-
-	// init m_BltParams structure
-	MSDK_MEMCPY_VAR(m_BltParams.DestFormat, &format,
-			sizeof(DXVA2_ExtendedFormat));
-	MSDK_MEMCPY_VAR(m_BltParams.BackgroundColor, &color,
-			sizeof(DXVA2_AYUVSample16));
-
-	// init m_Sample structure
-	m_Sample.Start = 0;
-	m_Sample.End = 1;
-	m_Sample.SampleFormat = format;
-	m_Sample.PlanarAlpha.Fraction = 0;
-	m_Sample.PlanarAlpha.Value = 1;
-
-	m_bIsA2rgb10 = FALSE;
-}
-
-bool CD3D9Device::CheckOverlaySupport()
-{
-	D3DCAPS9 d3d9caps;
-	D3DOVERLAYCAPS d3doverlaycaps = {0};
-	IDirect3D9ExOverlayExtension *d3d9overlay = NULL;
-	bool overlaySupported = false;
-
-	memset(&d3d9caps, 0, sizeof(d3d9caps));
-	HRESULT hr = m_pD3D9->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
-					 &d3d9caps);
-	if (FAILED(hr) || !(d3d9caps.Caps & D3DCAPS_OVERLAY)) {
-		overlaySupported = false;
-	} else {
-		hr = m_pD3D9->QueryInterface(IID_PPV_ARGS(&d3d9overlay));
-		if (FAILED(hr) || (d3d9overlay == NULL)) {
-			overlaySupported = false;
-		} else {
-			hr = d3d9overlay->CheckDeviceOverlayType(
-				D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
-				m_D3DPP.BackBufferWidth,
-				m_D3DPP.BackBufferHeight,
-				m_D3DPP.BackBufferFormat, NULL,
-				D3DDISPLAYROTATION_IDENTITY, &d3doverlaycaps);
-			MSDK_SAFE_RELEASE(d3d9overlay);
-
-			if (FAILED(hr)) {
-				overlaySupported = false;
-			} else {
-				overlaySupported = true;
-			}
-		}
-	}
-
-	return overlaySupported;
-}
-
-mfxStatus CD3D9Device::FillD3DPP(mfxHDL hWindow, mfxU16 nViews,
-				 D3DPRESENT_PARAMETERS &D3DPP)
-{
-	mfxStatus sts = MFX_ERR_NONE;
-
-	D3DPP.Windowed = true;
-	D3DPP.hDeviceWindow = (HWND)hWindow;
-
-	D3DPP.Flags = D3DPRESENTFLAG_VIDEO;
-	D3DPP.FullScreen_RefreshRateInHz = D3DPRESENT_RATE_DEFAULT;
-	D3DPP.PresentationInterval =
-		D3DPRESENT_INTERVAL_ONE; // note that this setting leads to an implicit timeBeginPeriod call
-	D3DPP.BackBufferCount = 1;
-	D3DPP.BackBufferFormat = (m_bIsA2rgb10) ? D3DFMT_A2R10G10B10
-						: D3DFMT_X8R8G8B8;
-
-	if (hWindow) {
-		RECT r;
-		GetClientRect((HWND)hWindow, &r);
-		int x = GetSystemMetrics(SM_CXSCREEN);
-		int y = GetSystemMetrics(SM_CYSCREEN);
-		D3DPP.BackBufferWidth = min(r.right - r.left, x);
-		D3DPP.BackBufferHeight = min(r.bottom - r.top, y);
-	} else {
-		D3DPP.BackBufferWidth = GetSystemMetrics(SM_CYSCREEN);
-		D3DPP.BackBufferHeight = GetSystemMetrics(SM_CYSCREEN);
-	}
-	//
-	// Mark the back buffer lockable if software DXVA2 could be used.
-	// This is because software DXVA2 device requires a lockable render target
-	// for the optimal performance.
-	//
-	{
-		D3DPP.Flags |= D3DPRESENTFLAG_LOCKABLE_BACKBUFFER;
-	}
-
-	bool isOverlaySupported = CheckOverlaySupport();
-	if (2 == nViews && !isOverlaySupported)
-		return MFX_ERR_UNSUPPORTED;
-
-	bool needOverlay = (2 == nViews) ? true : false;
-
-	D3DPP.SwapEffect = needOverlay ? D3DSWAPEFFECT_OVERLAY
-				 : D3DSWAPEFFECT_DISCARD;
-
-	return sts;
-}
-
-mfxStatus CD3D9Device::Init(mfxHDL hWindow, mfxU16 nViews, mfxU32 nAdapterNum)
-{
-	mfxStatus sts = MFX_ERR_NONE;
-
-	if (2 < nViews)
-		return MFX_ERR_UNSUPPORTED;
-
-	m_nViews = nViews;
-
-	HRESULT hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &m_pD3D9);
-	if (!m_pD3D9 || FAILED(hr))
-		return MFX_ERR_DEVICE_FAILED;
-
-	ZeroMemory(&m_D3DPP, sizeof(m_D3DPP));
-	sts = FillD3DPP(hWindow, nViews, m_D3DPP);
-	MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
-
-	hr = m_pD3D9->CreateDeviceEx(nAdapterNum, D3DDEVTYPE_HAL, (HWND)hWindow,
-				 D3DCREATE_SOFTWARE_VERTEXPROCESSING |
-					 D3DCREATE_MULTITHREADED |
-					 D3DCREATE_FPU_PRESERVE,
-				 &m_D3DPP, NULL, &m_pD3DD9);
-	if (FAILED(hr))
-		return MFX_ERR_NULL_PTR;
-
-	if (hWindow) {
-		hr = m_pD3DD9->ResetEx(&m_D3DPP, NULL);
-		if (FAILED(hr))
-			return MFX_ERR_UNDEFINED_BEHAVIOR;
-		hr = m_pD3DD9->Clear(0, NULL, D3DCLEAR_TARGET,
-				 D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0);
-		if (FAILED(hr))
-			return MFX_ERR_UNDEFINED_BEHAVIOR;
-	}
-	UINT resetToken = 0;
-
-	hr = DXVA2CreateDirect3DDeviceManager9(&resetToken, &m_pDeviceManager9);
-	if (FAILED(hr))
-		return MFX_ERR_NULL_PTR;
-
-	hr = m_pDeviceManager9->ResetDevice(m_pD3DD9, resetToken);
-	if (FAILED(hr))
-		return MFX_ERR_UNDEFINED_BEHAVIOR;
-
-	m_resetToken = resetToken;
-
-	return sts;
-}
-
-mfxStatus CD3D9Device::Reset()
-{
-	HRESULT hr = NO_ERROR;
-	MSDK_CHECK_POINTER(m_pD3DD9, MFX_ERR_NULL_PTR);
-
-	if (m_D3DPP.Windowed) {
-		RECT r;
-		GetClientRect((HWND)m_D3DPP.hDeviceWindow, &r);
-		int x = GetSystemMetrics(SM_CXSCREEN);
-		int y = GetSystemMetrics(SM_CYSCREEN);
-		m_D3DPP.BackBufferWidth = min(r.right - r.left, x);
-		m_D3DPP.BackBufferHeight = min(r.bottom - r.top, y);
-	} else {
-		m_D3DPP.BackBufferWidth = GetSystemMetrics(SM_CXSCREEN);
-		m_D3DPP.BackBufferHeight = GetSystemMetrics(SM_CYSCREEN);
-	}
-
-	// Reset will change the parameters, so use a copy instead.
-	D3DPRESENT_PARAMETERS d3dpp = m_D3DPP;
-	hr = m_pD3DD9->ResetEx(&d3dpp, NULL);
-
-	if (FAILED(hr))
-		return MFX_ERR_UNDEFINED_BEHAVIOR;
-
-	hr = m_pDeviceManager9->ResetDevice(m_pD3DD9, m_resetToken);
-	if (FAILED(hr))
-		return MFX_ERR_UNDEFINED_BEHAVIOR;
-
-	return MFX_ERR_NONE;
-}
-
-void CD3D9Device::Close()
-{
-	MSDK_SAFE_RELEASE(m_pDXVAVP_Left);
-	MSDK_SAFE_RELEASE(m_pDXVAVP_Right);
-	MSDK_SAFE_RELEASE(m_pDXVAVPS);
-
-	MSDK_SAFE_RELEASE(m_pDeviceManager9);
-	MSDK_SAFE_RELEASE(m_pD3DD9);
-	MSDK_SAFE_RELEASE(m_pD3D9);
-	m_pS3DControl = NULL;
-}
-
-CD3D9Device::~CD3D9Device()
-{
-	Close();
-}
-
-mfxStatus CD3D9Device::GetHandle(mfxHandleType type, mfxHDL *pHdl)
-{
-	if (MFX_HANDLE_DIRECT3D_DEVICE_MANAGER9 == type && pHdl != NULL) {
-		*pHdl = m_pDeviceManager9;
-
-		return MFX_ERR_NONE;
-	} else if (MFX_HANDLE_GFXS3DCONTROL == type && pHdl != NULL) {
-		*pHdl = m_pS3DControl;
-
-		return MFX_ERR_NONE;
-	}
-	return MFX_ERR_UNSUPPORTED;
-}
-
-mfxStatus CD3D9Device::SetHandle(mfxHandleType type, mfxHDL hdl)
-{
-	if (MFX_HANDLE_GFXS3DCONTROL == type && hdl != NULL) {
-		m_pS3DControl = (IGFXS3DControl *)hdl;
-		return MFX_ERR_NONE;
-	} else if (MFX_HANDLE_DEVICEWINDOW == type &&
-		 hdl != NULL) //for render window handle
-	{
-		m_D3DPP.hDeviceWindow = (HWND)hdl;
-		return MFX_ERR_NONE;
-	}
-	return MFX_ERR_UNSUPPORTED;
-}
-
-mfxStatus CD3D9Device::RenderFrame(mfxFrameSurface1 *pSurface,
-				 mfxFrameAllocator *pmfxAlloc)
-{
-	HRESULT hr = S_OK;
-
-	if (!(1 == m_nViews || (2 == m_nViews && NULL != m_pS3DControl)))
-		return MFX_ERR_UNDEFINED_BEHAVIOR;
-
-	MSDK_CHECK_POINTER(pSurface, MFX_ERR_NULL_PTR);
-	MSDK_CHECK_POINTER(m_pDeviceManager9, MFX_ERR_NOT_INITIALIZED);
-	MSDK_CHECK_POINTER(pmfxAlloc, MFX_ERR_NULL_PTR);
-
-	// don't try to render second view if output rect changed since first view
-	if (2 == m_nViews && (0 != pSurface->Info.FrameId.ViewId))
-		return MFX_ERR_NONE;
-
-	hr = m_pD3DD9->TestCooperativeLevel();
-
-	switch (hr) {
-	case D3D_OK:
-		break;
-
-	case D3DERR_DEVICELOST: {
-		return MFX_ERR_DEVICE_LOST;
-	}
-
-	case D3DERR_DEVICENOTRESET: {
-		return MFX_ERR_UNKNOWN;
-	}
-
-	default: {
-		return MFX_ERR_UNKNOWN;
-	}
-	}
-
-	CComPtr<IDirect3DSurface9> pBackBuffer;
-	hr = m_pD3DD9->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO,
-				 &pBackBuffer);
-
-	mfxHDLPair *dxMemId = (mfxHDLPair *)pSurface->Data.MemId;
-
-	hr = m_pD3DD9->StretchRect((IDirect3DSurface9 *)dxMemId->first, NULL,
-				 pBackBuffer, NULL, D3DTEXF_LINEAR);
-	if (FAILED(hr)) {
-		return MFX_ERR_UNKNOWN;
-	}
-
-	if (SUCCEEDED(hr) &&
-	 (1 == m_nViews || pSurface->Info.FrameId.ViewId == 1)) {
-		hr = m_pD3DD9->Present(NULL, NULL, NULL, NULL);
-	}
-
-	return SUCCEEDED(hr) ? MFX_ERR_NONE : MFX_ERR_DEVICE_FAILED;
-}
-
-/*
-mfxStatus CD3D9Device::CreateVideoProcessors()
-{
- if (!(1 == m_nViews || (2 == m_nViews && NULL != m_pS3DControl)))
- return MFX_ERR_UNDEFINED_BEHAVIOR;
-
- MSDK_SAFE_RELEASE(m_pDXVAVP_Left);
- MSDK_SAFE_RELEASE(m_pDXVAVP_Right);
-
- HRESULT hr ;
-
- if (2 == m_nViews && NULL != m_pS3DControl)
- {
- hr = m_pS3DControl->SetDevice(m_pDeviceManager9);
- if (FAILED(hr))
- {
- return MFX_ERR_DEVICE_FAILED;
- }
- }
-
- ZeroMemory(&m_backBufferDesc, sizeof(m_backBufferDesc));
- IDirect3DSurface9 *backBufferTmp = NULL;
- hr = m_pD3DD9->GetBackBuffer(0, 0, D3DBACKBUFFER_TYPE_MONO, &backBufferTmp);
- if (NULL != backBufferTmp)
- backBufferTmp->GetDesc(&m_backBufferDesc);
- MSDK_SAFE_RELEASE(backBufferTmp);
-
- if (SUCCEEDED(hr))
- {
- // Create DXVA2 Video Processor Service.
- hr = DXVA2CreateVideoService(m_pD3DD9,
- IID_IDirectXVideoProcessorService,
- (void**)&m_pDXVAVPS);
- }
-
- if (2 == m_nViews)
- {
- // Activate L channel
- if (SUCCEEDED(hr))
- {
- hr = m_pS3DControl->SelectLeftView();
- }
-
- if (SUCCEEDED(hr))
- {
- // Create VPP device for the L channel
- hr = m_pDXVAVPS->CreateVideoProcessor(DXVA2_VideoProcProgressiveDevice,
- &m_VideoDesc,
- m_D3DPP.BackBufferFormat,
- 1,
- &m_pDXVAVP_Left);
- }
-
- // Activate R channel
- if (SUCCEEDED(hr))
- {
- hr = m_pS3DControl->SelectRightView();
- }
-
- }
- if (SUCCEEDED(hr))
- {
- hr = m_pDXVAVPS->CreateVideoProcessor(DXVA2_VideoProcProgressiveDevice,
- &m_VideoDesc,
- m_D3DPP.BackBufferFormat,
- 1,
- &m_pDXVAVP_Right);
- }
-
- return SUCCEEDED(hr) ? MFX_ERR_NONE : MFX_ERR_DEVICE_FAILED;
-}
-*/
-
-#endif // #if defined(WIN32) || defined(WIN64)
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/device_directx9.h Deleted

@@ -1,109 +0,0 @@
-#pragma once
-
-#if defined(_WIN32) || defined(_WIN64)
-
-#include "common_utils.h"
-
-#pragma warning(disable : 4201)
-#include <initguid.h>
-#include <d3d9.h>
-#include <dxva2api.h>
-#include <dxva.h>
-#include <windows.h>
-
-#define VIDEO_MAIN_FORMAT D3DFMT_YUY2
-
-class IGFXS3DControl;
-
-/// Base class for hw device
-class CHWDevice {
-public:
-	virtual ~CHWDevice() {}
-	/** Initializes device for requested processing.
- @paramin hWindow Window handle to bundle device to.
- @paramin nViews Number of views to process.
- @paramin nAdapterNum Number of adapter to use
- */
-	virtual mfxStatus Init(mfxHDL hWindow, mfxU16 nViews,
-			 mfxU32 nAdapterNum) = 0;
-	/// Reset device.
-	virtual mfxStatus Reset() = 0;
-	/// Get handle can be used for MFX session SetHandle calls
-	virtual mfxStatus GetHandle(mfxHandleType type, mfxHDL *pHdl) = 0;
-	/** Set handle.
- Particular device implementation may require other objects to operate.
- */
-	virtual mfxStatus SetHandle(mfxHandleType type, mfxHDL hdl) = 0;
-	virtual mfxStatus RenderFrame(mfxFrameSurface1 *pSurface,
-				 mfxFrameAllocator *pmfxAlloc) = 0;
-	virtual void Close() = 0;
-};
-
-enum {
-	MFX_HANDLE_GFXS3DCONTROL =
-		0x100, /* A handle to the IGFXS3DControl instance */
-	MFX_HANDLE_DEVICEWINDOW = 0x101 /* A handle to the render window */
-}; //mfxHandleType
-
-/** Direct3D 9 device implementation.
-@note Can be initialized for only 1 or two 2 views. Handle to
-MFX_HANDLE_GFXS3DCONTROL must be set prior if initializing for 2 views.
-
-@note Device always set D3DPRESENT_PARAMETERS::Windowed to TRUE.
-*/
-class CD3D9Device : public CHWDevice {
-public:
-	CD3D9Device();
-	virtual ~CD3D9Device();
-
-	virtual mfxStatus Init(mfxHDL hWindow, mfxU16 nViews,
-			 mfxU32 nAdapterNum);
-	virtual mfxStatus Reset();
-	virtual mfxStatus GetHandle(mfxHandleType type, mfxHDL *pHdl);
-	virtual mfxStatus SetHandle(mfxHandleType type, mfxHDL hdl);
-	virtual mfxStatus RenderFrame(mfxFrameSurface1 *pSurface,
-				 mfxFrameAllocator *pmfxAlloc);
-	virtual void UpdateTitle(double /*fps*/) {}
-	virtual void Close();
-	void DefineFormat(bool isA2rgb10)
-	{
-		m_bIsA2rgb10 = (isA2rgb10) ? TRUE : FALSE;
-	}
-
-protected:
-	mfxStatus CreateVideoProcessors();
-	bool CheckOverlaySupport();
-	virtual mfxStatus FillD3DPP(mfxHDL hWindow, mfxU16 nViews,
-				 D3DPRESENT_PARAMETERS &D3DPP);
-
-private:
-	IDirect3D9Ex *m_pD3D9;
-	IDirect3DDevice9Ex *m_pD3DD9;
-	IDirect3DDeviceManager9 *m_pDeviceManager9;
-	D3DPRESENT_PARAMETERS m_D3DPP;
-	UINT m_resetToken;
-
-	mfxU16 m_nViews;
-	IGFXS3DControl *m_pS3DControl;
-
-	D3DSURFACE_DESC m_backBufferDesc;
-
-	// service required to create video processors
-	IDirectXVideoProcessorService *m_pDXVAVPS;
-	//left channel processor
-	IDirectXVideoProcessor *m_pDXVAVP_Left;
-	// right channel processor
-	IDirectXVideoProcessor *m_pDXVAVP_Right;
-
-	// target rectangle
-	RECT m_targetRect;
-
-	// various structures for DXVA2 calls
-	DXVA2_VideoDesc m_VideoDesc;
-	DXVA2_VideoProcessBltParams m_BltParams;
-	DXVA2_VideoSample m_Sample;
-
-	BOOL m_bIsA2rgb10;
-};
-
-#endif // #if defined( _WIN32 ) || defined ( _WIN64 )
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/.clang-format Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_critical_section.h Deleted

@@ -1,66 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_CRITICAL_SECTION_H)
-#define __MFX_CRITICAL_SECTION_H
-
-#include <mfxdefs.h>
-
-namespace MFX
-{
-
-// Just set "critical section" instance to zero for initialization.
-typedef volatile mfxL32 mfxCriticalSection;
-
-// Enter the global critical section.
-void mfxEnterCriticalSection(mfxCriticalSection *pCSection);
-
-// Leave the global critical section.
-void mfxLeaveCriticalSection(mfxCriticalSection *pCSection);
-
-class MFXAutomaticCriticalSection
-{
-public:
- // Constructor
- explicit MFXAutomaticCriticalSection(mfxCriticalSection *pCSection)
- {
- m_pCSection = pCSection;
- mfxEnterCriticalSection(m_pCSection);
- }
-
- // Destructor
- ~MFXAutomaticCriticalSection()
- {
- mfxLeaveCriticalSection(m_pCSection);
- }
-
-protected:
- // Pointer to a critical section
- mfxCriticalSection *m_pCSection;
-
-private:
- // unimplemented by intent to make this class non-copyable
- MFXAutomaticCriticalSection(const MFXAutomaticCriticalSection &);
- void operator=(const MFXAutomaticCriticalSection &);
-};
-
-} // namespace MFX
-
-#endif // __MFX_CRITICAL_SECTION_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_dispatcher.h Deleted

@@ -1,232 +0,0 @@
-// Copyright (c) 2012-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_DISPATCHER_H)
-#define __MFX_DISPATCHER_H
-
-#include <mfxvideo.h>
-#include <mfxaudio.h>
-#include <mfxplugin.h>
-#include <stddef.h>
-#include "mfx_dispatcher_defs.h"
-#include "mfx_load_plugin.h"
-#include "mfxenc.h"
-#include "mfxpak.h"
-
-#define INTEL_VENDOR_ID 0x8086
-
-mfxStatus MFXQueryVersion(mfxSession session, mfxVersion *version);
-
-
-
-enum
-{
- // to avoid code changing versions are just inherited
- // from the API header file.
- DEFAULT_API_VERSION_MAJOR = MFX_VERSION_MAJOR,
- DEFAULT_API_VERSION_MINOR = MFX_VERSION_MINOR
-};
-
-//
-// declare functions' integer identifiers.
-//
-
-#undef FUNCTION
-#define FUNCTION(return_value, func_name, formal_param_list, actual_param_list) \
- e##func_name,
-
-enum eFunc
-{
- eMFXInit,
- eMFXClose,
- eMFXQueryIMPL,
- eMFXQueryVersion,
- eMFXJoinSession,
- eMFXDisjoinSession,
- eMFXCloneSession,
- eMFXSetPriority,
- eMFXGetPriority,
- eMFXInitEx,
-#include "mfx_exposed_functions_list.h"
- eVideoFuncTotal
-};
-
-enum ePluginFunc
-{
- eMFXVideoUSER_Load,
- eMFXVideoUSER_LoadByPath,
- eMFXVideoUSER_UnLoad,
- eMFXAudioUSER_Load,
- eMFXAudioUSER_UnLoad,
- ePluginFuncTotal
-};
-
-enum eAudioFunc
-{
- eFakeAudioEnum = eMFXGetPriority,
-#include "mfxaudio_exposed_functions_list.h"
- eAudioFuncTotal
-};
-
-// declare max buffer length for regsitry key name
-enum
-{
- MFX_MAX_REGISTRY_KEY_NAME = 256
-};
-
-// declare the maximum DLL path
-enum
-{
- MFX_MAX_DLL_PATH = 1024
-};
-
-// declare library's implementation types
-enum eMfxImplType
-{
- MFX_LIB_HARDWARE = 0,
- MFX_LIB_SOFTWARE = 1,
- MFX_LIB_PSEUDO = 2,
-
- MFX_LIB_IMPL_TYPES
-};
-
-// declare dispatcher's version
-enum
-{
- MFX_DISPATCHER_VERSION_MAJOR = 1,
- MFX_DISPATCHER_VERSION_MINOR = 3
-};
-
-struct _mfxSession
-{
- // A real handle from MFX engine passed to a called function
- mfxSession session;
-
- mfxFunctionPointer callTableeVideoFuncTotal;
- mfxFunctionPointer callPlugInsTableePluginFuncTotal;
- mfxFunctionPointer callAudioTableeAudioFuncTotal;
-
- // Current library's implementation (exact implementation)
- mfxIMPL impl;
-};
-
-// declare a dispatcher's handle
-struct MFX_DISP_HANDLE : public _mfxSession
-{
- // Default constructor
- MFX_DISP_HANDLE(const mfxVersion requiredVersion);
- // Destructor
- ~MFX_DISP_HANDLE(void);
-
- // Load the library's module
- mfxStatus LoadSelectedDLL(const wchar_t *pPath, eMfxImplType implType, mfxIMPL impl, mfxIMPL implInterface, mfxInitParam &par);
- // Unload the library's module
- mfxStatus UnLoadSelectedDLL(void);
-
- // Close the handle
- mfxStatus Close(void);
-
- // NOTE: changing order of struct's members can make different version of
- // dispatchers incompatible. Think of different modules (e.g. MFT filters)
- // within a single application.
-
- // Library's implementation type (hardware or software)
- eMfxImplType implType;
- // Current library's VIA interface
- mfxIMPL implInterface;
- // Dispatcher's version. If version is 1.1 or lower, then old dispatcher's
- // architecture is used. Otherwise it means current dispatcher's version.
- mfxVersion dispVersion;
- // Required API version of session initialized
- const mfxVersion apiVersion;
- // Actual library API version
- mfxVersion actualApiVersion;
- // Status of loaded dll
- mfxStatus loadStatus;
- // Resgistry subkey name for windows version
- wchar_t subkeyNameMFX_MAX_REGISTRY_KEY_NAME;
- // Storage ID for windows version
- int storageID;
-
- // Library's module handle
- mfxModuleHandle hModule;
-
- MFX::MFXPluginStorage pluginHive;
- MFX::MFXPluginFactory pluginFactory;
-
-private:
- // Declare assignment operator and copy constructor to prevent occasional assignment
- MFX_DISP_HANDLE(const MFX_DISP_HANDLE &);
- MFX_DISP_HANDLE & operator = (const MFX_DISP_HANDLE &);
-
-};
-
-// This struct extends MFX_DISP_HANDLE, we cannot extend MFX_DISP_HANDLE itself due to possible compatibility issues
-// This struct was added in dispatcher version 1.3
-// Check dispatcher handle's version when you cast session struct which came from outside of MSDK API function to this
-struct MFX_DISP_HANDLE_EX : public MFX_DISP_HANDLE
-{
- MFX_DISP_HANDLE_EX(const mfxVersion requiredVersion);
-
- mfxU16 mediaAdapterType;
- mfxU16 reserved10;
-};
-
-// declare comparison operator
-inline
-bool operator == (const mfxVersion &one, const mfxVersion &two)
-{
- return (one.Version == two.Version);
-
-}
-
-inline
-bool operator < (const mfxVersion &one, const mfxVersion &two)
-{
- return (one.Major < two.Major) || ((one.Major == two.Major) && (one.Minor < two.Minor));
-
-}
-
-inline
-bool operator <= (const mfxVersion &one, const mfxVersion &two)
-{
- return (one == two) || (one < two);
-}
-
-
-//
-// declare a table with functions descriptions
-//
-
-typedef
-struct FUNCTION_DESCRIPTION
-{
- // Literal function's name
- const char *pName;
- // API version when function appeared first time
- mfxVersion apiVersion;
-} FUNCTION_DESCRIPTION;
-
-extern const
-FUNCTION_DESCRIPTION APIFunceVideoFuncTotal;
-
-extern const
-FUNCTION_DESCRIPTION APIAudioFunceAudioFuncTotal;
-#endif // __MFX_DISPATCHER_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_dispatcher_defs.h Deleted

@@ -1,47 +0,0 @@
-// Copyright (c) 2013-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include "mfxdefs.h"
-#include <cstring>
-#include <cstdio>
-
-#if defined(MFX_DISPATCHER_LOG)
-#include <string>
-#include <string.h>
-#endif
-
-#define MAX_PLUGIN_PATH 4096
-#define MAX_PLUGIN_NAME 4096
-
-#if _MSC_VER < 1400
-#define wcscpy_s(to,to_size, from) wcscpy(to, from)
-#define wcscat_s(to,to_size, from) wcscat(to, from)
-#endif
-
-// declare library module's handle
-typedef void * mfxModuleHandle;
-
-typedef void (MFX_CDECL * mfxFunctionPointer)(void);
-
-// Tracer uses lib loading from Program Files logic (via Dispatch reg key) to make dispatcher load tracer dll.
-// With DriverStore loading put at 1st place, dispatcher loads real lib before it finds tracer dll.
-// This workaround explicitly checks tracer presence in Dispatch reg key and loads tracer dll before the search for lib in all other places.
-#define MFX_TRACER_WA_FOR_DS 1

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_dispatcher_log.h Deleted

@@ -1,286 +0,0 @@
-// Copyright (c) 2012-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_DISPATCHER_LOG_H)
-#define __MFX_DISPATCHER_LOG_H
-
-//////////////////////////////////////////////////////////////////////////
-//dispatcher log (DL) level
-#define DL_INFO 1
-#define DL_WRN 2
-#define DL_ERROR 4
-#define DL_LOADED_LIBRARY 8
-//////////////////////////////////////////////////////////////////////////
-//opcodes used only in events
-enum
-{
- DL_EVENT_START = 1,
- DL_EVENT_STOP,
- DL_EVENT_MSG
-};
-//////////////////////////////////////////////////////////////////////////
-#define DL_SINK_NULL 0
-#define DL_SINK_PRINTF 1
-#define DL_SINK_IMsgHandler 2
-
-#define MFXFOURCCTYPE() "%c%c%c%c"
-#define ZERO_OR_SPACE(value) ((0==(value)) ? '0' : (value))
-#define MFXU32TOFOURCC(mfxu32)\
- ZERO_OR_SPACE((char)(mfxu32 & 0xFF)), \
- ZERO_OR_SPACE((char)((mfxu32 >> 8) & 0xFF)),\
- ZERO_OR_SPACE((char)((mfxu32 >> 16) & 0xFF)),\
- ZERO_OR_SPACE((char)((mfxu32 >> 24) & 0xFF))
-
-#define MFXGUIDTYPE() "%X-%X-%X-%X-%X-%X-%X-%X-%X-%X-%X-%X-%X-%X-%X-%X"
-
-#define MFXGUIDTOHEX(guid)\
- (guid)->Data0,\
- (guid)->Data1,\
- (guid)->Data2,\
- (guid)->Data3,\
- (guid)->Data4,\
- (guid)->Data5,\
- (guid)->Data6,\
- (guid)->Data7,\
- (guid)->Data8,\
- (guid)->Data9,\
- (guid)->Data10,\
- (guid)->Data11,\
- (guid)->Data12,\
- (guid)->Data13,\
- (guid)->Data14,\
- (guid)->Data15
-
-#if defined(MFX_DISPATCHER_LOG)
-
-//---------------------------setup section------------------------
-//using of formating instead of variadic macro with NULL end, 
-//leads to more flexibility in format, however constructing string 
-//with vsprintf_s is a time wasting
-#define DISPATCHER_LOG_USE_FORMATING 1
-
-//creates unique object, event guid registration, factories on heap
-//heap reduce stack allocation and reduce reservation time at startup
-//is a vital if mediasdk wont use
-#define DISPATCHER_LOG_HEAP_SINGLETONES
-
-// guid for all dispatcher events
-#define DISPATCHER_LOG_EVENT_GUID L"{EB0538CC-4FEE-484d-ACEE-1182E9F37A57}"
-
-//puts a sink into listeners list
-//#define DISPATCHER_LOG_REGISTER_EVENT_PROVIDER
-
-//puts a sink into listeners list
-//#define DISPATCHER_LOG_REGISTER_FILE_WRITER
-#define DISPACTHER_LOG_FW_PATH "c:\\dispatcher.log"
-
-#include <stdio.h>
-#include <stdarg.h>
-
-//callback interface for intercept logging messages
-class IMsgHandler
-{
-public:
- virtual ~IMsgHandler(){}
- virtual void Write(int level, int opcode, const char * msg, va_list argptr) = 0;
-};
-
-#if DISPATCHER_LOG_USE_FORMATING
-
- #define DISPATCHER_LOG(lvl, opcode, str)\
- {\
- DispatcherLogBracketsHelper wrt(lvl,opcode);\
- wrt.Write str;\
- }
-#else
- #define DISPATCHER_LOG_VA_ARGS(...) wrt.Write(__VA_ARGS__, NULL)
- //WARNING: don't use types that occupy more that 4 bytes in memory 
- //WARNING: don't use %s in format specifier
- #define DISPATCHER_LOG(lvl, opcode, str) \
- {\
- DispatcherLogBracketsHelper wrt(lvl, opcode);\
- DISPATCHER_LOG_VA_ARGS str;\
- }
-#endif//DISPATCHER_LOG_USE_FORMATING
-
-#define DISPATCHER_LOG_OPERATION(operation) operation
-
-#define __name_from_line( name, line ) name ## line
-#define _name_from_line( name , line) __name_from_line( name, line ) 
-#define name_from_line( name ) _name_from_line( name, __LINE__) 
-
-
-#define DISPATCHER_LOG_AUTO(lvl, msg)\
- DispatchLogBlockHelper name_from_line(__auto_log_)(lvl); name_from_line(__auto_log_).Write msg;
-
-#include <memory>
-#include <map>
-#include <list>
-#include <string>
-
-template <class T> 
-class DSSingleTone
-{
-public:
- template <class TParam1>
- inline static T & get(TParam1 par1)
- {
- T * pstored;
- if (NULL == (pstored = store_or_load()))
- {
- return *store_or_load(new T(par1));
- }
- return *pstored; 
- }
-
- inline static T & get()
- {
- T * pstored;
- if (NULL == (pstored = store_or_load()))
- {
- return *store_or_load(new T());
- }
- return *pstored;
- }
-private:
- //if obj == NULL, then it load 
- //if obj != NULL then it store obj
- inline static T * store_or_load(T * obj = NULL)
- {
- static std::unique_ptr<T> instance;
- if (NULL != obj)
- {
- instance.reset(obj);
- }
- return instance.get();
- }
-};
-
-class DispatchLog 
- : public DSSingleTone<DispatchLog>
-{
- friend class DSSingleTone<DispatchLog>;
- std::list<IMsgHandler*>m_Recepients;
- int m_DispatcherLogSink;
-
-public:
- //sets current sink
- void SetSink(int nsink, IMsgHandler *pHandler);
- void AttachSink(int nsink, IMsgHandler *pHandler);
- void DetachSink(int nsink, IMsgHandler *pHandler);
- void ExchangeSink(int nsink, IMsgHandler *pOld, IMsgHandler *pNew);
- void DetachAllSinks();
- void Write(int level, int opcode, const char * msg, va_list argptr);
- 
-protected:
- DispatchLog();
-};
-
-//allows to push arguments on the stack without declaring them as function parameters
-struct DispatcherLogBracketsHelper
-{
- int m_level;
- int m_opcode;
- DispatcherLogBracketsHelper(int level, int opcode)
- :m_level(level)
- ,m_opcode(opcode)
- {
- }
- void Write(const char * str, ...);
-} ;
-
-//auto log on ctor dtor
-struct DispatchLogBlockHelper
-{
- int m_level;
- void Write(const char * str, ...);
- DispatchLogBlockHelper (int level)
- : m_level(level)
- {
- }
- ~DispatchLogBlockHelper();
-};
-
-//----utility sinks-----
-#if defined(DISPATCHER_LOG_REGISTER_EVENT_PROVIDER)
-class ETWHandlerFactory
- : public DSSingleTone<ETWHandlerFactory>
-{
- friend class DSSingleTone<ETWHandlerFactory>;
- typedef std::map<std::wstring, IMsgHandler*> _storage_type;
- _storage_type m_storage;
-
-public:
- ~ETWHandlerFactory();
- IMsgHandler *GetSink(const wchar_t* sguid = DISPATCHER_LOG_EVENT_GUID);
-
-protected:
- ETWHandlerFactory(){}
-};
-#endif
-
-#if defined(DISPATCHER_LOG_REGISTER_FILE_WRITER)
-class FileSink 
- : public DSSingleTone<FileSink>
- , public IMsgHandler
-{
- friend class DSSingleTone<FileSink>;
-public:
- virtual void Write(int level, int opcode, const char * msg, va_list argptr);
- FileSink()
- : m_hdl(NULL)
- {
- }
- ~FileSink()
- {
- if (NULL != m_hdl)
- fclose(m_hdl);
- }
-private:
- FILE * m_hdl;
- FileSink(const std::string & log_file)
- {
- fopen_s(&m_hdl, log_file.c_str(), "a");
- }
- 
-};
-#endif
-
-//-----utility functions
-//since they are not called outside of macro we can define them here
-std::string DispatcherLog_GetMFXImplString(int impl);
-const char *DispatcherLog_GetMFXStatusString(int sts);
-
-#else // !defined(MFX_DISPATCHER_LOG)
-
- #define DISPATCHER_LOG(level, opcode, message)
- #define DISPATCHER_LOG_AUTO(level, message)
- #define DISPATCHER_LOG_OPERATION(operation) 
-
-#endif// !defined(MFX_DISPATCHER_LOG)
-
-
-#define DISPATCHER_LOG_INFO(msg) DISPATCHER_LOG(DL_INFO, DL_EVENT_MSG, msg)
-#define DISPATCHER_LOG_WRN(msg) DISPATCHER_LOG(DL_WRN, DL_EVENT_MSG, msg)
-#define DISPATCHER_LOG_ERROR(msg) DISPATCHER_LOG(DL_ERROR, DL_EVENT_MSG, msg)
-#define DISPATCHER_LOG_LIBRARY(msg) DISPATCHER_LOG(DL_LOADED_LIBRARY, DL_EVENT_MSG, msg)
-#define DISPATCHER_LOG_BLOCK(msg) DISPATCHER_LOG_AUTO(DL_INFO, msg)
-
-#endif // !defined(__MFX_DISPATCHER_LOG_H)

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_driver_store_loader.h Deleted

@@ -1,65 +0,0 @@
-// Copyright (c) 2019-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_DRIVER_STORE_LOADER_H)
-#define __MFX_DRIVER_STORE_LOADER_H
-
-#include <windows.h>
-#include <cfgmgr32.h>
-#include <devguid.h>
-
-#include "mfx_dispatcher_defs.h"
-
-namespace MFX
-{
-
-typedef CONFIGRET(WINAPI *Func_CM_Get_Device_ID_List_SizeW)(PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags);
-typedef CONFIGRET(WINAPI *Func_CM_Get_Device_ID_ListW)(PCWSTR pszFilter, PZZWSTR Buffer, ULONG BufferLen, ULONG ulFlags);
-typedef CONFIGRET(WINAPI *Func_CM_Locate_DevNodeW)(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags);
-typedef CONFIGRET(WINAPI *Func_CM_Open_DevNode_Key)(DEVINST dnDevNode, REGSAM samDesired, ULONG ulHardwareProfile, REGDISPOSITION Disposition, PHKEY phkDevice, ULONG ulFlags);
-
-class DriverStoreLoader
-{
-public:
- DriverStoreLoader(void);
- ~DriverStoreLoader(void);
-
- bool GetDriverStorePath(wchar_t *path, DWORD dwPathSize, mfxU32 deviceID);
-
-protected:
- bool LoadCfgMgr();
- bool LoadCmFuncs();
-
- mfxModuleHandle m_moduleCfgMgr;
- Func_CM_Get_Device_ID_List_SizeW m_pCM_Get_Device_ID_List_Size;
- Func_CM_Get_Device_ID_ListW m_pCM_Get_Device_ID_List;
- Func_CM_Locate_DevNodeW m_pCM_Locate_DevNode;
- Func_CM_Open_DevNode_Key m_pCM_Open_DevNode_Key;
-
-private:
- // unimplemented by intent to make this class non-copyable
- DriverStoreLoader(const DriverStoreLoader &);
- void operator=(const DriverStoreLoader &);
-
-};
-
-} // namespace MFX
-
-#endif // __MFX_DRIVER_STORE_LOADER_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_dxva2_device.h Deleted

@@ -1,213 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_DXVA2_DEVICE_H)
-#define __MFX_DXVA2_DEVICE_H
-
-#include <windows.h>
-
-#define TOSTRING(L) #L
-#define STRINGIFY(L) TOSTRING(L)
-
-#if defined(MEDIASDK_UWP_DISPATCHER)
- #if defined(MFX_D3D9_ENABLED) && !defined(MFX_FORCE_D3D9_ENABLED)
- #undef MFX_D3D9_ENABLED
- #pragma message("\n\nATTENTION:\nin file\n\t" __FILE__ " (" STRINGIFY(__LINE__) "):\nUsing of D3D9 disabled for UWP!\n\n")
- #endif
- #if defined(MFX_FORCE_D3D9_ENABLED)
- #define MFX_D3D9_ENABLED
- #endif
-#else
- #define MFX_D3D9_ENABLED
- #pragma message("\n\nATTENTION:\nin file\n\t" __FILE__ " (" STRINGIFY(__LINE__) "):\nUsing of D3D9 enabled!\n\n")
-#endif
-
-#include <mfxdefs.h>
-
-#ifdef DXVA2DEVICE_LOG
-#include <stdio.h>
-#define DXVA2DEVICE_TRACE(expr) printf expr;
-#define DXVA2DEVICE_TRACE_OPERATION(expr) expr;
-#else
-#define DXVA2DEVICE_TRACE(expr)
-#define DXVA2DEVICE_TRACE_OPERATION(expr)
-#endif
-
-namespace MFX
-{
-
-class DXDevice
-{
-public:
- // Default constructor
- DXDevice(void);
- // Destructor
- virtual
- ~DXDevice(void) = 0;
-
- // Initialize device using DXGI 1.1 or VAAPI interface
- virtual
- bool Init(const mfxU32 adapterNum) = 0;
-
- // Obtain graphic card's parameter
- mfxU32 GetVendorID(void) const;
- mfxU32 GetDeviceID(void) const;
- mfxU64 GetDriverVersion(void) const;
- mfxU64 GetLUID(void) const;
-
- // Provide the number of available adapters
- mfxU32 GetAdapterCount(void) const;
-
- // Close the object
- virtual
- void Close(void);
-
- // Load the required DLL module
- void LoadDLLModule(const wchar_t *pModuleName);
-
-protected:
-
- // Free DLL module
- void UnloadDLLModule(void);
-
- // Handle to the DLL library
- HMODULE m_hModule;
-
- // Number of adapters available
- mfxU32 m_numAdapters;
-
- // Vendor ID
- mfxU32 m_vendorID;
- // Device ID
- mfxU32 m_deviceID;
- // x.x.x.x each x of two bytes
- mfxU64 m_driverVersion;
- // LUID
- mfxU64 m_luid;
-
-private:
- // unimplemented by intent to make this class and its descendants non-copyable
- DXDevice(const DXDevice &);
- void operator=(const DXDevice &);
-};
-
-#ifdef MFX_D3D9_ENABLED
-class D3D9Device : public DXDevice
-{
-public:
- // Default constructor
- D3D9Device(void);
- // Destructor
- virtual
- ~D3D9Device(void);
-
- // Initialize device using D3D v9 interface
- virtual
- bool Init(const mfxU32 adapterNum);
-
- // Close the object
- virtual
- void Close(void);
-
-protected:
-
- // Pointer to the D3D v9 interface
- void *m_pD3D9;
- // Pointer to the D3D v9 extended interface
- void *m_pD3D9Ex;
-
-};
-#endif // MFX_D3D9_ENABLED
-
-class DXGI1Device : public DXDevice
-{
-public:
- // Default constructor
- DXGI1Device(void);
- // Destructor
- virtual
- ~DXGI1Device(void);
-
- // Initialize device
- virtual
- bool Init(const mfxU32 adapterNum);
-
- // Close the object
- virtual
- void Close(void);
-
-protected:
-
- // Pointer to the DXGI1 factory
- void *m_pDXGIFactory1;
- // Pointer to the current DXGI1 adapter
- void *m_pDXGIAdapter1;
-
-};
-
-class DXVA2Device
-{
-public:
- // Default constructor
- DXVA2Device(void);
- // Destructor
- ~DXVA2Device(void);
-
- // Initialize device using D3D v9 interface
- bool InitD3D9(const mfxU32 adapterNum);
-
- // Initialize device using DXGI 1.1 interface
- bool InitDXGI1(const mfxU32 adapterNum);
-
- // Obtain graphic card's parameter
- mfxU32 GetVendorID(void) const;
- mfxU32 GetDeviceID(void) const;
- mfxU64 GetDriverVersion(void) const;
-
- // Provide the number of available adapters
- mfxU32 GetAdapterCount(void) const;
-
- void Close(void);
-
-protected:
-
-#ifdef MFX_D3D9_ENABLED
- // Get vendor & device IDs by alternative way (D3D9 in Remote Desktop sessions)
- void UseAlternativeWay(const D3D9Device *pD3D9Device);
-#endif // MFX_D3D9_ENABLED
- // Number of adapters available
- mfxU32 m_numAdapters;
-
- // Vendor ID
- mfxU32 m_vendorID;
- // Device ID
- mfxU32 m_deviceID;
- //x.x.x.x
- mfxU64 m_driverVersion;
-
-private:
- // unimplemented by intent to make this class non-copyable
- DXVA2Device(const DXVA2Device &);
- void operator=(const DXVA2Device &);
-};
-
-} // namespace MFX
-
-#endif // __MFX_DXVA2_DEVICE_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_exposed_functions_list.h Deleted

@@ -1,141 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-//
-// WARNING:
-// this file doesn't contain an include guard by intension.
-// The file may be included into a source file many times.
-// That is why this header doesn't contain any include directive.
-// Please, do no try to fix it.
-//
-
-
-
-// Use define API_VERSION to set the API of functions listed further
-// When new functions are added new section with functions declarations must be started with updated define
-
-//
-// API version 1.0 functions
-//
-
-// API version where a function is added. Minor value should precedes the major value
-#define API_VERSION {{0, 1}}
-
-// CORE interface functions
-FUNCTION(mfxStatus, MFXVideoCORE_SetBufferAllocator, (mfxSession session, mfxBufferAllocator *allocator), (session, allocator))
-FUNCTION(mfxStatus, MFXVideoCORE_SetFrameAllocator, (mfxSession session, mfxFrameAllocator *allocator), (session, allocator))
-FUNCTION(mfxStatus, MFXVideoCORE_SetHandle, (mfxSession session, mfxHandleType type, mfxHDL hdl), (session, type, hdl))
-FUNCTION(mfxStatus, MFXVideoCORE_GetHandle, (mfxSession session, mfxHandleType type, mfxHDL *hdl), (session, type, hdl))
-
-FUNCTION(mfxStatus, MFXVideoCORE_SyncOperation, (mfxSession session, mfxSyncPoint syncp, mfxU32 wait), (session, syncp, wait))
-
-// ENCODE interface functions
-FUNCTION(mfxStatus, MFXVideoENCODE_Query, (mfxSession session, mfxVideoParam *in, mfxVideoParam *out), (session, in, out))
-FUNCTION(mfxStatus, MFXVideoENCODE_QueryIOSurf, (mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request), (session, par, request))
-FUNCTION(mfxStatus, MFXVideoENCODE_Init, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoENCODE_Reset, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoENCODE_Close, (mfxSession session), (session))
-
-FUNCTION(mfxStatus, MFXVideoENCODE_GetVideoParam, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoENCODE_GetEncodeStat, (mfxSession session, mfxEncodeStat *stat), (session, stat))
-FUNCTION(mfxStatus, MFXVideoENCODE_EncodeFrameAsync, (mfxSession session, mfxEncodeCtrl *ctrl, mfxFrameSurface1 *surface, mfxBitstream *bs, mfxSyncPoint *syncp), (session, ctrl, surface, bs, syncp))
-
-// DECODE interface functions
-FUNCTION(mfxStatus, MFXVideoDECODE_Query, (mfxSession session, mfxVideoParam *in, mfxVideoParam *out), (session, in, out))
-FUNCTION(mfxStatus, MFXVideoDECODE_DecodeHeader, (mfxSession session, mfxBitstream *bs, mfxVideoParam *par), (session, bs, par))
-FUNCTION(mfxStatus, MFXVideoDECODE_QueryIOSurf, (mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request), (session, par, request))
-FUNCTION(mfxStatus, MFXVideoDECODE_Init, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoDECODE_Reset, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoDECODE_Close, (mfxSession session), (session))
-
-FUNCTION(mfxStatus, MFXVideoDECODE_GetVideoParam, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoDECODE_GetDecodeStat, (mfxSession session, mfxDecodeStat *stat), (session, stat))
-FUNCTION(mfxStatus, MFXVideoDECODE_SetSkipMode, (mfxSession session, mfxSkipMode mode), (session, mode))
-FUNCTION(mfxStatus, MFXVideoDECODE_GetPayload, (mfxSession session, mfxU64 *ts, mfxPayload *payload), (session, ts, payload))
-FUNCTION(mfxStatus, MFXVideoDECODE_DecodeFrameAsync, (mfxSession session, mfxBitstream *bs, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxSyncPoint *syncp), (session, bs, surface_work, surface_out, syncp))
-
-// VPP interface functions
-FUNCTION(mfxStatus, MFXVideoVPP_Query, (mfxSession session, mfxVideoParam *in, mfxVideoParam *out), (session, in, out))
-FUNCTION(mfxStatus, MFXVideoVPP_QueryIOSurf, (mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request), (session, par, request))
-FUNCTION(mfxStatus, MFXVideoVPP_Init, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoVPP_Reset, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoVPP_Close, (mfxSession session), (session))
-
-FUNCTION(mfxStatus, MFXVideoVPP_GetVideoParam, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoVPP_GetVPPStat, (mfxSession session, mfxVPPStat *stat), (session, stat))
-FUNCTION(mfxStatus, MFXVideoVPP_RunFrameVPPAsync, (mfxSession session, mfxFrameSurface1 *in, mfxFrameSurface1 *out, mfxExtVppAuxData *aux, mfxSyncPoint *syncp), (session, in, out, aux, syncp))
-
-#undef API_VERSION
-
-//
-// API version 1.1 functions
-//
-
-#define API_VERSION {{1, 1}}
-
-FUNCTION(mfxStatus, MFXVideoUSER_Register, (mfxSession session, mfxU32 type, const mfxPlugin *par), (session, type, par))
-FUNCTION(mfxStatus, MFXVideoUSER_Unregister, (mfxSession session, mfxU32 type), (session, type))
-FUNCTION(mfxStatus, MFXVideoUSER_ProcessFrameAsync, (mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp), (session, in, in_num, out, out_num, syncp))
-
-#undef API_VERSION
-
-//
-// API version 1.10 functions
-//
-
-#define API_VERSION {{10, 1}}
-
-FUNCTION(mfxStatus, MFXVideoENC_Query,(mfxSession session, mfxVideoParam *in, mfxVideoParam *out), (session,in,out))
-FUNCTION(mfxStatus, MFXVideoENC_QueryIOSurf,(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request), (session,par,request))
-FUNCTION(mfxStatus, MFXVideoENC_Init,(mfxSession session, mfxVideoParam *par), (session,par))
-FUNCTION(mfxStatus, MFXVideoENC_Reset,(mfxSession session, mfxVideoParam *par), (session,par))
-FUNCTION(mfxStatus, MFXVideoENC_Close,(mfxSession session),(session))
-FUNCTION(mfxStatus, MFXVideoENC_ProcessFrameAsync,(mfxSession session, mfxENCInput *in, mfxENCOutput *out, mfxSyncPoint *syncp),(session,in,out,syncp))
-
-FUNCTION(mfxStatus, MFXVideoVPP_RunFrameVPPAsyncEx, (mfxSession session, mfxFrameSurface1 *in, mfxFrameSurface1 *work, mfxFrameSurface1 **out, mfxSyncPoint *syncp), (session, in, work, out, syncp))
-
-#undef API_VERSION
-
-#define API_VERSION {{13, 1}}
-
-FUNCTION(mfxStatus, MFXVideoPAK_Query, (mfxSession session, mfxVideoParam *in, mfxVideoParam *out), (session, in, out))
-FUNCTION(mfxStatus, MFXVideoPAK_QueryIOSurf, (mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request), (session, par, request))
-FUNCTION(mfxStatus, MFXVideoPAK_Init, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoPAK_Reset, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoPAK_Close, (mfxSession session), (session))
-FUNCTION(mfxStatus, MFXVideoPAK_ProcessFrameAsync, (mfxSession session, mfxPAKInput *in, mfxPAKOutput *out, mfxSyncPoint *syncp), (session, in, out, syncp))
-
-#undef API_VERSION
-
-#define API_VERSION {{14, 1}}
-
-// FUNCTION(mfxStatus, MFXInitEx, (mfxInitParam par, mfxSession session), (par, session))
-FUNCTION(mfxStatus, MFXDoWork, (mfxSession session), (session))
-
-#undef API_VERSION
-
-#define API_VERSION {{19, 1}}
-
-FUNCTION(mfxStatus, MFXVideoENC_GetVideoParam, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoPAK_GetVideoParam, (mfxSession session, mfxVideoParam *par), (session, par))
-FUNCTION(mfxStatus, MFXVideoCORE_QueryPlatform, (mfxSession session, mfxPlatform* platform), (session, platform))
-FUNCTION(mfxStatus, MFXVideoUSER_GetPlugin, (mfxSession session, mfxU32 type, mfxPlugin *par), (session, type, par))
-
-#undef API_VERSION
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_library_iterator.h Deleted

@@ -1,134 +0,0 @@
-// Copyright (c) 2012-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_LIBRARY_ITERATOR_H)
-#define __MFX_LIBRARY_ITERATOR_H
-
-
-#include <mfxvideo.h>
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-#include "mfx_win_reg_key.h"
-#endif
-
-#include "mfx_driver_store_loader.h"
-
-#include "mfx_dispatcher.h"
-
-namespace MFX
-{
-
-// declare desired storage ID
-enum
-{
-#if defined (MFX_TRACER_WA_FOR_DS)
- MFX_UNKNOWN_KEY = -1,
- MFX_TRACER = 0,
- MFX_DRIVER_STORE = 1,
- MFX_CURRENT_USER_KEY = 2,
- MFX_LOCAL_MACHINE_KEY = 3,
- MFX_APP_FOLDER = 4,
- MFX_PATH_MSDK_FOLDER = 5,
- MFX_STORAGE_ID_FIRST = MFX_TRACER,
- MFX_STORAGE_ID_LAST = MFX_PATH_MSDK_FOLDER
-#else
- MFX_UNKNOWN_KEY = -1,
- MFX_DRIVER_STORE = 0,
- MFX_CURRENT_USER_KEY = 1,
- MFX_LOCAL_MACHINE_KEY = 2,
- MFX_APP_FOLDER = 3,
- MFX_PATH_MSDK_FOLDER = 4,
- MFX_STORAGE_ID_FIRST = MFX_DRIVER_STORE,
- MFX_STORAGE_ID_LAST = MFX_PATH_MSDK_FOLDER
-#endif
-};
-
-// Try to initialize using given implementation type. Select appropriate type automatically in case of MFX_IMPL_VIA_ANY.
-// Params: adapterNum - in, pImplInterface - in/out, pVendorID - out, pDeviceID - out
-mfxStatus SelectImplementationType(const mfxU32 adapterNum, mfxIMPL *pImplInterface, mfxU32 *pVendorID, mfxU32 *pDeviceID);
-
-const mfxU32 msdk_disp_path_len = 1024;
-
-class MFXLibraryIterator
-{
-public:
- // Default constructor
- MFXLibraryIterator(void);
- // Destructor
- ~MFXLibraryIterator(void);
-
- // Initialize the iterator
- mfxStatus Init(eMfxImplType implType, mfxIMPL implInterface, const mfxU32 adapterNum, int storageID);
-
- // Get the next library path
- mfxStatus SelectDLLVersion(wchar_t *pPath, size_t pathSize,
- eMfxImplType *pImplType, mfxVersion minVersion);
-
- // Return interface type on which Intel adapter was found (if any): D3D9 or D3D11
- mfxIMPL GetImplementationType();
-
- // Retrun registry subkey name on which dll was selected after sucesfull call to selectDllVesion
- bool GetSubKeyName(wchar_t *subKeyName, size_t length) const;
-
- int GetStorageID() const { return m_StorageID; }
-protected:
-
- // Release the iterator
- void Release(void);
-
- // Initialize the registry iterator
- mfxStatus InitRegistry(int storageID);
-#if defined(MFX_TRACER_WA_FOR_DS)
- // Initialize the registry iterator for searching for tracer
- mfxStatus InitRegistryTracer();
-#endif
- // Initialize the app/module folder iterator
- mfxStatus InitFolder(eMfxImplType implType, const wchar_t * path, const int storageID);
-
-
- eMfxImplType m_implType; // Required library implementation
- mfxIMPL m_implInterface; // Required interface (D3D9, D3D11)
-
- mfxU32 m_vendorID; // (mfxU32) property of used graphic card
- mfxU32 m_deviceID; // (mfxU32) property of used graphic card
- bool m_bIsSubKeyValid;
- wchar_t m_SubKeyNameMFX_MAX_REGISTRY_KEY_NAME; // registry subkey for selected module loaded
- int m_StorageID;
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- WinRegKey m_baseRegKey; // (WinRegKey) main registry key
-#endif
-
- mfxU32 m_lastLibIndex; // (mfxU32) index of previously returned library
- mfxU32 m_lastLibMerit; // (mfxU32) merit of previously returned library
-
- wchar_t m_pathmsdk_disp_path_len;
-
- DriverStoreLoader m_driverStoreLoader; // for loading MediaSDK from DriverStore
-
-private:
- // unimplemented by intent to make this class non-copyable
- MFXLibraryIterator(const MFXLibraryIterator &);
- void operator=(const MFXLibraryIterator &);
-};
-
-} // namespace MFX
-
-#endif // __MFX_LIBRARY_ITERATOR_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_load_dll.h Deleted

@@ -1,52 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_LOAD_DLL_H)
-#define __MFX_LOAD_DLL_H
-
-#include "mfx_dispatcher.h"
-
-namespace MFX
-{
-
-
-    //
-    // declare DLL loading routines
-    //
-
-    mfxStatus mfx_get_rt_dll_name(wchar_t *pPath, size_t pathSize);
-    mfxStatus mfx_get_default_dll_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType);
-    mfxStatus mfx_get_default_plugin_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType);
-#if defined(MEDIASDK_UWP_DISPATCHER)
-    mfxStatus mfx_get_default_intel_gfx_api_dll_name(wchar_t *pPath, size_t pathSize);
-#endif
-
-    mfxStatus mfx_get_default_audio_dll_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType);
-    
-
-    mfxModuleHandle mfx_dll_load(const wchar_t *file_name);
-    //increments reference counter
-    mfxModuleHandle mfx_get_dll_handle(const wchar_t *file_name);
-    mfxFunctionPointer mfx_dll_get_addr(mfxModuleHandle handle, const char *func_name);
-    bool mfx_dll_free(mfxModuleHandle handle);
-
-} // namespace MFX
-
-#endif  // __MFX_LOAD_DLL_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_load_plugin.h Deleted

@@ -1,85 +0,0 @@
-// Copyright (c) 2013-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include "mfxplugin.h"
-#include "mfx_dispatcher_defs.h"
-#include "mfx_plugin_hive.h"
-
-namespace MFX
-{
- typedef mfxStatus (MFX_CDECL *CreatePluginPtr_t)(mfxPluginUID uid, mfxPlugin* plugin);
-
- class PluginModule
- {
- mfxModuleHandle mHmodule;
- CreatePluginPtr_t mCreatePluginPtr;
- wchar_t mPathMAX_PLUGIN_PATH;
- 
- public:
- PluginModule();
- PluginModule(const wchar_t * path);
- PluginModule(const PluginModule & that) ;
- PluginModule & operator = (const PluginModule & that);
- bool Create(mfxPluginUID guid, mfxPlugin&);
- ~PluginModule(void);
-
- private:
- void Tidy();
- };
-
- class MFXPluginFactory {
- struct FactoryRecord {
- mfxPluginParam plgParams;
- PluginModule module;
- mfxPlugin plugin;
- FactoryRecord ()
- : plgParams(), plugin()
- {}
- FactoryRecord(const mfxPluginParam &plgParams,
- PluginModule &module,
- mfxPlugin plugin) 
- : plgParams(plgParams) 
- , module(module)
- , plugin(plugin) {
- }
- };
- MFXVector<FactoryRecord> mPlugins;
- mfxU32 nPlugins;
- mfxSession mSession;
- public:
- MFXPluginFactory(mfxSession session);
- void Close();
- mfxStatus Create(const PluginDescriptionRecord &);
- bool Destroy(const mfxPluginUID &);
- 
- ~MFXPluginFactory();
- protected:
- void DestroyPlugin( FactoryRecord & );
- static bool RunVerification( const mfxPlugin & plg, const PluginDescriptionRecord &dsc, mfxPluginParam &pluginParams );
- static bool VerifyEncoder( const mfxVideoCodecPlugin &videoCodec );
- static bool VerifyAudioEncoder( const mfxAudioCodecPlugin &audioCodec );
- static bool VerifyEnc( const mfxVideoCodecPlugin &videoEnc );
- static bool VerifyVpp( const mfxVideoCodecPlugin &videoCodec );
- static bool VerifyDecoder( const mfxVideoCodecPlugin &videoCodec );
- static bool VerifyAudioDecoder( const mfxAudioCodecPlugin &audioCodec );
- static bool VerifyCodecCommon( const mfxVideoCodecPlugin & Video );
- };
-}

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_plugin_hive.h Deleted

@@ -1,115 +0,0 @@
-// Copyright (c) 2013-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-
-#include "mfx_dispatcher_defs.h"
-#include "mfxplugin.h"
-#include "mfx_win_reg_key.h"
-#include "mfx_vector.h"
-#include <string.h>
-#include <memory>
-#include <stdio.h>
-
-struct MFX_DISP_HANDLE;
-
-namespace MFX {
-
- inline bool operator == (const mfxPluginUID &lhs, const mfxPluginUID & rhs) 
- {
- return !memcmp(lhs.Data, rhs.Data, sizeof(mfxPluginUID));
- }
- 
- inline bool operator != (const mfxPluginUID &lhs, const mfxPluginUID & rhs) 
- {
- return !(lhs == rhs);
- }
-#ifdef _WIN32
- //warning C4351: new behavior: elements of array 'MFX::PluginDescriptionRecord::sName' will be default initialized
- #pragma warning (disable: 4351)
-#endif
- class PluginDescriptionRecord : public mfxPluginParam 
- {
- public:
- wchar_t sPathMAX_PLUGIN_PATH;
- char sNameMAX_PLUGIN_NAME;
- //used for FS plugins that has poor description
- bool onlyVersionRegistered;
- bool Default;
- PluginDescriptionRecord()
- : mfxPluginParam()
- , sPath()
- , sName()
- , onlyVersionRegistered()
- , Default()
- {
- }
- };
-
- typedef MFXVector<PluginDescriptionRecord> MFXPluginStorage;
-
- class MFXPluginStorageBase : public MFXPluginStorage 
- {
- protected:
- mfxVersion mCurrentAPIVersion;
- protected:
- MFXPluginStorageBase(mfxVersion currentAPIVersion) 
- : mCurrentAPIVersion(currentAPIVersion)
- {
- }
- void ConvertAPIVersion( mfxU32 APIVersion, PluginDescriptionRecord &descriptionRecord) const
- {
- descriptionRecord.APIVersion.Minor = static_cast<mfxU16> (APIVersion & 0x0ff);
- descriptionRecord.APIVersion.Major = static_cast<mfxU16> (APIVersion >> 8);
- }
- };
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-
- //populated from registry
- class MFXPluginsInHive : public MFXPluginStorageBase
- {
- public:
- MFXPluginsInHive(int mfxStorageID, const wchar_t *msdkLibSubKey, mfxVersion currentAPIVersion);
- };
-
- //plugins are loaded from FS close to executable
- class MFXPluginsInFS : public MFXPluginStorageBase
- {
- bool mIsVersionParsed;
- bool mIsAPIVersionParsed;
- public:
- MFXPluginsInFS(mfxVersion currentAPIVersion);
- private:
- bool ParseFile(FILE * f, PluginDescriptionRecord & des);
- bool ParseKVPair( wchar_t *key, wchar_t * value, PluginDescriptionRecord & des);
- };
-
-#endif //#if !defined(MEDIASDK_UWP_DISPATCHER)
-
- //plugins are loaded from FS close to Runtime library
- class MFXDefaultPlugins : public MFXPluginStorageBase
- {
- public:
- MFXDefaultPlugins(mfxVersion currentAPIVersion, MFX_DISP_HANDLE * hdl, int implType);
- private:
- };
-
-}

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_vector.h Deleted

@@ -1,217 +0,0 @@
-// Copyright (c) 2013-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#pragma once
-#include "mfxstructures.h"
-#include <exception>
-
-namespace MFX
-{
- template <class T>
- class iterator_tmpl
- {
- template <class U> friend class MFXVector;
- mfxU32 mIndex;
- T* mRecords;
- iterator_tmpl(mfxU32 index , T * records)
- : mIndex (index)
- , mRecords(records)
- {}
- public:
- iterator_tmpl()
- : mIndex ()
- , mRecords()
- {}
- bool operator ==(const iterator_tmpl<T> & that )const
- {
- return mIndex == that.mIndex;
- }
- bool operator !=(const iterator_tmpl<T> & that )const
- {
- return mIndex != that.mIndex;
- }
- mfxU32 operator - (const iterator_tmpl<T> &that) const
- {
- return mIndex - that.mIndex;
- }
- iterator_tmpl<T> & operator ++()
- {
- mIndex++;
- return * this;
- }
- iterator_tmpl<T> & operator ++(int)
- {
- mIndex++;
- return * this;
- }
- T & operator *()
- {
- return mRecordsmIndex;
- }
- T * operator ->()
- {
- return mRecords + mIndex;
- }
- };
-
- class MFXVectorRangeError : public std::exception
- {
- };
-
- template <class T>
- class MFXVector
- {
- T* mRecords;
- mfxU32 mNrecords;
- public:
- MFXVector()
- : mRecords()
- , mNrecords()
- {}
- MFXVector(const MFXVector & rhs)
- : mRecords()
- , mNrecords()
- {
- insert(end(), rhs.begin(), rhs.end());
- }
- MFXVector & operator = (const MFXVector & rhs)
- {
- if (this != &rhs)
- {
- clear();
- insert(end(), rhs.begin(), rhs.end());
- }
- return *this;
- }
- virtual ~MFXVector ()
- {
- clear();
- }
- typedef iterator_tmpl<T> iterator;
-
- iterator begin() const
- {
- return iterator(0u, mRecords);
- }
- iterator end() const
- {
- return iterator(mNrecords, mRecords);
- }
- void insert(iterator where, iterator beg_iter, iterator end_iter)
- {
- mfxU32 elementsToInsert = (end_iter - beg_iter);
- if (!elementsToInsert)
- {
- return;
- }
- if (where.mIndex > mNrecords)
- {
- throw MFXVectorRangeError();
- }
-
- T *newRecords = new TmNrecords + elementsToInsert();
- mfxU32 i = 0;
-
- // save left
- for (; i < where.mIndex; i++)
- {
- newRecordsi = mRecordsi;
- }
- // insert
- for (; beg_iter != end_iter; beg_iter++, i++)
- {
- newRecordsi = *beg_iter;
- }
-
- //save right
- for (; i < mNrecords + elementsToInsert; i++)
- {
- newRecordsi = mRecordsi - elementsToInsert;
- }
-
- delete mRecords;
-
- mRecords = newRecords;
- mNrecords = i;
- }
- T& operator (mfxU32 idx)
- {
- return mRecordsidx;
- }
- void push_back(const T& obj)
- {
- T *newRecords = new TmNrecords + 1();
- mfxU32 i = 0;
- for (; i <mNrecords; i++)
- {
- newRecordsi = mRecordsi;
- }
- newRecordsi = obj;
- delete mRecords;
-
- mRecords = newRecords;
- mNrecords = i + 1;
- }
- void erase (iterator at)
- {
- if (at.mIndex >= mNrecords)
- {
- throw MFXVectorRangeError();
- }
- mNrecords--;
- mfxU32 i = at.mIndex;
- for (; i != mNrecords; i++)
- {
- mRecordsi = mRecordsi+1;
- }
- //destroy last element
- mRecordsi = T();
- }
- void resize(mfxU32 nSize)
- {
- T * newRecords = new TnSize();
- for (mfxU32 i = 0; i <mNrecords; i++)
- {
- newRecordsi = mRecordsi;
- }
- delete mRecords;
- mRecords = newRecords;
- mNrecords = nSize;
- }
- mfxU32 size() const
- {
- return mNrecords;
- }
- void clear()
- {
- delete mRecords;
- mRecords = 0;
- mNrecords = 0;
- }
- bool empty()
- {
- return !mRecords;
- }
- T * data() const
- {
- return mRecords;
- }
- };
-}

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfx_win_reg_key.h Deleted

@@ -1,104 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(__MFX_WIN_REG_KEY_H)
-#define __MFX_WIN_REG_KEY_H
-
-#include <windows.h>
-#include "mfxplugin.h"
-#include "mfx_dispatcher_log.h"
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-namespace MFX {
-
-template<class T> struct RegKey{};
-template<> struct RegKey<bool>{enum {type = REG_DWORD};};
-template<> struct RegKey<mfxU32>{enum {type = REG_DWORD};};
-template<> struct RegKey<mfxPluginUID>{enum {type = REG_BINARY};};
-template<> struct RegKey<mfxVersion>{enum {type = REG_DWORD};};
-template<> struct RegKey<char*>{enum {type = REG_SZ};};
-template<> struct RegKey<wchar_t*>{enum {type = REG_SZ};};
-
-
-class WinRegKey
-{
-public:
- // Default constructor
- WinRegKey(void);
- // Destructor
- ~WinRegKey(void);
-
- // Open a registry key
- bool Open(HKEY hRootKey, const wchar_t *pSubKey, REGSAM samDesired);
- bool Open(WinRegKey &rootKey, const wchar_t *pSubKey, REGSAM samDesired);
-
- // Query value
- bool QueryInfo(LPDWORD lpcSubkeys);
-
- bool QueryValueSize(const wchar_t *pValueName, DWORD type, LPDWORD pcbData);
- bool Query(const wchar_t *pValueName, DWORD type, LPBYTE pData, LPDWORD pcbData);
-
- bool Query(const wchar_t *pValueName, wchar_t *pData, mfxU32 &nData) {
- DWORD dw = (DWORD)nData;
- if (!Query(pValueName, RegKey<wchar_t*>::type, (LPBYTE)pData, &dw)){
- return false;
- }
- nData = dw;
- return true;
- }
-
- // Enumerate value names
- bool EnumValue(DWORD index, wchar_t *pValueName, LPDWORD pcchValueName, LPDWORD pType);
- bool EnumKey(DWORD index, wchar_t *pValueName, LPDWORD pcchValueName);
-
-protected:
-
- // Release the object
- void Release(void);
-
- HKEY m_hKey; // (HKEY) handle to the opened key
-
-private:
- // unimplemented by intent to make this class non-copyable
- WinRegKey(const WinRegKey &);
- void operator=(const WinRegKey &);
-
-};
-
-
-template<class T>
-inline bool QueryKey(WinRegKey & key, const wchar_t *pValueName, T &data ) {
- DWORD size = sizeof(data);
- return key.Query(pValueName, RegKey<T>::type, (LPBYTE) &data, &size);
-}
-
-template<>
-inline bool QueryKey<bool>(WinRegKey & key, const wchar_t *pValueName, bool &data ) {
- mfxU32 value = 0;
- bool bRes = QueryKey(key, pValueName, value);
- data = (1 == value);
- return bRes;
-}
-
-
-} // namespace MFX
-#endif // #if !defined(MEDIASDK_UWP_DISPATCHER)
-
-#endif // __MFX_WIN_REG_KEY_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/mfxaudio_exposed_functions_list.h Deleted

@@ -1,71 +0,0 @@
-// Copyright (c) 2013-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-//
-// WARNING:
-// this file doesn't contain an include guard by intension.
-// The file may be included into a source file many times.
-// That is why this header doesn't contain any include directive.
-// Please, do no try to fix it.
-//
-
-//
-// API version 1.8 functions
-//
-
-// Minor value should precedes the major value
-#define API_VERSION {{8, 1}}
-
-// CORE interface functions
-FUNCTION(mfxStatus, MFXAudioCORE_SyncOperation, (mfxSession session, mfxSyncPoint syncp, mfxU32 wait), (session, syncp, wait))
-
-// ENCODE interface functions
-FUNCTION(mfxStatus, MFXAudioENCODE_Query, (mfxSession session, mfxAudioParam *in, mfxAudioParam *out), (session, in, out))
-FUNCTION(mfxStatus, MFXAudioENCODE_QueryIOSize, (mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request), (session, par, request))
-FUNCTION(mfxStatus, MFXAudioENCODE_Init, (mfxSession session, mfxAudioParam *par), (session, par))
-FUNCTION(mfxStatus, MFXAudioENCODE_Reset, (mfxSession session, mfxAudioParam *par), (session, par))
-FUNCTION(mfxStatus, MFXAudioENCODE_Close, (mfxSession session), (session))
-FUNCTION(mfxStatus, MFXAudioENCODE_GetAudioParam, (mfxSession session, mfxAudioParam *par), (session, par))
-FUNCTION(mfxStatus, MFXAudioENCODE_EncodeFrameAsync, (mfxSession session, mfxAudioFrame *frame, mfxBitstream *buffer_out, mfxSyncPoint *syncp), (session, frame, buffer_out, syncp))
-
-// DECODE interface functions
-FUNCTION(mfxStatus, MFXAudioDECODE_Query, (mfxSession session, mfxAudioParam *in, mfxAudioParam *out), (session, in, out))
-FUNCTION(mfxStatus, MFXAudioDECODE_DecodeHeader, (mfxSession session, mfxBitstream *bs, mfxAudioParam *par), (session, bs, par))
-FUNCTION(mfxStatus, MFXAudioDECODE_Init, (mfxSession session, mfxAudioParam *par), (session, par))
-FUNCTION(mfxStatus, MFXAudioDECODE_Reset, (mfxSession session, mfxAudioParam *par), (session, par))
-FUNCTION(mfxStatus, MFXAudioDECODE_Close, (mfxSession session), (session))
-FUNCTION(mfxStatus, MFXAudioDECODE_QueryIOSize, (mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request), (session, par, request))
-FUNCTION(mfxStatus, MFXAudioDECODE_GetAudioParam, (mfxSession session, mfxAudioParam *par), (session, par))
-FUNCTION(mfxStatus, MFXAudioDECODE_DecodeFrameAsync, (mfxSession session, mfxBitstream *bs, mfxAudioFrame *frame_out, mfxSyncPoint *syncp), (session, bs, frame_out, syncp))
-
-#undef API_VERSION
-
-//
-// API version 1.9 functions
-//
-
-#define API_VERSION {{9, 1}}
-
-FUNCTION(mfxStatus, MFXAudioUSER_Register, (mfxSession session, mfxU32 type, const mfxPlugin *par), (session, type, par))
-FUNCTION(mfxStatus, MFXAudioUSER_Unregister, (mfxSession session, mfxU32 type), (session, type))
-FUNCTION(mfxStatus, MFXAudioUSER_ProcessFrameAsync, (mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp), (session, in, in_num, out, out_num, syncp))
-
-
-#undef API_VERSION

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxadapter.h Deleted

@@ -1,40 +0,0 @@
-// Copyright (c) 2019-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfxdefs.h"
-#if (MFX_VERSION >= 1031)
-#ifndef __MFXADAPTER_H__
-#define __MFXADAPTER_H__
-
-#include "mfxstructures.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-mfxStatus MFX_CDECL MFXQueryAdapters(mfxComponentInfo* input_info, mfxAdaptersInfo* adapters);
-mfxStatus MFX_CDECL MFXQueryAdaptersDecode(mfxBitstream* bitstream, mfxU32 codec_id, mfxAdaptersInfo* adapters);
-mfxStatus MFX_CDECL MFXQueryAdaptersNumber(mfxU32* num_adapters);
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // __MFXADAPTER_H__
-#endif
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxastructures.h Deleted

@@ -1,170 +0,0 @@
-// Copyright (c) 2017-2019 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXASTRUCTURES_H__
-#define __MFXASTRUCTURES_H__
-#include "mfxcommon.h"
-
-#if !defined (__GNUC__)
-#pragma warning(disable: 4201)
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* CodecId */
-enum {
-    MFX_CODEC_AAC         =MFX_MAKEFOURCC('A','A','C',' '),
-    MFX_CODEC_MP3         =MFX_MAKEFOURCC('M','P','3',' ')
-};
-
-enum {
-    /* AAC Profiles & Levels */
-    MFX_PROFILE_AAC_LC          =2,
-    MFX_PROFILE_AAC_LTP         =4,
-    MFX_PROFILE_AAC_MAIN        =1,
-    MFX_PROFILE_AAC_SSR         =3,
-    MFX_PROFILE_AAC_HE          =5,
-    MFX_PROFILE_AAC_ALS         =0x20,
-    MFX_PROFILE_AAC_BSAC        =22,
-    MFX_PROFILE_AAC_PS          =29,
-
-    /*MPEG AUDIO*/
-    MFX_AUDIO_MPEG1_LAYER1      =0x00000110, 
-    MFX_AUDIO_MPEG1_LAYER2      =0x00000120,
-    MFX_AUDIO_MPEG1_LAYER3      =0x00000140,
-    MFX_AUDIO_MPEG2_LAYER1      =0x00000210,
-    MFX_AUDIO_MPEG2_LAYER2      =0x00000220,
-    MFX_AUDIO_MPEG2_LAYER3      =0x00000240
-};
-
-/*AAC HE decoder down sampling*/
-enum {
-    MFX_AUDIO_AAC_HE_DWNSMPL_OFF=0,
-    MFX_AUDIO_AAC_HE_DWNSMPL_ON= 1
-};
-
-/* AAC decoder support of PS */
-enum {
-    MFX_AUDIO_AAC_PS_DISABLE=   0,
-    MFX_AUDIO_AAC_PS_PARSER=    1,
-    MFX_AUDIO_AAC_PS_ENABLE_BL= 111,
-    MFX_AUDIO_AAC_PS_ENABLE_UR= 411
-};
-
-/*AAC decoder SBR support*/
-enum {
-    MFX_AUDIO_AAC_SBR_DISABLE =  0,
-    MFX_AUDIO_AAC_SBR_ENABLE=    1,
-    MFX_AUDIO_AAC_SBR_UNDEF=     2
-};
-
-/*AAC header type*/
-enum{
-    MFX_AUDIO_AAC_ADTS=            1,
-    MFX_AUDIO_AAC_ADIF=            2,
-    MFX_AUDIO_AAC_RAW=             3,
-};
-
-/*AAC encoder stereo mode*/
-enum 
-{
-    MFX_AUDIO_AAC_MONO=            0,
-    MFX_AUDIO_AAC_LR_STEREO=       1,
-    MFX_AUDIO_AAC_MS_STEREO=       2,
-    MFX_AUDIO_AAC_JOINT_STEREO=    3
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
-    mfxU32                CodecId;
-    mfxU16                CodecProfile;
-    mfxU16                CodecLevel;
-
-    mfxU32  Bitrate;
-    mfxU32  SampleFrequency;
-    mfxU16  NumChannel;
-    mfxU16  BitPerSample;
-
-    mfxU16                reserved122; 
-
-    union {    
-        struct {   /* AAC Decoding Options */
-            mfxU16       FlagPSSupportLev;
-            mfxU16       Layer;
-            mfxU16       AACHeaderDataSize;
-            mfxU8        AACHeaderData64;
-        };
-        struct {   /* AAC Encoding Options */
-            mfxU16       OutputFormat;
-            mfxU16       StereoMode;
-            mfxU16       reserved261; 
-        };
-    };
-} mfxAudioInfoMFX;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
-    mfxU16  AsyncDepth;
-    mfxU16  Protected;
-    mfxU16  reserved14; 
-
-    mfxAudioInfoMFX   mfx;
-    mfxExtBuffer**    ExtParam;
-    mfxU16            NumExtParam;
-} mfxAudioParam;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
-    mfxU32  SuggestedInputSize;
-    mfxU32  SuggestedOutputSize;
-    mfxU32  reserved6;
-} mfxAudioAllocRequest;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
-    mfxU64  TimeStamp; /* 1/90KHz */
-    mfxU16  Locked;
-    mfxU16  NumChannels;
-    mfxU32  SampleFrequency;
-    mfxU16  BitPerSample;
-    mfxU16  reserved17; 
-
-    mfxU8*  Data;
-    mfxU32  reserved2;
-    mfxU32  DataLength;
-    mfxU32  MaxLength;
-
-    mfxU32  NumExtParam;
-    mfxExtBuffer **ExtParam;
-} mfxAudioFrame;
-MFX_PACK_END()
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxaudio++.h Deleted

@@ -1,101 +0,0 @@
-// Copyright (c) 2017 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXAUDIOPLUSPLUS_H
-#define __MFXAUDIOPLUSPLUS_H
-
-#include "mfxaudio.h"
-
-class MFXAudioSession
-{
-public:
-    MFXAudioSession(void) { m_session = (mfxSession) 0; }
-    virtual ~MFXAudioSession(void) { Close(); }
-
-    virtual mfxStatus Init(mfxIMPL impl, mfxVersion *ver) { return MFXInit(impl, ver, &m_session); }
-    virtual mfxStatus Close(void)
-    {
-        mfxStatus mfxRes;
-        mfxRes = MFXClose(m_session); m_session = (mfxSession) 0;
-        return mfxRes;
-    }
-
-    virtual mfxStatus QueryIMPL(mfxIMPL *impl) { return MFXQueryIMPL(m_session, impl); }
-    virtual mfxStatus QueryVersion(mfxVersion *version) { return MFXQueryVersion(m_session, version); }
-
-    virtual mfxStatus JoinSession(mfxSession child_session) { return MFXJoinSession(m_session, child_session);}
-    virtual mfxStatus DisjoinSession( ) { return MFXDisjoinSession(m_session);}
-    virtual mfxStatus CloneSession( mfxSession *clone) { return MFXCloneSession(m_session, clone);}
-    virtual mfxStatus SetPriority( mfxPriority priority) { return MFXSetPriority(m_session, priority);}
-    virtual mfxStatus GetPriority( mfxPriority *priority) { return MFXGetPriority(m_session, priority);}
-
-    virtual mfxStatus SyncOperation(mfxSyncPoint syncp, mfxU32 wait) { return MFXAudioCORE_SyncOperation(m_session, syncp, wait); }
-
-    virtual operator mfxSession (void) { return m_session; }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-
-class MFXAudioDECODE
-{
-public:
-
-    MFXAudioDECODE(mfxSession session) { m_session = session; }
-    virtual ~MFXAudioDECODE(void) { Close(); }
-
-    virtual mfxStatus Query(mfxAudioParam *in, mfxAudioParam *out) { return MFXAudioDECODE_Query(m_session, in, out); }
-    virtual mfxStatus DecodeHeader(mfxBitstream *bs, mfxAudioParam *par) { return MFXAudioDECODE_DecodeHeader(m_session, bs, par); }
-    virtual mfxStatus QueryIOSize(mfxAudioParam *par, mfxAudioAllocRequest *request) { return MFXAudioDECODE_QueryIOSize(m_session, par, request); }
-    virtual mfxStatus Init(mfxAudioParam *par) { return MFXAudioDECODE_Init(m_session, par); }
-    virtual mfxStatus Reset(mfxAudioParam *par) { return MFXAudioDECODE_Reset(m_session, par); }
-    virtual mfxStatus Close(void) { return MFXAudioDECODE_Close(m_session); }
-    virtual mfxStatus GetAudioParam(mfxAudioParam *par) { return MFXAudioDECODE_GetAudioParam(m_session, par); }
-    virtual mfxStatus DecodeFrameAsync(mfxBitstream *bs, mfxAudioFrame *frame, mfxSyncPoint *syncp) { return MFXAudioDECODE_DecodeFrameAsync(m_session, bs, frame, syncp); }
-
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-
-class MFXAudioENCODE
-{
-public:
-
-    MFXAudioENCODE(mfxSession session) { m_session = session; }
-    virtual ~MFXAudioENCODE(void) { Close(); }
-
-    virtual mfxStatus Query(mfxAudioParam *in, mfxAudioParam *out) { return MFXAudioENCODE_Query(m_session, in, out); }
-    virtual mfxStatus QueryIOSize(mfxAudioParam *par, mfxAudioAllocRequest *request) { return MFXAudioENCODE_QueryIOSize(m_session, par, request); }
-    virtual mfxStatus Init(mfxAudioParam *par) { return MFXAudioENCODE_Init(m_session, par); }
-    virtual mfxStatus Reset(mfxAudioParam *par) { return MFXAudioENCODE_Reset(m_session, par); }
-    virtual mfxStatus Close(void) { return MFXAudioENCODE_Close(m_session); }
-    virtual mfxStatus GetAudioParam(mfxAudioParam *par) { return MFXAudioENCODE_GetAudioParam(m_session, par); }
-    virtual mfxStatus EncodeFrameAsync(mfxAudioFrame *frame, mfxBitstream *buffer_out, mfxSyncPoint *syncp) { return MFXAudioENCODE_EncodeFrameAsync(m_session, frame, buffer_out, syncp); }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-#endif
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxaudio.h Deleted

@@ -1,60 +0,0 @@
-// Copyright (c) 2017 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#ifndef __MFXAUDIO_H__
-#define __MFXAUDIO_H__
-#include "mfxsession.h"
-#include "mfxastructures.h"
-
-#define MFX_AUDIO_VERSION_MAJOR 1
-#define MFX_AUDIO_VERSION_MINOR 15
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* AudioCORE */
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioCORE_SyncOperation(mfxSession session, mfxSyncPoint syncp, mfxU32 wait);
-
-/* AudioENCODE */
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Init(mfxSession session, mfxAudioParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Reset(mfxSession session, mfxAudioParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_Close(mfxSession session);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_GetAudioParam(mfxSession session, mfxAudioParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioENCODE_EncodeFrameAsync(mfxSession session, mfxAudioFrame *frame, mfxBitstream *bs, mfxSyncPoint *syncp);
-
-/* AudioDECODE */
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Query(mfxSession session, mfxAudioParam *in, mfxAudioParam *out);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_DecodeHeader(mfxSession session, mfxBitstream *bs, mfxAudioParam* par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Init(mfxSession session, mfxAudioParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Reset(mfxSession session, mfxAudioParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_Close(mfxSession session);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_QueryIOSize(mfxSession session, mfxAudioParam *par, mfxAudioAllocRequest *request);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_GetAudioParam(mfxSession session, mfxAudioParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioDECODE_DecodeFrameAsync(mfxSession session, mfxBitstream *bs, mfxAudioFrame *frame, mfxSyncPoint *syncp);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxcommon.h Deleted

@@ -1,214 +0,0 @@
-// Copyright (c) 2018-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXCOMMON_H__
-#define __MFXCOMMON_H__
-#include "mfxdefs.h"
-
-#if !defined (__GNUC__)
-#pragma warning(disable: 4201)
-#endif
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#define MFX_MAKEFOURCC(A,B,C,D) ((((int)A))+(((int)B)<<8)+(((int)C)<<16)+(((int)D)<<24))
-
-/* Extended Configuration Header Structure */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU32 BufferId;
- mfxU32 BufferSz;
-} mfxExtBuffer;
-MFX_PACK_END()
-
-/* Library initialization and deinitialization */
-typedef mfxI32 mfxIMPL;
-#define MFX_IMPL_BASETYPE(x) (0x00ff & (x))
-
-enum {
- MFX_IMPL_AUTO = 0x0000, /* Auto Selection/In or Not Supported/Out */
- MFX_IMPL_SOFTWARE = 0x0001, /* Pure Software Implementation */
- MFX_IMPL_HARDWARE = 0x0002, /* Hardware Accelerated Implementation (default device) */
- MFX_IMPL_AUTO_ANY = 0x0003, /* Auto selection of any hardware/software implementation */
- MFX_IMPL_HARDWARE_ANY = 0x0004, /* Auto selection of any hardware implementation */
- MFX_IMPL_HARDWARE2 = 0x0005, /* Hardware accelerated implementation (2nd device) */
- MFX_IMPL_HARDWARE3 = 0x0006, /* Hardware accelerated implementation (3rd device) */
- MFX_IMPL_HARDWARE4 = 0x0007, /* Hardware accelerated implementation (4th device) */
- MFX_IMPL_RUNTIME = 0x0008,
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- MFX_IMPL_SINGLE_THREAD= 0x0009,
-#endif
- MFX_IMPL_VIA_ANY = 0x0100,
- MFX_IMPL_VIA_D3D9 = 0x0200,
- MFX_IMPL_VIA_D3D11 = 0x0300,
- MFX_IMPL_VIA_VAAPI = 0x0400,
-
- MFX_IMPL_AUDIO = 0x8000,
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- MFX_IMPL_EXTERNAL_THREADING = 0x10000,
-#endif
-
- MFX_IMPL_UNSUPPORTED = 0x0000 /* One of the MFXQueryIMPL returns */
-};
-
-/* Version Info */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef union {
- struct {
- mfxU16 Minor;
- mfxU16 Major;
- };
- mfxU32 Version;
-} mfxVersion;
-MFX_PACK_END()
-
-/* session priority */
-typedef enum
-{
- MFX_PRIORITY_LOW = 0,
- MFX_PRIORITY_NORMAL = 1,
- MFX_PRIORITY_HIGH = 2
-
-} mfxPriority;
-
-typedef struct _mfxEncryptedData mfxEncryptedData;
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- union {
- struct {
- mfxEncryptedData* EncryptedData;
- mfxExtBuffer **ExtParam;
- mfxU16 NumExtParam;
- };
- mfxU32 reserved6;
- };
- mfxI64 DecodeTimeStamp;
- mfxU64 TimeStamp;
- mfxU8* Data;
- mfxU32 DataOffset;
- mfxU32 DataLength;
- mfxU32 MaxLength;
-
- mfxU16 PicStruct;
- mfxU16 FrameType;
- mfxU16 DataFlag;
- mfxU16 reserved2;
-} mfxBitstream;
-MFX_PACK_END()
-
-typedef struct _mfxSyncPoint *mfxSyncPoint;
-
-/* GPUCopy */
-enum {
- MFX_GPUCOPY_DEFAULT = 0,
- MFX_GPUCOPY_ON = 1,
- MFX_GPUCOPY_OFF = 2
-};
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxIMPL Implementation;
- mfxVersion Version;
- mfxU16 ExternalThreads;
- union {
- struct {
- mfxExtBuffer **ExtParam;
- mfxU16 NumExtParam;
- };
- mfxU16 reserved25;
- };
- mfxU16 GPUCopy;
- mfxU16 reserved21;
-} mfxInitParam;
-MFX_PACK_END()
-
-enum {
- MFX_EXTBUFF_THREADS_PARAM = MFX_MAKEFOURCC('T','H','D','P')
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 NumThread;
- mfxI32 SchedulingType;
- mfxI32 Priority;
- mfxU16 reserved55;
-} mfxExtThreadsParam;
-MFX_PACK_END()
-
-/* PlatformCodeName */
-enum {
- MFX_PLATFORM_UNKNOWN = 0,
- MFX_PLATFORM_SANDYBRIDGE = 1,
- MFX_PLATFORM_IVYBRIDGE = 2,
- MFX_PLATFORM_HASWELL = 3,
- MFX_PLATFORM_BAYTRAIL = 4,
- MFX_PLATFORM_BROADWELL = 5,
- MFX_PLATFORM_CHERRYTRAIL = 6,
- MFX_PLATFORM_SKYLAKE = 7,
- MFX_PLATFORM_APOLLOLAKE = 8,
- MFX_PLATFORM_KABYLAKE = 9,
-#if (MFX_VERSION >= 1025)
- MFX_PLATFORM_GEMINILAKE = 10,
- MFX_PLATFORM_COFFEELAKE = 11,
- MFX_PLATFORM_CANNONLAKE = 20,
-#endif
-#if (MFX_VERSION >= 1027)
- MFX_PLATFORM_ICELAKE = 30,
-#endif
- MFX_PLATFORM_JASPERLAKE = 32,
- MFX_PLATFORM_ELKHARTLAKE = 33,
- MFX_PLATFORM_TIGERLAKE = 40,
- MFX_PLATFORM_ROCKETLAKE = 42,
- MFX_PLATFORM_ALDERLAKE_S = 43,
- MFX_PLATFORM_KEEMBAY = 50,
-};
-
-#if (MFX_VERSION >= 1031)
-typedef enum
-{
- MFX_MEDIA_UNKNOWN = 0xffff,
- MFX_MEDIA_INTEGRATED = 0,
- MFX_MEDIA_DISCRETE = 1
-} mfxMediaAdapterType;
-#endif
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU16 CodeName;
- mfxU16 DeviceId;
-#if (MFX_VERSION >= 1031)
- mfxU16 MediaAdapterType;
- mfxU16 reserved13;
-#else
- mfxU16 reserved14;
-#endif
-} mfxPlatform;
-MFX_PACK_END()
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxdefs.h Deleted

@@ -1,258 +0,0 @@
-// Copyright (c) 2019-2020 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXDEFS_H__
-#define __MFXDEFS_H__
-
-#define MFX_VERSION_MAJOR 1
-#define MFX_VERSION_MINOR 35
-
-// MFX_VERSION_NEXT is always +1 from last public release
-// may be enforced by MFX_VERSION_USE_LATEST define
-// if MFX_VERSION_USE_LATEST is defined MFX_VERSION is ignored
-
-#define MFX_VERSION_NEXT (MFX_VERSION_MAJOR * 1000 + MFX_VERSION_MINOR + 1)
-
-// MFX_VERSION - version of API that 'assumed' by build may be provided externally
-// if it omitted then latest stable API derived from Major.Minor is assumed
-
-
-#if !defined(MFX_VERSION)
- #if defined(MFX_VERSION_USE_LATEST)
- #define MFX_VERSION MFX_VERSION_NEXT
- #else
- #define MFX_VERSION (MFX_VERSION_MAJOR * 1000 + MFX_VERSION_MINOR)
- #endif
-#else
- #undef MFX_VERSION_MINOR
- #define MFX_VERSION_MINOR ((MFX_VERSION) % 1000)
-#endif
-
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* In preprocessor syntax # symbol has stringize meaning,
- so to expand some macro to preprocessor pragma we need to use
- special compiler dependent construction */
-
-#if defined(_MSC_VER)
- #define MFX_PRAGMA_IMPL(x) __pragma(x)
-#else
- #define MFX_PRAGMA_IMPL(x) _Pragma(#x)
-#endif
-
-#define MFX_PACK_BEGIN_X(x) MFX_PRAGMA_IMPL(pack(push, x))
-#define MFX_PACK_END() MFX_PRAGMA_IMPL(pack(pop))
-
-/* The general rule for alignment is following:
- - structures with pointers have 4/8 bytes alignment on 32/64 bit systems
- - structures with fields of type mfxU64/mfxF64 (unsigned long long / double)
- have alignment 8 bytes on 64 bit and 32 bit Windows, on Linux alignment is 4 bytes
- - all the rest structures are 4 bytes aligned
- - there are several exceptions: some structs which had 4-byte alignment were extended
- with pointer / long type fields; such structs have 4-byte alignment to keep binary
- compatibility with previously release API */
-
-#define MFX_PACK_BEGIN_USUAL_STRUCT() MFX_PACK_BEGIN_X(4)
-
-/* 64-bit LP64 data model */
-#if defined(_WIN64) || defined(__LP64__)
- #define MFX_PACK_BEGIN_STRUCT_W_PTR() MFX_PACK_BEGIN_X(8)
- #define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(8)
-/* 32-bit ILP32 data model Windows (Intel architecture) */
-#elif defined(_WIN32) || defined(_M_IX86) && !defined(__linux__)
- #define MFX_PACK_BEGIN_STRUCT_W_PTR() MFX_PACK_BEGIN_X(4)
- #define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(8)
-/* 32-bit ILP32 data model Linux */
-#elif defined(__ILP32__)
- #define MFX_PACK_BEGIN_STRUCT_W_PTR() MFX_PACK_BEGIN_X(4)
- #define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(4)
-#else
- #error Unknown packing
-#endif
-
- #define __INT64 long long
- #define __UINT64 unsigned long long
-
-#ifdef _WIN32
- #define MFX_CDECL __cdecl
- #define MFX_STDCALL __stdcall
-#else
- #define MFX_CDECL
- #define MFX_STDCALL
-#endif /* _WIN32 */
-
-#define MFX_INFINITE 0xFFFFFFFF
-
-#if !defined(MFX_DEPRECATED_OFF) && (MFX_VERSION >= 1034)
-#define MFX_DEPRECATED_OFF
-#endif
-
-#ifndef MFX_DEPRECATED_OFF
- #if defined(__cplusplus) && __cplusplus >= 201402L
- #define MFX_DEPRECATED deprecated
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg deprecated
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
- #elif defined(__clang__)
- #define MFX_DEPRECATED __attribute__((deprecated))
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
- #elif defined(__INTEL_COMPILER)
- #if (defined(_WIN32) || defined(_WIN64))
- #define MFX_DEPRECATED __declspec(deprecated)
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg))
- #elif defined(__linux__)
- #define MFX_DEPRECATED __attribute__((deprecated))
- #if defined(__cplusplus)
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
- #else
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
- #endif
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
- #endif
- #elif defined(_MSC_VER) && _MSC_VER > 1200 // VS 6 doesn't support deprecation
- #define MFX_DEPRECATED __declspec(deprecated)
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg) __pragma(deprecated(arg))
- #elif defined(__GNUC__)
- #define MFX_DEPRECATED __attribute__((deprecated))
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg __attribute__((deprecated))
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
- #else
- #define MFX_DEPRECATED
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
- #endif
-#else
- #define MFX_DEPRECATED
- #define MFX_DEPRECATED_ENUM_FIELD_INSIDE(arg) arg
- #define MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(arg)
-#endif
-
-typedef unsigned char mfxU8;
-typedef char mfxI8;
-typedef short mfxI16;
-typedef unsigned short mfxU16;
-typedef unsigned int mfxU32;
-typedef int mfxI32;
-#if defined( _WIN32 ) || defined ( _WIN64 )
-typedef unsigned long mfxUL32;
-typedef long mfxL32;
-#else
-typedef unsigned int mfxUL32;
-typedef int mfxL32;
-#endif
-typedef float mfxF32;
-typedef double mfxF64;
-typedef __UINT64 mfxU64;
-typedef __INT64 mfxI64;
-typedef void* mfxHDL;
-typedef mfxHDL mfxMemId;
-typedef void* mfxThreadTask;
-typedef char mfxChar;
-
-typedef struct {
- mfxI16 x;
- mfxI16 y;
-} mfxI16Pair;
-
-typedef struct {
- mfxHDL first;
- mfxHDL second;
-} mfxHDLPair;
-
-
-/*********************************************************************************\
-Error message
-\*********************************************************************************/
-typedef enum
-{
- /* no error */
- MFX_ERR_NONE = 0, /* no error */
-
- /* reserved for unexpected errors */
- MFX_ERR_UNKNOWN = -1, /* unknown error. */
-
- /* error codes <0 */
- MFX_ERR_NULL_PTR = -2, /* null pointer */
- MFX_ERR_UNSUPPORTED = -3, /* undeveloped feature */
- MFX_ERR_MEMORY_ALLOC = -4, /* failed to allocate memory */
- MFX_ERR_NOT_ENOUGH_BUFFER = -5, /* insufficient buffer at input/output */
- MFX_ERR_INVALID_HANDLE = -6, /* invalid handle */
- MFX_ERR_LOCK_MEMORY = -7, /* failed to lock the memory block */
- MFX_ERR_NOT_INITIALIZED = -8, /* member function called before initialization */
- MFX_ERR_NOT_FOUND = -9, /* the specified object is not found */
- MFX_ERR_MORE_DATA = -10, /* expect more data at input */
- MFX_ERR_MORE_SURFACE = -11, /* expect more surface at output */
- MFX_ERR_ABORTED = -12, /* operation aborted */
- MFX_ERR_DEVICE_LOST = -13, /* lose the HW acceleration device */
- MFX_ERR_INCOMPATIBLE_VIDEO_PARAM = -14, /* incompatible video parameters */
- MFX_ERR_INVALID_VIDEO_PARAM = -15, /* invalid video parameters */
- MFX_ERR_UNDEFINED_BEHAVIOR = -16, /* undefined behavior */
- MFX_ERR_DEVICE_FAILED = -17, /* device operation failure */
- MFX_ERR_MORE_BITSTREAM = -18, /* expect more bitstream buffers at output */
- MFX_ERR_INCOMPATIBLE_AUDIO_PARAM = -19, /* incompatible audio parameters */
- MFX_ERR_INVALID_AUDIO_PARAM = -20, /* invalid audio parameters */
- MFX_ERR_GPU_HANG = -21, /* device operation failure caused by GPU hang */
- MFX_ERR_REALLOC_SURFACE = -22, /* bigger output surface required */
-
- /* warnings >0 */
- MFX_WRN_IN_EXECUTION = 1, /* the previous asynchronous operation is in execution */
- MFX_WRN_DEVICE_BUSY = 2, /* the HW acceleration device is busy */
- MFX_WRN_VIDEO_PARAM_CHANGED = 3, /* the video parameters are changed during decoding */
- MFX_WRN_PARTIAL_ACCELERATION = 4, /* SW is used */
- MFX_WRN_INCOMPATIBLE_VIDEO_PARAM = 5, /* incompatible video parameters */
- MFX_WRN_VALUE_NOT_CHANGED = 6, /* the value is saturated based on its valid range */
- MFX_WRN_OUT_OF_RANGE = 7, /* the value is out of valid range */
- MFX_WRN_FILTER_SKIPPED = 10, /* one of requested filters has been skipped */
- MFX_WRN_INCOMPATIBLE_AUDIO_PARAM = 11, /* incompatible audio parameters */
-
-#if MFX_VERSION >= 1031
- /* low-delay partial output */
- MFX_ERR_NONE_PARTIAL_OUTPUT = 12, /* frame is not ready, but bitstream contains partial output */
-#endif
-
- /* threading statuses */
- MFX_TASK_DONE = MFX_ERR_NONE, /* task has been completed */
- MFX_TASK_WORKING = 8, /* there is some more work to do */
- MFX_TASK_BUSY = 9, /* task is waiting for resources */
-
- /* plug-in statuses */
- MFX_ERR_MORE_DATA_SUBMIT_TASK = -10000, /* return MFX_ERR_MORE_DATA but submit internal asynchronous task */
-
-} mfxStatus;
-
-
-// Application 
-#if defined(MFX_DISPATCHER_EXPOSED_PREFIX)
-
-#include "mfxdispatcherprefixedfunctions.h"
-
-#endif // MFX_DISPATCHER_EXPOSED_PREFIX
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __MFXDEFS_H__ */

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxenc.h Deleted

@@ -1,74 +0,0 @@
-// Copyright (c) 2017-2019 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXENC_H__
-#define __MFXENC_H__
-#include "mfxdefs.h"
-#include "mfxvstructures.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct _mfxENCInput{
-    mfxU32  reserved32;
-
-    mfxFrameSurface1 *InSurface;
-
-    mfxU16  NumFrameL0;
-    mfxFrameSurface1 **L0Surface;
-    mfxU16  NumFrameL1;
-    mfxFrameSurface1 **L1Surface;
-
-    mfxU16  NumExtParam;
-    mfxExtBuffer    **ExtParam;
-} mfxENCInput;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct _mfxENCOutput{
-    mfxU32  reserved32;
-
-    mfxFrameSurface1 *OutSurface;
-
-    mfxU16  NumExtParam;
-    mfxExtBuffer    **ExtParam;
-} mfxENCOutput;
-MFX_PACK_END()
-
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Init(mfxSession session, mfxVideoParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Reset(mfxSession session, mfxVideoParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_Close(mfxSession session);
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_ProcessFrameAsync(mfxSession session, mfxENCInput *in, mfxENCOutput *out, mfxSyncPoint *syncp);
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoENC_GetVideoParam(mfxSession session, mfxVideoParam *par);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif /* __cplusplus */
-
-
-#endif
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxjpeg.h Deleted

@@ -1,105 +0,0 @@
-// Copyright (c) 2017-2019 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFX_JPEG_H__
-#define __MFX_JPEG_H__
-
-#include "mfxdefs.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* CodecId */
-enum {
-    MFX_CODEC_JPEG    = MFX_MAKEFOURCC('J','P','E','G')
-};
-
-/* CodecProfile, CodecLevel */
-enum
-{
-    MFX_PROFILE_JPEG_BASELINE      = 1
-};
-
-enum
-{
-    MFX_ROTATION_0      = 0,
-    MFX_ROTATION_90     = 1,
-    MFX_ROTATION_180    = 2,
-    MFX_ROTATION_270    = 3
-};
-
-enum {
-    MFX_EXTBUFF_JPEG_QT      = MFX_MAKEFOURCC('J','P','G','Q'),
-    MFX_EXTBUFF_JPEG_HUFFMAN = MFX_MAKEFOURCC('J','P','G','H')
-};
-
-enum {
-    MFX_JPEG_COLORFORMAT_UNKNOWN = 0,
-    MFX_JPEG_COLORFORMAT_YCbCr   = 1,
-    MFX_JPEG_COLORFORMAT_RGB     = 2
-};
-
-enum {
-    MFX_SCANTYPE_UNKNOWN        = 0,
-    MFX_SCANTYPE_INTERLEAVED    = 1,
-    MFX_SCANTYPE_NONINTERLEAVED = 2
-};
-
-enum {
-    MFX_CHROMAFORMAT_JPEG_SAMPLING = 6
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
-    mfxExtBuffer    Header;
-
-    mfxU16  reserved7;
-    mfxU16  NumTable;
-
-    mfxU16    Qm464;
-} mfxExtJPEGQuantTables;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
-    mfxExtBuffer    Header;
-
-    mfxU16  reserved2;
-    mfxU16  NumDCTable;
-    mfxU16  NumACTable;
-
-    struct {
-        mfxU8   Bits16;
-        mfxU8   Values12;
-    } DCTables4;
-
-    struct {
-        mfxU8   Bits16;
-        mfxU8   Values162;
-    } ACTables4;
-} mfxExtJPEGHuffmanTables;
-MFX_PACK_END()
-
-#ifdef __cplusplus
-} // extern "C"
-#endif /* __cplusplus */
-
-#endif // __MFX_JPEG_H__

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxmvc.h Deleted

@@ -1,106 +0,0 @@
-// Copyright (c) 2017-2019 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXMVC_H__
-#define __MFXMVC_H__
-
-#include "mfxdefs.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* CodecProfile, CodecLevel */
-enum {
-    /* MVC profiles */
-    MFX_PROFILE_AVC_MULTIVIEW_HIGH =118,
-    MFX_PROFILE_AVC_STEREO_HIGH    =128
-};
-
-/* Extended Buffer Ids */
-enum {
-    MFX_EXTBUFF_MVC_SEQ_DESC =   MFX_MAKEFOURCC('M','V','C','D'),
-    MFX_EXTBUFF_MVC_TARGET_VIEWS    =   MFX_MAKEFOURCC('M','V','C','T')
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct  {
-    mfxU16 ViewId;
-
-    mfxU16 NumAnchorRefsL0;
-    mfxU16 NumAnchorRefsL1;
-    mfxU16 AnchorRefL016;
-    mfxU16 AnchorRefL116;
-
-    mfxU16 NumNonAnchorRefsL0;
-    mfxU16 NumNonAnchorRefsL1;
-    mfxU16 NonAnchorRefL016;
-    mfxU16 NonAnchorRefL116;
-} mfxMVCViewDependency;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
-    mfxU16 TemporalId;
-    mfxU16 LevelIdc;
-
-    mfxU16 NumViews;
-    mfxU16 NumTargetViews;
-    mfxU16 *TargetViewId;
-} mfxMVCOperationPoint;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct  {
-    mfxExtBuffer Header;
-
-    mfxU32 NumView;
-    mfxU32 NumViewAlloc;
-    mfxMVCViewDependency *View;
-
-    mfxU32 NumViewId;
-    mfxU32 NumViewIdAlloc;
-    mfxU16 *ViewId;
-
-    mfxU32 NumOP;
-    mfxU32 NumOPAlloc;
-    mfxMVCOperationPoint *OP;
-
-    mfxU16 NumRefsTotal;
-    mfxU32 Reserved16;
-
-} mfxExtMVCSeqDesc;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
-    mfxExtBuffer    Header;
-
-    mfxU16 TemporalId;
-    mfxU32 NumView;
-    mfxU16 ViewId1024;
-} mfxExtMVCTargetViews ;
-MFX_PACK_END()
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxpak.h Deleted

@@ -1,78 +0,0 @@
-// Copyright (c) 2017-2019 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXPAK_H__
-#define __MFXPAK_H__
-#include "mfxdefs.h"
-#include "mfxvstructures.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct {
-    mfxU16 reserved32;
-
-    mfxFrameSurface1 *InSurface;
-
-    mfxU16  NumFrameL0;
-    mfxFrameSurface1 **L0Surface;
-    mfxU16  NumFrameL1;
-    mfxFrameSurface1 **L1Surface;
-
-    mfxU16  NumExtParam;
-    mfxExtBuffer    **ExtParam;
-
-    mfxU16 NumPayload;
-    mfxPayload      **Payload;
-} mfxPAKInput;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct {
-    mfxU16  reserved32;
-
-    mfxBitstream     *Bs;
-
-    mfxFrameSurface1 *OutSurface;
-
-    mfxU16            NumExtParam;
-    mfxExtBuffer    **ExtParam;
-} mfxPAKOutput;
-MFX_PACK_END()
-
-typedef struct _mfxSession *mfxSession;
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest request2);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Init(mfxSession session, mfxVideoParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Reset(mfxSession session, mfxVideoParam *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_Close(mfxSession session);
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_ProcessFrameAsync(mfxSession session, mfxPAKInput *in, mfxPAKOutput *out,  mfxSyncPoint *syncp);
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoPAK_GetVideoParam(mfxSession session, mfxVideoParam *par);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif /* __cplusplus */
-
-
-#endif

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxplugin++.h Deleted

@@ -1,717 +0,0 @@
-// Copyright (c) 2017-2020 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#ifndef __MFXPLUGINPLUSPLUS_H
-#define __MFXPLUGINPLUSPLUS_H
-
-#include "mfxplugin.h"
-
-// base class for MFXVideoUSER/MFXAudioUSER API
-
-class MFXBaseUSER {
-public:
- explicit MFXBaseUSER(mfxSession session = NULL)
- : m_session(session){}
-
- virtual ~MFXBaseUSER() {}
-
- virtual mfxStatus Register(mfxU32 type, const mfxPlugin *par) = 0;
- virtual mfxStatus Unregister(mfxU32 type) = 0;
- virtual mfxStatus ProcessFrameAsync(const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp) = 0;
-
-protected:
- mfxSession m_session;
-};
-
-//c++ wrapper over only 3 exposed functions from MFXVideoUSER module
-class MFXVideoUSER: public MFXBaseUSER {
-public:
- explicit MFXVideoUSER(mfxSession session = NULL)
- : MFXBaseUSER(session){}
-
- virtual mfxStatus Register(mfxU32 type, const mfxPlugin *par) {
- return MFXVideoUSER_Register(m_session, type, par);
- }
- virtual mfxStatus Unregister(mfxU32 type) {
- return MFXVideoUSER_Unregister(m_session, type);
- }
- virtual mfxStatus ProcessFrameAsync(const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp) {
- return MFXVideoUSER_ProcessFrameAsync(m_session, in, in_num, out, out_num, syncp);
- }
-};
-
-//c++ wrapper over only 3 exposed functions from MFXAudioUSER module
-class MFXAudioUSER: public MFXBaseUSER {
-public:
- explicit MFXAudioUSER(mfxSession session = NULL)
- : MFXBaseUSER(session){}
-
- virtual mfxStatus Register(mfxU32 type, const mfxPlugin *par) {
- return MFXAudioUSER_Register(m_session, type, par);
- }
- virtual mfxStatus Unregister(mfxU32 type) {
- return MFXAudioUSER_Unregister(m_session, type);
- }
- virtual mfxStatus ProcessFrameAsync(const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp) {
- return MFXAudioUSER_ProcessFrameAsync(m_session, in, in_num, out, out_num, syncp);
- }
-};
-
-
-//initialize mfxPlugin struct
-class MFXPluginParam {
- mfxPluginParam m_param;
-
-public:
- MFXPluginParam(mfxU32 CodecId, mfxU32 Type, mfxPluginUID uid, mfxThreadPolicy ThreadPolicy = MFX_THREADPOLICY_SERIAL, mfxU32 MaxThreadNum = 1)
- : m_param() {
- m_param.PluginUID = uid;
- m_param.Type = Type;
- m_param.CodecId = CodecId;
- m_param.MaxThreadNum = MaxThreadNum;
- m_param.ThreadPolicy = ThreadPolicy;
- }
- operator const mfxPluginParam& () const {
- return m_param;
- }
- operator mfxPluginParam& () {
- return m_param;
- }
-};
-
-//common interface part for every plugin: decoder/encoder and generic
-struct MFXPlugin
-{
- virtual ~MFXPlugin() {};
- //init function always required for any transform or codec plugins, for codec plugins it maps to callback from MediaSDK
- //for generic plugin application should call it
- //MediaSDK mfxPlugin API mapping
- virtual mfxStatus PluginInit(mfxCoreInterface *core) = 0;
- //release CoreInterface, and destroy plugin state, not destroy plugin instance
- virtual mfxStatus PluginClose() = 0;
- virtual mfxStatus GetPluginParam(mfxPluginParam *par) = 0;
- virtual mfxStatus Execute(mfxThreadTask task, mfxU32 uid_p, mfxU32 uid_a) = 0;
- virtual mfxStatus FreeResources(mfxThreadTask task, mfxStatus sts) = 0;
- //destroy plugin due to shared module distribution model plugin wont support virtual destructor
- virtual void Release() = 0;
- //release resources associated with current instance of plugin, but do not release CoreInterface related resource set in pluginInit
- virtual mfxStatus Close() = 0;
- //communication protocol between particular version of plugin and application
- virtual mfxStatus SetAuxParams(void* auxParam, int auxParamSize) = 0;
-};
-
-//common extension interface that codec plugins should expose additionally to MFXPlugin
-struct MFXCodecPlugin : MFXPlugin
-{
- virtual mfxStatus Init(mfxVideoParam *par) = 0;
- virtual mfxStatus QueryIOSurf(mfxVideoParam *par, mfxFrameAllocRequest *in, mfxFrameAllocRequest *out) = 0;
- virtual mfxStatus Query(mfxVideoParam *in, mfxVideoParam *out) =0;
- virtual mfxStatus Reset(mfxVideoParam *par) = 0;
- virtual mfxStatus GetVideoParam(mfxVideoParam *par) = 0;
-};
-
-//common extension interface that audio codec plugins should expose additionally to MFXPlugin
-struct MFXAudioCodecPlugin : MFXPlugin
-{
- virtual mfxStatus Init(mfxAudioParam *par) = 0;
- virtual mfxStatus Query(mfxAudioParam *in, mfxAudioParam *out) =0;
- virtual mfxStatus QueryIOSize(mfxAudioParam *par, mfxAudioAllocRequest *request) = 0;
- virtual mfxStatus Reset(mfxAudioParam *par) = 0;
- virtual mfxStatus GetAudioParam(mfxAudioParam *par) = 0;
-};
-
-//general purpose transform plugin interface, not a codec plugin
-struct MFXGenericPlugin : MFXPlugin
-{
- virtual mfxStatus Init(mfxVideoParam *par) = 0;
- virtual mfxStatus QueryIOSurf(mfxVideoParam *par, mfxFrameAllocRequest *in, mfxFrameAllocRequest *out) = 0;
- virtual mfxStatus Submit(const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxThreadTask *task) = 0;
-};
-
-//decoder plugins may only support this interface
-struct MFXDecoderPlugin : MFXCodecPlugin
-{
- virtual mfxStatus DecodeHeader(mfxBitstream *bs, mfxVideoParam *par) = 0;
- virtual mfxStatus GetPayload(mfxU64 *ts, mfxPayload *payload) = 0;
- virtual mfxStatus DecodeFrameSubmit(mfxBitstream *bs, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxThreadTask *task) = 0;
-};
-
-//audio decoder plugins may only support this interface
-struct MFXAudioDecoderPlugin : MFXAudioCodecPlugin
-{
- virtual mfxStatus DecodeHeader(mfxBitstream *bs, mfxAudioParam *par) = 0;
-// virtual mfxStatus GetPayload(mfxU64 *ts, mfxPayload *payload) = 0;
- virtual mfxStatus DecodeFrameSubmit(mfxBitstream *in, mfxAudioFrame *out, mfxThreadTask *task) = 0;
-};
-
-//encoder plugins may only support this interface
-struct MFXEncoderPlugin : MFXCodecPlugin
-{
- virtual mfxStatus EncodeFrameSubmit(mfxEncodeCtrl *ctrl, mfxFrameSurface1 *surface, mfxBitstream *bs, mfxThreadTask *task) = 0;
-};
-
-//audio encoder plugins may only support this interface
-struct MFXAudioEncoderPlugin : MFXAudioCodecPlugin
-{
- virtual mfxStatus EncodeFrameSubmit(mfxAudioFrame *aFrame, mfxBitstream *out, mfxThreadTask *task) = 0;
-};
-
-//vpp plugins may only support this interface
-struct MFXVPPPlugin : MFXCodecPlugin
-{
- virtual mfxStatus VPPFrameSubmit(mfxFrameSurface1 *surface_in, mfxFrameSurface1 *surface_out, mfxExtVppAuxData *aux, mfxThreadTask *task) = 0;
- virtual mfxStatus VPPFrameSubmitEx(mfxFrameSurface1 *in, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxThreadTask *task) = 0;
-};
-
-struct MFXEncPlugin : MFXCodecPlugin
-{
- virtual mfxStatus EncFrameSubmit(mfxENCInput *in, mfxENCOutput *out, mfxThreadTask *task) = 0;
-};
-
-
-
-
-class MFXCoreInterface
-{
-protected:
- mfxCoreInterface m_core;
-public:
-
- MFXCoreInterface()
- : m_core() {
- }
- MFXCoreInterface(const mfxCoreInterface & pCore)
- : m_core(pCore) {
- }
-
- MFXCoreInterface(const MFXCoreInterface & that)
- : m_core(that.m_core) {
- }
- MFXCoreInterface &operator = (const MFXCoreInterface & that)
- {
- m_core = that.m_core;
- return *this;
- }
- bool IsCoreSet() {
- return m_core.pthis != 0;
- }
- mfxStatus GetCoreParam(mfxCoreParam *par) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.GetCoreParam(m_core.pthis, par);
- }
- mfxStatus GetHandle (mfxHandleType type, mfxHDL *handle) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.GetHandle(m_core.pthis, type, handle);
- }
- mfxStatus IncreaseReference (mfxFrameData *fd) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.IncreaseReference(m_core.pthis, fd);
- }
- mfxStatus DecreaseReference (mfxFrameData *fd) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.DecreaseReference(m_core.pthis, fd);
- }
- mfxStatus CopyFrame (mfxFrameSurface1 *dst, mfxFrameSurface1 *src) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.CopyFrame(m_core.pthis, dst, src);
- }
- mfxStatus CopyBuffer(mfxU8 *dst, mfxU32 size, mfxFrameSurface1 *src) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.CopyBuffer(m_core.pthis, dst, size, src);
- }
- mfxStatus MapOpaqueSurface(mfxU32 num, mfxU32 type, mfxFrameSurface1 **op_surf) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.MapOpaqueSurface(m_core.pthis, num, type, op_surf);
- }
- mfxStatus UnmapOpaqueSurface(mfxU32 num, mfxU32 type, mfxFrameSurface1 **op_surf) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.UnmapOpaqueSurface(m_core.pthis, num, type, op_surf);
- }
- mfxStatus GetRealSurface(mfxFrameSurface1 *op_surf, mfxFrameSurface1 **surf) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.GetRealSurface(m_core.pthis, op_surf, surf);
- }
- mfxStatus GetOpaqueSurface(mfxFrameSurface1 *surf, mfxFrameSurface1 **op_surf) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.GetOpaqueSurface(m_core.pthis, surf, op_surf);
- }
- mfxStatus CreateAccelerationDevice(mfxHandleType type, mfxHDL *handle) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.CreateAccelerationDevice(m_core.pthis, type, handle);
- }
- mfxFrameAllocator & FrameAllocator() {
- return m_core.FrameAllocator;
- }
- mfxStatus GetFrameHandle(mfxFrameData *fd, mfxHDL *handle) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.GetFrameHandle(m_core.pthis, fd, handle);
- }
- mfxStatus QueryPlatform(mfxPlatform *platform) {
- if (!IsCoreSet()) {
- return MFX_ERR_NULL_PTR;
- }
- return m_core.QueryPlatform(m_core.pthis, platform);
- }
-} ;
-
-/* Class adapter between "C" structure mfxPlugin and C++ interface MFXPlugin */
-
-namespace detail
-{
- template <class T>
- class MFXPluginAdapterBase
- {
- protected:
- mfxPlugin m_mfxAPI;
- public:
- MFXPluginAdapterBase( T *plugin, mfxVideoCodecPlugin *pCodec = NULL)
- : m_mfxAPI()
- {
- SetupCallbacks(plugin, pCodec);
- }
-
- MFXPluginAdapterBase( T *plugin, mfxAudioCodecPlugin *pCodec)
- : m_mfxAPI()
- {
- SetupCallbacks(plugin, pCodec);
- }
-
- operator mfxPlugin () const {
- return m_mfxAPI;
- }
- void SetupCallbacks(T *plugin) {
- m_mfxAPI.pthis = plugin;
- m_mfxAPI.PluginInit = _PluginInit;
- m_mfxAPI.PluginClose = _PluginClose;
- m_mfxAPI.GetPluginParam = _GetPluginParam;
- m_mfxAPI.Submit = 0;
- m_mfxAPI.Execute = _Execute;
- m_mfxAPI.FreeResources = _FreeResources;
- }
-
- void SetupCallbacks( T *plugin, mfxVideoCodecPlugin *pCodec) {
- SetupCallbacks(plugin);
- m_mfxAPI.Video = pCodec;
- }
-
- void SetupCallbacks( T *plugin, mfxAudioCodecPlugin *pCodec) {
- SetupCallbacks(plugin);
- m_mfxAPI.Audio = pCodec;
- }
- private:
-
- static mfxStatus _PluginInit(mfxHDL pthis, mfxCoreInterface *core) {
- return reinterpret_cast<T*>(pthis)->PluginInit(core);
- }
- static mfxStatus _PluginClose(mfxHDL pthis) {
- return reinterpret_cast<T*>(pthis)->PluginClose();
- }
- static mfxStatus _GetPluginParam(mfxHDL pthis, mfxPluginParam *par) {
- return reinterpret_cast<T*>(pthis)->GetPluginParam(par);
- }
- static mfxStatus _Execute(mfxHDL pthis, mfxThreadTask task, mfxU32 thread_id, mfxU32 call_count) {
- return reinterpret_cast<T*>(pthis)->Execute(task, thread_id, call_count);
- }
- static mfxStatus _FreeResources(mfxHDL pthis, mfxThreadTask task, mfxStatus sts) {
- return reinterpret_cast<T*>(pthis)->FreeResources(task, sts);
- }
- };
-
- template<class T>
- class MFXCodecPluginAdapterBase : public MFXPluginAdapterBase<T>
- {
- protected:
- //stub to feed mediasdk plugin API
- mfxVideoCodecPlugin m_codecPlg;
- public:
- MFXCodecPluginAdapterBase(T * pCodecPlg)
- : MFXPluginAdapterBase<T>(pCodecPlg, &m_codecPlg)
- , m_codecPlg()
- {
- m_codecPlg.Query = _Query;
- m_codecPlg.QueryIOSurf = _QueryIOSurf ;
- m_codecPlg.Init = _Init;
- m_codecPlg.Reset = _Reset;
- m_codecPlg.Close = _Close;
- m_codecPlg.GetVideoParam = _GetVideoParam;
- }
- MFXCodecPluginAdapterBase(const MFXCodecPluginAdapterBase<T> & that)
- : MFXPluginAdapterBase<T>(reinterpret_cast<T*>(that.m_mfxAPI.pthis), &m_codecPlg)
- , m_codecPlg() {
- SetupCallbacks();
- }
- MFXCodecPluginAdapterBase<T>& operator = (const MFXCodecPluginAdapterBase<T> & that) {
- MFXPluginAdapterBase<T> :: SetupCallbacks(reinterpret_cast<T*>(that.m_mfxAPI.pthis), &m_codecPlg);
- SetupCallbacks();
- return *this;
- }
-
- private:
- void SetupCallbacks() {
- m_codecPlg.Query = _Query;
- m_codecPlg.QueryIOSurf = _QueryIOSurf ;
- m_codecPlg.Init = _Init;
- m_codecPlg.Reset = _Reset;
- m_codecPlg.Close = _Close;
- m_codecPlg.GetVideoParam = _GetVideoParam;
- }
- static mfxStatus _Query(mfxHDL pthis, mfxVideoParam *in, mfxVideoParam *out) {
- return reinterpret_cast<T*>(pthis)->Query(in, out);
- }
- static mfxStatus _QueryIOSurf(mfxHDL pthis, mfxVideoParam *par, mfxFrameAllocRequest *in, mfxFrameAllocRequest *out){
- return reinterpret_cast<T*>(pthis)->QueryIOSurf(par, in, out);
- }
- static mfxStatus _Init(mfxHDL pthis, mfxVideoParam *par){
- return reinterpret_cast<T*>(pthis)->Init(par);
- }
- static mfxStatus _Reset(mfxHDL pthis, mfxVideoParam *par){
- return reinterpret_cast<T*>(pthis)->Reset(par);
- }
- static mfxStatus _Close(mfxHDL pthis) {
- return reinterpret_cast<T*>(pthis)->Close();
- }
- static mfxStatus _GetVideoParam(mfxHDL pthis, mfxVideoParam *par) {
- return reinterpret_cast<T*>(pthis)->GetVideoParam(par);
- }
- };
-
- template<class T>
- class MFXAudioCodecPluginAdapterBase : public MFXPluginAdapterBase<T>
- {
- protected:
- //stub to feed mediasdk plugin API
- mfxAudioCodecPlugin m_codecPlg;
- public:
- MFXAudioCodecPluginAdapterBase(T * pCodecPlg)
- : MFXPluginAdapterBase<T>(pCodecPlg, &m_codecPlg)
- , m_codecPlg()
- {
- m_codecPlg.Query = _Query;
- m_codecPlg.QueryIOSize = _QueryIOSize ;
- m_codecPlg.Init = _Init;
- m_codecPlg.Reset = _Reset;
- m_codecPlg.Close = _Close;
- m_codecPlg.GetAudioParam = _GetAudioParam;
- }
- MFXAudioCodecPluginAdapterBase(const MFXCodecPluginAdapterBase<T> & that)
- : MFXPluginAdapterBase<T>(reinterpret_cast<T*>(that.m_mfxAPI.pthis), &m_codecPlg)
- , m_codecPlg() {
- SetupCallbacks();
- }
- MFXAudioCodecPluginAdapterBase<T>& operator = (const MFXAudioCodecPluginAdapterBase<T> & that) {
- MFXPluginAdapterBase<T> :: SetupCallbacks(reinterpret_cast<T*>(that.m_mfxAPI.pthis), &m_codecPlg);
- SetupCallbacks();
- return *this;
- }
-
- private:
- void SetupCallbacks() {
- m_codecPlg.Query = _Query;
- m_codecPlg.QueryIOSize = _QueryIOSize;
- m_codecPlg.Init = _Init;
- m_codecPlg.Reset = _Reset;
- m_codecPlg.Close = _Close;
- m_codecPlg.GetAudioParam = _GetAudioParam;
- }
- static mfxStatus _Query(mfxHDL pthis, mfxAudioParam *in, mfxAudioParam *out) {
- return reinterpret_cast<T*>(pthis)->Query(in, out);
- }
- static mfxStatus _QueryIOSize(mfxHDL pthis, mfxAudioParam *par, mfxAudioAllocRequest *request){
- return reinterpret_cast<T*>(pthis)->QueryIOSize(par, request);
- }
- static mfxStatus _Init(mfxHDL pthis, mfxAudioParam *par){
- return reinterpret_cast<T*>(pthis)->Init(par);
- }
- static mfxStatus _Reset(mfxHDL pthis, mfxAudioParam *par){
- return reinterpret_cast<T*>(pthis)->Reset(par);
- }
- static mfxStatus _Close(mfxHDL pthis) {
- return reinterpret_cast<T*>(pthis)->Close();
- }
- static mfxStatus _GetAudioParam(mfxHDL pthis, mfxAudioParam *par) {
- return reinterpret_cast<T*>(pthis)->GetAudioParam(par);
- }
- };
-
- template <class T>
- struct MFXPluginAdapterInternal{};
- template<>
- class MFXPluginAdapterInternal<MFXGenericPlugin> : public MFXPluginAdapterBase<MFXGenericPlugin>
- {
- public:
- MFXPluginAdapterInternal(MFXGenericPlugin *pPlugin)
- : MFXPluginAdapterBase<MFXGenericPlugin>(pPlugin)
- {
- m_mfxAPI.Submit = _Submit;
- }
- MFXPluginAdapterInternal(const MFXPluginAdapterInternal & that )
- : MFXPluginAdapterBase<MFXGenericPlugin>(that) {
- m_mfxAPI.Submit = that._Submit;
- }
- MFXPluginAdapterInternal<MFXGenericPlugin>& operator = (const MFXPluginAdapterInternal<MFXGenericPlugin> & that) {
- MFXPluginAdapterBase<MFXGenericPlugin>::operator=(that);
- m_mfxAPI.Submit = that._Submit;
- return *this;
- }
-
- private:
- static mfxStatus _Submit(mfxHDL pthis, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxThreadTask *task) {
- return reinterpret_cast<MFXGenericPlugin*>(pthis)->Submit(in, in_num, out, out_num, task);
- }
- };
-
- template<>
- class MFXPluginAdapterInternal<MFXDecoderPlugin> : public MFXCodecPluginAdapterBase<MFXDecoderPlugin>
- {
- public:
- MFXPluginAdapterInternal(MFXDecoderPlugin *pPlugin)
- : MFXCodecPluginAdapterBase<MFXDecoderPlugin>(pPlugin)
- {
- SetupCallbacks();
- }
-
- MFXPluginAdapterInternal(const MFXPluginAdapterInternal & that)
- : MFXCodecPluginAdapterBase<MFXDecoderPlugin>(that) {
- SetupCallbacks();
- }
-
- MFXPluginAdapterInternal<MFXDecoderPlugin>& operator = (const MFXPluginAdapterInternal<MFXDecoderPlugin> & that) {
- MFXCodecPluginAdapterBase<MFXDecoderPlugin>::operator=(that);
- SetupCallbacks();
- return *this;
- }
-
- private:
- void SetupCallbacks() {
- m_codecPlg.DecodeHeader = _DecodeHeader;
- m_codecPlg.GetPayload = _GetPayload;
- m_codecPlg.DecodeFrameSubmit = _DecodeFrameSubmit;
- }
- static mfxStatus _DecodeHeader(mfxHDL pthis, mfxBitstream *bs, mfxVideoParam *par) {
- return reinterpret_cast<MFXDecoderPlugin*>(pthis)->DecodeHeader(bs, par);
- }
- static mfxStatus _GetPayload(mfxHDL pthis, mfxU64 *ts, mfxPayload *payload) {
- return reinterpret_cast<MFXDecoderPlugin*>(pthis)->GetPayload(ts, payload);
- }
- static mfxStatus _DecodeFrameSubmit(mfxHDL pthis, mfxBitstream *bs, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxThreadTask *task) {
- return reinterpret_cast<MFXDecoderPlugin*>(pthis)->DecodeFrameSubmit(bs, surface_work, surface_out, task);
- }
- };
-
- template<>
- class MFXPluginAdapterInternal<MFXAudioDecoderPlugin> : public MFXAudioCodecPluginAdapterBase<MFXAudioDecoderPlugin>
- {
- public:
- MFXPluginAdapterInternal(MFXAudioDecoderPlugin *pPlugin)
- : MFXAudioCodecPluginAdapterBase<MFXAudioDecoderPlugin>(pPlugin)
- {
- SetupCallbacks();
- }
-
- MFXPluginAdapterInternal(const MFXPluginAdapterInternal & that)
- : MFXAudioCodecPluginAdapterBase<MFXAudioDecoderPlugin>(that) {
- SetupCallbacks();
- }
-
- MFXPluginAdapterInternal<MFXAudioDecoderPlugin>& operator = (const MFXPluginAdapterInternal<MFXAudioDecoderPlugin> & that) {
- MFXAudioCodecPluginAdapterBase<MFXAudioDecoderPlugin>::operator=(that);
- SetupCallbacks();
- return *this;
- }
-
- private:
- void SetupCallbacks() {
- m_codecPlg.DecodeHeader = _DecodeHeader;
- m_codecPlg.DecodeFrameSubmit = _DecodeFrameSubmit;
- }
- static mfxStatus _DecodeHeader(mfxHDL pthis, mfxBitstream *bs, mfxAudioParam *par) {
- return reinterpret_cast<MFXAudioDecoderPlugin*>(pthis)->DecodeHeader(bs, par);
- }
- static mfxStatus _DecodeFrameSubmit(mfxHDL pthis, mfxBitstream *in, mfxAudioFrame *out, mfxThreadTask *task) {
- return reinterpret_cast<MFXAudioDecoderPlugin*>(pthis)->DecodeFrameSubmit(in, out, task);
- }
- };
-
- template<>
- class MFXPluginAdapterInternal<MFXEncoderPlugin> : public MFXCodecPluginAdapterBase<MFXEncoderPlugin>
- {
- public:
- MFXPluginAdapterInternal(MFXEncoderPlugin *pPlugin)
- : MFXCodecPluginAdapterBase<MFXEncoderPlugin>(pPlugin)
- {
- m_codecPlg.EncodeFrameSubmit = _EncodeFrameSubmit;
- }
- MFXPluginAdapterInternal(const MFXPluginAdapterInternal & that)
- : MFXCodecPluginAdapterBase<MFXEncoderPlugin>(that) {
- m_codecPlg.EncodeFrameSubmit = _EncodeFrameSubmit;
- }
-
- MFXPluginAdapterInternal<MFXEncoderPlugin>& operator = (const MFXPluginAdapterInternal<MFXEncoderPlugin> & that) {
- MFXCodecPluginAdapterBase<MFXEncoderPlugin>::operator = (that);
- m_codecPlg.EncodeFrameSubmit = _EncodeFrameSubmit;
- return *this;
- }
-
- private:
- static mfxStatus _EncodeFrameSubmit(mfxHDL pthis, mfxEncodeCtrl *ctrl, mfxFrameSurface1 *surface, mfxBitstream *bs, mfxThreadTask *task) {
- return reinterpret_cast<MFXEncoderPlugin*>(pthis)->EncodeFrameSubmit(ctrl, surface, bs, task);
- }
- };
-
- template<>
- class MFXPluginAdapterInternal<MFXAudioEncoderPlugin> : public MFXAudioCodecPluginAdapterBase<MFXAudioEncoderPlugin>
- {
- public:
- MFXPluginAdapterInternal(MFXAudioEncoderPlugin *pPlugin)
- : MFXAudioCodecPluginAdapterBase<MFXAudioEncoderPlugin>(pPlugin)
- {
- SetupCallbacks();
- }
-
- MFXPluginAdapterInternal(const MFXPluginAdapterInternal & that)
- : MFXAudioCodecPluginAdapterBase<MFXAudioEncoderPlugin>(that) {
- SetupCallbacks();
- }
-
- MFXPluginAdapterInternal<MFXAudioEncoderPlugin>& operator = (const MFXPluginAdapterInternal<MFXAudioEncoderPlugin> & that) {
- MFXAudioCodecPluginAdapterBase<MFXAudioEncoderPlugin>::operator=(that);
- SetupCallbacks();
- return *this;
- }
-
- private:
- void SetupCallbacks() {
- m_codecPlg.EncodeFrameSubmit = _EncodeFrameSubmit;
- }
- static mfxStatus _EncodeFrameSubmit(mfxHDL pthis, mfxAudioFrame *aFrame, mfxBitstream *out, mfxThreadTask *task) {
- return reinterpret_cast<MFXAudioEncoderPlugin*>(pthis)->EncodeFrameSubmit(aFrame, out, task);
- }
- };
-
- template<>
- class MFXPluginAdapterInternal<MFXEncPlugin> : public MFXCodecPluginAdapterBase<MFXEncPlugin>
- {
- public:
- MFXPluginAdapterInternal(MFXEncPlugin *pPlugin)
- : MFXCodecPluginAdapterBase<MFXEncPlugin>(pPlugin)
- {
- m_codecPlg.ENCFrameSubmit = _ENCFrameSubmit;
- }
- MFXPluginAdapterInternal(const MFXPluginAdapterInternal & that)
- : MFXCodecPluginAdapterBase<MFXEncPlugin>(that) {
- m_codecPlg.ENCFrameSubmit = _ENCFrameSubmit;
- }
-
- MFXPluginAdapterInternal<MFXEncPlugin>& operator = (const MFXPluginAdapterInternal<MFXEncPlugin> & that) {
- MFXCodecPluginAdapterBase<MFXEncPlugin>::operator = (that);
- m_codecPlg.ENCFrameSubmit = _ENCFrameSubmit;
- return *this;
- }
-
- private:
- static mfxStatus _ENCFrameSubmit(mfxHDL pthis,mfxENCInput *in, mfxENCOutput *out, mfxThreadTask *task) {
- return reinterpret_cast<MFXEncPlugin*>(pthis)->EncFrameSubmit(in, out, task);
- }
- };
-
-
- template<>
- class MFXPluginAdapterInternal<MFXVPPPlugin> : public MFXCodecPluginAdapterBase<MFXVPPPlugin>
- {
- public:
- MFXPluginAdapterInternal(MFXVPPPlugin *pPlugin)
- : MFXCodecPluginAdapterBase<MFXVPPPlugin>(pPlugin)
- {
- SetupCallbacks();
- }
- MFXPluginAdapterInternal(const MFXPluginAdapterInternal & that)
- : MFXCodecPluginAdapterBase<MFXVPPPlugin>(that) {
- SetupCallbacks();
- }
-
- MFXPluginAdapterInternal<MFXVPPPlugin>& operator = (const MFXPluginAdapterInternal<MFXVPPPlugin> & that) {
- MFXCodecPluginAdapterBase<MFXVPPPlugin>::operator = (that);
- SetupCallbacks();
- return *this;
- }
-
- private:
- void SetupCallbacks() {
- m_codecPlg.VPPFrameSubmit = _VPPFrameSubmit;
- m_codecPlg.VPPFrameSubmitEx = _VPPFrameSubmitEx;
- }
- static mfxStatus _VPPFrameSubmit(mfxHDL pthis, mfxFrameSurface1 *surface_in, mfxFrameSurface1 *surface_out, mfxExtVppAuxData *aux, mfxThreadTask *task) {
- return reinterpret_cast<MFXVPPPlugin*>(pthis)->VPPFrameSubmit(surface_in, surface_out, aux, task);
- }
- static mfxStatus _VPPFrameSubmitEx(mfxHDL pthis, mfxFrameSurface1 *surface_in, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxThreadTask *task) {
- return reinterpret_cast<MFXVPPPlugin*>(pthis)->VPPFrameSubmitEx(surface_in, surface_work, surface_out, task);
- }
- };
-}
-
-/* adapter for particular plugin type*/
-template<class T>
-class MFXPluginAdapter
-{
-public:
- detail::MFXPluginAdapterInternal<T> m_Adapter;
-
- operator mfxPlugin () const {
- return m_Adapter.operator mfxPlugin();
- }
-
- MFXPluginAdapter(T* pPlugin = NULL)
- : m_Adapter(pPlugin)
- {
- }
-};
-
-template<class T>
-inline MFXPluginAdapter<T> make_mfx_plugin_adapter(T* pPlugin) {
-
- MFXPluginAdapter<T> adapt(pPlugin);
- return adapt;
-}
-
-#endif // __MFXPLUGINPLUSPLUS_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxplugin.h Deleted

@@ -1,227 +0,0 @@
-// Copyright (c) 2018-2019 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXPLUGIN_H__
-#define __MFXPLUGIN_H__
-#include "mfxvideo.h"
-#include "mfxaudio.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
-    mfxU8  Data16;
-} mfxPluginUID;
-MFX_PACK_END()
-
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVCD_SW        = {{0x15, 0xdd, 0x93, 0x68, 0x25, 0xad, 0x47, 0x5e, 0xa3, 0x4e, 0x35, 0xf3, 0xf5, 0x42, 0x17, 0xa6}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVCD_HW        = {{0x33, 0xa6, 0x1c, 0x0b, 0x4c, 0x27, 0x45, 0x4c, 0xa8, 0xd8, 0x5d, 0xde, 0x75, 0x7c, 0x6f, 0x8e}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVCE_SW        = {{0x2f, 0xca, 0x99, 0x74, 0x9f, 0xdb, 0x49, 0xae, 0xb1, 0x21, 0xa5, 0xb6, 0x3e, 0xf5, 0x68, 0xf7}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVCE_GACC      = {{0xe5, 0x40, 0x0a, 0x06, 0xc7, 0x4d, 0x41, 0xf5, 0xb1, 0x2d, 0x43, 0x0b, 0xba, 0xa2, 0x3d, 0x0b}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVCE_DP_GACC   = {{0x2b, 0xad, 0x6f, 0x9d, 0x77, 0x54, 0x41, 0x2d, 0xbf, 0x63, 0x03, 0xed, 0x4b, 0xb5, 0x09, 0x68}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVCE_HW        = {{0x6f, 0xad, 0xc7, 0x91, 0xa0, 0xc2, 0xeb, 0x47, 0x9a, 0xb6, 0xdc, 0xd5, 0xea, 0x9d, 0xa3, 0x47}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_VP8D_HW         = {{0xf6, 0x22, 0x39, 0x4d, 0x8d, 0x87, 0x45, 0x2f, 0x87, 0x8c, 0x51, 0xf2, 0xfc, 0x9b, 0x41, 0x31}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_VP8E_HW         = {{0xbf, 0xfc, 0x51, 0x8c, 0xde, 0x13, 0x4d, 0xf9, 0x8a, 0x96, 0xf4, 0xcf, 0x81, 0x6c, 0x0f, 0xac}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_VP9E_HW         = {{0xce, 0x44, 0xef, 0x6f, 0x1a, 0x6d, 0x22, 0x46, 0xb4, 0x12, 0xbb, 0x38, 0xd6, 0xe4, 0x51, 0x82}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_VP9D_HW         = {{0xa9, 0x22, 0x39, 0x4d, 0x8d, 0x87, 0x45, 0x2f, 0x87, 0x8c, 0x51, 0xf2, 0xfc, 0x9b, 0x41, 0x31}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_CAMERA_HW       = {{0x54, 0x54, 0x26, 0x16, 0x24, 0x33, 0x41, 0xe6, 0x93, 0xae, 0x89, 0x99, 0x42, 0xce, 0x73, 0x55}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_CAPTURE_HW      = {{0x22, 0xd6, 0x2c, 0x07, 0xe6, 0x72, 0x40, 0x8f, 0xbb, 0x4c, 0xc2, 0x0e, 0xd7, 0xa0, 0x53, 0xe4}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_ITELECINE_HW    = {{0xe7, 0x44, 0x75, 0x3a, 0xcd, 0x74, 0x40, 0x2e, 0x89, 0xa2, 0xee, 0x06, 0x35, 0x49, 0x61, 0x79}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_H264LA_HW       = {{0x58, 0x8f, 0x11, 0x85, 0xd4, 0x7b, 0x42, 0x96, 0x8d, 0xea, 0x37, 0x7b, 0xb5, 0xd0, 0xdc, 0xb4}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_AACD            = {{0xe9, 0x34, 0x67, 0x25, 0xac, 0x2f, 0x4c, 0x93, 0xaa, 0x58, 0x5c, 0x11, 0xc7, 0x08, 0x7c, 0xf4}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_AACE            = {{0xb2, 0xa2, 0xa0, 0x5a, 0x4e, 0xac, 0x46, 0xbf, 0xa9, 0xde, 0x7e, 0x80, 0xc9, 0x8d, 0x2e, 0x18}};
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVCE_FEI_HW    = {{0x87, 0xe0, 0xe8, 0x02, 0x07, 0x37, 0x52, 0x40, 0x85, 0x25, 0x15, 0xcf, 0x4a, 0x5e, 0xdd, 0xe6}};
-#if (MFX_VERSION >= 1027)
-MFX_DEPRECATED static const mfxPluginUID  MFX_PLUGINID_HEVC_FEI_ENCODE = {{0x54, 0x18, 0xa7, 0x06, 0x66, 0xf9, 0x4d, 0x5c, 0xb4, 0xf7, 0xb1, 0xca, 0xee, 0x86, 0x33, 0x9b}};
-#endif
-
-
-typedef enum {
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLUGINTYPE_VIDEO_GENERAL)   = 0,
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLUGINTYPE_VIDEO_DECODE)    = 1,
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLUGINTYPE_VIDEO_ENCODE)    = 2,
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLUGINTYPE_VIDEO_VPP)       = 3,
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLUGINTYPE_VIDEO_ENC)       = 4,
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLUGINTYPE_AUDIO_DECODE)    = 5,
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_PLUGINTYPE_AUDIO_ENCODE)    = 6
-} mfxPluginType;
-
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_PLUGINTYPE_VIDEO_GENERAL);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_PLUGINTYPE_VIDEO_DECODE);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_PLUGINTYPE_VIDEO_ENCODE);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_PLUGINTYPE_VIDEO_VPP);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_PLUGINTYPE_VIDEO_ENC);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_PLUGINTYPE_AUDIO_DECODE);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_PLUGINTYPE_AUDIO_ENCODE);
-
-typedef enum {
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_THREADPOLICY_SERIAL)    = 0,
-    MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_THREADPOLICY_PARALLEL)  = 1
-} mfxThreadPolicy;
-
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_THREADPOLICY_SERIAL);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_THREADPOLICY_PARALLEL);
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-MFX_DEPRECATED typedef struct mfxPluginParam {
-    mfxU32          reserved6;
-    mfxU16          reserved1;
-    mfxU16          PluginVersion;
-    mfxVersion      APIVersion;
-    mfxPluginUID    PluginUID;
-    mfxU32          Type;
-    mfxU32          CodecId;
-    mfxThreadPolicy ThreadPolicy;
-    mfxU32          MaxThreadNum;
-} mfxPluginParam;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-MFX_DEPRECATED typedef struct mfxCoreParam{
-    mfxU32     reserved13;
-    mfxIMPL    Impl;
-    mfxVersion Version;
-    mfxU32     NumWorkingThread;
-} mfxCoreParam;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct mfxCoreInterface {
-    mfxHDL pthis;
-
-    mfxHDL reserved12;
-    mfxFrameAllocator FrameAllocator;
-    mfxBufferAllocator reserved3;
-
-    mfxStatus (MFX_CDECL *GetCoreParam)(mfxHDL pthis, mfxCoreParam *par);
-    mfxStatus (MFX_CDECL *GetHandle) (mfxHDL pthis, mfxHandleType type, mfxHDL *handle);
-    mfxStatus (MFX_CDECL *IncreaseReference) (mfxHDL pthis, mfxFrameData *fd);
-    mfxStatus (MFX_CDECL *DecreaseReference) (mfxHDL pthis, mfxFrameData *fd);
-    mfxStatus (MFX_CDECL *CopyFrame) (mfxHDL pthis, mfxFrameSurface1 *dst, mfxFrameSurface1 *src);
-    mfxStatus (MFX_CDECL *CopyBuffer)(mfxHDL pthis, mfxU8 *dst, mfxU32 size, mfxFrameSurface1 *src);
-
-    mfxStatus (MFX_CDECL *MapOpaqueSurface)(mfxHDL pthis, mfxU32  num, mfxU32  type, mfxFrameSurface1 **op_surf);
-    mfxStatus (MFX_CDECL *UnmapOpaqueSurface)(mfxHDL pthis, mfxU32  num, mfxU32  type, mfxFrameSurface1 **op_surf);
-
-    mfxStatus (MFX_CDECL *GetRealSurface)(mfxHDL pthis, mfxFrameSurface1 *op_surf, mfxFrameSurface1 **surf);
-    mfxStatus (MFX_CDECL *GetOpaqueSurface)(mfxHDL pthis, mfxFrameSurface1 *surf, mfxFrameSurface1 **op_surf);
-
-    mfxStatus (MFX_CDECL *CreateAccelerationDevice)(mfxHDL pthis, mfxHandleType type, mfxHDL *handle);
-    mfxStatus (MFX_CDECL *GetFrameHandle) (mfxHDL pthis, mfxFrameData *fd, mfxHDL *handle);
-    mfxStatus (MFX_CDECL *QueryPlatform) (mfxHDL pthis, mfxPlatform *platform);
-
-    mfxHDL reserved41;
-} mfxCoreInterface;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-/* video codec plugin extension */
-MFX_DEPRECATED typedef struct _mfxENCInput mfxENCInput;
-MFX_DEPRECATED typedef struct _mfxENCOutput mfxENCOutput;
-MFX_DEPRECATED typedef struct mfxVideoCodecPlugin{
-    mfxStatus (MFX_CDECL *Query)(mfxHDL pthis, mfxVideoParam *in, mfxVideoParam *out);
-    mfxStatus (MFX_CDECL *QueryIOSurf)(mfxHDL pthis, mfxVideoParam *par, mfxFrameAllocRequest *in, mfxFrameAllocRequest *out);
-    mfxStatus (MFX_CDECL *Init)(mfxHDL pthis, mfxVideoParam *par);
-    mfxStatus (MFX_CDECL *Reset)(mfxHDL pthis, mfxVideoParam *par);
-    mfxStatus (MFX_CDECL *Close)(mfxHDL pthis);
-    mfxStatus (MFX_CDECL *GetVideoParam)(mfxHDL pthis, mfxVideoParam *par);
-
-    mfxStatus (MFX_CDECL *EncodeFrameSubmit)(mfxHDL pthis, mfxEncodeCtrl *ctrl, mfxFrameSurface1 *surface, mfxBitstream *bs, mfxThreadTask *task);
-
-    mfxStatus (MFX_CDECL *DecodeHeader)(mfxHDL pthis, mfxBitstream *bs, mfxVideoParam *par);
-    mfxStatus (MFX_CDECL *GetPayload)(mfxHDL pthis, mfxU64 *ts, mfxPayload *payload);
-    mfxStatus (MFX_CDECL *DecodeFrameSubmit)(mfxHDL pthis, mfxBitstream *bs, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out,  mfxThreadTask *task);
-
-    mfxStatus (MFX_CDECL *VPPFrameSubmit)(mfxHDL pthis,  mfxFrameSurface1 *in, mfxFrameSurface1 *out, mfxExtVppAuxData *aux, mfxThreadTask *task);
-    mfxStatus (MFX_CDECL *VPPFrameSubmitEx)(mfxHDL pthis,  mfxFrameSurface1 *in, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxThreadTask *task);
-
-    mfxStatus (MFX_CDECL *ENCFrameSubmit)(mfxHDL pthis,  mfxENCInput *in, mfxENCOutput *out, mfxThreadTask *task);
-
-    mfxHDL reserved13;
-    mfxU32 reserved28;
-} mfxVideoCodecPlugin;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct mfxAudioCodecPlugin{
-    mfxStatus (MFX_CDECL *Query)(mfxHDL pthis, mfxAudioParam *in, mfxAudioParam *out);
-    mfxStatus (MFX_CDECL *QueryIOSize)(mfxHDL pthis, mfxAudioParam *par, mfxAudioAllocRequest *request);
-    mfxStatus (MFX_CDECL *Init)(mfxHDL pthis, mfxAudioParam *par);
-    mfxStatus (MFX_CDECL *Reset)(mfxHDL pthis, mfxAudioParam *par);
-    mfxStatus (MFX_CDECL *Close)(mfxHDL pthis);
-    mfxStatus (MFX_CDECL *GetAudioParam)(mfxHDL pthis, mfxAudioParam *par);
-
-    mfxStatus (MFX_CDECL *EncodeFrameSubmit)(mfxHDL pthis, mfxAudioFrame *aFrame, mfxBitstream *out, mfxThreadTask *task);
-
-    mfxStatus (MFX_CDECL *DecodeHeader)(mfxHDL pthis, mfxBitstream *bs, mfxAudioParam *par);
-//    mfxStatus (MFX_CDECL *GetPayload)(mfxHDL pthis, mfxU64 *ts, mfxPayload *payload);
-    mfxStatus (MFX_CDECL *DecodeFrameSubmit)(mfxHDL pthis, mfxBitstream *in, mfxAudioFrame *out, mfxThreadTask *task);
-
-    mfxHDL reserved16;
-    mfxU32 reserved28;
-} mfxAudioCodecPlugin;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct mfxPlugin{
-    mfxHDL pthis;
-
-    mfxStatus (MFX_CDECL *PluginInit) (mfxHDL pthis, mfxCoreInterface *core);
-    mfxStatus (MFX_CDECL *PluginClose) (mfxHDL pthis);
-
-    mfxStatus (MFX_CDECL *GetPluginParam)(mfxHDL pthis, mfxPluginParam *par);
-
-    mfxStatus (MFX_CDECL *Submit)(mfxHDL pthis, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxThreadTask *task);
-    mfxStatus (MFX_CDECL *Execute)(mfxHDL pthis, mfxThreadTask task, mfxU32 uid_p, mfxU32 uid_a);
-    mfxStatus (MFX_CDECL *FreeResources)(mfxHDL pthis, mfxThreadTask task, mfxStatus sts);
-
-    union {
-        mfxVideoCodecPlugin  *Video;
-        mfxAudioCodecPlugin  *Audio;
-    };
-
-    mfxHDL reserved8;
-} mfxPlugin;
-MFX_PACK_END()
-
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_Register(mfxSession session, mfxU32 type, const mfxPlugin *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_Unregister(mfxSession session, mfxU32 type);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_GetPlugin(mfxSession session, mfxU32 type, mfxPlugin *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_ProcessFrameAsync(mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp);
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_LoadByPath(mfxSession session, const mfxPluginUID *uid, mfxU32 version, const mfxChar *path, mfxU32 len);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoUSER_UnLoad(mfxSession session, const mfxPluginUID *uid);
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_Register(mfxSession session, mfxU32 type, const mfxPlugin *par);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_Unregister(mfxSession session, mfxU32 type);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_ProcessFrameAsync(mfxSession session, const mfxHDL *in, mfxU32 in_num, const mfxHDL *out, mfxU32 out_num, mfxSyncPoint *syncp);
-
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXAudioUSER_UnLoad(mfxSession session, const mfxPluginUID *uid);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif /* __cplusplus */
-
-#endif /* __MFXPLUGIN_H__ */

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxsession.h Deleted

@@ -1,50 +0,0 @@
-// Copyright (c) 2017 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXSESSION_H__
-#define __MFXSESSION_H__
-#include "mfxcommon.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-/* Global Functions */
-typedef struct _mfxSession *mfxSession;
-mfxStatus MFX_CDECL MFXInit(mfxIMPL impl, mfxVersion *ver, mfxSession *session);
-mfxStatus MFX_CDECL MFXInitEx(mfxInitParam par, mfxSession *session);
-mfxStatus MFX_CDECL MFXClose(mfxSession session);
-
-mfxStatus MFX_CDECL MFXQueryIMPL(mfxSession session, mfxIMPL *impl);
-mfxStatus MFX_CDECL MFXQueryVersion(mfxSession session, mfxVersion *version);
-
-mfxStatus MFX_CDECL MFXJoinSession(mfxSession session, mfxSession child);
-mfxStatus MFX_CDECL MFXDisjoinSession(mfxSession session);
-mfxStatus MFX_CDECL MFXCloneSession(mfxSession session, mfxSession *clone);
-mfxStatus MFX_CDECL MFXSetPriority(mfxSession session, mfxPriority priority);
-mfxStatus MFX_CDECL MFXGetPriority(mfxSession session, mfxPriority *priority);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXDoWork(mfxSession session);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxstructures.h Deleted

@@ -1,2521 +0,0 @@
-// Copyright (c) 2018-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXSTRUCTURES_H__
-#define __MFXSTRUCTURES_H__
-#include "mfxcommon.h"
-
-#if !defined (__GNUC__)
-#pragma warning(disable: 4201)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* Frame ID for SVC and MVC */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU16 TemporalId;
- mfxU16 PriorityId;
- union {
- struct {
- mfxU16 DependencyId;
- mfxU16 QualityId;
- };
- struct {
- mfxU16 ViewId;
- };
- };
-} mfxFrameId;
-MFX_PACK_END()
-
-/* This struct has 4-byte alignment for binary compatibility with previously released versions of API */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-/* Frame Info */
-typedef struct {
- mfxU32 reserved4;
- mfxU16 reserved4;
- mfxU16 BitDepthLuma;
- mfxU16 BitDepthChroma;
- mfxU16 Shift;
-
- mfxFrameId FrameId;
-
- mfxU32 FourCC;
- union {
- struct { /* Frame parameters */
- mfxU16 Width;
- mfxU16 Height;
-
- mfxU16 CropX;
- mfxU16 CropY;
- mfxU16 CropW;
- mfxU16 CropH;
- };
- struct { /* Buffer parameters (for plain formats like P8) */
- mfxU64 BufferSize;
- mfxU32 reserved5;
- };
- };
-
- mfxU32 FrameRateExtN;
- mfxU32 FrameRateExtD;
- mfxU16 reserved3;
-
- mfxU16 AspectRatioW;
- mfxU16 AspectRatioH;
-
- mfxU16 PicStruct;
- mfxU16 ChromaFormat;
- mfxU16 reserved2;
-} mfxFrameInfo;
-MFX_PACK_END()
-
-/* FourCC */
-enum {
- MFX_FOURCC_NV12 = MFX_MAKEFOURCC('N','V','1','2'), /* Native Format */
- MFX_FOURCC_YV12 = MFX_MAKEFOURCC('Y','V','1','2'),
- MFX_FOURCC_NV16 = MFX_MAKEFOURCC('N','V','1','6'),
- MFX_FOURCC_YUY2 = MFX_MAKEFOURCC('Y','U','Y','2'),
-#if (MFX_VERSION >= 1028)
- MFX_FOURCC_RGB565 = MFX_MAKEFOURCC('R','G','B','2'), /* 2 bytes per pixel, uint16 in little-endian format, where 0-4 bits are blue, bits 5-10 are green and bits 11-15 are red */
- MFX_FOURCC_RGBP = MFX_MAKEFOURCC('R','G','B','P'),
-#endif
- MFX_FOURCC_RGB3 = MFX_MAKEFOURCC('R','G','B','3'), /* deprecated */
- MFX_FOURCC_RGB4 = MFX_MAKEFOURCC('R','G','B','4'), /* ARGB in that order, A channel is 8 MSBs */
- MFX_FOURCC_P8 = 41, /* D3DFMT_P8 */
- MFX_FOURCC_P8_TEXTURE = MFX_MAKEFOURCC('P','8','M','B'),
- MFX_FOURCC_P010 = MFX_MAKEFOURCC('P','0','1','0'),
-#if (MFX_VERSION >= 1031)
- MFX_FOURCC_P016 = MFX_MAKEFOURCC('P','0','1','6'),
-#endif
- MFX_FOURCC_P210 = MFX_MAKEFOURCC('P','2','1','0'),
- MFX_FOURCC_BGR4 = MFX_MAKEFOURCC('B','G','R','4'), /* ABGR in that order, A channel is 8 MSBs */
- MFX_FOURCC_A2RGB10 = MFX_MAKEFOURCC('R','G','1','0'), /* ARGB in that order, A channel is two MSBs */
- MFX_FOURCC_ARGB16 = MFX_MAKEFOURCC('R','G','1','6'), /* ARGB in that order, 64 bits, A channel is 16 MSBs */
- MFX_FOURCC_ABGR16 = MFX_MAKEFOURCC('B','G','1','6'), /* ABGR in that order, 64 bits, A channel is 16 MSBs */
- MFX_FOURCC_R16 = MFX_MAKEFOURCC('R','1','6','U'),
- MFX_FOURCC_AYUV = MFX_MAKEFOURCC('A','Y','U','V'), /* YUV 4:4:4, AYUV in that order, A channel is 8 MSBs */
- MFX_FOURCC_AYUV_RGB4 = MFX_MAKEFOURCC('A','V','U','Y'), /* ARGB in that order, A channel is 8 MSBs stored in AYUV surface*/
- MFX_FOURCC_UYVY = MFX_MAKEFOURCC('U','Y','V','Y'),
-#if (MFX_VERSION >= 1027)
- MFX_FOURCC_Y210 = MFX_MAKEFOURCC('Y','2','1','0'),
- MFX_FOURCC_Y410 = MFX_MAKEFOURCC('Y','4','1','0'),
-#endif
-#if (MFX_VERSION >= 1031)
- MFX_FOURCC_Y216 = MFX_MAKEFOURCC('Y','2','1','6'),
- MFX_FOURCC_Y416 = MFX_MAKEFOURCC('Y','4','1','6'),
-#endif
- MFX_FOURCC_NV21 = MFX_MAKEFOURCC('N', 'V', '2', '1'), /* Same as NV12 but with weaved V and U values. */
- MFX_FOURCC_IYUV = MFX_MAKEFOURCC('I', 'Y', 'U', 'V'), /* Same as YV12 except that the U and V plane order is reversed. */
- MFX_FOURCC_I010 = MFX_MAKEFOURCC('I', '0', '1', '0'), /* 10-bit YUV 4:2:0, each component has its own plane. */
-};
-
-/* PicStruct */
-enum {
- MFX_PICSTRUCT_UNKNOWN =0x00,
- MFX_PICSTRUCT_PROGRESSIVE =0x01,
- MFX_PICSTRUCT_FIELD_TFF =0x02,
- MFX_PICSTRUCT_FIELD_BFF =0x04,
-
- MFX_PICSTRUCT_FIELD_REPEATED=0x10, /* first field repeated, pic_struct=5 or 6 in H.264 */
- MFX_PICSTRUCT_FRAME_DOUBLING=0x20, /* pic_struct=7 in H.264 */
- MFX_PICSTRUCT_FRAME_TRIPLING=0x40, /* pic_struct=8 in H.264 */
-
- MFX_PICSTRUCT_FIELD_SINGLE =0x100,
- MFX_PICSTRUCT_FIELD_TOP =MFX_PICSTRUCT_FIELD_SINGLE | MFX_PICSTRUCT_FIELD_TFF,
- MFX_PICSTRUCT_FIELD_BOTTOM =MFX_PICSTRUCT_FIELD_SINGLE | MFX_PICSTRUCT_FIELD_BFF,
- MFX_PICSTRUCT_FIELD_PAIRED_PREV =0x200,
- MFX_PICSTRUCT_FIELD_PAIRED_NEXT =0x400,
-};
-
-/* ColorFormat */
-enum {
- MFX_CHROMAFORMAT_MONOCHROME =0,
- MFX_CHROMAFORMAT_YUV420 =1,
- MFX_CHROMAFORMAT_YUV422 =2,
- MFX_CHROMAFORMAT_YUV444 =3,
- MFX_CHROMAFORMAT_YUV400 = MFX_CHROMAFORMAT_MONOCHROME,
- MFX_CHROMAFORMAT_YUV411 = 4,
- MFX_CHROMAFORMAT_YUV422H = MFX_CHROMAFORMAT_YUV422,
- MFX_CHROMAFORMAT_YUV422V = 5,
- MFX_CHROMAFORMAT_RESERVED1 = 6
-};
-
-enum {
- MFX_TIMESTAMP_UNKNOWN = -1
-};
-
-enum {
- MFX_FRAMEORDER_UNKNOWN = -1
-};
-
-/* DataFlag in mfxFrameData */
-enum {
- MFX_FRAMEDATA_ORIGINAL_TIMESTAMP = 0x0001
-};
-
-/* Corrupted in mfxFrameData */
-enum {
- MFX_CORRUPTION_MINOR = 0x0001,
- MFX_CORRUPTION_MAJOR = 0x0002,
- MFX_CORRUPTION_ABSENT_TOP_FIELD = 0x0004,
- MFX_CORRUPTION_ABSENT_BOTTOM_FIELD = 0x0008,
- MFX_CORRUPTION_REFERENCE_FRAME = 0x0010,
- MFX_CORRUPTION_REFERENCE_LIST = 0x0020
-};
-
-#if (MFX_VERSION >= 1027)
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct
-{
- mfxU32 U : 10;
- mfxU32 Y : 10;
- mfxU32 V : 10;
- mfxU32 A : 2;
-} mfxY410;
-MFX_PACK_END()
-#endif
-
-#if (MFX_VERSION >= 1025)
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct
-{
- mfxU32 B : 10;
- mfxU32 G : 10;
- mfxU32 R : 10;
- mfxU32 A : 2;
-} mfxA2RGB10;
-MFX_PACK_END()
-#endif
-
-/* Frame Data Info */
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- union {
- mfxExtBuffer **ExtParam;
- mfxU64 reserved2;
- };
- mfxU16 NumExtParam;
-
- mfxU16 reserved9;
- mfxU16 MemType;
- mfxU16 PitchHigh;
-
- mfxU64 TimeStamp;
- mfxU32 FrameOrder;
- mfxU16 Locked;
- union{
- mfxU16 Pitch;
- mfxU16 PitchLow;
- };
-
- /* color planes */
- union {
- mfxU8 *Y;
- mfxU16 *Y16;
- mfxU8 *R;
- };
- union {
- mfxU8 *UV; /* for UV merged formats */
- mfxU8 *VU; /* for VU merged formats */
- mfxU8 *CbCr; /* for CbCr merged formats */
- mfxU8 *CrCb; /* for CrCb merged formats */
- mfxU8 *Cb;
- mfxU8 *U;
- mfxU16 *U16;
- mfxU8 *G;
-#if (MFX_VERSION >= 1027)
- mfxY410 *Y410; /* for Y410 format (merged AVYU) */
-#endif
- };
- union {
- mfxU8 *Cr;
- mfxU8 *V;
- mfxU16 *V16;
- mfxU8 *B;
-#if (MFX_VERSION >= 1025)
- mfxA2RGB10 *A2RGB10; /* for A2RGB10 format (merged ARGB) */
-#endif
- };
- mfxU8 *A;
- mfxMemId MemId;
-
- /* Additional Flags */
- mfxU16 Corrupted;
- mfxU16 DataFlag;
-} mfxFrameData;
-MFX_PACK_END()
-
-/* Frame Surface */
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxU32 reserved4;
- mfxFrameInfo Info;
- mfxFrameData Data;
-} mfxFrameSurface1;
-MFX_PACK_END()
-
-enum {
- MFX_TIMESTAMPCALC_UNKNOWN = 0,
- MFX_TIMESTAMPCALC_TELECINE = 1,
-};
-
-/* Transcoding Info */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU32 reserved7;
-
- mfxU16 LowPower;
- mfxU16 BRCParamMultiplier;
-
- mfxFrameInfo FrameInfo;
- mfxU32 CodecId;
- mfxU16 CodecProfile;
- mfxU16 CodecLevel;
- mfxU16 NumThread;
-
- union {
- struct { /* Encoding Options */
- mfxU16 TargetUsage;
-
- mfxU16 GopPicSize;
- mfxU16 GopRefDist;
- mfxU16 GopOptFlag;
- mfxU16 IdrInterval;
-
- mfxU16 RateControlMethod;
- union {
- mfxU16 InitialDelayInKB;
- mfxU16 QPI;
- mfxU16 Accuracy;
- };
- mfxU16 BufferSizeInKB;
- union {
- mfxU16 TargetKbps;
- mfxU16 QPP;
- mfxU16 ICQQuality;
- };
- union {
- mfxU16 MaxKbps;
- mfxU16 QPB;
- mfxU16 Convergence;
- };
-
- mfxU16 NumSlice;
- mfxU16 NumRefFrame;
- mfxU16 EncodedOrder;
- };
- struct { /* Decoding Options */
- mfxU16 DecodedOrder;
- mfxU16 ExtendedPicStruct;
- mfxU16 TimeStampCalc;
- mfxU16 SliceGroupsPresent;
- mfxU16 MaxDecFrameBuffering;
- mfxU16 EnableReallocRequest;
-#if (MFX_VERSION >= 1034)
- mfxU16 FilmGrain;
- mfxU16 IgnoreLevelConstrain;
- mfxU16 reserved25;
-#else
- mfxU16 reserved27;
-#endif
- };
- struct { /* JPEG Decoding Options */
- mfxU16 JPEGChromaFormat;
- mfxU16 Rotation;
- mfxU16 JPEGColorFormat;
- mfxU16 InterleavedDec;
- mfxU8 SamplingFactorH4;
- mfxU8 SamplingFactorV4;
- mfxU16 reserved35;
- };
- struct { /* JPEG Encoding Options */
- mfxU16 Interleaved;
- mfxU16 Quality;
- mfxU16 RestartInterval;
- mfxU16 reserved510;
- };
- };
-} mfxInfoMFX;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU32 reserved8;
- mfxFrameInfo In;
- mfxFrameInfo Out;
-} mfxInfoVPP;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxU32 AllocId;
- mfxU32 reserved2;
- mfxU16 reserved3;
- mfxU16 AsyncDepth;
-
- union {
- mfxInfoMFX mfx;
- mfxInfoVPP vpp;
- };
- mfxU16 Protected;
- mfxU16 IOPattern;
- mfxExtBuffer** ExtParam;
- mfxU16 NumExtParam;
- mfxU16 reserved2;
-} mfxVideoParam;
-MFX_PACK_END()
-
-/* IOPattern */
-enum {
- MFX_IOPATTERN_IN_VIDEO_MEMORY = 0x01,
- MFX_IOPATTERN_IN_SYSTEM_MEMORY = 0x02,
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_IOPATTERN_IN_OPAQUE_MEMORY) = 0x04,
- MFX_IOPATTERN_OUT_VIDEO_MEMORY = 0x10,
- MFX_IOPATTERN_OUT_SYSTEM_MEMORY = 0x20,
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_IOPATTERN_OUT_OPAQUE_MEMORY) = 0x40
-};
-
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_IOPATTERN_IN_OPAQUE_MEMORY);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_IOPATTERN_OUT_OPAQUE_MEMORY);
-
-/* CodecId */
-enum {
- MFX_CODEC_AVC =MFX_MAKEFOURCC('A','V','C',' '),
- MFX_CODEC_HEVC =MFX_MAKEFOURCC('H','E','V','C'),
- MFX_CODEC_MPEG2 =MFX_MAKEFOURCC('M','P','G','2'),
- MFX_CODEC_VC1 =MFX_MAKEFOURCC('V','C','1',' '),
- MFX_CODEC_CAPTURE =MFX_MAKEFOURCC('C','A','P','T'),
- MFX_CODEC_VP9 =MFX_MAKEFOURCC('V','P','9',' '),
- MFX_CODEC_AV1 =MFX_MAKEFOURCC('A','V','1',' ')
-};
-
-/* CodecProfile, CodecLevel */
-enum {
- MFX_PROFILE_UNKNOWN =0,
- MFX_LEVEL_UNKNOWN =0,
-
- /* AVC Profiles & Levels */
- MFX_PROFILE_AVC_CONSTRAINT_SET0 = (0x100 << 0),
- MFX_PROFILE_AVC_CONSTRAINT_SET1 = (0x100 << 1),
- MFX_PROFILE_AVC_CONSTRAINT_SET2 = (0x100 << 2),
- MFX_PROFILE_AVC_CONSTRAINT_SET3 = (0x100 << 3),
- MFX_PROFILE_AVC_CONSTRAINT_SET4 = (0x100 << 4),
- MFX_PROFILE_AVC_CONSTRAINT_SET5 = (0x100 << 5),
-
- MFX_PROFILE_AVC_BASELINE =66,
- MFX_PROFILE_AVC_MAIN =77,
- MFX_PROFILE_AVC_EXTENDED =88,
- MFX_PROFILE_AVC_HIGH =100,
- MFX_PROFILE_AVC_HIGH10 =110,
- MFX_PROFILE_AVC_HIGH_422 =122,
- MFX_PROFILE_AVC_CONSTRAINED_BASELINE =MFX_PROFILE_AVC_BASELINE + MFX_PROFILE_AVC_CONSTRAINT_SET1,
- MFX_PROFILE_AVC_CONSTRAINED_HIGH =MFX_PROFILE_AVC_HIGH + MFX_PROFILE_AVC_CONSTRAINT_SET4
- + MFX_PROFILE_AVC_CONSTRAINT_SET5,
- MFX_PROFILE_AVC_PROGRESSIVE_HIGH =MFX_PROFILE_AVC_HIGH + MFX_PROFILE_AVC_CONSTRAINT_SET4,
-
- MFX_LEVEL_AVC_1 =10,
- MFX_LEVEL_AVC_1b =9,
- MFX_LEVEL_AVC_11 =11,
- MFX_LEVEL_AVC_12 =12,
- MFX_LEVEL_AVC_13 =13,
- MFX_LEVEL_AVC_2 =20,
- MFX_LEVEL_AVC_21 =21,
- MFX_LEVEL_AVC_22 =22,
- MFX_LEVEL_AVC_3 =30,
- MFX_LEVEL_AVC_31 =31,
- MFX_LEVEL_AVC_32 =32,
- MFX_LEVEL_AVC_4 =40,
- MFX_LEVEL_AVC_41 =41,
- MFX_LEVEL_AVC_42 =42,
- MFX_LEVEL_AVC_5 =50,
- MFX_LEVEL_AVC_51 =51,
- MFX_LEVEL_AVC_52 =52,
-#if (MFX_VERSION >= 1035)
- MFX_LEVEL_AVC_6 =60,
- MFX_LEVEL_AVC_61 =61,
- MFX_LEVEL_AVC_62 =62,
-#endif
-
- /* MPEG-2 Profiles & Levels */
- MFX_PROFILE_MPEG2_SIMPLE =0x50,
- MFX_PROFILE_MPEG2_MAIN =0x40,
- MFX_PROFILE_MPEG2_HIGH =0x10,
-
- MFX_LEVEL_MPEG2_LOW =0xA,
- MFX_LEVEL_MPEG2_MAIN =0x8,
- MFX_LEVEL_MPEG2_HIGH =0x4,
- MFX_LEVEL_MPEG2_HIGH1440 =0x6,
-
- /* VC1 Profiles & Levels */
- MFX_PROFILE_VC1_SIMPLE =(0+1),
- MFX_PROFILE_VC1_MAIN =(4+1),
- MFX_PROFILE_VC1_ADVANCED =(12+1),
-
- /* VC1 levels for simple & main profiles */
- MFX_LEVEL_VC1_LOW =(0+1),
- MFX_LEVEL_VC1_MEDIAN =(2+1),
- MFX_LEVEL_VC1_HIGH =(4+1),
-
- /* VC1 levels for the advanced profile */
- MFX_LEVEL_VC1_0 =(0x00+1),
- MFX_LEVEL_VC1_1 =(0x01+1),
- MFX_LEVEL_VC1_2 =(0x02+1),
- MFX_LEVEL_VC1_3 =(0x03+1),
- MFX_LEVEL_VC1_4 =(0x04+1),
-
- /* HEVC Profiles & Levels & Tiers */
- MFX_PROFILE_HEVC_MAIN =1,
- MFX_PROFILE_HEVC_MAIN10 =2,
- MFX_PROFILE_HEVC_MAINSP =3,
- MFX_PROFILE_HEVC_REXT =4,
-#if (MFX_VERSION >= 1032)
- MFX_PROFILE_HEVC_SCC =9,
-#endif
-
- MFX_LEVEL_HEVC_1 = 10,
- MFX_LEVEL_HEVC_2 = 20,
- MFX_LEVEL_HEVC_21 = 21,
- MFX_LEVEL_HEVC_3 = 30,
- MFX_LEVEL_HEVC_31 = 31,
- MFX_LEVEL_HEVC_4 = 40,
- MFX_LEVEL_HEVC_41 = 41,
- MFX_LEVEL_HEVC_5 = 50,
- MFX_LEVEL_HEVC_51 = 51,
- MFX_LEVEL_HEVC_52 = 52,
- MFX_LEVEL_HEVC_6 = 60,
- MFX_LEVEL_HEVC_61 = 61,
- MFX_LEVEL_HEVC_62 = 62,
-
- MFX_TIER_HEVC_MAIN = 0,
- MFX_TIER_HEVC_HIGH = 0x100,
-
- /* VP9 Profiles */
- MFX_PROFILE_VP9_0 = 1,
- MFX_PROFILE_VP9_1 = 2,
- MFX_PROFILE_VP9_2 = 3,
- MFX_PROFILE_VP9_3 = 4,
-
-#if (MFX_VERSION >= 1034)
- /* AV1 Profiles */
- MFX_PROFILE_AV1_MAIN = 1,
- MFX_PROFILE_AV1_HIGH = 2,
- MFX_PROFILE_AV1_PRO = 3,
-
- MFX_LEVEL_AV1_2 = 20,
- MFX_LEVEL_AV1_21 = 21,
- MFX_LEVEL_AV1_22 = 22,
- MFX_LEVEL_AV1_23 = 23,
- MFX_LEVEL_AV1_3 = 30,
- MFX_LEVEL_AV1_31 = 31,
- MFX_LEVEL_AV1_32 = 32,
- MFX_LEVEL_AV1_33 = 33,
- MFX_LEVEL_AV1_4 = 40,
- MFX_LEVEL_AV1_41 = 41,
- MFX_LEVEL_AV1_42 = 42,
- MFX_LEVEL_AV1_43 = 43,
- MFX_LEVEL_AV1_5 = 50,
- MFX_LEVEL_AV1_51 = 51,
- MFX_LEVEL_AV1_52 = 52,
- MFX_LEVEL_AV1_53 = 53,
- MFX_LEVEL_AV1_6 = 60,
- MFX_LEVEL_AV1_61 = 61,
- MFX_LEVEL_AV1_62 = 62,
- MFX_LEVEL_AV1_63 = 63,
-#endif
-};
-
-/* GopOptFlag */
-enum {
- MFX_GOP_CLOSED =1,
- MFX_GOP_STRICT =2
-};
-
-/* TargetUsages: from 1 to 7 inclusive */
-enum {
- MFX_TARGETUSAGE_1 =1,
- MFX_TARGETUSAGE_2 =2,
- MFX_TARGETUSAGE_3 =3,
- MFX_TARGETUSAGE_4 =4,
- MFX_TARGETUSAGE_5 =5,
- MFX_TARGETUSAGE_6 =6,
- MFX_TARGETUSAGE_7 =7,
-
- MFX_TARGETUSAGE_UNKNOWN =0,
- MFX_TARGETUSAGE_BEST_QUALITY =MFX_TARGETUSAGE_1,
- MFX_TARGETUSAGE_BALANCED =MFX_TARGETUSAGE_4,
- MFX_TARGETUSAGE_BEST_SPEED =MFX_TARGETUSAGE_7
-};
-
-/* RateControlMethod */
-enum {
- MFX_RATECONTROL_CBR =1,
- MFX_RATECONTROL_VBR =2,
- MFX_RATECONTROL_CQP =3,
- MFX_RATECONTROL_AVBR =4,
- MFX_RATECONTROL_RESERVED1 =5,
- MFX_RATECONTROL_RESERVED2 =6,
- MFX_RATECONTROL_RESERVED3 =100,
- MFX_RATECONTROL_RESERVED4 =7,
- MFX_RATECONTROL_LA =8,
- MFX_RATECONTROL_ICQ =9,
- MFX_RATECONTROL_VCM =10,
- MFX_RATECONTROL_LA_ICQ =11,
- MFX_RATECONTROL_LA_EXT =12,
- MFX_RATECONTROL_LA_HRD =13,
- MFX_RATECONTROL_QVBR =14,
-};
-
-/* Trellis control*/
-enum {
- MFX_TRELLIS_UNKNOWN =0,
- MFX_TRELLIS_OFF =0x01,
- MFX_TRELLIS_I =0x02,
- MFX_TRELLIS_P =0x04,
- MFX_TRELLIS_B =0x08
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 reserved1;
- mfxU16 RateDistortionOpt; /* tri-state option */
- mfxU16 MECostType;
- mfxU16 MESearchType;
- mfxI16Pair MVSearchWindow;
- mfxU16 EndOfSequence; /* tri-state option */
- mfxU16 FramePicture; /* tri-state option */
-
- mfxU16 CAVLC; /* tri-state option */
- mfxU16 reserved22;
- mfxU16 RecoveryPointSEI; /* tri-state option */
- mfxU16 ViewOutput; /* tri-state option */
- mfxU16 NalHrdConformance; /* tri-state option */
- mfxU16 SingleSeiNalUnit; /* tri-state option */
- mfxU16 VuiVclHrdParameters; /* tri-state option */
-
- mfxU16 RefPicListReordering; /* tri-state option */
- mfxU16 ResetRefList; /* tri-state option */
- mfxU16 RefPicMarkRep; /* tri-state option */
- mfxU16 FieldOutput; /* tri-state option */
-
- mfxU16 IntraPredBlockSize;
- mfxU16 InterPredBlockSize;
- mfxU16 MVPrecision;
- mfxU16 MaxDecFrameBuffering;
-
- mfxU16 AUDelimiter; /* tri-state option */
- mfxU16 EndOfStream; /* tri-state option */
- mfxU16 PicTimingSEI; /* tri-state option */
- mfxU16 VuiNalHrdParameters; /* tri-state option */
-} mfxExtCodingOption;
-MFX_PACK_END()
-
-enum {
- MFX_B_REF_UNKNOWN = 0,
- MFX_B_REF_OFF = 1,
- MFX_B_REF_PYRAMID = 2
-};
-
-enum {
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_LOOKAHEAD_DS_UNKNOWN) = 0,
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_LOOKAHEAD_DS_OFF) = 1,
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_LOOKAHEAD_DS_2x) = 2,
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_LOOKAHEAD_DS_4x) = 3
-};
-
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_LOOKAHEAD_DS_UNKNOWN);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_LOOKAHEAD_DS_OFF);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_LOOKAHEAD_DS_2x);
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_LOOKAHEAD_DS_4x);
-
-enum {
- MFX_BPSEI_DEFAULT = 0x00,
- MFX_BPSEI_IFRAME = 0x01
-};
-
-enum {
- MFX_SKIPFRAME_NO_SKIP = 0,
- MFX_SKIPFRAME_INSERT_DUMMY = 1,
- MFX_SKIPFRAME_INSERT_NOTHING = 2,
- MFX_SKIPFRAME_BRC_ONLY = 3,
-};
-
-/* Intra refresh types */
-enum {
- MFX_REFRESH_NO = 0,
- MFX_REFRESH_VERTICAL = 1,
- MFX_REFRESH_HORIZONTAL = 2,
- MFX_REFRESH_SLICE = 3
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 IntRefType;
- mfxU16 IntRefCycleSize;
- mfxI16 IntRefQPDelta;
-
- mfxU32 MaxFrameSize;
- mfxU32 MaxSliceSize;
-
- mfxU16 BitrateLimit; /* tri-state option */
- mfxU16 MBBRC; /* tri-state option */
- mfxU16 ExtBRC; /* tri-state option */
- mfxU16 LookAheadDepth;
- mfxU16 Trellis;
- mfxU16 RepeatPPS; /* tri-state option */
- mfxU16 BRefType;
- mfxU16 AdaptiveI; /* tri-state option */
- mfxU16 AdaptiveB; /* tri-state option */
- mfxU16 LookAheadDS;
- mfxU16 NumMbPerSlice;
- mfxU16 SkipFrame;
- mfxU8 MinQPI; /* 1..51, 0 = default */
- mfxU8 MaxQPI; /* 1..51, 0 = default */
- mfxU8 MinQPP; /* 1..51, 0 = default */
- mfxU8 MaxQPP; /* 1..51, 0 = default */
- mfxU8 MinQPB; /* 1..51, 0 = default */
- mfxU8 MaxQPB; /* 1..51, 0 = default */
- mfxU16 FixedFrameRate; /* tri-state option */
- mfxU16 DisableDeblockingIdc;
- mfxU16 DisableVUI;
- mfxU16 BufferingPeriodSEI;
- mfxU16 EnableMAD; /* tri-state option */
- mfxU16 UseRawRef; /* tri-state option */
-} mfxExtCodingOption2;
-MFX_PACK_END()
-
-/* WeightedPred */
-enum {
- MFX_WEIGHTED_PRED_UNKNOWN = 0,
- MFX_WEIGHTED_PRED_DEFAULT = 1,
- MFX_WEIGHTED_PRED_EXPLICIT = 2,
- MFX_WEIGHTED_PRED_IMPLICIT = 3
-};
-
-/* ScenarioInfo */
-enum {
- MFX_SCENARIO_UNKNOWN = 0,
- MFX_SCENARIO_DISPLAY_REMOTING = 1,
- MFX_SCENARIO_VIDEO_CONFERENCE = 2,
- MFX_SCENARIO_ARCHIVE = 3,
- MFX_SCENARIO_LIVE_STREAMING = 4,
- MFX_SCENARIO_CAMERA_CAPTURE = 5,
- MFX_SCENARIO_VIDEO_SURVEILLANCE = 6,
- MFX_SCENARIO_GAME_STREAMING = 7,
- MFX_SCENARIO_REMOTE_GAMING = 8
-};
-
-/* ContentInfo */
-enum {
- MFX_CONTENT_UNKNOWN = 0,
- MFX_CONTENT_FULL_SCREEN_VIDEO = 1,
- MFX_CONTENT_NON_VIDEO_SCREEN = 2
-};
-
-/* PRefType */
-enum {
- MFX_P_REF_DEFAULT = 0,
- MFX_P_REF_SIMPLE = 1,
- MFX_P_REF_PYRAMID = 2
-};
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
-
-/* QuantScaleType */
-enum {
- MFX_MPEG2_QUANT_SCALE_TYPE_DEFAULT = 0,
- MFX_MPEG2_QUANT_SCALE_TYPE_LINEAR = 1, /* q_scale_type = 0 */
- MFX_MPEG2_QUANT_SCALE_TYPE_NONLINEAR = 2 /* q_scale_type = 1 */
-};
-
-/* IntraVLCFormat */
-enum {
- MFX_MPEG2_INTRA_VLC_FORMAT_DEFAULT = 0,
- MFX_MPEG2_INTRA_VLC_FORMAT_B14 = 1, /* use table B.14 */
- MFX_MPEG2_INTRA_VLC_FORMAT_B15 = 2 /* use table B.15 */
-};
-
-/* ScanType */
-enum {
- MFX_MPEG2_SCAN_TYPE_DEFAULT = 0,
- MFX_MPEG2_SCAN_TYPE_ZIGZAG = 1, /* alternate_scan = 0 */
- MFX_MPEG2_SCAN_TYPE_ALTERNATE = 2 /* alternate_scan = 1 */
-};
-
-#endif
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 NumSliceI;
- mfxU16 NumSliceP;
- mfxU16 NumSliceB;
-
- mfxU16 WinBRCMaxAvgKbps;
- mfxU16 WinBRCSize;
-
- mfxU16 QVBRQuality;
- mfxU16 EnableMBQP;
- mfxU16 IntRefCycleDist;
- mfxU16 DirectBiasAdjustment; /* tri-state option */
- mfxU16 GlobalMotionBiasAdjustment; /* tri-state option */
- mfxU16 MVCostScalingFactor;
- mfxU16 MBDisableSkipMap; /* tri-state option */
-
- mfxU16 WeightedPred;
- mfxU16 WeightedBiPred;
-
- mfxU16 AspectRatioInfoPresent; /* tri-state option */
- mfxU16 OverscanInfoPresent; /* tri-state option */
- mfxU16 OverscanAppropriate; /* tri-state option */
- mfxU16 TimingInfoPresent; /* tri-state option */
- mfxU16 BitstreamRestriction; /* tri-state option */
- mfxU16 LowDelayHrd; /* tri-state option */
- mfxU16 MotionVectorsOverPicBoundaries; /* tri-state option */
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxU16 Log2MaxMvLengthHorizontal; /* 0..16 */
- mfxU16 Log2MaxMvLengthVertical; /* 0..16 */
-#else
- mfxU16 reserved12;
-#endif
-
- mfxU16 ScenarioInfo;
- mfxU16 ContentInfo;
-
- mfxU16 PRefType;
- mfxU16 FadeDetection; /* tri-state option */
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxI16 DeblockingAlphaTcOffset; /* -12..12 (slice_alpha_c0_offset_div2 << 1) */
- mfxI16 DeblockingBetaOffset; /* -12..12 (slice_beta_offset_div2 << 1) */
-#else
- mfxU16 reserved22;
-#endif
- mfxU16 GPB; /* tri-state option */
-
- mfxU32 MaxFrameSizeI;
- mfxU32 MaxFrameSizeP;
- mfxU32 reserved33;
-
- mfxU16 EnableQPOffset; /* tri-state option */
- mfxI16 QPOffset8; /* FrameQP = QPX + QPOffsetpyramid_layer; QPX = QPB for B-pyramid, QPP for P-pyramid */
-
- mfxU16 NumRefActiveP8;
- mfxU16 NumRefActiveBL08;
- mfxU16 NumRefActiveBL18;
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxU16 ConstrainedIntraPredFlag; /* tri-state option */
-#else
- mfxU16 reserved6;
-#endif
-#if (MFX_VERSION >= 1026)
- mfxU16 TransformSkip; /* tri-state option; HEVC transform_skip_enabled_flag */
-#else
- mfxU16 reserved7;
-#endif
-#if (MFX_VERSION >= 1027)
- mfxU16 TargetChromaFormatPlus1; /* Minus 1 specifies target encoding chroma format (see ColorFormat enum). May differ from input one. */
- mfxU16 TargetBitDepthLuma; /* Target encoding bit depth for luma samples. May differ from input one. */
- mfxU16 TargetBitDepthChroma; /* Target encoding bit depth for chroma samples. May differ from input one. */
-#else
- mfxU16 reserved43;
-#endif
- mfxU16 BRCPanicMode; /* tri-state option */
-
- mfxU16 LowDelayBRC; /* tri-state option */
- mfxU16 EnableMBForceIntra; /* tri-state option */
- mfxU16 AdaptiveMaxFrameSize; /* tri-state option */
-
- mfxU16 RepartitionCheckEnable; /* tri-state option */
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxU16 QuantScaleType; /* For MPEG2 specifies mapping between quantiser_scale_code and quantiser_scale (see QuantScaleType enum) */
- mfxU16 IntraVLCFormat; /* For MPEG2 specifies which table shall be used for coding of DCT coefficients of intra macroblocks (see IntraVLCFormat enum) */
- mfxU16 ScanType; /* For MPEG2 specifies transform coefficients scan pattern (see ScanType enum) */
-#else
- mfxU16 reserved53;
-#endif
-#if (MFX_VERSION >= 1025)
- mfxU16 EncodedUnitsInfo; /* tri-state option */
- mfxU16 EnableNalUnitType; /* tri-state option */
-#else
- mfxU16 reserved82;
-#endif
-#if (MFX_VERSION >= 1026)
- mfxU16 ExtBrcAdaptiveLTR; /* tri-state option for ExtBRC */
-#else
- mfxU16 reserved9;
-#endif
- mfxU16 reserved163;
-} mfxExtCodingOption3;
-MFX_PACK_END()
-
-/* IntraPredBlockSize/InterPredBlockSize */
-enum {
- MFX_BLOCKSIZE_UNKNOWN = 0,
- MFX_BLOCKSIZE_MIN_16X16 = 1, /* 16x16 */
- MFX_BLOCKSIZE_MIN_8X8 = 2, /* 16x16, 8x8 */
- MFX_BLOCKSIZE_MIN_4X4 = 3 /* 16x16, 8x8, 4x4 */
-};
-
-/* MVPrecision */
-enum {
- MFX_MVPRECISION_UNKNOWN = 0,
- MFX_MVPRECISION_INTEGER = (1 << 0),
- MFX_MVPRECISION_HALFPEL = (1 << 1),
- MFX_MVPRECISION_QUARTERPEL = (1 << 2)
-};
-
-enum {
- MFX_CODINGOPTION_UNKNOWN =0,
- MFX_CODINGOPTION_ON =0x10,
- MFX_CODINGOPTION_OFF =0x20,
- MFX_CODINGOPTION_ADAPTIVE =0x30
-};
-
-/* Data Flag for mfxBitstream*/
-enum {
- MFX_BITSTREAM_COMPLETE_FRAME = 0x0001, /* the bitstream contains a complete frame or field pair of data */
- MFX_BITSTREAM_EOS = 0x0002
-};
-/* Extended Buffer Ids */
-enum {
- MFX_EXTBUFF_CODING_OPTION = MFX_MAKEFOURCC('C','D','O','P'),
- MFX_EXTBUFF_CODING_OPTION_SPSPPS = MFX_MAKEFOURCC('C','O','S','P'),
- MFX_EXTBUFF_VPP_DONOTUSE = MFX_MAKEFOURCC('N','U','S','E'),
- MFX_EXTBUFF_VPP_AUXDATA = MFX_MAKEFOURCC('A','U','X','D'),
- MFX_EXTBUFF_VPP_DENOISE = MFX_MAKEFOURCC('D','N','I','S'),
- MFX_EXTBUFF_VPP_SCENE_ANALYSIS = MFX_MAKEFOURCC('S','C','L','Y'),
- MFX_EXTBUFF_VPP_SCENE_CHANGE = MFX_EXTBUFF_VPP_SCENE_ANALYSIS,
- MFX_EXTBUFF_VPP_PROCAMP = MFX_MAKEFOURCC('P','A','M','P'),
- MFX_EXTBUFF_VPP_DETAIL = MFX_MAKEFOURCC('D','E','T',' '),
- MFX_EXTBUFF_VIDEO_SIGNAL_INFO = MFX_MAKEFOURCC('V','S','I','N'),
- MFX_EXTBUFF_VPP_DOUSE = MFX_MAKEFOURCC('D','U','S','E'),
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION) = MFX_MAKEFOURCC('O','P','Q','S'),
- MFX_EXTBUFF_AVC_REFLIST_CTRL = MFX_MAKEFOURCC('R','L','S','T'),
- MFX_EXTBUFF_VPP_FRAME_RATE_CONVERSION = MFX_MAKEFOURCC('F','R','C',' '),
- MFX_EXTBUFF_PICTURE_TIMING_SEI = MFX_MAKEFOURCC('P','T','S','E'),
- MFX_EXTBUFF_AVC_TEMPORAL_LAYERS = MFX_MAKEFOURCC('A','T','M','L'),
- MFX_EXTBUFF_CODING_OPTION2 = MFX_MAKEFOURCC('C','D','O','2'),
- MFX_EXTBUFF_VPP_IMAGE_STABILIZATION = MFX_MAKEFOURCC('I','S','T','B'),
- MFX_EXTBUFF_VPP_PICSTRUCT_DETECTION = MFX_MAKEFOURCC('I','D','E','T'),
- MFX_EXTBUFF_ENCODER_CAPABILITY = MFX_MAKEFOURCC('E','N','C','P'),
- MFX_EXTBUFF_ENCODER_RESET_OPTION = MFX_MAKEFOURCC('E','N','R','O'),
- MFX_EXTBUFF_ENCODED_FRAME_INFO = MFX_MAKEFOURCC('E','N','F','I'),
- MFX_EXTBUFF_VPP_COMPOSITE = MFX_MAKEFOURCC('V','C','M','P'),
- MFX_EXTBUFF_VPP_VIDEO_SIGNAL_INFO = MFX_MAKEFOURCC('V','V','S','I'),
- MFX_EXTBUFF_ENCODER_ROI = MFX_MAKEFOURCC('E','R','O','I'),
- MFX_EXTBUFF_VPP_DEINTERLACING = MFX_MAKEFOURCC('V','P','D','I'),
- MFX_EXTBUFF_AVC_REFLISTS = MFX_MAKEFOURCC('R','L','T','S'),
- MFX_EXTBUFF_DEC_VIDEO_PROCESSING = MFX_MAKEFOURCC('D','E','C','V'),
- MFX_EXTBUFF_VPP_FIELD_PROCESSING = MFX_MAKEFOURCC('F','P','R','O'),
- MFX_EXTBUFF_CODING_OPTION3 = MFX_MAKEFOURCC('C','D','O','3'),
- MFX_EXTBUFF_CHROMA_LOC_INFO = MFX_MAKEFOURCC('C','L','I','N'),
- MFX_EXTBUFF_MBQP = MFX_MAKEFOURCC('M','B','Q','P'),
- MFX_EXTBUFF_MB_FORCE_INTRA = MFX_MAKEFOURCC('M','B','F','I'),
- MFX_EXTBUFF_HEVC_TILES = MFX_MAKEFOURCC('2','6','5','T'),
- MFX_EXTBUFF_MB_DISABLE_SKIP_MAP = MFX_MAKEFOURCC('M','D','S','M'),
- MFX_EXTBUFF_HEVC_PARAM = MFX_MAKEFOURCC('2','6','5','P'),
- MFX_EXTBUFF_DECODED_FRAME_INFO = MFX_MAKEFOURCC('D','E','F','I'),
- MFX_EXTBUFF_TIME_CODE = MFX_MAKEFOURCC('T','M','C','D'),
- MFX_EXTBUFF_HEVC_REGION = MFX_MAKEFOURCC('2','6','5','R'),
- MFX_EXTBUFF_PRED_WEIGHT_TABLE = MFX_MAKEFOURCC('E','P','W','T'),
- MFX_EXTBUFF_DIRTY_RECTANGLES = MFX_MAKEFOURCC('D','R','O','I'),
- MFX_EXTBUFF_MOVING_RECTANGLES = MFX_MAKEFOURCC('M','R','O','I'),
- MFX_EXTBUFF_CODING_OPTION_VPS = MFX_MAKEFOURCC('C','O','V','P'),
- MFX_EXTBUFF_VPP_ROTATION = MFX_MAKEFOURCC('R','O','T',' '),
- MFX_EXTBUFF_ENCODED_SLICES_INFO = MFX_MAKEFOURCC('E','N','S','I'),
- MFX_EXTBUFF_VPP_SCALING = MFX_MAKEFOURCC('V','S','C','L'),
- MFX_EXTBUFF_HEVC_REFLIST_CTRL = MFX_EXTBUFF_AVC_REFLIST_CTRL,
- MFX_EXTBUFF_HEVC_REFLISTS = MFX_EXTBUFF_AVC_REFLISTS,
- MFX_EXTBUFF_HEVC_TEMPORAL_LAYERS = MFX_EXTBUFF_AVC_TEMPORAL_LAYERS,
- MFX_EXTBUFF_VPP_MIRRORING = MFX_MAKEFOURCC('M','I','R','R'),
- MFX_EXTBUFF_MV_OVER_PIC_BOUNDARIES = MFX_MAKEFOURCC('M','V','P','B'),
- MFX_EXTBUFF_VPP_COLORFILL = MFX_MAKEFOURCC('V','C','L','F'),
-#if (MFX_VERSION >= 1025)
- MFX_EXTBUFF_DECODE_ERROR_REPORT = MFX_MAKEFOURCC('D', 'E', 'R', 'R'),
- MFX_EXTBUFF_VPP_COLOR_CONVERSION = MFX_MAKEFOURCC('V', 'C', 'S', 'C'),
- MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO = MFX_MAKEFOURCC('L', 'L', 'I', 'S'),
- MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME = MFX_MAKEFOURCC('D', 'C', 'V', 'S'),
- MFX_EXTBUFF_MULTI_FRAME_PARAM = MFX_MAKEFOURCC('M', 'F', 'R', 'P'),
- MFX_EXTBUFF_MULTI_FRAME_CONTROL = MFX_MAKEFOURCC('M', 'F', 'R', 'C'),
- MFX_EXTBUFF_ENCODED_UNITS_INFO = MFX_MAKEFOURCC('E', 'N', 'U', 'I'),
-#endif
-#if (MFX_VERSION >= 1026)
- MFX_EXTBUFF_VPP_MCTF = MFX_MAKEFOURCC('M', 'C', 'T', 'F'),
- MFX_EXTBUFF_VP9_SEGMENTATION = MFX_MAKEFOURCC('9', 'S', 'E', 'G'),
- MFX_EXTBUFF_VP9_TEMPORAL_LAYERS = MFX_MAKEFOURCC('9', 'T', 'M', 'L'),
- MFX_EXTBUFF_VP9_PARAM = MFX_MAKEFOURCC('9', 'P', 'A', 'R'),
-#endif
-#if (MFX_VERSION >= 1027)
- MFX_EXTBUFF_AVC_ROUNDING_OFFSET = MFX_MAKEFOURCC('R','N','D','O'),
-#endif
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- MFX_EXTBUFF_DPB = MFX_MAKEFOURCC('E','D','P','B'),
- MFX_EXTBUFF_TEMPORAL_LAYERS = MFX_MAKEFOURCC('T','M','P','L'),
- MFX_EXTBUFF_AVC_SCALING_MATRIX = MFX_MAKEFOURCC('A','V','S','M'),
- MFX_EXTBUFF_MPEG2_QUANT_MATRIX = MFX_MAKEFOURCC('M','2','Q','M'),
- MFX_EXTBUFF_TASK_DEPENDENCY = MFX_MAKEFOURCC('S','Y','N','C'),
-#endif
-#if (MFX_VERSION >= 1031)
- MFX_EXTBUFF_PARTIAL_BITSTREAM_PARAM = MFX_MAKEFOURCC('P','B','O','P'),
-#endif
- MFX_EXTBUFF_ENCODER_IPCM_AREA = MFX_MAKEFOURCC('P', 'C', 'M', 'R'),
- MFX_EXTBUFF_INSERT_HEADERS = MFX_MAKEFOURCC('S', 'P', 'R', 'E'),
-#if (MFX_VERSION >= 1034)
- MFX_EXTBUFF_AV1_FILM_GRAIN_PARAM = MFX_MAKEFOURCC('A','1','F','G'),
- MFX_EXTBUFF_AV1_LST_PARAM = MFX_MAKEFOURCC('A', '1', 'L', 'S'),
- MFX_EXTBUFF_AV1_SEGMENTATION = MFX_MAKEFOURCC('1', 'S', 'E', 'G'),
- MFX_EXTBUFF_AV1_PARAM = MFX_MAKEFOURCC('1', 'P', 'A', 'R'),
- MFX_EXTBUFF_AV1_AUXDATA = MFX_MAKEFOURCC('1', 'A', 'U', 'X'),
- MFX_EXTBUFF_AV1_TEMPORAL_LAYERS = MFX_MAKEFOURCC('1', 'T', 'M', 'L')
-#endif
-};
-
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION);
-
-/* VPP Conf: Do not use certain algorithms */
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxExtBuffer Header;
- mfxU32 NumAlg;
- mfxU32* AlgList;
-} mfxExtVPPDoNotUse;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 DenoiseFactor;
-} mfxExtVPPDenoise;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 DetailFactor;
-} mfxExtVPPDetail;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
- mfxF64 Brightness;
- mfxF64 Contrast;
- mfxF64 Hue;
- mfxF64 Saturation;
-} mfxExtVPPProcAmp;
-MFX_PACK_END()
-
-/* statistics collected for decode, encode and vpp */
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxU32 reserved16;
- mfxU32 NumFrame;
- mfxU64 NumBit;
- mfxU32 NumCachedFrame;
-} mfxEncodeStat;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU32 reserved16;
- mfxU32 NumFrame;
- mfxU32 NumSkippedFrame;
- mfxU32 NumError;
- mfxU32 NumCachedFrame;
-} mfxDecodeStat;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU32 reserved16;
- mfxU32 NumFrame;
- mfxU32 NumCachedFrame;
-} mfxVPPStat;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- union{
- struct{
- mfxU32 SpatialComplexity;
- mfxU32 TemporalComplexity;
- };
- struct{
- mfxU16 PicStruct;
- mfxU16 reserved3;
- };
- };
- mfxU16 SceneChangeRate;
- mfxU16 RepeatedFrame;
-} mfxExtVppAuxData;
-MFX_PACK_END()
-
-/* CtrlFlags */
-enum {
- MFX_PAYLOAD_CTRL_SUFFIX = 0x00000001 /* HEVC suffix SEI */
-};
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxU32 CtrlFlags;
- mfxU32 reserved3;
- mfxU8 *Data; /* buffer pointer */
- mfxU32 NumBit; /* number of bits */
- mfxU16 Type; /* SEI message type in H.264 or user data start_code in MPEG-2 */
- mfxU16 BufSize; /* payload buffer size in bytes */
-} mfxPayload;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxExtBuffer Header;
-#if (MFX_VERSION >= 1025)
- mfxU32 reserved4;
- mfxU16 reserved1;
- mfxU16 MfxNalUnitType;
-#else
- mfxU32 reserved5;
-#endif
- mfxU16 SkipFrame;
-
- mfxU16 QP; /* per frame QP */
-
- mfxU16 FrameType;
- mfxU16 NumExtParam;
- mfxU16 NumPayload; /* MPEG-2 user data or H.264 SEI message(s) */
- mfxU16 reserved2;
-
- mfxExtBuffer **ExtParam;
- mfxPayload **Payload; /* for field pair, first field uses even payloads and second field uses odd payloads */
-} mfxEncodeCtrl;
-MFX_PACK_END()
-
-/* Buffer Memory Types */
-enum {
- /* Buffer types */
- MFX_MEMTYPE_PERSISTENT_MEMORY =0x0002
-};
-
-/* Frame Memory Types */
-#define MFX_MEMTYPE_BASE(x) (0x90ff & (x))
-
-enum {
- MFX_MEMTYPE_DXVA2_DECODER_TARGET =0x0010,
- MFX_MEMTYPE_DXVA2_PROCESSOR_TARGET =0x0020,
- MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET = MFX_MEMTYPE_DXVA2_DECODER_TARGET,
- MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET = MFX_MEMTYPE_DXVA2_PROCESSOR_TARGET,
- MFX_MEMTYPE_SYSTEM_MEMORY =0x0040,
- MFX_MEMTYPE_RESERVED1 =0x0080,
-
- MFX_MEMTYPE_FROM_ENCODE = 0x0100,
- MFX_MEMTYPE_FROM_DECODE = 0x0200,
- MFX_MEMTYPE_FROM_VPPIN = 0x0400,
- MFX_MEMTYPE_FROM_VPPOUT = 0x0800,
- MFX_MEMTYPE_FROM_ENC = 0x2000,
- MFX_MEMTYPE_FROM_PAK = 0x4000, //reserved
-
- MFX_MEMTYPE_INTERNAL_FRAME = 0x0001,
- MFX_MEMTYPE_EXTERNAL_FRAME = 0x0002,
- MFX_DEPRECATED_ENUM_FIELD_INSIDE(MFX_MEMTYPE_OPAQUE_FRAME) = 0x0004,
- MFX_MEMTYPE_EXPORT_FRAME = 0x0008,
- MFX_MEMTYPE_SHARED_RESOURCE = MFX_MEMTYPE_EXPORT_FRAME,
-#if (MFX_VERSION >= 1025)
- MFX_MEMTYPE_VIDEO_MEMORY_ENCODER_TARGET = 0x1000
-#else
- MFX_MEMTYPE_RESERVED2 = 0x1000
-#endif
-};
-
-MFX_DEPRECATED_ENUM_FIELD_OUTSIDE(MFX_MEMTYPE_OPAQUE_FRAME);
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- union {
- mfxU32 AllocId;
- mfxU32 reserved1;
- };
- mfxU32 reserved33;
- mfxFrameInfo Info;
- mfxU16 Type; /* decoder or processor render targets */
- mfxU16 NumFrameMin;
- mfxU16 NumFrameSuggested;
- mfxU16 reserved2;
-} mfxFrameAllocRequest;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxU32 AllocId;
- mfxU32 reserved3;
- mfxMemId *mids; /* the array allocated by application */
- mfxU16 NumFrameActual;
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxU16 MemType;
-#else
- mfxU16 reserved2;
-#endif
-} mfxFrameAllocResponse;
-MFX_PACK_END()
-
-/* FrameType */
-enum {
- MFX_FRAMETYPE_UNKNOWN =0x0000,
-
- MFX_FRAMETYPE_I =0x0001,
- MFX_FRAMETYPE_P =0x0002,
- MFX_FRAMETYPE_B =0x0004,
- MFX_FRAMETYPE_S =0x0008,
-
- MFX_FRAMETYPE_REF =0x0040,
- MFX_FRAMETYPE_IDR =0x0080,
-
- MFX_FRAMETYPE_xI =0x0100,
- MFX_FRAMETYPE_xP =0x0200,
- MFX_FRAMETYPE_xB =0x0400,
- MFX_FRAMETYPE_xS =0x0800,
-
- MFX_FRAMETYPE_xREF =0x4000,
- MFX_FRAMETYPE_xIDR =0x8000
-};
-
-#if (MFX_VERSION >= 1025)
-enum {
- MFX_HEVC_NALU_TYPE_UNKNOWN = 0,
- MFX_HEVC_NALU_TYPE_TRAIL_N = ( 0+1),
- MFX_HEVC_NALU_TYPE_TRAIL_R = ( 1+1),
- MFX_HEVC_NALU_TYPE_RADL_N = ( 6+1),
- MFX_HEVC_NALU_TYPE_RADL_R = ( 7+1),
- MFX_HEVC_NALU_TYPE_RASL_N = ( 8+1),
- MFX_HEVC_NALU_TYPE_RASL_R = ( 9+1),
- MFX_HEVC_NALU_TYPE_IDR_W_RADL = (19+1),
- MFX_HEVC_NALU_TYPE_IDR_N_LP = (20+1),
- MFX_HEVC_NALU_TYPE_CRA_NUT = (21+1)
-};
-#endif
-
-typedef enum {
- MFX_HANDLE_DIRECT3D_DEVICE_MANAGER9 =1, /* IDirect3DDeviceManager9 */
- MFX_HANDLE_D3D9_DEVICE_MANAGER = MFX_HANDLE_DIRECT3D_DEVICE_MANAGER9,
- MFX_HANDLE_RESERVED1 = 2,
- MFX_HANDLE_D3D11_DEVICE = 3,
- MFX_HANDLE_VA_DISPLAY = 4,
- MFX_HANDLE_RESERVED3 = 5,
-#if (MFX_VERSION >= 1030)
- MFX_HANDLE_VA_CONFIG_ID = 6,
- MFX_HANDLE_VA_CONTEXT_ID = 7,
-#endif
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- MFX_HANDLE_CM_DEVICE = 8
-#endif
-} mfxHandleType;
-
-typedef enum {
- MFX_SKIPMODE_NOSKIP=0,
- MFX_SKIPMODE_MORE=1,
- MFX_SKIPMODE_LESS=2
-} mfxSkipMode;
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxExtBuffer Header;
- mfxU8 *SPSBuffer;
- mfxU8 *PPSBuffer;
- mfxU16 SPSBufSize;
- mfxU16 PPSBufSize;
- mfxU16 SPSId;
- mfxU16 PPSId;
-} mfxExtCodingOptionSPSPPS;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
-
- union {
- mfxU8 *VPSBuffer;
- mfxU64 reserved1;
- };
- mfxU16 VPSBufSize;
- mfxU16 VPSId;
-
- mfxU16 reserved6;
-} mfxExtCodingOptionVPS;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 VideoFormat;
- mfxU16 VideoFullRange;
- mfxU16 ColourDescriptionPresent;
- mfxU16 ColourPrimaries;
- mfxU16 TransferCharacteristics;
- mfxU16 MatrixCoefficients;
-} mfxExtVideoSignalInfo;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxExtBuffer Header;
- mfxU32 NumAlg;
- mfxU32 *AlgList;
-} mfxExtVPPDoUse;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-MFX_DEPRECATED typedef struct {
- mfxExtBuffer Header;
- mfxU32 reserved12;
- struct {
- mfxFrameSurface1 **Surfaces;
- mfxU32 reserved25;
- mfxU16 Type;
- mfxU16 NumSurface;
- } In, Out;
-} mfxExtOpaqueSurfaceAlloc;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 NumRefIdxL0Active;
- mfxU16 NumRefIdxL1Active;
-
- struct {
- mfxU32 FrameOrder;
- mfxU16 PicStruct;
- mfxU16 ViewId;
- mfxU16 LongTermIdx;
- mfxU16 reserved3;
- } PreferredRefList32, RejectedRefList16, LongTermRefList16;
-
- mfxU16 ApplyLongTermIdx;
- mfxU16 reserved15;
-} mfxExtAVCRefListCtrl;
-MFX_PACK_END()
-
-enum {
- MFX_FRCALGM_PRESERVE_TIMESTAMP = 0x0001,
- MFX_FRCALGM_DISTRIBUTED_TIMESTAMP = 0x0002,
- MFX_FRCALGM_FRAME_INTERPOLATION = 0x0004
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 Algorithm;
- mfxU16 reserved;
- mfxU32 reserved215;
-} mfxExtVPPFrameRateConversion;
-MFX_PACK_END()
-
-enum {
- MFX_IMAGESTAB_MODE_UPSCALE = 0x0001,
- MFX_IMAGESTAB_MODE_BOXING = 0x0002
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 Mode;
- mfxU16 reserved11;
-} mfxExtVPPImageStab;
-MFX_PACK_END()
-
-#if (MFX_VERSION >= 1025)
-
-enum {
- MFX_PAYLOAD_OFF = 0,
- MFX_PAYLOAD_IDR = 1
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 reserved15;
-
- mfxU16 InsertPayloadToggle;
- mfxU16 DisplayPrimariesX3;
- mfxU16 DisplayPrimariesY3;
- mfxU16 WhitePointX;
- mfxU16 WhitePointY;
- mfxU32 MaxDisplayMasteringLuminance;
- mfxU32 MinDisplayMasteringLuminance;
-} mfxExtMasteringDisplayColourVolume;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 reserved9;
-
- mfxU16 InsertPayloadToggle;
- mfxU16 MaxContentLightLevel;
- mfxU16 MaxPicAverageLightLevel;
-} mfxExtContentLightLevelInfo;
-MFX_PACK_END()
-#endif
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU32 reserved14;
-
- struct {
- mfxU16 ClockTimestampFlag;
- mfxU16 CtType;
- mfxU16 NuitFieldBasedFlag;
- mfxU16 CountingType;
- mfxU16 FullTimestampFlag;
- mfxU16 DiscontinuityFlag;
- mfxU16 CntDroppedFlag;
- mfxU16 NFrames;
- mfxU16 SecondsFlag;
- mfxU16 MinutesFlag;
- mfxU16 HoursFlag;
- mfxU16 SecondsValue;
- mfxU16 MinutesValue;
- mfxU16 HoursValue;
- mfxU32 TimeOffset;
- } TimeStamp3;
-} mfxExtPictureTimingSEI;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU32 reserved14;
- mfxU16 reserved2;
- mfxU16 BaseLayerPID;
-
- struct {
- mfxU16 Scale;
- mfxU16 reserved3;
- }Layer8;
-} mfxExtAvcTemporalLayers;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 MBPerSec;
- mfxU16 reserved58;
-} mfxExtEncoderCapability;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 StartNewSequence;
- mfxU16 reserved11;
-} mfxExtEncoderResetOption;
-MFX_PACK_END()
-
-/*LongTermIdx*/
-enum {
- MFX_LONGTERM_IDX_NO_IDX = 0xFFFF
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 FrameOrder;
- mfxU16 PicStruct;
- mfxU16 LongTermIdx;
- mfxU32 MAD;
- mfxU16 BRCPanicMode;
- mfxU16 QP;
- mfxU32 SecondFieldOffset;
- mfxU16 reserved2;
-
- struct {
- mfxU32 FrameOrder;
- mfxU16 PicStruct;
- mfxU16 LongTermIdx;
- mfxU16 reserved4;
- } UsedRefListL032, UsedRefListL132;
-} mfxExtAVCEncodedFrameInfo;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct mfxVPPCompInputStream {
- mfxU32 DstX;
- mfxU32 DstY;
- mfxU32 DstW;
- mfxU32 DstH;
-
- mfxU16 LumaKeyEnable;
- mfxU16 LumaKeyMin;
- mfxU16 LumaKeyMax;
-
- mfxU16 GlobalAlphaEnable;
- mfxU16 GlobalAlpha;
- mfxU16 PixelAlphaEnable;
-
- mfxU16 TileId;
-
- mfxU16 reserved217;
-} mfxVPPCompInputStream;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
- mfxExtBuffer Header;
-
- /* background color*/
- union {
- mfxU16 Y;
- mfxU16 R;
- };
- union {
- mfxU16 U;
- mfxU16 G;
- };
- union {
- mfxU16 V;
- mfxU16 B;
- };
- mfxU16 NumTiles;
- mfxU16 reserved123;
-
- mfxU16 NumInputStream;
- mfxVPPCompInputStream *InputStream;
-} mfxExtVPPComposite;
-MFX_PACK_END()
-
-/* TransferMatrix */
-enum {
- MFX_TRANSFERMATRIX_UNKNOWN = 0,
- MFX_TRANSFERMATRIX_BT709 = 1,
- MFX_TRANSFERMATRIX_BT601 = 2
-};
-
-/* NominalRange */
-enum {
- MFX_NOMINALRANGE_UNKNOWN = 0,
- MFX_NOMINALRANGE_0_255 = 1,
- MFX_NOMINALRANGE_16_235 = 2
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 reserved14;
-
- union {
- struct { // Init
- struct {
- mfxU16 TransferMatrix;
- mfxU16 NominalRange;
- mfxU16 reserved26;
- } In, Out;
- };
- struct { // Runtime
- mfxU16 TransferMatrix;
- mfxU16 NominalRange;
- mfxU16 reserved314;
- };
- };
-} mfxExtVPPVideoSignalInfo;
-MFX_PACK_END()
-
-/* ROI encoding mode */
-enum {
- MFX_ROI_MODE_PRIORITY = 0,
- MFX_ROI_MODE_QP_DELTA = 1,
- MFX_ROI_MODE_QP_VALUE = 2 
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 NumROI;
- mfxU16 ROIMode;
- mfxU16 reserved110;
-
- struct {
- mfxU32 Left;
- mfxU32 Top;
- mfxU32 Right;
- mfxU32 Bottom;
- union {
- mfxI16 Priority;
- mfxI16 DeltaQP;
- };
- mfxU16 reserved27;
- } ROI256;
-} mfxExtEncoderROI;
-MFX_PACK_END()
-
-/*Deinterlacing Mode*/
-enum {
- MFX_DEINTERLACING_BOB = 1,
- MFX_DEINTERLACING_ADVANCED = 2,
- MFX_DEINTERLACING_AUTO_DOUBLE = 3,
- MFX_DEINTERLACING_AUTO_SINGLE = 4,
- MFX_DEINTERLACING_FULL_FR_OUT = 5,
- MFX_DEINTERLACING_HALF_FR_OUT = 6,
- MFX_DEINTERLACING_24FPS_OUT = 7,
- MFX_DEINTERLACING_FIXED_TELECINE_PATTERN = 8,
- MFX_DEINTERLACING_30FPS_OUT = 9,
- MFX_DEINTERLACING_DETECT_INTERLACE = 10,
- MFX_DEINTERLACING_ADVANCED_NOREF = 11,
- MFX_DEINTERLACING_ADVANCED_SCD = 12,
- MFX_DEINTERLACING_FIELD_WEAVING = 13
-};
-
-/*TelecinePattern*/
-enum {
- MFX_TELECINE_PATTERN_32 = 0,
- MFX_TELECINE_PATTERN_2332 = 1,
- MFX_TELECINE_PATTERN_FRAME_REPEAT = 2,
- MFX_TELECINE_PATTERN_41 = 3,
- MFX_TELECINE_POSITION_PROVIDED = 4
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 Mode;
- mfxU16 TelecinePattern;
- mfxU16 TelecineLocation;
- mfxU16 reserved9;
-} mfxExtVPPDeinterlacing;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 NumRefIdxL0Active;
- mfxU16 NumRefIdxL1Active;
- mfxU16 reserved2;
-
- struct mfxRefPic{
- mfxU32 FrameOrder;
- mfxU16 PicStruct;
- mfxU16 reserved5;
- } RefPicList032, RefPicList132;
-
-}mfxExtAVCRefLists;
-MFX_PACK_END()
-
-enum {
- MFX_VPP_COPY_FRAME =0x01,
- MFX_VPP_COPY_FIELD =0x02,
- MFX_VPP_SWAP_FIELDS =0x03
-};
-
-/*PicType*/
-enum {
- MFX_PICTYPE_UNKNOWN =0x00,
- MFX_PICTYPE_FRAME =0x01,
- MFX_PICTYPE_TOPFIELD =0x02,
- MFX_PICTYPE_BOTTOMFIELD =0x04
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 Mode;
- mfxU16 InField;
- mfxU16 OutField;
- mfxU16 reserved25;
-} mfxExtVPPFieldProcessing;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- struct mfxIn{
- mfxU16 CropX;
- mfxU16 CropY;
- mfxU16 CropW;
- mfxU16 CropH;
- mfxU16 reserved12;
- }In;
-
- struct mfxOut{
- mfxU32 FourCC;
- mfxU16 ChromaFormat;
- mfxU16 reserved1;
-
- mfxU16 Width;
- mfxU16 Height;
-
- mfxU16 CropX;
- mfxU16 CropY;
- mfxU16 CropW;
- mfxU16 CropH;
- mfxU16 reserved22;
- }Out;
-
- mfxU16 reserved13;
-} mfxExtDecVideoProcessing;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 ChromaLocInfoPresentFlag;
- mfxU16 ChromaSampleLocTypeTopField;
- mfxU16 ChromaSampleLocTypeBottomField;
- mfxU16 reserved9;
-} mfxExtChromaLocInfo;
-MFX_PACK_END()
-
-/* MBQPMode */
-enum {
- MFX_MBQP_MODE_QP_VALUE = 0, // supported in CQP mode only
- MFX_MBQP_MODE_QP_DELTA = 1,
- MFX_MBQP_MODE_QP_ADAPTIVE = 2
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct{
- union {
- mfxU8 QP;
- mfxI8 DeltaQP;
- };
- mfxU16 Mode;
-} mfxQPandMode;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 reserved10;
- mfxU16 Mode; // see MBQPMode enum
- mfxU16 BlockSize; // QP block size, valid for HEVC only during Init and Runtime
- mfxU32 NumQPAlloc; // Size of allocated by application QP or DeltaQP array
- union {
- mfxU8 *QP; // Block QP value. Valid when Mode = MFX_MBQP_MODE_QP_VALUE
- mfxI8 *DeltaQP; // For block i: QPi = BrcQPi + DeltaQPi. Valid when Mode = MFX_MBQP_MODE_QP_DELTA
-#if (MFX_VERSION >= 1034)
- mfxQPandMode *QPmode; // Block-granularity modes when MFX_MBQP_MODE_QP_ADAPTIVE is set
-#endif
- mfxU64 reserved2;
- };
-} mfxExtMBQP;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header; /* Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_INSERT_HEADERS. */
- mfxU16 SPS; /* tri-state option to insert SPS */
- mfxU16 PPS; /* tri-state option to insert PPS */
- mfxU16 reserved8;
-} mfxExtInsertHeaders;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR() 
-typedef struct {
- mfxExtBuffer Header; /* Extension buffer header. Header.BufferId must be equal to MFX_EXTBUFF_ENCODER_IPCM_AREA. */
- mfxU16 reserve110;
-
- mfxU16 NumArea; /* Number of Area's */
- struct area {
- mfxU32 Left; /* Left Area's coordinate. */
- mfxU32 Top; /* Top Area's coordinate. */
- mfxU32 Right; /* Right Area's coordinate. */
- mfxU32 Bottom; /* Bottom Area's coordinate. */
-
- mfxU16 reserved28;
- } * Areas; /* Array of areas. */
-} mfxExtEncoderIPCMArea;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 reserved11;
- mfxU32 MapSize;
- union {
- mfxU8 *Map;
- mfxU64 reserved2;
- };
-} mfxExtMBForceIntra;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 NumTileRows;
- mfxU16 NumTileColumns;
- mfxU16 reserved74;
-}mfxExtHEVCTiles;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 reserved11;
- mfxU32 MapSize;
- union {
- mfxU8 *Map;
- mfxU64 reserved2;
- };
-} mfxExtMBDisableSkipMap;
-MFX_PACK_END()
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 DPBSize;
- mfxU16 reserved11;
-
- struct {
- mfxU32 FrameOrder;
- mfxU16 PicType;
- mfxU16 LongTermIdx;
- mfxU16 reserved4;
- } DPB32;
-} mfxExtDPB;
-MFX_PACK_END()
-
-#endif
-
-/*GeneralConstraintFlags*/
-enum {
- /* REXT Profile constraint flags*/
- MFX_HEVC_CONSTR_REXT_MAX_12BIT = (1 << 0),
- MFX_HEVC_CONSTR_REXT_MAX_10BIT = (1 << 1),
- MFX_HEVC_CONSTR_REXT_MAX_8BIT = (1 << 2),
- MFX_HEVC_CONSTR_REXT_MAX_422CHROMA = (1 << 3),
- MFX_HEVC_CONSTR_REXT_MAX_420CHROMA = (1 << 4),
- MFX_HEVC_CONSTR_REXT_MAX_MONOCHROME = (1 << 5),
- MFX_HEVC_CONSTR_REXT_INTRA = (1 << 6),
- MFX_HEVC_CONSTR_REXT_ONE_PICTURE_ONLY = (1 << 7),
- MFX_HEVC_CONSTR_REXT_LOWER_BIT_RATE = (1 << 8)
-};
-
-#if (MFX_VERSION >= 1026)
-
-/* SampleAdaptiveOffset */
-enum {
- MFX_SAO_UNKNOWN = 0x00,
- MFX_SAO_DISABLE = 0x01,
- MFX_SAO_ENABLE_LUMA = 0x02,
- MFX_SAO_ENABLE_CHROMA = 0x04
-};
-
-#endif
-
-/* This struct has 4-byte alignment for binary compatibility with previously released versions of API */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 PicWidthInLumaSamples;
- mfxU16 PicHeightInLumaSamples;
- mfxU64 GeneralConstraintFlags;
-#if (MFX_VERSION >= 1026)
- mfxU16 SampleAdaptiveOffset; /* see enum SampleAdaptiveOffset, valid during Init and Runtime */
- mfxU16 LCUSize;
- mfxU16 reserved116;
-#else
- mfxU16 reserved118;
-#endif
-} mfxExtHEVCParam;
-MFX_PACK_END()
-
-#if (MFX_VERSION >= 1025)
-/*ErrorTypes in mfxExtDecodeErrorReport*/
-enum {
- MFX_ERROR_PPS = (1 << 0),
- MFX_ERROR_SPS = (1 << 1),
- MFX_ERROR_SLICEHEADER = (1 << 2),
- MFX_ERROR_SLICEDATA = (1 << 3),
- MFX_ERROR_FRAME_GAP = (1 << 4),
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 ErrorTypes;
- mfxU16 reserved10;
-} mfxExtDecodeErrorReport;
-MFX_PACK_END()
-
-#endif
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 FrameType;
- mfxU16 reserved59;
-} mfxExtDecodedFrameInfo;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 DropFrameFlag;
- mfxU16 TimeCodeHours;
- mfxU16 TimeCodeMinutes;
- mfxU16 TimeCodeSeconds;
- mfxU16 TimeCodePictures;
- mfxU16 reserved7;
-} mfxExtTimeCode;
-MFX_PACK_END()
-
-/*RegionType*/
-enum {
- MFX_HEVC_REGION_SLICE = 0
-};
-
-/*RegionEncoding*/
-enum {
- MFX_HEVC_REGION_ENCODING_ON = 0,
- MFX_HEVC_REGION_ENCODING_OFF = 1
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 RegionId;
- mfxU16 RegionType;
- mfxU16 RegionEncoding;
- mfxU16 reserved24;
-} mfxExtHEVCRegion;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 LumaLog2WeightDenom; // 0..7
- mfxU16 ChromaLog2WeightDenom; // 0..7
- mfxU16 LumaWeightFlag232; // list 0,1
- mfxU16 ChromaWeightFlag232; // list 0,1
- mfxI16 Weights23232; // listlist entryY, Cb, Crweight, offset
- mfxU16 reserved58;
-} mfxExtPredWeightTable;
-MFX_PACK_END()
-
-#if (MFX_VERSION >= 1027)
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 EnableRoundingIntra; // tri-state option
- mfxU16 RoundingOffsetIntra; // valid value 0,7
- mfxU16 EnableRoundingInter; // tri-state option
- mfxU16 RoundingOffsetInter; // valid value 0,7
-
- mfxU16 reserved24;
-} mfxExtAVCRoundingOffset;
-MFX_PACK_END()
-#endif
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 reserved12;
-
- struct {
- mfxU16 Scale;
- mfxU16 QPI;
- mfxU16 QPP;
- mfxU16 QPB;
- mfxU32 TargetKbps;
- mfxU32 MaxKbps;
- mfxU32 BufferSizeInKB;
- mfxU32 InitialDelayInKB;
- mfxU16 reserved120;
- } Layer8;
-} mfxExtTemporalLayers;
-MFX_PACK_END()
-
-#endif
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 NumRect;
- mfxU16 reserved111;
-
- struct {
- mfxU32 Left;
- mfxU32 Top;
- mfxU32 Right;
- mfxU32 Bottom;
-
- mfxU16 reserved28;
- } Rect256;
-} mfxExtDirtyRect;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 NumRect;
- mfxU16 reserved111;
-
- struct {
- mfxU32 DestLeft;
- mfxU32 DestTop;
- mfxU32 DestRight;
- mfxU32 DestBottom;
-
- mfxU32 SourceLeft;
- mfxU32 SourceTop;
- mfxU16 reserved24;
- } Rect256;
-} mfxExtMoveRect;
-MFX_PACK_END()
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
-
-/* ScalingMatrixType */
-enum {
- MFX_SCALING_MATRIX_SPS = 1,
- MFX_SCALING_MATRIX_PPS = 2
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 Type;
- mfxU16 reserved5;
-
- /* 4x4_Intra_Y, 4x4_Intra_Cb, 4x4_Intra_Cr,
- 4x4_Inter_Y, 4x4_Inter_Cb, 4x4_Inter_Cr,
- 8x8_Intra_Y, 8x8_Inter_Y, 8x8_Intra_Cb,
- 8x8_Inter_Cb, 8x8_Intra_Cr, 8x8_Inter_Cr */
- mfxU8 ScalingListPresent12;
-
- /* Intra_Y, Intra_Cb, Intra_Cr,
- Inter_Y, Inter_Cb, Inter_Cr */
- mfxU8 ScalingList4x4616;
-
- /* Intra_Y, Inter_Y, Intra_Cb,
- Inter_Cb, Intra_Cr, Inter_Cr */
- mfxU8 ScalingList8x8664;
-} mfxExtAVCScalingMatrix;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 reserved28;
-
- mfxU8 LoadMatrix4; // LumaIntra, LumaInter, ChromaIntra, ChromaInter
- mfxU8 Matrix464; // LumaIntra, LumaInter, ChromaIntra, ChromaInter
-} mfxExtMPEG2QuantMatrix;
-MFX_PACK_END()
-
-#endif
-
-/* Angle */
-enum {
- MFX_ANGLE_0 = 0,
- MFX_ANGLE_90 = 90,
- MFX_ANGLE_180 = 180,
- MFX_ANGLE_270 = 270
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 Angle;
- mfxU16 reserved11;
-} mfxExtVPPRotation;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 SliceSizeOverflow;
- mfxU16 NumSliceNonCopliant;
- mfxU16 NumEncodedSlice;
- mfxU16 NumSliceSizeAlloc;
- union {
- mfxU16 *SliceSize;
- mfxU64 reserved1;
- };
-
- mfxU16 reserved20;
-} mfxExtEncodedSlicesInfo;
-MFX_PACK_END()
-
-/* ScalingMode */
-enum {
- MFX_SCALING_MODE_DEFAULT = 0,
- MFX_SCALING_MODE_LOWPOWER = 1,
- MFX_SCALING_MODE_QUALITY = 2
-};
-
-#if (MFX_VERSION >= 1033)
-/* Interpolation Method */
-enum {
- MFX_INTERPOLATION_DEFAULT = 0,
- MFX_INTERPOLATION_NEAREST_NEIGHBOR = 1,
- MFX_INTERPOLATION_BILINEAR = 2,
- MFX_INTERPOLATION_ADVANCED = 3
-};
-#endif
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 ScalingMode;
-#if (MFX_VERSION >= 1033)
- mfxU16 InterpolationMethod;
- mfxU16 reserved10;
-#else
- mfxU16 reserved11;
-#endif
-} mfxExtVPPScaling;
-MFX_PACK_END()
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
-
-/* SceneChangeType */
-enum {
- MFX_SCENE_NO_CHANGE = 0,
- MFX_SCENE_START = 1,
- MFX_SCENE_END = 2
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 Type;
- mfxU16 reserved11;
-} mfxExtSceneChange;
-MFX_PACK_END()
-
-#endif
-
-typedef mfxExtAVCRefListCtrl mfxExtHEVCRefListCtrl;
-typedef mfxExtAVCRefLists mfxExtHEVCRefLists;
-typedef mfxExtAvcTemporalLayers mfxExtHEVCTemporalLayers;
-
-/* MirroringType */
-enum
-{
- MFX_MIRRORING_DISABLED = 0,
- MFX_MIRRORING_HORIZONTAL = 1,
- MFX_MIRRORING_VERTICAL = 2
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 Type;
- mfxU16 reserved11;
-} mfxExtVPPMirroring;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 StickTop; /* tri-state option */
- mfxU16 StickBottom; /* tri-state option */
- mfxU16 StickLeft; /* tri-state option */
- mfxU16 StickRight; /* tri-state option */
- mfxU16 reserved8;
-} mfxExtMVOverPicBoundaries;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 Enable; /* tri-state option */
- mfxU16 reserved11;
-} mfxExtVPPColorFill;
-MFX_PACK_END()
-
-#if (MFX_VERSION >= 1025)
-
-/* ChromaSiting */
-enum {
- MFX_CHROMA_SITING_UNKNOWN = 0x0000,
- MFX_CHROMA_SITING_VERTICAL_TOP = 0x0001, /* Chroma samples are co-sited vertically on the top with the luma samples. */
- MFX_CHROMA_SITING_VERTICAL_CENTER = 0x0002, /* Chroma samples are not co-sited vertically with the luma samples. */
- MFX_CHROMA_SITING_VERTICAL_BOTTOM = 0x0004, /* Chroma samples are co-sited vertically on the bottom with the luma samples. */
- MFX_CHROMA_SITING_HORIZONTAL_LEFT = 0x0010, /* Chroma samples are co-sited horizontally on the left with the luma samples. */
- MFX_CHROMA_SITING_HORIZONTAL_CENTER = 0x0020 /* Chroma samples are not co-sited horizontally with the luma samples. */
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 ChromaSiting;
- mfxU16 reserved27;
-} mfxExtColorConversion;
-MFX_PACK_END()
-
-#endif
-
-#if (MFX_VERSION >= 1026)
-/* VP9ReferenceFrame */
-enum {
- MFX_VP9_REF_INTRA = 0,
- MFX_VP9_REF_LAST = 1,
- MFX_VP9_REF_GOLDEN = 2,
- MFX_VP9_REF_ALTREF = 3
-};
-
-/* SegmentIdBlockSize */
-enum {
- MFX_VP9_SEGMENT_ID_BLOCK_SIZE_UNKNOWN = 0,
- MFX_VP9_SEGMENT_ID_BLOCK_SIZE_8x8 = 8,
- MFX_VP9_SEGMENT_ID_BLOCK_SIZE_16x16 = 16,
- MFX_VP9_SEGMENT_ID_BLOCK_SIZE_32x32 = 32,
- MFX_VP9_SEGMENT_ID_BLOCK_SIZE_64x64 = 64,
-};
-
-/* SegmentFeature */
-enum {
- MFX_VP9_SEGMENT_FEATURE_QINDEX = 0x0001,
- MFX_VP9_SEGMENT_FEATURE_LOOP_FILTER = 0x0002,
- MFX_VP9_SEGMENT_FEATURE_REFERENCE = 0x0004,
- MFX_VP9_SEGMENT_FEATURE_SKIP = 0x0008 /* (0,0) MV, no residual */
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU16 FeatureEnabled; /* see enum SegmentFeature */
- mfxI16 QIndexDelta;
- mfxI16 LoopFilterLevelDelta;
- mfxU16 ReferenceFrame; /* see enum VP9ReferenceFrame */
- mfxU16 reserved12;
-} mfxVP9SegmentParam;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 NumSegments; /* 0..8 */
- mfxVP9SegmentParam Segment8;
- mfxU16 SegmentIdBlockSize; /* see enum SegmentIdBlockSize */
- mfxU32 NumSegmentIdAlloc; /* >= (Ceil(Width / SegmentIdBlockSize) * Ceil(Height / SegmentIdBlockSize)) */
- union {
- mfxU8 *SegmentId; /*NumSegmentIdAlloc = 0..7, index in Segment array, blocks of SegmentIdBlockSize map */
- mfxU64 reserved1;
- };
- mfxU16 reserved52;
-} mfxExtVP9Segmentation;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU16 FrameRateScale; /* Layern.FrameRateScale = Layern - 1.FrameRateScale * (uint)m */
- mfxU16 TargetKbps; /* affected by BRCParamMultiplier, Layern.TargetKbps > Layern - 1.TargetKbps */
- mfxU16 reserved14;
-} mfxVP9TemporalLayer;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxVP9TemporalLayer Layer8;
- mfxU16 reserved60;
-} mfxExtVP9TemporalLayers;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 FrameWidth;
- mfxU16 FrameHeight;
-
- mfxU16 WriteIVFHeaders; /* tri-state option */
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxI16 LoopFilterRefDelta4;
- mfxI16 LoopFilterModeDelta2;
-#else // API 1.26
- mfxI16 reserved16;
-#endif
- mfxI16 QIndexDeltaLumaDC;
- mfxI16 QIndexDeltaChromaAC;
- mfxI16 QIndexDeltaChromaDC;
-#if (MFX_VERSION >= 1029)
- mfxU16 NumTileRows;
- mfxU16 NumTileColumns;
- mfxU16 reserved110;
-#else
- mfxU16 reserved112;
-#endif
-} mfxExtVP9Param;
-MFX_PACK_END()
-
-#endif // #if (MFX_VERSION >= 1026)
-
-#if (MFX_VERSION >= 1025)
-/* Multi-Frame Mode */
-enum {
- MFX_MF_DEFAULT = 0,
- MFX_MF_DISABLED = 1,
- MFX_MF_AUTO = 2,
- MFX_MF_MANUAL = 3
-};
-
-/* Multi-Frame Initialization parameters */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-MFX_DEPRECATED typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 MFMode;
- mfxU16 MaxNumFrames;
-
- mfxU16 reserved58;
-} mfxExtMultiFrameParam;
-MFX_PACK_END()
-
-/* Multi-Frame Run-time controls */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-MFX_DEPRECATED typedef struct {
- mfxExtBuffer Header;
-
- mfxU32 Timeout; /* timeout in millisecond */
- mfxU16 Flush; /* Flush internal frame buffer, e.g. submit all collected frames. */
-
- mfxU16 reserved57;
-} mfxExtMultiFrameControl;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU16 Type;
- mfxU16 reserved1;
- mfxU32 Offset;
- mfxU32 Size;
- mfxU32 reserved5;
-} mfxEncodedUnitInfo;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_L_TYPE()
-typedef struct {
- mfxExtBuffer Header;
-
- union {
- mfxEncodedUnitInfo *UnitInfo;
- mfxU64 reserved1;
- };
- mfxU16 NumUnitsAlloc;
- mfxU16 NumUnitsEncoded;
-
- mfxU16 reserved22;
-} mfxExtEncodedUnitsInfo;
-MFX_PACK_END()
-
-#endif
-
-#if (MFX_VERSION >= 1026)
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
-/* MCTFTemporalMode */
-enum {
- MFX_MCTF_TEMPORAL_MODE_UNKNOWN = 0,
- MFX_MCTF_TEMPORAL_MODE_SPATIAL = 1,
- MFX_MCTF_TEMPORAL_MODE_1REF = 2,
- MFX_MCTF_TEMPORAL_MODE_2REF = 3,
- MFX_MCTF_TEMPORAL_MODE_4REF = 4
-};
-#endif
-
-/* MCTF initialization & runtime */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU16 FilterStrength;
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxU16 Overlap; /* tri-state option */
- mfxU32 BitsPerPixelx100k;
- mfxU16 Deblocking; /* tri-state option */
- mfxU16 TemporalMode;
- mfxU16 MVPrecision;
- mfxU16 reserved21;
-#else
- mfxU16 reserved27;
-#endif
-} mfxExtVppMctf;
-MFX_PACK_END()
-
-#endif
-
-#if (MFX_VERSION >= 1031)
-/* Multi-adapters Querying structs */
-typedef enum
-{
- MFX_COMPONENT_ENCODE = 1,
- MFX_COMPONENT_DECODE = 2,
- MFX_COMPONENT_VPP = 3
-} mfxComponentType;
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct
-{
- mfxComponentType Type;
- mfxVideoParam Requirements;
-
- mfxU16 reserved4;
-} mfxComponentInfo;
-MFX_PACK_END()
-
-/* Adapter description */
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct
-{
- mfxPlatform Platform;
- mfxU32 Number;
-
- mfxU16 reserved14;
-} mfxAdapterInfo;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct
-{
- mfxAdapterInfo * Adapters;
- mfxU32 NumAlloc;
- mfxU32 NumActual;
-
- mfxU16 reserved4;
-} mfxAdaptersInfo;
-MFX_PACK_END()
-
-#endif
-
-#if (MFX_VERSION >= 1034)
-/* FilmGrainFlags */
-enum {
- MFX_FILM_GRAIN_APPLY = (1 << 0),
- MFX_FILM_GRAIN_UPDATE = (1 << 1),
- MFX_FILM_GRAIN_CHROMA_SCALING_FROM_LUMA = (1 << 2),
- MFX_FILM_GRAIN_OVERLAP = (1 << 3),
- MFX_FILM_GRAIN_CLIP_TO_RESTRICTED_RANGE = (1 << 4)
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxU8 Value;
- mfxU8 Scaling;
-} mfxAV1FilmGrainPoint;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
-
- mfxU16 FilmGrainFlags; /* FilmGrainFlags */
- mfxU16 GrainSeed; /* 0..65535 */
-
- mfxU8 RefIdx; /* 0..6 */
- mfxU8 NumYPoints; /* 0..14 */
- mfxU8 NumCbPoints; /* 0..10 */
- mfxU8 NumCrPoints; /* 0..10 */
-
- mfxAV1FilmGrainPoint PointY14;
- mfxAV1FilmGrainPoint PointCb10;
- mfxAV1FilmGrainPoint PointCr10;
-
- mfxU8 GrainScalingMinus8; /* 0..3 */
- mfxU8 ArCoeffLag; /* 0..3 */
-
- mfxU8 ArCoeffsYPlus12824; /* 0..255 */
- mfxU8 ArCoeffsCbPlus12825; /* 0..255 */
- mfxU8 ArCoeffsCrPlus12825; /* 0..255 */
-
- mfxU8 ArCoeffShiftMinus6; /* 0..3 */
- mfxU8 GrainScaleShift; /* 0..3 */
-
- mfxU8 CbMult; /* 0..255 */
- mfxU8 CbLumaMult; /* 0..255 */
- mfxU16 CbOffset; /* 0..511 */
-
- mfxU8 CrMult; /* 0..255 */
- mfxU8 CrLumaMult; /* 0..255 */
- mfxU16 CrOffset; /* 0..511 */
-
- mfxU16 reserved43;
-} mfxExtAV1FilmGrainParam;
-MFX_PACK_END()
-
-#endif
-
-#if (MFX_VERSION >= 1031)
-/* PartialBitstreamOutput */
-enum {
- MFX_PARTIAL_BITSTREAM_NONE = 0, /* Don't use partial output */
- MFX_PARTIAL_BITSTREAM_SLICE = 1, /* Partial bitstream output will be aligned to slice granularity */
- MFX_PARTIAL_BITSTREAM_BLOCK = 2, /* Partial bitstream output will be aligned to user-defined block size granularity */
- MFX_PARTIAL_BITSTREAM_ANY = 3 /* Partial bitstream output will be return any coded data avilable at the end of SyncOperation timeout */
-};
-
-MFX_PACK_BEGIN_USUAL_STRUCT()
-typedef struct {
- mfxExtBuffer Header;
- mfxU32 BlockSize; /* output block granulatiry for Granularity = MFX_PARTIAL_BITSTREAM_BLOCK */
- mfxU16 Granularity; /* granulatiry of the partial bitstream: slice/block/any */
- mfxU16 reserved8;
-} mfxExtPartialBitstreamParam;
-MFX_PACK_END()
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxvideo++.h Deleted

@@ -1,188 +0,0 @@
-// Copyright (c) 2017 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#ifndef __MFXVIDEOPLUSPLUS_H
-#define __MFXVIDEOPLUSPLUS_H
-
-#include "mfxvideo.h"
-#include "mfxenc.h"
-#include "mfxpak.h"
-
-class MFXVideoSession
-{
-public:
-    MFXVideoSession(void) { m_session = (mfxSession) 0; }
-    virtual ~MFXVideoSession(void) { Close(); }
-
-    virtual mfxStatus Init(mfxIMPL impl, mfxVersion *ver) { return MFXInit(impl, ver, &m_session); }
-    virtual mfxStatus InitEx(mfxInitParam par) { return MFXInitEx(par, &m_session); }
-    virtual mfxStatus Close(void)
-    {
-        mfxStatus mfxRes;
-        mfxRes = MFXClose(m_session); m_session = (mfxSession) 0;
-        return mfxRes;
-    }
-
-    virtual mfxStatus QueryIMPL(mfxIMPL *impl) { return MFXQueryIMPL(m_session, impl); }
-    virtual mfxStatus QueryVersion(mfxVersion *version) { return MFXQueryVersion(m_session, version); }
-
-    virtual mfxStatus JoinSession(mfxSession child_session) { return MFXJoinSession(m_session, child_session);}
-    virtual mfxStatus DisjoinSession( ) { return MFXDisjoinSession(m_session);}
-    virtual mfxStatus CloneSession( mfxSession *clone) { return MFXCloneSession(m_session, clone);}
-    virtual mfxStatus SetPriority( mfxPriority priority) { return MFXSetPriority(m_session, priority);}
-    virtual mfxStatus GetPriority( mfxPriority *priority) { return MFXGetPriority(m_session, priority);}
-
-    MFX_DEPRECATED virtual mfxStatus SetBufferAllocator(mfxBufferAllocator *allocator) { return MFXVideoCORE_SetBufferAllocator(m_session, allocator); }
-    virtual mfxStatus SetFrameAllocator(mfxFrameAllocator *allocator) { return MFXVideoCORE_SetFrameAllocator(m_session, allocator); }
-    virtual mfxStatus SetHandle(mfxHandleType type, mfxHDL hdl) { return MFXVideoCORE_SetHandle(m_session, type, hdl); }
-    virtual mfxStatus GetHandle(mfxHandleType type, mfxHDL *hdl) { return MFXVideoCORE_GetHandle(m_session, type, hdl); }
-    virtual mfxStatus QueryPlatform(mfxPlatform* platform) { return MFXVideoCORE_QueryPlatform(m_session, platform); }
-
-    virtual mfxStatus SyncOperation(mfxSyncPoint syncp, mfxU32 wait) { return MFXVideoCORE_SyncOperation(m_session, syncp, wait); }
-
-    virtual mfxStatus DoWork() { return MFXDoWork(m_session); }
-
-    virtual operator mfxSession (void) { return m_session; }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-private:
-    MFXVideoSession(const MFXVideoSession &);
-    void operator=(MFXVideoSession &);
-};
-
-class MFXVideoENCODE
-{
-public:
-
-    MFXVideoENCODE(mfxSession session) { m_session = session; }
-    virtual ~MFXVideoENCODE(void) { Close(); }
-
-    virtual mfxStatus Query(mfxVideoParam *in, mfxVideoParam *out) { return MFXVideoENCODE_Query(m_session, in, out); }
-    virtual mfxStatus QueryIOSurf(mfxVideoParam *par, mfxFrameAllocRequest *request) { return MFXVideoENCODE_QueryIOSurf(m_session, par, request); }
-    virtual mfxStatus Init(mfxVideoParam *par) { return MFXVideoENCODE_Init(m_session, par); }
-    virtual mfxStatus Reset(mfxVideoParam *par) { return MFXVideoENCODE_Reset(m_session, par); }
-    virtual mfxStatus Close(void) { return MFXVideoENCODE_Close(m_session); }
-
-    virtual mfxStatus GetVideoParam(mfxVideoParam *par) { return MFXVideoENCODE_GetVideoParam(m_session, par); }
-    virtual mfxStatus GetEncodeStat(mfxEncodeStat *stat) { return MFXVideoENCODE_GetEncodeStat(m_session, stat); }
-
-    virtual mfxStatus EncodeFrameAsync(mfxEncodeCtrl *ctrl, mfxFrameSurface1 *surface, mfxBitstream *bs, mfxSyncPoint *syncp) { return MFXVideoENCODE_EncodeFrameAsync(m_session, ctrl, surface, bs, syncp); }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-class MFXVideoDECODE
-{
-public:
-
-    MFXVideoDECODE(mfxSession session) { m_session = session; }
-    virtual ~MFXVideoDECODE(void) { Close(); }
-
-    virtual mfxStatus Query(mfxVideoParam *in, mfxVideoParam *out) { return MFXVideoDECODE_Query(m_session, in, out); }
-    virtual mfxStatus DecodeHeader(mfxBitstream *bs, mfxVideoParam *par) { return MFXVideoDECODE_DecodeHeader(m_session, bs, par); }
-    virtual mfxStatus QueryIOSurf(mfxVideoParam *par, mfxFrameAllocRequest *request) { return MFXVideoDECODE_QueryIOSurf(m_session, par, request); }
-    virtual mfxStatus Init(mfxVideoParam *par) { return MFXVideoDECODE_Init(m_session, par); }
-    virtual mfxStatus Reset(mfxVideoParam *par) { return MFXVideoDECODE_Reset(m_session, par); }
-    virtual mfxStatus Close(void) { return MFXVideoDECODE_Close(m_session); }
-
-    virtual mfxStatus GetVideoParam(mfxVideoParam *par) { return MFXVideoDECODE_GetVideoParam(m_session, par); }
-
-    virtual mfxStatus GetDecodeStat(mfxDecodeStat *stat) { return MFXVideoDECODE_GetDecodeStat(m_session, stat); }
-    virtual mfxStatus GetPayload(mfxU64 *ts, mfxPayload *payload) {return MFXVideoDECODE_GetPayload(m_session, ts, payload); }
-    virtual mfxStatus SetSkipMode(mfxSkipMode mode) { return MFXVideoDECODE_SetSkipMode(m_session, mode); }
-    virtual mfxStatus DecodeFrameAsync(mfxBitstream *bs, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxSyncPoint *syncp) { return MFXVideoDECODE_DecodeFrameAsync(m_session, bs, surface_work, surface_out, syncp); }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-class MFXVideoVPP
-{
-public:
-
-    MFXVideoVPP(mfxSession session) { m_session = session; }
-    virtual ~MFXVideoVPP(void) { Close(); }
-
-    virtual mfxStatus Query(mfxVideoParam *in, mfxVideoParam *out) { return MFXVideoVPP_Query(m_session, in, out); }
-    virtual mfxStatus QueryIOSurf(mfxVideoParam *par, mfxFrameAllocRequest request2) { return MFXVideoVPP_QueryIOSurf(m_session, par, request); }
-    virtual mfxStatus Init(mfxVideoParam *par) { return MFXVideoVPP_Init(m_session, par); }
-    virtual mfxStatus Reset(mfxVideoParam *par) { return MFXVideoVPP_Reset(m_session, par); }
-    virtual mfxStatus Close(void) { return MFXVideoVPP_Close(m_session); }
-
-    virtual mfxStatus GetVideoParam(mfxVideoParam *par) { return MFXVideoVPP_GetVideoParam(m_session, par); }
-    virtual mfxStatus GetVPPStat(mfxVPPStat *stat) { return MFXVideoVPP_GetVPPStat(m_session, stat); }
-    virtual mfxStatus RunFrameVPPAsync(mfxFrameSurface1 *in, mfxFrameSurface1 *out, mfxExtVppAuxData *aux, mfxSyncPoint *syncp) { return MFXVideoVPP_RunFrameVPPAsync(m_session, in, out, aux, syncp); }
-    virtual mfxStatus RunFrameVPPAsyncEx(mfxFrameSurface1 *in, mfxFrameSurface1 *work, mfxFrameSurface1 **out, mfxSyncPoint *syncp) {return MFXVideoVPP_RunFrameVPPAsyncEx(m_session, in, work, out, syncp); }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-class MFXVideoENC
-{
-public:
-
-    MFXVideoENC(mfxSession session) { m_session = session; }
-    virtual ~MFXVideoENC(void) { Close(); }
-
-    virtual mfxStatus Query(mfxVideoParam *in, mfxVideoParam *out) { return MFXVideoENC_Query(m_session, in, out); }
-    virtual mfxStatus QueryIOSurf(mfxVideoParam *par, mfxFrameAllocRequest *request) { return MFXVideoENC_QueryIOSurf(m_session, par, request); }
-    virtual mfxStatus Init(mfxVideoParam *par) { return MFXVideoENC_Init(m_session, par); }
-    virtual mfxStatus Reset(mfxVideoParam *par) { return MFXVideoENC_Reset(m_session, par); }
-    virtual mfxStatus Close(void) { return MFXVideoENC_Close(m_session); }
-
-    virtual mfxStatus GetVideoParam(mfxVideoParam *par) { return MFXVideoENC_GetVideoParam(m_session, par); }
-    virtual mfxStatus ProcessFrameAsync(mfxENCInput *in, mfxENCOutput *out, mfxSyncPoint *syncp) { return MFXVideoENC_ProcessFrameAsync(m_session, in, out, syncp); }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-class MFXVideoPAK
-{
-public:
-
-    MFXVideoPAK(mfxSession session) { m_session = session; }
-    virtual ~MFXVideoPAK(void) { Close(); }
-
-    virtual mfxStatus Query(mfxVideoParam *in, mfxVideoParam *out) { return MFXVideoPAK_Query(m_session, in, out); }
-    virtual mfxStatus QueryIOSurf(mfxVideoParam *par, mfxFrameAllocRequest *request) { return MFXVideoPAK_QueryIOSurf(m_session, par, request); }
-    virtual mfxStatus Init(mfxVideoParam *par) { return MFXVideoPAK_Init(m_session, par); }
-    virtual mfxStatus Reset(mfxVideoParam *par) { return MFXVideoPAK_Reset(m_session, par); }
-    virtual mfxStatus Close(void) { return MFXVideoPAK_Close(m_session); }
-
-    virtual mfxStatus GetVideoParam(mfxVideoParam *par) { return MFXVideoPAK_GetVideoParam(m_session, par); }
-    //virtual mfxStatus GetEncodeStat(mfxEncodeStat *stat) { return MFXVideoENCODE_GetEncodeStat(m_session, stat); }
-
-    virtual mfxStatus ProcessFrameAsync(mfxPAKInput *in, mfxPAKOutput *out, mfxSyncPoint *syncp) { return MFXVideoPAK_ProcessFrameAsync(m_session, in, out, syncp); }
-
-protected:
-
-    mfxSession m_session;                                       // (mfxSession) handle to the owning session
-};
-
-#endif // __MFXVIDEOPLUSPLUS_H

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxvideo.h Deleted

@@ -1,104 +0,0 @@
-// Copyright (c) 2017-2019 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#ifndef __MFXVIDEO_H__
-#define __MFXVIDEO_H__
-#include "mfxsession.h"
-#include "mfxvstructures.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* MFXVideoCORE */
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
-    mfxU32      reserved4;
-    mfxHDL      pthis;
-    mfxStatus  (MFX_CDECL *Alloc)    (mfxHDL pthis, mfxU32 nbytes, mfxU16 type, mfxMemId *mid);
-    mfxStatus  (MFX_CDECL *Lock)     (mfxHDL pthis, mfxMemId mid, mfxU8 **ptr);
-    mfxStatus  (MFX_CDECL *Unlock)   (mfxHDL pthis, mfxMemId mid);
-    mfxStatus  (MFX_CDECL *Free)     (mfxHDL pthis, mfxMemId mid);
-} mfxBufferAllocator;
-MFX_PACK_END()
-
-MFX_PACK_BEGIN_STRUCT_W_PTR()
-typedef struct {
-    mfxU32      reserved4;
-    mfxHDL      pthis;
-
-    mfxStatus  (MFX_CDECL  *Alloc)    (mfxHDL pthis, mfxFrameAllocRequest *request, mfxFrameAllocResponse *response);
-    mfxStatus  (MFX_CDECL  *Lock)     (mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr);
-    mfxStatus  (MFX_CDECL  *Unlock)   (mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr);
-    mfxStatus  (MFX_CDECL  *GetHDL)   (mfxHDL pthis, mfxMemId mid, mfxHDL *handle);
-    mfxStatus  (MFX_CDECL  *Free)     (mfxHDL pthis, mfxFrameAllocResponse *response);
-} mfxFrameAllocator;
-MFX_PACK_END()
-
-/* VideoCORE */
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoCORE_SetBufferAllocator(mfxSession session, mfxBufferAllocator *allocator);
-mfxStatus MFX_CDECL MFXVideoCORE_SetFrameAllocator(mfxSession session, mfxFrameAllocator *allocator);
-mfxStatus MFX_CDECL MFXVideoCORE_SetHandle(mfxSession session, mfxHandleType type, mfxHDL hdl);
-mfxStatus MFX_CDECL MFXVideoCORE_GetHandle(mfxSession session, mfxHandleType type, mfxHDL *hdl);
-mfxStatus MFX_CDECL MFXVideoCORE_QueryPlatform(mfxSession session, mfxPlatform* platform);
-mfxStatus MFX_CDECL MFXVideoCORE_SyncOperation(mfxSession session, mfxSyncPoint syncp, mfxU32 wait);
-
-/* VideoENCODE */
-mfxStatus MFX_CDECL MFXVideoENCODE_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out);
-mfxStatus MFX_CDECL MFXVideoENCODE_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request);
-mfxStatus MFX_CDECL MFXVideoENCODE_Init(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoENCODE_Reset(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoENCODE_Close(mfxSession session);
-
-mfxStatus MFX_CDECL MFXVideoENCODE_GetVideoParam(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoENCODE_GetEncodeStat(mfxSession session, mfxEncodeStat *stat);
-mfxStatus MFX_CDECL MFXVideoENCODE_EncodeFrameAsync(mfxSession session, mfxEncodeCtrl *ctrl, mfxFrameSurface1 *surface, mfxBitstream *bs, mfxSyncPoint *syncp);
-
-/* VideoDECODE */
-mfxStatus MFX_CDECL MFXVideoDECODE_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out);
-mfxStatus MFX_CDECL MFXVideoDECODE_DecodeHeader(mfxSession session, mfxBitstream *bs, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoDECODE_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest *request);
-mfxStatus MFX_CDECL MFXVideoDECODE_Init(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoDECODE_Reset(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoDECODE_Close(mfxSession session);
-
-mfxStatus MFX_CDECL MFXVideoDECODE_GetVideoParam(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoDECODE_GetDecodeStat(mfxSession session, mfxDecodeStat *stat);
-mfxStatus MFX_CDECL MFXVideoDECODE_SetSkipMode(mfxSession session, mfxSkipMode mode);
-mfxStatus MFX_CDECL MFXVideoDECODE_GetPayload(mfxSession session, mfxU64 *ts, mfxPayload *payload);
-mfxStatus MFX_CDECL MFXVideoDECODE_DecodeFrameAsync(mfxSession session, mfxBitstream *bs, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxSyncPoint *syncp);
-
-/* VideoVPP */
-mfxStatus MFX_CDECL MFXVideoVPP_Query(mfxSession session, mfxVideoParam *in, mfxVideoParam *out);
-mfxStatus MFX_CDECL MFXVideoVPP_QueryIOSurf(mfxSession session, mfxVideoParam *par, mfxFrameAllocRequest request2);
-mfxStatus MFX_CDECL MFXVideoVPP_Init(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoVPP_Reset(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoVPP_Close(mfxSession session);
-
-mfxStatus MFX_CDECL MFXVideoVPP_GetVideoParam(mfxSession session, mfxVideoParam *par);
-mfxStatus MFX_CDECL MFXVideoVPP_GetVPPStat(mfxSession session, mfxVPPStat *stat);
-mfxStatus MFX_CDECL MFXVideoVPP_RunFrameVPPAsync(mfxSession session, mfxFrameSurface1 *in, mfxFrameSurface1 *out, mfxExtVppAuxData *aux, mfxSyncPoint *syncp);
-MFX_DEPRECATED mfxStatus MFX_CDECL MFXVideoVPP_RunFrameVPPAsyncEx(mfxSession session, mfxFrameSurface1 *in, mfxFrameSurface1 *surface_work, mfxFrameSurface1 **surface_out, mfxSyncPoint *syncp);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/include/msdk/include/mfxvstructures.h Deleted

@@ -1,22 +0,0 @@
-// Copyright (c) 2017 Intel Corporation
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-#include "mfxstructures.h"
-
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/main.cpp Deleted

@@ -1,1166 +0,0 @@
-// Copyright (c) 2012-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include <windows.h>
-#include <stringapiset.h>
-
-#include <new>
-#include <memory>
-
-#include "mfx_dispatcher.h"
-#include "mfx_load_dll.h"
-#include "mfx_dispatcher_log.h"
-#include "mfx_library_iterator.h"
-#include "mfx_critical_section.h"
-
-#if defined(MEDIASDK_UWP_DISPATCHER)
-#include "mfx_dispatcher_uwp.h"
-#endif
-
-#include <string.h> /* for memset on Linux */
-
-#include <stdlib.h> /* for qsort on Linux */
-#include "mfx_load_plugin.h"
-#include "mfx_plugin_hive.h"
-
-// module-local definitions
-namespace
-{
-
- const
- struct
- {
- // instance implementation type
- eMfxImplType implType;
- // real implementation
- mfxIMPL impl;
- // adapter numbers
- mfxU32 adapterID;
-
- } implTypes =
- {
- // MFX_IMPL_AUTO case
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE, 0},
- {MFX_LIB_SOFTWARE, MFX_IMPL_SOFTWARE, 0},
-
- // MFX_IMPL_ANY case
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE, 0},
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE2, 1},
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE3, 2},
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE4, 3},
- {MFX_LIB_SOFTWARE, MFX_IMPL_SOFTWARE, 0},
- {MFX_LIB_SOFTWARE, MFX_IMPL_SOFTWARE | MFX_IMPL_AUDIO, 0},
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- //MFX_SINGLE_THREAD case
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE | MFX_IMPL_EXTERNAL_THREADING, 0},
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE2 | MFX_IMPL_EXTERNAL_THREADING, 1},
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE3 | MFX_IMPL_EXTERNAL_THREADING, 2},
- {MFX_LIB_HARDWARE, MFX_IMPL_HARDWARE4 | MFX_IMPL_EXTERNAL_THREADING, 3},
-#endif
- };
-
- const
- struct
- {
- // start index in implTypes table for specified implementation
- mfxU32 minIndex;
- // last index in implTypes table for specified implementation
- mfxU32 maxIndex;
-
- } implTypesRange =
- {
- {0, 1}, // MFX_IMPL_AUTO
- {1, 1}, // MFX_IMPL_SOFTWARE
- {0, 0}, // MFX_IMPL_HARDWARE
- {2, 6}, // MFX_IMPL_AUTO_ANY
- {2, 5}, // MFX_IMPL_HARDWARE_ANY
- {3, 3}, // MFX_IMPL_HARDWARE2
- {4, 4}, // MFX_IMPL_HARDWARE3
- {5, 5}, // MFX_IMPL_HARDWARE4
- {2, 6}, // MFX_IMPL_RUNTIME, same as MFX_IMPL_HARDWARE_ANY
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- {8, 11}, // MFX_SINGLE_THREAD,
-#endif
- {7, 7} // MFX_IMPL_AUDIO
- };
-
- MFX::mfxCriticalSection dispGuard = 0;
-
-} // namespace
-
-using namespace MFX;
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-
-//
-// Implement DLL exposed functions. MFXInit and MFXClose have to do
-// slightly more than other. They require to be implemented explicitly.
-// All other functions are implemented implicitly.
-//
-
-typedef MFXVector<MFX_DISP_HANDLE_EX*> HandleVector;
-typedef MFXVector<mfxStatus> StatusVector;
-
-struct VectorHandleGuard
-{
- VectorHandleGuard(HandleVector& aVector): m_vector(aVector) {}
- ~VectorHandleGuard()
- {
- HandleVector::iterator it = m_vector.begin(),
- et = m_vector.end();
- for ( ; it != et; ++it)
- {
- delete *it;
- }
- }
-
- HandleVector& m_vector;
-private:
- void operator=(const VectorHandleGuard&);
-};
-
-
-static int HandleSort (const void * plhs, const void * prhs)
-{
- const MFX_DISP_HANDLE_EX * lhs = *(const MFX_DISP_HANDLE_EX **)plhs;
- const MFX_DISP_HANDLE_EX * rhs = *(const MFX_DISP_HANDLE_EX **)prhs;
-
- // prefer HW implementation
- if (lhs->implType != MFX_LIB_HARDWARE && rhs->implType == MFX_LIB_HARDWARE)
- {
- return 1;
- }
- if (lhs->implType == MFX_LIB_HARDWARE && rhs->implType != MFX_LIB_HARDWARE)
- {
- return -1;
- }
-
- // prefer integrated GPU
- if (lhs->mediaAdapterType != MFX_MEDIA_INTEGRATED && rhs->mediaAdapterType == MFX_MEDIA_INTEGRATED)
- {
- return 1;
- }
- if (lhs->mediaAdapterType == MFX_MEDIA_INTEGRATED && rhs->mediaAdapterType != MFX_MEDIA_INTEGRATED)
- {
- return -1;
- }
-
- // prefer dll with lower API version
- if (lhs->actualApiVersion < rhs->actualApiVersion)
- {
- return -1;
- }
- if (rhs->actualApiVersion < lhs->actualApiVersion)
- {
- return 1;
- }
-
- // if versions are equal prefer library with HW
- if (lhs->loadStatus == MFX_WRN_PARTIAL_ACCELERATION && rhs->loadStatus == MFX_ERR_NONE)
- {
- return 1;
- }
- if (lhs->loadStatus == MFX_ERR_NONE && rhs->loadStatus == MFX_WRN_PARTIAL_ACCELERATION)
- {
- return -1;
- }
-
- return 0;
-}
-
-mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session)
-{
- MFX::MFXAutomaticCriticalSection guard(&dispGuard);
-
- DISPATCHER_LOG_BLOCK( ("MFXInitEx (impl=%s, pVer=%d.%d, ExternalThreads=%d session=0x%p\n"
- , DispatcherLog_GetMFXImplString(par.Implementation).c_str()
- , par.Version.Major
- , par.Version.Minor
- , par.ExternalThreads
- , session));
-
- mfxStatus mfxRes = MFX_ERR_UNSUPPORTED;
- HandleVector allocatedHandle;
- VectorHandleGuard handleGuard(allocatedHandle);
-
- MFX_DISP_HANDLE_EX *pHandle;
- wchar_t dllNameMFX_MAX_DLL_PATH = { 0 };
- MFX::MFXLibraryIterator libIterator;
-
- // there iterators are used only if the caller specified implicit type like AUTO
- mfxU32 curImplIdx, maxImplIdx;
- // implementation method masked from the input parameter
- // special case for audio library
- const mfxIMPL implMethod = (par.Implementation & MFX_IMPL_AUDIO) ? (sizeof(implTypesRange) / sizeof(implTypesRange0) - 1) : (par.Implementation & (MFX_IMPL_VIA_ANY - 1));
-
- // implementation interface masked from the input parameter
- mfxIMPL implInterface = par.Implementation & -MFX_IMPL_VIA_ANY;
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- bool isSingleThread = (implInterface & MFX_IMPL_EXTERNAL_THREADING) > 0;
- implInterface &= ~MFX_IMPL_EXTERNAL_THREADING;
-#endif
- mfxIMPL implInterfaceOrig = implInterface;
- mfxVersion requiredVersion = {{MFX_VERSION_MINOR, MFX_VERSION_MAJOR}};
-
- // check error(s)
- if (NULL == session)
- {
- return MFX_ERR_NULL_PTR;
- }
-
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- if (((MFX_IMPL_AUTO > implMethod) || (MFX_IMPL_SINGLE_THREAD < implMethod)) && !(par.Implementation & MFX_IMPL_AUDIO))
-#else
- if (((MFX_IMPL_AUTO > implMethod) || (MFX_IMPL_RUNTIME < implMethod)) && !(par.Implementation & MFX_IMPL_AUDIO))
-#endif
- {
- return MFX_ERR_UNSUPPORTED;
- }
-
- // set the minimal required version
- requiredVersion = par.Version;
-
- try
- {
- // reset the session value
- *session = 0;
-
- // allocate the dispatching handle and call-table
- pHandle = new MFX_DISP_HANDLE_EX(requiredVersion);
- }
- catch(...)
- {
- return MFX_ERR_MEMORY_ALLOC;
- }
-
- DISPATCHER_LOG_INFO((("Required API version is %u.%u\n"), requiredVersion.Major, requiredVersion.Minor));
- // particular implementation value
- mfxIMPL curImpl;
-
- // Load HW library or RT from system location
- curImplIdx = implTypesRangeimplMethod.minIndex;
- maxImplIdx = implTypesRangeimplMethod.maxIndex;
- do
- {
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- if (isSingleThread && implTypescurImplIdx.implType != MFX_LIB_HARDWARE)
- continue;
-#endif
-
- int currentStorage = MFX::MFX_STORAGE_ID_FIRST;
- implInterface = implInterfaceOrig;
- do
- {
- // this storage will be checked below
- if (currentStorage == MFX::MFX_APP_FOLDER)
- {
- currentStorage += 1;
- continue;
- }
-
- // initialize the library iterator
- mfxRes = libIterator.Init(implTypescurImplIdx.implType,
- implInterface,
- implTypescurImplIdx.adapterID,
- currentStorage);
-
- // look through the list of installed SDK version,
- // looking for a suitable library with higher merit value.
- if (MFX_ERR_NONE == mfxRes)
- {
-
- if (
- MFX_LIB_HARDWARE == implTypescurImplIdx.implType
- && (!implInterface
- || MFX_IMPL_VIA_ANY == implInterface))
- {
- implInterface = libIterator.GetImplementationType();
- }
-
- do
- {
- eMfxImplType implType = implTypescurImplIdx.implType;
-
- // select a desired DLL
- mfxRes = libIterator.SelectDLLVersion(dllName,
- sizeof(dllName) / sizeof(dllName0),
- &implType,
- pHandle->apiVersion);
- if (MFX_ERR_NONE != mfxRes)
- {
- break;
- }
- DISPATCHER_LOG_INFO((("loading library %S\n"), dllName));
- // try to load the selected DLL
- curImpl = implTypescurImplIdx.impl;
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- if (isSingleThread)
- curImpl |= MFX_IMPL_EXTERNAL_THREADING;
-#endif
- mfxRes = pHandle->LoadSelectedDLL(dllName, implType, curImpl, implInterface, par);
- // unload the failed DLL
- if (MFX_ERR_NONE != mfxRes)
- {
- pHandle->Close();
- continue;
- }
-
- mfxPlatform platform = { MFX_PLATFORM_UNKNOWN, 0, MFX_MEDIA_UNKNOWN };
- if (pHandle->callTableeMFXVideoCORE_QueryPlatform)
- {
- mfxRes = MFXVideoCORE_QueryPlatform((mfxSession)pHandle, &platform);
- if (MFX_ERR_NONE != mfxRes)
- {
- DISPATCHER_LOG_WRN(("MFXVideoCORE_QueryPlatform failed, rejecting loaded library\n"));
- pHandle->Close();
- continue;
- }
- }
- pHandle->mediaAdapterType = platform.MediaAdapterType;
- DISPATCHER_LOG_INFO((("media adapter type is %d\n"), pHandle->mediaAdapterType));
-
- libIterator.GetSubKeyName(pHandle->subkeyName, sizeof(pHandle->subkeyName) / sizeof(pHandle->subkeyName0));
- pHandle->storageID = libIterator.GetStorageID();
- allocatedHandle.push_back(pHandle);
- pHandle = new MFX_DISP_HANDLE_EX(requiredVersion);
-
- } while (MFX_ERR_NONE != mfxRes);
- }
-
- // select another place for loading engine
- currentStorage += 1;
-
- } while ((MFX_ERR_NONE != mfxRes) && (MFX::MFX_STORAGE_ID_LAST >= currentStorage));
-
- } while (++curImplIdx <= maxImplIdx);
-
- curImplIdx = implTypesRangeimplMethod.minIndex;
- maxImplIdx = implTypesRangeimplMethod.maxIndex;
-
- // Load RT from app folder (libmfxsw64 with API >= 1.10)
- do
- {
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- if (isSingleThread && implTypescurImplIdx.implType != MFX_LIB_HARDWARE)
- continue;
-#endif
-
- implInterface = implInterfaceOrig;
- // initialize the library iterator
- mfxRes = libIterator.Init(implTypescurImplIdx.implType,
- implInterface,
- implTypescurImplIdx.adapterID,
- MFX::MFX_APP_FOLDER);
-
- if (MFX_ERR_NONE == mfxRes)
- {
-
- if (
- MFX_LIB_HARDWARE == implTypescurImplIdx.implType
- && (!implInterface
- || MFX_IMPL_VIA_ANY == implInterface))
- {
- implInterface = libIterator.GetImplementationType();
- }
-
- do
- {
- eMfxImplType implType;
-
- // select a desired DLL
- mfxRes = libIterator.SelectDLLVersion(dllName,
- sizeof(dllName) / sizeof(dllName0),
- &implType,
- pHandle->apiVersion);
- if (MFX_ERR_NONE != mfxRes)
- {
- break;
- }
- DISPATCHER_LOG_INFO((("loading library %S\n"), dllName));
-
- // try to load the selected DLL
- curImpl = implTypescurImplIdx.impl;
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- if (isSingleThread)
- curImpl |= MFX_IMPL_EXTERNAL_THREADING;
-#endif
- mfxRes = pHandle->LoadSelectedDLL(dllName, implType, curImpl, implInterface, par);
- // unload the failed DLL
- if (MFX_ERR_NONE != mfxRes)
- {
- pHandle->Close();
- }
- else
- {
- if (pHandle->actualApiVersion.Major == 1 && pHandle->actualApiVersion.Minor <= 9)
- {
- // this is not RT, skip it
- mfxRes = MFX_ERR_ABORTED;
- break;
- }
- pHandle->storageID = MFX::MFX_UNKNOWN_KEY;
- allocatedHandle.push_back(pHandle);
- pHandle = new MFX_DISP_HANDLE_EX(requiredVersion);
- }
-
- } while (MFX_ERR_NONE != mfxRes);
- }
- } while ((MFX_ERR_NONE != mfxRes) && (++curImplIdx <= maxImplIdx));
-
- // Load HW and SW libraries using legacy default DLL search mechanism
- // set current library index again
- curImplIdx = implTypesRangeimplMethod.minIndex;
- do
- {
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- if (isSingleThread && implTypescurImplIdx.implType != MFX_LIB_HARDWARE)
- continue;
-#endif
-
- implInterface = implInterfaceOrig;
-
- if (par.Implementation & MFX_IMPL_AUDIO)
- {
- mfxRes = MFX::mfx_get_default_audio_dll_name(dllName,
- sizeof(dllName) / sizeof(dllName0),
- implTypescurImplIdx.implType);
- }
- else
- {
- mfxRes = MFX::mfx_get_default_dll_name(dllName,
- sizeof(dllName) / sizeof(dllName0),
- implTypescurImplIdx.implType);
- }
-
- if (MFX_ERR_NONE == mfxRes)
- {
- DISPATCHER_LOG_INFO((("loading default library %S\n"), dllName))
-
- // try to load the selected DLL using default DLL search mechanism
- if (MFX_LIB_HARDWARE == implTypescurImplIdx.implType)
- {
- if (!implInterface)
- {
- implInterface = MFX_IMPL_VIA_ANY;
- }
- mfxU32 curVendorID = 0, curDeviceID = 0;
- mfxRes = MFX::SelectImplementationType(implTypescurImplIdx.adapterID, &implInterface, &curVendorID, &curDeviceID);
- if (curVendorID != INTEL_VENDOR_ID)
- mfxRes = MFX_ERR_UNKNOWN;
- }
- if (MFX_ERR_NONE == mfxRes)
- {
- curImpl = implTypescurImplIdx.impl;
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- if (isSingleThread)
- curImpl |= MFX_IMPL_EXTERNAL_THREADING;
-#endif
- // try to load the selected DLL using default DLL search mechanism
- mfxRes = pHandle->LoadSelectedDLL(dllName,
- implTypescurImplIdx.implType,
- curImpl,
- implInterface,
- par);
- }
- // unload the failed DLL
- if ((MFX_ERR_NONE != mfxRes) &&
- (MFX_WRN_PARTIAL_ACCELERATION != mfxRes))
- {
- pHandle->Close();
- }
- else
- {
- pHandle->storageID = MFX::MFX_UNKNOWN_KEY;
- allocatedHandle.push_back(pHandle);
- pHandle = new MFX_DISP_HANDLE_EX(requiredVersion);
- }
- }
- }
- while ((MFX_ERR_NONE > mfxRes) && (++curImplIdx <= maxImplIdx));
- delete pHandle;
-
- if (allocatedHandle.size() == 0)
- return MFX_ERR_UNSUPPORTED;
-
- { // sort candidate list
- bool NeedSort = false;
- HandleVector::iterator first = allocatedHandle.begin(),
- it = allocatedHandle.begin(),
- et = allocatedHandle.end();
- for (it++; it != et; ++it)
- if (HandleSort(&(*first), &(*it)) != 0)
- NeedSort = true;
-
- // sort allocatedHandle so that the most preferred dll is at the beginning
- if (NeedSort)
- qsort(&(*allocatedHandle.begin()), allocatedHandle.size(), sizeof(MFX_DISP_HANDLE_EX*), &HandleSort);
- }
- HandleVector::iterator candidate = allocatedHandle.begin();
- // check the final result of loading
- try
- {
- pHandle = *candidate;
- //pulling up current mediasdk version, that required to match plugin version
- mfxVersion apiVerActual = { { 0, 0 } };
- mfxStatus stsQueryVersion = MFXQueryVersion((mfxSession)pHandle, &apiVerActual);
-
- if (MFX_ERR_NONE != stsQueryVersion)
- {
- DISPATCHER_LOG_ERROR((("MFXQueryVersion returned: %d, cannot load plugins\n"), mfxRes))
- }
- else
- {
- MFX::MFXPluginStorage & hive = pHandle->pluginHive;
-
- HandleVector::iterator it = allocatedHandle.begin(),
- et = allocatedHandle.end();
- for (; it != et; ++it)
- {
- // Registering default plugins set
- MFX::MFXDefaultPlugins defaultPugins(apiVerActual, *it, (*it)->implType);
- hive.insert(hive.end(), defaultPugins.begin(), defaultPugins.end());
-
- if ((*it)->storageID != MFX::MFX_UNKNOWN_KEY)
- {
- // Scan HW plugins in subkeys of registry library
- MFX::MFXPluginsInHive plgsInHive((*it)->storageID, (*it)->subkeyName, apiVerActual);
- hive.insert(hive.end(), plgsInHive.begin(), plgsInHive.end());
- }
- }
-
- //setting up plugins records
- for(int i = MFX::MFX_STORAGE_ID_FIRST; i <= MFX::MFX_STORAGE_ID_LAST; i++)
- {
- MFX::MFXPluginsInHive plgsInHive(i, NULL, apiVerActual);
- hive.insert(hive.end(), plgsInHive.begin(), plgsInHive.end());
- }
-
- // SOLID dispatcher also loads plug-ins from file system
- MFX::MFXPluginsInFS plgsInFS(apiVerActual);
- hive.insert(hive.end(), plgsInFS.begin(), plgsInFS.end());
- }
-
- pHandle->callPlugInsTableeMFXVideoUSER_Load = (mfxFunctionPointer)MFXVideoUSER_Load;
- pHandle->callPlugInsTableeMFXVideoUSER_LoadByPath = (mfxFunctionPointer)MFXVideoUSER_LoadByPath;
- pHandle->callPlugInsTableeMFXVideoUSER_UnLoad = (mfxFunctionPointer)MFXVideoUSER_UnLoad;
- pHandle->callPlugInsTableeMFXAudioUSER_Load = (mfxFunctionPointer)MFXAudioUSER_Load;
- pHandle->callPlugInsTableeMFXAudioUSER_UnLoad = (mfxFunctionPointer)MFXAudioUSER_UnLoad;
-
- }
- catch(...)
- {
- DISPATCHER_LOG_ERROR((("unknown exception while loading plugins\n")))
- }
-
- // everything is OK. Save pointers to the output variable
- *candidate = 0; // keep this one safe from guard destructor
-
-
- //===================================
-
- // MFXVideoCORE_QueryPlatform call creates d3d device handle, so we have handle right after MFXInit and can't accept external handle
- // This is a workaround which calls close-init to remove that handle
-
- mfxFunctionPointer *actualTable = (pHandle->impl & MFX_IMPL_AUDIO) ? pHandle->callAudioTable : pHandle->callTable;
- mfxFunctionPointer pFunc;
-
- pFunc = actualTableeMFXClose;
- mfxRes = (*(mfxStatus(MFX_CDECL *) (mfxSession)) pFunc) (pHandle->session);
- if (mfxRes != MFX_ERR_NONE)
- return mfxRes;
-
- pHandle->session = 0;
- bool callOldInit = (pHandle->impl & MFX_IMPL_AUDIO) || !actualTableeMFXInitEx;
- pFunc = actualTable(callOldInit) ? eMFXInit : eMFXInitEx;
-
- mfxVersion version(pHandle->apiVersion);
- if (callOldInit)
- {
- pHandle->loadStatus = (*(mfxStatus(MFX_CDECL *) (mfxIMPL, mfxVersion *, mfxSession *)) pFunc) (pHandle->impl | pHandle->implInterface, &version, &pHandle->session);
- }
- else
- {
- mfxInitParam initPar = par;
- initPar.Implementation = pHandle->impl | pHandle->implInterface;
- initPar.Version = version;
- pHandle->loadStatus = (*(mfxStatus(MFX_CDECL *) (mfxInitParam, mfxSession *)) pFunc) (initPar, &pHandle->session);
- }
-
- //===================================
-
- *((MFX_DISP_HANDLE_EX **) session) = pHandle;
-
- return pHandle->loadStatus;
-
-} // mfxStatus MFXInitEx(mfxIMPL impl, mfxVersion *ver, mfxSession *session)
-
-mfxStatus MFXClose(mfxSession session)
-{
- MFX::MFXAutomaticCriticalSection guard(&dispGuard);
-
- mfxStatus mfxRes = MFX_ERR_INVALID_HANDLE;
- MFX_DISP_HANDLE *pHandle = (MFX_DISP_HANDLE *) session;
-
- // check error(s)
- if (pHandle)
- {
- try
- {
- // unload the DLL library
- mfxRes = pHandle->Close();
-
- // it is possible, that there is an active child session.
- // can't unload library in that case.
- if (MFX_ERR_UNDEFINED_BEHAVIOR != mfxRes)
- {
- // release the handle
- delete pHandle;
- }
- }
- catch(...)
- {
- mfxRes = MFX_ERR_INVALID_HANDLE;
- }
- }
-
- return mfxRes;
-
-} // mfxStatus MFXClose(mfxSession session)
-
-mfxStatus MFXVideoUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version)
-{
- mfxStatus sts = MFX_ERR_NONE;
- bool ErrFlag = false;
- if (!session)
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_Load: session=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
- MFX_DISP_HANDLE &pHandle = *(MFX_DISP_HANDLE *) session;
- if (!uid)
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_Load: uid=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
- DISPATCHER_LOG_INFO((("MFXVideoUSER_Load: uid=" MFXGUIDTYPE()" version=%d\n")
- , MFXGUIDTOHEX(uid)
- , version))
- size_t pluginsChecked = 0;
-
- for (MFX::MFXPluginStorage::iterator i = pHandle.pluginHive.begin();i != pHandle.pluginHive.end(); i++, pluginsChecked++)
- {
- if (i->PluginUID != *uid)
- {
- continue;
- }
- //check rest in records
- if (i->PluginVersion < version)
- {
- DISPATCHER_LOG_INFO((("MFXVideoUSER_Load: registered \"Plugin Version\" for GUID=" MFXGUIDTYPE()" is %d, that is smaller that requested\n")
- , MFXGUIDTOHEX(uid)
- , i->PluginVersion))
- continue;
- }
- try
- {
- sts = pHandle.pluginFactory.Create(*i);
- if( MFX_ERR_NONE != sts)
- {
- ErrFlag = (ErrFlag || (sts == MFX_ERR_UNDEFINED_BEHAVIOR));
- continue;
- }
- return MFX_ERR_NONE;
- }
- catch(...)
- {
- continue;
- }
- }
-
- // Specified UID was not found among individually registed plugins, now try load it from default sets if any
- for (MFX::MFXPluginStorage::iterator i = pHandle.pluginHive.begin();i != pHandle.pluginHive.end(); i++, pluginsChecked++)
- {
- if (!i->Default)
- continue;
-
- i->PluginUID = *uid;
- i->PluginVersion = (mfxU16)version;
- try
- {
- sts = pHandle.pluginFactory.Create(*i);
- if( MFX_ERR_NONE != sts)
- {
- ErrFlag = (ErrFlag || (sts == MFX_ERR_UNDEFINED_BEHAVIOR));
- continue;
- }
- return MFX_ERR_NONE;
- }
- catch(...)
- {
- continue;
- }
- }
-
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_Load: cannot find registered plugin with requested UID, total plugins available=%d\n"), pHandle.pluginHive.size()));
- if (ErrFlag)
- return MFX_ERR_UNDEFINED_BEHAVIOR;
- else
- return MFX_ERR_NOT_FOUND;
-}
-
-
-mfxStatus MFXVideoUSER_LoadByPath(mfxSession session, const mfxPluginUID *uid, mfxU32 version, const mfxChar *path, mfxU32 len)
-{
- if (!session)
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_LoadByPath: session=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
- MFX_DISP_HANDLE &pHandle = *(MFX_DISP_HANDLE *) session;
- if (!uid)
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_LoadByPath: uid=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
-
- DISPATCHER_LOG_INFO((("MFXVideoUSER_LoadByPath: %S uid=" MFXGUIDTYPE()" version=%d\n")
- , path
- , MFXGUIDTOHEX(uid)
- , version))
-
- PluginDescriptionRecord record;
- record.sName0 = 0;
-
- wchar_t wPathMAX_PLUGIN_PATH;
- int res = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, path, len, wPath, MAX_PLUGIN_PATH-1);
-
- if (!res)
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_LoadByPath: can't convert UTF-8 path to UTF-16\n")));
- return MFX_ERR_NOT_FOUND;
- }
- wPathres=0;
-
- wcscpy_s(record.sPath, MAX_PLUGIN_PATH, wPath);
-
- record.PluginUID = *uid;
- record.PluginVersion = (mfxU16)version;
- record.Default = true;
-
- try
- {
- return pHandle.pluginFactory.Create(record);
- }
- catch(...)
- {
- return MFX_ERR_NOT_FOUND;
- }
-}
-
-
-mfxStatus MFXVideoUSER_UnLoad(mfxSession session, const mfxPluginUID *uid)
-{
- if (!session)
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_UnLoad: session=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
- MFX_DISP_HANDLE &rHandle = *(MFX_DISP_HANDLE *) session;
- if (!uid)
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_UnLoad: uid=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
-
- bool bDestroyed = rHandle.pluginFactory.Destroy(*uid);
- if (bDestroyed)
- {
- DISPATCHER_LOG_INFO((("MFXVideoUSER_UnLoad : plugin with GUID=" MFXGUIDTYPE()" unloaded\n"), MFXGUIDTOHEX(uid)));
- } else
- {
- DISPATCHER_LOG_ERROR((("MFXVideoUSER_UnLoad : plugin with GUID=" MFXGUIDTYPE()" not found\n"), MFXGUIDTOHEX(uid)));
- }
-
- return bDestroyed ? MFX_ERR_NONE : MFX_ERR_NOT_FOUND;
-}
-
-mfxStatus MFXAudioUSER_Load(mfxSession session, const mfxPluginUID *uid, mfxU32 version)
-{
- if (!session)
- {
- DISPATCHER_LOG_ERROR((("MFXAudioUSER_Load: session=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
- MFX_DISP_HANDLE &pHandle = *(MFX_DISP_HANDLE *) session;
- if (!uid)
- {
- DISPATCHER_LOG_ERROR((("MFXAudioUSER_Load: uid=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
- DISPATCHER_LOG_INFO((("MFXAudioUSER_Load: uid=" MFXGUIDTYPE()" version=%d\n")
- , MFXGUIDTOHEX(uid)
- , version))
- size_t pluginsChecked = 0;
- PluginDescriptionRecord defaultPluginRecord;
- for (MFX::MFXPluginStorage::iterator i = pHandle.pluginHive.begin();i != pHandle.pluginHive.end(); i++, pluginsChecked++)
- {
- if (i->PluginUID != *uid)
- {
- if (i->Default) // PluginUID == 0 for default set
- {
- defaultPluginRecord = *i;
- }
- continue;
- }
- //check rest in records
- if (i->PluginVersion < version)
- {
- DISPATCHER_LOG_INFO((("MFXAudioUSER_Load: registered \"Plugin Version\" for GUID=" MFXGUIDTYPE()" is %d, that is smaller that requested\n")
- , MFXGUIDTOHEX(uid)
- , i->PluginVersion))
- continue;
- }
- try {
- return pHandle.pluginFactory.Create(*i);
- }
- catch(...) {
- return MFX_ERR_UNKNOWN;
- }
- }
-
- // Specified UID was not found among individually registed plugins, now try load it from default set if any
- if (defaultPluginRecord.Default)
- {
- defaultPluginRecord.PluginUID = *uid;
- defaultPluginRecord.onlyVersionRegistered = true;
- defaultPluginRecord.PluginVersion = (mfxU16)version;
- try {
- return pHandle.pluginFactory.Create(defaultPluginRecord);
- }
- catch(...) {
- return MFX_ERR_UNKNOWN;
- }
- }
-
- DISPATCHER_LOG_ERROR((("MFXAudioUSER_Load: cannot find registered plugin with requested UID, total plugins available=%d\n"), pHandle.pluginHive.size()));
- return MFX_ERR_NOT_FOUND;
-}
-
-mfxStatus MFXAudioUSER_UnLoad(mfxSession session, const mfxPluginUID *uid)
-{
- if (!session)
- {
- DISPATCHER_LOG_ERROR((("MFXAudioUSER_UnLoad: session=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
- MFX_DISP_HANDLE &rHandle = *(MFX_DISP_HANDLE *) session;
- if (!uid)
- {
- DISPATCHER_LOG_ERROR((("MFXAudioUSER_Load: uid=NULL\n")));
- return MFX_ERR_NULL_PTR;
- }
-
- bool bDestroyed = rHandle.pluginFactory.Destroy(*uid);
- if (bDestroyed)
- {
- DISPATCHER_LOG_INFO((("MFXAudioUSER_UnLoad : plugin with GUID=" MFXGUIDTYPE()" unloaded\n"), MFXGUIDTOHEX(uid)));
- } else
- {
- DISPATCHER_LOG_ERROR((("MFXAudioUSER_UnLoad : plugin with GUID=" MFXGUIDTYPE()" not found\n"), MFXGUIDTOHEX(uid)));
- }
-
- return bDestroyed ? MFX_ERR_NONE : MFX_ERR_NOT_FOUND;
-}
-#else // relates to !defined (MEDIASDK_UWP_DISPATCHER), i.e. #else part as if MEDIASDK_UWP_DISPATCHER defined
-
-static mfxModuleHandle hModule;
-
-// for the UWP_DISPATCHER purposes implementation of MFXinitEx is calling
-// InitialiseMediaSession() implemented in intel_gfx_api.dll
-mfxStatus MFXInitEx(mfxInitParam par, mfxSession *session)
-{
-#if defined(MEDIASDK_ARM_LOADER)
-
- return MFX_ERR_UNSUPPORTED;
-
-#else
-
- wchar_t IntelGFXAPIdllNameMFX_MAX_DLL_PATH = { 0 };
- mfxI32 adapterNum = -1;
-
- switch (par.Implementation & 0xf)
- {
- case MFX_IMPL_SOFTWARE:
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- case MFX_IMPL_SINGLE_THREAD:
-#endif
- return MFX_ERR_UNSUPPORTED;
- case MFX_IMPL_AUTO:
- case MFX_IMPL_HARDWARE:
- adapterNum = 0;
- break;
- case MFX_IMPL_HARDWARE2:
- adapterNum = 1;
- break;
- case MFX_IMPL_HARDWARE3:
- adapterNum = 2;
- break;
- case MFX_IMPL_HARDWARE4:
- adapterNum = 3;
- break;
- default:
- return GfxApiInitPriorityIntegrated(par, session, hModule);
- }
-
- return GfxApiInitByAdapterNum(par, adapterNum, session, hModule);
-
-#endif
-}
-
-// for the UWP_DISPATCHER purposes implementation of MFXClose is calling
-// DisposeMediaSession() implemented in intel_gfx_api.dll
-mfxStatus MFXClose(mfxSession session)
-{
- if (NULL == session) {
- return MFX_ERR_INVALID_HANDLE;
- }
-
- mfxStatus sts = MFX_ERR_NONE;
-
-#if defined(MEDIASDK_ARM_LOADER)
-
- sts = MFX_ERR_UNSUPPORTED;
-
-#else
-
- sts = GfxApiClose(session, hModule);
-
-#endif
-
- session = (mfxSession)NULL;
- return sts;
-}
-
-#undef FUNCTION
-#define FUNCTION(return_value, func_name, formal_param_list, actual_param_list) \
- return_value func_name formal_param_list \
-{ \
- mfxStatus mfxRes = MFX_ERR_INVALID_HANDLE; \
-\
- _mfxSession *pHandle = (_mfxSession *) session; \
-\
- /* get the function's address and make a call */ \
- if (pHandle) \
-{ \
- mfxFunctionPointer pFunc = pHandle->callPlugInsTablee##func_name; \
- if (pFunc) \
-{ \
- /* pass down the call */ \
- mfxRes = (*(mfxStatus (MFX_CDECL *) formal_param_list) pFunc) actual_param_list; \
-} \
-} \
- return mfxRes; \
-}
-
-FUNCTION(mfxStatus, MFXVideoUSER_Load, (mfxSession session, const mfxPluginUID *uid, mfxU32 version), (session, uid, version))
-FUNCTION(mfxStatus, MFXVideoUSER_LoadByPath, (mfxSession session, const mfxPluginUID *uid, mfxU32 version, const mfxChar *path, mfxU32 len), (session, uid, version, path, len))
-FUNCTION(mfxStatus, MFXVideoUSER_UnLoad, (mfxSession session, const mfxPluginUID *uid), (session, uid))
-FUNCTION(mfxStatus, MFXAudioUSER_Load, (mfxSession session, const mfxPluginUID *uid, mfxU32 version), (session, uid, version))
-FUNCTION(mfxStatus, MFXAudioUSER_UnLoad, (mfxSession session, const mfxPluginUID *uid), (session, uid))
-
-#endif //!defined(MEDIASDK_UWP_DISPATCHER)
-
-mfxStatus MFXJoinSession(mfxSession session, mfxSession child_session)
-{
- mfxStatus mfxRes = MFX_ERR_INVALID_HANDLE;
- MFX_DISP_HANDLE *pHandle = (MFX_DISP_HANDLE *)session;
- MFX_DISP_HANDLE *pChildHandle = (MFX_DISP_HANDLE *)child_session;
-
- // get the function's address and make a call
- if ((pHandle) && (pChildHandle) && (pHandle->actualApiVersion == pChildHandle->actualApiVersion))
- {
- /* check whether it is audio session or video */
- int tableIndex = eMFXJoinSession;
- mfxFunctionPointer pFunc;
- if (pHandle->impl & MFX_IMPL_AUDIO)
- {
- pFunc = pHandle->callAudioTabletableIndex;
- }
- else
- {
- pFunc = pHandle->callTabletableIndex;
- }
-
- if (pFunc)
- {
- // pass down the call
- mfxRes = (*(mfxStatus(MFX_CDECL *) (mfxSession, mfxSession)) pFunc) (pHandle->session,
- pChildHandle->session);
- }
- }
-
- return mfxRes;
-
-} // mfxStatus MFXJoinSession(mfxSession session, mfxSession child_session)
-
-mfxStatus MFXCloneSession(mfxSession session, mfxSession *clone)
-{
- mfxStatus mfxRes = MFX_ERR_INVALID_HANDLE;
- MFX_DISP_HANDLE *pHandle = (MFX_DISP_HANDLE *)session;
- mfxVersion apiVersion;
- mfxIMPL impl;
-
- // check error(s)
- if (pHandle)
- {
- // initialize the clone session
- apiVersion = pHandle->apiVersion;
- impl = pHandle->impl | pHandle->implInterface;
- mfxRes = MFXInit(impl, &apiVersion, clone);
- if (MFX_ERR_NONE != mfxRes)
- {
- return mfxRes;
- }
-
- // join the sessions
- mfxRes = MFXJoinSession(session, *clone);
- if (MFX_ERR_NONE != mfxRes)
- {
- MFXClose(*clone);
- *clone = NULL;
- return mfxRes;
- }
- }
-
- return mfxRes;
-
-} // mfxStatus MFXCloneSession(mfxSession session, mfxSession *clone)
-
-mfxStatus MFXInit(mfxIMPL impl, mfxVersion *pVer, mfxSession *session)
-{
- mfxInitParam par = {};
-
- par.Implementation = impl;
- if (pVer)
- {
- par.Version = *pVer;
- }
- else
- {
- par.Version.Major = DEFAULT_API_VERSION_MAJOR;
- par.Version.Minor = DEFAULT_API_VERSION_MINOR;
- }
- par.ExternalThreads = 0;
-
- return MFXInitEx(par, session);
-}
-
-//
-//
-// implement all other calling functions.
-// They just call a procedure of DLL library from the table.
-//
-
-// define for common functions (from mfxsession.h)
-#undef FUNCTION
-#define FUNCTION(return_value, func_name, formal_param_list, actual_param_list) \
- return_value func_name formal_param_list \
-{ \
- mfxStatus mfxRes = MFX_ERR_INVALID_HANDLE; \
- _mfxSession *pHandle = (_mfxSession *) session; \
- /* get the function's address and make a call */ \
- if (pHandle) \
-{ \
- /* check whether it is audio session or video */ \
- int tableIndex = e##func_name; \
- mfxFunctionPointer pFunc; \
- if (pHandle->impl & MFX_IMPL_AUDIO) \
-{ \
- pFunc = pHandle->callAudioTabletableIndex; \
-} \
- else \
-{ \
- pFunc = pHandle->callTabletableIndex; \
-} \
- if (pFunc) \
-{ \
- /* get the real session pointer */ \
- session = pHandle->session; \
- /* pass down the call */ \
- mfxRes = (*(mfxStatus (MFX_CDECL *) formal_param_list) pFunc) actual_param_list; \
-} \
-} \
- return mfxRes; \
-}
-
-FUNCTION(mfxStatus, MFXQueryIMPL, (mfxSession session, mfxIMPL *impl), (session, impl))
-FUNCTION(mfxStatus, MFXQueryVersion, (mfxSession session, mfxVersion *version), (session, version))
-
-// these functions are not necessary in LOADER part of dispatcher and
-// need to be included only in in SOLID dispatcher or PROCTABLE part of dispatcher
-
-FUNCTION(mfxStatus, MFXDisjoinSession, (mfxSession session), (session))
-FUNCTION(mfxStatus, MFXSetPriority, (mfxSession session, mfxPriority priority), (session, priority))
-FUNCTION(mfxStatus, MFXGetPriority, (mfxSession session, mfxPriority *priority), (session, priority))
-
-#undef FUNCTION
-#define FUNCTION(return_value, func_name, formal_param_list, actual_param_list) \
- return_value func_name formal_param_list \
-{ \
- mfxStatus mfxRes = MFX_ERR_INVALID_HANDLE; \
- _mfxSession *pHandle = (_mfxSession *) session;\
- /* get the function's address and make a call */ \
- if (pHandle) \
-{ \
- mfxFunctionPointer pFunc = pHandle->callTablee##func_name; \
- if (pFunc) \
-{ \
- /* get the real session pointer */ \
- session = pHandle->session; \
- /* pass down the call */ \
- mfxRes = (*(mfxStatus (MFX_CDECL *) formal_param_list) pFunc) actual_param_list; \
-} \
-} \
- return mfxRes; \
-}
-
-#include "mfx_exposed_functions_list.h"
-#undef FUNCTION
-#define FUNCTION(return_value, func_name, formal_param_list, actual_param_list) \
- return_value func_name formal_param_list \
-{ \
- mfxStatus mfxRes = MFX_ERR_INVALID_HANDLE; \
- _mfxSession *pHandle = (_mfxSession *) session; \
- /* get the function's address and make a call */ \
- if (pHandle) \
-{ \
- mfxFunctionPointer pFunc = pHandle->callAudioTablee##func_name; \
- if (pFunc) \
-{ \
- /* get the real session pointer */ \
- session = pHandle->session; \
- /* pass down the call */ \
- mfxRes = (*(mfxStatus (MFX_CDECL *) formal_param_list) pFunc) actual_param_list; \
-} \
-} \
- return mfxRes; \
-}
-
-#include "mfxaudio_exposed_functions_list.h"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_critical_section.cpp Deleted

@@ -1,74 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfx_critical_section.h"
-
-#include <windows.h>
-// SDK re-declares the following functions with different call declarator.
-// We don't need them. Just redefine them to nothing.
-#define _interlockedbittestandset fake_set
-#define _interlockedbittestandreset fake_reset
-#define _interlockedbittestandset64 fake_set64
-#define _interlockedbittestandreset64 fake_reset64
-#include <intrin.h>
-
-#define MFX_WAIT() SwitchToThread()
-
-// static section of the file
-namespace
-{
-
-enum
-{
- MFX_SC_IS_FREE = 0,
- MFX_SC_IS_TAKEN = 1
-};
-
-} // namespace
-
-namespace MFX
-{
-
-mfxU32 mfxInterlockedCas32(mfxCriticalSection *pCSection, mfxU32 value_to_exchange, mfxU32 value_to_compare)
-{
- return _InterlockedCompareExchange(pCSection, value_to_exchange, value_to_compare);
-}
-
-mfxU32 mfxInterlockedXchg32(mfxCriticalSection *pCSection, mfxU32 value) 
-{ 
- return _InterlockedExchange(pCSection, value);
-}
-
-void mfxEnterCriticalSection(mfxCriticalSection *pCSection)
-{
- while (MFX_SC_IS_TAKEN == mfxInterlockedCas32(pCSection,
- MFX_SC_IS_TAKEN,
- MFX_SC_IS_FREE))
- {
- MFX_WAIT();
- }
-} // void mfxEnterCriticalSection(mfxCriticalSection *pCSection)
-
-void mfxLeaveCriticalSection(mfxCriticalSection *pCSection)
-{
- mfxInterlockedXchg32(pCSection, MFX_SC_IS_FREE);
-} // void mfxLeaveCriticalSection(mfxCriticalSection *pCSection)
-
-} // namespace MFX

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_dispatcher.cpp Deleted

@@ -1,661 +0,0 @@
-// Copyright (c) 2012-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfx_dispatcher.h"
-#include "mfx_dispatcher_log.h"
-#include "mfx_load_dll.h"
-
-#include <assert.h>
-
-#include <string.h>
-#include <windows.h>
-
-#include "mfx_dxva2_device.h"
-#include "mfxvideo++.h"
-#include "mfx_vector.h"
-#include "mfxadapter.h"
-#include <algorithm>
-
-#pragma warning(disable:4355)
-
-MFX_DISP_HANDLE::MFX_DISP_HANDLE(const mfxVersion requiredVersion) :
- _mfxSession()
- ,apiVersion(requiredVersion)
- ,pluginHive()
- ,pluginFactory((mfxSession)this)
-{
- actualApiVersion.Version = 0;
- implType = MFX_LIB_SOFTWARE;
- impl = MFX_IMPL_SOFTWARE;
- loadStatus = MFX_ERR_NOT_FOUND;
- dispVersion.Major = MFX_DISPATCHER_VERSION_MAJOR;
- dispVersion.Minor = MFX_DISPATCHER_VERSION_MINOR;
- storageID = 0;
- implInterface = MFX_IMPL_HARDWARE_ANY;
-
- hModule = (mfxModuleHandle) 0;
-
-} // MFX_DISP_HANDLE::MFX_DISP_HANDLE(const mfxVersion requiredVersion)
-
-MFX_DISP_HANDLE::~MFX_DISP_HANDLE(void)
-{
- Close();
-
-} // MFX_DISP_HANDLE::~MFX_DISP_HANDLE(void)
-
-mfxStatus MFX_DISP_HANDLE::Close(void)
-{
- mfxStatus mfxRes;
-
- mfxRes = UnLoadSelectedDLL();
-
- // need to reset dispatcher state after unloading dll
- if (MFX_ERR_NONE == mfxRes)
- {
- implType = MFX_LIB_SOFTWARE;
- impl = MFX_IMPL_SOFTWARE;
- loadStatus = MFX_ERR_NOT_FOUND;
- dispVersion.Major = MFX_DISPATCHER_VERSION_MAJOR;
- dispVersion.Minor = MFX_DISPATCHER_VERSION_MINOR;
- *static_cast<_mfxSession*>(this) = _mfxSession();
- hModule = (mfxModuleHandle) 0;
- }
-
- return mfxRes;
-
-} // mfxStatus MFX_DISP_HANDLE::Close(void)
-
-mfxStatus MFX_DISP_HANDLE::LoadSelectedDLL(const wchar_t *pPath, eMfxImplType reqImplType,
- mfxIMPL reqImpl, mfxIMPL reqImplInterface, mfxInitParam &par)
-{
- mfxStatus mfxRes = MFX_ERR_NONE;
-
- // check error(s)
- if ((MFX_LIB_SOFTWARE != reqImplType) &&
- (MFX_LIB_HARDWARE != reqImplType))
- {
- DISPATCHER_LOG_ERROR((("implType == %s, should be either MFX_LIB_SOFTWARE ot MFX_LIB_HARDWARE\n"), DispatcherLog_GetMFXImplString(reqImplType).c_str()));
- loadStatus = MFX_ERR_ABORTED;
- return loadStatus;
- }
- // only exact types of implementation is allowed
- if (!(reqImpl & MFX_IMPL_AUDIO) &&
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- !(reqImpl & MFX_IMPL_EXTERNAL_THREADING) &&
-#endif
- (MFX_IMPL_SOFTWARE != reqImpl) &&
- (MFX_IMPL_HARDWARE != reqImpl) &&
- (MFX_IMPL_HARDWARE2 != reqImpl) &&
- (MFX_IMPL_HARDWARE3 != reqImpl) &&
- (MFX_IMPL_HARDWARE4 != reqImpl))
- {
- DISPATCHER_LOG_ERROR((("invalid implementation impl == %s\n"), DispatcherLog_GetMFXImplString(impl).c_str()));
- loadStatus = MFX_ERR_ABORTED;
- return loadStatus;
- }
- // only mfxExtThreadsParam is allowed
- if (par.NumExtParam)
- {
- if ((par.NumExtParam > 1) || !par.ExtParam)
- {
- loadStatus = MFX_ERR_ABORTED;
- return loadStatus;
- }
- if ((par.ExtParam0->BufferId != MFX_EXTBUFF_THREADS_PARAM) ||
- (par.ExtParam0->BufferSz != sizeof(mfxExtThreadsParam)))
- {
- loadStatus = MFX_ERR_ABORTED;
- return loadStatus;
- }
- }
-
- // close the handle before initialization
- Close();
-
- // save the library's type
- this->implType = reqImplType;
- this->impl = reqImpl;
- this->implInterface = reqImplInterface;
-
- {
- assert(hModule == (mfxModuleHandle)0);
- DISPATCHER_LOG_BLOCK(("invoking LoadLibrary(%S)\n", pPath));
-
- // load the DLL into the memory
- hModule = MFX::mfx_dll_load(pPath);
-
- if (hModule)
- {
- int i;
-
- DISPATCHER_LOG_OPERATION({
- wchar_t modulePath1024;
- GetModuleFileNameW((HMODULE)hModule, modulePath, sizeof(modulePath)/sizeof(modulePath0));
- DISPATCHER_LOG_INFO((("loaded module %S\n"), modulePath))
- });
-
- if (impl & MFX_IMPL_AUDIO)
- {
- // load audio functions: pointers to exposed functions
- for (i = 0; i < eAudioFuncTotal; i += 1)
- {
- // construct correct name of the function - remove "_a" postfix
-
- mfxFunctionPointer pProc = (mfxFunctionPointer) MFX::mfx_dll_get_addr(hModule, APIAudioFunci.pName);
- if (pProc)
- {
- // function exists in the library,
- // save the pointer.
- callAudioTablei = pProc;
- }
- else
- {
- // The library doesn't contain the function
- DISPATCHER_LOG_WRN((("Can't find API function \"%s\"\n"), APIAudioFunci.pName));
- if (apiVersion.Version >= APIAudioFunci.apiVersion.Version)
- {
- DISPATCHER_LOG_ERROR((("\"%s\" is required for API %u.%u\n"), APIAudioFunci.pName, apiVersion.Major, apiVersion.Minor));
- mfxRes = MFX_ERR_UNSUPPORTED;
- break;
- }
- }
- }
- }
- else
- {
- // load video functions: pointers to exposed functions
- for (i = 0; i < eVideoFuncTotal; i += 1)
- {
- mfxFunctionPointer pProc = (mfxFunctionPointer) MFX::mfx_dll_get_addr(hModule, APIFunci.pName);
- if (pProc)
- {
- // function exists in the library,
- // save the pointer.
- callTablei = pProc;
- }
- else
- {
- // The library doesn't contain the function
- DISPATCHER_LOG_WRN((("Can't find API function \"%s\"\n"), APIFunci.pName));
- if (apiVersion.Version >= APIFunci.apiVersion.Version)
- {
- DISPATCHER_LOG_ERROR((("\"%s\" is required for API %u.%u\n"), APIFunci.pName, apiVersion.Major, apiVersion.Minor));
- mfxRes = MFX_ERR_UNSUPPORTED;
- break;
- }
- }
- }
- }
- }
- else
- {
- DISPATCHER_LOG_WRN((("can't find DLL: GetLastErr()=0x%x\n"), GetLastError()))
- mfxRes = MFX_ERR_UNSUPPORTED;
- }
- }
-
- // initialize the loaded DLL
- if (MFX_ERR_NONE == mfxRes)
- {
- mfxVersion version(apiVersion);
-
- /* check whether it is audio session or video */
- mfxFunctionPointer *actualTable = (impl & MFX_IMPL_AUDIO) ? callAudioTable : callTable;
-
- // Call old-style MFXInit init for older libraries and audio library
- bool callOldInit = (impl & MFX_IMPL_AUDIO) || !actualTableeMFXInitEx; // if true call eMFXInit, if false - eMFXInitEx
- int tableIndex = (callOldInit) ? eMFXInit : eMFXInitEx;
-
- mfxFunctionPointer pFunc = actualTabletableIndex;
-
- {
- if (callOldInit)
- {
- DISPATCHER_LOG_BLOCK(("MFXInit(%s,ver=%u.%u,session=0x%p)\n"
- , DispatcherLog_GetMFXImplString(impl | implInterface).c_str()
- , apiVersion.Major
- , apiVersion.Minor
- , &session));
-
- mfxRes = (*(mfxStatus(MFX_CDECL *) (mfxIMPL, mfxVersion *, mfxSession *)) pFunc) (impl | implInterface, &version, &session);
- }
- else
- {
- DISPATCHER_LOG_BLOCK(("MFXInitEx(%s,ver=%u.%u,ExtThreads=%d,session=0x%p)\n"
- , DispatcherLog_GetMFXImplString(impl | implInterface).c_str()
- , apiVersion.Major
- , apiVersion.Minor
- , par.ExternalThreads
- , &session));
-
- mfxInitParam initPar = par;
- // adjusting user parameters
- initPar.Implementation = impl | implInterface;
- initPar.Version = version;
- mfxRes = (*(mfxStatus(MFX_CDECL *) (mfxInitParam, mfxSession *)) pFunc) (initPar, &session);
- }
- }
-
- if (MFX_ERR_NONE != mfxRes)
- {
- DISPATCHER_LOG_WRN((("library can't be load. MFXInit returned %s \n"), DispatcherLog_GetMFXStatusString(mfxRes)))
- }
- else
- {
- mfxRes = MFXQueryVersion((mfxSession) this, &actualApiVersion);
-
- if (MFX_ERR_NONE != mfxRes)
- {
- DISPATCHER_LOG_ERROR((("MFXQueryVersion returned: %d, skiped this library\n"), mfxRes))
- }
- else
- {
- DISPATCHER_LOG_INFO((("MFXQueryVersion returned API: %d.%d\n"), actualApiVersion.Major, actualApiVersion.Minor))
- //special hook for applications that uses sink api to get loaded library path
- DISPATCHER_LOG_LIBRARY(("%p" , hModule));
- DISPATCHER_LOG_INFO(("library loaded succesfully\n"))
- }
- }
- }
-
- loadStatus = mfxRes;
- return mfxRes;
-
-} // mfxStatus MFX_DISP_HANDLE::LoadSelectedDLL(const wchar_t *pPath, eMfxImplType implType, mfxIMPL impl)
-
-mfxStatus MFX_DISP_HANDLE::UnLoadSelectedDLL(void)
-{
- mfxStatus mfxRes = MFX_ERR_NONE;
-
- //unregistered plugins if any
- pluginFactory.Close();
-
- // close the loaded DLL
- if (session)
- {
- /* check whether it is audio session or video */
- int tableIndex = eMFXClose;
- mfxFunctionPointer pFunc;
- if (impl & MFX_IMPL_AUDIO)
- {
- pFunc = callAudioTabletableIndex;
- }
- else
- {
- pFunc = callTabletableIndex;
- }
-
- mfxRes = (*(mfxStatus (MFX_CDECL *) (mfxSession)) pFunc) (session);
- if (MFX_ERR_NONE == mfxRes)
- {
- session = (mfxSession) 0;
- }
-
- DISPATCHER_LOG_INFO((("MFXClose(0x%x) returned %d\n"), session, mfxRes));
- // actually, the return value is required to pass outside only.
- }
-
- // it is possible, that there is an active child session.
- // can't unload library in that case.
- if ((MFX_ERR_UNDEFINED_BEHAVIOR != mfxRes) &&
- (hModule))
- {
- // unload the library.
- if (!MFX::mfx_dll_free(hModule))
- {
- mfxRes = MFX_ERR_UNDEFINED_BEHAVIOR;
- }
- hModule = (mfxModuleHandle) 0;
- }
-
- return mfxRes;
-
-} // mfxStatus MFX_DISP_HANDLE::UnLoadSelectedDLL(void)
-
-
-MFX_DISP_HANDLE_EX::MFX_DISP_HANDLE_EX(const mfxVersion requiredVersion)
- : MFX_DISP_HANDLE(requiredVersion)
- , mediaAdapterType(MFX_MEDIA_UNKNOWN)
-{}
-
-
-#if (defined(_WIN64) || defined(_WIN32)) && (MFX_VERSION >= 1031)
-static mfxStatus InitDummySession(mfxU32 adapter_n, MFXVideoSession & dummy_session)
-{
- mfxInitParam initPar;
- memset(&initPar, 0, sizeof(initPar));
-
- initPar.Version.Major = 1;
- initPar.Version.Minor = 0;
-
- switch (adapter_n)
- {
- case 0:
- initPar.Implementation = MFX_IMPL_HARDWARE;
- break;
- case 1:
- initPar.Implementation = MFX_IMPL_HARDWARE2;
- break;
- case 2:
- initPar.Implementation = MFX_IMPL_HARDWARE3;
- break;
- case 3:
- initPar.Implementation = MFX_IMPL_HARDWARE4;
- break;
-
- default:
- // try searching on all display adapters
- initPar.Implementation = MFX_IMPL_HARDWARE_ANY;
- break;
- }
-
- initPar.Implementation |= MFX_IMPL_VIA_D3D11;
-
- return dummy_session.InitEx(initPar);
-}
-
-static inline bool is_iGPU(const mfxAdapterInfo& adapter_info)
-{
- return adapter_info.Platform.MediaAdapterType == MFX_MEDIA_INTEGRATED;
-}
-
-static inline bool is_dGPU(const mfxAdapterInfo& adapter_info)
-{
- return adapter_info.Platform.MediaAdapterType == MFX_MEDIA_DISCRETE;
-}
-
-// This function implies that iGPU has higher priority
-static inline mfxI32 iGPU_priority(const void* ll, const void* rr)
-{
- const mfxAdapterInfo& l = *(reinterpret_cast<const mfxAdapterInfo*>(ll));
- const mfxAdapterInfo& r = *(reinterpret_cast<const mfxAdapterInfo*>(rr));
-
- if (is_iGPU(l) && is_iGPU(r) || is_dGPU(l) && is_dGPU(r))
- return 0;
-
- if (is_iGPU(l) && is_dGPU(r))
- return -1;
-
- // The only combination left is_dGPU(l) && is_iGPU(r))
- return 1;
-}
-
-
-static void RearrangeInPriorityOrder(const mfxComponentInfo & info, MFX::MFXVector<mfxAdapterInfo> & vec)
-{
-	(void)info;
- {
- // Move iGPU to top priority
- qsort(vec.data(), vec.size(), sizeof(mfxAdapterInfo), &iGPU_priority);
- }
-}
-
-static mfxStatus PrepareAdaptersInfo(const mfxComponentInfo * info, MFX::MFXVector<mfxAdapterInfo> & vec, mfxAdaptersInfo& adapters)
-{
- // No suitable adapters on system to handle user's workload
- if (vec.empty())
- {
- adapters.NumActual = 0;
- return MFX_ERR_NOT_FOUND;
- }
-
- if (info)
- {
- RearrangeInPriorityOrder(*info, vec);
- }
-
- mfxU32 num_to_copy = (std::min)(mfxU32(vec.size()), adapters.NumAlloc);
- for (mfxU32 i = 0; i < num_to_copy; ++i)
- {
- adapters.Adaptersi = veci;
- }
-
- adapters.NumActual = num_to_copy;
-
- if (vec.size() > adapters.NumAlloc)
- {
- return MFX_WRN_OUT_OF_RANGE;
- }
-
- return MFX_ERR_NONE;
-}
-
-static inline bool QueryAdapterInfo(mfxU32 adapter_n, mfxU32& VendorID, mfxU32& DeviceID)
-{
- MFX::DXVA2Device dxvaDevice;
-
- if (!dxvaDevice.InitDXGI1(adapter_n))
- return false;
-
- VendorID = dxvaDevice.GetVendorID();
- DeviceID = dxvaDevice.GetDeviceID();
-
- return true;
-}
-
-static inline mfxU32 MakeVersion(mfxU16 major, mfxU16 minor)
-{
- return major * 1000 + minor;
-}
-
-mfxStatus MFXQueryAdaptersDecode(mfxBitstream* bitstream, mfxU32 codec_id, mfxAdaptersInfo* adapters)
-{
- if (!adapters || !bitstream)
- return MFX_ERR_NULL_PTR;
-
- MFX::MFXVector<mfxAdapterInfo> obtained_info;
-
- mfxU32 adapter_n = 0, VendorID, DeviceID;
-
- mfxComponentInfo input_info;
- memset(&input_info, 0, sizeof(input_info));
- input_info.Type = mfxComponentType::MFX_COMPONENT_DECODE;
- input_info.Requirements.mfx.CodecId = codec_id;
-
- for(;;)
- {
- if (!QueryAdapterInfo(adapter_n, VendorID, DeviceID))
- break;
-
- ++adapter_n;
-
- if (VendorID != INTEL_VENDOR_ID)
- continue;
-
- // Check if requested capabilities are supported
- MFXVideoSession dummy_session;
-
- mfxStatus sts = InitDummySession(adapter_n - 1, dummy_session);
- if (sts != MFX_ERR_NONE)
- {
- continue;
- }
-
- mfxVideoParam stream_params, out;
- memset(&out, 0, sizeof(out));
- memset(&stream_params, 0, sizeof(stream_params));
- out.mfx.CodecId = stream_params.mfx.CodecId = codec_id;
-
- sts = MFXVideoDECODE_DecodeHeader(dummy_session.operator mfxSession(), bitstream, &stream_params);
-
- if (sts != MFX_ERR_NONE)
- {
- continue;
- }
-
- sts = MFXVideoDECODE_Query(dummy_session.operator mfxSession(), &stream_params, &out);
-
- if (sts != MFX_ERR_NONE) // skip MFX_ERR_UNSUPPORTED as well as MFX_WRN_INCOMPATIBLE_VIDEO_PARAM
- continue;
-
- mfxAdapterInfo info;
- memset(&info, 0, sizeof(info));
-
- //WA for initialization when application built w/ new API, but lib w/ old one.
- mfxVersion apiVersion;
- sts = dummy_session.QueryVersion(&apiVersion);
- if (sts != MFX_ERR_NONE)
- continue;
-
- mfxU32 version = MakeVersion(apiVersion.Major, apiVersion.Minor);
-
- if (version >= 1019)
- {
- sts = MFXVideoCORE_QueryPlatform(dummy_session.operator mfxSession(), &info.Platform);
-
- if (sts != MFX_ERR_NONE)
- {
- continue;
- }
- }
- else
- {
- // for API versions greater than 1.19 Device id is set inside QueryPlatform call
- info.Platform.DeviceId = static_cast<mfxU16>(DeviceID);
- }
-
- info.Number = adapter_n - 1;
-
- obtained_info.push_back(info);
- }
-
- return PrepareAdaptersInfo(&input_info, obtained_info, *adapters);
-}
-
-mfxStatus MFXQueryAdapters(mfxComponentInfo* input_info, mfxAdaptersInfo* adapters)
-{
- if (!adapters)
- return MFX_ERR_NULL_PTR;
-
- MFX::MFXVector<mfxAdapterInfo> obtained_info;
- //obtained_info.reserve(adapters->NumAdaptersAlloc);
-
- mfxU32 adapter_n = 0, VendorID, DeviceID;
-
- for (;;)
- {
- if (!QueryAdapterInfo(adapter_n, VendorID, DeviceID))
- break;
-
- ++adapter_n;
-
- if (VendorID != INTEL_VENDOR_ID)
- continue;
-
- // Check if requested capabilities are supported
- MFXVideoSession dummy_session;
-
- mfxStatus sts = InitDummySession(adapter_n - 1, dummy_session);
- if (sts != MFX_ERR_NONE)
- {
- continue;
- }
-
- // If input_info is NULL just return all Intel adapters and information about them
- if (input_info)
- {
- mfxVideoParam out;
- memset(&out, 0, sizeof(out));
-
- switch (input_info->Type)
- {
- case mfxComponentType::MFX_COMPONENT_ENCODE:
- {
- out.mfx.CodecId = input_info->Requirements.mfx.CodecId;
-
- sts = MFXVideoENCODE_Query(dummy_session.operator mfxSession(), &input_info->Requirements, &out);
- }
- break;
- case mfxComponentType::MFX_COMPONENT_DECODE:
- {
- out.mfx.CodecId = input_info->Requirements.mfx.CodecId;
-
- sts = MFXVideoDECODE_Query(dummy_session.operator mfxSession(), &input_info->Requirements, &out);
- }
- break;
- case mfxComponentType::MFX_COMPONENT_VPP:
- {
- sts = MFXVideoVPP_Query(dummy_session.operator mfxSession(), &input_info->Requirements, &out);
- }
- break;
- default:
- sts = MFX_ERR_UNSUPPORTED;
- }
- }
-
- if (sts != MFX_ERR_NONE) // skip MFX_ERR_UNSUPPORTED as well as MFX_WRN_INCOMPATIBLE_VIDEO_PARAM
- continue;
-
- mfxAdapterInfo info;
- memset(&info, 0, sizeof(info));
-
- //WA for initialization when application built w/ new API, but lib w/ old one.
- mfxVersion apiVersion;
- sts = dummy_session.QueryVersion(&apiVersion);
- if (sts != MFX_ERR_NONE)
- continue;
-
- mfxU32 version = MakeVersion(apiVersion.Major, apiVersion.Minor);
-
- if (version >= 1019)
- {
- sts = MFXVideoCORE_QueryPlatform(dummy_session.operator mfxSession(), &info.Platform);
-
- if (sts != MFX_ERR_NONE)
- {
- continue;
- }
- }
- else
- {
- // for API versions greater than 1.19 Device id is set inside QueryPlatform call
- info.Platform.DeviceId = static_cast<mfxU16>(DeviceID);
- }
-
- info.Number = adapter_n - 1;
-
- obtained_info.push_back(info);
- }
-
- return PrepareAdaptersInfo(input_info, obtained_info, *adapters);
-}
-
-mfxStatus MFXQueryAdaptersNumber(mfxU32* num_adapters)
-{
- if (!num_adapters)
- return MFX_ERR_NULL_PTR;
-
- mfxU32 intel_adapter_count = 0, VendorID, DeviceID;
-
- for (mfxU32 cur_adapter = 0; ; ++cur_adapter)
- {
- if (!QueryAdapterInfo(cur_adapter, VendorID, DeviceID))
- break;
-
- if (VendorID == INTEL_VENDOR_ID)
- ++intel_adapter_count;
- }
-
- *num_adapters = intel_adapter_count;
-
- return MFX_ERR_NONE;
-}
-
-#endif // (defined(_WIN64) || defined(_WIN32)) && (MFX_VERSION >= 1031)

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_dispatcher_log.cpp Deleted

@@ -1,437 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if defined(MFX_DISPATCHER_LOG)
-
-#include "mfx_dispatcher_log.h"
-#include "mfxstructures.h"
-#include <windows.h>
-#if defined(DISPATCHER_LOG_REGISTER_EVENT_PROVIDER)
-#include <evntprov.h>
-#include <winmeta.h>
-#endif
-#include <stdarg.h>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-struct CodeStringTable
-{
- int code;
- const char *string;
-} LevelStrings = 
-{
- {DL_INFO, "INFO: "},
- {DL_WRN, "WARNING:"},
- {DL_ERROR, "ERROR: "}
-};
-
-#define DEFINE_CODE(code)\
- {code, #code}
-
-static CodeStringTable StringsOfImpl = {
- DEFINE_CODE(MFX_IMPL_AUTO), 
- DEFINE_CODE(MFX_IMPL_SOFTWARE),
- DEFINE_CODE(MFX_IMPL_HARDWARE), 
- DEFINE_CODE(MFX_IMPL_AUTO_ANY), 
- DEFINE_CODE(MFX_IMPL_HARDWARE_ANY), 
- DEFINE_CODE(MFX_IMPL_HARDWARE2), 
- DEFINE_CODE(MFX_IMPL_HARDWARE3), 
- DEFINE_CODE(MFX_IMPL_HARDWARE4), 
-
- DEFINE_CODE(MFX_IMPL_UNSUPPORTED)
-};
-
-static CodeStringTable StringsOfImplVIA = {
- DEFINE_CODE(MFX_IMPL_VIA_ANY),
- DEFINE_CODE(MFX_IMPL_VIA_D3D9),
- DEFINE_CODE(MFX_IMPL_VIA_D3D11),
-};
-
-static CodeStringTable StringsOfStatus =
-{
- DEFINE_CODE(MFX_ERR_NONE ),
- DEFINE_CODE(MFX_ERR_UNKNOWN ),
- DEFINE_CODE(MFX_ERR_NULL_PTR ),
- DEFINE_CODE(MFX_ERR_UNSUPPORTED ),
- DEFINE_CODE(MFX_ERR_MEMORY_ALLOC ),
- DEFINE_CODE(MFX_ERR_NOT_ENOUGH_BUFFER ),
- DEFINE_CODE(MFX_ERR_INVALID_HANDLE ),
- DEFINE_CODE(MFX_ERR_LOCK_MEMORY ),
- DEFINE_CODE(MFX_ERR_NOT_INITIALIZED ),
- DEFINE_CODE(MFX_ERR_NOT_FOUND ),
- DEFINE_CODE(MFX_ERR_MORE_DATA ),
- DEFINE_CODE(MFX_ERR_MORE_SURFACE ),
- DEFINE_CODE(MFX_ERR_ABORTED ),
- DEFINE_CODE(MFX_ERR_DEVICE_LOST ),
- DEFINE_CODE(MFX_ERR_INCOMPATIBLE_VIDEO_PARAM),
- DEFINE_CODE(MFX_ERR_INVALID_VIDEO_PARAM ),
- DEFINE_CODE(MFX_ERR_UNDEFINED_BEHAVIOR ),
- DEFINE_CODE(MFX_ERR_DEVICE_FAILED ),
- DEFINE_CODE(MFX_WRN_IN_EXECUTION ),
- DEFINE_CODE(MFX_WRN_DEVICE_BUSY ),
- DEFINE_CODE(MFX_WRN_VIDEO_PARAM_CHANGED ),
- DEFINE_CODE(MFX_WRN_PARTIAL_ACCELERATION ),
- DEFINE_CODE(MFX_WRN_INCOMPATIBLE_VIDEO_PARAM),
- DEFINE_CODE(MFX_WRN_VALUE_NOT_CHANGED ),
- DEFINE_CODE(MFX_WRN_OUT_OF_RANGE ),
- 
-};
-
-#define CODE_TO_STRING(code, array)\
- CodeToString(code, array, sizeof(array)/sizeof(array0))
-
-const char* CodeToString(int code, CodeStringTable array, int len )
-{
- for (int i = 0 ; i < len; i++)
- {
- if (arrayi.code == code)
- return arrayi.string;
- }
- return "undef";
-}
-
-std::string DispatcherLog_GetMFXImplString(int impl)
-{
- std::string str1 = CODE_TO_STRING(impl & ~(-MFX_IMPL_VIA_ANY), StringsOfImpl);
- std::string str2 = CODE_TO_STRING(impl & (-MFX_IMPL_VIA_ANY), StringsOfImplVIA);
-
- return str1 + (str2 == "undef" ? "" : "|"+str2);
-}
-
-const char *DispatcherLog_GetMFXStatusString(int sts)
-{
- return CODE_TO_STRING(sts, StringsOfStatus);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-
-void DispatcherLogBracketsHelper::Write(const char * str, ...)
-{
- va_list argsptr;
- va_start(argsptr, str);
- DispatchLog::get().Write(m_level, m_opcode, str, argsptr);
- va_end(argsptr);
-}
-
-void DispatchLogBlockHelper::Write(const char * str, ...)
-{
- va_list argsptr;
- va_start(argsptr, str);
- DispatchLog::get().Write(m_level, DL_EVENT_START, str, argsptr);
- va_end(argsptr);
-}
-
-DispatchLogBlockHelper::~DispatchLogBlockHelper()
-{
- DispatchLog::get().Write(m_level, DL_EVENT_STOP, NULL, NULL);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-DispatchLog::DispatchLog()
- : m_DispatcherLogSink(DL_SINK_PRINTF)
-{
-
-}
-
-void DispatchLog::SetSink(int nSink, IMsgHandler * pHandler)
-{
- DetachAllSinks();
- AttachSink(nSink, pHandler);
-}
-
-void DispatchLog::AttachSink(int nsink, IMsgHandler *pHandler)
-{
- m_DispatcherLogSink |= nsink;
- if (NULL != pHandler)
- m_Recepients.push_back(pHandler);
-}
-
-void DispatchLog::DetachSink(int nsink, IMsgHandler *pHandler)
-{
- if (nsink & DL_SINK_IMsgHandler)
- {
- m_Recepients.remove(pHandler);
- }
-
- m_DispatcherLogSink &= ~nsink;
-}
-
-void DispatchLog::ExchangeSink(int nsink, IMsgHandler *oldHdl, IMsgHandler *newHdl)
-{
- if (nsink & DL_SINK_IMsgHandler)
- {
- std::list<IMsgHandler*> :: iterator it = std::find(m_Recepients.begin(), m_Recepients.end(), oldHdl);
- 
- //cannot exchange in that case
- if (m_Recepients.end() == it)
- return;
-
- *it = newHdl;
- }
-}
-
-
-void DispatchLog::DetachAllSinks()
-{
- m_Recepients.clear();
- m_DispatcherLogSink = DL_SINK_NULL;
-}
-
-void DispatchLog::Write(int level, int opcode, const char * msg, va_list argptr)
-{
- int sinkTable =
- {
- DL_SINK_PRINTF,
- DL_SINK_IMsgHandler,
- };
-
- for (size_t i = 0; i < sizeof(sinkTable) / sizeof(sinkTable0); i++)
- {
- switch(m_DispatcherLogSink & sinkTablei)
- {
- case DL_SINK_NULL:
- break;
- 
- case DL_SINK_PRINTF:
- {
- char msg_formated8048 = {0};
-
- if (NULL != msg && level != DL_LOADED_LIBRARY)
- {
-#if _MSC_VER >= 1400
- vsprintf_s(msg_formated, sizeof(msg_formated)/sizeof(msg_formated0), msg, argptr);
-#else
- vsnprintf(msg_formated, sizeof(msg_formated)/sizeof(msg_formated0), msg, argptr);
-#endif
- //TODO: improve this , add opcode handling
- printf("%s %s", CODE_TO_STRING(level, LevelStrings), msg_formated);
- }
- break;
- }
-
- case DL_SINK_IMsgHandler:
- {
- std::list<IMsgHandler*>::iterator it;
-
- for (it = m_Recepients.begin(); it != m_Recepients.end(); ++it)
- {
- (*it)->Write(level, opcode, msg, argptr);
- }
- break;
- }
- }
- }
-}
-
-#if defined(DISPATCHER_LOG_REGISTER_EVENT_PROVIDER)
-class ETWHandler : public IMsgHandler
-{
-public:
- ETWHandler(const wchar_t * guid_str)
- : m_bUseFormatter(DISPATCHER_LOG_USE_FORMATING)
- , m_EventHandle()
- , m_bProviderEnable()
- {
- GUID rguid = GUID_NULL;
- if (FAILED(CLSIDFromString(guid_str, &rguid)))
- {
- return;
- }
- 
- EventRegister(&rguid, NULL, NULL, &m_EventHandle);
-
- m_bProviderEnable = 0 != EventProviderEnabled(m_EventHandle, 1,0);
- }
-
- ~ETWHandler()
- {
- if (m_EventHandle)
- {
- EventUnregister(m_EventHandle);
- }
- }
-
- virtual void Write(int level, int opcode, const char * msg, va_list argptr)
- {
- //event not registered
- if (0==m_EventHandle)
- {
- return;
- }
- if (!m_bProviderEnable)
- {
- return;
- }
- if (level == DL_LOADED_LIBRARY)
- {
- return;
- }
-
- char msg_formated1024;
- EVENT_DESCRIPTOR descriptor;
- EVENT_DATA_DESCRIPTOR data_descriptor;
-
- EventDescZero(&descriptor);
- 
- descriptor.Opcode = (UCHAR)opcode; 
- descriptor.Level = (UCHAR)level;
- 
- if (m_bUseFormatter)
- {
- if (NULL != msg)
- {
-#if _MSC_VER >= 1400
- vsprintf_s(msg_formated, sizeof (msg_formated) / sizeof (msg_formated0), msg, argptr);
-#else
- vsnprintf(msg_formated, sizeof (msg_formated) / sizeof (msg_formated0), msg, argptr);
-#endif
- EventDataDescCreate(&data_descriptor, msg_formated, (ULONG)(strlen(msg_formated) + 1));
- }else
- {
- EventDataDescCreate(&data_descriptor, NULL, 0);
- }
- }else
- {
- //TODO: non formated events supports under zbb 
- }
-
- EventWrite(m_EventHandle, &descriptor, 1, &data_descriptor);
- }
-
-protected:
-
- //we may not use formatter in some cases described in dispatch_log macro
- //it significantly increases performance by eliminating any vsprintf operations
- bool m_bUseFormatter;
- //consumer is attached, dispatcher trace to reduce formating overhead 
- //submits event only if consumer attached
- bool m_bProviderEnable;
- REGHANDLE m_EventHandle;
-};
-//
-
-
-IMsgHandler *ETWHandlerFactory::GetSink(const wchar_t* sguid)
-{
- _storage_type::iterator it;
- it = m_storage.find(sguid);
- if (it == m_storage.end())
- {
- ETWHandler * handler = new ETWHandler(sguid);
- _storage_type::_Pairib it_bool = m_storage.insert(_storage_type::value_type(sguid, handler));
- it = it_bool.first;
- }
-
- return it->second;
-}
-
-ETWHandlerFactory::~ETWHandlerFactory()
-{
- for each(_storage_type::value_type val in m_storage)
- {
- delete val.second;
- }
-}
-
-class EventRegistrator : public IMsgHandler
-{
- const wchar_t * m_sguid;
-public:
- EventRegistrator(const wchar_t* sguid = DISPATCHER_LOG_EVENT_GUID)
- :m_sguid(sguid)
- {
- DispatchLog::get().AttachSink( DL_SINK_IMsgHandler
- , this);
- }
-
- virtual void Write(int level, int opcode, const char * msg, va_list argptr)
- {
- //we cannot call attach sink since we may have been called from iteration
- //we axchanging preserve that placeholding
- IMsgHandler * pSink = NULL;
- DispatchLog::get().ExchangeSink(DL_SINK_IMsgHandler,
- this,
- pSink = ETWHandlerFactory::get().GetSink(m_sguid));
- //need to call only once here all next calls will be done inside dispatcherlog
- if (NULL != pSink)
- {
- pSink->Write(level, opcode, msg, argptr);
- }
- }
-};
-#endif
-
-template <class TSink>
-class SinkRegistrator
-{
-};
-
-#if defined(DISPATCHER_LOG_REGISTER_EVENT_PROVIDER)
-template <>
-class SinkRegistrator<ETWHandlerFactory>
-{
-public:
- SinkRegistrator(const wchar_t* sguid = DISPATCHER_LOG_EVENT_GUID)
- {
- DispatchLog::get().AttachSink( DL_SINK_IMsgHandler
- , ETWHandlerFactory::get().GetSink(sguid));
- }
-};
-#endif
-
-#if defined(DISPATCHER_LOG_REGISTER_FILE_WRITER)
-template <>
-class SinkRegistrator<FileSink>
-{
-public:
- SinkRegistrator()
- {
- DispatchLog::get().AttachSink( DL_SINK_IMsgHandler, &FileSink::get(DISPACTHER_LOG_FW_PATH));
- }
-};
-
-void FileSink::Write(int level, int /*opcode*/, const char * msg, va_list argptr)
-{
- if (NULL != m_hdl && NULL != msg)
- {
- fprintf(m_hdl, "%s", CODE_TO_STRING(level, LevelStrings));
- vfprintf(m_hdl, msg, argptr);
- }
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-//singletons initialization section
-
-
-#ifdef DISPATCHER_LOG_REGISTER_EVENT_PROVIDER
- static SinkRegistrator<ETWHandlerFactory> g_registrator1;
-#endif
-
-
-#ifdef DISPATCHER_LOG_REGISTER_FILE_WRITER
- static SinkRegistrator<FileSink> g_registrator2;
-#endif
-
-
-#endif//(MFX_DISPATCHER_LOG)
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_driver_store_loader.cpp Deleted

@@ -1,218 +0,0 @@
-// Copyright (c) 2019-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include <tchar.h>
-
-#include "mfx_driver_store_loader.h"
-#include "mfx_dispatcher_log.h"
-#include "mfx_load_dll.h"
-
-namespace MFX
-{
-
-
-inline bool IsIntelDeviceInstanceID(const wchar_t * DeviceID)
-{
- return wcsstr(DeviceID, L"VEN_8086") || wcsstr(DeviceID, L"ven_8086");
-}
-
-inline bool ExctractDeviceID(const wchar_t* descrString, mfxU32& deviceID)
-{
- const wchar_t *begin = wcsstr(descrString, L"DEV_");
-
- if (!begin)
- {
- begin = wcsstr(descrString, L"dev_");
- if (!begin)
- {
- DISPATCHER_LOG_WRN(("exctracting device id: failed to find device id substring\n"));
- return false;
- }
- }
-
- begin += wcslen(L"DEV_");
- deviceID = wcstoul(begin, NULL, 16);
- if (!deviceID)
- {
- DISPATCHER_LOG_WRN(("exctracting device id: failed to convert device id str to int\n"));
- return false;
- }
-
- return true;
-}
-
-
-
-DriverStoreLoader::DriverStoreLoader(void)
- : m_moduleCfgMgr(NULL)
- , m_pCM_Get_Device_ID_List_Size(NULL)
- , m_pCM_Get_Device_ID_List(NULL)
- , m_pCM_Locate_DevNode(NULL)
- , m_pCM_Open_DevNode_Key(NULL)
-{
-}
-
-DriverStoreLoader::~DriverStoreLoader(void)
-{
-}
-
-bool DriverStoreLoader::GetDriverStorePath(wchar_t * path, DWORD dwPathSize, mfxU32 deviceID)
-{
- if (path == NULL || dwPathSize == 0)
- {
- return false;
- }
-
- // Obtain a PnP handle to the Intel graphics adapter
- CONFIGRET result = CR_SUCCESS;
- ULONG DeviceIDListSize = 0;
- MFXVector<WCHAR> DeviceIDList;
- wchar_t DisplayGUID40;
- DEVINST DeviceInst;
-
- DISPATCHER_LOG_INFO(("Looking for MediaSDK in DriverStore\n"));
-
- if (!LoadCfgMgr() || !LoadCmFuncs())
- {
- return false;
- }
-
- if (StringFromGUID2(GUID_DEVCLASS_DISPLAY, DisplayGUID, sizeof(DisplayGUID)) == 0)
- {
- DISPATCHER_LOG_WRN(("Couldn't prepare string from GUID\n"));
- return false;
- }
-
- do
- {
- result = m_pCM_Get_Device_ID_List_Size(&DeviceIDListSize, DisplayGUID, CM_GETIDLIST_FILTER_CLASS | CM_GETIDLIST_FILTER_PRESENT);
- if (result != CR_SUCCESS)
- {
- break;
- }
-
- try
- {
- DeviceIDList.resize(DeviceIDListSize);
- }
- catch (...)
- {
- return false;
- }
- result = m_pCM_Get_Device_ID_List(DisplayGUID, DeviceIDList.data(), DeviceIDListSize, CM_GETIDLIST_FILTER_CLASS | CM_GETIDLIST_FILTER_PRESENT);
-
- } while (result == CR_BUFFER_SMALL);
-
- if (result != CR_SUCCESS)
- {
- return false;
- }
-
- //Look for MediaSDK record
- wchar_t *begin = DeviceIDList.data();
- wchar_t *end = begin + DeviceIDList.size();
- size_t len = 0;
-
- for (; (begin < end) && (len = wcslen(begin)) > 0; begin += len + 1)
- {
- if (IsIntelDeviceInstanceID(begin))
- {
- mfxU32 curDeviceID = 0;
- if (!ExctractDeviceID(begin, curDeviceID) || curDeviceID != deviceID)
- {
- continue;
- }
-
- result = m_pCM_Locate_DevNode(&DeviceInst, begin, CM_LOCATE_DEVNODE_NORMAL);
- if (result != CR_SUCCESS)
- {
- continue;
- }
-
- HKEY hKey_sw;
- result = m_pCM_Open_DevNode_Key(DeviceInst, KEY_READ, 0, RegDisposition_OpenExisting, &hKey_sw, CM_REGISTRY_SOFTWARE);
- if (result != CR_SUCCESS)
- {
- continue;
- }
-
- ULONG nError;
-
- DWORD pathSize = dwPathSize;
-
- nError = RegQueryValueExW(hKey_sw, L"DriverStorePathForMediaSDK", 0, NULL, (LPBYTE)path, &pathSize);
-
- RegCloseKey(hKey_sw);
-
- if (ERROR_SUCCESS == nError)
- {
- if (pathwcslen(path) - 1 != '/' && pathwcslen(path) - 1 != '\\')
- {
- wcscat_s(path, MFX_MAX_DLL_PATH, L"\\");
- }
- DISPATCHER_LOG_INFO(("DriverStore path is found\n"));
- return true;
- }
- }
- }
-
- DISPATCHER_LOG_INFO(("DriverStore path isn't found\n"));
- return false;
-
-} // bool DriverStoreLoader::GetDriverStorePath(wchar_t * path, DWORD dwPathSize)
-
-bool DriverStoreLoader::LoadCfgMgr()
-{
- if (!m_moduleCfgMgr)
- {
- m_moduleCfgMgr = mfx_dll_load(L"cfgmgr32.dll");
-
- if (!m_moduleCfgMgr)
- {
- DISPATCHER_LOG_WRN(("cfgmgr32.dll couldn't be loaded\n"));
- return false;
- }
- }
-
- return true;
-
-} // bool DriverStoreLoader::LoadCfgMgr()
-
-bool DriverStoreLoader::LoadCmFuncs()
-{
- if (!m_pCM_Get_Device_ID_List || !m_pCM_Get_Device_ID_List_Size || !m_pCM_Locate_DevNode || !m_pCM_Open_DevNode_Key)
- {
- m_pCM_Get_Device_ID_List = (Func_CM_Get_Device_ID_ListW) mfx_dll_get_addr((HMODULE)m_moduleCfgMgr, "CM_Get_Device_ID_ListW");
- m_pCM_Get_Device_ID_List_Size = (Func_CM_Get_Device_ID_List_SizeW) mfx_dll_get_addr((HMODULE)m_moduleCfgMgr, "CM_Get_Device_ID_List_SizeW");
- m_pCM_Locate_DevNode = (Func_CM_Locate_DevNodeW) mfx_dll_get_addr((HMODULE)m_moduleCfgMgr, "CM_Locate_DevNodeW");
- m_pCM_Open_DevNode_Key = (Func_CM_Open_DevNode_Key) mfx_dll_get_addr((HMODULE)m_moduleCfgMgr, "CM_Open_DevNode_Key");
-
- if (!m_pCM_Get_Device_ID_List || !m_pCM_Get_Device_ID_List_Size || !m_pCM_Locate_DevNode || !m_pCM_Open_DevNode_Key)
- {
- DISPATCHER_LOG_WRN(("One of cfgmgr32.dll function isn't found\n"));
- return false;
- }
- }
-
- return true;
-
-} // bool DriverStoreLoader::LoadCmFuncs()
-
-} // namespace MFX

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_dxva2_device.cpp Deleted

@@ -1,568 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#define INITGUID
-#include <d3d9.h>
-#include <dxgi.h>
-
-#include "mfx_dxva2_device.h"
-
-
-using namespace MFX;
-
-
-DXDevice::DXDevice(void)
-{
- m_hModule = (HMODULE) 0;
-
- m_numAdapters = 0;
-
- m_vendorID = 0;
- m_deviceID = 0;
- m_driverVersion = 0;
- m_luid = 0;
-
-} // DXDevice::DXDevice(void)
-
-DXDevice::~DXDevice(void)
-{
- Close();
-
- // free DX library only when device is destroyed
- UnloadDLLModule();
-
-} // DXDevice::~DXDevice(void)
-
-mfxU32 DXDevice::GetVendorID(void) const
-{
- return m_vendorID;
-
-} // mfxU32 DXDevice::GetVendorID(void) const
-
-mfxU32 DXDevice::GetDeviceID(void) const
-{
- return m_deviceID;
-
-} // mfxU32 DXDevice::GetDeviceID(void) const
-
-mfxU64 DXDevice::GetDriverVersion(void) const
-{
- return m_driverVersion;
- 
-}// mfxU64 DXDevice::GetDriverVersion(void) const
-
-mfxU64 DXDevice::GetLUID(void) const
-{
- return m_luid;
-
-} // mfxU64 DXDevice::GetLUID(void) const
-
-mfxU32 DXDevice::GetAdapterCount(void) const
-{
- return m_numAdapters;
-
-} // mfxU32 DXDevice::GetAdapterCount(void) const
-
-void DXDevice::Close(void)
-{
- m_numAdapters = 0;
-
- m_vendorID = 0;
- m_deviceID = 0;
- m_luid = 0;
-
-} // void DXDevice::Close(void)
-
-void DXDevice::LoadDLLModule(const wchar_t *pModuleName)
-{
- // unload the module if it is required
- UnloadDLLModule();
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- DWORD prevErrorMode = 0;
- // set the silent error mode
-#if (_WIN32_WINNT >= 0x0600)
- SetThreadErrorMode(SEM_FAILCRITICALERRORS, &prevErrorMode); 
-#else
- prevErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
-#endif
-#endif // !defined(MEDIASDK_UWP_DISPATCHER)
-
- // load specified library
- m_hModule = LoadLibraryExW(pModuleName, NULL, 0);
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- // set the previous error mode
-#if (_WIN32_WINNT >= 0x0600)
- SetThreadErrorMode(prevErrorMode, NULL);
-#else
- SetErrorMode(prevErrorMode);
-#endif
-#endif // !defined(MEDIASDK_UWP_DISPATCHER)
-
-} // void LoadDLLModule(const wchar_t *pModuleName)
-
-void DXDevice::UnloadDLLModule(void)
-{
- if (m_hModule)
- {
- FreeLibrary(m_hModule);
- m_hModule = (HMODULE) 0;
- }
-
-} // void DXDevice::UnloaDLLdModule(void)
-
-#ifdef MFX_D3D9_ENABLED
-D3D9Device::D3D9Device(void)
-{
- m_pD3D9 = (void *) 0;
- m_pD3D9Ex = (void *) 0;
-
-} // D3D9Device::D3D9Device(void)
-
-D3D9Device::~D3D9Device(void)
-{
- Close();
-
-} // D3D9Device::~D3D9Device(void)
-
-void D3D9Device::Close(void)
-{
- // release the interfaces
- if (m_pD3D9Ex)
- {
- ((IDirect3D9Ex *) m_pD3D9Ex)->Release();
- }
-
- // release the interfaces
- if (m_pD3D9)
- {
- ((IDirect3D9 *) m_pD3D9)->Release();
- }
-
- m_pD3D9 = (void *) 0;
- m_pD3D9Ex = (void *) 0;
-
-} // void D3D9Device::Close(void)
-
-typedef
- IDirect3D9 * (WINAPI *D3DCreateFunctionPtr_t) (UINT);
-
-typedef
- HRESULT (WINAPI *D3DExCreateFunctionPtr_t) (UINT, IDirect3D9Ex **);
-
-bool D3D9Device::Init(const mfxU32 adapterNum)
-{
- // close the device before initialization
- Close();
-
- // load the library
- if (NULL == m_hModule)
- {
- LoadDLLModule(L"d3d9.dll");
- }
-
- if (m_hModule)
- {
- D3DCreateFunctionPtr_t pFunc;
-
- // load address of procedure to create D3D device
- pFunc = (D3DCreateFunctionPtr_t) GetProcAddress(m_hModule, "Direct3DCreate9");
- if (pFunc)
- {
- D3DADAPTER_IDENTIFIER9 adapterIdent;
- IDirect3D9 *pD3D9;
- HRESULT hRes;
-
- // create D3D object
- m_pD3D9 = pFunc(D3D_SDK_VERSION);
-
- if (NULL == m_pD3D9)
- {
- DXVA2DEVICE_TRACE(("FAIL: Direct3DCreate9(%d) : GetLastError()=0x%x", D3D_SDK_VERSION, GetLastError()));
- return false;
- }
-
- // cast the interface
- pD3D9 = (IDirect3D9 *) m_pD3D9;
-
- m_numAdapters = pD3D9->GetAdapterCount();
- if (adapterNum >= m_numAdapters)
- {
- return false;
- }
-
- // get the card's parameters
- hRes = pD3D9->GetAdapterIdentifier(adapterNum, 0, &adapterIdent);
- if (D3D_OK != hRes)
- {
- DXVA2DEVICE_TRACE(("FAIL: GetAdapterIdentifier(%d) = 0x%x \n", adapterNum, hRes)); 
- return false;
- }
-
- m_vendorID = adapterIdent.VendorId;
- m_deviceID = adapterIdent.DeviceId;
- m_driverVersion = (mfxU64)adapterIdent.DriverVersion.QuadPart;
-
- // load LUID
- IDirect3D9Ex *pD3D9Ex;
- D3DExCreateFunctionPtr_t pFuncEx;
- LUID d3d9LUID;
-
- // find the appropriate function
- pFuncEx = (D3DExCreateFunctionPtr_t) GetProcAddress(m_hModule, "Direct3DCreate9Ex");
- if (NULL == pFuncEx)
- {
- // the extended interface is not supported
- return true;
- }
-
- // create extended interface
- hRes = pFuncEx(D3D_SDK_VERSION, &pD3D9Ex);
- if (FAILED(hRes))
- {
- // can't create extended interface
- return true;
- }
- m_pD3D9Ex = pD3D9Ex;
-
- // obtain D3D9 device LUID
- hRes = pD3D9Ex->GetAdapterLUID(adapterNum, &d3d9LUID);
- if (FAILED(hRes))
- {
- // can't get LUID
- return true;
- }
- // copy the LUID
- *((LUID *) &m_luid) = d3d9LUID;
- }
- else
- {
- DXVA2DEVICE_TRACE_OPERATION({
- wchar_t path1024; 
- DWORD lastErr = GetLastError();
- GetModuleFileNameW(m_hModule, path, sizeof(path)/sizeof(path0));
- DXVA2DEVICE_TRACE(("FAIL: invoking GetProcAddress(Direct3DCreate9) in %S : GetLastError()==0x%x\n", path, lastErr)); });
- return false;
- }
- }
- else
- {
- DXVA2DEVICE_TRACE(("FAIL: invoking LoadLibrary(\"d3d9.dll\") : GetLastError()==0x%x\n", GetLastError())); 
- return false;
- }
-
- return true;
-
-} // bool D3D9Device::Init(const mfxU32 adapterNum)
-#endif //MFX_D3D9_ENABLED
-
-typedef
-HRESULT (WINAPI *DXGICreateFactoryFunc) (REFIID riid, void **ppFactory);
-
-DXGI1Device::DXGI1Device(void)
-{
- m_pDXGIFactory1 = (void *) 0;
- m_pDXGIAdapter1 = (void *) 0;
-
-} // DXGI1Device::DXGI1Device(void)
-
-DXGI1Device::~DXGI1Device(void)
-{
- Close();
-
-} // DXGI1Device::~DXGI1Device(void)
-
-void DXGI1Device::Close(void)
-{
- // release the interfaces
- if (m_pDXGIAdapter1)
- {
- ((IDXGIAdapter1 *) m_pDXGIAdapter1)->Release();
- }
-
- if (m_pDXGIFactory1)
- {
- ((IDXGIFactory1 *) m_pDXGIFactory1)->Release();
- }
-
- m_pDXGIFactory1 = (void *) 0;
- m_pDXGIAdapter1 = (void *) 0;
-
-} // void DXGI1Device::Close(void)
-
-bool DXGI1Device::Init(const mfxU32 adapterNum)
-{
- // release the object before initialization
- Close();
-
- IDXGIFactory1 *pFactory = NULL;
- IDXGIAdapter1 *pAdapter = NULL;
- DXGI_ADAPTER_DESC1 desc = { 0 };
- mfxU32 curAdapter = 0;
- mfxU32 maxAdapters = 0;
- HRESULT hRes = E_FAIL;
-
- DXGICreateFactoryFunc pFunc = NULL;
-
- // load up the library if it is not loaded
- if (NULL == m_hModule)
- {
- LoadDLLModule(L"dxgi.dll");
- }
-
- if (m_hModule)
- {
- // load address of procedure to create DXGI 1.1 factory
- pFunc = (DXGICreateFactoryFunc)GetProcAddress(m_hModule, "CreateDXGIFactory1");
- }
-
- if (NULL == pFunc)
- {
- return false;
- }
-
- // create the factory
-#if _MSC_VER >= 1400
- hRes = pFunc(__uuidof(IDXGIFactory1), (void**)(&pFactory));
-#else
- hRes = pFunc(IID_IDXGIFactory1, (void**)(&pFactory));
-#endif
-
- if (FAILED(hRes))
- {
- return false;
- }
- m_pDXGIFactory1 = pFactory;
-
- // get the number of adapters
- curAdapter = 0;
- maxAdapters = 0;
- do
- {
- // get the required adapted
- hRes = pFactory->EnumAdapters1(curAdapter, &pAdapter);
- if (FAILED(hRes))
- {
- break;
- }
-
- // if it is the required adapter, save the interface
- if (curAdapter == adapterNum)
- {
- m_pDXGIAdapter1 = pAdapter;
- }
- else
- {
- pAdapter->Release();
- }
-
- // get the next adapter
- curAdapter += 1;
-
- } while (SUCCEEDED(hRes));
- maxAdapters = curAdapter;
-
- // there is no required adapter
- if (adapterNum >= maxAdapters)
- {
- return false;
- }
- pAdapter = (IDXGIAdapter1 *) m_pDXGIAdapter1;
-
- // get the adapter's parameters
- hRes = pAdapter->GetDesc1(&desc);
- if (FAILED(hRes))
- {
- return false;
- }
-
- // save the parameters
- m_vendorID = desc.VendorId;
- m_deviceID = desc.DeviceId;
- *((LUID *) &m_luid) = desc.AdapterLuid;
-
- return true;
-
-} // bool DXGI1Device::Init(const mfxU32 adapterNum)
-
-DXVA2Device::DXVA2Device(void)
-{
- m_numAdapters = 0;
-
- m_vendorID = 0;
- m_deviceID = 0;
-
- m_driverVersion = 0;
-} // DXVA2Device::DXVA2Device(void)
-
-DXVA2Device::~DXVA2Device(void)
-{
- Close();
-
-} // DXVA2Device::~DXVA2Device(void)
-
-void DXVA2Device::Close(void)
-{
- m_numAdapters = 0;
-
- m_vendorID = 0;
- m_deviceID = 0;
-
- m_driverVersion = 0;
-} // void DXVA2Device::Close(void)
-
-#ifdef MFX_D3D9_ENABLED
-bool DXVA2Device::InitD3D9(const mfxU32 adapterNum)
-{
- D3D9Device d3d9Device;
- bool bRes;
-
- // release the object before initialization
- Close();
-
- // create 'old fashion' device
- bRes = d3d9Device.Init(adapterNum);
- if (false == bRes)
- {
- return false;
- }
-
-
- m_numAdapters = d3d9Device.GetAdapterCount();
-
- // check if the application is under Remote Desktop
- if ((0 == d3d9Device.GetVendorID()) || (0 == d3d9Device.GetDeviceID()))
- {
- // get the required parameters alternative way and ...
- UseAlternativeWay(&d3d9Device);
- }
- else
- {
- // save the parameters and ...
- m_vendorID = d3d9Device.GetVendorID();
- m_deviceID = d3d9Device.GetDeviceID();
- m_driverVersion = d3d9Device.GetDriverVersion();
- }
-
- // ... say goodbye
- return true;
-} // bool InitD3D9(const mfxU32 adapterNum)
-#else // MFX_D3D9_ENABLED
-bool DXVA2Device::InitD3D9(const mfxU32 adapterNum)
-{
- (void)adapterNum;
- return false;
-}
-#endif // MFX_D3D9_ENABLED
-
-bool DXVA2Device::InitDXGI1(const mfxU32 adapterNum)
-{
- DXGI1Device dxgi1Device;
- bool bRes;
-
- // release the object before initialization
- Close();
-
- // create modern DXGI device
- bRes = dxgi1Device.Init(adapterNum);
- if (false == bRes)
- {
- return false;
- }
-
- // save the parameters and ...
- m_vendorID = dxgi1Device.GetVendorID();
- m_deviceID = dxgi1Device.GetDeviceID();
- m_numAdapters = dxgi1Device.GetAdapterCount();
-
- // ... say goodbye
- return true;
-
-} // bool DXVA2Device::InitDXGI1(const mfxU32 adapterNum)
-
-#ifdef MFX_D3D9_ENABLED
-void DXVA2Device::UseAlternativeWay(const D3D9Device *pD3D9Device)
-{
- mfxU64 d3d9LUID = pD3D9Device->GetLUID();
-
- // work only with valid LUIDs
- if (0 == d3d9LUID)
- {
- return;
- }
-
- DXGI1Device dxgi1Device;
- mfxU32 curDevice = 0;
- bool bRes = false;
-
- do
- {
- // initialize the next DXGI1 or DXGI device
- bRes = dxgi1Device.Init(curDevice);
- if (false == bRes)
- {
- // there is no more devices
- break;
- }
-
- // is it required device ?
- if (d3d9LUID == dxgi1Device.GetLUID())
- {
- m_vendorID = dxgi1Device.GetVendorID();
- m_deviceID = dxgi1Device.GetDeviceID();
- m_driverVersion = dxgi1Device.GetDriverVersion();
- return ;
- }
-
- // get the next device
- curDevice += 1;
-
- } while (bRes);
-
- dxgi1Device.Close();
- // we need to match a DXGI(1) device to the D3D9 device
-
-} // void DXVA2Device::UseAlternativeWay(const D3D9Device *pD3D9Device)
-#endif // MFX_D3D9_ENABLED
-
-mfxU32 DXVA2Device::GetVendorID(void) const
-{
- return m_vendorID;
-
-} // mfxU32 DXVA2Device::GetVendorID(void) const
-
-mfxU32 DXVA2Device::GetDeviceID(void) const
-{
- return m_deviceID;
-
-} // mfxU32 DXVA2Device::GetDeviceID(void) const
-
-mfxU64 DXVA2Device::GetDriverVersion(void) const
-{
- return m_driverVersion;
-}// mfxU64 DXVA2Device::GetDriverVersion(void) const
-
-mfxU32 DXVA2Device::GetAdapterCount(void) const
-{
- return m_numAdapters;
-
-} // mfxU32 DXVA2Device::GetAdapterCount(void) const
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_function_table.cpp Deleted

@@ -1,133 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfx_dispatcher.h"
-
-//
-// implement a table with functions names
-//
-
-#undef FUNCTION
-#define FUNCTION(return_value, func_name, formal_param_list, actual_param_list) \
-    {#func_name, API_VERSION},
-
-const
-FUNCTION_DESCRIPTION APIFunceVideoFuncTotal =
-{
-    {"MFXInit", {{0, 1}}},
-    {"MFXClose", {{0, 1}}},
-    {"MFXQueryIMPL", {{0, 1}}},
-    {"MFXQueryVersion", {{0, 1}}},
-
-    {"MFXJoinSession", {{1, 1}}},
-    {"MFXDisjoinSession", {{1, 1}}},
-    {"MFXCloneSession", {{1, 1}}},
-    {"MFXSetPriority", {{1, 1}}},
-    {"MFXGetPriority", {{1, 1}}},
-    
-    {"MFXInitEx", {{1, 14}}},
-
-#include "mfx_exposed_functions_list.h"
-};
-
-const
-FUNCTION_DESCRIPTION APIAudioFunceAudioFuncTotal =
-{
-    {"MFXInit", {{8, 1}}},
-    {"MFXClose", {{8, 1}}},
-    {"MFXQueryIMPL", {{8, 1}}},
-    {"MFXQueryVersion", {{8, 1}}},
-
-    {"MFXJoinSession", {{8, 1}}},
-    {"MFXDisjoinSession", {{8, 1}}},
-    {"MFXCloneSession", {{8, 1}}},
-    {"MFXSetPriority", {{8, 1}}},
-    {"MFXGetPriority", {{8, 1}}},
-
-#include "mfxaudio_exposed_functions_list.h"
-};
-
-// static section of the file
-namespace
-{
-
-//
-// declare pseudo-functions.
-// they are used as default values for call-tables.
-//
-
-mfxStatus pseudoMFXInit(mfxIMPL impl, mfxVersion *ver, mfxSession *session)
-{
-    // touch unreferenced parameters
-    (void) impl;
-    (void) ver;
-    (void) session;
-
-    return MFX_ERR_UNKNOWN;
-
-} // mfxStatus pseudoMFXInit(mfxIMPL impl, mfxVersion *ver, mfxSession *session)
-
-mfxStatus pseudoMFXClose(mfxSession session)
-{
-    // touch unreferenced parameters
-    (void) session;
-
-    return MFX_ERR_UNKNOWN;
-
-} // mfxStatus pseudoMFXClose(mfxSession session)
-
-mfxStatus pseudoMFXJoinSession(mfxSession session, mfxSession child_session)
-{
-    // touch unreferenced parameters
-    (void) session;
-    (void) child_session;
-
-    return MFX_ERR_UNKNOWN;
-
-} // mfxStatus pseudoMFXJoinSession(mfxSession session, mfxSession child_session)
-
-mfxStatus pseudoMFXCloneSession(mfxSession session, mfxSession *clone)
-{
-    // touch unreferenced parameters
-    (void) session;
-    (void) clone;
-
-    return MFX_ERR_UNKNOWN;
-
-} // mfxStatus pseudoMFXCloneSession(mfxSession session, mfxSession *clone)
-
-void SuppressWarnings(...)
-{
-    // this functions is suppose to suppress warnings.
-    // Actually it does nothing.
-
-} // void SuppressWarnings(...)
-
-#undef FUNCTION
-#define FUNCTION(return_value, func_name, formal_param_list, actual_param_list) \
-return_value pseudo##func_name formal_param_list \
-{ \
-    SuppressWarnings actual_param_list; \
-    return MFX_ERR_UNKNOWN; \
-}
-
-#include "mfx_exposed_functions_list.h"
-
-} // namespace

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_library_iterator.cpp Deleted

@@ -1,592 +0,0 @@
-// Copyright (c) 2012-2020 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfx_library_iterator.h"
-
-#include "mfx_dispatcher.h"
-#include "mfx_dispatcher_log.h"
-
-#include "mfx_dxva2_device.h"
-#include "mfx_load_dll.h"
-
-#include <tchar.h>
-#include <windows.h>
-
-namespace MFX
-{
-
-enum
-{
- MFX_MAX_MERIT = 0x7fffffff
-};
-
-//
-// declare registry keys
-//
-
-const
-wchar_t rootDispPath = L"Software\\Intel\\MediaSDK\\Dispatch";
-const
-wchar_t vendorIDKeyName = L"VendorID";
-const
-wchar_t deviceIDKeyName = L"DeviceID";
-const
-wchar_t meritKeyName = L"Merit";
-const
-wchar_t pathKeyName = L"Path";
-const
-wchar_t apiVersionName = L"APIVersion";
-
-mfxStatus SelectImplementationType(const mfxU32 adapterNum, mfxIMPL *pImplInterface, mfxU32 *pVendorID, mfxU32 *pDeviceID)
-{
- if (NULL == pImplInterface)
- {
- return MFX_ERR_NULL_PTR;
- }
-#if (MFX_VERSION >= MFX_VERSION_NEXT)
- mfxIMPL impl_via = (*pImplInterface & ~MFX_IMPL_EXTERNAL_THREADING);
-#else
- mfxIMPL impl_via = *pImplInterface;
-#endif
-
- DXVA2Device dxvaDevice;
- if (MFX_IMPL_VIA_D3D9 == impl_via)
- {
- // try to create the Direct3D 9 device and find right adapter
- if (!dxvaDevice.InitD3D9(adapterNum))
- {
- DISPATCHER_LOG_INFO((("dxvaDevice.InitD3D9(%d) Failed\n"), adapterNum ));
- return MFX_ERR_UNSUPPORTED;
- }
- }
- else if (MFX_IMPL_VIA_D3D11 == impl_via)
- {
- // try to open DXGI 1.1 device to get hardware ID
- if (!dxvaDevice.InitDXGI1(adapterNum))
- {
- DISPATCHER_LOG_INFO((("dxvaDevice.InitDXGI1(%d) Failed\n"), adapterNum ));
- return MFX_ERR_UNSUPPORTED;
- }
- }
- else if (MFX_IMPL_VIA_ANY == impl_via)
- {
- // try the Direct3D 9 device
- if (dxvaDevice.InitD3D9(adapterNum))
- {
- *pImplInterface = MFX_IMPL_VIA_D3D9; // store value for GetImplementationType() call
- }
- // else try to open DXGI 1.1 device to get hardware ID
- else if (dxvaDevice.InitDXGI1(adapterNum))
- {
- *pImplInterface = MFX_IMPL_VIA_D3D11; // store value for GetImplementationType() call
- }
- else
- {
- DISPATCHER_LOG_INFO((("Unsupported adapter %d\n"), adapterNum ));
- return MFX_ERR_UNSUPPORTED;
- }
- }
- else
- {
- DISPATCHER_LOG_ERROR((("Unknown implementation type %d\n"), *pImplInterface ));
- return MFX_ERR_UNSUPPORTED;
- }
-
- // obtain card's parameters
- if (pVendorID && pDeviceID)
- {
- *pVendorID = dxvaDevice.GetVendorID();
- *pDeviceID = dxvaDevice.GetDeviceID();
- }
-
- return MFX_ERR_NONE;
-}
-
-MFXLibraryIterator::MFXLibraryIterator(void)
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- : m_baseRegKey()
-#endif
-{
- m_implType = MFX_LIB_PSEUDO;
- m_implInterface = MFX_IMPL_UNSUPPORTED;
-
- m_vendorID = 0;
- m_deviceID = 0;
-
- m_lastLibIndex = 0;
- m_lastLibMerit = MFX_MAX_MERIT;
-
- m_bIsSubKeyValid = 0;
- m_StorageID = 0;
-
- m_SubKeyName0 = 0;
-} // MFXLibraryIterator::MFXLibraryIterator(void)
-
-MFXLibraryIterator::~MFXLibraryIterator(void)
-{
- Release();
-
-} // MFXLibraryIterator::~MFXLibraryIterator(void)
-
-void MFXLibraryIterator::Release(void)
-{
- m_implType = MFX_LIB_PSEUDO;
- m_implInterface = MFX_IMPL_UNSUPPORTED;
-
- m_vendorID = 0;
- m_deviceID = 0;
-
- m_lastLibIndex = 0;
- m_lastLibMerit = MFX_MAX_MERIT;
- m_SubKeyName0 = 0;
-
-} // void MFXLibraryIterator::Release(void)
-
-DECLSPEC_NOINLINE HMODULE GetThisDllModuleHandle()
-{
- HMODULE hDll = NULL;
-
- GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
- GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
- reinterpret_cast<LPCWSTR>(&GetThisDllModuleHandle), &hDll);
- return hDll;
-}
-
-// wchar_t* sImplPath must be allocated with size not less then msdk_disp_path_len
-bool GetImplPath(int storageID, wchar_t* sImplPath)
-{
- HMODULE hModule = NULL;
-
- sImplPath0 = L'\0';
-
- switch (storageID) {
- case MFX_APP_FOLDER:
- hModule = 0;
- break;
- case MFX_PATH_MSDK_FOLDER:
- hModule = GetThisDllModuleHandle();
- HMODULE exeModule = GetModuleHandleW(NULL);
- //It should works only if Dispatcher is linked with Dynamic Linked Library
- if (!hModule || !exeModule || hModule == exeModule)
- return false;
- break;
- }
-
- DWORD nSize = 0;
- DWORD allocSize = msdk_disp_path_len;
-
- nSize = GetModuleFileNameW(hModule, &sImplPath0, allocSize);
-
- if (nSize == 0 || nSize == allocSize) {
- // nSize == 0 meanse that system can't get this info for hModule
- // nSize == allocSize buffer is too small
- return false;
- }
-
- // for any case because WinXP implementation of GetModuleFileName does not add \0 to the end of string
- sImplPathnSize = L'\0';
-
- wchar_t * dirSeparator = wcsrchr(sImplPath, L'\\');
- if (dirSeparator != NULL && dirSeparator < (sImplPath + msdk_disp_path_len))
- {
- *++dirSeparator = 0;
- }
- return true;
-}
-
-mfxStatus MFXLibraryIterator::Init(eMfxImplType implType, mfxIMPL implInterface, const mfxU32 adapterNum, int storageID)
-{
- // check error(s)
- if ((MFX_LIB_SOFTWARE != implType) &&
- (MFX_LIB_HARDWARE != implType))
- {
- return MFX_ERR_UNSUPPORTED;
- }
-
- // release the object before initialization
- Release();
- m_StorageID = storageID;
- m_lastLibIndex = 0;
- m_implType = implType;
- m_implInterface = implInterface != 0
- ? implInterface
- : MFX_IMPL_VIA_ANY;
-
- // for HW impl check impl interface, check adapter, obtain deviceID and vendorID
- if (m_implType != MFX_LIB_SOFTWARE)
- {
- mfxStatus mfxRes = MFX::SelectImplementationType(adapterNum, &m_implInterface, &m_vendorID, &m_deviceID);
- if (MFX_ERR_NONE != mfxRes)
- {
- return mfxRes;
- }
- }
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- if (storageID == MFX_CURRENT_USER_KEY || storageID == MFX_LOCAL_MACHINE_KEY)
- {
- return InitRegistry(storageID);
- }
-
-#if defined(MFX_TRACER_WA_FOR_DS)
- if (storageID == MFX_TRACER)
- {
- return InitRegistryTracer();
- }
-#endif
-
-#endif
-
- wchar_t sMediaSDKPathmsdk_disp_path_len = {};
-
- if (storageID == MFX_DRIVER_STORE)
- {
- if (!m_driverStoreLoader.GetDriverStorePath(sMediaSDKPath, sizeof(sMediaSDKPath), m_deviceID))
- {
- return MFX_ERR_UNSUPPORTED;
- }
- }
- else if(!GetImplPath(storageID, sMediaSDKPath))
- {
- return MFX_ERR_UNSUPPORTED;
- }
-
- return InitFolder(implType, sMediaSDKPath, storageID);
-
-} // mfxStatus MFXLibraryIterator::Init(eMfxImplType implType, const mfxU32 adapterNum, int storageID)
-
-mfxStatus MFXLibraryIterator::InitRegistry(int storageID)
-{
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- HKEY rootHKey;
- bool bRes;
-
- // open required registry key
- rootHKey = (MFX_LOCAL_MACHINE_KEY == storageID) ? (HKEY_LOCAL_MACHINE) : (HKEY_CURRENT_USER);
- bRes = m_baseRegKey.Open(rootHKey, rootDispPath, KEY_READ);
- if (false == bRes)
- {
- DISPATCHER_LOG_WRN((("Can't open %s\\%S : RegOpenKeyExA()==0x%x\n"),
- (MFX_LOCAL_MACHINE_KEY == storageID) ? ("HKEY_LOCAL_MACHINE") : ("HKEY_CURRENT_USER"),
- rootDispPath, GetLastError()))
- return MFX_ERR_UNKNOWN;
- }
-
- DISPATCHER_LOG_INFO((("Inspecting %s\\%S\n"),
- (MFX_LOCAL_MACHINE_KEY == storageID) ? ("HKEY_LOCAL_MACHINE") : ("HKEY_CURRENT_USER"),
- rootDispPath))
-
- return MFX_ERR_NONE;
-#else
- (void) storageID;
- return MFX_ERR_UNSUPPORTED;
-#endif // #if !defined(MEDIASDK_UWP_DISPATCHER)
-
-} // mfxStatus MFXLibraryIterator::InitRegistry(int storageID)
-
-#if defined(MFX_TRACER_WA_FOR_DS)
-mfxStatus MFXLibraryIterator::InitRegistryTracer()
-{
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-
- const wchar_t tracerRegKeyPath = L"Software\\Intel\\MediaSDK\\Dispatch\\tracer";
-
- if (!m_baseRegKey.Open(HKEY_LOCAL_MACHINE, tracerRegKeyPath, KEY_READ) && !m_baseRegKey.Open(HKEY_CURRENT_USER, tracerRegKeyPath, KEY_READ))
- {
- DISPATCHER_LOG_WRN(("can't find tracer registry key\n"))
- return MFX_ERR_UNKNOWN;
- }
-
- DISPATCHER_LOG_INFO(("found tracer registry key\n"))
- return MFX_ERR_NONE;
-
-#else
- return MFX_ERR_UNSUPPORTED;
-#endif // #if !defined(MEDIASDK_UWP_DISPATCHER)
-
-} // mfxStatus MFXLibraryIterator::InitRegistryTracer()
-#endif
-
-mfxStatus MFXLibraryIterator::InitFolder(eMfxImplType implType, const wchar_t * path, const int storageID)
-{
- const int maxPathLen = sizeof(m_path)/sizeof(m_path0);
- m_path0 = 0;
- wcscpy_s(m_path, maxPathLen, path);
- size_t pathLen = wcslen(m_path);
-
- if(storageID==MFX_APP_FOLDER)
- {
- // we looking for runtime in application folder, it should be named libmfxsw64 or libmfxsw32
- mfx_get_default_dll_name(m_path + pathLen, msdk_disp_path_len - pathLen, MFX_LIB_SOFTWARE);
- }
- else
- {
- mfx_get_default_dll_name(m_path + pathLen, msdk_disp_path_len - pathLen, implType);
- }
-
- return MFX_ERR_NONE;
-} // mfxStatus MFXLibraryIterator::InitFolder(eMfxImplType implType, const wchar_t * path, const int storageID)
-
-mfxStatus MFXLibraryIterator::SelectDLLVersion(wchar_t *pPath
- , size_t pathSize
- , eMfxImplType *pImplType, mfxVersion minVersion)
-{
- UNREFERENCED_PARAMETER(minVersion);
-
- if (m_StorageID == MFX_APP_FOLDER)
- {
- if (m_lastLibIndex != 0)
- return MFX_ERR_NOT_FOUND;
- if (m_vendorID != INTEL_VENDOR_ID)
- return MFX_ERR_UNKNOWN;
-
- m_lastLibIndex = 1;
- wcscpy_s(pPath, pathSize, m_path);
- *pImplType = MFX_LIB_SOFTWARE;
- return MFX_ERR_NONE;
- }
-
- if (m_StorageID == MFX_PATH_MSDK_FOLDER || m_StorageID == MFX_DRIVER_STORE)
- {
- if (m_lastLibIndex != 0)
- return MFX_ERR_NOT_FOUND;
- if (m_vendorID != INTEL_VENDOR_ID)
- return MFX_ERR_UNKNOWN;
-
- m_lastLibIndex = 1;
- wcscpy_s(pPath, pathSize, m_path);
- // do not change impl type
- return MFX_ERR_NONE;
- }
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-
-#if defined(MFX_TRACER_WA_FOR_DS)
- if (m_StorageID == MFX_TRACER)
- {
- if (m_lastLibIndex != 0)
- return MFX_ERR_NOT_FOUND;
- if (m_vendorID != INTEL_VENDOR_ID)
- return MFX_ERR_UNKNOWN;
-
- m_lastLibIndex = 1;
-
- if (m_baseRegKey.Query(pathKeyName, REG_SZ, (LPBYTE)pPath, (DWORD*)&pathSize))
- {
- DISPATCHER_LOG_INFO((("loaded %S : %S\n"), pathKeyName, pPath));
- }
- else
- {
- DISPATCHER_LOG_WRN((("error querying %S : RegQueryValueExA()==0x%x\n"), pathKeyName, GetLastError()));
- }
- return MFX_ERR_NONE;
- }
-#endif
-
- wchar_t libPathMFX_MAX_DLL_PATH = L"";
- DWORD libIndex = 0;
- DWORD libMerit = 0;
- DWORD index;
- bool enumRes;
-
- // main query cycle
- index = 0;
- m_bIsSubKeyValid = false;
- do
- {
- WinRegKey subKey;
- wchar_t subKeyNameMFX_MAX_REGISTRY_KEY_NAME = { 0 };
- DWORD subKeyNameSize = sizeof(subKeyName) / sizeof(subKeyName0);
-
- // query next value name
- enumRes = m_baseRegKey.EnumKey(index, subKeyName, &subKeyNameSize);
- if (!enumRes)
- {
- DISPATCHER_LOG_WRN((("no more subkeys : RegEnumKeyExA()==0x%x\n"), GetLastError()))
- }
- else
- {
- DISPATCHER_LOG_INFO((("found subkey: %S\n"), subKeyName))
-
- bool bRes;
-
- // open the sub key
- bRes = subKey.Open(m_baseRegKey, subKeyName, KEY_READ);
- if (!bRes)
- {
- DISPATCHER_LOG_WRN((("error opening key %S :RegOpenKeyExA()==0x%x\n"), subKeyName, GetLastError()));
- }
- else
- {
- DISPATCHER_LOG_INFO((("opened key: %S\n"), subKeyName));
-
- mfxU32 vendorID = 0, deviceID = 0, merit = 0;
- DWORD size;
-
- // query vendor and device IDs
- size = sizeof(vendorID);
- bRes = subKey.Query(vendorIDKeyName, REG_DWORD, (LPBYTE) &vendorID, &size);
- DISPATCHER_LOG_OPERATION({
- if (bRes)
- {
- DISPATCHER_LOG_INFO((("loaded %S : 0x%x\n"), vendorIDKeyName, vendorID));
- }
- else
- {
- DISPATCHER_LOG_WRN((("querying %S : RegQueryValueExA()==0x%x\n"), vendorIDKeyName, GetLastError()));
- }
- })
-
- if (bRes)
- {
- size = sizeof(deviceID);
- bRes = subKey.Query(deviceIDKeyName, REG_DWORD, (LPBYTE) &deviceID, &size);
- DISPATCHER_LOG_OPERATION({
- if (bRes)
- {
- DISPATCHER_LOG_INFO((("loaded %S : 0x%x\n"), deviceIDKeyName, deviceID));
- }
- else
- {
- DISPATCHER_LOG_WRN((("querying %S : RegQueryValueExA()==0x%x\n"), deviceIDKeyName, GetLastError()));
- }
- })
- }
- // query merit value
- if (bRes)
- {
- size = sizeof(merit);
- bRes = subKey.Query(meritKeyName, REG_DWORD, (LPBYTE) &merit, &size);
- DISPATCHER_LOG_OPERATION({
- if (bRes)
- {
- DISPATCHER_LOG_INFO((("loaded %S : %d\n"), meritKeyName, merit));
- }
- else
- {
- DISPATCHER_LOG_WRN((("querying %S : RegQueryValueExA()==0x%x\n"), meritKeyName, GetLastError()));
- }
- })
- }
-
- // if the library fits required parameters,
- // query the library's path
- if (bRes)
- {
- // compare device's and library's IDs
- if (MFX_LIB_HARDWARE == m_implType)
- {
- if (m_vendorID != vendorID)
- {
- bRes = false;
- DISPATCHER_LOG_WRN((("%S conflict, actual = 0x%x : required = 0x%x\n"), vendorIDKeyName, m_vendorID, vendorID));
- }
- if (bRes && m_deviceID != deviceID)
- {
- bRes = false;
- DISPATCHER_LOG_WRN((("%S conflict, actual = 0x%x : required = 0x%x\n"), deviceIDKeyName, m_deviceID, deviceID));
- }
- }
-
- DISPATCHER_LOG_OPERATION({
- if (bRes)
- {
- if (!(((m_lastLibMerit > merit) || ((m_lastLibMerit == merit) && (m_lastLibIndex < index))) &&
- (libMerit < merit)))
- {
- DISPATCHER_LOG_WRN((("merit conflict: lastMerit = 0x%x, requiredMerit = 0x%x, libraryMerit = 0x%x, lastindex = %d, index = %d\n")
- , m_lastLibMerit, merit, libMerit, m_lastLibIndex, index));
- }
- }})
-
- if ((bRes) &&
- ((m_lastLibMerit > merit) || ((m_lastLibMerit == merit) && (m_lastLibIndex < index))) &&
- (libMerit < merit))
- {
- wchar_t tmpPathMFX_MAX_DLL_PATH;
- DWORD tmpPathSize = sizeof(tmpPath);
-
- bRes = subKey.Query(pathKeyName, REG_SZ, (LPBYTE) tmpPath, &tmpPathSize);
- if (!bRes)
- {
- DISPATCHER_LOG_WRN((("error querying %S : RegQueryValueExA()==0x%x\n"), pathKeyName, GetLastError()));
- }
- else
- {
- DISPATCHER_LOG_INFO((("loaded %S : %S\n"), pathKeyName, tmpPath));
-
- wcscpy_s(libPath, sizeof(libPath) / sizeof(libPath0), tmpPath);
- wcscpy_s(m_SubKeyName, sizeof(m_SubKeyName) / sizeof(m_SubKeyName0), subKeyName);
-
- libMerit = merit;
- libIndex = index;
-
- // set the library's type
- if ((0 == vendorID) || (0 == deviceID))
- {
- *pImplType = MFX_LIB_SOFTWARE;
- DISPATCHER_LOG_INFO((("Library type is MFX_LIB_SOFTWARE\n")));
- }
- else
- {
- *pImplType = MFX_LIB_HARDWARE;
- DISPATCHER_LOG_INFO((("Library type is MFX_LIB_HARDWARE\n")));
- }
- }
- }
- }
- }
- }
-
- // advance key index
- index += 1;
-
- } while (enumRes);
-
- // if the library's path was successfully read,
- // the merit variable holds valid value
- if (0 == libMerit)
- {
- return MFX_ERR_NOT_FOUND;
- }
-
- wcscpy_s(pPath, pathSize, libPath);
-
- m_lastLibIndex = libIndex;
- m_lastLibMerit = libMerit;
- m_bIsSubKeyValid = true;
-
-#endif
-
- return MFX_ERR_NONE;
-
-} // mfxStatus MFXLibraryIterator::SelectDLLVersion(wchar_t *pPath, size_t pathSize, eMfxImplType *pImplType, mfxVersion minVersion)
-
-mfxIMPL MFXLibraryIterator::GetImplementationType()
-{
- return m_implInterface;
-} // mfxIMPL MFXLibraryIterator::GetImplementationType()
-
-bool MFXLibraryIterator::GetSubKeyName(wchar_t *subKeyName, size_t length) const
-{
- wcscpy_s(subKeyName, length, m_SubKeyName);
- return m_bIsSubKeyValid;
-}
-} // namespace MFX

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_load_dll.cpp Deleted

@@ -1,230 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfx_dispatcher.h"
-#include "mfx_load_dll.h"
-
-#include <wchar.h>
-#include <string.h>
-#include <windows.h>
-
-#if defined(_WIN64)
-const
-wchar_t * const defaultDLLName2 = {L"libmfxhw64.dll",
- L"libmfxsw64.dll"};
-const
-wchar_t * const defaultAudioDLLName2 = {L"libmfxaudiosw64.dll",
- L"libmfxaudiosw64.dll"};
-
-const 
-wchar_t * const defaultPluginDLLName2 = {L"mfxplugin64_hw.dll",
- L"mfxplugin64_sw.dll"};
-
-#if defined(MEDIASDK_UWP_DISPATCHER)
-const
-wchar_t * const IntelGFXAPIDLLName = {L"intel_gfx_api-x64.dll"};
-#endif
-
-#elif defined(_WIN32)
-const
-wchar_t * const defaultDLLName2 = {L"libmfxhw32.dll",
- L"libmfxsw32.dll"};
-
-const
-wchar_t * const defaultAudioDLLName2 = {L"libmfxaudiosw32.dll",
- L"libmfxaudiosw32.dll"};
-
-const 
-wchar_t * const defaultPluginDLLName2 = {L"mfxplugin32_hw.dll",
- L"mfxplugin32_sw.dll"};
-
-#if defined(MEDIASDK_UWP_DISPATCHER)
-const
-wchar_t * const IntelGFXAPIDLLName = {L"intel_gfx_api-x86.dll"};
-#endif
-
-#endif // (defined(_WIN64))
-
-namespace MFX
-{
-
-
-mfxStatus mfx_get_default_dll_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType)
-{
- if (!pPath)
- {
- return MFX_ERR_NULL_PTR;
- }
- 
-
- // there are only 2 implementation with default DLL names
-#if _MSC_VER >= 1400
- return 0 == wcscpy_s(pPath, pathSize, defaultDLLNameimplType & 1)
- ? MFX_ERR_NONE : MFX_ERR_UNKNOWN;
-#else 
- wcscpy(pPath, defaultDLLNameimplType & 1);
- return MFX_ERR_NONE;
-#endif
-} // mfxStatus mfx_get_default_dll_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType)
-
-#if defined(MEDIASDK_UWP_DISPATCHER)
-mfxStatus mfx_get_default_intel_gfx_api_dll_name(wchar_t *pPath, size_t pathSize)
-{
- if (!pPath)
- {
- return MFX_ERR_NULL_PTR;
- }
-
-#if _MSC_VER >= 1400
- return 0 == wcscpy_s(pPath, pathSize, IntelGFXAPIDLLName)
- ? MFX_ERR_NONE : MFX_ERR_UNKNOWN;
-#else
- wcscpy(pPath, IntelGFXAPIDLLName);
- return MFX_ERR_NONE;
-#endif
-} // mfx_get_default_intel_gfx_api_dll_name(wchar_t *pPath, size_t pathSize)
-#endif
-
-mfxStatus mfx_get_default_plugin_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType)
-{
- if (!pPath)
- {
- return MFX_ERR_NULL_PTR;
- }
-
-
- // there are only 2 implementation with default DLL names
-#if _MSC_VER >= 1400
- return 0 == wcscpy_s(pPath, pathSize, defaultPluginDLLNameimplType & 1)
- ? MFX_ERR_NONE : MFX_ERR_UNKNOWN;
-#else 
- wcscpy(pPath, defaultPluginDLLNameimplType & 1);
- return MFX_ERR_NONE;
-#endif
-}
-
-mfxStatus mfx_get_default_audio_dll_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType)
-{
- if (!pPath)
- {
- return MFX_ERR_NULL_PTR;
- }
- 
- // there are only 2 implementation with default DLL names
-#if _MSC_VER >= 1400
- return 0 == wcscpy_s(pPath, pathSize, defaultAudioDLLNameimplType & 1)
- ? MFX_ERR_NONE : MFX_ERR_UNKNOWN;
-#else 
- wcscpy(pPath, defaultAudioDLLNameimplType & 1);
- return MFX_ERR_NONE;
-#endif
-} // mfxStatus mfx_get_default_audio_dll_name(wchar_t *pPath, size_t pathSize, eMfxImplType implType)
-
-mfxModuleHandle mfx_dll_load(const wchar_t *pFileName)
-{
- mfxModuleHandle hModule = (mfxModuleHandle) 0;
-
- // check error(s)
- if (NULL == pFileName)
- {
- return NULL;
- }
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- // set the silent error mode
- DWORD prevErrorMode = 0;
-#if (_WIN32_WINNT >= 0x0600)
- SetThreadErrorMode(SEM_FAILCRITICALERRORS, &prevErrorMode);
-#else
- prevErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
-#endif
-#endif // !defined(MEDIASDK_UWP_DISPATCHER)
-
- // load the library's module
-#if !defined(MEDIASDK_ARM_LOADER)
- hModule = LoadLibraryExW(pFileName, NULL, 0);
-#endif
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
- // set the previous error mode
-#if (_WIN32_WINNT >= 0x0600)
- SetThreadErrorMode(prevErrorMode, NULL);
-#else
- SetErrorMode(prevErrorMode);
-#endif
-#endif // !defined(MEDIASDK_UWP_DISPATCHER)
-
- return hModule;
-
-} // mfxModuleHandle mfx_dll_load(const wchar_t *pFileName)
-
-mfxFunctionPointer mfx_dll_get_addr(mfxModuleHandle handle, const char *pFunctionName)
-{
- if (NULL == handle)
- {
- return NULL;
- }
-
- return (mfxFunctionPointer) GetProcAddress((HMODULE) handle, pFunctionName);
-} // mfxFunctionPointer mfx_dll_get_addr(mfxModuleHandle handle, const char *pFunctionName)
-
-bool mfx_dll_free(mfxModuleHandle handle)
-{
- if (NULL == handle)
- {
- return true;
- }
-
- BOOL bRes = FreeLibrary((HMODULE)handle);
-
- return !!bRes;
-} // bool mfx_dll_free(mfxModuleHandle handle)
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-mfxModuleHandle mfx_get_dll_handle(const wchar_t *pFileName)
-{
- mfxModuleHandle hModule = (mfxModuleHandle) 0;
-
- // check error(s)
- if (NULL == pFileName)
- {
- return NULL;
- }
-
- // set the silent error mode
- DWORD prevErrorMode = 0;
-#if (_WIN32_WINNT >= 0x0600)
- SetThreadErrorMode(SEM_FAILCRITICALERRORS, &prevErrorMode); 
-#else
- prevErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
-#endif
- // load the library's module
- GetModuleHandleExW(0, pFileName, (HMODULE*) &hModule);
- // set the previous error mode
-#if (_WIN32_WINNT >= 0x0600)
- SetThreadErrorMode(prevErrorMode, NULL);
-#else
- SetErrorMode(prevErrorMode);
-#endif
- return hModule;
-}
-#endif //!defined(MEDIASDK_UWP_DISPATCHER)
-
-} // namespace MFX
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_load_plugin.cpp Deleted

@@ -1,454 +0,0 @@
-// Copyright (c) 2013-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfx_load_plugin.h"
-#include "mfx_load_dll.h"
-#include "mfx_dispatcher_log.h"
-
-#define TRACE_PLUGIN_ERROR(str, ...) DISPATCHER_LOG_ERROR((("PLUGIN: " str), __VA_ARGS__))
-#define TRACE_PLUGIN_INFO(str, ...) DISPATCHER_LOG_INFO((("PLUGIN: " str), __VA_ARGS__))
-
-#define CREATE_PLUGIN_FNC "CreatePlugin"
-
-MFX::PluginModule::PluginModule()
- : mHmodule()
- , mCreatePluginPtr()
- , mPath()
-{
-}
-
-MFX::PluginModule::PluginModule(const PluginModule & that)
- : mHmodule(mfx_dll_load(that.mPath))
- , mCreatePluginPtr(that.mCreatePluginPtr)
-{
- wcscpy_s(mPath, sizeof(mPath) / sizeof(*mPath), that.mPath);
-}
-
-MFX::PluginModule & MFX::PluginModule::operator = (const MFX::PluginModule & that)
-{
- if (this != &that)
- {
- Tidy();
- mHmodule = mfx_dll_load(that.mPath);
- mCreatePluginPtr = that.mCreatePluginPtr;
- wcscpy_s(mPath, sizeof(mPath) / sizeof(*mPath), that.mPath);
- }
- return *this;
-}
-
-MFX::PluginModule::PluginModule(const wchar_t * path)
- : mCreatePluginPtr()
-{
- mHmodule = mfx_dll_load(path);
- if (NULL == mHmodule) {
- TRACE_PLUGIN_ERROR("Cannot load module: %S\n", path);
- return ;
- }
- TRACE_PLUGIN_INFO("Plugin loaded at: %S\n", path);
-
- mCreatePluginPtr = (CreatePluginPtr_t)mfx_dll_get_addr(mHmodule, CREATE_PLUGIN_FNC);
- if (NULL == mCreatePluginPtr) {
- TRACE_PLUGIN_ERROR("Cannot get procedure address: %s\n", CREATE_PLUGIN_FNC);
- return ;
- }
-
- wcscpy_s(mPath, sizeof(mPath) / sizeof(*mPath), path);
-}
-
-bool MFX::PluginModule::Create( mfxPluginUID uid, mfxPlugin& plg)
-{
- bool result = false;
- if (mCreatePluginPtr)
- {
- mfxStatus mfxResult = mCreatePluginPtr(uid, &plg);
- result = (MFX_ERR_NONE == mfxResult);
- if (!result) {
- TRACE_PLUGIN_ERROR("\"%S::%s\" returned %d\n", mPath, CREATE_PLUGIN_FNC, mfxResult);
- } else {
- TRACE_PLUGIN_INFO("\"%S::%s\" SUCCEED\n", mPath, CREATE_PLUGIN_FNC);
- }
- }
- return result;
-}
-
-void MFX::PluginModule::Tidy()
-{
- mfx_dll_free(mHmodule);
- mCreatePluginPtr = NULL;
- mHmodule = NULL;
-}
-
-MFX::PluginModule::~PluginModule(void)
-{
- Tidy();
-}
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-
-bool MFX::MFXPluginFactory::RunVerification( const mfxPlugin & plg, const PluginDescriptionRecord &dsc, mfxPluginParam &pluginParams)
-{
- if (plg.PluginInit == 0)
- {
- TRACE_PLUGIN_ERROR("plg->PluginInit = 0\n", 0);
- return false;
- }
- if (plg.PluginClose == 0)
- {
- TRACE_PLUGIN_ERROR("plg->PluginClose = 0\n", 0);
- return false;
- }
- if (plg.GetPluginParam == 0)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam = 0\n", 0);
- return false;
- }
-
- if (plg.Execute == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Execute = 0\n", 0);
- return false;
- }
- if (plg.FreeResources == 0)
- {
- TRACE_PLUGIN_ERROR("plg->FreeResources = 0\n", 0);
- return false;
- }
-
- mfxStatus sts = plg.GetPluginParam(plg.pthis, &pluginParams);
- if (sts != MFX_ERR_NONE)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam() returned %d\n", sts);
- return false;
- }
-
- if (dsc.Default)
- {
- // for default plugins there is no description, dsc.APIVersion, dsc.PluginVersion and dsc.PluginUID were set by dispatcher
- // dsc.PluginVersion == requested plugin version (parameter of MFXVideoUSER_Load); dsc.APIVersion == loaded library API
- if (dsc.PluginVersion > pluginParams.PluginVersion)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam() returned PluginVersion=%d, but it is smaller than requested : %d\n", pluginParams.PluginVersion, dsc.PluginVersion);
- return false;
- }
- }
- else
- {
- if (!dsc.onlyVersionRegistered && pluginParams.CodecId != dsc.CodecId)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam() returned CodecId=" MFXFOURCCTYPE()", but registration has CodecId=" MFXFOURCCTYPE()"\n"
- , MFXU32TOFOURCC(pluginParams.CodecId), MFXU32TOFOURCC(dsc.CodecId));
- return false;
- }
-
- if (!dsc.onlyVersionRegistered && pluginParams.Type != dsc.Type)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam() returned Type=%d, but registration has Type=%d\n", pluginParams.Type, dsc.Type);
- return false;
- }
-
- if (pluginParams.PluginUID != dsc.PluginUID)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam() returned UID=" MFXGUIDTYPE()", but registration has UID=" MFXGUIDTYPE()"\n"
- , MFXGUIDTOHEX(&pluginParams.PluginUID), MFXGUIDTOHEX(&dsc.PluginUID));
- return false;
- }
-
- if (pluginParams.PluginVersion != dsc.PluginVersion)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam() returned PluginVersion=%d, but registration has PlgVer=%d\n", pluginParams.PluginVersion, dsc.PluginVersion);
- return false;
- }
-
- if (pluginParams.APIVersion.Version != dsc.APIVersion.Version)
- {
- TRACE_PLUGIN_ERROR("plg->GetPluginParam() returned APIVersion=%d.%d, but registration has APIVer=%d.%d\n"
- , pluginParams.APIVersion.Major, pluginParams.APIVersion.Minor
- , dsc.APIVersion.Major, dsc.APIVersion.Minor);
- return false;
- }
- }
-
- switch(pluginParams.Type)
- {
- case MFX_PLUGINTYPE_VIDEO_DECODE:
- case MFX_PLUGINTYPE_VIDEO_ENCODE:
- case MFX_PLUGINTYPE_VIDEO_VPP:
- {
- TRACE_PLUGIN_INFO("plugin type= %d\n", pluginParams.Type);
- if (plg.Video == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video = 0\n", 0);
- return false;
- }
-
- if (!VerifyCodecCommon(*plg.Video))
- return false;
- break;
- }
- }
-
- switch(pluginParams.Type)
- {
- case MFX_PLUGINTYPE_VIDEO_DECODE:
- return VerifyDecoder(*plg.Video);
- case MFX_PLUGINTYPE_AUDIO_DECODE:
- return VerifyAudioDecoder(*plg.Audio);
- case MFX_PLUGINTYPE_VIDEO_ENCODE:
- return VerifyEncoder(*plg.Video);
- case MFX_PLUGINTYPE_AUDIO_ENCODE:
- return VerifyAudioEncoder(*plg.Audio);
- case MFX_PLUGINTYPE_VIDEO_VPP:
- return VerifyVpp(*plg.Video);
- case MFX_PLUGINTYPE_VIDEO_ENC:
- return VerifyEnc(*plg.Video);
- default:
- {
- TRACE_PLUGIN_ERROR("unsupported plugin type: %d\n", pluginParams.Type);
- return false;
- }
- }
-}
-
-bool MFX::MFXPluginFactory::VerifyVpp( const mfxVideoCodecPlugin &vpp )
-{
- if (vpp.VPPFrameSubmit == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->VPPFrameSubmit = 0\n", 0);
- return false;
- }
-
- return true;
-
-}
-
-bool MFX::MFXPluginFactory::VerifyEncoder( const mfxVideoCodecPlugin &encoder )
-{
- if (encoder.EncodeFrameSubmit == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->EncodeFrameSubmit = 0\n", 0);
- return false;
- }
-
- return true;
-}
-
-bool MFX::MFXPluginFactory::VerifyAudioEncoder( const mfxAudioCodecPlugin &encoder )
-{
- if (encoder.EncodeFrameSubmit == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Audio->EncodeFrameSubmit = 0\n", 0);
- return false;
- }
-
- return true;
-}
-
-bool MFX::MFXPluginFactory::VerifyEnc( const mfxVideoCodecPlugin &videoEnc )
-{
- if (videoEnc.ENCFrameSubmit == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->EncodeFrameSubmit = 0\n", 0);
- return false;
- }
-
- return true;
-}
-
-bool MFX::MFXPluginFactory::VerifyDecoder( const mfxVideoCodecPlugin &decoder )
-{
- if (decoder.DecodeHeader == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->DecodeHeader = 0\n", 0);
- return false;
- }
- if (decoder.GetPayload == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->GetPayload = 0\n", 0);
- return false;
- }
- if (decoder.DecodeFrameSubmit == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->DecodeFrameSubmit = 0\n", 0);
- return false;
- }
-
- return true;
-}
-
-bool MFX::MFXPluginFactory::VerifyAudioDecoder( const mfxAudioCodecPlugin &decoder )
-{
- if (decoder.DecodeHeader == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Audio->DecodeHeader = 0\n", 0);
- return false;
- }
-// if (decoder.GetPayload == 0)
- {
- // TRACE_PLUGIN_ERROR("plg->Audio->GetPayload = 0\n", 0);
- // return false;
- }
- if (decoder.DecodeFrameSubmit == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Audio->DecodeFrameSubmit = 0\n", 0);
- return false;
- }
-
- return true;
-}
-
-bool MFX::MFXPluginFactory::VerifyCodecCommon( const mfxVideoCodecPlugin & videoCodec )
-{
- if (videoCodec.Query == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->Query = 0\n", 0);
- return false;
- }
- //todo: remove
- if (videoCodec.Query == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->Query = 0\n", 0);
- return false;
- }
- if (videoCodec.QueryIOSurf == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->QueryIOSurf = 0\n", 0);
- return false;
- }
- if (videoCodec.Init == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->Init = 0\n", 0);
- return false;
- }
- if (videoCodec.Reset == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->Reset = 0\n", 0);
- return false;
- }
- if (videoCodec.Close == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->Close = 0\n", 0);
- return false;
- }
- if (videoCodec.GetVideoParam == 0)
- {
- TRACE_PLUGIN_ERROR("plg->Video->GetVideoParam = 0\n", 0);
- return false;
- }
-
- return true;
-}
-
-mfxStatus MFX::MFXPluginFactory::Create(const PluginDescriptionRecord & rec)
-{
- PluginModule plgModule(rec.sPath);
- mfxPlugin plg = {};
- mfxPluginParam plgParams;
-
- if (!plgModule.Create(rec.PluginUID, plg))
- {
- return MFX_ERR_UNKNOWN;
- }
-
- if (!RunVerification(plg, rec, plgParams))
- {
- //will do not call plugin close since it is not safe to do that until structure is corrected
- return MFX_ERR_UNKNOWN;
- }
-
-
- if (rec.Type == MFX_PLUGINTYPE_AUDIO_DECODE ||
- rec.Type == MFX_PLUGINTYPE_AUDIO_ENCODE)
- {
- mfxStatus sts = MFXAudioUSER_Register(mSession, plgParams.Type, &plg);
- if (MFX_ERR_NONE != sts)
- {
- TRACE_PLUGIN_ERROR(" MFXAudioUSER_Register returned %d\n", sts);
- return sts;
- }
- }
- else
- {
- mfxStatus sts = MFXVideoUSER_Register(mSession, plgParams.Type, &plg);
- if (MFX_ERR_NONE != sts)
- {
- TRACE_PLUGIN_ERROR(" MFXVideoUSER_Register returned %d\n", sts);
- return sts;
- }
- }
-
- mPlugins.push_back(FactoryRecord(plgParams, plgModule, plg));
-
- return MFX_ERR_NONE;
-}
-
-MFX::MFXPluginFactory::~MFXPluginFactory()
-{
- Close();
-}
-
-MFX::MFXPluginFactory::MFXPluginFactory( mfxSession session ) :
- mPlugins()
-{
- mSession = session;
- nPlugins = 0;
-}
-
-bool MFX::MFXPluginFactory::Destroy( const mfxPluginUID & uidToDestroy)
-{
- for (MFXVector<FactoryRecord >::iterator i = mPlugins.begin(); i!= mPlugins.end(); i++)
- {
- if (i->plgParams.PluginUID == uidToDestroy)
- {
- DestroyPlugin(*i);
- //dll unload should happen here
- //todo: check that dll_free fail is traced
- mPlugins.erase(i);
- return true;
- }
- }
- return false;
-}
-
-void MFX::MFXPluginFactory::Close()
-{
- for (MFXVector<FactoryRecord>::iterator i = mPlugins.begin(); i!= mPlugins.end(); i++)
- {
- DestroyPlugin(*i);
- }
- mPlugins.clear();
-}
-
-void MFX::MFXPluginFactory::DestroyPlugin( FactoryRecord & record)
-{
- mfxStatus sts;
- if (record.plgParams.Type == MFX_PLUGINTYPE_AUDIO_DECODE ||
- record.plgParams.Type == MFX_PLUGINTYPE_AUDIO_ENCODE)
- {
- sts = MFXAudioUSER_Unregister(mSession, record.plgParams.Type);
- TRACE_PLUGIN_INFO(" MFXAudioUSER_Unregister for Type=%d, returned %d\n", record.plgParams.Type, sts);
- }
- else
- {
- sts = MFXVideoUSER_Unregister(mSession, record.plgParams.Type);
- TRACE_PLUGIN_INFO(" MFXVideoUSER_Unregister for Type=%d, returned %d\n", record.plgParams.Type, sts);
- }
-}
-
-#endif //!defined(MEDIASDK_UWP_DISPATCHER)
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_plugin_hive.cpp Deleted

@@ -1,491 +0,0 @@
-// Copyright (c) 2013-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#include "mfx_plugin_hive.h"
-#include "mfx_library_iterator.h"
-#include "mfx_dispatcher.h"
-#include "mfx_dispatcher_log.h"
-#include "mfx_load_dll.h"
-
-#define TRACE_HIVE_ERROR(str, ...) DISPATCHER_LOG_ERROR((("HIVE: " str), __VA_ARGS__))
-#define TRACE_HIVE_INFO(str, ...) DISPATCHER_LOG_INFO((("HIVE: " str), __VA_ARGS__))
-#define TRACE_HIVE_WRN(str, ...) DISPATCHER_LOG_WRN((("HIVE: " str), __VA_ARGS__))
-
-namespace
-{
- const wchar_t rootPluginPath = L"Software\\Intel\\MediaSDK\\Plugin";
- const wchar_t rootDispatchPath = L"Software\\Intel\\MediaSDK\\Dispatch";
- const wchar_t pluginSubkey = L"Plugin";
- const wchar_t TypeKeyName = L"Type";
- const wchar_t CodecIDKeyName = L"CodecID";
- const wchar_t GUIDKeyName = L"GUID";
- const wchar_t PathKeyName = L"Path";
- const wchar_t DefaultKeyName = L"Default";
- const wchar_t PlgVerKeyName = L"PluginVersion";
- const wchar_t APIVerKeyName = L"APIVersion";
-}
-
-namespace
-{
-#ifdef _WIN64
- const wchar_t pluginFileName = L"FileName64";
-#else
- const wchar_t pluginFileName = L"FileName32";
-#endif // _WIN64
-
- //do not allow store plugin in different hierarchy
- const wchar_t pluginFileNameRestrictedCharacters = L"\\/";
- const wchar_t pluginCfgFileName = L"plugin.cfg";
- const wchar_t pluginSearchPattern = L"????????????????????????????????";
- const mfxU32 pluginCfgFileNameLen = 10;
- const mfxU32 pluginDirNameLen = 32;
- const mfxU32 defaultPluginNameLen = 25;
- const mfxU32 charsPermfxU8 = 2;
- const mfxU32 slashLen = 1;
- enum
- {
- MAX_PLUGIN_FILE_LINE = 4096
- };
-
- #define alignStr() "%-14S"
-}
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-
-MFX::MFXPluginsInHive::MFXPluginsInHive(int mfxStorageID, const wchar_t *msdkLibSubKey, mfxVersion currentAPIVersion)
- : MFXPluginStorageBase(currentAPIVersion)
-{
- HKEY rootHKey;
- bool bRes;
- WinRegKey regKey;
-
- if (MFX_LOCAL_MACHINE_KEY != mfxStorageID && MFX_CURRENT_USER_KEY != mfxStorageID)
- return;
-
- // open required registry key
- rootHKey = (MFX_LOCAL_MACHINE_KEY == mfxStorageID) ? (HKEY_LOCAL_MACHINE) : (HKEY_CURRENT_USER);
- if (msdkLibSubKey) {
- //dispatch/subkey/plugin
- bRes = regKey.Open(rootHKey, rootDispatchPath, KEY_READ);
- if (bRes)
- {
- bRes = regKey.Open(regKey, msdkLibSubKey, KEY_READ);
- }
- if (bRes)
- {
- bRes = regKey.Open(regKey, pluginSubkey, KEY_READ);
- }
- }
- else
- {
- bRes = regKey.Open(rootHKey, rootPluginPath, KEY_READ);
- }
-
- if (false == bRes) {
- return;
- }
- DWORD index = 0;
- if (!regKey.QueryInfo(&index)) {
- return;
- }
- try
- {
- resize(index);
- }
- catch (...) {
- TRACE_HIVE_ERROR("new PluginDescriptionRecord%d threw an exception: \n", index);
- return;
- }
-
- for(index = 0; ; index++)
- {
- wchar_t subKeyNameMFX_MAX_REGISTRY_KEY_NAME;
- DWORD subKeyNameSize = sizeof(subKeyName) / sizeof(subKeyName0);
- WinRegKey subKey;
-
- // query next value name
- bool enumRes = regKey.EnumKey(index, subKeyName, &subKeyNameSize);
- if (!enumRes) {
- break;
- }
-
- // open the sub key
- bRes = subKey.Open(regKey, subKeyName, KEY_READ);
- if (!bRes) {
- continue;
- }
-
- if (msdkLibSubKey)
- {
- TRACE_HIVE_INFO("Found Plugin: %s\\%S\\%S\\%S\\%S\n", (MFX_LOCAL_MACHINE_KEY == mfxStorageID) ? ("HKEY_LOCAL_MACHINE") : ("HKEY_CURRENT_USER"),
- rootDispatchPath, msdkLibSubKey, pluginSubkey, subKeyName);
- }
- else
- {
- TRACE_HIVE_INFO("Found Plugin: %s\\%S\\%S\n", (MFX_LOCAL_MACHINE_KEY == mfxStorageID) ? ("HKEY_LOCAL_MACHINE") : ("HKEY_CURRENT_USER"),
- rootPluginPath, subKeyName);
- }
-
- PluginDescriptionRecord descriptionRecord;
-
- if (!QueryKey(subKey, TypeKeyName, descriptionRecord.Type))
- {
- continue;
- }
- TRACE_HIVE_INFO(alignStr()" : %d\n", TypeKeyName, descriptionRecord.Type);
-
- if (QueryKey(subKey, CodecIDKeyName, descriptionRecord.CodecId))
- {
- TRACE_HIVE_INFO(alignStr()" : " MFXFOURCCTYPE()" \n", CodecIDKeyName, MFXU32TOFOURCC(descriptionRecord.CodecId));
- }
- else
- {
- TRACE_HIVE_INFO(alignStr()" : \n", CodecIDKeyName, "NOT REGISTERED");
- }
-
- if (!QueryKey(subKey, GUIDKeyName, descriptionRecord.PluginUID))
- {
- continue;
- }
- TRACE_HIVE_INFO(alignStr()" : " MFXGUIDTYPE()"\n", GUIDKeyName, MFXGUIDTOHEX(&descriptionRecord.PluginUID));
-
- mfxU32 nSize = sizeof(descriptionRecord.sPath)/sizeof(*descriptionRecord.sPath);
- if (!subKey.Query(PathKeyName, descriptionRecord.sPath, nSize))
- {
- TRACE_HIVE_WRN("no value for : %S\n", PathKeyName);
- continue;
- }
- TRACE_HIVE_INFO(alignStr()" : %S\n", PathKeyName, descriptionRecord.sPath);
-
- if (!QueryKey(subKey, DefaultKeyName, descriptionRecord.Default))
- {
- continue;
- }
- TRACE_HIVE_INFO(alignStr()" : %s\n", DefaultKeyName, descriptionRecord.Default ? "true" : "false");
-
- mfxU32 version = 0;
- if (!QueryKey(subKey, PlgVerKeyName, version))
- {
- continue;
- }
- descriptionRecord.PluginVersion = static_cast<mfxU16>(version);
- if (0 == version)
- {
- TRACE_HIVE_ERROR(alignStr()" : %d, which is invalid\n", PlgVerKeyName, descriptionRecord.PluginVersion);
- continue;
- }
- else
- {
- TRACE_HIVE_INFO(alignStr()" : %d\n", PlgVerKeyName, descriptionRecord.PluginVersion);
- }
-
- mfxU32 APIVersion = 0;
- if (!QueryKey(subKey, APIVerKeyName, APIVersion))
- {
- continue;
- }
- ConvertAPIVersion(APIVersion, descriptionRecord);
- TRACE_HIVE_INFO(alignStr()" : %d.%d \n", APIVerKeyName, descriptionRecord.APIVersion.Major, descriptionRecord.APIVersion.Minor);
-
- try
- {
- operator(index) = descriptionRecord;
- }
- catch (...) {
- TRACE_HIVE_ERROR("operator(%d) = descriptionRecord; - threw exception \n", index);
- }
- }
-}
-
-MFX::MFXPluginsInFS::MFXPluginsInFS( mfxVersion currentAPIVersion )
- : MFXPluginStorageBase(currentAPIVersion)
- , mIsVersionParsed()
- , mIsAPIVersionParsed()
-{
- WIN32_FIND_DATAW find_data;
- wchar_t currentModuleNameMAX_PLUGIN_PATH;
-
- GetModuleFileNameW(NULL, currentModuleName, MAX_PLUGIN_PATH);
- if (GetLastError() != 0)
- {
- TRACE_HIVE_ERROR("GetModuleFileName() reported an error: %d\n", GetLastError());
- return;
- }
- wchar_t *lastSlashPos = wcsrchr(currentModuleName, L'\\');
- if (!lastSlashPos) {
- lastSlashPos = currentModuleName;
- }
- mfxU32 executableDirLen = (mfxU32)(lastSlashPos - currentModuleName) + slashLen;
- if (executableDirLen + pluginDirNameLen + pluginCfgFileNameLen >= MAX_PLUGIN_PATH)
- {
- TRACE_HIVE_ERROR("MAX_PLUGIN_PATH which is %d, not enough to locate plugin path\n", MAX_PLUGIN_PATH);
- return;
- }
- wcscpy_s(lastSlashPos + slashLen
- , MAX_PLUGIN_PATH - executableDirLen, pluginSearchPattern);
-
- HANDLE fileFirst = FindFirstFileW(currentModuleName, &find_data);
- if (INVALID_HANDLE_VALUE == fileFirst)
- {
- TRACE_HIVE_ERROR("FindFirstFileW() unable to locate any plugins folders\n", 0);
- return;
- }
- do
- {
- if (!(find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
- {
- continue;
- }
- if (pluginDirNameLen != wcslen(find_data.cFileName))
- {
- continue;
- }
- //converting dirname into guid
- PluginDescriptionRecord descriptionRecord;
- descriptionRecord.APIVersion = currentAPIVersion;
- descriptionRecord.onlyVersionRegistered = true;
-
- mfxU32 i = 0;
- for(i = 0; i != pluginDirNameLen / charsPermfxU8; i++)
- {
- mfxU32 hexNum = 0;
- if (1 != swscanf_s(find_data.cFileName + charsPermfxU8 * i, L"%2x", &hexNum))
- {
- // it is ok to have non-plugin subdirs with length 32
- //TRACE_HIVE_INFO("folder name \"%S\" is not a valid GUID string\n", find_data.cFileName);
- break;
- }
- if (hexNum == 0 && find_data.cFileName + charsPermfxU8 * i != wcsstr(find_data.cFileName + 2*i, L"00"))
- {
- // it is ok to have non-plugin subdirs with length 32
- //TRACE_HIVE_INFO("folder name \"%S\" is not a valid GUID string\n", find_data.cFileName);
- break;
- }
- descriptionRecord.PluginUID.Datai = (mfxU8)hexNum;
- }
- if (i != pluginDirNameLen / charsPermfxU8) {
- continue;
- }
-
- wcscpy_s(currentModuleName + executableDirLen
- , MAX_PLUGIN_PATH - executableDirLen, find_data.cFileName);
-
- wcscpy_s(currentModuleName + executableDirLen + pluginDirNameLen
- , MAX_PLUGIN_PATH - executableDirLen - pluginDirNameLen, L"\\");
-
- //this is path to plugin directory
- wcscpy_s(descriptionRecord.sPath
- , sizeof(descriptionRecord.sPath) / sizeof(*descriptionRecord.sPath), currentModuleName);
-
- wcscpy_s(currentModuleName + executableDirLen + pluginDirNameLen + slashLen
- , MAX_PLUGIN_PATH - executableDirLen - pluginDirNameLen - slashLen, pluginCfgFileName);
-
- FILE *pluginCfgFile = 0;
- _wfopen_s(&pluginCfgFile, currentModuleName, L"r");
- if (!pluginCfgFile)
- {
- TRACE_HIVE_INFO("in directory \"%S\" no mandatory \"%S\"\n"
- , find_data.cFileName, pluginCfgFileName);
- continue;
- }
-
- if (ParseFile(pluginCfgFile, descriptionRecord))
- {
- try
- {
- push_back(descriptionRecord);
- }
- catch (...) {
- TRACE_HIVE_ERROR("mRecords.push_back(descriptionRecord); - threw exception \n", 0);
- }
- }
-
- fclose(pluginCfgFile);
- }while (FindNextFileW(fileFirst, &find_data));
- FindClose(fileFirst);
-}
-
-bool MFX::MFXPluginsInFS::ParseFile(FILE * f, PluginDescriptionRecord & descriptionRecord)
-{
- wchar_t lineMAX_PLUGIN_FILE_LINE;
-
- while(NULL != fgetws(line, sizeof(line) / sizeof(*line), f))
- {
- wchar_t *delimiter = wcschr(line, L'=');
- if (0 == delimiter)
- {
- TRACE_HIVE_INFO("plugin.cfg contains line \"%S\" which is not in K=V format, skipping \n", line);
- continue;
- }
- *delimiter = 0;
- if (!ParseKVPair(line, delimiter + 1, descriptionRecord))
- {
- return false;
- }
- }
-
- if (!mIsVersionParsed)
- {
- TRACE_HIVE_ERROR("%S : Mandatory key %S not found\n", pluginCfgFileName, PlgVerKeyName);
- return false;
- }
-
- if (!mIsAPIVersionParsed)
- {
- TRACE_HIVE_ERROR("%S : Mandatory key %S not found\n", pluginCfgFileName, APIVerKeyName);
- return false;
- }
-
- if (!wcslen(descriptionRecord.sPath))
- {
- TRACE_HIVE_ERROR("%S : Mandatory key %S not found\n", pluginCfgFileName, pluginFileName);
- return false;
- }
-
- return true;
-}
-
-bool MFX::MFXPluginsInFS::ParseKVPair( wchar_t * key, wchar_t* value, PluginDescriptionRecord & descriptionRecord)
-{
- if (0 != wcsstr(key, PlgVerKeyName))
- {
- mfxU32 version ;
- if (0 == swscanf_s(value, L"%d", &version))
- {
- return false;
- }
- descriptionRecord.PluginVersion = (mfxU16)version;
-
- if (0 == descriptionRecord.PluginVersion)
- {
- TRACE_HIVE_ERROR("%S: %S = %d, which is invalid\n", pluginCfgFileName, PlgVerKeyName, descriptionRecord.PluginVersion);
- return false;
- }
-
- TRACE_HIVE_INFO("%S: %S = %d \n", pluginCfgFileName, PlgVerKeyName, descriptionRecord.PluginVersion);
- mIsVersionParsed = true;
- return true;
- }
-
- if (0 != wcsstr(key, APIVerKeyName))
- {
- mfxU32 APIversion;
- if (0 == swscanf_s(value, L"%d", &APIversion))
- {
- return false;
- }
-
- ConvertAPIVersion(APIversion, descriptionRecord);
- TRACE_HIVE_INFO("%S: %S = %d.%d \n", pluginCfgFileName, APIVerKeyName, descriptionRecord.APIVersion.Major, descriptionRecord.APIVersion.Minor);
-
- mIsAPIVersionParsed = true;
- return true;
- }
-
-
- if (0!=wcsstr(key, pluginFileName))
- {
- wchar_t *startQuoteMark = wcschr(value, L'\"');
- if (!startQuoteMark)
- {
- TRACE_HIVE_ERROR("plugin filename not in quotes : %S\n", value);
- return false;
- }
- wchar_t *endQuoteMark = wcschr(startQuoteMark + 1, L'\"');
-
- if (!endQuoteMark)
- {
- TRACE_HIVE_ERROR("plugin filename not in quotes : %S\n", value);
- return false;
- }
- *endQuoteMark = 0;
-
- mfxU32 currentPathLen = (mfxU32)wcslen(descriptionRecord.sPath);
- if (currentPathLen + wcslen(startQuoteMark + 1) > sizeof(descriptionRecord.sPath) / sizeof(*descriptionRecord.sPath))
- {
- TRACE_HIVE_ERROR("buffer of MAX_PLUGIN_PATH characters which is %d, not enough lo store plugin path: %S%S\n"
- , MAX_PLUGIN_PATH, descriptionRecord.sPath, startQuoteMark + 1);
- return false;
- }
-
- size_t restrictedCharIdx = wcscspn(startQuoteMark + 1, pluginFileNameRestrictedCharacters);
- if (restrictedCharIdx != wcslen(startQuoteMark + 1))
- {
- TRACE_HIVE_ERROR("plugin filename :%S, contains one of restricted characters: %S\n", startQuoteMark + 1, pluginFileNameRestrictedCharacters);
- return false;
- }
-
- wcscpy_s(descriptionRecord.sPath + currentPathLen
- , sizeof(descriptionRecord.sPath) / sizeof(*descriptionRecord.sPath) - currentPathLen, startQuoteMark + 1);
-
- TRACE_HIVE_INFO("%S: %S = \"%S\" \n", pluginCfgFileName, pluginFileName, startQuoteMark + 1);
-
- return true;
- }
-
-
- return true;
-}
-
-#endif //#if !defined(MEDIASDK_UWP_DISPATCHER)
-
-MFX::MFXDefaultPlugins::MFXDefaultPlugins(mfxVersion currentAPIVersion, MFX_DISP_HANDLE * hdl, int implType)
- : MFXPluginStorageBase(currentAPIVersion)
-{
- wchar_t libModuleNameMAX_PLUGIN_PATH;
-
- GetModuleFileNameW((HMODULE)hdl->hModule, libModuleName, MAX_PLUGIN_PATH);
- if (GetLastError() != 0)
- {
- TRACE_HIVE_ERROR("GetModuleFileName() reported an error: %d\n", GetLastError());
- return;
- }
- wchar_t *lastSlashPos = wcsrchr(libModuleName, L'\\');
- if (!lastSlashPos) {
- lastSlashPos = libModuleName;
- }
- mfxU32 executableDirLen = (mfxU32)(lastSlashPos - libModuleName) + slashLen;
- if (executableDirLen + defaultPluginNameLen >= MAX_PLUGIN_PATH)
- {
- TRACE_HIVE_ERROR("MAX_PLUGIN_PATH which is %d, not enough to locate default plugin path\n", MAX_PLUGIN_PATH);
- return;
- }
-
- mfx_get_default_plugin_name(lastSlashPos + slashLen, MAX_PLUGIN_PATH - executableDirLen, (eMfxImplType)implType);
-
- if (-1 != GetFileAttributesW(libModuleName))
- {
- // add single default plugin description
- PluginDescriptionRecord descriptionRecord;
- descriptionRecord.APIVersion = currentAPIVersion;
- descriptionRecord.Default = true;
-
- wcscpy_s(descriptionRecord.sPath
- , sizeof(descriptionRecord.sPath) / sizeof(*descriptionRecord.sPath), libModuleName);
-
- push_back(descriptionRecord);
- }
- else
- {
- TRACE_HIVE_INFO("GetFileAttributesW() unable to locate default plugin dll named %S\n", libModuleName);
- }
-}
-
-

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/libmfx/src/mfx_win_reg_key.cpp Deleted

@@ -1,217 +0,0 @@
-// Copyright (c) 2012-2019 Intel Corporation
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-
-#if !defined(MEDIASDK_UWP_DISPATCHER)
-#include "mfx_win_reg_key.h"
-#include "mfx_dispatcher_log.h"
-
-#define TRACE_WINREG_ERROR(str, ...) DISPATCHER_LOG_ERROR((("WINREG: " str), __VA_ARGS__))
-
-namespace MFX
-{
-
-WinRegKey::WinRegKey(void)
-{
- m_hKey = (HKEY) 0;
-
-} // WinRegKey::WinRegKey(void)
-
-WinRegKey::~WinRegKey(void)
-{
- Release();
-
-} // WinRegKey::~WinRegKey(void)
-
-void WinRegKey::Release(void)
-{
- // close the opened key
- if (m_hKey)
- {
- RegCloseKey(m_hKey);
- }
-
- m_hKey = (HKEY) 0;
-
-} // void WinRegKey::Release(void)
-
-bool WinRegKey::Open(HKEY hRootKey, const wchar_t *pSubKey, REGSAM samDesired)
-{
- LONG lRes;
- HKEY hTemp;
-
- //
- // All operation are performed in this order by intention.
- // It makes possible to reopen the keys, using itself as a base.
- //
-
- // try to the open registry key
- lRes = RegOpenKeyExW(hRootKey, pSubKey, 0, samDesired, &hTemp);
- if (ERROR_SUCCESS != lRes)
- {
- DISPATCHER_LOG_OPERATION(SetLastError(lRes));
- TRACE_WINREG_ERROR("Opening key \"%s\\%S\" : RegOpenKeyExW()==0x%x\n"
- , (HKEY_LOCAL_MACHINE == hRootKey) ? ("HKEY_LOCAL_MACHINE") 
- : (HKEY_CURRENT_USER == hRootKey) ? ("HKEY_CURRENT_USER") 
- : "UNSUPPORTED_KEY", pSubKey, GetLastError());
- return false;
- }
-
- // release the object before initialization
- Release();
-
- // save the handle
- m_hKey = hTemp;
-
- return true;
-
-} // bool WinRegKey::Open(HKEY hRootKey, const wchar_t *pSubKey, REGSAM samDesired)
-
-bool WinRegKey::Open(WinRegKey &rootKey, const wchar_t *pSubKey, REGSAM samDesired)
-{
- return Open(rootKey.m_hKey, pSubKey, samDesired);
-
-} // bool WinRegKey::Open(WinRegKey &rootKey, const wchar_t *pSubKey, REGSAM samDesired)
-
-bool WinRegKey::QueryValueSize(const wchar_t *pValueName, DWORD type, LPDWORD pcbData) {
- DWORD keyType = type;
- LONG lRes;
-
- // query the value
- lRes = RegQueryValueExW(m_hKey, pValueName, NULL, &keyType, 0, pcbData);
- if (ERROR_SUCCESS != lRes)
- {
- DISPATCHER_LOG_OPERATION(SetLastError(lRes));
- TRACE_WINREG_ERROR("Querying \"%S\" : RegQueryValueExA()==0x%x\n", pValueName, GetLastError());
- return false;
- }
-
- return true;
-}
-
-bool WinRegKey::Query(const wchar_t *pValueName, DWORD type, LPBYTE pData, LPDWORD pcbData)
-{
- DWORD keyType = type;
- LONG lRes;
- DWORD dstSize = (pcbData) ? (*pcbData) : (0);
-
- // query the value
- lRes = RegQueryValueExW(m_hKey, pValueName, NULL, &keyType, pData, pcbData);
- if (ERROR_SUCCESS != lRes)
- {
- DISPATCHER_LOG_OPERATION(SetLastError(lRes));
- TRACE_WINREG_ERROR("Querying \"%S\" : RegQueryValueExA()==0x%x\n", pValueName, GetLastError());
- return false;
- }
-
- // check the type
- if (keyType != type)
- {
- TRACE_WINREG_ERROR("Querying \"%S\" : expectedType=%d, returned=%d\n", pValueName, type, keyType);
- return false;
- }
-
- // terminate the string only if pointers not NULL
- if ((REG_SZ == type || REG_EXPAND_SZ == type) && NULL != pData && NULL != pcbData)
- {
- wchar_t *pString = (wchar_t *) pData;
- size_t NullEndingSizeBytes = sizeof(wchar_t); // size of string termination null character
- if (dstSize < NullEndingSizeBytes)
- {
- TRACE_WINREG_ERROR("Querying \"%S\" : buffer is too small for null-terminated string", pValueName);
- return false;
- }
- size_t maxStringLengthBytes = dstSize - NullEndingSizeBytes;
- size_t maxStringIndex = dstSize / sizeof(wchar_t) - 1;
-
- size_t lastIndex = (maxStringLengthBytes < *pcbData) ? (maxStringIndex) : (*pcbData) / sizeof(wchar_t);
-
- pStringlastIndex = (wchar_t) 0;
- }
- else if(REG_MULTI_SZ == type && NULL != pData && NULL != pcbData)
- {
- wchar_t *pString = (wchar_t *) pData;
- size_t NullEndingSizeBytes = sizeof(wchar_t)*2; // size of string termination null characters
- if (dstSize < NullEndingSizeBytes)
- {
- TRACE_WINREG_ERROR("Querying \"%S\" : buffer is too small for multi-line null-terminated string", pValueName);
- return false;
- }
- size_t maxStringLengthBytes = dstSize - NullEndingSizeBytes;
- size_t maxStringIndex = dstSize / sizeof(wchar_t) - 1;
-
- size_t lastIndex = (maxStringLengthBytes < *pcbData) ? (maxStringIndex) : (*pcbData) / sizeof(wchar_t) + 1;
-
- // last 2 bytes should be 0 in case of REG_MULTI_SZ
- pStringlastIndex = pStringlastIndex - 1 = (wchar_t) 0;
- }
-
- return true;
-
-} // bool WinRegKey::Query(const wchar_t *pValueName, DWORD type, LPBYTE pData, LPDWORD pcbData)
-
-bool WinRegKey::EnumValue(DWORD index, wchar_t *pValueName, LPDWORD pcchValueName, LPDWORD pType)
-{
- LONG lRes;
-
- // enum the values
- lRes = RegEnumValueW(m_hKey, index, pValueName, pcchValueName, 0, pType, NULL, NULL);
- if (ERROR_SUCCESS != lRes)
- {
- DISPATCHER_LOG_OPERATION(SetLastError(lRes));
- return false;
- }
-
- return true;
-
-} // bool WinRegKey::EnumValue(DWORD index, wchar_t *pValueName, LPDWORD pcchValueName, LPDWORD pType)
-
-bool WinRegKey::EnumKey(DWORD index, wchar_t *pValueName, LPDWORD pcchValueName)
-{
- LONG lRes;
-
- // enum the keys
- lRes = RegEnumKeyExW(m_hKey, index, pValueName, pcchValueName, NULL, NULL, NULL, NULL);
- if (ERROR_SUCCESS != lRes)
- {
- DISPATCHER_LOG_OPERATION(SetLastError(lRes));
- TRACE_WINREG_ERROR("EnumKey with index=%d: RegEnumKeyExW()==0x%x\n", index, GetLastError());
- return false;
- }
-
- return true;
-
-} // bool WinRegKey::EnumKey(DWORD index, wchar_t *pValueName, LPDWORD pcchValueName)
-
-bool WinRegKey::QueryInfo(LPDWORD lpcSubkeys)
-{
- LONG lRes;
-
- lRes = RegQueryInfoKeyW(m_hKey, NULL, 0, 0, lpcSubkeys, 0, 0, 0, 0, 0, 0, 0);
- if (ERROR_SUCCESS != lRes) {
- TRACE_WINREG_ERROR("RegQueryInfoKeyW()==0x%x\n", lRes);
- return false;
- }
- return true;
-
-} //bool QueryInfo(LPDWORD lpcSubkeys);
-
-} // namespace MFX
-
-#endif // #if !defined(MEDIASDK_UWP_DISPATCHER)
\ No newline at end of file

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/cmake/macos/Info.plist.in Deleted

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleExecutable</key>
-	<string>obs-transitions</string>
-	<key>CFBundleIconFile</key>
-	<string>AppIcon</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.obs-transitions</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>OBS</string>
-	<key>CFBundleDisplayName</key>
-	<string>OBS Studio</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleSupportedPlatforms</key>
- 	<array>
- 		<string>MacOSX</string>
- 	</array>
-	<key>NSHighResolutionCapable</key>
-	<true/>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>LSAppNapIsDisabled</key>
-	<true/>
-	<key>NSCameraUsageDescription</key>
- 	<string>OBS needs to access the camera to enable camera sources to work.</string>
- 	<key>NSMicrophoneUsageDescription</key>
- 	<string>OBS needs to access the microphone to enable audio input.</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
-	<key>SUFeedURL</key>
-	<string>${OBS_SPARKLE_FEED_URL}</string>
-	<key>SUPublicDSAKeyFile</key>
-	<string>${OBS_PUBLIC_KEY_NAME}</string>
-</dict>
-</plist>

obs-studio-29.1.3.tar.xz/plugins/obs-vst/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-vst/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/websocketserver/rpc/WebSocketSession.cpp Deleted

@@ -1,153 +0,0 @@
-/*
-obs-websocket
-Copyright (C) 2016-2021 Stephane Lepin <stephane.lepin@gmail.com>
-Copyright (C) 2020-2021 Kyle Manning <tt2468@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program. If not, see <https://www.gnu.org/licenses/>
-*/
-
-#include "WebSocketSession.h"
-#include "../../eventhandler/types/EventSubscription.h"
-
-WebSocketSession::WebSocketSession()
-	: _remoteAddress(""),
-	 _connectedAt(0),
-	 _incomingMessages(0),
-	 _outgoingMessages(0),
-	 _encoding(0),
-	 _challenge(""),
-	 _rpcVersion(OBS_WEBSOCKET_RPC_VERSION),
-	 _isIdentified(false),
-	 _eventSubscriptions(EventSubscription::All)
-{
-}
-
-std::string WebSocketSession::RemoteAddress()
-{
-	std::lock_guard<std::mutex> lock(_remoteAddressMutex);
-	std::string ret(_remoteAddress);
-	return ret;
-}
-
-void WebSocketSession::SetRemoteAddress(std::string address)
-{
-	std::lock_guard<std::mutex> lock(_remoteAddressMutex);
-	_remoteAddress = address;
-}
-
-uint64_t WebSocketSession::ConnectedAt()
-{
-	return _connectedAt.load();
-}
-
-void WebSocketSession::SetConnectedAt(uint64_t at)
-{
-	_connectedAt.store(at);
-}
-
-uint64_t WebSocketSession::IncomingMessages()
-{
-	return _incomingMessages.load();
-}
-
-void WebSocketSession::IncrementIncomingMessages()
-{
-	_incomingMessages++;
-}
-
-uint64_t WebSocketSession::OutgoingMessages()
-{
-	return _outgoingMessages.load();
-}
-
-void WebSocketSession::IncrementOutgoingMessages()
-{
-	_outgoingMessages++;
-}
-
-uint8_t WebSocketSession::Encoding()
-{
-	return _encoding.load();
-}
-
-void WebSocketSession::SetEncoding(uint8_t encoding)
-{
-	_encoding.store(encoding);
-}
-
-bool WebSocketSession::AuthenticationRequired()
-{
-	return _authenticationRequired.load();
-}
-
-void WebSocketSession::SetAuthenticationRequired(bool required)
-{
-	_authenticationRequired.store(required);
-}
-
-std::string WebSocketSession::Secret()
-{
-	std::lock_guard<std::mutex> lock(_secretMutex);
-	std::string ret(_secret);
-	return ret;
-}
-
-void WebSocketSession::SetSecret(std::string secret)
-{
-	std::lock_guard<std::mutex> lock(_secretMutex);
-	_secret = secret;
-}
-
-std::string WebSocketSession::Challenge()
-{
-	std::lock_guard<std::mutex> lock(_challengeMutex);
-	std::string ret(_challenge);
-	return ret;
-}
-
-void WebSocketSession::SetChallenge(std::string challengeString)
-{
-	std::lock_guard<std::mutex> lock(_challengeMutex);
-	_challenge = challengeString;
-}
-
-uint8_t WebSocketSession::RpcVersion()
-{
-	return _rpcVersion.load();
-}
-
-void WebSocketSession::SetRpcVersion(uint8_t version)
-{
-	_rpcVersion.store(version);
-}
-
-bool WebSocketSession::IsIdentified()
-{
-	return _isIdentified.load();
-}
-
-void WebSocketSession::SetIsIdentified(bool identified)
-{
-	_isIdentified.store(identified);
-}
-
-uint64_t WebSocketSession::EventSubscriptions()
-{
-	return _eventSubscriptions.load();
-}
-
-void WebSocketSession::SetEventSubscriptions(uint64_t subscriptions)
-{
-	_eventSubscriptions.store(subscriptions);
-}

obs-studio-29.1.3.tar.xz/plugins/obs-x264/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/obs-x264/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/plugins/vlc-video/cmake/macos Deleted

obs-studio-29.1.3.tar.xz/plugins/vlc-video/cmake/macos/Info.plist.in Deleted

obs-studio-29.1.3.tar.xz/.cirrus.yml -> obs-studio-30.0.2.tar.xz/.cirrus.yml Changed

obs-studio-29.1.3.tar.xz/.clang-format -> obs-studio-30.0.2.tar.xz/.clang-format Changed

@@ -1,6 +1,6 @@
-# please use clang-format version 8 or later
+# please use clang-format version 16 or later
 
-Standard: Cpp11
+Standard: c++17
 AccessModifierOffset: -8
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
@@ -8,14 +8,14 @@
 AlignEscapedNewlines: Left
 AlignOperands: true
 AlignTrailingComments: true
-#AllowAllArgumentsOnNextLine: false  # requires clang-format 9
-#AllowAllConstructorInitializersOnNextLine: false  # requires clang-format 9
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: false
-#AllowShortLambdasOnASingleLine: Inline  # requires clang-format 9
+AllowShortLambdasOnASingleLine: Inline
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
@@ -52,8 +52,8 @@
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
 DisableFormat: false
-FixNamespaceComments: false
-ForEachMacros: 
+FixNamespaceComments: true
+ForEachMacros:
   - 'json_object_foreach'
   - 'json_object_foreach_safe'
   - 'json_array_foreach'
@@ -66,7 +66,7 @@
 KeepEmptyLinesAtTheStartOfBlocks: true
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-#ObjCBinPackProtocolList: Auto  # requires clang-format 7
+ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 8
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
@@ -84,13 +84,13 @@
 SortIncludes: false
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: false
-#SpaceAfterLogicalNot: false  # requires clang-format 9
+SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
-#SpaceBeforeCtorInitializerColon: true  # requires clang-format 7
-#SpaceBeforeInheritanceColon: true  # requires clang-format 7
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
-#SpaceBeforeRangeBasedForLoopColon: true  # requires clang-format 7
+SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
@@ -98,11 +98,111 @@
 SpacesInContainerLiterals: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-#StatementMacros:  # requires clang-format 8
-#  - 'Q_OBJECT'
+StatementMacros:
+  - 'Q_OBJECT'
 TabWidth: 8
-#TypenameMacros:  # requires clang-format 9
-#  - 'DARRAY'
+TypenameMacros:
+  - 'DARRAY'
 UseTab: ForContinuationAndIndentation
 ---
 Language: ObjC
+AccessModifierOffset: 2
+AlignArrayOfStructures: Right
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros:
+  Enabled: true
+  AcrossEmptyLines: false
+  AcrossComments: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: None
+AttributeMacros: '__unused', '__autoreleasing', '_Nonnull', '__bridge'
+BitFieldColonSpacing: Both
+#BreakBeforeBraces: Webkit
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: true
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: true
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+BreakAfterAttributes: Never
+BreakArrays: false
+BreakBeforeConceptDeclarations: Allowed
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakConstructorInitializers: AfterColon
+BreakInheritanceList: AfterComma
+ColumnLimit: 120
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: true
+IndentExternBlock: Indent
+IndentGotoLabels: false
+IndentRequiresClause: true
+IndentWidth: 4
+IndentWrappedFunctionNames: true
+InsertBraces: false
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+NamespaceIndentation: All
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+ObjCBreakBeforeNestedBlockParam: false
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PPIndentWidth: -1
+PackConstructorInitializers: NextLine
+QualifierAlignment: Leave
+ReferenceAlignment: Right
+RemoveSemicolon: false
+RequiresClausePosition: WithPreceding
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Always
+ShortNamespaceLines: 1
+SortIncludes: false
+#SortUsingDeclarations: LexicographicNumeric
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: true
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInConditionalStatement: false
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+Standard: c++17
+TabWidth: 4
+UseTab: Never

obs-studio-29.1.3.tar.xz/.editorconfig -> obs-studio-30.0.2.tar.xz/.editorconfig Changed

obs-studio-29.1.3.tar.xz/.git-blame-ignore-revs -> obs-studio-30.0.2.tar.xz/.git-blame-ignore-revs Changed

obs-studio-30.0.2.tar.xz/.github/actions Added

obs-studio-30.0.2.tar.xz/.github/actions/build-obs Added

obs-studio-30.0.2.tar.xz/.github/actions/build-obs/action.yaml Added

@@ -0,0 +1,120 @@
+name: Set Up and Build obs-studio
+description: Builds obs-studio for specified architecture and build config
+inputs:
+  target:
+    description: Build target for obs-studio
+    required: true
+  config:
+    description: Build configuration
+    required: false
+    default: RelWithDebInfo
+  codesign:
+    description: Enable codesigning (macOS only)
+    required: false
+    default: 'false'
+  codesignIdent:
+    description: Developer ID for application codesigning (macOS only)
+    required: false
+    default: '-'
+  codesignTeam:
+    description: Team ID for application codesigning (macOS only)
+    required: false
+    default: ''
+  provisioningProfileUUID:
+    description: UUID of provisioning profile (macOS only)
+    required: false
+    default: ''
+  workingDirectory:
+    description: Working directory for packaging
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Run macOS Build
+      if: runner.os == 'macOS'
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      working-directory: ${{ inputs.workingDirectory }}
+      env:
+        CODESIGN_IDENT: ${{ inputs.codesignIdent }}
+        CODESIGN_TEAM: ${{ inputs.codesignTeam }}
+        PROVISIONING_PROFILE: ${{ inputs.provisioningProfileUUID }}
+      run: |
+        : Run macOS Build
+
+        local -a build_args=(
+          --config ${{ inputs.config }}
+          --target macos-${{ inputs.target }}
+        )
+        if (( ${+RUNNER_DEBUG} )) build_args+=(--debug)
+
+        if  '${{ inputs.codesign }}' == true  build_args+=(--codesign)
+
+        git fetch origin --no-tags --no-recurse-submodules -q
+        .github/scripts/build-macos ${build_args}
+
+    - name: Install Dependencies 🛍️
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        : Install Dependencies 🛍️
+        echo ::group::Install Dependencies
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+        brew install --quiet zsh
+        echo ::endgroup::
+
+    - name: Run Ubuntu Build
+      if: runner.os == 'Linux'
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      working-directory: ${{ inputs.workingDirectory }}
+      run: |
+        : Run Ubuntu Build
+
+        local -a build_args=(
+          --config ${{ inputs.config }}
+          --target linux-${{ inputs.target }}
+        )
+        if (( ${+RUNNER_DEBUG} )) build_args+=(--debug)
+
+        git fetch origin --no-tags --no-recurse-submodules -q
+        .github/scripts/build-linux ${build_args}
+
+    - name: Run Windows Build
+      if: runner.os == 'Windows'
+      shell: pwsh
+      working-directory: ${{ inputs.workingDirectory }}
+      run: |
+        # Run Windows Build
+        $BuildArgs = @{
+          Target = '${{ inputs.target }}'
+          Configuration = '${{ inputs.config }}'
+        }
+
+        if ( $Env:RUNNER_DEBUG -ne $null ) {
+          $BuildArgs += @{ Debug = $true }
+        }
+
+        git fetch origin --no-tags --no-recurse-submodules -q
+        .github/scripts/Build-Windows.ps1 @BuildArgs
+
+    - name: Create Summary 📊
+      if: contains(fromJSON('"Linux", "macOS"'), runner.os)
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      run: |
+        : Create Summary 📊
+
+        local -a ccache_data
+        if (( ${+RUNNER_DEBUG} )) {
+          setopt XTRACE
+          ccache_data=("${(fA)$(ccache -s -vv)}")
+        } else {
+          ccache_data=("${(fA)$(ccache -s)}")
+        }
+
+        print '### ${{ runner.os }} Ccache Stats (${{ inputs.target }})' >> $GITHUB_STEP_SUMMARY
+        print '```' >> $GITHUB_STEP_SUMMARY
+        for line (${ccache_data}) {
+          print ${line} >> $GITHUB_STEP_SUMMARY
+        }
+        print '```' >> $GITHUB_STEP_SUMMARY

obs-studio-30.0.2.tar.xz/.github/actions/check-changes Added

obs-studio-30.0.2.tar.xz/.github/actions/check-changes/action.yaml Added

@@ -0,0 +1,57 @@
+name: Check For Changed Files
+description: Checks for changed files compared to specific git reference and glob expression
+inputs:
+  baseRef:
+    description: Git reference to check against
+    required: true
+  ref:
+    description: Git reference to check with
+    required: false
+    default: HEAD
+  checkGlob:
+    description: Glob expression to limit check to specific files
+    required: false
+  useFallback:
+    description: Use fallback compare against prior commit
+    required: false
+    default: 'true'
+outputs:
+  hasChangedFiles:
+    value: ${{ steps.checks.outputs.hasChangedFiles }}
+    description: True if specified files were changed in comparison to specified git reference
+  changedFiles:
+    value: ${{ toJSON(steps.checks.outputs.changedFiles) }}
+    description: List of changed files
+runs:
+  using: composite
+  steps:
+    - name: Check For Changed Files ✅
+      shell: bash
+      id: checks
+      env:
+        GIT_BASE_REF: ${{ inputs.baseRef }}
+        GIT_REF: ${{ inputs.ref }}
+        USE_FALLBACK: ${{ inputs.useFallback }}
+      run: |
+        : Check for Changed Files ✅
+        if  "${RUNNER_DEBUG}" ; then set -x; fi
+        shopt -s extglob
+        shopt -s dotglob
+
+        if ! git cat-file -e "${GIT_BASE_REF}" &> /dev/null; then
+          echo "::warning::Provided base reference ${GIT_BASE_REF} is invalid"
+          if  "${USE_FALLBACK}" == 'true' ; then
+            GIT_BASE_REF='HEAD~1'
+          fi
+        fi
+
+        changes=($(git diff --name-only ${GIT_BASE_REF} ${GIT_REF} -- ${{ inputs.checkGlob }}))
+
+        if (( ${#changes@} )); then
+          file_string="${changes*}"
+          echo "hasChangedFiles=true" >> $GITHUB_OUTPUT
+          echo "changedFiles=${file_string// /,}" >> GITHUB_OUTPUT
+        else
+          echo "hasChangedFiles=false" >> $GITHUB_OUTPUT
+          echo "changedFiles=" >> GITHUB_OUTPUT
+        fi

obs-studio-30.0.2.tar.xz/.github/actions/compatibility-validator Added

obs-studio-30.0.2.tar.xz/.github/actions/compatibility-validator/action.yaml Added

@@ -0,0 +1,58 @@
+name: Compatibility Data Validator
+description: Checks Windows compatibility data files
+inputs:
+  repositorySecret:
+    description: GitHub token for API access
+    required: true
+  workingDirectory:
+    description: Working directory for checks
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Check Runner Operating System 🏃‍♂️
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        : Check Runner Operating System 🏃‍♂️
+        echo "services-validation action requires a macOS-based or Linux-based runner."
+        exit 2
+
+    - name: Install and Configure Python 🐍
+      shell: bash
+      run: |
+        : Install and Configure Python 🐍
+        if  "${RUNNER_DEBUG}" ; then set -x; fi
+
+        echo ::group::Python Set Up
+        if  "${RUNNER_OS}" == Linux ; then
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+          echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+        fi
+        brew install --quiet python3
+        python3 -m pip install jsonschema json_source_map
+        echo ::endgroup::
+
+    - name: Validate Compatibility Files JSON Schema 🕵️
+      shell: bash
+      working-directory: ${{ inputs.workingDirectory }}
+      run: |
+        : Validate services file JSON schema 🕵️
+        if  "${RUNNER_DEBUG}" ; then set -x; fi
+        shopt -s extglob
+
+        echo ::group::Schema Validation
+        python3 -u \
+          .github/scripts/utils.py/check-jsonschema.py \
+          --loglevel INFO \
+          plugins/win-capture/data/@(compatibility|package).json
+        echo ::endgroup::
+
+    - name: Annotate Schema Validation Errors 🏷️
+      uses: yuzutech/annotations-action@v0.4.0
+      if: failure()
+      with:
+        repo-token: ${{ inputs.repositorySecret }}
+        title: Compatibility JSON Errors
+        input: ${{ inputs.workingDirectory }}/validation_errors.json

obs-studio-30.0.2.tar.xz/.github/actions/flatpak-builder-lint Added

obs-studio-30.0.2.tar.xz/.github/actions/flatpak-builder-lint/action.yaml Added

@@ -0,0 +1,73 @@
+name: Run flatpak-builder-lint
+description: Runs flatpak-builder-lint with exceptions
+inputs:
+ artifact:
+ description: Type of artifact to lint (builddir, repo, manifest)
+ required: true
+ path:
+ description: Path to flatpak-builder manifest or Flatpak build directory
+ required: true
+ workingDirectory:
+ description: Working directory to clone flatpak-builder-lint
+ required: false
+ default: ${{ github.workspace }}
+runs:
+ using: composite
+ steps:
+ - name: Check artifact type
+ shell: bash
+ working-directory: ${{ inputs.workingDirectory }}
+ run: |
+ : Check artifact input
+ case "${{ inputs.artifact }}" in
+ builddir);;
+ repo);;
+ manifest);;
+ *)
+ echo "::error::Given artifact type is incorrect"
+ exit 2
+ ;;
+ esac
+
+ - uses: actions/checkout@v3
+ with:
+ repository: flathub/flatpak-builder-lint
+ ref: v2.0.13
+ path: flatpak-builder-lint
+ set-safe-directory: ${{ inputs.workingDirectory }}
+
+ - name: Install Dependencies 🛍️
+ shell: bash
+ working-directory: ${{ inputs.workingDirectory }}
+ run: |
+ : Install Dependencies 🛍️
+ echo ::group::Install Dependencies
+ dnf install -y -q poetry jq
+ poetry -q -C flatpak-builder-lint install
+ echo ::endgroup::
+
+ - name: Run flatpak-builder-lint
+ id: result
+ shell: bash
+ working-directory: ${{ inputs.workingDirectory }}
+ run: |
+ : Run flatpak-builder-lint
+ exit_code=0
+ ret=$(poetry -C flatpak-builder-lint run flatpak-builder-lint --exceptions ${{ inputs.artifact }} ${{ inputs.path }}) || exit_code=$?
+ if $exit_code != 0 && -z "$ret" ; then
+ echo "::error::Error while running flatpak-builder-lint"
+ exit 2
+ fi
+
+ for ((i = 0 ; i < $(echo $ret | jq '.warnings | length') ; i++)); do
+ warning=$(echo $ret | jq ".warnings$i")
+ echo "::warning::$warning found in the Flatpak ${{ inputs.artifact }}"
+ done
+
+ n_errors=$(echo $ret | jq '.errors | length')
+ for ((i = 0; i < $n_errors; i++)); do
+ error=$(echo $ret | jq ".errors$i")
+ echo "::error::$error found in the Flatpak ${{ inputs.artifact }}"
+ done
+
+ $n_errors == 0 || exit 2

obs-studio-30.0.2.tar.xz/.github/actions/flatpak-manifest-validator Added

obs-studio-30.0.2.tar.xz/.github/actions/flatpak-manifest-validator/action.yaml Added

@@ -0,0 +1,38 @@
+name: Flatpak Manifest Validator
+description: Checks order of Flatpak modules in manifest file
+inputs:
+  manifestFile:
+    description: Flatpak manifest file to check
+  failCondition:
+    description: Controls whether failed checks also fail the workflow run
+    required: false
+    default: never
+  workingDirectory:
+    description: Working directory for checks
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Check Runner Operating System 🏃‍♂️
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        : Check Runner Operating System 🏃‍♂️
+        echo "services-validation action requires a macOS-based or Linux-based runner."
+        exit 2
+
+    - name: Validate Flatpak Manifest 🕵️
+      shell: bash
+      working-directory: ${{ inputs.workingDirectory }}
+      run: |
+        : Validate Flatpak Manifest 🕵️
+
+        echo ::group::Run Validation
+        if  '${{ inputs.failCondition }}' == 'never' ; then set +e; fi
+        python3 -u \
+          build-aux/format-manifest.py \
+          build-aux/com.obsproject.Studio.json \
+          --check \
+          --loglevel INFO
+        echo ::endgroup::

obs-studio-30.0.2.tar.xz/.github/actions/generate-docs Added

obs-studio-30.0.2.tar.xz/.github/actions/generate-docs/action.yaml Added

@@ -0,0 +1,62 @@
+name: Generate Documentation
+description: Updates Sphinx-based documentation
+inputs:
+ sourceDirectory:
+ description: Path to repository checkout
+ required: false
+ default: ${{ github.workspace }}
+ disableLinkExtensions:
+ description: Disable Sphinx link extensions
+ required: false
+ default: 'false'
+runs:
+ using: composite
+ steps:
+ - name: Update Version Number and Copyright ↗️
+ id: setup
+ shell: bash
+ run: |
+ : Update Version Number and Copyright ↗️
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+
+ : "${major:=}"
+ : "${minor:=}"
+ : "${patch:=}"
+
+ read -r _ major _ minor _ patch _ <<< \
+ "$(grep -E -e "#define LIBOBS_API_(MAJOR|MINOR|PATCH)_VER *" libobs/obs-config.h \
+ | sed 's/#define //g' \
+ | tr -s ' ' \
+ | tr '\n' ' ')"
+
+ sed -i -E \
+ -e "s/version = '(0-9+\.0-9+\.0-9+)'/version = '${major}.${minor}.${patch}'/g" \
+ -e "s/release = '(0-9+\.0-9+\.0-9+)'/release = '${major}.${minor}.${patch}'/g" \
+ -e "s/copyright = '(2017-0-9+, Lain Bailey)'/copyright = '2017-$(date +"%Y"), Lain Bailey'/g" \
+ ${{ inputs.sourceDirectory }}/docs/sphinx/conf.py
+
+ if '${{ inputs.disableLinkExtensions }}' == 'true' ; then
+ sed -i -e "s/html_link_suffix = None/html_link_suffix = ''/g" \
+ ${{ inputs.sourceDirectory }}/docs/sphinx/conf.py
+ echo "artifactName=OBS Studio Docs (No Extensions)" >> $GITHUB_OUTPUT
+ else
+ echo "artifactName=OBS Studio Docs" >> $GITHUB_OUTPUT
+ fi
+
+ echo "commitHash=${GITHUB_SHA:0:9}" >> $GITHUB_OUTPUT
+
+ - name: Install Sphinx 📜
+ uses: totaldebug/sphinx-publish-action@1.2.0
+ with:
+ sphinx_src: ${{ inputs.sourceDirectory }}/docs/sphinx
+ build_only: true
+ target_branch: master
+ target_path: '../home/_build'
+ pre_build_commands: 'pip install -Iv sphinx==5.1.1'
+
+ - uses: actions/upload-artifact@v3
+ with:
+ name: ${{ steps.setup.outputs.artifactName }} ${{ steps.setup.outputs.commitHash }}
+ path: |
+ ${{ runner.temp }}/_github_home/_build
+ !${{ runner.temp }}/_github_home/_build/.doctrees

obs-studio-30.0.2.tar.xz/.github/actions/package-obs Added

obs-studio-30.0.2.tar.xz/.github/actions/package-obs/action.yaml Added

@@ -0,0 +1,114 @@
+name: Package obs-studio
+description: Packages obs-studio for specified architecture and build config
+inputs:
+  target:
+    description: Build target for dependencies
+    required: true
+  config:
+    description: Build configuration
+    required: false
+    default: Release
+  codesign:
+    description: Enable codesigning (macOS only)
+    required: false
+    default: 'false'
+  notarize:
+    description: Enable notarization (macOS only)
+    required: false
+    default: 'false'
+  codesignIdent:
+    description: Developer ID for application codesigning (macOS only)
+    required: false
+    default: '-'
+  codesignUser:
+    description: Apple ID username for notarization (macOS only)
+    required: false
+    default: ''
+  codesignPass:
+    description: Apple ID password for notarization (macOS only)
+    required: false
+    default: ''
+  package:
+    description: Create platform-specific packages instead of archives
+    required: false
+    default: 'false'
+  workingDirectory:
+    description: Working directory for packaging
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Run macOS packaging
+      if: runner.os == 'macOS'
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      working-directory: ${{ inputs.workingDirectory }}
+      env:
+        CODESIGN_IDENT: ${{ inputs.codesignIdent }}
+        CODESIGN_IDENT_USER: ${{ inputs.codesignUser }}
+        CODESIGN_IDENT_PASS: ${{ inputs.codesignPass }}
+      run: |
+        : Run macOS Packaging
+
+        local -a package_args=(
+          --target macos-${{ inputs.target }}
+          --config ${{ inputs.config }}
+        )
+        if (( ${+RUNNER_DEBUG} )) build_args+=(--debug)
+
+        if  '${{ inputs.codesign }}' == true  package_args+=(--codesign)
+        if  '${{ inputs.notarize }}' == true  package_args+=(--notarize)
+        if  '${{ inputs.package }}' == true  package_args+=(--package)
+
+        .github/scripts/package-macos ${package_args}
+
+    - name: Install Dependencies 🛍️
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        : Install Dependencies 🛍️
+        echo ::group::Install Dependencies
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+        brew install --quiet zsh
+        echo ::endgroup::
+
+    - name: Run Ubuntu packaging
+      if: runner.os == 'Linux'
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      working-directory: ${{ inputs.workingDirectory }}
+      run: |
+        : Run Ubuntu Packaging
+
+        local -a package_args=(
+          --target linux-${{ inputs.target }}
+          --config ${{ inputs.config }}
+        )
+        if (( ${+RUNNER_DEBUG} )) build_args+=(--debug)
+
+        if  '${{ inputs.package }}' == true  package_args+=(--package)
+
+        ${{ inputs.workingDirectory }}/.github/scripts/package-linux ${package_args}
+
+    - name: Run Windows packaging
+      if: runner.os == 'Windows'
+      shell: pwsh
+      working-directory: ${{ inputs.workingDirectory }}
+      run: |
+        # Run Windows Packaging
+        $PackageArgs = @{
+          Target = '${{ inputs.target }}'
+          Configuration = '${{ inputs.config }}'
+        }
+
+        if ( $Env:RUNNER_DEBUG -ne $null ) {
+          $PackageArgs += @{ Debug = $true }
+        }
+
+        if ( ( Test-Path env:CI ) -and ( Test-Path env:RUNNER_DEBUG ) ) {
+          $BuildArgs += @{
+            Debug = $true
+          }
+        }
+
+        .github/scripts/Package-windows.ps1 @PackageArgs

obs-studio-30.0.2.tar.xz/.github/actions/qt-xml-validator Added

obs-studio-30.0.2.tar.xz/.github/actions/qt-xml-validator/action.yaml Added

@@ -0,0 +1,69 @@
+name: Validate UI XML
+description: Validates Qt UI XML files
+inputs:
+  failCondition:
+    description: Controls whether failed checks also fail the workflow run
+    required: false
+    default: never
+  workingDirectory:
+    description: Working directory for checks
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Check Runner Operating System 🏃‍♂️
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        : Check Runner Operating System 🏃‍♂️
+        echo "::notice::qt-xml-validator action requires an Linux-based or macOS-based runner."
+        exit 2
+
+    - name: Install xmllint 🕵️
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        : Install xmllint 🕵️
+        if  "${RUNNER_DEBUG}" ; then set -x; fi
+
+        echo ::group::Installing libxml2-utils
+        sudo apt-get -qq update
+        sudo apt-get install --no-install-recommends -y libxml2-utils
+        echo ::endgroup::
+
+    - name: Register Annotations 📝
+      uses: korelstar/xmllint-problem-matcher@22352420d1d3e8f18d311d76284c4f5f71982222
+
+    - name: Validate XML 💯
+      shell: bash
+      env:
+        GITHUB_EVENT_FORCED: ${{ github.event.forced }}
+        GITHUB_REF_BEFORE: ${{ github.event.before }}
+      run: |
+        : Validate XML 💯
+        if  "${RUNNER_DEBUG}" ; then set -x; fi
+        shopt -s extglob
+        shopt -s globstar
+
+        if ! git cat-file -e "${GITHUB_REF_BEFORE}" &> /dev/null; then
+          GITHUB_REF_BEFORE='4b825dc642cb6eb9a060e54bf8d69288fbee4904'
+        fi
+
+        changes=($(git diff --name-only HEAD~1 HEAD -- UI/forms/**/*.ui))
+        case "${GITHUB_EVENT_NAME}" in
+          pull_request) changes=($(git diff --name-only origin/"${GITHUB_BASE_REF}" HEAD -- UI/forms/**/*.ui)) ;;
+          push)
+            if  "${GITHUB_EVENT_FORCED}" == false ; then
+              changes=($(git diff --name-only ${GITHUB_REF_BEFORE} HEAD -- UI/forms/**/*.ui))
+            fi
+            ;;
+          *) ;;
+        esac
+
+        if (( ${#changes@} )); then
+          if  '${{ inputs.failCondition }}' == never ; then set +e; fi
+          xmllint \
+            --schema ${{ github.workspace }}/UI/forms/XML-Schema-Qt5.15.xsd \
+            --noout "${changes@}"
+        fi

obs-studio-30.0.2.tar.xz/.github/actions/run-clang-format Added

obs-studio-30.0.2.tar.xz/.github/actions/run-clang-format/action.yaml Added

@@ -0,0 +1,65 @@
+name: Run clang-format
+description: Runs clang-format and checks for any changes introduced by it
+inputs:
+  failCondition:
+    description: Controls whether failed checks also fail the workflow run
+    required: false
+    default: never
+  workingDirectory:
+    description: Working directory for checks
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Check Runner Operating System 🏃‍♂️
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        : Check Runner Operating System 🏃‍♂️
+        echo "::notice::run-clang-format action requires a macOS-based or Linux-based runner."
+        exit 2
+
+    - name: Install Dependencies 🛍️
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        : Install Dependencies 🛍️
+        echo ::group::Install Dependencies
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+        echo "/home/linuxbrew/.linuxbrew/opt/clang-format@16/bin" >> $GITHUB_PATH
+        brew install --quiet zsh
+        echo ::endgroup::
+
+    - name: Run clang-format 🐉
+      id: result
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      working-directory: ${{ inputs.workingDirectory }}
+      env:
+        GITHUB_EVENT_FORCED: ${{ github.event.forced }}
+        GITHUB_REF_BEFORE: ${{ github.event.before }}
+      run: |
+        : Run clang-format 🐉
+        if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+        if ! git cat-file -e ${GITHUB_REF_BEFORE} &> /dev/null; then
+          GITHUB_REF_BEFORE='4b825dc642cb6eb9a060e54bf8d69288fbee4904'
+        fi
+
+        local -a changes=($(git diff --name-only HEAD~1 HEAD))
+        case ${GITHUB_EVENT_NAME} {
+          pull_request) changes=($(git diff --name-only origin/${GITHUB_BASE_REF} HEAD)) ;;
+          push) if  ${GITHUB_EVENT_FORCED} != true  changes=($(git diff --name-only ${GITHUB_REF_BEFORE} HEAD)) ;;
+          *) ;;
+        }
+
+        if (( ${changes(I)(*.c|*.h|*.cpp|*.hpp|*.m|*.mm)} )) {
+          print ::group::Install clang-format-16
+          brew install --quiet obsproject/tools/clang-format@16
+          print ::endgroup::
+
+          print ::group::Run clang-format-16
+          ./build-aux/run-clang-format --fail-${{ inputs.failCondition }} --check
+          print ::endgroup::
+        }

obs-studio-30.0.2.tar.xz/.github/actions/run-cmake-format Added

obs-studio-30.0.2.tar.xz/.github/actions/run-cmake-format/action.yaml Added

@@ -0,0 +1,64 @@
+name: Run cmake-format
+description: Runs cmake-format and checks for any changes introduced by it
+inputs:
+  failCondition:
+    description: Controls whether failed checks also fail the workflow run
+    required: false
+    default: never
+  workingDirectory:
+    description: Working directory for checks
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Check Runner Operating System 🏃‍♂️
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        : Check Runner Operating System 🏃‍♂️
+        echo "::notice::run-cmake-format action requires a macOS-based or Linux-based runner."
+        exit 2
+
+    - name: Install Dependencies 🛍️
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        : Install Dependencies 🛍️
+        echo ::group::Install Dependencies
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+        brew install --quiet zsh
+        echo ::endgroup::
+
+    - name: Run cmake-format 🎛️
+      id: result
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      working-directory: ${{ github.workspace }}
+      env:
+        GITHUB_EVENT_FORCED: ${{ github.event.forced }}
+        GITHUB_REF_BEFORE: ${{ github.event.before }}
+      run: |
+        : Run cmake-format 🎛️
+        if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+        if ! git cat-file -e ${GITHUB_REF_BEFORE} &> /dev/null; then
+          GITHUB_REF_BEFORE='4b825dc642cb6eb9a060e54bf8d69288fbee4904'
+        fi
+
+        local -a changes=($(git diff --name-only HEAD~1 HEAD))
+        case ${GITHUB_EVENT_NAME} {
+          pull_request) changes=($(git diff --name-only origin/${GITHUB_BASE_REF} HEAD)) ;;
+          push) if  ${GITHUB_EVENT_FORCED} != true  changes=($(git diff --name-only ${GITHUB_REF_BEFORE} HEAD)) ;;
+          *) ;;
+        }
+
+        if (( ${changes(I)*.cmake|*CMakeLists.txt} )) {
+          print ::group::Install cmakelang
+          pip3 install cmakelang
+          print ::endgroup::
+
+          print ::group::Run cmake-format
+          ./build-aux/run-cmake-format --fail-${{ inputs.failCondition }} --check
+          print ::endgroup::
+        }

obs-studio-30.0.2.tar.xz/.github/actions/run-swift-format Added

obs-studio-30.0.2.tar.xz/.github/actions/run-swift-format/action.yaml Added

@@ -0,0 +1,64 @@
+name: Run swift-format
+description: Runs swift-format and checks for any changes introduced by it
+inputs:
+  failCondition:
+    description: Controls whether failed checks also fail the workflow run
+    required: false
+    default: never
+  workingDirectory:
+    description: Working directory for checks
+    required: false
+    default: ${{ github.workspace }}
+runs:
+  using: composite
+  steps:
+    - name: Check Runner Operating System 🏃‍♂️
+      if: runner.os == 'Windows'
+      shell: bash
+      run: |
+        : Check Runner Operating System 🏃‍♂️
+        echo "::notice::run-swift-format action requires a macOS-based or Linux-based runner."
+        exit 2
+
+    - name: Install Dependencies 🛍️
+      if: runner.os == 'Linux'
+      shell: bash
+      run: |
+        : Install Dependencies 🛍️
+        echo ::group::Install Dependencies
+        eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+        echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+        brew install --quiet zsh
+        echo ::endgroup::
+
+    - name: Run swift-format 🔥
+      id: result
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      working-directory: ${{ github.workspace }}
+      env:
+        GITHUB_EVENT_FORCED: ${{ github.event.forced }}
+        GITHUB_REF_BEFORE: ${{ github.event.before }}
+      run: |
+        : Run swift-format 🔥
+        if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+        if ! git cat-file -e ${GITHUB_REF_BEFORE} &> /dev/null; then
+          GITHUB_REF_BEFORE='4b825dc642cb6eb9a060e54bf8d69288fbee4904'
+        fi
+
+        local -a changes=($(git diff --name-only HEAD~1 HEAD))
+        case ${GITHUB_EVENT_NAME} {
+          pull_request) changes=($(git diff --name-only origin/${GITHUB_BASE_REF} HEAD)) ;;
+          push) if  ${GITHUB_EVENT_FORCED} != true  changes=($(git diff --name-only ${GITHUB_REF_BEFORE} HEAD)) ;;
+          *) ;;
+        }
+
+        if (( ${changes(I)*.swift} )) {
+          print ::group::Install swift-format
+          brew install --quiet swift-format
+          print ::endgroup::
+
+          print ::group::Run swift-format
+          ./build-aux/run-swift-format --fail-${{ inputs.failCondition }} --check
+          print ::endgroup::
+        }

obs-studio-30.0.2.tar.xz/.github/actions/services-validator Added

obs-studio-30.0.2.tar.xz/.github/actions/services-validator/action.yaml Added

@@ -0,0 +1,113 @@
+name: Services Validation
+description: Checks services configuration file and checks for defunct services
+inputs:
+ repositorySecret:
+ description: GitHub token for API access
+ required: true
+ runSchemaChecks:
+ description: Enable schema checking
+ required: false
+ default: 'true'
+ runServiceChecks:
+ description: Enable defunct service checking
+ required: false
+ default: 'false'
+ createPullRequest:
+ description: Enable pull request creation after service checks
+ required: false
+ default: 'false'
+ workingDirectory:
+ description: Working directory for checks
+ required: false
+ default: ${{ github.workspace }}
+outputs:
+ hasDefunctServices:
+ description: True if defunct services were found in configuration
+ value: ${{ steps.check.outputs.make_pr }}
+runs:
+ using: composite
+ steps:
+ - name: Check Runner Operating System 🏃‍♂️
+ if: runner.os == 'Windows'
+ shell: bash
+ run: |
+ : Check Runner Operating System 🏃‍♂️
+ echo "::notice::services-validation action requires a macOS-based or Linux-based runner."
+ exit 2
+
+ - name: Install and Configure Python 🐍
+ shell: bash
+ run: |
+ : Install and Configure Python 🐍
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+
+ echo ::group::Python Set Up
+ if "${RUNNER_OS}" == Linux ; then
+ eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+ echo "/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin" >> $GITHUB_PATH
+ fi
+ brew install --overwrite --quiet python3
+ python3 -m pip install jsonschema json_source_map requests
+ echo ::endgroup::
+
+ - name: Validate Services File JSON Schema 🕵️
+ if: fromJSON(inputs.runSchemaChecks)
+ shell: bash
+ working-directory: ${{ inputs.workingDirectory }}
+ run: |
+ : Validate Services File JSON Schema 🕵️
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+ shopt -s extglob
+
+ echo ::group::Run Validation
+ python3 -u \
+ .github/scripts/utils.py/check-jsonschema.py \
+ plugins/rtmp-services/data/@(services|package).json \
+ --loglevel INFO
+ echo ::endgroup::
+
+ - name: Annotate schema validation errors 🏷️
+ if: fromJSON(inputs.runSchemaChecks) && failure()
+ uses: yuzutech/annotations-action@v0.4.0
+ with:
+ repo-token: ${{ inputs.repositorySecret }}
+ title: Service JSON Errors
+ input: ${{ inputs.workingDirectory }}/validation_errors.json
+
+ - name: Restore Timestamp Cache ⏳
+ if: fromJSON(inputs.runServiceChecks)
+ uses: actions/cache@v3
+ with:
+ path: ${{ github.workspace }}/other
+ key: service-check-${{ github.run_id }}
+ restore-keys: service-check-
+
+ - name: Check for defunct services 📉
+ id: services-check
+ if: fromJSON(inputs.runServiceChecks)
+ shell: bash
+ working-directory: ${{ inputs.workingDirectory }}
+ env:
+ GITHUB_TOKEN: ${{ inputs.repositorySecret }}
+ WORKFLOW_RUN_ID: ${{ github.run_id }}
+ REPOSITORY: ${{ github.repository }}
+ run: |
+ : Check for defunct services 📉
+ python3 -u .github/scripts/utils.py/check-services.py
+
+ - uses: actions/upload-artifact@v3
+ if: fromJSON(inputs.runServiceChecks)
+ with:
+ name: timestamps
+ path: ${{ inputs.workingDirectory }}/other/*
+
+ - name: Create pull request 🔧
+ uses: peter-evans/create-pull-request@ad43dccb4d726ca8514126628bec209b8354b6dd
+ if: fromJSON(inputs.createPullRequest) && fromJSON(inputs.runServiceChecks) && fromJSON(steps.services-check.outputs.make_pr)
+ with:
+ author: 'Service Checker <commits@obsproject.com>'
+ commit-message: 'rtmp-services: Remove defunct servers/services'
+ title: 'rtmp-services: Remove defunct servers/services'
+ branch: 'automated/clean-services'
+ body: ${{ fromJSON(steps.services-check.outputs.pr_message) }}
+ delete-branch: true

obs-studio-30.0.2.tar.xz/.github/actions/setup-macos-codesigning Added

obs-studio-30.0.2.tar.xz/.github/actions/setup-macos-codesigning/action.yaml Added

@@ -0,0 +1,149 @@
+name: Set up macOS Code Signing
+description: Sets up code signing certificates, provisioning profiles, and notarization information
+inputs:
+  codesignIdentity:
+    description: Code signing identity
+    required: true
+  codesignCertificate:
+    description: PKCS12 certificate in base64 format
+    required: true
+  certificatePassword:
+    description: Password required to install PKCS12 certificate
+    required: true
+  keychainPassword:
+    description: Password to use for temporary keychain
+    required: false
+  notarizationUser:
+    description: Apple ID to use for notarization
+    required: false
+  notarizationPassword:
+    description: Application password for notarization
+  provisioningProfile:
+    description: Provisioning profile in base64 format
+    required: false
+outputs:
+  haveCodesignIdent:
+    description: True if necessary code signing credentials were found
+    value: ${{ steps.codesign.outputs.haveCodesignIdent }}
+  haveProvisioningProfile:
+    description: True if necessary provisioning profile credentials were found
+    value: ${{ steps.provisioning.outputs.haveProvisioningProfile }}
+  provisioningProfileUUID:
+    description: UUID of imported provisioning profile
+    value: ${{ steps.provisioning.outputs.provisioningProfileUUID }}
+  haveNotarizationUser:
+    description: True if necessary notarization credentials were found
+    value: ${{ steps.notarization.outputs.haveNotarizationUser }}
+  codesignIdent:
+    description: Code signing identity
+    value: ${{ steps.codesign.outputs.codesignIdent }}
+  codesignTeam:
+    description: Code signing team
+    value: ${{ steps.codesign.outputs.codesignTeam }}
+runs:
+  using: composite
+  steps:
+    - name: Check Runner Operating System 🏃‍♂️
+      if: runner.os != 'macOS'
+      shell: bash
+      run: |
+        : Check Runner Operating System 🏃‍♂️
+        echo "setup-macos-codesigning action requires a macOS-based runner."
+        exit 2
+
+    - name: macOS Code Signing ✍️
+      id: codesign
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      env:
+        MACOS_SIGNING_IDENTITY: ${{ inputs.codesignIdentity }}
+        MACOS_SIGNING_CERT: ${{ inputs.codesignCertificate }}
+        MAOCS_SIGNING_CERT_PASSWORD: ${{ inputs.certificatePassword }}
+        MACOS_KEYCHAIN_PASSWORD: ${{ inputs.keychainPassword }}
+      run: |
+        : macOS Code Signing ✍️
+        if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+        if  ${MACOS_SIGNING_IDENTITY} && ${MACOS_SIGNING_CERT}  {
+          print 'haveCodesignIdent=true' >> $GITHUB_OUTPUT
+
+          local -r certificate_path="${RUNNER_TEMP}/build_certificate.p12"
+          local -r keychain_path="${RUNNER_TEMP}/app-signing.keychain-db"
+
+          print -n "${MACOS_SIGNING_CERT}" | base64 --decode --output=${certificate_path}
+
+          : "${MACOS_KEYCHAIN_PASSWORD:="$(print ${RANDOM} | shasum | head -c 32)"}"
+
+          print '::group::Keychain setup'
+          security create-keychain -p "${MACOS_KEYCHAIN_PASSWORD}" ${keychain_path}
+          security set-keychain-settings -lut 21600 ${keychain_path}
+          security unlock-keychain -p "${MACOS_KEYCHAIN_PASSWORD}" ${keychain_path}
+
+          security import "${certificate_path}" -P "${MAOCS_SIGNING_CERT_PASSWORD}" -A \
+            -t cert -f pkcs12 -k ${keychain_path} \
+            -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/xcrun
+
+          security set-key-partition-list -S 'apple-tool:,apple:' -k "${MACOS_KEYCHAIN_PASSWORD}" \
+            ${keychain_path} &> /dev/null
+
+          security list-keychain -d user -s ${keychain_path} 'login-keychain'
+          print '::endgroup::'
+
+          local -r team_id="${${MACOS_SIGNING_IDENTITY##* }//($|$)/}"
+
+          print "codesignIdent=${MACOS_SIGNING_IDENTITY}" >> $GITHUB_OUTPUT
+          print "MACOS_KEYCHAIN_PASSWORD=${MACOS_KEYCHAIN_PASSWORD}" >> $GITHUB_ENV
+          print "codesignTeam=${team_id}" >> $GITHUB_OUTPUT
+        } else {
+          print 'haveCodesignIdent=false' >> $GITHUB_OUTPUT
+        }
+
+    - name: Provisioning Profile 👤
+      id: provisioning
+      if: fromJSON(steps.codesign.outputs.haveCodesignIdent)
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      env:
+          MACOS_SIGNING_PROVISIONING_PROFILE: ${{ inputs.provisioningProfile }}
+      run: |
+        : Provisioning Profile 👤
+        if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+        if  "${MACOS_SIGNING_PROVISIONING_PROFILE}"  {
+          print 'haveProvisioningProfile=true' >> $GITHUB_OUTPUT
+
+          local -r profile_path="${RUNNER_TEMP}/build_profile.provisionprofile"
+          print -n "${MACOS_SIGNING_PROVISIONING_PROFILE}" \
+            | base64 --decode --output="${profile_path}"
+
+          print '::group::Provisioning Profile Setup'
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          security cms -D -i ${profile_path} -o ${RUNNER_TEMP}/build_profile.plist
+          local -r uuid="$(plutil -extract UUID raw ${RUNNER_TEMP}/build_profile.plist)"
+          local -r team_id="$(plutil -extract TeamIdentifier.0 raw -expect string ${RUNNER_TEMP}/build_profile.plist)"
+
+          if  ${team_id} != '${{ steps.codesign.outputs.codesignTeam }}'  {
+            print '::notice::Code Signing team in provisioning profile does not match certificate.'
+          }
+
+          cp ${profile_path} ~/Library/MobileDevice/Provisioning\ Profiles/${uuid}.provisionprofile
+          print "provisioningProfileUUID=${uuid}" >> $GITHUB_OUTPUT
+          print '::endgroup::'
+        } else {
+          print 'haveProvisioningProfile=false' >> $GITHUB_OUTPUT
+        }
+
+    - name: Notarization 🧑‍💼
+      id: notarization
+      if: fromJSON(steps.codesign.outputs.haveCodesignIdent)
+      shell: zsh --no-rcs --errexit --pipefail {0}
+      env:
+          MACOS_NOTARIZATION_USERNAME: ${{ inputs.notarizationUser }}
+          MACOS_NOTARIZATION_PASSWORD: ${{ inputs.notarizationPassword }}
+      run: |
+        : Notarization 🧑‍💼
+        if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+        if  ${MACOS_NOTARIZATION_USERNAME} && ${MACOS_NOTARIZATION_PASSWORD}  {
+          print 'haveNotarizationUser=true' >> $GITHUB_OUTPUT
+        } else {
+          print 'haveNotarizationUser=false' >> $GITHUB_OUTPUT
+        }

obs-studio-30.0.2.tar.xz/.github/actions/sparkle-appcast Added

obs-studio-30.0.2.tar.xz/.github/actions/sparkle-appcast/action.yaml Added

@@ -0,0 +1,216 @@
+name: Generate Sparkle Appcast
+description: Creates Sparkle Appcast for a new release and generates delta patch files
+inputs:
+ sparklePrivateKey:
+ description: Private key used for Sparkle signing
+ required: true
+ baseImage:
+ description: Disk image to base the Sparkle Appcast on
+ required: true
+ channel:
+ description: Sparkle Appcast channel to use
+ required: false
+ default: stable
+ count:
+ description: Number of old versions to generate deltas for
+ required: false
+ default: '1'
+ urlPrefix:
+ description: URL prefix to use for Sparkle downloads
+ required: true
+ customTitle:
+ description: Custom title to use for Appcast
+ required: false
+ customLink:
+ description: Custom link to use for Appcast
+ required: false
+runs:
+ using: composite
+ steps:
+ - name: Check Runner Operating System 🏃‍♂️
+ if: runner.os != 'macOS'
+ shell: bash
+ run: |
+ : Check Runner Operating System 🏃‍♂️
+ echo '::notice::sparkle-appcast action requires a macOS-based runner.'
+ exit 2
+
+ - name: Install Dependencies
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Install Dependencies
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ print ::group::Install Dependencies
+ brew install --quiet coreutils pandoc
+ print ::endgroup::
+
+ - name: Set Up Sparkle ✨
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Set Up Sparkle ✨
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local version
+ local base_url
+ local hash
+ IFS=';' read -r version base_url hash <<< \
+ "$(jq -r '.tools.sparkle | {version, baseUrl, hash} | join(";")' buildspec.json)"
+
+ mkdir -p Sparkle && pushd Sparkle
+ curl -s -L -O "${base_url}/${version}/Sparkle-${version}.tar.xz"
+
+ local checksum="$(sha256sum Sparkle-${version}.tar.xz | cut -d " " -f 1)"
+
+ if ${hash} != ${checksum} {
+ print "::error::Sparkle-${version}.tar.xz checksum mismatch: ${checksum} (expected: ${hash})"
+ exit 2
+ }
+
+ tar -xJf "Sparkle-${version}.tar.xz"
+ popd
+
+ mkdir builds
+ mkdir -p output/appcasts/stable
+
+ - name: Download Builds 📥
+ id: builds
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Download Builds 📥
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ pushd builds
+ local image_location=(${{ inputs.baseImage }})
+ hdiutil attach -readonly -noverify -noautoopen -plist ${image_location} > result.plist
+
+ local -i num_entities=$(( $(plutil -extract system-entities raw -- result.plist) - 1 ))
+ local keys
+ local mount_point
+ for i ({0..${num_entities}}) {
+ keys=($(plutil -extract system-entities.${i} raw -- result.plist))
+ if ${keys} == *mount-point* {
+ mount_point=$(plutil -extract system-entities.${i}.mount-point raw -- result.plist)
+ break
+ }
+ }
+
+ local feed_url
+ local info_plist=(${mount_point}/*.app/Contents/Info.plist)
+
+ if -f ${info_plist} {
+ feed_url=$(plutil -extract SUFeedURL raw -- ${info_plist})
+ } else {
+ print '::error:: No Info.plist file found in specified disk image.'
+ hdiutil detach ${mount_point}
+ exit 2
+ }
+
+ print "feedUrl=${feed_url}" >> $GITHUB_OUTPUT
+ hdiutil detach ${mount_point}
+
+ curl -s -L -O ${feed_url}
+ local -a artifacts=($(\
+ xmllint \
+ -xpath "//rss/channel/item*local-name()='channel'text()='${{ inputs.channel }}'/enclosure/@url" \
+ ${feed_url:t} \
+ | sed -n 's/.*url="$.*$"/\1/p')
+ )
+
+ local url
+ local file_name
+ for i ({1..${{ inputs.count }}}) {
+ url="${artifacts${i}}"
+ file_name="${artifacts${i}:t}"
+ curl -s -L -O ${url}
+ }
+
+ mv ${{ inputs.baseImage }} ${PWD}
+ rm -rf - result.plist
+ popd
+
+ - name: Prepare Release Notes 📝
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Prepare Release Notes 📝
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ git tag -l --format='%(contents:subject)' ${GITHUB_REF_NAME} > notes.rst
+ echo '###################################################' >> notes.rst
+ echo '' >> notes.rst
+ git tag -l --format='%(contents:body)' ${GITHUB_REF_NAME} >> notes.rst
+ pandoc -f rst -t html notes.rst -o output/appcasts/notes_${{ inputs.channel }}.html
+
+ - name: Generate Appcast 🎙️
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Generate Appcast 🎙️
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ print -n '${{ inputs.sparklePrivateKey }}' >> eddsa_private.key
+ local feed_url='${{ steps.builds.outputs.feedUrl }}'
+ local arch=${${${(s:_:)feed_url:t}2}//x86/x86_64}
+
+ Sparkle/bin/generate_appcast \
+ --verbose \
+ --ed-key-file eddsa_private.key \
+ --download-url-prefix '${{ inputs.urlPrefix }}/' \
+ --full-release-notes-url "${feed_url//updates_*/notes_${{ inputs.channel }}.html}" \
+ --maximum-versions 0 \
+ --maximum-deltas ${{ inputs.count }} \
+ --channel '${{ inputs.channel }}' \
+ builds
+
+ local -a deltas=(builds/*.delta(N))
+
+ if (( #deltas )) {
+ mkdir -p output/sparkle_deltas/${arch}
+ mv ${deltas} output/sparkle_deltas/${arch}
+ }
+
+ mv builds/*.xml output/appcasts
+
+ - name: Adjust Appcast 🎙️
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Adjust Appcast 🎙️
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local feed_url='${{ steps.builds.outputs.feedUrl }}'
+ local arch=${${${(s:_:)feed_url:t}2}//x86/x86_64}
+ local -a appcasts=(output/appcasts/*_v2.xml)
+ local adjusted
+ for appcast (${appcasts}) {
+ adjusted="${appcast//.xml/-adjusted.xml}"
+ xsltproc \
+ --stringparam pDeltaUrl "${{ inputs.urlPrefix }}/sparkle_deltas/${arch}/" \
+ --stringparam pSparkleUrl '${{ inputs.urlPrefix }}/' \
+ --stringparam pCustomTitle '${{ inputs.customTitle }}' \
+ --stringparam pCustomLink '${{ inputs.customLink }}' \
+ -o ${adjusted} ${GITHUB_ACTION_PATH}/appcast_adjust.xslt ${appcast}
+
+ xmllint --format ${adjusted} >! ${appcast}
+ rm ${adjusted}
+ }
+
+ - name: Create Legacy Appcast 📟
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Create Legacy Appcast 📟
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local -a appcasts=(output/appcasts/*_v2.xml)
+ local legacy
+ local feed_url='${{ steps.builds.outputs.feedUrl }}'
+ local arch=${${${(s:_:)feed_url:t}2}//x86/x86_64}
+
+ for appcast (${appcasts}) {
+ legacy="${appcast//.xml/-legacy.xml}"
+ xsltproc \
+ -o ${legacy} ${GITHUB_ACTION_PATH}/appcast_legacy.xslt ${appcast}
+
+ xmllint --format ${legacy} >! output/appcasts/stable/${${appcast:t}//_v2.xml/.xml}
+
+ if ${arch} == x86_64 xmllint --format ${legacy} >! output/appcasts/stable/${${appcast:t}//_x86_64_v2.xml/.xml}
+ rm ${legacy}
+ }

obs-studio-30.0.2.tar.xz/.github/actions/sparkle-appcast/appcast_adjust.xslt Added

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+<xsl:output method="xml" encoding="UTF-8" omit-xml-declaration="no"/>
+<xsl:strip-space elements="*"/>
+
+<xsl:param name="pCustomTitle" select="/rss/channel/title" />
+<xsl:param name="pCustomLink" select="/rss/channel/link" />
+<xsl:param name="pSparkleUrl" select="''" />
+<xsl:param name="pDeltaUrl" select="''" />
+
+<xsl:template match="@* | node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@* | node()" />
+ </xsl:copy>
+</xsl:template>
+<xsl:template match="/rss/channel/title" />
+<xsl:template match="/rss/channel/link" />
+<xsl:template match="/rss/channel">
+ <xsl:copy>
+ <xsl:element name="title"><xsl:value-of select="$pCustomTitle" /></xsl:element>
+ <xsl:element name="link"><xsl:value-of select="$pCustomLink" /></xsl:element>
+ <xsl:apply-templates select="@* | node()" />
+ </xsl:copy>
+</xsl:template>
+<xsl:template match="/rss/channel/item/sparkle:deltas/enclosure/@url">
+ <xsl:attribute name="url">
+ <xsl:choose>
+ <xsl:when test="starts-with(., $pDeltaUrl)">
+ <xsl:value-of select="." />
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$pDeltaUrl" />
+ <xsl:value-of select="substring-after(., $pSparkleUrl)" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+</xsl:template>
+<xsl:template match="/rss/channel/item/sparkle:fullReleaseNotesLink">
+ <xsl:element name="sparkle:releaseNotesLink"><xsl:apply-templates select="@* | node()" /></xsl:element>
+</xsl:template>
+</xsl:stylesheet>

obs-studio-30.0.2.tar.xz/.github/actions/sparkle-appcast/appcast_legacy.xslt Added

obs-studio-30.0.2.tar.xz/.github/actions/steam-upload Added

obs-studio-30.0.2.tar.xz/.github/actions/steam-upload/action.yaml Added

@@ -0,0 +1,291 @@
+name: Steam Upload
+description: Creates and uploads stable and nightly builds of obs-studio and beta builds (if available)
+inputs:
+ steamSecret:
+ description: Steam auth code
+ required: true
+ steamUser:
+ description: Steam user name
+ required: true
+ steamPassword:
+ description: Steam user password
+ required: true
+ workflowSecret:
+ description: GitHub API token to use for API calls
+ required: true
+ tagName:
+ description: Tag name to use for packaging
+ required: false
+ default: ''
+ stableBranch:
+ description: Name of the stable branch to use
+ required: false
+ default: staging
+ betaBranch:
+ description: Name of the beta branch to use
+ required: false
+ default: beta_staging
+ nightlyBranch:
+ description: Name of the nightly branch to use
+ required: false
+ default: nightly
+ playtestBranch:
+ description: Name of the playtest branch to use
+ required: false
+ default: staging
+ customAssetWindows:
+ description: Custom asset for Windows
+ required: false
+ default: ''
+ customAssetMacOSApple:
+ description: Custom asset for macOS Apple Silicon
+ required: false
+ default: ''
+ customAssetMacOSIntel:
+ description: Custom asset for macOS Intel
+ required: false
+ default: ''
+ preview:
+ description: Enable preview mode (no uploads done)
+ required: false
+ default: ''
+runs:
+ using: composite
+ steps:
+ - name: Check Runner Operating System 🏃‍♂️
+ if: runner.os != 'macOS'
+ shell: bash
+ run: |
+ : Check Runner Operating System 🏃‍♂️
+ echo '::error::steam-upload action requires a macOS-based runner.'
+ exit 2
+
+ - name: Check GitHub Event 🔬
+ if: contains(fromJSON('"release", "workflow_dispatch", "schedule"'), github.event_name) != true
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Check GitHub Event 🔬
+ print "::error:steam-upload action can only be used with 'release', 'workflow-dispatch', or 'schedule' events."
+ exit 2
+
+ - name: Download Nightly Assets 🌙
+ id: asset-info-nightly
+ uses: actions/download-artifact@v3
+ if: github.event_name == 'schedule'
+
+ - name: Download Assets 📥
+ id: asset-info
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ env:
+ GH_TOKEN: ${{ inputs.workflowSecret }}
+ windows_custom_asset: ${{ inputs.customAssetWindows }}
+ macos_apple_custom_asset: ${{ inputs.customAssetMacOSApple }}
+ macos_intel_custom_asset: ${{ inputs.customAssetMacOSIntel }}
+ run: |
+ : Download Assets 📥
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local root_dir="${PWD}"
+ local description
+ local is_prerelease
+
+ case ${GITHUB_EVENT_NAME} {
+ release)
+ gh release download ${{ inputs.tagName }} \
+ --pattern '*.dmg' \
+ --pattern '*.zip' \
+ --clobber
+
+ IFS=';' read -r is_prerelease description <<< \
+ "$(gh release view ${{ inputs.tagName }} --json isPrerelease,tagName --jq 'join(";")')"
+ ;;
+ workflow_dispatch)
+ if '${{ inputs.tagName }}' =~ 0-9+\.0-9+\.0-9+(-(rc|beta)0-9+)*$ {
+ gh release download ${{ inputs.tagName }} \
+ --pattern '*.dmg' \
+ --pattern '*.zip' \
+ --clobber
+
+ description='${{ inputs.tagName }}'
+ read -r is_prerelease <<< \
+ "$(gh release view ${{ inputs.tagName }} --json isPrerelease --jq '.isPrerelease')"
+
+ local -A custom_assets=(
+ windows "Windows x64;${windows_custom_asset}"
+ macos_apple "macOS Apple;${macos_apple_custom_asset}"
+ macos_intel "macOS Intel;${macos_intel_custom_asset}"
+ )
+
+ local display_name
+ local url
+ mkdir -p custom_assets && pushd custom_assets
+ for platform (windows macos_apple macos_intel) {
+ IFS=';' read -r display_name url <<< "${custom_assets${platform}}"
+ if ${url} {
+ print "::group::Download of ${display_name} custom asset"
+ curl --location --silent --remote-name ${url}
+
+ if ! -f ${root_dir}/${url:t} {
+ print "::warning::Custom asset for ${display_name} does not replace an existing release asset"
+ } else {
+ rm -rf -- ${root_dir}/${url:t}
+ }
+ mv ${url:t} ${root_dir}
+ print '::endgroup::'
+ }
+ }
+ popd
+ } else {
+ print "::error::Invalid tag name for non-release workflow run: '${{ inputs.tagName }}'."
+ exit 2
+ }
+ ;;
+ schedule)
+ local short_hash="${GITHUB_SHA:0:9}"
+ mv obs-studio-windows-x64-${short_hash}/obs-studio-*-windows-x64.zip \
+ ${root_dir}
+ mv obs-studio-macos-arm64-${short_hash}/obs-studio-*-macos-apple.dmg \
+ ${root_dir}
+ mv obs-studio-macos-x86_64-${short_hash}/obs-studio-*-macos-intel.dmg \
+ ${root_dir}
+
+ description="g${GITHUB_SHA:0:9}"
+ is_prerelease='false'
+ ;;
+ }
+
+ print "description=${description}" >> $GITHUB_OUTPUT
+ print "is_prerelease=${is_prerelease}" >> $GITHUB_OUTPUT
+
+ - name: Prepare Builds for Steam 🍜
+ shell: zsh --no-rcs --errexit --pipefail --extendedglob {0}
+ run: |
+ : Prepare Builds for Steam 🍜
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local root_dir="${PWD}"
+ mkdir -p steam && pushd steam
+
+ print '::group::Prepare Windows x64 assets'
+ mkdir -p steam-windows && pushd steam-windows
+ unzip ${root_dir}/(#i)obs-studio-*.zip
+ rm ${root_dir}/(#i)obs-studio-*.zip
+
+ cp -r ${root_dir}/build-aux/steam/scripts_windows scripts
+ touch disable_updater
+ popd
+ print '::endgroup::'
+
+ print '::group::Prepare macOS Apple assets'
+ mkdir -p steam-macos/arm64/OBS.app
+ hdiutil attach -noverify -readonly -noautoopen -mountpoint /Volumes/obs-studio-arm64 ${root_dir}/(#i)obs-studio-*-macos-apple.dmg
+ ditto /Volumes/obs-studio-arm64/OBS.app steam-macos/arm64/OBS.app
+ hdiutil unmount /Volumes/obs-studio-arm64
+ rm ${root_dir}/(#i)obs-studio-*-macos-apple.dmg
+ print '::endgroup::'
+
+ print '::group::Prepare macOS Intel assets'
+ mkdir -p steam-macos/x86_64/OBS.app
+ hdiutil attach -noverify -readonly -noautoopen -mountpoint /Volumes/obs-studio-x86_64 ${root_dir}/(#i)obs-studio-*-macos-intel.dmg
+ ditto /Volumes/obs-studio-x86_64/OBS.app steam-macos/x86_64/OBS.app
+ hdiutil unmount /Volumes/obs-studio-x86_64
+ rm ${root_dir}/(#i)obs-studio-*-macos-intel.dmg
+ print '::endgroup::'
+
+ cp ${root_dir}/build-aux/steam/scripts_macos/launch.sh steam-macos/launch.sh
+
+ popd
+
+ - name: Set Up steamcmd 🚂
+ uses: CyberAndrii/setup-steamcmd@b786e0da44db3d817e66fa3910a9560cb28c9323
+
+ - name: Generate Steam auth code 🔐
+ id: steam-totp
+ uses: CyberAndrii/steam-totp@c7f636bc64e77f1b901e0420b7890813141508ee
+ if: ${{ ! fromJSON(inputs.preview) }}
+ with:
+ shared_secret: ${{ inputs.steamSecret }}
+
+ - name: Upload to Steam 📤
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Upload to Steam 📤
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local root_dir="${PWD}"
+ local build_file='build.vdf'
+ local branch_name
+
+ pushd steam
+ print '::group::Prepare Steam Build Script'
+
+ case ${GITHUB_EVENT_NAME} {
+ schedule) branch_name='${{ inputs.nightlyBranch }}' ;;
+ release|workflow_dispatch)
+ if '${{ steps.asset-info.outputs.is_prerelease }}' == 'true' {
+ branch_name='${{ inputs.betaBranch }}'
+ } else {
+ branch_name='${{ inputs.stableBranch }}'
+ }
+ ;;
+ }
+
+ sed "s/@@DESC@@/${branch_name}-${{ steps.asset-info.outputs.description }}/;s/@@BRANCH@@/${branch_name}/" \
+ ${root_dir}/build-aux/steam/obs_build.vdf > ${build_file}
+
+ print "Generated ${build_file}:\n$(<${build_file})"
+ print '::endgroup::'
+
+ print '::group::Upload to Steam'
+ local preview='${{ inputs.preview }}'
+
+ steamcmd \
+ +login '${{ inputs.steamUser }}' '${{ inputs.steamPassword }}' '${{ steps.steam-totp.outputs.code }}' \
+ +run_app_build ${preview:+-preview} ${build_file:a} \
+ +quit
+ print '::endgroup'
+ popd
+
+ - name: Generate Steam auth code 🔐
+ id: steam-totp-playtest
+ uses: CyberAndrii/steam-totp@c7f636bc64e77f1b901e0420b7890813141508ee
+ if: ${{ ! fromJSON(inputs.preview) && fromJSON(steps.asset-info.outputs.is_prerelease) }}
+ with:
+ shared_secret: ${{ inputs.steamSecret }}
+
+ - name: Upload to Steam (Playtest) 📤
+ if: fromJSON(steps.asset-info.outputs.is_prerelease)
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ run: |
+ : Upload to Steam Playtest 📤
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local root_dir="${PWD}"
+ local build_file='build_playtest.vdf'
+ local branch_name='${{ inputs.playtestBranch }}'
+
+ pushd steam
+ print '::group::Prepare Steam Build Script'
+
+ sed "s/@@DESC@@/${branch_name}-${{ steps.asset-info.outputs.description }}/;s/@@BRANCH@@/${branch_name}/" \
+ ${root_dir}/build-aux/steam/obs_playtest_build.vdf > ${build_file}
+
+ print "Generated ${build_file}:\n$(<${build_file})"
+ print '::endgroup::'
+
+ print '::group::Upload to Steam'
+ local preview
+ if '${{ inputs.preview }}' == 'true' preview='-preview'
+
+ steamcmd \
+ +login '${{ inputs.steamUser }}' '${{ inputs.steamPassword }}' '${{ steps.steam-totp-playtest.outputs.code }}' \
+ +run_app_build ${preview} ${build_file:a} \
+ +quit
+ print '::endgroup'
+ popd
+
+ - name: Upload Steam build logs
+ uses: actions/upload-artifact@v3
+ with:
+ name: steam-build-logs
+ path: ${{ github.workspace }}/steam/build/*.log

obs-studio-30.0.2.tar.xz/.github/scripts Added

obs-studio-30.0.2.tar.xz/.github/scripts/.Aptfile Added

obs-studio-30.0.2.tar.xz/.github/scripts/.Brewfile Added

obs-studio-30.0.2.tar.xz/.github/scripts/.Wingetfile Changed

obs-studio-30.0.2.tar.xz/.github/scripts/.build.zsh Added

@@ -0,0 +1,218 @@
+#!/usr/bin/env zsh
+
+builtin emulate -L zsh
+setopt EXTENDED_GLOB
+setopt PUSHD_SILENT
+setopt ERR_EXIT
+setopt ERR_RETURN
+setopt NO_UNSET
+setopt PIPE_FAIL
+setopt NO_AUTO_PUSHD
+setopt NO_PUSHD_IGNORE_DUPS
+setopt FUNCTION_ARGZERO
+
+## Enable for script debugging
+#setopt WARN_CREATE_GLOBAL
+#setopt WARN_NESTED_VAR
+#setopt XTRACE
+
+if (( ! ${+CI} )) {
+ print -u2 -PR "%F{1} ✖︎ ${ZSH_ARGZERO:t:r} requires CI environment.%f"
+ exit 1
+}
+
+autoload -Uz is-at-least && if ! is-at-least 5.2; then
+ print -u2 -PR "%F{1}${funcstack1##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade Zsh to fix this issue."
+ exit 1
+fi
+
+TRAPZERR() {
+ print -u2 -PR "::error::%F{1} ✖︎ script execution error.%f"
+ print -PR -e "
+ Callstack:
+ ${(j:\n :)funcfiletrace}
+ "
+
+ exit 2
+}
+
+build() {
+ if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h}
+ local host_os=${${(s:-:)ZSH_ARGZERO:t:r}2}
+ local project_root=${SCRIPT_HOME:A:h:h}
+ local buildspec_file=${project_root}/buildspec.json
+
+ fpath=(${SCRIPT_HOME}/utils.zsh ${fpath})
+ autoload -Uz log_group log_error log_output check_${host_os} setup_ccache
+
+ if ! -r ${buildspec_file} {
+ log_error 'Missing buildspec.json in project checkout.'
+ return 2
+ }
+
+ local -i debug=0
+
+ local target
+ local -r -a _valid_targets=(
+ macos-x86_64
+ macos-arm64
+ linux-x86_64
+ )
+
+ local config='RelWithDebInfo'
+ local -r -a _valid_configs=(Debug RelWithDebInfo Release MinSizeRel)
+ local -i codesign=0
+
+ local -a args
+ while (( # )) {
+ case ${1} {
+ -t|--target|--generator|-c|--config)
+ if (( # == 1 )) || ${2:0:1} == '-' {
+ log_error "Missing value for option %B${1}%b"
+ exit 2
+ }
+ ;;
+ }
+ case ${1} {
+ --) shift; args+=($@); break ;;
+ -t|--target)
+ if (( ! ${_valid_targets(Ie)${2}} )) {
+ log_error "Invalid value %B${2}%b for option %B${1}%b"
+ exit 2
+ }
+ target=${2}
+ shift 2
+ ;;
+ -c|--config)
+ if (( ! ${_valid_configs(Ie)${2}} )) {
+ log_error "Invalid value %B${2}%b for option %B${1}%b"
+ exit 2
+ }
+ config=${2}
+ shift 2
+ ;;
+ -s|--codesign) codesign=1; shift ;;
+ --debug) debug=1; shift ;;
+ *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
+ }
+ }
+
+ : "${target:="${host_os}-${CPUTYPE}"}"
+
+ set -- ${(@)args}
+
+ check_${host_os}
+ setup_ccache
+
+ if ${host_os} == linux {
+ autoload -Uz setup_linux && setup_linux
+ }
+
+ local product_name
+ read -r product_name <<< "$(jq -r '.name' ${buildspec_file})"
+
+ pushd ${project_root}
+
+ local -a cmake_args=()
+ local -a cmake_build_args=(--build)
+ local -a cmake_install_args=(--install)
+
+ if (( debug )) cmake_args+=(--debug-output)
+
+ case ${target} {
+ macos-*)
+ cmake_args+=(--preset 'macos-ci' -DCMAKE_OSX_ARCHITECTURES:STRING=${target##*-})
+
+ typeset -gx NSUnbufferedIO=YES
+
+ typeset -gx CODESIGN_IDENT="${CODESIGN_IDENT:--}"
+ if (( codesign )) && -z ${CODESIGN_TEAM} {
+ typeset -gx CODESIGN_TEAM="$(print "${CODESIGN_IDENT}" | /usr/bin/sed -En 's/.+$(.+)$/\1/p')"
+ }
+
+ log_group "Configuring ${product_name}..."
+ cmake -S ${project_root} ${cmake_args}
+
+ log_group "Building ${product_name}..."
+ run_xcodebuild() {
+ if (( debug )) {
+ xcodebuild ${@}
+ } else {
+ xcodebuild ${@} 2>&1 | xcbeautify
+ }
+ }
+
+ local -a build_args=(
+ ONLY_ACTIVE_ARCH=NO
+ -project obs-studio.xcodeproj
+ -target obs-studio
+ -destination "generic/platform=macOS,name=Any Mac"
+ -configuration ${config}
+ -parallelizeTargets
+ -hideShellScriptEnvironment
+ build
+ )
+
+ local -a archive_args=(
+ ONLY_ACTIVE_ARCH=NO
+ -project obs-studio.xcodeproj
+ -scheme obs-studio
+ -destination "generic/platform=macOS,name=Any Mac"
+ -archivePath obs-studio.xcarchive
+ -parallelizeTargets
+ -hideShellScriptEnvironment
+ archive
+ )
+
+ local -a export_args=(
+ -exportArchive
+ -archivePath obs-studio.xcarchive
+ -exportOptionsPlist exportOptions.plist
+ -exportPath ${project_root}/build_macos
+ )
+
+ pushd build_macos
+ if ${GITHUB_EVENT_NAME} == push && ${GITHUB_REF_NAME} =~ 0-9+.0-9+.0-9+(-(rc|beta).+)? {
+ run_xcodebuild ${archive_args}
+ run_xcodebuild ${export_args}
+ } else {
+ run_xcodebuild ${build_args}
+
+ rm -rf OBS.app
+ mkdir OBS.app
+ ditto UI/${config}/OBS.app OBS.app
+ }
+ popd
+ ;;
+ linux-*)
+ local cmake_bin='/usr/bin/cmake'
+ cmake_args+=(
+ -S ${PWD} -B build_${target##*-}
+ -G Ninja
+ -DCMAKE_BUILD_TYPE:STRING=${config}
+ -DCEF_ROOT_DIR:PATH="${project_root}/.deps/cef_binary_${CEF_VERSION}_${target//-/_}"
+ -DENABLE_AJA:BOOL=OFF
+ -DENABLE_WEBRTC:BOOL=OFF
+ )
+ if (( ! UBUNTU_2210_OR_LATER )) cmake_args+=(-DENABLE_NEW_MPEGTS_OUTPUT:BOOL=OFF)
+
+ cmake_build_args+=(build_${target##*-} --config ${config} --parallel)
+ cmake_install_args+=(build_${target##*-} --prefix ${project_root}/build_${target##*-}/install/${config})
+
+ log_group "Configuring ${product_name}..."
+ ${cmake_bin} -S ${project_root} ${cmake_args}
+
+ log_group "Building ${product_name}..."
+ if (( debug )) cmake_build_args+=(--verbose)
+ ${cmake_bin} ${cmake_build_args}
+
+ log_group "Installing ${product_name}..."
+ if (( debug )) cmake_install_args+=(--verbose)
+ ${cmake_bin} ${cmake_install_args}
+ ;;
+ }
+ popd
+ log_group
+}
+
+build ${@}

obs-studio-30.0.2.tar.xz/.github/scripts/.package.zsh Added

@@ -0,0 +1,241 @@
+#!/usr/bin/env zsh
+
+builtin emulate -L zsh
+setopt EXTENDED_GLOB
+setopt PUSHD_SILENT
+setopt ERR_EXIT
+setopt ERR_RETURN
+setopt NO_UNSET
+setopt PIPE_FAIL
+setopt NO_AUTO_PUSHD
+setopt NO_PUSHD_IGNORE_DUPS
+setopt FUNCTION_ARGZERO
+
+## Enable for script debugging
+#setopt WARN_CREATE_GLOBAL
+#setopt WARN_NESTED_VAR
+#setopt XTRACE
+
+if (( ! ${+CI} )) {
+ print -u2 -PR "%F{1} ✖︎ ${ZSH_ARGZERO:t:r} requires CI environment%f"
+ exit 1
+}
+
+autoload -Uz is-at-least && if ! is-at-least 5.2; then
+ print -u2 -PR "%F{1}${funcstack1##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade Zsh to fix this issue."
+ exit 1
+fi
+
+TRAPZERR() {
+ print -u2 -PR "::error::%F{1} ✖︎ script execution error%f"
+ print -PR -e "
+ Callstack:
+ ${(j:\n :)funcfiletrace}
+ "
+
+ exit 2
+}
+
+package() {
+ if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h}
+ local host_os=${${(s:-:)ZSH_ARGZERO:t:r}2}
+ local project_root=${SCRIPT_HOME:A:h:h}
+ local buildspec_file=${project_root}/buildspec.json
+
+ fpath=(${SCRIPT_HOME}/utils.zsh ${fpath})
+ autoload -Uz log_error log_output log_group check_${host_os}
+
+ local -i debug=0
+
+ local target
+ local -r -a _valid_targets=(
+ macos-x86_64
+ macos-arm64
+ linux-x86_64
+ )
+
+ local config='RelWithDebInfo'
+ local -r -a _valid_configs=(Debug RelWithDebInfo Release MinSizeRel)
+
+ local -i codesign=0
+ local -i notarize=0
+ local -i package=0
+ local -i skip_deps=0
+
+ local -a args
+ while (( # )) {
+ case ${1} {
+ -t|--target|-c|--config)
+ if (( # == 1 )) || ${2:0:1} == '-' {
+ log_error "Missing value for option %B${1}%b"
+ exit 2
+ }
+ ;;
+ }
+ case ${1} {
+ --) shift; args+=($@); break ;;
+ -t|--target)
+ if (( ! ${_valid_targets(Ie)${2}} )) {
+ log_error "Invalid value %B${2}%b for option %B${1}%b"
+ exit 2
+ }
+ target=${2}
+ shift 2
+ ;;
+ -c|--config)
+ if (( ! ${_valid_configs(Ie)${2}} )) {
+ log_error "Invalid value %B${2}%b for option %B${1}%b"
+ exit 2
+ }
+ config=${2}
+ shift 2
+ ;;
+ -s|--codesign) codesign=1; shift ;;
+ -n|--notarize) notarize=1; shift ;;
+ -p|--package) typeset -g package=1; shift ;;
+ --debug) debug=0; shift ;;
+ *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
+ }
+ }
+
+ : "${target:="${host_os}-${CPUTYPE}"}"
+
+ set -- ${(@)args}
+
+ check_${host_os}
+
+ local product_name
+ read -r product_name <<< \
+ "$(jq -r '.name' ${buildspec_file})"
+
+ local commit_version='0.0.0'
+ local commit_distance='0'
+ local commit_hash
+
+ if -d ${project_root}/.git {
+ local git_description="$(git describe --tags --long)"
+ commit_version="${${git_description%-*}%-*}"
+ commit_hash="${git_description##*-g}"
+ commit_distance="${${git_description%-*}##*-}"
+ }
+
+ local output_name
+ if (( commit_distance > 0 )) {
+ output_name="obs-studio-${commit_version}-${commit_hash}"
+ } else {
+ output_name="obs-studio-${commit_version}"
+ }
+
+ if ${host_os} == macos {
+ if ! -d build_macos/OBS.app {
+ log_error 'No application bundle found. Run the build script to create a valid application bundle.'
+ return 0
+ }
+
+ local -A arch_names=(x86_64 Intel arm64 Apple)
+ output_name="${output_name}-macos-${(L)arch_names${target##*-}}"
+
+ local volume_name
+ if (( commit_distance > 0 )) {
+ volume_name="OBS Studio ${commit_version}-${commit_hash} (${arch_names${target##*-}})"
+ } else {
+ volume_name="OBS Studio ${commit_version} (${arch_names${target##*-}})"
+ }
+
+ if (( package )) {
+ pushd build_macos
+
+ mkdir -p obs-studio/.background
+ cp ${project_root}/cmake/macos/resources/background.tiff obs-studio/.background/
+ cp ${project_root}/cmake/macos/resources/AppIcon.icns obs-studio/.VolumeIcon.icns
+ ln -s /Applications obs-studio/Applications
+
+ mkdir -p obs-studio/OBS.app
+ ditto OBS.app obs-studio/OBS.app
+
+ local -i _status=0
+
+ autoload -Uz create_diskimage
+ create_diskimage obs-studio ${volume_name} ${output_name} || _status=1
+
+ rm -r obs-studio
+ if (( _status )) {
+ log_error "Disk image creation failed."
+ return 2
+ }
+
+ typeset -gx CODESIGN_IDENT="${CODESIGN_IDENT:--}"
+ typeset -gx CODESIGN_TEAM="$(print "${CODESIGN_IDENT}" | /usr/bin/sed -En 's/.+$(.+)$/\1/p')"
+
+ codesign --sign "${CODESIGN_IDENT}" ${output_name}.dmg
+
+ if (( codesign && notarize )) {
+ if ! ${CODESIGN_IDENT} != '-' && ${CODESIGN_TEAM} && ${CODESIGN_IDENT_USER} && ${CODESIGN_IDENT_PASS} {
+ log_error "Notarization requires Apple ID and application password."
+ return 2
+ }
+
+ xcrun notarytool store-credentials 'OBS-Codesign-Password' --apple-id "${CODESIGN_IDENT_USER}" --team-id "${CODESIGN_TEAM}" --password "${CODESIGN_IDENT_PASS}"
+ xcrun notarytool submit "${output_name}".dmg --keychain-profile "OBS-Codesign-Password" --wait
+
+ local -i _status=0
+
+ xcrun stapler staple ${output_name}.dmg || _status=1
+
+ if (( _status )) {
+ log_error "Notarization failed. Use 'xcrun notarytool log <submission ID>' to check errors."
+ return 2
+ }
+ }
+ popd
+ } else {
+ log_group "Archiving obs-studio..."
+ pushd build_macos
+ XZ_OPT=-T0 tar -cvJf ${output_name}.tar.xz OBS.app
+ popd
+ }
+
+ if ${config} == Release {
+ log_group "Archiving debug symbols..."
+ mkdir -p build_macos/dSYMs
+ pushd build_macos/dSYMs
+ rm -rf -- *.dSYM(N)
+ cp -pR ${PWD:h}/**/*.dSYM .
+ XZ_OPT=-T0 tar -cvJf ${output_name}-dSYMs.tar.xz -- *
+ mv ${output_name}-dSYMs.tar.xz ${PWD:h}
+ popd
+ }
+
+ log_group
+
+ } elif ${host_os} == linux {
+ local cmake_bin='/usr/bin/cmake'
+ local -a cmake_args=()
+ if (( debug )) cmake_args+=(--verbose)
+
+ if (( package )) {
+ log_group "Packaging obs-studio..."
+ pushd ${project_root}
+ ${cmake_bin} --build build_${target##*-} --config ${config} -t package ${cmake_args}
+ output_name="${output_name}-${target##*-}-linux-gnu"
+
+ pushd ${project_root}/build_${target##*-}
+ local -a files=(obs-studio-*-Linux*.(ddeb|deb))
+ for file (${files}) {
+ mv ${file} ${file//obs-studio-*-Linux/${output_name}}
+ }
+ popd
+ popd
+ } else {
+ log_group "Archiving obs-studio..."
+ output_name="${output_name}-${target##*-}-linux-gnu"
+
+ pushd ${project_root}/build_${target##*-}/install/${config}
+ XZ_OPT=-T0 tar -cvJf ${project_root}/build_${target##*-}/${output_name}.tar.xz (bin|lib|share)
+ popd
+ }
+ log_group
+ }
+}
+
+package ${@}

obs-studio-30.0.2.tar.xz/.github/scripts/Build-Windows.ps1 Added

@@ -0,0 +1,91 @@
+CmdletBinding()
+param(
+    ValidateSet('x64')
+    string $Target = 'x64',
+    ValidateSet('Debug', 'RelWithDebInfo', 'Release', 'MinSizeRel')
+    string $Configuration = 'RelWithDebInfo'
+)
+
+$ErrorActionPreference = 'Stop'
+
+if ( $DebugPreference -eq 'Continue' ) {
+    $VerbosePreference = 'Continue'
+    $InformationPreference = 'Continue'
+}
+
+if ( $env:CI -eq $null ) {
+    throw "Build-Windows.ps1 requires CI environment"
+}
+
+if ( ! ( System.Environment::Is64BitOperatingSystem ) ) {
+    throw "obs-studio requires a 64-bit system to build and run."
+}
+
+if ( $PSVersionTable.PSVersion -lt '7.2.0' ) {
+    Write-Warning 'The obs-studio PowerShell build script requires PowerShell Core 7. Install or upgrade your PowerShell version: https://aka.ms/pscore6'
+    exit 2
+}
+
+function Build {
+    trap {
+        Pop-Location -Stack BuildTemp -ErrorAction 'SilentlyContinue'
+        Write-Error $_
+        Log-Group
+        exit 2
+    }
+
+    $ScriptHome = $PSScriptRoot
+    $ProjectRoot = Resolve-Path -Path "$PSScriptRoot/../.."
+    $BuildSpecFile = "${ProjectRoot}/buildspec.json"
+
+    $UtilityFunctions = Get-ChildItem -Path $PSScriptRoot/utils.pwsh/*.ps1 -Recurse
+
+    foreach($Utility in $UtilityFunctions) {
+        Write-Debug "Loading $($Utility.FullName)"
+        . $Utility.FullName
+    }
+
+    $BuildSpec = Get-Content -Path ${BuildSpecFile} -Raw | ConvertFrom-Json
+
+    Install-BuildDependencies -WingetFile "${ScriptHome}/.Wingetfile"
+
+    Push-Location -Stack BuildTemp
+    Ensure-Location $ProjectRoot
+
+    $CmakeArgs = @('--preset', "windows-ci-${Target}")
+    $CmakeBuildArgs = @('--build')
+    $CmakeInstallArgs = @()
+
+    if ( $DebugPreference -eq 'Continue' ) {
+        $CmakeArgs += ('--debug-output')
+        $CmakeBuildArgs += ('--verbose')
+        $CmakeInstallArgs += ('--verbose')
+    }
+
+    $CmakeBuildArgs += @(
+        '--preset', "windows-${Target}"
+        '--config', $Configuration
+        '--parallel'
+        '--', '/consoleLoggerParameters:Summary', '/noLogo'
+    )
+
+    $CmakeInstallArgs += @(
+        '--install', "build_${Target}"
+        '--prefix', "${ProjectRoot}/build_${Target}/install"
+        '--config', $Configuration
+    )
+
+    Log-Group "Configuring obs-studio..."
+    Invoke-External cmake @CmakeArgs
+
+    Log-Group "Building obs-studio..."
+    Invoke-External cmake @CmakeBuildArgs
+
+    Log-Group "Installing obs-studio..."
+    Invoke-External cmake @CmakeInstallArgs
+
+    Pop-Location -Stack BuildTemp
+    Log-Group
+}
+
+Build

obs-studio-30.0.2.tar.xz/.github/scripts/Package-Windows.ps1 Added

@@ -0,0 +1,80 @@
+CmdletBinding()
+param(
+    ValidateSet('x64')
+    string $Target = 'x64',
+    ValidateSet('Debug', 'RelWithDebInfo', 'Release', 'MinSizeRel')
+    string $Configuration = 'RelWithDebInfo'
+)
+
+$ErrorActionPreference = 'Stop'
+
+if ( $DebugPreference -eq 'Continue' ) {
+    $VerbosePreference = 'Continue'
+    $InformationPreference = 'Continue'
+}
+
+if ( $env:CI -eq $null ) {
+    throw "Package-Windows.ps1 requires CI environment"
+}
+
+if ( ! ( System.Environment::Is64BitOperatingSystem ) ) {
+    throw "obs-studio requires a 64-bit system to build and run."
+}
+
+if ( $PSVersionTable.PSVersion -lt '7.2.0' ) {
+    Write-Warning 'The obs-studio packaging script requires PowerShell Core 7. Install or upgrade your PowerShell version: https://aka.ms/pscore6'
+    exit 2
+}
+
+function Package {
+    trap {
+        Write-Error $_
+        exit 2
+    }
+
+    $ScriptHome = $PSScriptRoot
+    $ProjectRoot = Resolve-Path -Path "$PSScriptRoot/../.."
+    $BuildSpecFile = "${ProjectRoot}/buildspec.json"
+
+    $UtilityFunctions = Get-ChildItem -Path $PSScriptRoot/utils.pwsh/*.ps1 -Recurse
+
+    foreach( $Utility in $UtilityFunctions ) {
+        Write-Debug "Loading $($Utility.FullName)"
+        . $Utility.FullName
+    }
+
+    Install-BuildDependencies -WingetFile "${ScriptHome}/.Wingetfile"
+
+    $GitDescription = Invoke-External git describe --tags --long
+    $Tokens = ($GitDescription -split '-')
+    $CommitVersion = $Tokens0..$($Tokens.Count - 3) -join '-'
+    $CommitHash = $($Tokens-1).SubString(1)
+    $CommitDistance = $Tokens-2
+
+    if ( $CommitDistance -gt 0 ) {
+        $OutputName = "obs-studio-${CommitVersion}-${CommitHash}"
+    } else {
+        $OutputName = "obs-studio-${CommitVersion}"
+    }
+
+    $CpackArgs = @(
+        '-C', "${Configuration}"
+    )
+
+    if ( $DebugPreference -eq 'Continue' ) {
+        $CpackArgs += ('--verbose')
+    }
+
+    Log-Group "Packaging obs-studio..."
+
+    Push-Location -Stack PackageTemp "build_${Target}"
+
+    cpack @CpackArgs
+
+    $Package = Get-ChildItem -filter "obs-studio-*-windows-x64.zip" -File
+    Move-Item -Path $Package -Destination "${OutputName}-windows-x64.zip"
+
+    Pop-Location -Stack PackageTemp
+}
+
+Package

obs-studio-30.0.2.tar.xz/.github/scripts/build-linux Added

obs-studio-30.0.2.tar.xz/.github/scripts/build-macos Added

obs-studio-30.0.2.tar.xz/.github/scripts/package-linux Added

obs-studio-30.0.2.tar.xz/.github/scripts/package-macos Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.pwsh Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.pwsh/Ensure-Location.ps1 Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.pwsh/Install-BuildDependencies.ps1 Added

@@ -0,0 +1,70 @@
+function Install-BuildDependencies {
+ <#
+ .SYNOPSIS
+ Installs required build dependencies.
+ .DESCRIPTION
+ Additional packages might be needed for successful builds. This module contains additional
+ dependencies available for installation via winget and, if possible, adds their locations
+ to the environment path for future invocation.
+ .EXAMPLE
+ Install-BuildDependencies
+ #>
+
+ param(
+ string $WingetFile = "$PSScriptRoot/.Wingetfile"
+ )
+
+ if ( ! ( Test-Path function:Log-Warning ) ) {
+ . $PSScriptRoot/Logger.ps1
+ }
+
+ $Prefixes = @{
+ 'x64' = ${env:ProgramFiles}
+ 'x86' = ${env:ProgramFiles(x86)}
+ 'arm64' = ${env:ProgramFiles(arm)}
+ }
+ 
+ $Paths = $env:Path -split System.IO.Path::PathSeparator
+
+ $WingetOptions = @('install', '--accept-package-agreements', '--accept-source-agreements')
+
+ if ( $script:Quiet ) {
+ $WingetOptions += '--silent'
+ }
+
+ Log-Group 'Check Windows build requirements'
+ Get-Content $WingetFile | ForEach-Object {
+ $_, $Package, $_, $Path, $_, $Binary, $_, $Version = $_ -replace ',','' -split " +(?=(?:^\'*\'^\'*\')*^\'*$)" -replace "'",''
+
+ $Prefixes.GetEnumerator() | ForEach-Object {
+ $Prefix = $_.value
+ $FullPath = "${Prefix}\${Path}"
+ if ( ( Test-Path $FullPath ) -and ! ( $Paths -contains $FullPath ) ) {
+ $Paths = @($FullPath) + $Paths
+ $env:Path = $Paths -join System.IO.Path::PathSeparator
+ }
+ }
+
+ Log-Debug "Checking for command ${Binary}"
+ $Found = Get-Command -ErrorAction SilentlyContinue $Binary
+
+ if ( $Found ) {
+ Log-Status "Found dependency ${Binary} as $($Found.Source)"
+ } else {
+ Log-Status "Installing package ${Package} $(if ( $Version -ne $null ) { "Version: ${Version}" } )"
+
+ if ( $Version -ne $null ) {
+ $WingGetOptions += @('--version', ${Version})
+ }
+
+ try {
+ $Params = $WingetOptions + $Package
+
+ winget @Params
+ } catch {
+ throw "Error while installing winget package ${Package}: $_"
+ }
+ }
+ }
+ Log-Group
+}

obs-studio-30.0.2.tar.xz/.github/scripts/utils.pwsh/Invoke-External.ps1 Added

@@ -0,0 +1,40 @@
+function Invoke-External {
+ <#
+ .SYNOPSIS
+ Invokes a non-PowerShell command.
+ .DESCRIPTION
+ Runs a non-PowerShell command, and captures its return code.
+ Throws an exception if the command returns non-zero.
+ .EXAMPLE
+ Invoke-External 7z x $MyArchive
+ #>
+
+ if ( $args.Count -eq 0 ) {
+ throw 'Invoke-External called without arguments.'
+ }
+
+ if ( ! ( Test-Path function:Log-Information ) ) {
+ . $PSScriptRoot/Logger.ps1
+ }
+
+ $Command = $args0
+ $CommandArgs = @()
+
+ if ( $args.Count -gt 1) {
+ $CommandArgs = $args1..($args.Count - 1)
+ }
+
+ $_EAP = $ErrorActionPreference
+ $ErrorActionPreference = "Continue"
+
+ Log-Debug "Invoke-External: ${Command} ${CommandArgs}"
+
+ & $command $commandArgs
+ $Result = $LASTEXITCODE
+
+ $ErrorActionPreference = $_EAP
+
+ if ( $Result -ne 0 ) {
+ throw "${Command} ${CommandArgs} exited with non-zero code ${Result}."
+ }
+}

obs-studio-30.0.2.tar.xz/.github/scripts/utils.pwsh/Logger.ps1 Added

@@ -0,0 +1,149 @@
+function Log-Debug {
+    CmdletBinding()
+    param(
+        Parameter(Mandatory,ValueFromPipeline)
+        ValidateNotNullOrEmpty()
+        string $Message
+    )
+
+    Process {
+        foreach($m in $Message) {
+            Write-Debug $m
+        }
+    }
+}
+
+function Log-Verbose {
+    CmdletBinding()
+    param(
+        Parameter(Mandatory,ValueFromPipeline)
+        ValidateNotNullOrEmpty()
+        string $Message
+    )
+
+    Process {
+        foreach($m in $Message) {
+            Write-Verbose $m
+        }
+    }
+}
+
+function Log-Warning {
+    CmdletBinding()
+    param(
+        Parameter(Mandatory,ValueFromPipeline)
+        ValidateNotNullOrEmpty()
+        string $Message
+    )
+
+    Process {
+        foreach($m in $Message) {
+            Write-Warning $m
+        }
+    }
+}
+
+function Log-Error {
+    CmdletBinding()
+    param(
+        Parameter(Mandatory,ValueFromPipeline)
+        ValidateNotNullOrEmpty()
+        string $Message
+    )
+
+    Process {
+        foreach($m in $Message) {
+            Write-Error $m
+        }
+    }
+}
+
+function Log-Information {
+    CmdletBinding()
+    param(
+        Parameter(Mandatory,ValueFromPipeline)
+        ValidateNotNullOrEmpty()
+        string $Message
+    )
+
+    Process {
+        if ( ! ( $script:Quiet ) ) {
+            $StageName = $( if ( $script:StageName -ne $null ) { $script:StageName } else { '' })
+            $Icon = ' =>'
+
+            foreach($m in $Message) {
+                Write-Host -NoNewLine -ForegroundColor Blue "  ${StageName} $($Icon.PadRight(5)) "
+                Write-Host "${m}"
+            }
+        }
+    }
+}
+
+function Log-Group {
+    CmdletBinding()
+    param(
+        Parameter(ValueFromPipeline)
+        string $Message
+    )
+
+    Process {
+        if ( $Env:CI -ne $null )  {
+            if ( $script:LogGroup ) {
+                Write-Output '::endgroup::'
+                $script:LogGroup = $false
+            }
+
+            if ( $Message.count -ge 1 ) {
+                Write-Output "::group::$($Message -join ' ')"
+                $script:LogGroup = $true
+            }
+        } else {
+            if ( $Message.count -ge 1 ) {
+                Log-Information $Message
+            }
+        }
+    }
+}
+
+function Log-Status {
+    CmdletBinding()
+    param(
+        Parameter(Mandatory,ValueFromPipeline)
+        ValidateNotNullOrEmpty()
+        string $Message
+    )
+
+    Process {
+        if ( ! ( $script:Quiet ) ) {
+            $StageName = $( if ( $StageName -ne $null ) { $StageName } else { '' })
+            $Icon = '  >'
+
+            foreach($m in $Message) {
+                Write-Host -NoNewLine -ForegroundColor Green "  ${StageName} $($Icon.PadRight(5)) "
+                Write-Host "${m}"
+            }
+        }
+    }
+}
+
+function Log-Output {
+    CmdletBinding()
+    param(
+        Parameter(Mandatory,ValueFromPipeline)
+        ValidateNotNullOrEmpty()
+        string $Message
+    )
+
+    Process {
+        if ( ! ( $script:Quiet ) ) {
+            $StageName = $( if ( $script:StageName -ne $null ) { $script:StageName } else { '' })
+            $Icon = ''
+
+            foreach($m in $Message) {
+                Write-Output "  ${StageName} $($Icon.PadRight(5)) ${m}"
+            }
+        }
+    }
+}
+
+$Columns = (Get-Host).UI.RawUI.WindowSize.Width - 5

obs-studio-30.0.2.tar.xz/.github/scripts/utils.py Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.py/check-jsonschema.py Added

@@ -0,0 +1,131 @@
+import argparse
+import json
+import logging
+import os
+import sys
+from typing import Any
+
+from json_source_map import calculate
+from json_source_map.errors import InvalidInputError
+from jsonschema import Draft7Validator
+
+
+def discover_schema_file(filename: str) -> tuplestr | None, Any:
+    logger = logging.getLogger()
+
+    with open(filename) as json_file:
+        json_data = json.load(json_file)
+
+    schema_filename = json_data.get("$schema", None)
+
+    if not schema_filename:
+        logger.info(f"ℹ️ ${filename} has no schema definition")
+        return (None, None)
+
+    schema_file = os.path.join(os.path.dirname(filename), schema_filename)
+
+    with open(schema_file) as schema_file:
+        schema_data = json.load(schema_file)
+
+    return (str(schema_file), schema_data)
+
+
+def validate_json_files(
+    schema_data: dictAny, Any, json_file_name: str
+) -> listdictstr, str:
+    logger = logging.getLogger()
+
+    with open(json_file_name) as json_file:
+        text_data = json_file.read()
+
+    json_data = json.loads(text_data)
+    source_map = calculate(text_data)
+
+    validator = Draft7Validator(schema_data)
+
+    violations = 
+    for violation in sorted(validator.iter_errors(json_data), key=str):
+        logger.info(
+            f"⚠️ Schema violation in file '{json_file_name}':\n{violation}\n----\n"
+        )
+
+        if len(violation.absolute_path):
+            error_path = "/".join(
+                str(path_element) for path_element in violation.absolute_path
+            )
+            error_entry = source_map"/{}".format(error_path)
+
+            violation_data = {
+                "file": json_file_name,
+                "title": "Validation Error",
+                "message": violation.message,
+                "annotation_level": "failure",
+                "start_line": error_entry.value_start.line + 1,
+                "end_line": error_entry.value_end.line + 1,
+            }
+
+            violations.append(violation_data)
+
+    return violations
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(
+        description="Validate JSON files by schema definition"
+    )
+    parser.add_argument(
+        "json_files", metavar="FILE", type=str, nargs="+", help="JSON file to validate"
+    )
+    parser.add_argument(
+        "--loglevel", type=str, help="Set log level", default="WARNING", required=False
+    )
+
+    arguments = parser.parse_args()
+
+    logging.basicConfig(level=arguments.loglevel, format="%(levelname)s - %(message)s")
+    logger = logging.getLogger()
+
+    schema_mappings = {}
+
+    for json_file in arguments.json_files:
+        try:
+            (schema_file, schema_data) = discover_schema_file(json_file)
+        except OSError as e:
+            logger.error(f"❌ Failed to discover schema for file '{json_file}': {e}")
+            return 2
+
+        if schema_file and schema_file not in schema_mappings.keys():
+            schema_mappings.update(
+                {schema_file: {"schema_data": schema_data, "files": set()}}
+            )
+
+        schema_mappingsschema_file"files".add(json_file)
+
+    validation_errors = 
+    for schema_entry in schema_mappings.values():
+        for json_file in schema_entry"files":
+            try:
+                new_errors = validate_json_files(schema_entry"schema_data", json_file)
+            except (InvalidInputError, OSError) as e:
+                logger.error(
+                    f"❌ Failed to create JSON source map for file '{json_file}': {e}"
+                )
+                return 2
+
+            validation_errors.append(error) for error in new_errors
+
+    if validation_errors:
+        try:
+            with open("validation_errors.json", "w") as results_file:
+                json.dump(validation_errors, results_file)
+        except OSError as e:
+            logger.error(f"❌ Failed to write validation results file: {e}")
+            return 2
+
+        return 1
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

obs-studio-30.0.2.tar.xz/.github/scripts/utils.py/check-services.py Added

@@ -0,0 +1,381 @@
+import json
+import socket
+import ssl
+import os
+import time
+import requests
+import sys
+import zipfile
+
+from io import BytesIO
+from random import randbytes
+from urllib.parse import urlparse
+from collections import defaultdict
+
+MINIMUM_PURGE_AGE = 9.75 * 24 * 60 * 60 # slightly less than 10 days
+TIMEOUT = 10
+SKIPPED_SERVICES = {"YouNow", "SHOWROOM", "Dacast"}
+SERVICES_FILE = "plugins/rtmp-services/data/services.json"
+PACKAGE_FILE = "plugins/rtmp-services/data/package.json"
+CACHE_FILE = "other/timestamps.json"
+GITHUB_OUTPUT_FILE = os.environ.get("GITHUB_OUTPUT", None)
+
+DO_NOT_PING = {"jp9000"}
+PR_MESSAGE = """This is an automatically created pull request to remove unresponsive servers and services.
+
+| Service | Action Taken | Author(s) |
+| ------- | ------------ | --------- |
+{table}
+
+If you are not responsible for an affected service and want to be excluded from future pings please let us know.
+
+Created by workflow run: https://github.com/{repository}/actions/runs/{run_id}"""
+
+# GQL is great isn't it
+GQL_QUERY = """{
+ repositoryOwner(login: "obsproject") {
+ repository(name: "obs-studio") {
+ object(expression: "master") {
+ ... on Commit {
+ blame(path: "plugins/rtmp-services/data/services.json") {
+ ranges {
+ startingLine
+ endingLine
+ commit {
+ author {
+ user {
+ login
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+}"""
+
+context = ssl.create_default_context()
+
+
+def check_ftl_server(hostname) -> bool:
+ """Check if hostname resolves to a valid address - FTL handshake not implemented"""
+ try:
+ socket.getaddrinfo(hostname, 8084, proto=socket.IPPROTO_UDP)
+ except socket.gaierror as e:
+ print(f"⚠️ Could not resolve hostname for server: {hostname} (Exception: {e})")
+ return False
+ else:
+ return True
+
+
+def check_hls_server(uri) -> bool:
+ """Check if URL responds with status code < 500 and not 404, indicating that at least there's *something* there"""
+ try:
+ r = requests.post(uri, timeout=TIMEOUT)
+ if r.status_code >= 500 or r.status_code == 404:
+ raise Exception(f"Server responded with {r.status_code}")
+ except Exception as e:
+ print(f"⚠️ Could not connect to HLS server: {uri} (Exception: {e})")
+ return False
+ else:
+ return True
+
+
+def check_rtmp_server(uri) -> bool:
+ """Try connecting and sending a RTMP handshake (with SSL if necessary)"""
+ parsed = urlparse(uri)
+ hostname, port = parsed.netloc.partition(":")::2
+
+ if port:
+ port = int(port)
+ elif parsed.scheme == "rtmps":
+ port = 443
+ else:
+ port = 1935
+
+ try:
+ recv = b""
+ with socket.create_connection((hostname, port), timeout=TIMEOUT) as sock:
+ # RTMP handshake is \x03 + 4 bytes time (can be 0) + 4 zero bytes + 1528 bytes random
+ handshake = b"\x03\x00\x00\x00\x00\x00\x00\x00\x00" + randbytes(1528)
+ if parsed.scheme == "rtmps":
+ with context.wrap_socket(sock, server_hostname=hostname) as ssock:
+ ssock.sendall(handshake)
+ while True:
+ _tmp = ssock.recv(4096)
+ recv += _tmp
+ if len(recv) >= 1536 or not _tmp:
+ break
+ else:
+ sock.sendall(handshake)
+ while True:
+ _tmp = sock.recv(4096)
+ recv += _tmp
+ if len(recv) >= 1536 or not _tmp:
+ break
+
+ if len(recv) < 1536 or recv0 != 3:
+ raise ValueError("Invalid RTMP handshake received from server")
+ except Exception as e:
+ print(f"⚠️ Connection to server failed: {uri} (Exception: {e})")
+ return False
+ else:
+ return True
+
+
+def get_last_artifact():
+ s = requests.session()
+ s.headers"Authorization" = f'Bearer {os.environ"GITHUB_TOKEN"}'
+
+ run_id = os.environ"WORKFLOW_RUN_ID"
+ repo = os.environ"REPOSITORY"
+
+ # fetch run first, get workflow id from there to get workflow runs
+ r = s.get(f"https://api.github.com/repos/{repo}/actions/runs/{run_id}")
+ r.raise_for_status()
+ workflow_id = r.json()"workflow_id"
+
+ r = s.get(
+ f"https://api.github.com/repos/{repo}/actions/workflows/{workflow_id}/runs",
+ params=dict(
+ per_page=1,
+ status="completed",
+ branch="master",
+ conclusion="success",
+ event="schedule",
+ ),
+ )
+ r.raise_for_status()
+ runs = r.json()
+ if not runs"workflow_runs":
+ raise ValueError("No completed workflow runs found")
+
+ r = s.get(runs"workflow_runs"0"artifacts_url")
+ r.raise_for_status()
+
+ for artifact in r.json()"artifacts":
+ if artifact"name" == "timestamps":
+ artifact_url = artifact"archive_download_url"
+ break
+ else:
+ raise ValueError("No previous artifact found.")
+
+ r = s.get(artifact_url)
+ r.raise_for_status()
+ zip_data = BytesIO()
+ zip_data.write(r.content)
+
+ with zipfile.ZipFile(zip_data) as zip_ref:
+ for info in zip_ref.infolist():
+ if info.filename == "timestamps.json":
+ return json.loads(zip_ref.read(info.filename))
+
+
+def find_people_to_blame(raw_services: str, servers: listtuplestr, str) -> dict:
+ if not servers:
+ return dict()
+
+ # Fetch Blame data from github
+ s = requests.session()
+ s.headers"Authorization" = f'Bearer {os.environ"GITHUB_TOKEN"}'
+
+ r = s.post(
+ "https://api.github.com/graphql", json=dict(query=GQL_QUERY, variables=dict())
+ )
+ r.raise_for_status()
+ j = r.json()
+
+ # The file is only ~2600 lines so this isn't too crazy and makes the lookup very easy
+ line_author = dict()
+ for blame in j"data""repositoryOwner""repository""object""blame"
+ "ranges"
+ :
+ for i in range(blame"startingLine" - 1, blame"endingLine"):
+ if user := blame"commit""author""user":
+ line_authori = user"login"
+
+ service_authors = defaultdict(set)
+ for i, line in enumerate(raw_services.splitlines()):
+ if '"url":' not in line:
+ continue
+ for server, service in servers:
+ if server in line and (author := line_author.get(i)):
+ if author not in DO_NOT_PING:
+ service_authorsservice.add(author)
+
+ return service_authors
+
+
+def set_output(name, value):
+ if not GITHUB_OUTPUT_FILE:
+ return
+
+ try:
+ with open(GITHUB_OUTPUT_FILE, "a", encoding="utf-8", newline="\n") as f:
+ f.write(f"{name}={value}\n")
+ except Exception as e:
+ print(f"Writing to github output files failed: {e!r}")
+
+
+def main():
+ try:
+ with open(SERVICES_FILE, encoding="utf-8") as services_file:
+ raw_services = services_file.read()
+ services = json.loads(raw_services)
+ with open(PACKAGE_FILE, encoding="utf-8") as package_file:
+ package = json.load(package_file)
+ except OSError as e:
+ print(f"❌ Could not open services/package file: {e}")
+ return 1
+
+ # attempt to load last check result cache
+ try:
+ with open(CACHE_FILE, encoding="utf-8") as check_file:
+ fail_timestamps = json.load(check_file)
+ except OSError as e:
+ # cache might be evicted or not exist yet, so this is non-fatal
+ print(
+ f"⚠️ Could not read cache file, trying to get last artifact (Exception: {e})"
+ )
+
+ try:
+ fail_timestamps = get_last_artifact()
+ except Exception as e:
+ print(f"⚠️ Could not fetch cache file, starting fresh. (Exception: {e})")
+ fail_timestamps = dict()
+ else:
+ print("Fetched cache file from last run artifact.")
+ else:
+ print("Successfully loaded cache file:", CACHE_FILE)
+
+ start_time = int(time.time())
+ affected_services = dict()
+ removed_servers = list()
+
+ # create temporary new list
+ new_services = services.copy()
+ new_services"services" = 
+
+ for service in services"services":
+ # skip services that do custom stuff that we can't easily check
+ if service"name" in SKIPPED_SERVICES:
+ new_services"services".append(service)
+ continue
+
+ service_type = service.get("recommended", {}).get("output", "rtmp_output")
+ if service_type not in {"rtmp_output", "ffmpeg_hls_muxer", "ftl_output"}:
+ print("Unknown service type:", service_type)
+ new_services"services".append(service)
+ continue
+
+ # create a copy to mess with
+ new_service = service.copy()
+ new_service"servers" = 
+
+ # run checks for all the servers, and store results in timestamp cache
+ for server in service"servers":
+ if service_type == "ftl_output":
+ is_ok = check_ftl_server(server"url")
+ elif service_type == "ffmpeg_hls_muxer":
+ is_ok = check_hls_server(server"url")
+ else: # rtmp
+ is_ok = check_rtmp_server(server"url")
+
+ if not is_ok:
+ if ts := fail_timestamps.get(server"url", None):
+ if (delta := start_time - ts) >= MINIMUM_PURGE_AGE:
+ print(
+ f'🗑️ Purging server "{server"url"}", it has been '
+ f"unresponsive for {round(delta/60/60/24)} days."
+ )
+ removed_servers.append((server"url", service"name"))
+ # continuing here means not adding it to the new list, thus dropping it
+ continue
+ else:
+ fail_timestampsserver"url" = start_time
+ elif is_ok and server"url" in fail_timestamps:
+ # remove timestamp of failed check if server is back
+ delta = start_time - fail_timestampsserver"url"
+ print(
+ f'💡 Server "{server"url"}" is back after {round(delta/60/60/24)} days!'
+ )
+ del fail_timestampsserver"url"
+
+ new_service"servers".append(server)
+
+ if (diff := len(service"servers") - len(new_service"servers")) > 0:
+ print(f'ℹ️ Removed {diff} server(s) from {service"name"}')
+ affected_servicesservice"name" = f"{diff} servers removed"
+
+ # remove services with no valid servers
+ if not new_service"servers":
+ print(f'💀 Service "{service"name"}" has no valid servers left, removing!')
+ affected_servicesservice"name" = f"Service removed"
+ continue
+
+ new_services"services".append(new_service)
+
+ # write cache file
+ try:
+ os.makedirs("other", exist_ok=True)
+ with open(CACHE_FILE, "w", encoding="utf-8") as cache_file:
+ json.dump(fail_timestamps, cache_file)
+ except OSError as e:
+ print(f"❌ Could not write cache file: {e}")
+ return 1
+ else:
+ print("Successfully wrote cache file:", CACHE_FILE)
+
+ if removed_servers:
+ # increment package version and save that as well
+ package"version" += 1
+ package"files"0"version" += 1
+
+ try:
+ with open(SERVICES_FILE, "w", encoding="utf-8") as services_file:
+ json.dump(new_services, services_file, indent=4, ensure_ascii=False)
+ services_file.write("\n")
+
+ with open(PACKAGE_FILE, "w", encoding="utf-8") as package_file:
+ json.dump(package, package_file, indent=4)
+ package_file.write("\n")
+ except OSError as e:
+ print(f"❌ Could not write services/package file: {e}")
+ return 1
+ else:
+ print(
+ f"Successfully wrote services/package files:\n- {SERVICES_FILE}\n- {PACKAGE_FILE}"
+ )
+
+ # try to find authors to ping, this is optional and is allowed to fail
+ try:
+ service_authors = find_people_to_blame(raw_services, removed_servers)
+ except Exception as e:
+ print(f"⚠ Could not fetch blame for some reason: {e}")
+ service_authors = dict()
+
+ # set GitHub outputs
+ set_output("make_pr", "true")
+ msg = PR_MESSAGE.format(
+ repository=os.environ"REPOSITORY",
+ run_id=os.environ"WORKFLOW_RUN_ID",
+ table="\n".join(
+ "| {name} | {action} | {authors} |".format(
+ name=name.replace("|", "\\|"),
+ action=action,
+ authors=", ".join(
+ f"@{author}" for author in sorted(service_authors.get(name, ))
+ ),
+ )
+ for name, action in sorted(affected_services.items())
+ ),
+ )
+ set_output("pr_message", json.dumps(msg))
+ else:
+ set_output("make_pr", "false")
+
+
+if __name__ == "__main__":
+ sys.exit(main())

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/check_linux Added

@@ -0,0 +1,45 @@
+autoload -Uz log_debug log_group
+
+log_group 'Check Linux build requirements'
+log_debug 'Checking Linux distribution name and version...'
+
+# Check for Ubuntu version 22.10 or later, which have srt and librist available via apt-get
+typeset -g -i UBUNTU_2210_OR_LATER=0
+if -f /etc/os_release {
+ local dist_name
+ local dist_version
+ read -r dist_name dist_version <<< "$(source /etc/os_release; print "${NAME} ${VERSION_ID}")"
+
+ autoload -Uz is-at-least
+ if ${dist_name} == Ubuntu && is-at-least 22.10 ${dist_version}; then
+ typeset -g -i UBUNTU_2210_OR_LATER=1
+ fi
+}
+
+local -a dependencies=("${(fA)$(<${SCRIPT_HOME}/.Aptfile)}")
+local -a install_list
+local binary
+
+sudo apt-get update -qq
+
+for dependency (${dependencies}) {
+ local -a tokens=(${=dependency//(,|:|\')/})
+
+ if ! ${tokens1} == package continue
+
+ if ${#tokens} -gt 2 && ${tokens3} == bin {
+ binary=${tokens4}
+ } else {
+ binary=${tokens2}
+ }
+
+ if (( ! ${+commands${binary}} )) install_list+=(${tokens2})
+}
+
+log_debug "List of dependencies to install: ${install_list}"
+if (( #install_list )) {
+ sudo apt-get -y --no-install-recommends install ${install_list}
+}
+
+rehash
+log_group

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/check_macos Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/create_diskimage Added

@@ -0,0 +1,84 @@
+autoload -Uz log_debug log_error log_info log_status log_group log_output log_warning
+
+local -r _usage="Usage: %B${0}%b <source> <volume name> <output_name>
+
+Create macOS disk image <volume name> <output_name> with contents of <source>"
+
+if (( ! # )) {
+ log_error 'Called without arguments.'
+ log_output ${_usage}
+ return 2
+}
+
+local source=${1}
+local volume_name=${2}
+local output_name=${3}
+
+log_group "Create macOS disk image"
+
+trap "safe_hdiutil detach /Volumes/${output_name}; rm temp.dmg; log_group; return 2" ERR
+
+safe_hdiutil() {
+ local _status=0
+ local -r -a _backoff=(2 5 10 15 30)
+
+ for i ({1..5}) {
+ hdiutil ${@} && _status=0 || _status=1
+
+ if (( _status )) {
+ log_warning "Unable to run 'hdiutil ${@}' (attempt #${i}). Retrying."
+ if (( ${+CI} )) sudo pkill -9 XProtect >/dev/null || true
+ sleep ${_backoff${i}}
+ } else {
+ break
+ }
+ }
+
+ if (( _status )) {
+ log_error "Unable to run 'hdiutil ${@}'. Aborting"
+ log_group
+ return 2
+ }
+}
+
+safe_hdiutil create \
+ -volname "${volume_name}" \
+ -srcfolder ${source} \
+ -ov \
+ -fs HFS+ \
+ -format UDRW \
+ temp.dmg
+safe_hdiutil attach \
+ -noverify \
+ -readwrite \
+ -mountpoint /Volumes/${output_name} \
+ temp.dmg
+
+log_info "Waiting 2 seconds to ensure mounted volume is available..."
+sleep 2
+log_status "Done"
+log_info "Setting up disk volume..."
+log_status "Volume icon"
+SetFile -c icnC /Volumes/${output_name}/.VolumeIcon.icns
+log_status "Icon positions"
+osascript package.applescript ${output_name}
+log_status "File permissions"
+chmod -Rf go-w /Volumes/${output_name}
+SetFile -a C /Volumes/${output_name}
+rm -rf -- /Volumes/${output_name}/.fseventsd(N)
+log_info "Converting disk image..."
+
+safe_hdiutil detach /Volumes/${output_name}
+
+safe_hdiutil convert \
+ -format ULFO \
+ -ov \
+ -o ${output_name}.dmg temp.dmg
+
+rm temp.dmg
+
+trap '' ERR
+
+log_group
+
+return 0

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/log_debug Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/log_error Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/log_group Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/log_info Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/log_output Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/log_status Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/log_warning Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/mkcd Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/setup_ccache Added

obs-studio-30.0.2.tar.xz/.github/scripts/utils.zsh/setup_linux Added

@@ -0,0 +1,117 @@
+autoload -Uz log_group log_error log_status log_info log_debug
+
+if (( ! ${+commandscurl} )) {
+ log_error 'curl not available.'
+ return 2
+}
+
+if (( ! ${+commandsjq} )) {
+ log_error 'jq not available.'
+ return 2
+}
+
+local -a curl_opts=(--show-error --silent --location -O ${@})
+
+pushd ${project_root}
+
+typeset -g QT_VERSION
+read -r QT_VERSION <<< \
+ "$(jq -r --arg target "${target}" \
+ '.platformConfig$target | { qtVersion } | join(" ")' \
+ ${buildspec_file})"
+
+log_group 'Installing obs-studio build dependencies...'
+
+mkdir -p ${project_root}/.deps
+local deps_version
+local deps_baseurl
+local deps_label
+local deps_hash
+
+IFS=';' read -r deps_version deps_baseurl deps_label deps_hash deps_revision <<< \
+ "$(jq -r --arg target "${target}" \
+ '.dependencies"cef" | {version, baseUrl, "label", "hash": .hashes$target, "revision": .revision$target} | join(";")' \
+ ${buildspec_file})"
+
+if (( ! deps_version )) {
+ log_error 'No valid cef spec found in buildspec.json.'
+ return 2
+}
+log_group 'Setting up pre-built Chromium Embedded Framework...'
+
+pushd ${project_root}/.deps
+local _filename="cef_binary_${deps_version}_${target//-/_}${deps_revision:+"_v${deps_revision}"}.tar.xz"
+local _url=${deps_baseurl}/${_filename}
+local _target="cef_binary_${deps_version}_${target//-/_}"
+typeset -g CEF_VERSION=${deps_version}
+
+log_debug "Running curl ${curl_opts} ${_url}"
+curl ${curl_opts} ${_url} && \
+ log_status "Downloaded ${deps_label} for ${target}."
+
+read -r artifact_checksum _ <<< "$(sha256sum ${_filename})"
+if ${deps_hash} != ${artifact_checksum} {
+ log_error "Checksum of downloaded ${deps_label} does not match specification.
+Expected : ${deps_hash}
+Actual : ${artifact_checksum}"
+ return 2
+}
+log_status "Checksum of downloaded ${deps_label} matches."
+mkdir -p ${_target} && pushd ${_target}
+
+XZ_OPT=-T0 tar --strip-components 1 -xJf ../${_filename} && log_status "${deps_label} extracted."
+popd
+
+local suffix
+if ${CPUTYPE} != ${target##*-} {
+ local -A arch_mappings=(
+ aarch64 arm64
+ x86_64 amd64
+ )
+
+ suffix=":${arch_mappings${target##*-}}"
+ sudo apt-get install -y --no-install-recommends \
+ gcc-${${target##*-}//_/-}-linux-gnu g++-${${target##*-}//_/-}-linux-gnu
+}
+
+sudo apt-get install -y --no-install-recommends \
+ build-essential \
+ libcurl4-openssl-dev \
+ libavcodec-dev libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev \
+ libswresample-dev libswscale-dev \
+ libjansson-dev \
+ libx11-xcb-dev \
+ libgles2-mesa-dev libgles2-mesa \
+ libwayland-dev \
+ libpipewire-0.3-dev \
+ libpulse-dev \
+ libx264-dev \
+ libmbedtls-dev \
+ libgl1-mesa-dev \
+ libjansson-dev \
+ libluajit-5.1-dev python3-dev \
+ libx11-dev libxcb-randr0-dev libxcb-shm0-dev libxcb-xinerama0-dev \
+ libxcb-composite0-dev libxinerama-dev libxcb1-dev libx11-xcb-dev libxcb-xfixes0-dev \
+ swig libcmocka-dev libxss-dev libglvnd-dev \
+ libxkbcommon-dev \
+ libasound2-dev libfdk-aac-dev libfontconfig-dev libfreetype6-dev libjack-jackd2-dev \
+ libpulse-dev libsndio-dev libspeexdsp-dev libudev-dev libv4l-dev libva-dev libvlc-dev \
+ libpci-dev libdrm-dev \
+ nlohmann-json3-dev libwebsocketpp-dev libasio-dev libvpl-dev libvpl2 libqrcodegencpp-dev
+
+if (( UBUNTU_2210_OR_LATER )) sudo apt-get install -y --no-install-recommends librist-dev libsrt-openssl-dev
+
+local -a _qt_packages=()
+
+if (( QT_VERSION == 6 )) {
+ _qt_packages+=(
+ qt6-base-dev
+ libqt6svg6-dev
+ qt6-base-private-dev
+ )
+} else {
+ log_error "Unsupported Qt version '${QT_VERSION}' specified."
+ return 2
+}
+
+sudo apt-get install -y --no-install-recommends ${_qt_packages}

obs-studio-30.0.2.tar.xz/.github/workflows/build-project.yaml Added

@@ -0,0 +1,360 @@
+name: Build Project
+on:
+ workflow_call:
+jobs:
+ check-event:
+ name: Event Data 🔎
+ runs-on: ubuntu-22.04
+ defaults:
+ run:
+ shell: bash
+ outputs:
+ package: ${{ steps.setup.outputs.package }}
+ codesign: ${{ steps.setup.outputs.codesign }}
+ notarize: ${{ steps.setup.outputs.notarize }}
+ config: ${{ steps.setup.outputs.config }}
+ commitHash: ${{ steps.setup.outputs.commitHash }}
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - name: Check Event Data ☑️
+ id: setup
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ : Check Event Data ☑️
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+
+ case "${GITHUB_EVENT_NAME}" in
+ pull_request)
+ config_data=('codesign:false' 'notarize:false' 'package:false' 'config:RelWithDebInfo')
+ if gh pr view ${{ github.event.number }} --json labels \
+ | jq -e -r '.labels | select(.name == "Seeking Testers")' > /dev/null; then
+ config_data0='codesign:true'
+ config_data2='package:true'
+ fi
+ ;;
+ push)
+ config_data=('codesign:true' 'notarize:false' 'package:true' 'config:RelWithDebInfo')
+ if ${GITHUB_REF_NAME} =~ 0-9+.0-9+.0-9+(-(rc|beta).+)? ; then
+ config_data1='notarize:true'
+ config_data3='config:Release'
+ fi
+ ;;
+ workflow_dispatch)
+ config_data=('codesign:true' 'notarize:false' 'package:false' 'config:RelWithDebInfo')
+ ;;
+ schedule)
+ config_data=('codesign:true' 'notarize:false' 'package:true' 'config:RelWithDebInfo')
+ ;;
+ *) ;;
+ esac
+
+ for config in "${config_data@}"; do
+ IFS=':' read -r key value <<< "${config}"
+ echo "${key}=${value}" >> $GITHUB_OUTPUT
+ done
+ echo "commitHash=${GITHUB_SHA:0:9}" >> $GITHUB_OUTPUT
+
+ macos-build:
+ name: macOS 🍏
+ runs-on: macos-13
+ needs: check-event
+ strategy:
+ fail-fast: false
+ matrix:
+ target: arm64, x86_64
+ defaults:
+ run:
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ fetch-depth: 0
+
+ - name: Set Up Environment 🔧
+ id: setup
+ run: |
+ : Set Up Environment 🔧
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ print '::group::Enable Xcode 14.3.1 and AppleScript'
+ sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+ sudo sqlite3 $HOME/Library/Application\ Support/com.apple.TCC/TCC.db \
+ "INSERT OR REPLACE INTO access VALUES('kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552);"
+ sudo sqlite3 /Library/Application\ Support/com.apple.TCC/TCC.db \
+ "INSERT OR REPLACE INTO access VALUES('kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552);"
+ print '::endgroup::'
+
+ print '::group::Clean Homebrew Environment'
+ local -a to_remove=()
+
+ for formula (curl) {
+ if -d ${HOMEBREW_PREFIX}/opt/${formula} to_remove+=(${formula})
+ }
+
+ if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
+ print '::endgroup::'
+
+ local -A arch_names=(x86_64 intel arm64 apple)
+ print "cpuName=${arch_names${{ matrix.target }}}" >> $GITHUB_OUTPUT
+
+ - uses: actions/cache/restore@v3
+ id: ccache-cache
+ with:
+ path: ${{ github.workspace }}/.ccache
+ key: ${{ runner.os }}-ccache-${{ matrix.target }}-${{ needs.check-event.outputs.config }}
+ restore-keys: |
+ ${{ runner.os }}-ccache-${{ matrix.target }}-
+
+ - name: Set Up Code Signing 🔑
+ uses: ./.github/actions/setup-macos-codesigning
+ if: fromJSON(needs.check-event.outputs.codesign)
+ id: codesign
+ with:
+ codesignIdentity: ${{ secrets.MACOS_SIGNING_IDENTITY }}
+ codesignCertificate: ${{ secrets.MACOS_SIGNING_CERT }}
+ certificatePassword: ${{ secrets.MACOS_SIGNING_CERT_PASSWORD }}
+ keychainPassword: ${{ secrets.MACOS_KEYCHAIN_PASSWORD }}
+ provisioningProfile: ${{ secrets.MACOS_SIGNING_PROVISIONING_PROFILE }}
+ notarizationUser: ${{ secrets.MACOS_NOTARIZATION_USERNAME }}
+ notarizationPassword: ${{ secrets.MACOS_NOTARIZATION_PASSWORD }}
+
+ - name: Build OBS Studio 🧱
+ uses: ./.github/actions/build-obs
+ env:
+ TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
+ TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
+ RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
+ RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
+ YOUTUBE_CLIENTID: ${{ secrets.YOUTUBE_CLIENTID }}
+ YOUTUBE_CLIENTID_HASH: ${{ secrets.YOUTUBE_CLIENTID_HASH }}
+ YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
+ YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
+ with:
+ target: ${{ matrix.target }}
+ config: ${{ needs.check-event.outputs.config }}
+ codesign: ${{ fromJSON(needs.check-event.outputs.codesign) }}
+ codesignIdent: ${{ steps.codesign.outputs.codesignIdent }}
+ codesignTeam: ${{ steps.codesign.outputs.codesignTeam }}
+ provisioningProfileUUID: ${{ steps.codesign.outputs.provisioningProfileUUID }}
+
+ - name: Package OBS Studio 📀
+ uses: ./.github/actions/package-obs
+ with:
+ target: ${{ matrix.target }}
+ config: ${{ needs.check-event.outputs.config }}
+ package: ${{ fromJSON(needs.check-event.outputs.package) }}
+ codesign: ${{ fromJSON(needs.check-event.outputs.codesign) && fromJSON(steps.codesign.outputs.haveCodesignIdent) }}
+ codesignIdent: ${{ steps.codesign.outputs.codesignIdent }}
+ notarize: ${{ fromJSON(needs.check-event.outputs.notarize) && fromJSON(steps.codesign.outputs.haveNotarizationUser) }}
+ codesignUser: ${{ secrets.MACOS_NOTARIZATION_USERNAME }}
+ codesignPass: ${{ secrets.MACOS_NOTARIZATION_PASSWORD }}
+
+ - name: Upload Artifacts 📡
+ uses: actions/upload-artifact@v3
+ with:
+ name: obs-studio-macos-${{ matrix.target }}-${{ needs.check-event.outputs.commitHash }}
+ path: ${{ github.workspace }}/build_macos/obs-studio-*-macos-${{ steps.setup.outputs.cpuName }}.*
+
+ - name: Upload Debug Symbol Artifacts 🪲
+ uses: actions/upload-artifact@v3
+ if: ${{ needs.check-event.outputs.config == 'Release' }}
+ with:
+ name: obs-studio-macos-${{ matrix.target }}-${{ needs.check-event.outputs.commitHash }}-dSYMs
+ path: ${{ github.workspace }}/build_macos/obs-studio-*-macos-${{ steps.setup.outputs.cpuName }}-dSYMs.tar.xz
+
+ - uses: actions/cache/save@v3
+ if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
+ with:
+ path: ${{ github.workspace }}/.ccache
+ key: ${{ runner.os }}-ccache-${{ matrix.target }}-${{ needs.check-event.outputs.config }}
+
+ ubuntu-build:
+ name: Ubuntu 🐧
+ runs-on: ubuntu-22.04
+ needs: check-event
+ defaults:
+ run:
+ shell: bash
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ fetch-depth: 0
+
+ - uses: actions/cache/restore@v3
+ id: ccache-cache
+ with:
+ path: ${{ github.workspace }}/.ccache
+ key: ${{ runner.os }}-ccache-x86_64-${{ needs.check-event.outputs.config }}
+ restore-keys: |
+ ${{ runner.os }}-ccache-x86_64-
+
+ - name: Build OBS Studio 🧱
+ uses: ./.github/actions/build-obs
+ env:
+ TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
+ TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
+ RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
+ RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
+ YOUTUBE_CLIENTID: ${{ secrets.YOUTUBE_CLIENTID }}
+ YOUTUBE_CLIENTID_HASH: ${{ secrets.YOUTUBE_CLIENTID_HASH }}
+ YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
+ YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
+ with:
+ target: x86_64
+ config: ${{ needs.check-event.outputs.config }}
+
+ - name: Package OBS Studio 📀
+ uses: ./.github/actions/package-obs
+ with:
+ target: x86_64
+ config: ${{ needs.check-event.outputs.config }}
+ package: ${{ fromJSON(needs.check-event.outputs.package) }}
+
+ - name: Upload Source Tarball 🗜️
+ uses: actions/upload-artifact@v3
+ if: ${{ ! always() }}
+ with:
+ name: obs-studio-*-sources-${{ needs.check-event.outputs.commitHash }}
+ path: ${{ github.workspace }}/build_x86_64/obs-studio-*-sources.*
+
+ - name: Upload Artifacts 📡
+ uses: actions/upload-artifact@v3
+ with:
+ name: obs-studio-ubuntu-22.04-x86_64-${{ needs.check-event.outputs.commitHash }}
+ path: ${{ github.workspace }}/build_x86_64/obs-studio-*-x86_64-linux-gnu.*
+
+ - name: Upload Debug Symbol Artifacts 🪲
+ uses: actions/upload-artifact@v3
+ if: ${{ fromJSON(needs.check-event.outputs.package) }}
+ with:
+ name: obs-studio-ubuntu-22.04-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
+ path: ${{ github.workspace }}/build_x86_64/obs-studio-*-x86_64-linux-gnu-dbgsym.ddeb
+
+ - uses: actions/cache/save@v3
+ if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
+ with:
+ path: ${{ github.workspace }}/.ccache
+ key: ${{ runner.os }}-ccache-x86_64-${{ needs.check-event.outputs.config }}
+
+ flatpak-build:
+ name: Flatpak 📦
+ runs-on: ubuntu-22.04
+ needs: check-event
+ defaults:
+ run:
+ shell: bash
+ container:
+ image: bilelmoussaoui/flatpak-github-actions:kde-6.5
+ options: --privileged
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ fetch-depth: 0
+ set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
+
+ - name: Set Up Environment 🔧
+ id: setup
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ : Set Up Environment 🔧
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+
+ git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+
+ echo '::group::Install GitHub CLI tool'
+ dnf install -y -q gh
+ gh extension install actions/gh-actions-cache
+ echo '::endgroup::'
+
+ cache_key='flatpak-builder-${{ hashFiles('build-aux/**/*.json') }}'
+ cache_ref='master'
+ read -r key size unit _ ref _ <<< \
+ "$(gh actions-cache list -B ${cache_ref} --key "${cache_key}-x86_64" | head -1)"
+
+ if "${key}" ; then
+ echo "cacheHit=true" >> $GITHUB_OUTPUT
+ else
+ echo "cacheHit=false" >> $GITHUB_OUTPUT
+ fi
+
+ echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT
+
+ - name: Validate Flatpak manifest
+ uses: ./.github/actions/flatpak-builder-lint
+ with:
+ artifact: manifest
+ path: build-aux/com.obsproject.Studio.json
+
+ - name: Build Flatpak Manifest 🧾
+ uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
+ with:
+ build-bundle: ${{ fromJSON(needs.check-event.outputs.package) }}
+ bundle: obs-studio-flatpak-${{ needs.check-event.outputs.commitHash }}.flatpak
+ manifest-path: ${{ github.workspace }}/build-aux/com.obsproject.Studio.json
+ cache: ${{ fromJSON(steps.setup.outputs.cacheHit) || (github.event_name == 'push' && github.ref_name == 'master')}}
+ restore-cache: ${{ fromJSON(steps.setup.outputs.cacheHit) }}
+ cache-key: ${{ steps.setup.outputs.cacheKey }}
+
+ - name: Validate build directory
+ uses: ./.github/actions/flatpak-builder-lint
+ with:
+ artifact: builddir
+ path: flatpak_app
+
+ windows-build:
+ name: Windows 🪟
+ runs-on: windows-2022
+ needs: check-event
+ defaults:
+ run:
+ shell: pwsh
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ fetch-depth: 0
+
+ - uses: actions/cache@v3
+ id: ccache-cache
+ if: github.event_name == 'pull_request'
+ with:
+ path: ${{ github.workspace }}/.ccache
+ key: ${{ runner.os }}-ccache-x86_64-${{ needs.check-event.outputs.config }}
+ restore-keys: |
+ ${{ runner.os }}-ccache-x86_64-
+
+ - name: Build OBS Studio 🧱
+ uses: ./.github/actions/build-obs
+ env:
+ TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
+ TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
+ RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
+ RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
+ YOUTUBE_CLIENTID: ${{ secrets.YOUTUBE_CLIENTID }}
+ YOUTUBE_CLIENTID_HASH: ${{ secrets.YOUTUBE_CLIENTID_HASH }}
+ YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
+ YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
+ GPU_PRIORITY_VAL: ${{ secrets.GPU_PRIORITY_VAL }}
+ with:
+ target: x64
+ config: ${{ needs.check-event.outputs.config }}
+
+ - name: Package OBS Studio 📀
+ uses: ./.github/actions/package-obs
+ with:
+ target: x64
+ config: ${{ needs.check-event.outputs.config }}
+ package: ${{ fromJSON(needs.check-event.outputs.package) }}
+
+ - name: Upload Artifacts 📡
+ uses: actions/upload-artifact@v3
+ with:
+ name: obs-studio-windows-x64-${{ needs.check-event.outputs.commitHash }}
+ path: ${{ github.workspace }}/build_x64/obs-studio-*-windows-x64.zip

obs-studio-30.0.2.tar.xz/.github/workflows/check-format.yaml Added

@@ -0,0 +1,63 @@
+name: Check Code Formatting 🛠️
+on:
+  workflow_call:
+jobs:
+  clang-format:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: clang-format Check 🐉
+        id: clang-format
+        uses: ./.github/actions/run-clang-format
+        with:
+          failCondition: error
+
+  swift-format:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: swift-format Check 🔥
+        id: swift-format
+        uses: ./.github/actions/run-swift-format
+        with:
+          failCondition: error
+
+  cmake-format:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: cmake-format Check 🎛️
+        id: cmake-format
+        uses: ./.github/actions/run-cmake-format
+        with:
+          failCondition: error
+
+  flatpak-validator:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Flatpak Manifest Check 📦
+        id: flatpak-check
+        uses: ./.github/actions/flatpak-manifest-validator
+        with:
+          failCondition: error
+
+  qt-xml-validator:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Qt XML Check 🖼️
+        id: qt-xml-check
+        uses: ./.github/actions/qt-xml-validator
+        with:
+          failCondition: error

obs-studio-30.0.2.tar.xz/.github/workflows/dispatch.yaml Added

@@ -0,0 +1,130 @@
+name: Dispatch
+run-name: Dispatched Repository Actions - ${{ inputs.job }} ⌛️
+on:
+  workflow_dispatch:
+    inputs:
+      job:
+        description: Dispatch job to run
+        required: true
+        type: choice
+        options:
+          - steam
+          - services
+          - translations
+          - documentation
+      ref:
+        description: GitHub reference to use for job
+        type: string
+        required: false
+      customAssetWindows:
+        description: Custom Windows build for Steam Upload
+        type: string
+        required: false
+      customAssetMacOSApple:
+        description: Custom macOS Apple Silicon build for Steam Upload
+        type: string
+        required: false
+      customAssetMacOSIntel:
+        description: Custom macOS Intel build for Steam Upload
+        type: string
+        required: false
+permissions:
+  contents: write
+jobs:
+  services-validation:
+    name: Validate Services 🕵️
+    if: github.repository_owner == 'obsproject' && inputs.job == 'services'
+    runs-on: macos-13
+    permissions:
+      checks: write
+      contents: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Check for Defunct Services 📉
+        uses: ./.github/actions/services-validator
+        with:
+          repositorySecret: ${{ secrets.GITHUB_TOKEN }}
+          runSchemaChecks: true
+          runServiceChecks: true
+          createPullRequest: true
+
+  download-language-files:
+    name: Download Language Files 🌐
+    if: github.repository_owner == 'obsproject' && inputs.job == 'translations'
+    runs-on: ubuntu-22.04
+    env:
+      CROWDIN_PAT: ${{ secrets.CROWDIN_SYNC_CROWDIN_PAT }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.CROWDIN_SYNC_GITHUB_PAT }}
+          fetch-depth: 0
+      - uses: obsproject/obs-crowdin-sync/download@30b5446e3b5eb19595aa68a81ddf896a857302cf
+
+  steam-upload:
+    name: Upload Steam Builds 🚂
+    if: github.repository_owner == 'obsproject' && inputs.job == 'steam'
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/steam-upload
+        with:
+          steamSecret: ${{ secrets.STEAM_SHARED_SECRET }}
+          steamUser: ${{ secrets.STEAM_USER }}
+          steamPassword: ${{ secrets.STEAM_PASSWORD }}
+          tagName: ${{ inputs.ref }}
+          customAssetWindows: ${{ inputs.customAssetWindows }}
+          customAssetMacOSApple: ${{ inputs.customAssetMacOSApple }}
+          customAssetMacOSIntel: ${{ inputs.customAssetMacOSIntel }}
+          workflowSecret: ${{ github.token }}
+          preview: false
+
+  update-documentation:
+    name: Update Documentation 📖
+    if: github.repository_owner == 'obsproject' && inputs.job == 'documentation'
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/generate-docs
+
+  update-documentation-cloudflare:
+    name: Update Documentation for Cloudflare ☁️
+    if: github.repository_owner == 'obsproject' && inputs.job == 'documentation'
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/generate-docs
+        with:
+          disableLinkExtensions: true
+
+  deploy-documentation:
+    name: Deploy Documentation to Cloudflare ☁️
+    if: github.repository_owner == 'obsproject' && inputs.job == 'documentation'
+    runs-on: ubuntu-22.04
+    needs: update-documentation-cloudflare
+    defaults:
+      run:
+        shell: bash
+    environment:
+      name: cf-pages-deploy
+    steps:
+      - name: Get Commit Information 🆔
+        id: setup
+        run: |
+          : Get Commit Hash 🆔
+          echo "commitHash=${GITHUB_SHA:0:9}" >> $GITHUB_OUTPUT
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: OBS Studio Docs (No Extensions) ${{ steps.setup.outputs.commitHash }}
+          path: docs
+
+      - name: Publish to Live Page
+        uses: cloudflare/wrangler-action@4c10c1822abba527d820b29e6333e7f5dac2cabd
+        with:
+          workingDirectory: docs
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages publish . --project-name=${{ vars.CF_PAGES_PROJECT }} --commit-hash='${{ steps.setup.outputs.commitHash }}'

obs-studio-30.0.2.tar.xz/.github/workflows/pr-pull.yaml Added

@@ -0,0 +1,94 @@
+name: Pull
+run-name: ${{ github.event.pull_request.title }} pull request run 🚀
+on:
+  workflow_dispatch:
+  pull_request:
+    paths-ignore:
+      - '**.md'
+    branches: master
+    types:  opened, synchronize, reopened 
+permissions:
+  contents: read
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+jobs:
+  check-format:
+    name: Format 🔍
+    uses: ./.github/workflows/check-format.yaml
+    permissions:
+      contents: read
+
+  build-project:
+    name: Build 🧱
+    uses: ./.github/workflows/build-project.yaml
+    secrets: inherit
+    permissions:
+      contents: read
+
+  compatibility-validation:
+    name: Validate Compatibility 🕵️
+    if: github.base_ref == 'master'
+    runs-on: ubuntu-22.04
+    permissions:
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check for Changed Files ✅
+        uses: ./.github/actions/check-changes
+        id: checks
+        with:
+          baseRef: origin/${{ github.base_ref }}
+          checkGlob: plugins/win-capture/data/*.json
+
+      - name: Check for Invalid Compatibility Data 📉
+        if: fromJSON(steps.checks.outputs.hasChangedFiles)
+        uses: ./.github/actions/compatibility-validator
+
+  services-validation:
+    name: Validate Services 🕵️
+    if: github.base_ref == 'master'
+    runs-on: ubuntu-22.04
+    permissions:
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check for Changed Files ✅
+        uses: ./.github/actions/check-changes
+        id: checks
+        with:
+          baseRef: origin/${{ github.base_ref }}
+          checkGlob: plugins/rtmp-services/data/*.json
+
+      - name: Check Services JSON Schema 📉
+        if: fromJSON(steps.checks.outputs.hasChangedFiles)
+        uses: ./.github/actions/services-validator
+        with:
+          repositorySecret: ${{ secrets.GITHUB_TOKEN }}
+          runSchemaChecks: true
+          runServiceChecks: false
+
+  update-documentation:
+    name: Update Documentation 📖
+    if: github.repository_owner == 'obsproject' && github.base_ref == 'master'
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check for Changed Files ✅
+        uses: ./.github/actions/check-changes
+        id: checks
+        with:
+          baseRef: origin/${{ github.base_ref }}
+          checkGlob: docs/sphinx
+
+      - uses: ./.github/actions/generate-docs
+        if: fromJSON(steps.checks.outputs.hasChangedFiles)

obs-studio-30.0.2.tar.xz/.github/workflows/publish.yaml Added

@@ -0,0 +1,179 @@
+name: Publish
+run-name: Publish Repository Actions 🛫
+on:
+ release:
+ types:
+ - published
+ branches:
+ - master
+ - 'release/**'
+permissions:
+ contents: read
+concurrency:
+ group: '${{ github.workflow }} @ ${{ github.head_ref || github.ref }}'
+ cancel-in-progress: true
+jobs:
+ check-tag:
+ name: Check Release Tag
+ if: github.repository_owner == 'obsproject'
+ runs-on: ubuntu-22.04
+ outputs:
+ validTag: ${{ steps.check.outputs.validTag }}
+ flatpakMatrix: ${{ steps.check.outputs.flatpakMatrix }}
+ steps:
+ - name: Check Release Tag ☑️
+ id: check
+ run: |
+ : Check Release Tag ☑️
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+ shopt -s extglob
+
+ case "${GITHUB_REF_NAME}" in
+ +(0-9).+(0-9).+(0-9) )
+ echo 'validTag=true' >> $GITHUB_OUTPUT
+ echo 'flatpakMatrix="beta", "stable"' >> $GITHUB_OUTPUT
+ ;;
+ +(0-9).+(0-9).+(0-9)-@(beta|rc)*(0-9) )
+ echo 'validTag=true' >> $GITHUB_OUTPUT
+ echo 'flatpakMatrix="beta"' >> $GITHUB_OUTPUT
+ ;;
+ *) echo 'validTag=false' >> $GITHUB_OUTPUT ;;
+ esac
+
+ flatpak-publish:
+ name: Flathub 📦
+ needs: check-tag
+ if: github.repository_owner == 'obsproject' && fromJSON(needs.check-tag.outputs.validTag)
+ runs-on: ubuntu-22.04
+ defaults:
+ run:
+ shell: bash
+ env:
+ FLATPAK_BUILD_PATH: flatpak_app/files/share
+ TWITCH_CLIENTID: ${{ secrets.TWITCH_CLIENT_ID }}
+ TWITCH_HASH: ${{ secrets.TWITCH_HASH }}
+ RESTREAM_CLIENTID: ${{ secrets.RESTREAM_CLIENTID }}
+ RESTREAM_HASH: ${{ secrets.RESTREAM_HASH }}
+ YOUTUBE_CLIENTID: ${{ secrets.YOUTUBE_CLIENTID }}
+ YOUTUBE_CLIENTID_HASH: ${{ secrets.YOUTUBE_CLIENTID_HASH }}
+ YOUTUBE_SECRET: ${{ secrets.YOUTUBE_SECRET }}
+ YOUTUBE_SECRET_HASH: ${{ secrets.YOUTUBE_SECRET_HASH }}
+ container:
+ image: bilelmoussaoui/flatpak-github-actions:kde-6.5
+ options: --privileged
+ strategy:
+ matrix:
+ branch: ${{ fromJSON(needs.check-tag.outputs.flatpakMatrix) }}
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ fetch-depth: 0
+ set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
+
+ - name: Set Up Environment 🔧
+ id: setup
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ : Set Up Environment 🔧
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+
+ git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+
+ dnf install -y -q gh flatpak-builder-1.3.3-2.fc39
+ gh extension install actions/gh-actions-cache
+
+ cache_key='flatpak-builder-${{ hashFiles('build-aux/**/*.json') }}'
+ cache_ref='master'
+ read -r key size unit _ ref _ <<< \
+ "$(gh actions-cache list -B ${cache_ref} --key "${cache_key}-x86_64" | head -1)"
+
+ if "${key}" ; then
+ echo "cacheHit=true" >> $GITHUB_OUTPUT
+ else
+ echo "cacheHit=false" >> $GITHUB_OUTPUT
+ fi
+
+ echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT
+ echo "commitHash=${GITHUB_SHA:0:9}" >> $GITHUB_OUTPUT
+
+ - name: Validate Flatpak manifest
+ uses: ./.github/actions/flatpak-builder-lint
+ with:
+ artifact: manifest
+ path: build-aux/com.obsproject.Studio.json
+
+ - name: Build Flatpak Manifest
+ uses: flatpak/flatpak-github-actions/flatpak-builder@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
+ with:
+ bundle: obs-studio-${{ steps.setup.outputs.commitHash }}.flatpak
+ manifest-path: ${{ github.workspace }}/build-aux/com.obsproject.Studio.json
+ cache: ${{ fromJSON(steps.setup.outputs.cacheHit) }}
+ cache-key: ${{ steps.setup.outputs.cacheKey }}
+ mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
+ branch: ${{ matrix.branch }}
+
+ - name: Validate AppStream
+ working-directory: ${{ env.FLATPAK_BUILD_PATH }}
+ run: |
+ : Validate AppStream
+ appstream-util validate appdata/com.obsproject.Studio.appdata.xml
+
+ - name: Verify Icon and Metadata in app-info
+ working-directory: ${{ env.FLATPAK_BUILD_PATH }}
+ run: |
+ : Verify Icon and Metadata in app-info
+ test -f app-info/icons/flatpak/128x128/com.obsproject.Studio.png || { echo "Missing 128x128 icon in app-info!"; exit 1; }
+ test -f app-info/xmls/com.obsproject.Studio.xml.gz || { echo "Missing com.obsproject.Studio.xml.gz in app-info!"; exit 1; }
+
+ - name: Commit Screenshots to OSTree Repository
+ run: |
+ : Commit Screenshots to OSTree Repository
+ ostree commit --repo=repo --canonical-permissions --branch=screenshots/x86_64 flatpak_app/screenshots
+
+ - name: Validate build directory
+ uses: ./.github/actions/flatpak-builder-lint
+ with:
+ artifact: builddir
+ path: flatpak_app
+
+ - name: Validate repository
+ uses: ./.github/actions/flatpak-builder-lint
+ with:
+ artifact: repo
+ path: repo
+
+ - name: Publish to Flathub Beta
+ uses: flatpak/flatpak-github-actions/flat-manager@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
+ if: ${{ matrix.branch == 'beta' }}
+ with:
+ flat-manager-url: https://hub.flathub.org/
+ repository: beta
+ token: ${{ secrets.FLATHUB_BETA_TOKEN }}
+ build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+ - name: Publish to Flathub
+ uses: flatpak/flatpak-github-actions/flat-manager@0ab9dd6a6afa6fe7e292db0325171660bf5b6fdf
+ if: ${{ matrix.branch == 'stable' }}
+ with:
+ flat-manager-url: https://hub.flathub.org/
+ repository: stable
+ token: ${{ secrets.FLATHUB_TOKEN }}
+ build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+ steam-upload:
+ name: Upload Steam Builds 🚂
+ needs: check-tag
+ if: github.repository_owner == 'obsproject' && fromJSON(needs.check-tag.outputs.validTag)
+ runs-on: macos-13
+ steps:
+ - uses: actions/checkout@v3
+ - uses: ./.github/actions/steam-upload
+ with:
+ steamSecret: ${{ secrets.STEAM_SHARED_SECRET }}
+ steamUser: ${{ secrets.STEAM_USER }}
+ steamPassword: ${{ secrets.STEAM_PASSWORD }}
+ workflowSecret: ${{ github.token }}
+ tagName: ${{ github.ref_name }}
+ preview: false

obs-studio-30.0.2.tar.xz/.github/workflows/push.yaml Added

@@ -0,0 +1,288 @@
+name: Push
+run-name: ${{ github.ref_name }} push run 🚀
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+    branches:
+      - master
+      - 'release/**'
+    tags:
+      - '*'
+permissions:
+  contents: write
+jobs:
+  check-format:
+    name: Format 🔍
+    if: github.ref_name == 'master'
+    uses: ./.github/workflows/check-format.yaml
+    permissions:
+      contents: read
+
+  build-project:
+    name: Build 🧱
+    uses: ./.github/workflows/build-project.yaml
+    secrets: inherit
+    permissions:
+      contents: read
+
+  compatibility-validation:
+    name: Validate Compatibility 🕵️
+    if: github.ref_name == 'master'
+    runs-on: ubuntu-22.04
+    permissions:
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check for Changed Files ✅
+        uses: ./.github/actions/check-changes
+        id: checks
+        with:
+          baseRef: ${{ github.event.before }}
+          checkGlob: plugins/win-capture/data/*.json
+
+      - name: Check for Invalid Compatibility Data 📉
+        if: fromJSON(steps.checks.outputs.hasChangedFiles)
+        uses: ./.github/actions/compatibility-validator
+        with:
+          repositorySecret: ${{ github.token }}
+
+  services-validation:
+    name: Validate Services 🕵️
+    if: github.ref_name == 'master'
+    runs-on: ubuntu-22.04
+    permissions:
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check for Changed Files ✅
+        uses: ./.github/actions/check-changes
+        id: checks
+        with:
+          baseRef: ${{ github.event.before }}
+          checkGlob: plugins/rtmp-services/data/*.json
+
+      - name: Check Services JSON Schema 📉
+        if: fromJSON(steps.checks.outputs.hasChangedFiles)
+        uses: ./.github/actions/services-validator
+        with:
+          repositorySecret: ${{ github.token }}
+          runSchemaChecks: true
+          runServiceChecks: false
+
+  update-documentation:
+    name: Update Documentation 📖
+    if: github.repository_owner == 'obsproject' && (github.ref_name == 'master' || github.ref_type == 'tag')
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check for Changed Files ✅
+        if: github.ref_type != 'tag'
+        uses: ./.github/actions/check-changes
+        id: checks
+        with:
+          baseRef: ${{ github.event.before }}
+          checkGlob: '!(cmake*)'
+
+      - uses: ./.github/actions/generate-docs
+        if: github.ref_type == 'tag' || fromJSON(steps.checks.outputs.hasChangedFiles)
+        with:
+          disableLinkExtensions: ${{ github.ref_type == 'tag' }}
+
+  deploy-documentation:
+    name: Deploy Documentation to Cloudflare ☁️
+    if: github.repository_owner == 'obsproject' && github.ref_type == 'tag'
+    runs-on: ubuntu-22.04
+    needs: update-documentation
+    defaults:
+      run:
+        shell: bash
+    environment:
+      name: cf-pages-deploy
+    steps:
+      - name: Get Commit Information 🆔
+        id: setup
+        run: |
+          : Get Commit Hash 🆔
+          echo "commitHash=${GITHUB_SHA:0:9}" >> $GITHUB_OUTPUT
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: OBS Studio Docs (No Extensions) ${{ steps.setup.outputs.commitHash }}
+          path: docs
+
+      - name: Set Up Redirects 🔄
+        run: |
+          : Set Up Redirects 🔄
+          if  "${RUNNER_DEBUG}" ; then set -x; fi
+
+          echo "/previous/27.2 https://obsproject.com/docs/27.2 302" >> docs/_redirects
+          echo "/previous/:major.:minor https://:major-:minor.${{ vars.CF_PAGES_PROJECT }}.pages.dev 302" >> docs/_redirects
+
+      - name: Publish to Live Page
+        uses: cloudflare/wrangler-action@4c10c1822abba527d820b29e6333e7f5dac2cabd
+        with:
+          workingDirectory: docs
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{ secrets.CF_ACCOUNT_ID }}
+          command: pages publish . --project-name=${{ vars.CF_PAGES_PROJECT }} --commit-hash='${{ steps.setup.outputs.commitHash }}'
+
+  create-appcast:
+    name: Create Sparkle Appcast 🎙️
+    if: github.repository_owner == 'obsproject' && github.ref_type == 'tag'
+    runs-on: macos-13
+    needs: build-project
+    strategy:
+      fail-fast: false
+      matrix:
+        target: arm64, x86_64
+    defaults:
+      run:
+        shell: zsh --no-rcs --errexit --pipefail {0}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+          ref: ${{ github.ref }}
+
+      - name: Set Up Environment 🔧
+        id: setup
+        run: |
+          : Set Up Environment 🔧
+          if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+          local channel='stable'
+          if  ${GITHUB_REF_NAME} == *(beta|rc)*  {
+            channel='beta'
+          }
+
+          local -A arch_names=(x86_64 intel arm64 apple)
+          print "cpuName=${arch_names${{ matrix.target }}}" >> $GITHUB_OUTPUT
+          print "commitHash=${GITHUB_SHA:0:9}" >> $GITHUB_OUTPUT
+          print "channel=${channel}" >> $GITHUB_OUTPUT
+
+      - name: Download Artifact 📥
+        uses: actions/download-artifact@v3
+        with:
+          name: obs-studio-macos-${{ matrix.target }}-${{ steps.setup.outputs.commitHash }}
+
+      - name: Generate Appcast 🎙️
+        id: generate-appcast
+        uses: ./.github/actions/sparkle-appcast
+        with:
+          sparklePrivateKey: ${{ secrets.SPARKLE_PRIVATE_KEY }}
+          baseImage: ${{ github.workspace }}/obs-studio-*-macos-${{ steps.setup.outputs.cpuName }}.dmg
+          channel: ${{ steps.setup.outputs.channel }}
+          count: 1
+          urlPrefix: 'https://cdn-fastly.obsproject.com/downloads'
+          customTitle: 'OBS Studio'
+          customLink: 'https://obsproject.com/'
+
+      - name: Upload Artifacts 📡
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos-sparkle-update
+          path: ${{ github.workspace }}/output
+
+  create-release:
+    name: Create Release 🛫
+    if: github.ref_type == 'tag'
+    runs-on: ubuntu-22.04
+    needs: build-project
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Check Release Tag ☑️
+        id: check
+        run: |
+          : Check Release Tag ☑️
+          if  "${RUNNER_DEBUG}" ; then set -x; fi
+          shopt -s extglob
+
+          case "${GITHUB_REF_NAME}" in
+            +(0-9).+(0-9).+(0-9) )
+              echo 'validTag=true' >> $GITHUB_OUTPUT
+              echo 'prerelease=false' >> $GITHUB_OUTPUT
+              echo "version=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
+              ;;
+            +(0-9).+(0-9).+(0-9)-@(beta|rc)*(0-9) )
+              echo 'validTag=true' >> $GITHUB_OUTPUT
+              echo 'prerelease=true' >> $GITHUB_OUTPUT
+              echo "version=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
+              ;;
+            *) echo 'validTag=false' >> $GITHUB_OUTPUT ;;
+          esac
+
+      - name: Download Build Artifacts 📥
+        uses: actions/download-artifact@v3
+        if: ${{ fromJSON(steps.check.outputs.validTag) }}
+
+      - name: Rename Files 🏷️
+        if: fromJSON(steps.check.outputs.validTag)
+        run: |
+          : Rename Files 🏷️
+          if  "${RUNNER_DEBUG}" ; then set -x; fi
+
+          root_dir="${PWD}"
+
+          commit_hash="${GITHUB_SHA:0:9}"
+          macos_arm64_artifact_name="obs-studio-macos-arm64-${commit_hash}"
+          macos_arm64_dsym_artifact_name="obs-studio-macos-arm64-${commit_hash}-dSYMs"
+          macos_intel_artifact_name="obs-studio-macos-x86_64-${commit_hash}"
+          macos_intel_dsym_artifact_name="obs-studio-macos-x86_64-${commit_hash}-dSYMs"
+          ubuntu_x86_64_artifact_name="obs-studio-ubuntu-22.04-x86_64-${commit_hash}"
+          ubuntu_x86_64_debug_name="obs-studio-ubuntu-22.04-x86_64-${commit_hash}-dbgsym"
+
+          echo '::group::Renaming Artifacts'
+          mv -v "${macos_arm64_artifact_name}/"obs-studio-*-macos-apple.dmg \
+            "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-macOS-Apple.dmg
+          mv -v "${macos_arm64_dsym_artifact_name}/"obs-studio-*-macos-apple-dSYMs.tar.xz \
+            "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-macOS-Apple-dSYMs.tar.xz
+          mv -v "${macos_intel_artifact_name}/"obs-studio-*-macos-intel.dmg \
+            "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-macOS-Intel.dmg
+          mv -v "${macos_intel_dsym_artifact_name}/"obs-studio-*-macos-intel-dSYMs.tar.xz \
+            "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-macOS-Intel-dSYMs.tar.xz
+          mv -v "${ubuntu_x86_64_artifact_name}/"obs-studio-*-x86_64-linux-gnu.deb \
+            "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Ubuntu-x86_64.deb
+          mv -v "${ubuntu_x86_64_debug_name}/"obs-studio-*-x86_64-linux-gnu-dbgsym.ddeb \
+            "${root_dir}"/OBS-Studio-${{ steps.check.outputs.version }}-Ubuntu-x86_64-dbsym.ddeb
+          echo '::endgroup::'
+
+      - name: Generate Checksums 🪪
+        if: fromJSON(steps.check.outputs.validTag)
+        run: |
+          : Generate Checksums 🪪
+          if  "${RUNNER_DEBUG}" ; then set -x; fi
+          shopt -s extglob
+
+          echo "### Checksums" > ${{ github.workspace }}/CHECKSUMS.txt
+          for file in ${{ github.workspace }}/@(*.deb|*.ddeb|*.dmg|*.tar.xz); do
+            echo "    ${file##*/}: $(sha256sum "${file}" | cut -d " " -f 1)" >> ${{ github.workspace }}/CHECKSUMS.txt
+          done
+
+      - name: Create Release 🛫
+        if: fromJSON(steps.check.outputs.validTag)
+        id: create_release
+        uses: softprops/action-gh-release@d4e8205d7e959a9107da6396278b2f1f07af0f9b
+        with:
+          draft: true
+          prerelease: ${{ fromJSON(steps.check.outputs.prerelease) }}
+          tag_name: ${{ steps.check.outputs.version }}
+          name: OBS Studio ${{ steps.check.outputs.version }}
+          body_path: ${{ github.workspace }}/CHECKSUMS.txt
+          files: |
+            ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-macOS-*.dmg
+            ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-macOS-*-dSYMs.tar.xz
+            ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Ubuntu-*.deb
+            ${{ github.workspace }}/OBS-Studio-${{ steps.check.outputs.version }}-Ubuntu-*.ddeb

obs-studio-30.0.2.tar.xz/.github/workflows/scheduled.yaml Added

@@ -0,0 +1,164 @@
+name: Scheduled
+run-name: Scheduled Repository Actions ⏰
+on:
+ schedule:
+ - cron: 17 0 * * *
+permissions:
+ contents: write
+concurrency:
+ group: '${{ github.workflow }} @ ${{ github.head_ref || github.ref }}'
+ cancel-in-progress: true
+jobs:
+ services-availability:
+ name: Check Service Availability 🛜
+ if: github.repository_owner == 'obsproject'
+ runs-on: macos-13
+ permissions:
+ checks: write
+ contents: write
+ pull-requests: write
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ - name: Set Up Homebrew 🍺
+ uses: Homebrew/actions/setup-homebrew@master
+ - name: Check for Defunct Services 📉
+ uses: ./.github/actions/services-validator
+ with:
+ repositorySecret: ${{ secrets.GITHUB_TOKEN }}
+ runSchemaChecks: false
+ runServiceChecks: true
+ createPullRequest: true
+
+ cache-cleanup:
+ name: Cache Cleanup 🧹
+ runs-on: ubuntu-22.04
+ permissions:
+ actions: write
+ steps:
+ - name: Remove Stale Ccache Caches
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ : Remove Stale Ccache Caches
+
+ echo '::group::Processing master branch cache entries'
+ while IFS=";" read -r cache_id cache_name; do
+ if "${cache_name}" ; then
+ result=true
+ gh api -X DELETE repos/${GITHUB_REPOSITORY}/actions/caches?key=${cache_name} --jq '.total_count' &> /dev/null || result=false
+
+ if ${result}; then
+ echo "Deleted cache entry ${cache_name}"
+ else
+ echo "::warning::Unable to delete cache entry ${cache_name}"
+ fi
+ fi
+ done <<< \
+ "$(gh api repos/${GITHUB_REPOSITORY}/actions/caches \
+ --jq '.actions_caches. | select(.ref|test("refs/heads/master")) | select(.key|test(".*-ccache-*")) | {id, key} | join(";")')"
+ echo '::endgroup::'
+
+
+ echo '::group::Processing pull request cache entries'
+ while IFS=";" read -r cache_id cache_name cache_ref; do
+ if "${cache_name}" ; then
+ result=true
+ gh api -X DELETE repos/${GITHUB_REPOSITORY}/actions/caches?key=${cache_name} --jq '.total_count' &> /dev/null || result=false
+
+ pr_number=$(echo ${cache_ref} | cut -d '/' -f 3)
+
+ if ${result}; then
+ echo "Deleted PR #${pr_number} cache entry ${cache_name}"
+ else
+ echo "::warning::Unable to delete PR #${pr_number} cache entry ${cache_name}"
+ fi
+ fi
+ done <<< \
+ "$(gh api repos/${GITHUB_REPOSITORY}/actions/caches \
+ --jq '.actions_caches. | select(.ref|test("refs/heads/master")|not) | select(.key|test(".*-ccache-*")) | {id, key, ref} | join(";")')"
+ echo '::endgroup::'
+
+ build-project:
+ name: Build 🧱
+ uses: ./.github/workflows/build-project.yaml
+ needs: cache-cleanup
+ secrets: inherit
+
+ upload-language-files:
+ name: Upload Language Files 🌐
+ if: github.repository_owner == 'obsproject' && github.ref_name == 'master'
+ runs-on: ubuntu-22.04
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: recursive
+ fetch-depth: 0
+
+ - name: Check Nightly Runs ☑️
+ id: nightly-checks
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ : Check Nightly Runs ☑️
+ if "${RUNNER_DEBUG}" ; then set -x; fi
+
+ last_nightly=$(gh run list --workflow scheduled.yaml --limit 2 --json headSha --jq '.1.headSha')
+
+ if "${GITHUB_SHA}" == "${last_nightly}" ; then
+ echo "passed=false" >> $GITHUB_OUTPUT
+ else
+ echo "passed=true" >> $GITHUB_OUTPUT
+ echo "lastNightly=${last_nightly}" >> $GITHUB_OUTPUT
+ fi
+
+ - name: Check for Changed Files ✅
+ uses: ./.github/actions/check-changes
+ id: checks
+ with:
+ baseRef: ${{ steps.nightly-checks.outputs.lastNightly }}
+ checkGlob: '**/en-US.ini'
+
+ - name: Upload US English Language Files 🇺🇸
+ if: fromJSON(steps.checks.outputs.hasChangedFiles) && fromJSON(steps.nightly-checks.outputs.passed)
+ uses: obsproject/obs-crowdin-sync/upload@30b5446e3b5eb19595aa68a81ddf896a857302cf
+ env:
+ CROWDIN_PAT: ${{ secrets.CROWDIN_SYNC_CROWDIN_PAT }}
+ GITHUB_EVENT_BEFORE: ${{ steps.nightly-checks.outputs.lastNightly }}
+
+ steam-upload:
+ name: Upload Steam Builds 🚂
+ needs: build-project
+ if: github.repository_owner == 'obsproject'
+ runs-on: macos-13
+ defaults:
+ run:
+ shell: zsh --no-rcs --errexit --pipefail {0}
+ steps:
+ - uses: actions/checkout@v3
+
+ - name: Check Nightly Runs ☑️
+ id: checks
+ env:
+ GH_TOKEN: ${{ github.token }}
+ run: |
+ : Check Nightly Runs ☑️
+ if (( ${+RUNNER_DEBUG} )) setopt XTRACE
+
+ local last_nightly=$(gh run list --workflow scheduled.yaml --limit 2 --json headSha --jq '.1.headSha')
+
+ if "${GITHUB_SHA}" == "${last_nightly}" {
+ print "passed=false" >> $GITHUB_OUTPUT
+ } else {
+ print "passed=true" >> $GITHUB_OUTPUT
+ }
+
+ - uses: ./.github/actions/steam-upload
+ if: fromJSON(steps.checks.outputs.passed)
+ with:
+ steamSecret: ${{ secrets.STEAM_SHARED_SECRET }}
+ steamUser: ${{ secrets.STEAM_USER }}
+ steamPassword: ${{ secrets.STEAM_PASSWORD }}
+ workflowSecret: ${{ secrets.GITHUB_TOKEN }}
+ preview: ${{ github.repository_owner != 'obsproject' }}

obs-studio-29.1.3.tar.xz/.gitignore -> obs-studio-30.0.2.tar.xz/.gitignore Changed

@@ -1,106 +1,49 @@
-#binaries
-*.exe
-*.dll
-*.dylib
-*.so
-*.plugin
-*.framework
-*.systemextension
-
-#cmake
-/build*/
-/release*/
-/debug*/
-.vs/
-*.o.d
-*.ninja
-.ninja*
-.dirstamp
-/cmake/.CMakeBuildNumber
-.deps
-
-#xcode
-*.xcodeproj/
-/xcodebuild/
-
-#clion
-.idea/
-cmake-build-debug/
-
-#other stuff (windows stuff, qt moc stuff, etc)
-Release_MD/
-Release/
-Debug/
-x64/
-ipch/
-GeneratedFiles/
-.moc/
-/UI/obs.rc
-.vscode/
-/CI/include/*.lock.json
-install_temp/
-
-/other/
-
-#make stuff
-configure
-depcomp
-install-sh
-Makefile.in
-Makefile
-
-#python
-__pycache__
-
-#sphinx
+# Exclude everything
+/*
+
+# Except for default project files
+!/.github
+!/build-aux
+!/cmake
+!/deps
+!/docs
+!/libobs*
+!/plugins
+!/tests
+!/UI
+!.cirrus.xml
+!.clang-format
+!.cmake-format.json
+!.editorconfig
+!.git-blame-ignore-devs
+!.gitmodules
+!.gitignore
+!.mailmap
+!.swift-format
+!AUTHORS
+!buildspec.json
+!CMakeLists.txt
+!CMakePresets.json
+!COC.rst
+!COMMITMENT
+!CONTRIBUTING.rst
+!COPYING
+!INSTALL
+!README.rst
+
+# Exclude lock files
+*.lock.json
+
+# Exclude files generated by Sphinx in-tree
 /docs/sphinx/_build/*
 !/docs/sphinx/_build/.gitignore
 !/docs/sphinx/Makefile
 
-#random useless file stuff
-*.dmg
-*.app
-.directory
-.hg
-.depend
-tags
-*.trace
-*.vsp
-*.psess
-*.swp
-*.dat
-*.clbin
-*.log
-*.tlog
-*.sdf
-*.opensdf
-*.xml
-*.ipch
-*.css
-*.xslt
-*.aps
-*.suo
-*.ncb
-*.user
-*.lo
-*.ilk
-*.la
-*.o
-*.obj
-*.pdb
-*.res
-*.dep
-*.zip
-*.lnk
-*.chm
-*~
+# Exclude modified Flatpak files
+build-aux/flatpak-github-action-modified-*
+
+# Exclude macOS legacy resource forks
 .DS_Store
-*/.DS_Store
-*/**/.DS_Store
 
-#flatpak
-/.flatpak-builder/
-/_flatpak_build/
-/flatpak_app/
-/repo/
-/CI/flatpak/flatpak-github-action-modified-*
+# Exclude CMake build number cache
+/cmake/.CMakeBuildNumber

obs-studio-29.1.3.tar.xz/.gitmodules -> obs-studio-30.0.2.tar.xz/.gitmodules Changed

obs-studio-29.1.3.tar.xz/.mailmap -> obs-studio-30.0.2.tar.xz/.mailmap Changed

obs-studio-29.1.3.tar.xz/AUTHORS -> obs-studio-30.0.2.tar.xz/AUTHORS Changed

@@ -1,47 +1,50 @@
-Original Author: Hugh Bailey ("Jim")
+Original Author: Lain Bailey
 
 Contributors are sorted by their amount of commits / translated words.
 
 Contributors:
- Jim
+ Lain
  jpark37
- Palana
  R1CH
+ Palana
  cg2121
- WizardCM
  PatTheMav
  Sebastian Beckmann
+ derrod
  Ryan Foster
+ WizardCM
  tytan652
+ Norihiro Kamae
  fryshorts
- derrod
  DDRBoxman
  Georges Basile Stavracas Neto
- Gol-D-Ace
- Rodney
  Kurt Kartaltepe
+ Rodney
+ Gol-D-Ace
  pkv
  BtbN
- Norihiro Kamae
  Shaolin
- kc5nra
  tt2468
- Michael Fabian 'Xaymar' Dirks
+ kc5nra
  Exeldro
+ Michael Fabian 'Xaymar' Dirks
  VodBox
  Zachary Lund
  Warchamp7
  SuslikV
  Paul Hindt
+ Vainock
  Reboot
+ CodeYan01
  Martell Malone
- Vainock
  Ford Smith
+ columbarius
  dodgepong
- HomeWorld
+ 田七不甜
  Ed Maste
+ HomeWorld
  Joel Bethke
- columbarius
+ Penwywern
  Alex Anderson
  SCG82
  brittneysclark
@@ -49,32 +52,34 @@
  Tommy Vercetti
  Roman Huts
  shiina424
+ Yuriy Chumak
  juvester
  mvji
- Yuriy Chumak
  wangshaohui
- CodeYan01
+ Gale
+ Service Checker
  JohannMG
  craftwar
  sorayuki
  Dead133
+ Jimi Huotari
  Maya Venkatraman
  Eric Lindvall
- Jimi Huotari
+ Florian Zwoch
  Radzaquiel
  Scratch
  Socapex
  mntone
+ tududweb
  Cephas Reis
  Fabian Mastenbroek
  Hector Martin
+ Igor Bochkariov
  Luke Yelavich
  Chris
  Developer-Ecosystem-Engineering
  Stéphane Lepin
- tududweb
  Chip Bradford
- Florian Zwoch
  Ilya Melamed
  Marvin Scholz
  Rat
@@ -82,14 +87,15 @@
  Arkkis
  GoaLitiuM
  Hunter L. Allen
- Igor Bochkariov
  Jan Beich
  Ka Ho Ng
  Manuel Kroeber
  Michel
  Quinn Damerell
+ Ruwen Hahn
  Theodore Dubois
  bin
+ jcm
  Anthony Torres
  Anton Bershanskiy
  Barnabás Pőcze
@@ -101,35 +107,43 @@
  Kris Moore
  Mike
  Palakis
- Service Checker
+ Sean DuBois
  Tristan Matthews
  Alexandre Vicenzi
  Carl Fürstenberg
+ Chris (Flaeri)
+ James Hurley
+ John Bradley
+ Jonathan Bennett
  Kilian von Pflugk
+ Neal Gompa
  SoftArch
  Timo Gurr
  Tjienta Vara
  Wahaj Dar
+ prgmitchell
  Aaron Boxer
  Anry
  Bilal Elmoussaoui
- Chris (Flaeri)
  CoDEmanX
  Cody Jung
  David Bieber
+ David Rosca
  Hosein
+ Huts, Roman
  Ioan Loosley
  Ján Mlynek
  MaZderMind
  OldBaldGeek
  Stefan Hoffmeister
+ Stephen Seo
  WarmUpTill
+ Zhao Zhili
  bl
  makise-homura
  nleseul
  obiwac
  univrsal
- 田七不甜
  Alexander Popov
  Artem Polishchuk
  Benjamin Klettbach
@@ -137,10 +151,11 @@
  Bl00drav3n
  Blackhive
  Charles Ray Shisler III
+ Chensiyy
  Daniel Lopez
  David Cooper
  Dossy Shiobara
- Gale
+ Friedhelm Birth
  Grant Likely
  Hernán
  Jeremiah Senkpiel
@@ -151,6 +166,7 @@
  Lin
  Matthew Glazar
  Matthew Orlando
+ Mattias Landin
  Michael R. Crusoe
  Monsteer
  Peter Geis
@@ -160,6 +176,7 @@
  Serge Paquet
  Tatsuyuki Ishi
  Valentin
+ Yoshimasa Niwa
  karenkim-AfreecaTV
  kevin.dww
  paibox
@@ -179,6 +196,7 @@
  AuroraWright
  Azat Khasanshin
  Be1erafon
+ Benjamin Schubert
  Bongalive
  Brian S. Stephan
  Chaturbate
@@ -193,8 +211,8 @@
  Grzegorz Godlewski
  Hans Petter Selasky
  Henrik "Henke37" Andersson
+ Ilya Chernikov
  John Boiles
- John Bradley
  Joshua Rowe
  Julian Orth
  Justin Bull
@@ -202,23 +220,29 @@
  Jérémy Farnaud
  Kevin Degeling
  Kristian Ollikainen
+ Lev Leontev
  Lexsus
  Lionheart Zhang
  Lordmau5
  Lucian Poston
+ Luke Strickland
  Mat Clayton
  Mathijs Kadijk
  Matt Morrissette
  Matthew
  Matthew McNamara
- Mattias Landin
  MedicMomcilo
  Michael Goulet
  Nirusu
  Olle Kelderman
  Piotr Esden-Tempski
+ Sergo
+ Seth Williams
  Skid-Inc
+ Sludge
+ Staacks
  Stéphane Cottin
+ TDV Alinsa
  Take Vos
  Taylor Blau
  Thomas Schnitzler
@@ -228,8 +252,9 @@
  Vadim Zhukov
  Warren Turkal
  Willy Liu(HQ ENG)
- Zhao Zhili
+ Zulleyy3 Zulleyy3
  adray
+ aggresss
  akapar
  astudios123
  boombatower
@@ -245,6 +270,8 @@
  jw0z96
  liu.haibin
  notmark
+ nquah
+ rhutsAMD
  shinji3
  skwerlman
  stopforumspam
@@ -272,6 +299,7 @@
  Alexandre Paré
  Alexis King
  Ali Kaviani
+ Amin Mahmoudi
  Amin Shayan
  Anastasiia Sidorovskaia
  Andrew
@@ -298,7 +326,6 @@
  Ben Bowler
  Ben Krueger
  Ben Stahl
- Benjamin Schubert
  Bernd Buschinski
  Biswapriyo Nath
  Bob van de Vijver
@@ -311,17 +338,19 @@
  CallumHoward
  Cam
  Can Bal
+ Carl Pédimina
  Carlo Castoldi
  CarrotCodes
  Cenk Uluisik
+ Chase Adams
  Cheeseness
- Chensiyy
  Christian Lockley
  Christopher P. Yarger
  Christopher Serr
  Claude Heiland-Allen
  Clemens Meinhart
  Cole
+ Colerar
  CommanderRoot
  Copy Liu
  Cray Elliott
@@ -342,6 +371,7 @@
  Dmitry Odintsov
  Dmitry Vovk
  Doug Ty
+ E Jikan
  Ed Ropple
  Ek Palmer
  Emil Sayahi
@@ -353,7 +383,6 @@
  Frank
  Frank Gehann
  Frank Löffler
- Friedhelm Birth
  Garrett
  GingerAudio
  Giorgio Pellero
@@ -367,12 +396,13 @@
  Hayden McAfee
  Hicham LEMGHARI
  Iblis Lin
+ Ihor Kalnytskyi
  Ivan Efremov
  J Lynn
  J.D. Purcell
+ Jack Karamanian
  Jake Probst
  James Beddek
- James Hurley
  Jamy Timmermans
  Jason Francis
  Jeff Ward
@@ -386,7 +416,6 @@
  Jon Topper
  Jonathan
  Jonathan Baecker
- Jonathan Bennett
  Joshua Ashton
  Joshua Berenhaus
  Julian Miller
@@ -400,9 +429,11 @@
  Kevin Deng
  Kevin Ross
  Kevin Tardif
+ Kevin Wang
  Keylase
  Kraz3D
  Lasse Dalegaard
+ Laurin Müller
  LiamCoal
  Linnun
  Lioncash
@@ -410,7 +441,6 @@
  Lqlsoftware
  Lukas Monka
  Luke Granger-Brown
- Luke Strickland
  Lukáš Cezner
  Lukáš Mojžíš
  MagicBear
@@ -420,6 +450,7 @@
  Mark Sergienko
  Masato Takahashi
  Mathias Panzenböck
+ Matt
  Matthew Szatmary
  Matthieu Cunzi
  Meng Li
@@ -433,15 +464,16 @@
  Morten Bøgeskov
  Murnux
  Nathan-Huckleberry
- Neal Gompa
  Nick Stockton
  Nicolas F
  Nicolas Fella
  Night
+ Nikola Jovic
  Oliver Lietz
  Olivier Humbert
  OvchinnikovDmitrii
  Patrick Ancillotti
+ Paul Gregoire
  Paul Mc Galey
  Per Heed
  Peter "Marenthyu" Fredebold
@@ -474,11 +506,13 @@
  Shlee
  Simon
  Simon Rost
+ Smartkin
  Sophie Hamilton
  Stanislav Izotov
  Stefan Murawski
  Steve Wills
  Stripchat
+ Susko3
  Teemu Kauhanen
  Terje Gundersen
  Thomas Crider
@@ -499,6 +533,7 @@
  Weikardzaena
  Will Jamieson
  William Casarin
+ Wooster
  Wouter
  Ying Yin
  Younes SERRAJ
@@ -508,6 +543,7 @@
  a1346054
  adocilesloth
  antho
+ artemmdev
  bluekirby0
  bth
  chaselliu
@@ -518,6 +554,7 @@
  crazyheart
  cryptonaut
  davids
+ deadmeu
  dennis
  dwot
  eastkiki
@@ -540,9 +577,11 @@
  jasonlee
  jbpratt78
  jeremiah
+ joelgerard
  ka’imi
  kiwialec
  kokole
+ kyle
  lemmi
  lorskun
  lucha
@@ -555,7 +594,6 @@
  nd
  nico
  nkmerrill
- nquah
  pantonvich
  partouf
  pedanticdan
@@ -605,36 +643,48 @@
  练亮斌
  
 Translators:
+ Afrikaans:
+  Gideon Wentink (gjwentink)
+  Rory Townsend (f3emarketing)
+  Samuel Nthoroane (Samuel_Nthoroane)
+  speedytechdev
+  sadam2002 sadam4 (sadam2002sadam4)
+  Vainock
  Albanian:
   Aredio Vani (aredio.vani)
   Albin Pllana (albinnpllanaa)
   Enea (eneaaene1)
   Begi Ganellari (begiganellari1997)
   avnidj
+  Sigurður óskarsson (sig.oskarsson)
   Baker123
   unknowndomain
   Vainock
+  casttor
  Arabic:
   Tareq Almutairi (Tareq_s)
   ZILZAL
-  Abdullah AL-Qahtani (Za7ef_SA)
   ‫علي السادة (‪games power‬‏)‬‎ (alidsds11)
+  Abdullah AL-Qahtani (Za7ef_SA)
   majdcomp
   Rami Kattan (rkattan)
   Fady Adal (fadyadal)
+  sxm1
   Wydady (Wyd1)
+  yngams (younessmouhid)
   aaakjt
+  lazerns
+  Vainock
   doyTech (aldoyh)
   waleedmortaja
-  yngams (younessmouhid)
   AiAF (7MR)
   ibrahim Younis (gr33v)
   omar al_hasasneh (omar.alhasasneh)
+  Mustafa A. Al-syady (mostafa307)
   E3saR (e3sa_r)
   معتصم دعنا (rozana-media)
   fawaz006
   Mohamed Zain (Thecheeseman)
-  Vainock
   Fahim Sabah (Road_ar)
   Abdulaziz (CleverShadow)
   Gol D. Ace (goldace)
@@ -645,12 +695,13 @@
   Tensai
   Mustafa2018
   FiberAhmed
-  Ndalabo Taema (hake_bsowq)
   VainockManager
+  Ndalabo Taema (hake_bsowq)
   MesterPerfect
   Fahad Alshaya (fashaya)
   azez sh (azezsh)
   AL-3boud_25 (alaboud257)
+  Chipsum
   Hani Sweileh (hno.sweileh)
   Nasser Bin Laboun (nasserbinlaboun)
   M24 AL-Zurqan (mohammedamer2443)
@@ -683,8 +734,10 @@
   ՀայՏղաՀՏ (Zoro02)
   HayTxa02
   Hrach Mkrtchyan (hrachmk)
+  Gevorg Tsaturyan (Geworg)
   test123456ob
   nkamae
+  Sergey Simonyan (we1nmann)
   VainockManager
   Tigran's Tips (tigrank08)
   Vainock
@@ -693,6 +746,7 @@
   ShahinF27 (Khan27)
   Mirsahin Mirserifov (mirsahin.mirsarifov)
   Sədi Məmmədov (sedi9816)
+  royal_reyx
   Şamil Veliyev (TheShamil035)
   Javid-An
   unknowndomain
@@ -729,11 +783,15 @@
  Belarusian:
   ymcei
   Kriper1111
+  Аляксандр (parhomenka)
+  Kapatych (kapatych)
   Dzmitry Zubialevich (dzmitry.zubialevich)
   CelluloseNF
   Aliaksandr Kliujeu (PlagaMedicum)
   Ljaukouski Uladzislau (NonNegative)
+  ToffeeMutant
   Георгій Пугачоў (Heorhi_Puhachou)
+  yungvoix
   VainockManager
  Bemba:
   P White (phiaramulima)
@@ -746,6 +804,7 @@
   C559 Raiyan :D (purebangali)
   Rudro Rasel (rdrrsl)
   Morshedul Alam (morshedintouch)
+  Hajaj
   Oymate
   Nurul Huda (nurulhuda859)
   Gol D. Ace (goldace)
@@ -760,6 +819,8 @@
   kalmarin
   Seyhan Halil (easythe)
   BeCaReFuL24
+  Krasimir Dankov (krasidankov)
+  TraoX_ (Macroguy)
   capitalrhino
   g-k-m
   DivideByNone
@@ -769,7 +830,7 @@
   Viktor Kitov (viktorkitov)
   djradimix
   Stoyan Stoyanov (sstoyanov)
-  Maxim Germanov (Macroguy)
+  Alex Hristov (jokerabg2)
   Stanislav_Evtimov
   Deivid Ivanov (GODMANEX)
   Akjo (Akjo03)
@@ -787,15 +848,17 @@
   Aniol Pagès (aniolpages)
   Aleix Vidal i Gaya (leixet)
   Vainock
+  Xavier Muntada Samà (XavierMSama)
   Lluís R (LluisR98)
   Gol D. Ace (goldace)
   jan (test83318)
   vilagamer999
+  Vicenç Sallés (vicesalles)
   Adolfo Jayme (fitojb)
-  Xavier Muntada Samà (XavierMSama)
   ROkelbow
   Pere O. (gotrunks)
   unknowndomain
+  user (user1cat)
  Chinese Simplified:
   Bob Liu (Akagi201)
   fangzheng
@@ -806,44 +869,56 @@
   Origami
   Hexcolyte
   AthlonHD
+  Ka (Itukii)
+  苏波马六 (Andypsl8)
   Rortenfeat
   Gol D. Ace (goldace)
+  Lion Yang (lionium)
+  田七不甜 (TianQiBuTian)
   Licardo
   PabloLiu (719018105)
   BrianCheng
-  Lion Yang (lionium)
+  Unili
   853
+  CoolKid (conannan)
   Sasasu
+  Misha (Mishasama)
   SpeedyOrc340069
   王秉德 (LUMOGROUP)
   Vainock
   David Kuo (s50407s)
-  Misha (Mishasama)
   鲜童 (xiananjyzy)
   Rudro Rasel (rdrrsl)
   KyleBing
+  十月 (10jugatsu)
   cai_miao
   Opportunity (OpportunityLiu)
   lm902
   MarsYoung
   Inku Xuan (inkuxuan)
+  一叶杳舟 (Yao_Zhou)
+  Michaelwu (michaelwucoc)
   Yi-Jyun Pan (pan93412)
   yunluzhang
-  Sora (candysweetplayzmc)
+  慕茶Mucha (candysweetplayzmc)
   copyliu
   Boyuan Yang (073plan)
+  CharlieTheCat
+  Flysoft
   神枪968 (GodGun968)
   崔致埔 (ACGPlanck)
+  wuliao-
   Richard Stanway (r1ch)
   Gō̤ Brian Dìng (brightlikesun)
   希铁石z (XiTieShiZ)
   自满 (ziman_)
   Sea Stone (BiliSeaStone)
+  nkh0472
+  VainockManager
+  Ang_Nicholas_Zhao
   Bing Feng (fengbing123)
-  wuliao-
   David Hwang (davidxuang)
   jyc001
-  CharlieTheCat
   for_the_zero
   科技小白堂 (lipeng0820)
   WeiYuanStudio
@@ -863,6 +938,8 @@
   Bob Wei (BobWaver)
   Haoran Du (bingchuanjuzi)
   lifeeeeeeeeeeE
+  AperturePenguin
+  Chen99
   Gentry Deng (wordlesswind)
   FaZe Fakay (fazefakay)
   xtexChooser
@@ -877,29 +954,30 @@
   Michael Yeh (hinet60613)
   Julian_Lai
   dodgepong
+  abc0922001
   myjourney in Steemit (myjourney)
   Yu-Juei Tseng (e222et)
-  Kanbi Dungaitj (open3)
+  Kanbi Dungaitj (openuko)
   David Kuo (s50407s)
   loulou921222
+  十月 (10jugatsu)
   Gol D. Ace (goldace)
   Vainock
   craftwar
   Thomas (thomassth)
   Jcys
   菘菘 (SiongSng)
+  Rice Hung (ricehung29)
   xixiaofan (XXXF)
   吳軒竹 (ggjason.tw)
   Watson Tsai (ashaneba)
   Han-Jen Cheng (notexist)
   Inndy.Lin (inndy)
-  Zhang Maiyun (myzhang1029)
   offthegrid-mike
   Edison Lee (edisonlee55)
   khng300
   Meng Hao Li (GazCore)
   ak-47root
-  abc0922001
   Append Huang (append)
   X-RAY team film (961111ray)
   fangzheng
@@ -913,26 +991,29 @@
   Jimmy Huang (f56112000)
   曹恩逢 (5idereal)
   FaZe Fakay (fazefakay)
+  Starry Tacos (starrytacos)
   chaironeko
   tomoe-musashi
   weixiang0815
  Croatian:
   medicmomcilo
+  Ivan Horak (MarvinDarwin)
   milotype
   srdjan_m
-  Ivan Horak (MarvinDarwin)
   MARINOMARINO
   Adrian S (wuku0)
   Fran Kelava (fkelava)
   schwabengeiz
   Runicar (dajtisina)
+  Filip Grubeša (filipgrubi)
+  damba_
   penta (junp5i)
   OfficialwobY
   Gol D. Ace (goldace)
-  damba_
   Maky (the.real.maky)
   Vainock
   Flicker (galaxybro2411)
+  VainockManager
   tvoja_stara
   unknowndomain
   CroatianTranslator
@@ -949,13 +1030,14 @@
   Martin H. (mhanak)
   Stewio MC (stepandolsky)
   Gol D. Ace (goldace)
-  Matěj David Ondráček (setam7)
-  JIMMY (vopasek)
+  Setam7 (setam7)
   Kiznoh
   MrJaroslavik
   Sawanyo
   Soviet Bear (cheatercz123)
-  TheWolfiKK
+  MartinRatvaj
+  VainockManager
+  Lukáš D. (Asherro)
   Marilok (Marilokms)
   Bazer47
   Alex Smotra (smotraalex75)
@@ -1002,6 +1084,7 @@
   Nicole (Dutchess_Nicole)
   theking2
   robbert0891 (robbertoorschot38)
+  Jay P. (JayPaans)
   Kjetil Verstrepen (kjetilv)
   Gol D. Ace (goldace)
   silverstorm993
@@ -1021,6 +1104,7 @@
   F_Producktions
   Thom Knepper (MrKnepp)
   Dobby-progam
+  VainockManager
   lokerhp
   Jasper (DJj123dj)
   Lesley Natrop (lesleynatrop)
@@ -1031,7 +1115,6 @@
   JorRy
   Julian Meijboom (julianmeijboom)
   RyyzQ
-  Jori van Ee (jorivanee)
   Mees (MeesJ)
   Roeland Kussé (roeland)
  English, United Kingdom:
@@ -1045,6 +1128,9 @@
   Cristhofer Sanchez Solano (JafetSS)
   Endo (Balisong)
   Pete Russell (pete.russell)
+  George Prime (Diacius)
+  beq (sorenxysm)
+  Alex (ALEXWARELLC)
   Amy (amyipdev)
   Joel Jose (joeljose350)
   Noah Husby (noahhusby)
@@ -1056,8 +1142,10 @@
   Endysis
   GarbageAtSB
   Roofers
+  Benjamin Otto (Cubebanyasz)
   Roktim Ibne Hasan (roktimih)
   tossing
+  Karthik Balaji (karthikbalaji174)
  Esperanto:
   Matt Aaldenberg (MattAalden)
   Mesu Devastator (Mesu_Devastator)
@@ -1068,6 +1156,7 @@
   Infinity ArcAngel (SirColdcrown)
   David M. (Syndyo)
   Vainock
+  TNT The Noob (tntthenoob)
  Estonian:
   Mr Wildlore (wildlore)
   MartinEwing
@@ -1075,9 +1164,9 @@
   treierxyz
   AndresTraks
   Agu Ratas (aguratas)
+  Ben Towali (BenTowali)
   jmcrwd
   Mikk T (Mikkt86)
-  Ben Towali (BenTowali)
   Dex (deloxs)
   C3kos (C3kos1)
   Bentologi
@@ -1087,33 +1176,33 @@
   Vainock
   Mardo M (stemugram)
  Filipino:
-  Francis Euclid Fernandez (fernandezfrancis428)
+  Francis Euclid Fernandez (fernandezfrancisE)
   dwaeji-aizelle
   nyakayed
   Napstaguy04
   CodeYan01
   Loyd Stephen Jayme (loydjayme25)
   jermel
-  Raffy (Tested)
+  Raffy (Dharma_Buddha)
   Gol D. Ace (goldace)
   Vainock
   Iver (IverCoder)
   nkamae
-  arnoldsecret
   VainockManager
+  arnoldsecret
   Hagen Peter Marquez (HAJDog247)
   Tros Mercado (User451)
-  Footmark
   Raylir
+  oxygren
   unknowndomain
   atomicfart2009
   Jake Llabres Rabelas (rabelasj)
  Finnish:
   Arkkis (j)
-  supersingularisogeny
   Kimmo Kujansuu (mrkujansuu)
-  Jarska
+  supersingularisogeny
   Jiri Grönroos (spammemoreplease)
+  Jarska
   Ricky Tigg (ricky.tigg)
   dodgepong
   Tero Keso (tero.keso)
@@ -1128,6 +1217,8 @@
   Obama (Obama44)
   YummyTomatoes
   K0p1m1
+  Mika (Mipsu)
+  CaldronKDVR
   banbaf (3peruna)
   MCPE-1
   unknowndomain
@@ -1140,6 +1231,7 @@
   Arttu Ylhävuori (arttu.ylhavuori)
   Jaakko Saarikko (styxnix)
   Seqv
+  Jere8091
   chaironeko
   fa booh (boohfa09)
  French:
@@ -1148,8 +1240,8 @@
   Stéphane Lepin (Palakis)
   ArsTechnis
   Tocram2 (tocram2)
+  Skallr
   Benjamin Cambour (lesinfox)
-  Skallr2 (Skallr)
   Yberion
   Léo (leeo97one)
   RisedSky
@@ -1160,6 +1252,8 @@
   MrAngelos6
   EN LYOWH (enlyowh)
   DarckCrystale
+  EGuillemot
+  Lucatacos
   Ben Turner (ben-turner)
   MaxALEau
   Vainock
@@ -1169,18 +1263,19 @@
   Gol D. Ace (goldace)
   Figurant16
   Youtubeur FR│Giaco35 (Giaco35)
-  Lucatacos
-  steve_fr
   Wiwok
+  steve_fr
   Valentin (valentin45)
+  Kévin (FleuryK)
+  LEMIBANDDEXARI
   kyllian (tardigradeus)
   Nicolas Leperlier (leperlier)
-  LEMIBANDDEXARI
   Hugo Varlet (Huvar)
   Deski_
   QD59
   GANGAT Naeem (zboggum)
-  Julien R. (TurTiMo)
+  Julien R. (L1nju)
+  Thomas BLANC (thb5309)
   Aime23
   Grisou2907
   BaguetteDePain_
@@ -1190,6 +1285,7 @@
   Jérémy LITIQUE (JeremyLTE)
   christophe (TedM)
   Wydady (Wyd1)
+  ImDaBigBoss
   illusdidi
   Mathieu Hautebas (matteyeux)
   🌠 DarK | #Hello 🌠 (DarKTV_FR)
@@ -1200,32 +1296,36 @@
   tburette
   Richard Stanway (r1ch)
   Adrien “GameZone Tv” de Decker (redcraft007)
+  Remy Geko (Geko_Officiel)
   Evan Kummel (EvanK)
   ButterflyOfFire (BoFFire)
   Aryoll (Naomi_CAST)
   Zalki
   SkytAsul (skytasul)
-  Alex Smotra (smotraalex75)
   xav blacyre (xav35000)
+  Alex Smotra (smotraalex75)
   VainockManager
   Alexis Brandner (Alexinfos)
   Romain Gille (romgille)
   Camille Nury (kamsdu30)
+  neesn
   dodgepong
+  BOSSFOX ! (BOSSFOX)
   Jean-Mathieu Jm Samson (sjm450666)
   Lexane Sirac (Exilexi)
   Wizi_89
   Thomas Fournier (GoudronViande24)
-  Thomas BLANC (thb5309)
   Arzugar
   Dredd47
   Benoit (BPTdev)
   jérémie gagnant (jeremiegremaud2003)
+  HumainAbsurde (humain)
   Albakham (albakham)
   HistoriCode97
   Mathieu Goossens (matgoossens)
   Clem Gaming (clmntfeugere)
   Saimyx
+  Paul (i8008) (i8008)
   SkylixX
   Warchamp7
   Nicolas Richard (YoungFrog)
@@ -1236,6 +1336,7 @@
   mbouzada
   Xesús M. Mosquera Carregal (xesusmosquera)
   Máximo A. Coejo (mcoejo)
+  Fran Diéguez (frandieguez)
   Vainock
   Fer (1fbr)
   Alex Smotra (smotraalex75)
@@ -1250,37 +1351,40 @@
   Vainock
   Razmik Badalyan (badalyanrazmik)
   Gol D. Ace (goldace)
+  SimModer
   Temuri Doghonadze (temuri.doghonadze)
   unknowndomain
  German:
   Vainock
   Gol D. Ace (goldace)
   Michael Fabian Dirks (Xaymar)
+  Letoonik
   Sven Kirschbaum (fallobst22) (fallobst22)
   Dennis Giebert (Isegrim) (isegrimderwolf)
+  Tillikum Soyer (Tillikum)
   Gregor Bigalke (gregtcltk)
   dodgepong
-  Tillikum Soyer (Tillikum)
-  Letoonik
   Manuel (ElectronicWar)
-  Tim (robske_110) (robske110)
   gxalpha
+  Tim (robske_110) (robske110)
   Marvin J. (juettemarvin)
   Rodney (derrod)
   lebaston100
   mdod
   Benjamin Klettbach (benklett)
   cryxgio
+  VainockManager
   Jonas Otto (jottosmail)
+  EinfachMerlin
   Jeremy Jürgens (Jeremy3463)
   Holger Sinn (Holger-Sinn)
   WurstOnAir
   yojixe
+  Der Ston (derston)
   Splinter Cel (4eloweck)
   Max Schulz (maxsschulz)
   The_Legend_of_xD
   DonutCrab
-  VainockManager
   AbsolutLeon
   Luchx
   MatsMTN
@@ -1288,10 +1392,12 @@
   kinsej
   Palana
   deexbeam
+  Bumpsy
   Jonathan (greenbigfrog)
   Achampnator
-  WrapOwl
+  Geisteskranker
   Enderdrache LP (enderdrachelp)
+  David (Tulpedublone)
   J T (JT4)
   Prince_of_Raop
   SlimPlay
@@ -1305,6 +1411,7 @@
   Finn Hoffhenke (Finnlife)
   Adrian S (wuku0)
   Holger Hupfer (2holgerhupfer)
+  Noah Alexander (noahalexanderhb)
   AndreLeonardo (andreleonardoyt)
   Lord Aidan (BadSideofBright)
   BoJustus
@@ -1316,6 +1423,7 @@
   swatzniker (dimitrisrtg324)
   Katerina (katerinaramm)
   Scourgemcdak
+  jimkats
   Mepharees
   Iwannhs Kokkinhs (pigot12)
   TheMetalHelper
@@ -1326,14 +1434,16 @@
   George T. (tzikas97)
   Nikolaos Peltekis (nikpelgr)
   opensavk
+  NickMihal
   dimitris45
   Greek Transliterator (greektransliterator)
   Vainock
+  Enes (Edinbo)
   Qufy
   ROkelbow
   kioydio
   Jim Spentzos (dspentzos)
-  Alex Kalles (leskal)
+  leskal
   Ανδρέας Γεωργόπουλος (andrewgeo)
   Kostas F (Kostas-F)
   Warmaster
@@ -1350,9 +1460,9 @@
   chaironeko
   Dumb Thoughts (DumbThoughts)
  Hebrew:
+  Yaron Shahrabani (YaronSh)
   djsavta
   amirsher
-  Yaron Shahrabani (YaronSh)
   lonelywolf11
   David Furman (thefourCraft)
   idanbo27
@@ -1371,6 +1481,7 @@
   Yoel (ye8323)
   epic_ziver_D
   Netro (roi_adler)
+  VainockManager
   Hilla Glebotzki (Hilla123)
   David Zabrovsky (david.zabrovsky)
   Aguy33
@@ -1392,12 +1503,14 @@
   Rahul Dhangar (rahuldhangar)
   SneakyFish5
   shamuntohamd
+  VainockManager
   Vainock
   Devendra Poonia (programerd)
   Sid-Shanker
   ROkelbow
   unknowndomain
   Arnav Kumar (arnavkumar)
+  Saket Anand (saketanandjha)
  Hungarian:
   Gige
   Balázs Meskó (mesko.balazs)
@@ -1410,18 +1523,24 @@
   Daniii_
   Isti (eisti)
   ROkelbow
+  Attila Németh (nmthatti)
   TOM005
+  Schweiszgut Márk József (mynter)
   Adam Liszkai (adamos42)
   henn89
   Tóth Ádám (totemadam)
   IrepY
+  VainockManager
   vargag159
   Biró Bence (birobence19)
   Levente Parádi (Techno.HaX)
   unknowndomain
   abydosan (abydoshun)
   Skelly001
+  Benjamin Otto (Cubebanyasz)
   dodgepong
+ Icelandic:
+  Sigurður óskarsson (sig.oskarsson)
  Indonesian:
   Anbiya Shafaat (Anfia)
   M Akmal (akmalcakep59)
@@ -1437,6 +1556,8 @@
   dnpxs (Dnoxs)
   Deraidos
   Asahi itoza (azza_su)
+  VainockManager
+  Irgi Fachrezi (IrgiFachrezi)
   Jovan Ferryal E. F. (Jovanzers)
   doplank
   unknowndomain
@@ -1462,8 +1583,8 @@
   Marco Ciampa (ciampix)
   Alessandro Sarto (alesarto03)
   Tommaso Cammelli (tomganguz) (tomganguz)
-  Vainock
   VainockManager
+  Vainock
   Christian Mazzola (Alphaaa)
   Martazza
   mauriziopersi
@@ -1488,6 +1609,7 @@
   Eugenio Tomasella (eugeniotomasella9)
   Alessio Ilardi (alantheandroid)
   SkyLion
+  Alfonso Scarpino (alfonso.scarpino)
   Cristian Alfano (CristianAUnisa)
   unknowndomain
   Benedetto Mazza (benedetto.mazza99)
@@ -1499,6 +1621,7 @@
   Flavio Rinaldi (flaviorinaldi)
   Rodney (derrod)
   Lorenzo Giannini (Loweredgames)
+  Augusto (augustomich)
   Alessandro Iepure (alessandro_iepure)
   Daniele02_777
  Japanese:
@@ -1516,14 +1639,17 @@
   Kanji1113 (kanji1113)
   nkamae
   Gol D. Ace (goldace)
-  ato lash (hal_shu_sato)
   宮脇丈治 (gogstudio)
+  VainockManager
+  ato lash (hal_shu_sato)
   unknowndomain
   依神紫苑 (MonogoiNoobs)
   神成フィルム (kami00nari)
   ? (a2y4)
   GO Channel (georgestv.0129)
   Bob Liu (Akagi201)
+  Tolr
+  chika takada (miyu1224)
   chaironeko
   Alex Shafer (enzanki-ars)
   Yuki Yu (Yukiyu)
@@ -1536,45 +1662,48 @@
   Slimane Selyan AMIRI (SelyanKab)
  Karakalpak:
   KarLin - Karakalpak Translators Team (alizhumagaliev)
-  Gulnaz (Abdijamilova_Gulnaz)
+  flower (flower_flower)
   Mukhit Nurmanov (nurmanov)
   Zhanserik
+  Джон Доу (izmarsa)
   Shingis Joldasbaev (joldasbaevkhan)
   Niyazbek Tolibaev (niyazbeksayipnazarovish)
-  Джон Доу (izmarsa)
+  andyme
  Korean:
   ynetwork
   영구땡 (wonkyupark)
-  Alex Lee (alex01763)
   그냥기여자 (justcontributor)
+  Alex Lee (alex01763)
   hibiya inemuri (hibiya)
   yeoneer
   AlexKoala (alexkoala)
-  임세훈 (shlim)
+  임세훈 (sh9351)
   vyteking
+  Hwanyong Lee (grbear)
   Vainock
   임시이름 (H_FeelsGood)
   PaperCore (pprfp)
   Gol D. Ace (goldace)
-  Hwanyong Lee (grbear)
   RedditRook
+  John Lee (john3374)
   hoehoetvhs
   이지완 (Jiwan)
   ppapman
-  John Lee (john3374)
+  _XD
   켈빈926 (hsjang2000)
   Kim (Fomalhaut0098)
   Jong Kwon Choi (dailypro)
   Ra.Workspace (RaWouk)
   ilsubyeega
   무아MUA (moajikyeongtv1048)
+  VainockManager
   rldbs3411
   DHtheCreator
   hykdem kim (hykdem)
   미르냥 (Mirnyang)
   Russell (crimeroyal)
   unknowndomain
-  최호빵 (SteamB) (steamb23)
+  SteamB23 (steamb23)
   뇽룡 (nyongryong)
   Charles Wallis (charlestw127)
   이승진 (smctgrass)
@@ -1602,18 +1731,22 @@
   oskars
   Andris Liepiņš (andrisliepins3)
   Arthur (ArthurLV)
+  Imants Vancāns (Imants565)
   Mops3005
   VainockManager
   Dejelnieks (dejelnieks212)
   Peridot Nation (PeridotNation)
+  Markuss Strods (Marcuss_5001)
  Lithuanian:
   Viljamas (Vegas1)
   Justas Vilimas (tyntas)
   xNaii (lyrikas5)
   Tool Way (toolwayrblx)
   TitasK (titukas1572)
+  Akela_LT
   Mariio_
   Rolic
+  Tboy Adey (ttlolsucs)
   Nikita Podvinskij (PODWINSKi)
   MuscileTurze
   justas beisinas (idkjhui)
@@ -1635,14 +1768,16 @@
   WeingHong
   Srap Dsign (srapdsign)
   ROkelbow
+  VainockManager
   Gol D. Ace (goldace)
   Vainock
-  VainockManager
+  Intannatassya
   unknowndomain
   dodgepong
  Mongolian:
   begjan
   Erhmee
+  Uilsbat Arslan (Velox729)
   Bilguun Ochirbat (BilguunOch)
   unknowndomain
   Vainock
@@ -1656,7 +1791,7 @@
   dodgepong
   LandyLERThERmfLOpi
   areedw
-  Tryvseu
+  Qrynill
   Hvidsten Media (HvidstenMedia)
   mgKaiztra
   Tommy (nwgat)
@@ -1679,10 +1814,10 @@
  Norwegian Nynorsk:
   Bjørn I. (bjorni)
   Imre Kristoffer Eilertsen (DandelionSprout)
-  Eiliv
+  Eiliv Ulvestad (Eiliv)
   morden
   LandyLERThERmfLOpi
-  Tryvseu
+  Qrynill
   unknowndomain
   Yngve Spjeld Landro (yslandro)
   VainockManager
@@ -1697,13 +1832,15 @@
   AmirGhorbani_ir
   ahangarha
   Pikhosh (pikhosh)
+  Peyman M. (peymanr34)
   Danial Behzadi (danialbehzadi)
-  peymanr34
   Vainock
   TiXO
   MohammadSaleh Kamyab (mskf1383)
   Mohammad jawad (mrahmani788)
+  Amin Mahmoudi (masterking32)
   Farshid Meidani (farshid_mi)
+  mahdi ram (mhadi-ram)
   VainockManager
   ROkelbow
   Gol D. Ace (goldace)
@@ -1712,12 +1849,12 @@
   TqkeL
   Hosein Hallavi (habibot81)
   MehdiAmirirad (Mehdiamirirad)
-  Berrely
   unknowndomain
   RytoEX
   Meysam Naghavi (MeysamNaghavi)
   lostman2000
   XubeIR
+  arashe_023 (arashe023)
   Amirhossein yousefi (amir.sara)
   Navid Sadeghieh (nsadeghieh)
   Erfaniom
@@ -1727,8 +1864,8 @@
   Vassamo (jotpl69)
   The Syntox (TheSyntox)
   kaktus (_kaktus_)
-  Michał Durak (micechal)
   mjluszko
+  Michał Durak (micechal)
   Damian Korcz (damikiller)
   Łukasz Wójcik (lwojcik)
   Vainock
@@ -1736,18 +1873,20 @@
   Daniel Wieczorek (Kennyluz)
   sebek1pan
   Mateusz (Silesianek)
+  Mateusz Starzak (MatiasPL)
   Gol D. Ace (goldace)
   VainockManager
-  Mateusz Starzak (MatiasPL)
   opl
   Popke
   Skajdrovski
   Michal (progamesmicrok)
   Patryk Radziszewski (Chefski)
+  Xslash
   unknowndomain
   RytoEX
   Piteriuz
   Hubert Degler (Hubertoos)
+  seba (xseba)
   adamek2314
   Super Polakowy (pawi.sun)
   OldShaterhan (tomek12-96)
@@ -1755,6 +1894,7 @@
   dodgepong
   Julia Drewniak (ewagsi)
   partypiotr
+  Maciej Ślusarz (tendan)
   Michał Lewczak (michal200507)
   Patryk Kunda (ner.i.ol)
   Nojterone
@@ -1770,19 +1910,20 @@
   Tomás Antunes (tomasantunes)
   Albakham (albakham)
   x1k1nh0
+  Rafael Peixoto (rapmje)
   dodgepong
   joaoboia
   alexandre433
   Vainock
+  Pedro Mendonça (pedromendonca)
   pedro.moreira.359 (pmmorsoft)
   Nuno Matos (NunoCMatos)
-  Pedro Mendonça (pedromendonca)
   Gol D. Ace (goldace)
   Gatinhos
   Christophe Carvalho Vilas-Boas (ChristopheCVB)
   vanscorp
   Gabriel Lima (gablm)
-  Diogo Soares (DabliwAga)
+  Diogo Soares (DiogoSoares)
   Pedro Ricardo (Pedro270707)
   kayal15948
   ROkelbow
@@ -1792,12 +1933,13 @@
   Tiago Mesquita (tiagomesquita)
   Diogo Ramos (dr03ramos)
   Hélder Ferreira (Mtx32)
+  Rafa.Godoy
  Portuguese, Brazilian:
   Shaolin (admshao)
   Diogo Ramos (dr03ramos)
-  Skellingtor
   Marcelo dos Santos Mafra (msmafra)
   Lincoln H. (LincolnH)
+  Skellingtor
   Ramon Mendes (rbrgameplays)
   Fabio Madia (Shaolin)
   igorruckert
@@ -1808,40 +1950,42 @@
   Eneias Polini (Eneias)
   TFSThiagoBR98
   Vainock
-  Krenack Greghi (krenack)
   Bruno Lopes Mattos Luiz (lopestranslate)
   CaioWzy
   mizifih
+  VALTER HITELMAN (vhitelman)
   Luiz Machado (qluizmachado)
   André Gama (ToeOficial)
-  VALTER HITELMAN (vhitelman)
   Avellar (BetaTester)
   Maison da Silva (maisondasilva)
   VergiI
+  Luciano Santos Gonçalves (luciano.ivec)
   ドージェ (Doges)
   clr0dr1g
   aalonsomb
   Gol D. Ace (goldace)
+  Gabriel Rodrigues (GBRodrigues)
   Suni (SuniModni)
   ROkelbow
   Murilo Ferrari (ferrarintc)
   Gabriel Thiago (gth1ago)
   morittan
+  BerGP (BerGP4504)
   LoboMetalurgico
   Leonardo Ostan (lostan)
   dav (Davizinhn)
   mathues
   judy manzaneda (judymanzaneda95)
   Eduardo Araujo (Finhawk)
+  VainockManager
   Matheus Fongaro (matheus.fongaro)
   Hustuha
   maribatis
   Eriberto Mota (eribertomota)
-  Diego Ramos (Dieguinho)
+  Dieguinho
   JNylson
   DanielTaqueto
   Alex Smotra (smotraalex75)
-  VainockManager
   lakitoo
   DJ Matheus Martins (DJMatheusMartins)
   Tetri Mesquita Neto (tetri)
@@ -1851,6 +1995,7 @@
   DevilLorde
   João (fror)
   unknowndomain
+  Gersonzao
   Ramon Gonzalez (ramon200000)
   Esdras Tarsis (esdrastarsis)
   Guilherme Cruz (gcrz)
@@ -1881,7 +2026,8 @@
   Andrei Ionescu (abcdedjdmddx)
   Voie Tudor (tudorvoie2008)
   BlakeNowah
-  Doru Stoica (dorusto)
+  Ant. Rares (Iepurooy)
+  Doru Stoica (Dorulian)
   Victor Paul (corvinpaul)
   Skellytone
   Mihai G (babasghenciu)
@@ -1891,7 +2037,6 @@
   nkamae
   Melonoone
   LupusMechanicus
-  Ant. Rares (Iepurooy)
   Andrii Popovych (Andrii-Popovich)
   Sw3aty1 Cristi (ca1510797)
   Diamyx
@@ -1903,6 +2048,7 @@
   Andrei Stepanov (adem4ik)
   Alek Nirov (dectanova)
   iltrof
+  Blueberry (Blueberryy)
   EDNVKjldr8vyu9
   ViktorOn
   Pavel (Shevalie)
@@ -1915,12 +2061,13 @@
   Vainock
   Fitik
   Gol D. Ace (goldace)
+  PanForPancakes
   Artem (Artem4ik)
-  GP (legionerri)
+  Gleb (Apeol4)
+  MishaRey (mishaareyy)
   Yaroslav (MrYadro)
   css
   Synbulat Biishev (Syjalo)
-  Temak
   fromgate
   Пахомов Александр (GXTrus)
   kirbyhi5
@@ -1934,7 +2081,6 @@
   Nemesis (Nemesis07)
   NEO FEED (srdsafdsfsdfsdfsdgdfh)
   Просто Взут (JustVzyt)
-  Blueberry (Blueberryy)
   Zonega
   bxkr
   Utoog (rivus)
@@ -1945,7 +2091,6 @@
   HSD Channel (kvdbve34)
   slicht
   Mr Misha (MrMisha)
-  MishaRey (mishaareyy)
   Nikita Epifanov (Nikets)
   Fik Dencer (4Soul)
   ExZo
@@ -1956,6 +2101,7 @@
   Mikhailus_
   Mikhail Paulyshka (Mixaill)
   Agehrg4
+  denfry
   Super 2004 (pe86ki)
   Иван Геймеров (hronos-2t)
   Дима Исаев (dima.isaev2005)
@@ -1983,6 +2129,8 @@
   Anatoly (Atsupak)
   MeDustyy
   Nezila Nez (Nezila)
+  Башҡорт агенты (vint6908)
+  Timofey Sosnovsky (timofey.sosnovsky)
   Kcurett TM (thekcurett)
   Leika098
   Sigge Stjärnholm (Kladdy)
@@ -1991,7 +2139,6 @@
   Evgeny Bogdanov (vtrifonov548)
   TOWUK (towuk)
   mchg _ (mchg)
-  Башҡорт агенты (vint6908)
   SurPaul
   MUHADDIS MEDIA (muhaddismedia)
   Kirill Arkhipov (dokl957)
@@ -2002,6 +2149,7 @@
   Vainock
   Endo (Balisong)
   VainockManager
+  Alex Hall (Decidy)
   Alex Smotra (smotraalex75)
   unknowndomain
  Serbian (Cyrillic):
@@ -2034,7 +2182,7 @@
   Vainock
  Sinhala:
   නාමල් ජයසිංහ (nimnaya)
-  හෙළබස සමූහය (HelaBasa)
+  HelaBasa Group (HelaBasa)
   VainockManager
   rpu ysam (rpuyasi)
   Vainock
@@ -2045,8 +2193,9 @@
   Ján M (longmoped)
   Anton Lokaj (anlo)
   Vainock
+  Filip Hanes (filip.hanes)
   Vladimír Krajč (mkkyy)
-  TheWolfiKK
+  MartinRatvaj
   Gol D. Ace (goldace)
   Miroslav Machala (Miroslav_Machala)
   LoLLy Nka (lollynka279)
@@ -2070,6 +2219,7 @@
   unknowndomain
   dodgepong
   FixyFN (nikolaj.ceferin)
+  VainockManager
  Spanish:
   Monsteer
   Marcos Vidal Martinez (M4RK22)
@@ -2081,15 +2231,15 @@
   EG Gamer (eggamer131)
   Pilar G. (TheMadnessLady)
   MarioMey
+  Adolfo Jayme (fitojb)
   Gol D. Ace (goldace)
   Trimax
   Manuel Matías (manuel.matias)
   716gjesu
+  Alejandro Alzate Sanchez (alejandroalzate)
   Cristhofer Sanchez Solano (JafetSS)
-  Adolfo Jayme (fitojb)
   Lluís R (LluisR98)
   Vainock
-  Alejandro Alzate Sanchez (alejandroalzate)
   francisco Emanuel montero cordoba (monterofranciscoemanuel)
   Maximiliano Schtroumpftech Pena-Roig (som2tokmynam)
   fordink257
@@ -2099,6 +2249,7 @@
   eemiroj
   Hector meneses (hector.meneses)
   henrycontreras
+  saviour6699
   Skiddome (sergiomalagonmartin)
   Marcos Vidal (markitos.maki22)
   Ruben Deig Ramos (rdeigramos)
@@ -2110,6 +2261,7 @@
   jan (test83318)
   David Sonico (davidsubsonico)
   Jokeestd
+  Sr_V
   Eleazar (MtrElee3)
   AndMe (accomigt)
   GNosii (ElNosii)
@@ -2127,6 +2279,7 @@
   Micaela Rivero Aguirre (riveromikaela15)
   Amy (amyipdev)
   neuzeh
+  Joshua Peisach (ItzSwirlz)
   jiseokss
   dodgepong
   Rodrigo Ipince (ipince)
@@ -2135,6 +2288,7 @@
   Gloriana Cocozza (gcocozza)
   Streamlabs Translator (Streamlabs)
   Andy Venegas (andyvenegashernandez)
+  Monoverde
   Rubén Pérez (RixzZ)
   Mogabie's Nation (Mogabie)
   GarbageAtSB
@@ -2162,7 +2316,8 @@
   Axel Aminoff (axel.aminoff)
   chaironeko
   Jonas Svensson (jonassanojj99)
-  Hannes Blåman (thebluis)
+  Hannes Blåman (hannesblaman)
+  pitedaniel
   TacticalKebab
   kronblom2
  Tagalog:
@@ -2184,30 +2339,33 @@
   GobinathAL
   rooban23
   Vainock
+  Devanathan T (nathandeva26895)
   Gol D. Ace (goldace)
   unknowndomain
   Naveen Techs (alexonpeace)
  Telugu:
   CRTL Amaravati (rrskiran)
  Thai:
+  aefgh3962
   Yarika Sutthiwong (ammaneena)
   เทพประสิทธิ์ โพลาหา (Thepprasit300150)
   Alvah Connelly (AlvahConnelly)
   Aefgh Threenine (aefgh39622)
   Slow Life (SlowLife)
-  ppondd2020
-  aefgh3962
   戸渡 生野 (アオムシン) (aomyouza2543)
+  ppondd2020
   Nawin Somprasong (thaipirch98)
   Kamolpat Petsuwan (Paksa)
   zero0200
   ธีรภัทร์ โยชนา (2RD)
   PolaX3
+  Narintorn101
   sakuhanachan* (sakuhanachanloli)
   SurachaiJUI
   Sakia Normal Human (arcanaarcana5)
   นักลูบคม อันดับ 1 (mrmanyt629)
   PlyKung (plykung)
+  ธีร์ ธีรพล (teraphonk)
   Vainock
   Oat. Thanawat (thanawat6484)
   盛凤阁 (execzero)
@@ -2215,6 +2373,7 @@
   301-14 สิรวิชญ์ ศรีคําเมือง (Sam_Hanhyongsok2006)
   Worawut Weerawan (nero.exe)
   Rathchaarnon Threeanjuleethaan (rathchaarnon)
+  Yuthana Phanom (uyuth19thai)
   unknowndomain
   แมน ทศพร (lovemanna456)
   Worametee Prasarnsieng (worametee)
@@ -2233,34 +2392,39 @@
   Emir (dirt3009)
   Cemal Dursun (cmldrs)
   Savas Tokmak (Laserist)
-  Serhat Öktem (Guazy)
+  Serhat Öktem (delidolu1adam)
   Vainock
   Umut kılıç (kilic190787)
   Burak‏ Eker‏‏‏‏‏‏‎ (mburakeker)
   BreezeQS
   keke_ea
   furkanbicici
+  Ektaynot
+  Brtc (BorATICI)
   MeskaX
   Murat Karagöz (anemon_1994)
   Miss.Syzygy
   Görkem Akova (gorkemakova)
+  Doğukan (qreardedisback)
   Ebubekir Türker (ebubekirtrkr)
+  berkanx
   oth0pus
   Bilgehan Demirel (bilgehandemirel)
   Alperen Yıldız (Sparrow34Tr) (Sparrow34Tr)
+  tikhi
   Sueda A (sue-a)
   realdep (realdeep)
   Gol D. Ace (goldace)
   berkcan uçan (ibnehayati)
   Zafer Çopur (zafercopur)
   Solusyon2
+  Yoke6432
   gecebekcisi1
   Furkan Korhan (furkankorhan)
   Emin Can OGUZ (emincanoguz11)
   inci (sluggishwitch)
   bitigchi
   Berk Kırıkçı (berkkrkc09)
-  Doğukan (qreardedisback)
   Arat Ünal (AratreyizprogamerX)
   ownieyo
   Tarık Coşkun (tarikcoskun)
@@ -2270,6 +2434,7 @@
   bkzspam
   Ferhat Geçdoğan (ferhatgec)
   Onur Yılmaz (Makaron3422)
+  Nejdet ACAR (nejdetacar)
   TahaCelik
   Baran Moroğan (okunamayanad)
   Ata Çağan Atamer (atamerco23)
@@ -2285,7 +2450,7 @@
   Khedi
   Niemand (lelledguy)
   ROkelbow
-  Brtc (BorATICI)
+  Veysel Okan (viseyn)
   Hydroboost
   unknowndomain
   Mustafa Arslan (mstfaa)
@@ -2295,27 +2460,33 @@
   Ip Logging Boi (Karatchi)
   basakbk
   m (balik27)
+  1 0 (efkanyz)
+  Emre  (Khapnols)
   chaironeko
   Huseyin Emre (emreemuzik)
+  Selim Şumlu (maxcoder)
  Ukrainian:
   SuslikV
   Mykola Ronik (Mantikor)
   Ihor Hordiichuk (ihor_ck)
   lxlalexlxl
   Anatolii Bielibov (anatoly136ua)
+  Denys (Veydzher)
   Vainock
   Kefir (Kefir2105)
-  Denys (Veydzher)
   Lino Bico (bicolino34)
   Dekanenko (dekanenko)
   Юрій (Devinit)
   ROkelbow
+  FOR___REST (konstantinkostenko96)
+  Свиридюк Іван (fl1per)
   Gol D. Ace (goldace)
   Shannar de Kassal (587)
   Andy (anry025)
   kateryna.roiko
   Andrey (Fokz)
   NoPressure
+  Kirill Stuzhuk (kirillstuzhuk)
   បងមាន តែអូន (cheaiphone267)
   geimfis
   Hotripak (hotr1pak)
@@ -2327,6 +2498,7 @@
   skuu
   Maksym Tymoshyk (maximillian_)
   MeDustyy
+  Lev Leontev (gottagofaster)
   Володимир Родич (vrodych)
   Mark Chorney (chorneymark2006)
  Urdu (Pakistan):
@@ -2341,11 +2513,11 @@
   Vainock
  Vietnamese:
   IoeCmcomc (ioecmcomc)
+  Vichy (tnhung2011)
   Johnny “max20091” Utah (boostyourprogram)
   Quang Nguyen (quangnguyen.25)
-  Vichy (tnhung2011)
-  Hưng Nguyễn (hoyostudio)
   I_am_Vietnam
+  Hưng Nguyễn (hoyostudio)
   Drake Strike (phjtieudoc)
   ngoisaosang
   Dũng Nguyễn (CDzungx)

obs-studio-29.1.3.tar.xz/CI/include/build_support.sh -> obs-studio-30.0.2.tar.xz/CI/include/build_support.sh Changed

obs-studio-29.1.3.tar.xz/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/CMakeLists.txt Changed

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.22...3.25)
 
-if(OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
-  include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake")
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "(Darwin)" OR OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
+  include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
 
   project(obs-studio VERSION ${OBS_VERSION_CANONICAL})
 
@@ -14,7 +14,6 @@
   include(defaults)
   include(helpers)
 
-  option(ENABLE_RELEASE_BUILD "Enable all options for a release build" OFF)
   option(ENABLE_UI "Enable building with UI (requires Qt)" ON)
   option(ENABLE_SCRIPTING "Enable scripting support" ON)
   option(ENABLE_HEVC "Enable HEVC encoders" ON)
@@ -26,6 +25,9 @@
   endif()
   add_subdirectory(libobs-opengl)
   add_subdirectory(plugins)
+
+  add_subdirectory(test/test-input)
+
   add_subdirectory(UI)
 
   message_configuration()
@@ -37,7 +39,7 @@
 
 # Prohibit in-source builds
 if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
-  message(FATAL_ERROR "OBS: You cannot build in a source directory (or any directory with CMakeLists.txt file)."
+  message(FATAL_ERROR "OBS: You cannot build in a source directory (or any directory with CMakeLists.txt file). "
                       "Please make a build subdirectory. Feel free to remove CMakeCache.txt and CMakeFiles.")
 endif()

obs-studio-29.1.3.tar.xz/CMakePresets.json -> obs-studio-30.0.2.tar.xz/CMakePresets.json Changed

@@ -7,98 +7,59 @@
   },
   "configurePresets": 
     {
-      "name": "macos",
+      "name": "environmentVars",
       "hidden": true,
+      "cacheVariables": {
+        "TWITCH_CLIENTID": {"type": "STRING", "value": "$penv{TWITCH_CLIENTID}"},
+        "TWITCH_HASH": {"type": "STRING", "value": "$penv{TWITCH_HASH}"},
+        "RESTREAM_CLIENTID": {"type": "STRING", "value": "$penv{RESTREAM_CLIENTID}"},
+        "RESTREAM_HASH": {"type": "STRING", "value": "$penv{RESTREAM_HASH}"},
+        "YOUTUBE_CLIENTID": {"type": "STRING", "value": "$penv{YOUTUBE_CLIENTID}"},
+        "YOUTUBE_CLIENTID_HASH": {"type": "STRING", "value": "$penv{YOUTUBE_CLIENTID_HASH}"},
+        "YOUTUBE_SECRET": {"type": "STRING", "value": "$penv{YOUTUBE_SECRET}"},
+        "YOUTUBE_SECRET_HASH": {"type": "STRING", "value": "$penv{YOUTUBE_SECRET_HASH}"}
+      }
+    },
+    {
+      "name": "macos",
+      "displayName": "macOS",
+      "description": "Default macOS build (single architecture only)",
+      "inherits": "environmentVars",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Darwin"
       },
       "generator": "Xcode",
-      "warnings": {"dev": true, "deprecated": true},
+      "binaryDir": "${sourceDir}/build_macos",
       "cacheVariables": {
-        "QT_VERSION": "6",
         "ENABLE_BROWSER": true,
-        "ENABLE_VLC": true,
-        "CMAKE_OSX_DEPLOYMENT_TARGET": "11.0",
-        "OBS_CODESIGN_IDENTITY": "-",
-        "OBS_CMAKE_VERSION": "3.0.0"
-      }
-    },
-    {
-      "name": "macos-arm64",
-      "inherits": "macos",
-      "displayName": "macOS Apple Silicon",
-      "description": "obs-studio for macOS 11.0+ (Apple Silicon)",
-      "binaryDir": "${sourceDir}/build_arm64",
-      "cacheVariables": {
-        "CMAKE_OSX_ARCHITECTURES": "arm64"
-      }
-    },
-    {
-      "name": "macos-x86_64",
-      "inherits": "macos",
-      "displayName": "macOS Apple Intel",
-      "description": "obs-studio for macOS 11.0+ (Intel)",
-      "binaryDir": "${sourceDir}/build_x86_64",
-      "cacheVariables": {
-        "CMAKE_OSX_ARCHITECTURES": "x86_64"
-      }
-    },
-    {
-      "name": "macos-ci-arm64",
-      "inherits": "macos-arm64",
-      "generator": "Ninja",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "macos-ci-x86_64",
-      "inherits": "macos-x86_64",
-      "generator": "Ninja",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "macos-release-arm64",
-      "displayName": "macOS Apple Silicon (Release)",
-      "description": "obs-studio for macOS (Apple) - Release Configuration",
-      "inherits": "macos-arm64",
-      "cacheVariables": {
-        "ENABLE_RELEASE_BUILD": true,
-        "ENABLE_SPARKLE": true,
-        "OBS_SPARKLE_KEY": {"type": "STRING", "value": ""},
-        "OBS_CODESIGN_IDENTITY": "$penv{CODESIGN_IDENT}",
-        "SPARKLE_APPCAST_URL": {"type": "STRING", "value": "https://obsproject.com/osx_update/updates_arm64_v2.xml"},
-        "SPARKLE_PUBLIC_KEY": {"type": "STRING", "value": "HQ5/Ba9VHOuEWaM0jtVjZzgHKFJX9YTl+HNVpgNF0iM="},
+        "CMAKE_OSX_DEPLOYMENT_TARGET": {"type": "STRING", "value": "11.0"},
+        "OBS_CODESIGN_TEAM": {"type": "STRING", "value": "$penv{CODESIGN_TEAM}"},
+        "OBS_CODESIGN_IDENTITY": {"type": "STRING", "value": "$penv{CODESIGN_IDENT}"},
+        "OBS_PROVISIONING_PROFILE": {"type": "STRING", "value": "$penv{PROVISIONING_PROFILE}"},
         "VIRTUALCAM_DEVICE_UUID": {"type": "STRING", "value": "7626645E-4425-469E-9D8B-97E0FA59AC75"},
         "VIRTUALCAM_SOURCE_UUID": {"type": "STRING", "value": "A8D7B8AA-65AD-4D21-9C42-66480DBFA8E1"},
-        "VIRTUALCAM_SINK_UUID": {"type": "STRING", "value": "A3F16177-7044-4DD8-B900-72E2419F7A9A"}
+        "VIRTUALCAM_SINK_UUID": {"type": "STRING", "value": "A3F16177-7044-4DD8-B900-72E2419F7A9A"},
+        "SPARKLE_APPCAST_URL": {"type": "STRING", "value": "https://obsproject.com/osx_update/updates_$(ARCHS)_v2.xml"},
+        "SPARKLE_PUBLIC_KEY": {"type": "STRING", "value": "HQ5/Ba9VHOuEWaM0jtVjZzgHKFJX9YTl+HNVpgNF0iM="}
       }
     },
     {
-      "name": "macos-release-x86_64",
-      "displayName": "macOS Intel (Release)",
-      "description": "obs-studio for macOS (Intel) - Release Configuration",
-      "inherits": "macos-x86_64",
+      "name": "macos-ci",
+      "displayName": "macOS (CI)",
+      "description": "CI macOS build (single architecture only)",
+      "inherits": "macos",
+      "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
-        "ENABLE_RELEASE_BUILD": true,
-        "ENABLE_SPARKLE": true,
-        "OBS_SPARKLE_KEY": {"type": "STRING", "value": ""},
-        "OBS_CODESIGN_IDENTITY": "$penv{CODESIGN_IDENT}",
-        "SPARKLE_APPCAST_URL": {"type": "STRING", "value": "https://obsproject.com/osx_update/updates_x86_64_v2.xml"},
-        "SPARKLE_PUBLIC_KEY": {"type": "STRING", "value": "HQ5/Ba9VHOuEWaM0jtVjZzgHKFJX9YTl+HNVpgNF0iM="},
-        "VIRTUALCAM_DEVICE_UUID": {"type": "STRING", "value": "7626645E-4425-469E-9D8B-97E0FA59AC75"},
-        "VIRTUALCAM_SOURCE_UUID": {"type": "STRING", "value": "A8D7B8AA-65AD-4D21-9C42-66480DBFA8E1"},
-        "VIRTUALCAM_SINK_UUID": {"type": "STRING", "value": "A3F16177-7044-4DD8-B900-72E2419F7A9A"}
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true
       }
     },
     {
       "name": "linux-aarch64",
       "displayName": "Linux aarch64",
       "description": "obs-studio for Linux (aarch64)",
+      "inherits": "environmentVars",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
@@ -110,13 +71,7 @@
       "cacheVariables": {
         "ENABLE_WAYLAND": true,
         "ENABLE_VLC": true,
-        "QT_VERSION": "6",
-        "CMAKE_BUILD_TYPE": "Debug",
-        "OBS_CMAKE_VERSION": "2.0.0",
-        "CMAKE_PREFIX_PATH": {
-          "type": "PATH",
-          "value": ""
-        }
+        "CMAKE_BUILD_TYPE": "Debug"
       }
     },
     {
@@ -140,6 +95,7 @@
       "name": "linux-x86_64",
       "displayName": "Linux x86_64",
       "description": "obs-studio for Linux (x86_64)",
+      "inherits": "environmentVars",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
@@ -151,23 +107,12 @@
       "cacheVariables": {
         "ENABLE_WAYLAND": true,
         "ENABLE_VLC": true,
-        "QT_VERSION": "6",
-        "CMAKE_BUILD_TYPE": "Debug",
-        "OBS_CMAKE_VERSION": "2.0.0",
-        "CMAKE_PREFIX_PATH": {
-          "type": "PATH",
-          "value": ""
-        },
-        "CEF_ROOT_DIR": {
-          "type": "PATH",
-          "value": ""
-        }
+        "CMAKE_BUILD_TYPE": {"type": "STRING", "value": "Debug"}
       }
     },
     {
       "name": "linux-ci-x86_64",
       "inherits": "linux-x86_64",
-      "hidden": true,
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       }
@@ -185,7 +130,8 @@
     {
       "name": "windows-x64",
       "displayName": "Windows x64",
-      "description": "obs-studio for Windows (x64)",
+      "description": "Default Windows build (x64)",
+      "inherits": "environmentVars",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
@@ -194,64 +140,28 @@
       "architecture": "x64",
       "binaryDir": "${sourceDir}/build_x64",
       "generator": "Visual Studio 17 2022",
-      "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
-        "QT_VERSION": "6",
-        "CMAKE_BUILD_TYPE": "Debug",
-        "OBS_WINDOWS_LEGACY_DIRS": true,
-        "CMAKE_SYSTEM_VERSION": "10.0.18363.657",
-        "OBS_CMAKE_VERSION": "2.0.0",
-        "CMAKE_PREFIX_PATH": {
-          "type": "PATH",
-          "value": ""
-        },
-        "CEF_ROOT_DIR": {
-          "type": "PATH",
-          "value": ""
-        },
-        "VLC_PATH": {
-          "type": "PATH",
-          "value": ""
-        }
+        "OBS_CMAKE_VERSION": {"type": "STRING", "value": "3.0.0"},
+        "ENABLE_BROWSER": true,
+        "VIRTUALCAM_GUID": {"type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"},
+        "GPU_PRIORITY_VAL": {"type": "STRING", "value": "$penv{GPU_PRIORITY_VAL}"},
+        "ENABLE_CCACHE": false
       }
     },
     {
       "name": "windows-ci-x64",
-      "inherits": "windows-x64",
-      "hidden": true,
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
-      }
-    },
-    {
-      "name": "windows-release-x64",
-      "displayName": "Windowx x64 (Release)",
-      "description": "obs-studio for Windows (x64) - Release Configuration",
-      "inherits": "windows-x64",
+      "displayName": "Windows x64 (CI)",
+      "description": "CI Windows build (x64)",
+      "inherits": "windows-x64",
+      "warnings": {"dev": true, "deprecated": true},
       "cacheVariables": {
-        "ENABLE_RELEASE_BUILD": true,
-        "ENABLE_BROWSER": true,
-        "ENABLE_VLC": true,
-        "VIRTUALCAM_GUID": { "type": "STRING", "value": "A3FCE0F5-3493-419F-958A-ABA1250EC20B"}
+        "CMAKE_COMPILE_WARNING_AS_ERROR": true,
+        "ENABLE_CCACHE": false
       }
     }
   ,
   "buildPresets": 
     {
-      "name": "macos-arm64",
-      "configurePreset": "macos-arm64",
-      "displayName": "macOS Apple Silicon",
-      "description": "macOS build for Apple Silicon",
-      "configuration": "RelWithDebInfo"
-    },
-    {
-      "name": "macos-x86_64",
-      "configurePreset": "macos-x86_64",
-      "displayName": "macOS Intel",
-      "description": "macOS build for Intel",
-      "configuration": "RelWithDebInfo"
-    },
-    {
       "name": "linux-aarch64",
       "configurePreset": "linux-aarch64",
       "displayName": "Linux aarch64",

obs-studio-29.1.3.tar.xz/CONTRIBUTING.rst -> obs-studio-30.0.2.tar.xz/CONTRIBUTING.rst Changed

obs-studio-29.1.3.tar.xz/README.rst -> obs-studio-30.0.2.tar.xz/README.rst Changed

obs-studio-29.1.3.tar.xz/UI/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/UI/CMakeLists.txt Changed

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.22...3.25)
 
 legacy_check()
 
@@ -16,10 +16,6 @@
 find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil avformat)
 find_package(CURL REQUIRED)
 
-if(NOT TARGET OBS::libff-util)
- add_subdirectory("${CMAKE_SOURCE_DIR}/deps/libff" "${CMAKE_BINARY_DIR}/deps/libff")
-endif()
-
 if(NOT TARGET OBS::json11)
 add_subdirectory("${CMAKE_SOURCE_DIR}/deps/json11" "${CMAKE_BINARY_DIR}/deps/json11")
 endif()
@@ -35,7 +31,6 @@
 FFmpeg::avformat
 OBS::libobs
 OBS::frontend-api
- OBS::libff-util
 OBS::json11)
 
 include(cmake/ui-qt.cmake)
@@ -45,11 +40,10 @@
 include(cmake/feature-browserpanels.cmake)
 
 if(NOT OAUTH_BASE_URL)
- set(OAUTH_BASE_URL
- "https://auth.obsproject.com/"
- CACHE STRING "Default OAuth base URL")
-
+ # cmake-format: off
+ set(OAUTH_BASE_URL "https://auth.obsproject.com/" CACHE STRING "Default OAuth base URL")
 mark_as_advanced(OAUTH_BASE_URL)
+ # cmake-format: on
 endif()
 include(cmake/feature-twitch.cmake)
 include(cmake/feature-restream.cmake)
@@ -72,6 +66,8 @@
 auth-oauth.cpp
 auth-oauth.hpp
 display-helpers.hpp
+ ffmpeg-utils.cpp
+ ffmpeg-utils.hpp
 multiview.cpp
 multiview.hpp
 obf.c
@@ -109,4 +105,10 @@
 endif()
 endforeach()
 
-set_target_properties_obs(obs-studio PROPERTIES FOLDER frontend OUTPUT_NAME obs)
+get_property(obs_module_list GLOBAL PROPERTY OBS_MODULES_ENABLED)
+list(JOIN obs_module_list "|" SAFE_MODULES)
+target_compile_definitions(obs-studio PRIVATE "SAFE_MODULES=\"${SAFE_MODULES}\"")
+
+# cmake-format: off
+set_target_properties_obs(obs-studio PROPERTIES FOLDER frontend OUTPUT_NAME "$<IF:$<PLATFORM_ID:Windows>,obs64,obs>")
+# cmake-format: on

obs-studio-29.1.3.tar.xz/UI/adv-audio-control.cpp -> obs-studio-30.0.2.tar.xz/UI/adv-audio-control.cpp Changed

@@ -16,6 +16,8 @@
 
 #define MIN_DB -96.0
 #define MAX_DB 26.0
+static inline void setMixer(obs_source_t *source, const int mixerIdx,
+			    const bool checked);
 
 OBSAdvAudioCtrl::OBSAdvAudioCtrl(QGridLayout *, obs_source_t *source_)
 	: source(source_)
@@ -223,34 +225,33 @@
 	mixerContainer->layout()->addWidget(mixer6);
 	mixerContainer->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
 
-	QWidget::connect(volume, SIGNAL(valueChanged(double)), this,
-			 SLOT(volumeChanged(double)));
-	QWidget::connect(percent, SIGNAL(valueChanged(int)), this,
-			 SLOT(percentChanged(int)));
-	QWidget::connect(forceMono, SIGNAL(clicked(bool)), this,
-			 SLOT(downmixMonoChanged(bool)));
-	QWidget::connect(balance, SIGNAL(valueChanged(int)), this,
-			 SLOT(balanceChanged(int)));
-	QWidget::connect(balance, SIGNAL(doubleClicked()), this,
-			 SLOT(ResetBalance()));
-	QWidget::connect(syncOffset, SIGNAL(valueChanged(int)), this,
-			 SLOT(syncOffsetChanged(int)));
+	connect(volume, &QDoubleSpinBox::valueChanged, this,
+		&OBSAdvAudioCtrl::volumeChanged);
+	connect(percent, &QSpinBox::valueChanged, this,
+		&OBSAdvAudioCtrl::percentChanged);
+	connect(forceMono, &QCheckBox::clicked, this,
+		&OBSAdvAudioCtrl::downmixMonoChanged);
+	connect(balance, &BalanceSlider::valueChanged, this,
+		&OBSAdvAudioCtrl::balanceChanged);
+	connect(balance, &BalanceSlider::doubleClicked, this,
+		&OBSAdvAudioCtrl::ResetBalance);
+	connect(syncOffset, &QSpinBox::valueChanged, this,
+		&OBSAdvAudioCtrl::syncOffsetChanged);
 	if (obs_audio_monitoring_available())
-		QWidget::connect(monitoringType,
-				 SIGNAL(currentIndexChanged(int)), this,
-				 SLOT(monitoringTypeChanged(int)));
-	QWidget::connect(mixer1, SIGNAL(clicked(bool)), this,
-			 SLOT(mixer1Changed(bool)));
-	QWidget::connect(mixer2, SIGNAL(clicked(bool)), this,
-			 SLOT(mixer2Changed(bool)));
-	QWidget::connect(mixer3, SIGNAL(clicked(bool)), this,
-			 SLOT(mixer3Changed(bool)));
-	QWidget::connect(mixer4, SIGNAL(clicked(bool)), this,
-			 SLOT(mixer4Changed(bool)));
-	QWidget::connect(mixer5, SIGNAL(clicked(bool)), this,
-			 SLOT(mixer5Changed(bool)));
-	QWidget::connect(mixer6, SIGNAL(clicked(bool)), this,
-			 SLOT(mixer6Changed(bool)));
+		connect(monitoringType, &QComboBox::currentIndexChanged, this,
+			&OBSAdvAudioCtrl::monitoringTypeChanged);
+
+	auto connectMixer = this(QCheckBox *mixer, int num) {
+		connect(mixer, &QCheckBox::clicked, this, num(bool checked) {
+			setMixer(source, num, checked);
+		});
+	};
+	connectMixer(mixer1, 0);
+	connectMixer(mixer2, 1);
+	connectMixer(mixer3, 2);
+	connectMixer(mixer4, 3);
+	connectMixer(mixer5, 4);
+	connectMixer(mixer6, 5);
 
 	setObjectName(sourceName);
 }
@@ -440,19 +441,19 @@
 	float val = obs_db_to_mul(db);
 	obs_source_set_volume(source, val);
 
-	auto undo_redo = (const std::string &name, float val) {
+	auto undo_redo = (const std::string &uuid, float val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_volume(source, val);
 	};
 
 	const char *name = obs_source_get_name(source);
-
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic *main = OBSBasic::Get();
 	main->undo_s.add_action(
 		QTStr("Undo.Volume.Change").arg(name),
 		std::bind(undo_redo, std::placeholders::_1, prev),
-		std::bind(undo_redo, std::placeholders::_1, val), name, name,
+		std::bind(undo_redo, std::placeholders::_1, val), uuid, uuid,
 		true);
 }
 
@@ -463,17 +464,18 @@
 
 	obs_source_set_volume(source, val);
 
-	auto undo_redo = (const std::string &name, float val) {
+	auto undo_redo = (const std::string &uuid, float val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_volume(source, val);
 	};
 
 	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		QTStr("Undo.Volume.Change").arg(name),
 		std::bind(undo_redo, std::placeholders::_1, prev),
-		std::bind(undo_redo, std::placeholders::_1, val), name, name,
+		std::bind(undo_redo, std::placeholders::_1, val), uuid, uuid,
 		true);
 }
 
@@ -502,19 +504,20 @@
 
 	obs_source_set_flags(source, flags);
 
-	auto undo_redo = (const std::string &name, bool val) {
+	auto undo_redo = (const std::string &uuid, bool val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		set_mono(source, val);
 	};
 
 	QString text = QTStr(val ? "Undo.ForceMono.On" : "Undo.ForceMono.Off");
 
 	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		text.arg(name),
 		std::bind(undo_redo, std::placeholders::_1, !val),
-		std::bind(undo_redo, std::placeholders::_1, val), name, name);
+		std::bind(undo_redo, std::placeholders::_1, val), uuid, uuid);
 }
 
 void OBSAdvAudioCtrl::balanceChanged(int val)
@@ -531,17 +534,18 @@
 
 	obs_source_set_balance_value(source, bal);
 
-	auto undo_redo = (const std::string &name, float val) {
+	auto undo_redo = (const std::string &uuid, float val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_balance_value(source, val);
 	};
 
 	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		QTStr("Undo.Balance.Change").arg(name),
 		std::bind(undo_redo, std::placeholders::_1, prev),
-		std::bind(undo_redo, std::placeholders::_1, bal), name, name,
+		std::bind(undo_redo, std::placeholders::_1, bal), uuid, uuid,
 		true);
 }
 
@@ -560,17 +564,18 @@
 
 	obs_source_set_sync_offset(source, val);
 
-	auto undo_redo = (const std::string &name, int64_t val) {
+	auto undo_redo = (const std::string &uuid, int64_t val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_sync_offset(source, val);
 	};
 
 	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		QTStr("Undo.SyncOffset.Change").arg(name),
 		std::bind(undo_redo, std::placeholders::_1, prev),
-		std::bind(undo_redo, std::placeholders::_1, val), name, name,
+		std::bind(undo_redo, std::placeholders::_1, val), uuid, uuid,
 		true);
 }
 
@@ -600,16 +605,17 @@
 	blog(LOG_INFO, "User changed audio monitoring for source '%s' to: %s",
 	     name ? name : "(null)", type);
 
-	auto undo_redo = (const std::string &name, obs_monitoring_type val) {
+	auto undo_redo = (const std::string &uuid, obs_monitoring_type val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_monitoring_type(source, val);
 	};
 
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		QTStr("Undo.MonitoringType.Change").arg(name),
 		std::bind(undo_redo, std::placeholders::_1, prev),
-		std::bind(undo_redo, std::placeholders::_1, mt), name, name);
+		std::bind(undo_redo, std::placeholders::_1, mt), uuid, uuid);
 }
 
 static inline void setMixer(obs_source_t *source, const int mixerIdx,
@@ -625,48 +631,19 @@
 
 	obs_source_set_audio_mixers(source, new_mixers);
 
-	auto undo_redo = (const std::string &name, uint32_t mixers) {
+	auto undo_redo = (const std::string &uuid, uint32_t mixers) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_audio_mixers(source, mixers);
 	};
 
 	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		QTStr("Undo.Mixers.Change").arg(name),
 		std::bind(undo_redo, std::placeholders::_1, mixers),
-		std::bind(undo_redo, std::placeholders::_1, new_mixers), name,
-		name);
-}
-
-void OBSAdvAudioCtrl::mixer1Changed(bool checked)
-{
-	setMixer(source, 0, checked);
-}
-
-void OBSAdvAudioCtrl::mixer2Changed(bool checked)
-{
-	setMixer(source, 1, checked);
-}
-
-void OBSAdvAudioCtrl::mixer3Changed(bool checked)
-{
-	setMixer(source, 2, checked);
-}
-
-void OBSAdvAudioCtrl::mixer4Changed(bool checked)
-{
-	setMixer(source, 3, checked);
-}
-
-void OBSAdvAudioCtrl::mixer5Changed(bool checked)
-{
-	setMixer(source, 4, checked);
-}
-
-void OBSAdvAudioCtrl::mixer6Changed(bool checked)
-{
-	setMixer(source, 5, checked);
+		std::bind(undo_redo, std::placeholders::_1, new_mixers), uuid,
+		uuid);
 }
 
 void OBSAdvAudioCtrl::SetVolumeWidget(VolumeType type)

obs-studio-29.1.3.tar.xz/UI/adv-audio-control.hpp -> obs-studio-30.0.2.tar.xz/UI/adv-audio-control.hpp Changed

obs-studio-29.1.3.tar.xz/UI/api-interface.cpp -> obs-studio-30.0.2.tar.xz/UI/api-interface.cpp Changed

@@ -379,7 +379,70 @@
 
 	void *obs_frontend_add_dock(void *dock) override
 	{
-		return (void *)main->AddDockWidget((QDockWidget *)dock);
+		QDockWidget *d = reinterpret_cast<QDockWidget *>(dock);
+
+		QString name = d->objectName();
+		if (name.isEmpty() || main->IsDockObjectNameUsed(name)) {
+			blog(LOG_WARNING,
+			 "The object name of the added dock is empty or already used,"
+			 " a temporary one will be set to avoid conflicts");
+
+			char *uuid = os_generate_uuid();
+			name = QT_UTF8(uuid);
+			bfree(uuid);
+			name.append("_oldExtraDock");
+
+			d->setObjectName(name);
+		}
+
+		return (void *)main->AddDockWidget(d);
+	}
+
+	bool obs_frontend_add_dock_by_id(const char *id, const char *title,
+					 void *widget) override
+	{
+		if (main->IsDockObjectNameUsed(QT_UTF8(id))) {
+			blog(LOG_WARNING,
+			 "Dock id '%s' already used! "
+			 "Duplicate library?",
+			 id);
+			return false;
+		}
+
+		OBSDock *dock = new OBSDock(main);
+		dock->setWidget((QWidget *)widget);
+		dock->setWindowTitle(QT_UTF8(title));
+		dock->setObjectName(QT_UTF8(id));
+
+		main->AddDockWidget(dock, Qt::RightDockWidgetArea);
+
+		dock->setFloating(true);
+		dock->setVisible(false);
+
+		return true;
+	}
+
+	void obs_frontend_remove_dock(const char *id) override
+	{
+		main->RemoveDockWidget(QT_UTF8(id));
+	}
+
+	bool obs_frontend_add_custom_qdock(const char *id, void *dock) override
+	{
+		if (main->IsDockObjectNameUsed(QT_UTF8(id))) {
+			blog(LOG_WARNING,
+			 "Dock id '%s' already used! "
+			 "Duplicate library?",
+			 id);
+			return false;
+		}
+
+		QDockWidget *d = reinterpret_cast<QDockWidget *>(dock);
+		d->setObjectName(QT_UTF8(id));
+
+		main->AddCustomDockWidget(d);
+
+		return true;
 	}
 
 	void obs_frontend_add_event_callback(obs_frontend_event_cb callback,

obs-studio-29.1.3.tar.xz/UI/audio-encoders.cpp -> obs-studio-30.0.2.tar.xz/UI/audio-encoders.cpp Changed

obs-studio-29.1.3.tar.xz/UI/auth-base.hpp -> obs-studio-30.0.2.tar.xz/UI/auth-base.hpp Changed

obs-studio-29.1.3.tar.xz/UI/auth-oauth.cpp -> obs-studio-30.0.2.tar.xz/UI/auth-oauth.cpp Changed

obs-studio-29.1.3.tar.xz/UI/auth-restream.cpp -> obs-studio-30.0.2.tar.xz/UI/auth-restream.cpp Changed

obs-studio-29.1.3.tar.xz/UI/auth-twitch.cpp -> obs-studio-30.0.2.tar.xz/UI/auth-twitch.cpp Changed

@@ -251,7 +251,7 @@
 	QSize size = main->frameSize();
 	QPoint pos = main->pos();
 
-	BrowserDock *chat = new BrowserDock();
+	BrowserDock *chat = new BrowserDock(QTStr("Auth.Chat"));
 	chat->setObjectName(TWITCH_CHAT_DOCK_NAME);
 	chat->resize(300, 600);
 	chat->setMinimumSize(200, 300);
@@ -340,7 +340,7 @@
 	url += name;
 	url += "/stream-manager/edit-stream-info";
 
-	BrowserDock *info = new BrowserDock();
+	BrowserDock *info = new BrowserDock(QTStr("Auth.StreamInfo"));
 	info->setObjectName(TWITCH_INFO_DOCK_NAME);
 	info->resize(300, 650);
 	info->setMinimumSize(200, 300);
@@ -359,7 +359,7 @@
 	url += name;
 	url += "/dashboard/live/stats";
 
-	BrowserDock *stats = new BrowserDock();
+	BrowserDock *stats = new BrowserDock(QTStr("TwitchAuth.Stats"));
 	stats->setObjectName(TWITCH_STATS_DOCK_NAME);
 	stats->resize(200, 250);
 	stats->setMinimumSize(200, 150);
@@ -379,7 +379,7 @@
 	url += "/stream-manager/activity-feed";
 	url += "?uuid=" + uuid;
 
-	BrowserDock *feed = new BrowserDock();
+	BrowserDock *feed = new BrowserDock(QTStr("TwitchAuth.Feed"));
 	feed->setObjectName(TWITCH_FEED_DOCK_NAME);
 	feed->resize(300, 650);
 	feed->setMinimumSize(200, 300);

obs-studio-29.1.3.tar.xz/UI/auth-youtube.cpp -> obs-studio-30.0.2.tar.xz/UI/auth-youtube.cpp Changed

@@ -69,7 +69,8 @@
 }
 
 YoutubeAuth::YoutubeAuth(const Def &d)
-	: OAuthStreamKey(d), section(SECTION_NAME)
+	: OAuthStreamKey(d),
+	 section(SECTION_NAME)
 {
 }
 
@@ -154,11 +155,10 @@
 	QSize size = main->frameSize();
 	QPoint pos = main->pos();
 
-	chat = new YoutubeChatDock();
+	chat = new YoutubeChatDock(QTStr("Auth.Chat"));
 	chat->setObjectName(YOUTUBE_CHAT_DOCK_NAME);
 	chat->resize(300, 600);
 	chat->setMinimumSize(200, 300);
-	chat->setWindowTitle(QTStr("Auth.Chat"));
 	chat->setAllowedAreas(Qt::AllDockWidgetAreas);
 
 	browser = cef->create_widget(chat, YOUTUBE_CHAT_PLACEHOLDER_URL,
@@ -173,7 +173,12 @@
 
 	if (firstLoad) {
 		chat->setVisible(true);
-	} else {
+	}
+#endif
+
+	main->NewYouTubeAppDock();
+
+	if (!firstLoad) {
 		const char *dockStateStr = config_get_string(
 			main->Config(), service(), "DockState");
 		QByteArray dockState =
@@ -182,7 +187,6 @@
 		if (main->isVisible() || !main->isMaximized())
 			main->restoreState(dockState);
 	}
-#endif
 
 	uiLoaded = true;
 }
@@ -274,6 +278,11 @@
 	dlg.setText(text);
 	dlg.setTextFormat(Qt::RichText);
 	dlg.setStandardButtons(QMessageBox::StandardButton::Cancel);
+#if defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
+	/* We can't show clickable links with the native NSAlert, so let's
+	 * force the old non-native dialog instead. */
+	dlg.setOption(QMessageBox::Option::DontUseNativeDialog);
+#endif
 
 	connect(&dlg, &QMessageBox::buttonClicked, &dlg,
 		&(QAbstractButton *) {
@@ -301,11 +310,23 @@
 		dlg.reject();
 	});
 
-	auto open_external_browser = url() { OpenBrowser(url); };
+	auto open_external_browser = url() {
+		OpenBrowser(url);
+	};
 	QScopedPointer<QThread> thread(CreateQThread(open_external_browser));
 	thread->start();
 
+#if defined(__APPLE__) && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && \
+	QT_VERSION < QT_VERSION_CHECK(6, 6, 0)
+	const bool nativeDialogs =
+		qApp->testAttribute(Qt::AA_DontUseNativeDialogs);
+	App()->setAttribute(Qt::AA_DontUseNativeDialogs, true);
+	dlg.exec();
+	App()->setAttribute(Qt::AA_DontUseNativeDialogs, nativeDialogs);
+#else
 	dlg.exec();
+#endif
+
 	if (dlg.result() == QMessageBox::Cancel ||
 	 dlg.result() == QDialog::Rejected)
 		return nullptr;
@@ -352,10 +373,10 @@
 	widget->setLayout(layout);
 	setWidget(widget);
 
-	QWidget::connect(lineEdit, SIGNAL(returnPressed()), this,
-			 SLOT(SendChatMessage()));
-	QWidget::connect(sendButton, SIGNAL(pressed()), this,
-			 SLOT(SendChatMessage()));
+	QWidget::connect(lineEdit, &LineEditAutoResize::returnPressed, this,
+			 &YoutubeChatDock::SendChatMessage);
+	QWidget::connect(sendButton, &QPushButton::pressed, this,
+			 &YoutubeChatDock::SendChatMessage);
 
 	cefWidget.reset(widget_);
 }

obs-studio-29.1.3.tar.xz/UI/auth-youtube.hpp -> obs-studio-30.0.2.tar.xz/UI/auth-youtube.hpp Changed

obs-studio-29.1.3.tar.xz/UI/cmake/feature-importers.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/feature-importers.cmake Changed

obs-studio-29.1.3.tar.xz/UI/cmake/feature-macos-update.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/feature-macos-update.cmake Changed

@@ -1,10 +1,22 @@
 include_guard(DIRECTORY)
 
+find_package(nlohmann_json REQUIRED)
+
 if(NOT TARGET OBS::blake2)
 add_subdirectory("${CMAKE_SOURCE_DIR}/deps/blake2" "${CMAKE_BINARY_DIR}/deps/blake2")
 endif()
 
-target_sources(obs-studio PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mac.mm update/shared-update.cpp
- update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
+target_sources(
+ obs-studio
+ PRIVATE # cmake-format: sortable
+ update/crypto-helpers-mac.mm
+ update/crypto-helpers.hpp
+ update/models/branches.hpp
+ update/models/whatsnew.hpp
+ update/shared-update.cpp
+ update/shared-update.hpp
+ update/update-helpers.cpp
+ update/update-helpers.hpp)
 
-target_link_libraries(obs-studio PRIVATE "$<LINK_LIBRARY:FRAMEWORK,Security.framework>" OBS::blake2)
+target_link_libraries(obs-studio PRIVATE "$<LINK_LIBRARY:FRAMEWORK,Security.framework>" nlohmann_json::nlohmann_json
+ OBS::blake2)

obs-studio-29.1.3.tar.xz/UI/cmake/feature-restream.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/feature-restream.cmake Changed

obs-studio-29.1.3.tar.xz/UI/cmake/feature-sparkle.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/feature-sparkle.cmake Changed

obs-studio-29.1.3.tar.xz/UI/cmake/feature-twitch.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/feature-twitch.cmake Changed

obs-studio-29.1.3.tar.xz/UI/cmake/feature-whatsnew.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/feature-whatsnew.cmake Changed

@@ -5,11 +5,19 @@
     include(cmake/feature-macos-update.cmake)
   elseif(OS_LINUX)
     find_package(MbedTLS REQUIRED)
-    target_link_libraries(obs-studio PRIVATE MbedTLS::MbedTLS OBS::blake2)
+    find_package(nlohmann_json REQUIRED)
+    target_link_libraries(obs-studio PRIVATE MbedTLS::MbedTLS nlohmann_json::nlohmann_json OBS::blake2)
 
     target_sources(
-      obs-studio PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mbedtls.cpp update/shared-update.cpp
-                         update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
+      obs-studio
+      PRIVATE # cmake-format: sortable
+              update/crypto-helpers-mbedtls.cpp
+              update/crypto-helpers.hpp
+              update/models/whatsnew.hpp
+              update/shared-update.cpp
+              update/shared-update.hpp
+              update/update-helpers.cpp
+              update/update-helpers.hpp)
   endif()
 
   target_enable_feature(obs-studio "What's New panel" WHATSNEW_ENABLED)

obs-studio-29.1.3.tar.xz/UI/cmake/feature-youtube.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/feature-youtube.cmake Changed

obs-studio-29.1.3.tar.xz/UI/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/legacy.cmake Changed

@@ -82,7 +82,7 @@
              AUTORCC ON
              AUTOUIC_SEARCH_PATHS "forms;forms/source-toolbar")
 
-if(_QT_VERSION EQUAL 6 AND OS_WINDOWS)
+if(OS_WINDOWS)
   set_target_properties(obs PROPERTIES AUTORCC_OPTIONS "--format-version;1")
 endif()
 
@@ -116,6 +116,7 @@
           forms/OBSRemux.ui
           forms/OBSUpdate.ui
           forms/OBSYoutubeActions.ui
+          forms/StatusBarWidget.ui
           forms/source-toolbar/browser-source-toolbar.ui
           forms/source-toolbar/color-source-toolbar.ui
           forms/source-toolbar/device-select-toolbar.ui
@@ -149,10 +150,10 @@
           ui-validation.hpp
           multiview.cpp
           multiview.hpp
+          ffmpeg-utils.cpp
+          ffmpeg-utils.hpp
           ${CMAKE_SOURCE_DIR}/deps/json11/json11.cpp
           ${CMAKE_SOURCE_DIR}/deps/json11/json11.hpp
-          ${CMAKE_SOURCE_DIR}/deps/libff/libff/ff-util.c
-          ${CMAKE_SOURCE_DIR}/deps/libff/libff/ff-util.h
           ${CMAKE_CURRENT_BINARY_DIR}/ui-config.h)
 
 target_sources(
@@ -171,7 +172,6 @@
           item-widget-helpers.hpp
           context-bar-controls.cpp
           context-bar-controls.hpp
-          expand-checkbox.hpp
           focus-list.cpp
           focus-list.hpp
           hotkey-edit.cpp
@@ -288,7 +288,7 @@
 
 target_compile_features(obs PRIVATE cxx_std_17)
 
-target_include_directories(obs PRIVATE ${CMAKE_SOURCE_DIR}/deps/json11 ${CMAKE_SOURCE_DIR}/deps/libff)
+target_include_directories(obs PRIVATE ${CMAKE_SOURCE_DIR}/deps/json11)
 
 target_link_libraries(obs PRIVATE CURL::libcurl FFmpeg::avcodec FFmpeg::avutil FFmpeg::avformat OBS::libobs
                                   OBS::frontend-api)
@@ -329,8 +329,16 @@
 
 if(YOUTUBE_ENABLED)
   target_compile_definitions(obs PRIVATE YOUTUBE_ENABLED)
-  target_sources(obs PRIVATE auth-youtube.cpp auth-youtube.hpp youtube-api-wrappers.cpp youtube-api-wrappers.hpp
-                             window-youtube-actions.cpp window-youtube-actions.hpp)
+  target_sources(
+    obs
+    PRIVATE auth-youtube.cpp
+            auth-youtube.hpp
+            window-dock-youtube-app.cpp
+            window-dock-youtube-app.hpp
+            window-youtube-actions.cpp
+            window-youtube-actions.hpp
+            youtube-api-wrappers.cpp
+            youtube-api-wrappers.hpp)
 endif()
 
 if(OS_WINDOWS)
@@ -339,6 +347,7 @@
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/obs.rc.in ${CMAKE_BINARY_DIR}/obs.rc)
 
   find_package(Detours REQUIRED)
+  find_package(nlohmann_json REQUIRED)
 
   target_sources(
     obs
@@ -355,27 +364,23 @@
             update/update-helpers.hpp
             update/crypto-helpers-mbedtls.cpp
             update/crypto-helpers.hpp
+            update/models/branches.hpp
+            update/models/whatsnew.hpp
+            win-update/updater/manifest.hpp
             ${CMAKE_BINARY_DIR}/obs.rc)
 
-  if(_QT_VERSION EQUAL 5)
-    find_qt(COMPONENTS WinExtras)
-    target_link_libraries(obs PRIVATE Qt::WinExtras)
-  endif()
-
   find_package(MbedTLS)
-  target_link_libraries(obs PRIVATE Mbedtls::Mbedtls OBS::blake2 Detours::Detours)
+  target_link_libraries(obs PRIVATE Mbedtls::Mbedtls nlohmann_json::nlohmann_json OBS::blake2 Detours::Detours)
 
   target_compile_features(obs PRIVATE cxx_std_17)
 
   target_compile_definitions(obs PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS
                                          PSAPI_VERSION=2)
 
+  set_source_files_properties(update/win-update.cpp PROPERTIES COMPILE_DEFINITIONS OBS_COMMIT="${OBS_COMMIT}")
   if(MSVC)
     target_link_options(obs PRIVATE "LINKER:/IGNORE:4098" "LINKER:/IGNORE:4099")
     target_link_libraries(obs PRIVATE OBS::w32-pthreads)
-
-    set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}../deps/libff/libff/ff-util.c PROPERTIES COMPILE_FLAGS
-                                                                                                    -Dinline=__inline)
   endif()
 
   if(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -426,17 +431,27 @@
 
   if(ENABLE_WHATSNEW)
     find_library(SECURITY Security)
+    find_package(nlohmann_json REQUIRED)
     mark_as_advanced(SECURITY)
-    target_link_libraries(obs PRIVATE ${SECURITY} OBS::blake2)
 
-    target_sources(obs PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mac.mm update/shared-update.cpp
-                               update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
+    target_link_libraries(obs PRIVATE ${SECURITY} OBS::blake2 nlohmann_json::nlohmann_json)
+
+    target_sources(
+      obs
+      PRIVATE update/crypto-helpers.hpp
+              update/crypto-helpers-mac.mm
+              update/shared-update.cpp
+              update/shared-update.hpp
+              update/update-helpers.cpp
+              update/update-helpers.hpp
+              update/models/whatsnew.hpp)
 
     if(SPARKLE_APPCAST_URL AND SPARKLE_PUBLIC_KEY)
       find_library(SPARKLE Sparkle)
       mark_as_advanced(SPARKLE)
 
-      target_sources(obs PRIVATE update/mac-update.cpp update/mac-update.hpp update/sparkle-updater.mm)
+      target_sources(obs PRIVATE update/mac-update.cpp update/mac-update.hpp update/sparkle-updater.mm
+                                 update/models/branches.hpp)
       target_compile_definitions(obs PRIVATE ENABLE_SPARKLE_UPDATER)
       target_link_libraries(obs PRIVATE ${SPARKLE})
       # Enable Automatic Reference Counting for Sparkle wrapper
@@ -468,13 +483,14 @@
 
   if(OS_LINUX AND ENABLE_WHATSNEW)
     find_package(MbedTLS)
+    find_package(nlohmann_json REQUIRED)
     if(NOT MBEDTLS_FOUND)
       obs_status(FATAL_ERROR "mbedTLS not found, but required for WhatsNew support on Linux")
     endif()
 
     target_sources(obs PRIVATE update/crypto-helpers.hpp update/crypto-helpers-mbedtls.cpp update/shared-update.cpp
                                update/shared-update.hpp update/update-helpers.cpp update/update-helpers.hpp)
-    target_link_libraries(obs PRIVATE Mbedtls::Mbedtls OBS::blake2)
+    target_link_libraries(obs PRIVATE Mbedtls::Mbedtls nlohmann_json::nlohmann_json OBS::blake2)
   endif()
 endif()
 
@@ -489,6 +505,10 @@
 unset(_SOURCES)
 unset(_UI)
 
+get_property(OBS_MODULE_LIST GLOBAL PROPERTY OBS_MODULE_LIST)
+list(JOIN OBS_MODULE_LIST "|" SAFE_MODULES)
+target_compile_definitions(obs PRIVATE "SAFE_MODULES=\"${SAFE_MODULES}\"")
+
 define_graphic_modules(obs)
 setup_obs_app(obs)
 setup_target_resources(obs obs-studio)

obs-studio-29.1.3.tar.xz/UI/cmake/macos/Info.plist.in -> obs-studio-30.0.2.tar.xz/UI/cmake/macos/Info.plist.in Changed

@@ -2,40 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleExecutable</key>
-	<string>OBS</string>
-	<key>CFBundleIconFile</key>
-	<string>AppIcon</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.obs-studio</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>OBS Studio</string>
-	<key>CFBundleDisplayName</key>
-	<string>OBS Studio</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleSupportedPlatforms</key>
- 	<array>
- 		<string>MacOSX</string>
- 	</array>
 	<key>NSHighResolutionCapable</key>
 	<true/>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
 	<key>LSAppNapIsDisabled</key>
 	<true/>
-	<key>NSCameraUsageDescription</key>
- 	<string>OBS needs to access the camera to enable camera sources to work.</string>
- 	<key>NSMicrophoneUsageDescription</key>
- 	<string>OBS needs to access the microphone to enable audio input.</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
 	<key>SUFeedURL</key>
 	<string>${SPARKLE_APPCAST_URL}</string>
 	<key>SUPublicEDKey</key>

obs-studio-30.0.2.tar.xz/UI/cmake/macos/entitlements-extension.plist Added

obs-studio-29.1.3.tar.xz/UI/cmake/macos/exportOptions-extension.plist.in -> obs-studio-30.0.2.tar.xz/UI/cmake/macos/exportOptions-extension.plist.in Changed

obs-studio-29.1.3.tar.xz/UI/cmake/macos/exportOptions.plist.in -> obs-studio-30.0.2.tar.xz/UI/cmake/macos/exportOptions.plist.in Changed

obs-studio-29.1.3.tar.xz/UI/cmake/os-macos.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/os-macos.cmake Changed

@@ -2,20 +2,21 @@
 target_add_resource(obs-studio "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Assets.xcassets")
 endif()
 
-find_library(APPKIT Appkit)
-find_library(AVFOUNDATION AVFoundation)
-find_library(APPLICATIONSERVICES ApplicationServices)
-mark_as_advanced(APPKIT AVFOUNDATION APPLICATIONSERVICES)
-
 target_sources(obs-studio PRIVATE platform-osx.mm forms/OBSPermissions.ui window-permissions.cpp window-permissions.hpp)
+target_compile_options(
+ obs-studio PRIVATE -Wno-error=float-conversion -Wno-error=implicit-int-conversion -Wno-error=shorten-64-to-32
+ -Wno-quoted-include-in-framework-header -Wno-comma)
 
 set_source_files_properties(platform-osx.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 
-target_link_libraries(obs-studio PRIVATE ${APPKIT} ${AVFOUNDATION} ${APPLICATIONSERVICES})
-
-target_compile_options(obs-studio PRIVATE -Wno-error=float-conversion -Wno-error=implicit-int-conversion
- -Wno-error=shorten-64-to-32)
-
 if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0.3)
 target_compile_options(obs-studio PRIVATE -Wno-error=unqualified-std-cast-call)
 endif()
+
+# cmake-format: off
+target_link_libraries(
+ obs-studio
+ PRIVATE "$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,ApplicationServices.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,AVFoundation.framework>")
+# cmake-format: on

obs-studio-29.1.3.tar.xz/UI/cmake/os-windows.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/os-windows.cmake Changed

@@ -8,6 +8,7 @@
 
 find_package(MbedTLS)
 find_package(Detours REQUIRED)
+find_package(nlohmann_json REQUIRED)
 
 configure_file(cmake/windows/obs.rc.in obs.rc)
 
@@ -26,10 +27,14 @@
 update/update-window.cpp
 update/update-window.hpp
 update/win-update.cpp
- update/win-update.hpp)
+ update/win-update.hpp
+ update/models/branches.hpp
+ update/models/whatsnew.hpp
+ win-update/updater/manifest.hpp)
 
-target_link_libraries(obs-studio PRIVATE crypt32 OBS::blake2 OBS::w32-pthreads MbedTLS::MbedTLS Detours::Detours)
-target_compile_options(obs-studio PRIVATE PSAPI_VERSION=2)
+target_link_libraries(obs-studio PRIVATE crypt32 OBS::blake2 OBS::w32-pthreads MbedTLS::MbedTLS
+ nlohmann_json::nlohmann_json Detours::Detours)
+target_compile_definitions(obs-studio PRIVATE PSAPI_VERSION=2)
 target_link_options(obs-studio PRIVATE /IGNORE:4098 /IGNORE:4099)
 
 add_library(obs-update-helpers INTERFACE)
@@ -38,6 +43,14 @@
 target_sources(obs-update-helpers INTERFACE win-update/win-update-helpers.cpp win-update/win-update-helpers.hpp)
 target_include_directories(obs-update-helpers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/win-update")
 
+# Set commit for untagged version comparisons in the Windows updater
+if(OBS_VERSION MATCHES ".+ga-f0-9+.*")
+ string(REGEX REPLACE ".+g(a-f0-9+).*$" "\\1" OBS_COMMIT ${OBS_VERSION})
+else()
+ set(OBS_COMMIT "")
+endif()
+set_source_files_properties(update/win-update.cpp PROPERTIES COMPILE_DEFINITIONS OBS_COMMIT="${OBS_COMMIT}")
+
 add_subdirectory(win-update/updater)
 
 set_property(
@@ -48,8 +61,6 @@
 set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT obs-studio)
 set_target_properties(
 obs-studio
- PROPERTIES
- WIN32_EXECUTABLE TRUE
- VS_DEBUGGER_COMMAND
- "${CMAKE_BINARY_DIR}/rundir/$<CONFIG>/$<$<BOOL:${OBS_WINDOWS_LEGACY_DIRS}>:bin/>$<TARGET_FILE_NAME:obs-studio>"
- VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/rundir/$<CONFIG>$<$<BOOL:${OBS_WINDOWS_LEGACY_DIRS}>:/bin>")
+ PROPERTIES WIN32_EXECUTABLE TRUE
+ VS_DEBUGGER_COMMAND "${CMAKE_BINARY_DIR}/rundir/$<CONFIG>/bin/64bit/$<TARGET_FILE_NAME:obs-studio>"
+ VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/rundir/$<CONFIG>/bin/64bit")

obs-studio-29.1.3.tar.xz/UI/cmake/ui-elements.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/ui-elements.cmake Changed

obs-studio-29.1.3.tar.xz/UI/cmake/ui-qt.cmake -> obs-studio-30.0.2.tar.xz/UI/cmake/ui-qt.cmake Changed

obs-studio-30.0.2.tar.xz/UI/cmake/windows Added

obs-studio-30.0.2.tar.xz/UI/cmake/windows/obs-studio.ico Added

obs-studio-30.0.2.tar.xz/UI/cmake/windows/obs.manifest Added

obs-studio-30.0.2.tar.xz/UI/cmake/windows/obs.rc.in Added

obs-studio-29.1.3.tar.xz/UI/context-bar-controls.cpp -> obs-studio-30.0.2.tar.xz/UI/context-bar-controls.cpp Changed

@@ -40,7 +40,7 @@
 
 	OBSDataAutoRelease oldSettings = obs_source_get_settings(source);
 	obs_data_apply(oldData, oldSettings);
-	obs_data_set_string(oldData, "undo_sname", obs_source_get_name(source));
+	obs_data_set_string(oldData, "undo_suuid", obs_source_get_uuid(source));
 }
 
 void SourceToolbar::SetUndoProperties(obs_source_t *source, bool repeatable)
@@ -55,17 +55,17 @@
 	OBSSource currentSceneSource = main->GetCurrentSceneSource();
 	if (!currentSceneSource)
 		return;
-	std::string scene_name = obs_source_get_name(currentSceneSource);
-	auto undo_redo = scene_name = std::move(scene_name),
+	std::string scene_uuid = obs_source_get_uuid(currentSceneSource);
+	auto undo_redo = scene_uuid = std::move(scene_uuid),
 			  main(const std::string &data) {
 		OBSDataAutoRelease settings =
 			obs_data_create_from_json(data.c_str());
-		OBSSourceAutoRelease source = obs_get_source_by_name(
-			obs_data_get_string(settings, "undo_sname"));
+		OBSSourceAutoRelease source = obs_get_source_by_uuid(
+			obs_data_get_string(settings, "undo_suuid"));
 		obs_source_reset_settings(source, settings);
 
 		OBSSourceAutoRelease scene_source =
-			obs_get_source_by_name(scene_name.c_str());
+			obs_get_source_by_uuid(scene_uuid.c_str());
 		main->SetCurrentScene(scene_source.Get(), true);
 
 		main->UpdateContextBar();
@@ -74,8 +74,8 @@
 	OBSDataAutoRelease new_settings = obs_data_create();
 	OBSDataAutoRelease curr_settings = obs_source_get_settings(source);
 	obs_data_apply(new_settings, curr_settings);
-	obs_data_set_string(new_settings, "undo_sname",
-			    obs_source_get_name(source));
+	obs_data_set_string(new_settings, "undo_suuid",
+			    obs_source_get_uuid(source));
 
 	std::string undo_data(obs_data_get_json(oldData));
 	std::string redo_data(obs_data_get_json(new_settings));
@@ -92,7 +92,8 @@
 /* ========================================================================= */
 
 BrowserToolbar::BrowserToolbar(QWidget *parent, OBSSource source)
-	: SourceToolbar(parent, source), ui(new Ui_BrowserSourceToolbar)
+	: SourceToolbar(parent, source),
+	  ui(new Ui_BrowserSourceToolbar)
 {
 	ui->setupUi(this);
 }
@@ -113,7 +114,8 @@
 /* ========================================================================= */
 
 ComboSelectToolbar::ComboSelectToolbar(QWidget *parent, OBSSource source)
-	: SourceToolbar(parent, source), ui(new Ui_DeviceSelectToolbar)
+	: SourceToolbar(parent, source),
+	  ui(new Ui_DeviceSelectToolbar)
 {
 	ui->setupUi(this);
 }
@@ -311,15 +313,13 @@
 	const char *device_str =
 		get_os_text(mod, "Monitor", "DisplayCapture.Display", "Screen");
 	ui->deviceLabel->setText(device_str);
-#ifndef _WIN32
-	is_int = true;
-#endif
 
 #ifdef _WIN32
 	prop_name = "monitor_id";
 #elif __APPLE__
-	prop_name = "display";
+	prop_name = "display_uuid";
 #else
+	is_int = true;
 	prop_name = "screen";
 #endif
 
@@ -386,7 +386,8 @@
 /* ========================================================================= */
 
 GameCaptureToolbar::GameCaptureToolbar(QWidget *parent, OBSSource source)
-	: SourceToolbar(parent, source), ui(new Ui_GameCaptureToolbar)
+	: SourceToolbar(parent, source),
+	  ui(new Ui_GameCaptureToolbar)
 {
 	obs_property_t *p;
 	int cur_idx;
@@ -471,7 +472,8 @@
 /* ========================================================================= */
 
 ImageSourceToolbar::ImageSourceToolbar(QWidget *parent, OBSSource source)
-	: SourceToolbar(parent, source), ui(new Ui_ImageSourceToolbar)
+	: SourceToolbar(parent, source),
+	  ui(new Ui_ImageSourceToolbar)
 {
 	ui->setupUi(this);
 
@@ -531,7 +533,8 @@
 }
 
 ColorSourceToolbar::ColorSourceToolbar(QWidget *parent, OBSSource source)
-	: SourceToolbar(parent, source), ui(new Ui_ColorSourceToolbar)
+	: SourceToolbar(parent, source),
+	  ui(new Ui_ColorSourceToolbar)
 {
 	ui->setupUi(this);
 
@@ -600,7 +603,8 @@
 extern void MakeQFont(obs_data_t *font_obj, QFont &font, bool limit = false);
 
 TextSourceToolbar::TextSourceToolbar(QWidget *parent, OBSSource source)
-	: SourceToolbar(parent, source), ui(new Ui_TextSourceToolbar)
+	: SourceToolbar(parent, source),
+	  ui(new Ui_TextSourceToolbar)
 {
 	ui->setupUi(this);
 
@@ -650,8 +654,10 @@
 	options = QFontDialog::DontUseNativeDialog;
 #endif
 
-	font = QFontDialog::getFont(&success, font, this, "Pick a Font",
-				    options);
+	font = QFontDialog::getFont(
+		&success, font, this,
+		QTStr("Basic.PropertiesWindow.SelectFont.WindowTitle"),
+		options);
 	if (!success) {
 		return;
 	}

obs-studio-30.0.2.tar.xz/UI/data/locale/af-ZA.ini Added

@@ -0,0 +1,536 @@
+Language="Afrikaans"
+OK="Goed"
+Apply="Pas toe"
+Cancel="Kanselleer"
+Close="Maak toe"
+Save="Stoor"
+Discard="Verwyder"
+Disable="Deaktiveer"
+Yes="Ja"
+No="Nee"
+Add="Voeg by"
+Remove="Verwyder"
+Rename="Hernoem"
+Interact="Interaksie"
+Properties="Eienskappe"
+MoveUp="Beweeg Op"
+MoveDown="Beweeg Af"
+Settings="Instellings"
+Display="Vertoon"
+Name="Naam"
+Exit="Verlaat"
+Mixer="OudioMenger"
+Browse="Blaai"
+StudioProgramProjector="Volskerem Projektor (Program)"
+PreviewProjector="Volskerem Projektor (Voorshou)"
+SceneProjector="Volskerem Projektor (Toneel)"
+SourceProjector="Volskerem Projektor (Bron)"
+StudioProgramWindow="Gevensterde Projektor (Program)"
+PreviewWindow="Gevensterde Projektor (Voorshou)"
+SceneWindow="Gevensterde Projektor (Toneel)"
+SourceWindow="Gevensterde Projektor (Bron)"
+MultiviewProjector="Milti aansig (Volskerm)"
+MultiviewWindowed="Milti aansig (Gevensterde)"
+ResizeProjectorWindowToContent="Pas Skerm met inhoud"
+Clear="Vee Uit"
+Revert="Keur Terug"
+Show="Wys"
+Hide="Versteek"
+UnhideAll="Onsteek Alles"
+Untitled="Ongetitelde"
+New="Nuwe"
+Duplicate="Dupliseer"
+Enable="Aktiveer"
+DisableOSXVSync="Deaktiveer macOS V-Sync"
+Transition="Transiesie"
+QuickTransitions="Vinnege Transiesie"
+FadeToBlack="Verdwyn na swart"
+Left="Links"
+Right="Regs"
+Top="Bo"
+Bottom="Onder"
+Reset="Terugstel"
+Hours="Ure"
+Minutes="Minute"
+Seconds="Sekondes"
+Deprecated="Afgemaai"
+Import="Voer in"
+Export="Stuur uit"
+Copy="Kopieer"
+Paste="Plak"
+PasteReference="Plak (verwysing)"
+PasteDuplicate="Plak (dupliseer)"
+RemuxRecordings="Hermuks opnames"
+Next="Volgende"
+Back="Terug"
+Defaults="Verstekke"
+RestoreDefaults="Verstekke"
+HideMixer="Versteek in menger"
+ShowTransition="Toon oorgang"
+HideTransition="Versteek oorgang"
+None="Geen"
+StudioMode.Preview="Voorskou"
+StudioMode.PreviewSceneName="Voorskou: %1"
+VerticalLayout="Vertikale uitleg"
+Group="Groep"
+DoNotShowAgain="Moet dit nie weer toon nie"
+Default="(Verstek)"
+Calculating="Bereken tans…"
+Fullscreen="Volskerm"
+Windowed="Venster"
+AspectRatio="Aspekverhouding %1:%2"
+LockVolume="Vergrendel volume"
+OpenFile="Open lêer"
+AddSource="Voeg bron toe"
+RemoveScene="Verwyder gekose toneel"
+RemoveSource="erwyder gekose bron(ne)"
+MoveSceneUp="Skuif toneel boontoe"
+MoveSceneDown="Skuif toneel ondertoe"
+MoveSourceUp="Skuif bron(ne) op"
+MoveSourceDown="Skuif bron(ne) af"
+SourceProperties="Open broneienskappe"
+SourceFilters="Open bronfilters"
+MixerToolbarMenu="Oudiomengerkieslys"
+SceneFilters="Open toneelfilters"
+List="Lys"
+Grid="Rooster"
+PluginsFailedToLoad.Text="Die volgende OBS-inprop kon nie laai nie:\n\n%1\nWerk dit by of verwyder hierdie inproppe."
+AlreadyRunning.Title="OBS loop reeds"
+AlreadyRunning.Text="OBS loop reeds! Tensy die bedoeling was om dit te doen, moet u asb. enige bestaande instansies van OBS sluit voor u ’n nuwe instansie wil laat loop. Indien OBS in die stelsellaai verklein is, kyk asb. om te sien of dit nog daar loop."
+AlreadyRunning.LaunchAnyway="Laat in elk geval loop"
+AutoSafeMode.Title="Veilige modus"
+AutoSafeMode.Text="OBS het nie korrek afgesluityij die vorige sessie nie.\n\nWil u nou in veilige modus begin (derdeparty-inproppe, skripte en WebSockets gedeaktiveer)?"
+AutoSafeMode.LaunchSafe="Laat in veilige modus loop"
+AutoSafeMode.LaunchNormal="Laat normaal loop"
+SafeMode.Restart="Wil u OBS in veilige modus herbegin (derdeparty-inproppe, skripte en WebSockets gedeaktiveer)?"
+SafeMode.RestartNormal="Wil u OBS in normale modus herbegin?"
+ChromeOS.Title="Onondersteunde platform"
+ChromeOS.Text="OBS blyk binne ’n ChromeOS-houer te loop. Hierdie platform word nie ondersteun nie."
+Wine.Title="Wine bespeur"
+DockCloseWarning.Title="Dokbare venster word gesluit"
+DockCloseWarning.Text="U het pas ’n dokbare venster gesluit. Indien u dit weer wil vertoon kan u die Doks-kieslys in die kieslysbalk gebruik."
+ExtraBrowsers="Pasgemaakte blaaierdoks"
+ExtraBrowsers.Info="Voeg doks toe deur ’n naam en URL daaraan te gee, klik dan op Pas toe of Sluit om die doks te open. U kan enige tyd doks toevoeg of verwyder."
+ExtraBrowsers.DockName="Doknaam"
+Auth.LoadingChannel.Title="Laai tans kanaalinligting…"
+Auth.LoadingChannel.Text="Laai tans kanaalinligting vir %1, wag asb…"
+Auth.LoadingChannel.Error="Kon nie kanaalinligting kry nie."
+Auth.ChannelFailure.Title="Kon nie kanaal laai nie"
+Auth.ChannelFailure.Text="Kon nie kanaalinligting vir %1\n\n%2: %3 laai nie"
+Auth.Chat="Klets"
+Auth.StreamInfo="Stroominligting"
+TwitchAuth.Stats="Twitch-statiestieke"
+TwitchAuth.Feed="Twitch-aktiwiteitsvoer"
+TwitchAuth.TwoFactorFail.Text="OBS kon nie aan u Twitch-rekening koppel nie; sorg dat tweestapwaarmerking ingestel is in die <a href='https://www.twitch.tv/settings/security'>Twitch-veiligheidssinstellings</a>, omdat dit vereis word om te kan stroom."
+Copy.Filters="Kopieer filters"
+Paste.Filters="Plak filters"
+BandwidthTest.Region="Streek"
+BandwidthTest.Region.US="Verenigde State"
+BandwidthTest.Region.EU="Europa"
+BandwidthTest.Region.Asia="Asië"
+BandwidthTest.Region.Other="Ander"
+Basic.AutoConfig.ApplySettings="Pas instellings toe"
+Basic.AutoConfig.StartPage="Gebruik inligting"
+Basic.AutoConfig.StartPage.SubTitle="Spesifiseer waarvoor u die program wil gebruik"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Ek gaan slegs die virtuele kamera gebruik"
+Basic.AutoConfig.VideoPage="Video-instellings"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Gebruik huidige (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Beeldskerm %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Gebruik huidige (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 of 30, maar gee voorkeur aan 60 wanneer moontlik"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 of 30, maar gee voorkeur aan hoër beeldskerpte"
+Basic.AutoConfig.VideoPage.CanvasExplanation="Nota: die basisbeeldskerpte (doek) hoef nie gelyk te wees aan die beeldskerpte waarmee u stroom of opneem nie. U stroom/opnamebeeldskerpte kan afgeskaal word vanaf die basisbeeldskerpte om die belasting op die rekenaar of die benodigde bistempo te verlaag."
+Basic.AutoConfig.StreamPage="Stroominligting"
+Basic.AutoConfig.StreamPage.ConnectAccount="Koppel rekening (aanbeveel)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Ontkoppel rekening"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Ontkoppel rekening?"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Hierdie verandering sal onmiddellik van toepassing wees. Is u seker u wil u rekening ontkoppel?"
+Basic.AutoConfig.StreamPage.MoreInfo="Meer inligting"
+Basic.AutoConfig.StreamPage.Service="Diens"
+Basic.AutoConfig.StreamPage.Service.ShowAll="Toon alles…"
+Basic.AutoConfig.StreamPage.Service.Custom="Pasgemaak..."
+Basic.AutoConfig.StreamPage.Server="Bediener"
+Basic.AutoConfig.StreamPage.EncoderKey="Enkodeerdersleutel"
+Basic.AutoConfig.StreamPage.ConnectedAccount="Gekoppelde rekening"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Verkies apparatuurenkodering"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Apparatuurenkodering elimineer die meeste SVE-gebruik, maar kan meer bistempo vereis om dieselfde kwaliteitsvlak te handhaaf."
+Basic.AutoConfig.TestPage.SubTitle.Testing="Die program voer nou ’n stel toetse uit om die ideale instellings te raam."
+Basic.AutoConfig.TestPage.SubTitle.Complete="Toetse is afgehandel"
+Basic.AutoConfig.TestPage.TestingBandwidth="Bandwydtetoets word uitgevoer, dit kan enkele minute duur…"
+Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Geen afvoer vir die protokol van hierdie diens gevind"
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="Toets tans bandwydte vir: %1"
+Basic.AutoConfig.TestPage.TestingRes.Resolution="Toets tans %1x%2 %3 RPS…"
+Basic.Stats="Statistieke"
+Basic.Stats.CPUUsage="SVE-gebruik"
+Basic.Stats.HDDSpaceAvailable="Beskikbare skyfspasie"
+Basic.Stats.MemoryUsage="Geheuegebruik"
+Basic.Stats.Status.Live="REGSTREEKS"
+Basic.Stats.Status.Inactive="Onaktief"
+Basic.Stats.Status.Active="Aktief"
+ResetUIWarning.Text="Herstel van die koppelvlak sal ekstra doks versteek. As u hierdie doks tog wil sien, dan moet u dit in die Doks-kieslys weer sigbaar maak.\n\nIs u seker u wil die koppelvlak herstel?"
+Updater.RemindMeLater="Herinner my later"
+Updater.Skip="Slaan weergawe oor"
+Updater.NoUpdatesAvailable.Title="Geen bywerkings beskikbaar"
+Updater.BranchNotFound.Text="U gekose bywerkkanaal is nie meer beskikbaar nie, OBS is teruggestel na die verstekbywerkkanaal."
+QuickTransitions.HotkeyName="Kitsoorgang: %1"
+Basic.TransitionProperties="Oorgangeienskappe"
+Basic.TransitionDuration="Duur"
+Basic.TogglePreviewProgramMode="Studiomodus"
+Basic.EnablePreviewProgramMode="Aktiveer Studiomodus"
+Basic.DisablePreviewProgramMode="Deaktiveer Studiomodus"
+Undo.Undo="Ontdoen"
+Undo.Redo="Herdoen"
+Undo.Add="Voeg ‘%1’ toe"
+Undo.Delete="Skrap ‘%1’"
+Undo.Rename="Hernoem ‘%1’"
+Undo.SceneCollection.Switch="Wissel na ‘%1’"
+Undo.Item.Undo="Ontdoen %1"
+Undo.Item.Redo="Herdoen %1"
+Undo.Sources.Multi="Skrap %1 bronne"
+Undo.Transform.HFlip="Spieël horisontaal in ‘%1’"
+Undo.Transform.HCenter="Plaas horisontaal in middel van skerm in ‘%1’"
+Undo.Mixers.Change="Verander oudiomengers op ‘%1’"
+TransitionNameDlg.Title="Oorgangnaam"
+TitleBar.Profile="Profiel"
+NameExists.Title="Naam bestaat reeds"
+NameExists.Text="Die naam is reeds in gebruik"
+NoNameEntered.Title="Voer asb. ’n geldige naam in"
+NoNameEntered.Text="U kan nie leë name gebruik nie."
+ConfirmStopRecord.Title="Stop opname?"
+ConfirmStopRecord.Text="Is u seker u wil die opname stop?"
+ConfirmReset.Text="Is u seker u wil die huidige eienskappe na die verstekwaarde terugstel?"
+Output.RecordError.Title="Opnamefout"
+Output.BadPath.Title="Ongeldige lêerpad"
+Output.BadPath.Text="Die gekonfigureerde lêerpad kon nie geopen word nie. Gaan u opnamepad onder Instellings → Afvoer → Opname na."
+LogReturnDialog.CopyURL="Kopieer URL"
+LogReturnDialog.AnalyzeURL="ontleed"
+Remux.SourceFile="OBS Opname"
+Remux.TargetFile="Teikenlêer"
+Remux.Remux="Hermuks"
+Remux.Stop="Stop met hermuks"
+Remux.FinishedTitle="Hermuks afgehandel"
+Remux.Finished="Opname gehermuks"
+Remux.FinishedError="Opname gehermuks, maar die lêer is dalk onvolledig"
+Remux.SelectTarget="Kies teikenlêer…"
+Remux.FileExistsTitle="Teikenlêer bestaan"
+Remux.FileExists="Die volgende teikenlêers bestaan reeds. Wil u hulle vervang?"
+Remux.ExitUnfinishedTitle="Besig met hermuks"
+Remux.ExitUnfinished="Hermuks is nog nie klaar nie; as u nou stop kan die teikenlêer onbruikbaar word.\nIs u seker u wil die hermuks stop?"
+Remux.NoFilesAddedTitle="Geen hermukslêer toegevoeg"
+Remux.NoFilesAdded="Geen lêer is toegevoeg om te hermuks nie. Los ’n vouer met een of meer videolêers hier."
+MissingFiles="Ontbrekende lêers"
+MissingFiles.MissingFile="Ontbrekende lêer"
+MissingFiles.NewFile="Nuwe lêer"
+MissingFiles.HelpText="Sommige lêers ontbreek sedert u OBS laas gebruik het."
+MissingFiles.NumFound="%1 van %2 gevind"
+MissingFiles.Search="Deursoek gids…"
+MissingFiles.SelectFile="Kies lêers…"
+MissingFiles.SelectDir="Kies die vouer waarin u wil soek"
+MissingFiles.State="Toestand"
+MissingFiles.Missing="Ontbrekend"
+MissingFiles.Replaced="Vervang"
+MissingFiles.Cleared="Gewis"
+MissingFiles.Found="Gevind"
+MacPermissions.Description="OBS Studio benodig u toestemming om bepaalde funksies te kan bied. Dit word aanbeveel om hierdie magtiging te aktiveer, maar dit is nie nodig om die toep te gebruik nie. U kan dit later altyd weer aktiveer."
+MacPermissions.Description.OpenDialog="U kan hierdie dialoogvenster heropen via die OBS Studio-kieslys."
+MacPermissions.AccessGranted="Toegang toegestaan"
+MacPermissions.RequestAccess="Versoek toegang"
+MacPermissions.Item.Camera="Kamera"
+MacPermissions.Item.Microphone="Mikrofoon"
+MacPermissions.Item.Accessibility="Toeganklikheid"
+Basic.DisplayCapture="Beeldskermopname"
+ScaleFiltering.Bilinear="Bilineêr"
+BlendingMethod.Default="Verstek"
+BlendingMode="Mengmodus"
+BlendingMode.Normal="Normaal"
+BlendingMode.Additive="Voeg toe"
+BlendingMode.Subtract="Trek af"
+BlendingMode.Screen="Skerm"
+BlendingMode.Multiply="Vermenigvuldig"
+BlendingMode.Lighten="Maak ligter"
+BlendingMode.Darken="Maak donkerder"
+VolControl.UnassignedWarning.Text="“%1” is nie toegewys aan ’n oudiosnit nie en sal nie in die strome of opnames hoorbaar wees nie.\n\nOm ’n oudiobron toe te wys aan ’n kanaal, open die Gevorderde Oudio-eienskappe deur die regsklikkieslys of die ratknop in die mengerdoknutsbalk."
+Basic.Main.MixerRename.Title="Hernoem oudiobron"
+Basic.Main.MixerRename.Text="Voer asb. die naam van die oudiobron in"
+Basic.SourceSelect="Skep/kies bron"
+Basic.SourceSelect.CreateNew="Skep nuwe"
+Basic.SourceSelect.AddExisting="Voeg bestaande toe"
+Basic.SourceSelect.AddVisible="Maak bron sigbaar"
+Basic.Main.Sources.Visibility="Sigbaarheid"
+Basic.Main.Sources.Lock="Vergrendel"
+Basic.Main.Sources.LockDescription="Vergrendel die posisie en skaal van ‘%1’ op die doek"
+Basic.PropertiesWindow="Eienskappe vir ‘%1’"
+Basic.PropertiesWindow.SelectColor="Kies kleur"
+Basic.PropertiesWindow.NoProperties="Geen eienskappe beskikbaar"
+Basic.PropertiesWindow.AddFiles="Voeg lêers toe"
+Basic.PropertiesWindow.AddDir="Voeg gids toe"
+Basic.PropertiesWindow.AddURL="Voeg pad/URL toe"
+Basic.PropertiesWindow.AddEditableListDir="Voeg gids toe tot ’%1’"
+Basic.PropertiesWindow.AddEditableListFiles="Voeg lêers toe tot ‘%1’"
+Basic.PropertiesView.FPS.Simple="Eenvoudige RPS-waardes"
+Basic.PropertiesView.FPS.Rational="Rasionele RPS-waardes"
+Basic.PropertiesView.FPS.ValidFPSRanges="Geldige RPS-bereike:"
+Basic.PropertiesView.UrlButton.Text="Open hierdie skakel in u verstekwebblaaier?"
+Basic.StatusBar.Delay="Vertraging (%1 sek)"
+Basic.StatusBar.AutoRemuxedTo="Opname outomaties gehermuks na ‘%1’"
+Basic.Filters.AsyncFilters="Oudio-/Videofilters"
+Basic.Filters.AudioFilters="Oudiofilters"
+Basic.Filters.EffectFilters="Effekfilters"
+Basic.Filters.Title="Filters vir ‘%1’"
+Basic.Filters.AddFilter.Title="Filternaam"
+Basic.Filters.AddFilter.Text="Spesifiseer die naam vir die filter"
+Basic.TransformWindow.Position="Posisie"
+Basic.TransformWindow.PositionX="Posisie X"
+Basic.TransformWindow.PositionY="Posisie Y"
+Basic.TransformWindow.Rotation="Rotasie"
+Basic.TransformWindow.Size="Grootte"
+Basic.TransformWindow.Width="Breedte"
+Basic.TransformWindow.Height="Hoogte"
+Basic.TransformWindow.Alignment="Positionele inlynstelling"
+Basic.TransformWindow.Crop="Snoei"
+Basic.TransformWindow.CropLeft="Snoei links"
+Basic.TransformWindow.CropRight="Snoei regs"
+Basic.TransformWindow.CropTop="Snoei bo"
+Basic.TransformWindow.CropBottom="Snoei onder"
+Basic.Main.Sources="Bronne"
+Basic.Main.Source="Bron"
+Basic.Main.StartRecording="Begin opname"
+Basic.Main.PauseRecording="Laat opname wag"
+Basic.VCam.OutputType.Program="Program (Verstek)"
+Basic.MainMenu.File.Remux="Her&muks opnames"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Spieël &horisontaal"
+Basic.MainMenu.Edit.Transform.FlipVertical="Spieël &vertikaal"
+Basic.MainMenu.Edit.Transform.HorizontalCenter="Horisontaal in die middel"
+Basic.MainMenu.View.ListboxToolbars="Dok nutsbalke"
+Basic.MainMenu.Docks="&Dokke"
+Basic.MainMenu.Docks.ResetDocks="&Herstel dokke"
+Basic.MainMenu.Docks.LockDocks="Vergrende&l dokke"
+Basic.MainMenu.Docks.SideDocks="&Volledigehoogtedoks"
+Basic.MainMenu.Docks.CustomBrowserDocks="&Pasgemaakte blaaierdoks…"
+Basic.MainMenu.Help.WhatsNew="Wat is nuut"
+Basic.MainMenu.Help.ReleaseNotes="Vrystellingsnotas"
+Basic.MainMenu.Help.CheckForUpdates="Soek na bywerkings"
+Basic.MainMenu.Help.Repair="Gaan lêerintegriteit na"
+Basic.Settings.ConfirmTitle="Bevestig veranderinge"
+Basic.Settings.Confirm="U het onbewaarde veranderinge. Bewaar verandeirnge?"
+Basic.Settings.General="Algemeen"
+Basic.Settings.General.Theme="Tema"
+Basic.Settings.General.Language="Taal"
+Basic.Settings.General.Updater="Bywerkings"
+Basic.Settings.General.UpdateChannel="Bywerkkanaal"
+Basic.Settings.General.UpdateChannelDisabled="(Gedeaktiveer)"
+Basic.Settings.General.UpdateChannelDefault="(Verstek)"
+Basic.Settings.General.Preview="Voorskou"
+Basic.Settings.General.OverflowHidden="Versteek oorloop"
+Basic.Settings.General.OverflowAlwaysVisible="Oorloop altyd sigbaar"
+Basic.Settings.General.OverflowSelectionHidden="Toon oorloop selfs wanneer bron onsigbaar is"
+Basic.Settings.General.Multiview.DrawSafeAreas="Teken veilige areas (EBU R 95)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horisontaal, bo (8 tonele)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horisontaal, onder (8 tonele)"
+Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Horisontaal, bo (18 tonele)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horisontaal, bo (24 tonele)"
+Basic.Settings.General.ChannelName.stable="Stabiel"
+Basic.Settings.General.ChannelDescription.stable="Nuutste stabiele vrystelling"
+Basic.Settings.Stream.Custom.Username="Gebruikersnaam"
+Basic.Settings.Stream.Custom.Password="Wagwoord"
+Basic.Settings.Stream.TTVAddon.None="Geen"
+Basic.Settings.Stream.StreamSettingsWarning="Open instellings"
+Basic.Settings.Stream.Recommended.MaxResolution="Maksimum beeldskerpte: %1"
+Basic.Settings.Stream.Recommended.MaxFPS="Maksimum RPS: %1"
+Basic.Settings.Output.Format.MKV="Matroska-video (.mkv)"
+Basic.Settings.Output.Format.fMP4="Gefragmenteerde MP4 (.mp4)"
+Basic.Settings.Output.Format.fMOV="Gefragmenteerde MOV (.mov)"
+Basic.Settings.Output.Format.TT.fmov="Gefragmenteerde MOV skryf die opname in dele en vereis nie dieselfde afsluiting as tradisionele MOV-lêers nie.\nDit verseker dat die lêer speelbaar bly, selfs as die skryf na skyf onderbreek word, bv. as gevolg van ’n BSOD of kragonderbreking.\n\nDit is dalk nie versoenbaar met alle spelers en redigeerders nie. Gebruik Lêer → Hermuks opnames om die lêer indien nodig in ’n meer versoenbare formaat om te skakel."
+Basic.Settings.Output.Format.TT.fmp4="Gefragmenteerde MP4 skryf die opname in dele en vereis nie dieselfde afsluiting as tradisionele MP4-lêers nie.\nDit verseker dat die lêer speelbaar bly, selfs as die skryf na skyf onderbreek word, bv. as gevolg van ’n BSOD of kragonderbreking.\n\nDit is dalk nie versoenbaar met alle spelers en redigeerders nie. Gebruik Lêer → Hermuks opnames om die lêer indien nodig in ’n meer versoenbare formaat om te skakel."
+Basic.Settings.Output.Encoder.Video="Video-enkodeerder"
+Basic.Settings.Output.Encoder.Audio="Oudio-enkodeerder"
+Basic.Settings.Output.ReplayBuffer.Suffix="Agtervoegsel"
+Basic.Settings.Output.Simple.SavePath="Opnamepad"
+Basic.Settings.Output.Simple.RecordingQuality="Opnamekwaliteit"
+Basic.Settings.Output.Simple.Warn.CannotPause="Waarskuwing: opnames kan nie onderbreek word as de opnamekwaliteit op ‘Dieselfde as stroom’ ingestel is nie."
+Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Waarskuwing: Die huidig gekose opnameformaat is onversoenbaar met die gekose stroomenkodeerder(s)."
+Basic.Settings.Output.Simple.Warn.Lossless.Msg="Is u seker u wil verlieslose kwaliteit gebruik?"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Verlieslosekwaliteitwaarskuwing!"
+Basic.Settings.Output.Simple.Encoder.Software="Programmatuur (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Apparatuur (QSV, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Apparatuur (QSV, AV1)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Apparatuur (AMD, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.HEVC="Apparatuur (AMD, HEVC)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.AV1="Apparatuur (AMD, AV1)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.H264="Apparatuur (NVENC, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Apparatuur (NVENC, AV1)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Apparatuur (NVENC, HEVC)"
+Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Apparatuur (Apple, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Apparatuur (Apple, HEVC)"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Programmatuur (x264 lae sve-gebruik, verhoog lêergrootte)"
+Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Verstek)"
+Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Onversoenbare beeldskerpte/beeldduur"
+Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Hierdie stroomdiens ondersteun nie die huidige afvoerresolusie en/of beeldduur nie; dit sal gewysig moet word na die naaste versoenbare waarde:\n\n%1\n\nWil u voortgaan?"
+Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Beeldskerpte: %1"
+Basic.Settings.Output.Warn.EnforceResolutionFPS.FPS="RPS: %1"
+Basic.Settings.Output.EncoderPreset.veryfast="%1 (verstek) (gemiddeld SVE-gebruik, standaard kwaliteit)"
+Basic.Settings.Output.CustomMuxerSettings="Pasgemaakte mukserinstellings"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alle lêers"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Lêerpad of URL"
+Basic.Settings.Output.Adv.FFmpeg.Format="Houerformaat"
+Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Oudio"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Verstekformaat"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Houerformaatbeskrywing"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Verstekenkodeerder"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Deaktiveer enkodeerder"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video-enkodeerder"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Video-enkodeerderinstellings (indien enige)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Oudio-enkodeerder"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Oudio-enkodeerderinstellings (indien enige)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Mukserinstellings (indien enige)"
+Basic.Settings.Output.Adv.FFmpeg.GOPSize="sleutelraaminterval (rame)"
+Basic.Settings.Output.Adv.FFmpeg.Settings="FFmpeg-instellings"
+Basic.Settings.Output.EnableSplitFile="Outomatiese lêersplitsing"
+Basic.Settings.Output.SplitFile.TypeTime="Gesplits op tyd"
+Basic.Settings.Output.SplitFile.TypeSize="Gesplits op grootte"
+Basic.Settings.Output.SplitFile.TypeManual="Splits slegs handmatig"
+Basic.Settings.Output.SplitFile.Time="Splits tyd"
+Basic.Settings.Output.SplitFile.Size="Splits grootte"
+FilenameFormatting.TT.CCYY="Jaar, vier syfers"
+FilenameFormatting.TT.YY="Jaar, laaste twee syfers (00-99)"
+FilenameFormatting.TT.MM="Maand as desimale getal (01-12)"
+FilenameFormatting.TT.DD="Dag van die maand, nul-opgevul (01-31)"
+FilenameFormatting.TT.hh="Uur in 24h-formaat (00-23)"
+FilenameFormatting.TT.mm="Minuut (00-59)"
+FilenameFormatting.TT.ss="Sekonde (00-59)"
+FilenameFormatting.TT.Percent="’n %-teken"
+FilenameFormatting.TT.a="Afgekorte weekdagnaam"
+FilenameFormatting.TT.A="Volledige weekdagnaam"
+FilenameFormatting.TT.b="Afgekorte maandnaam"
+FilenameFormatting.TT.B="Volledige maandnaam"
+FilenameFormatting.TT.d="Dag van die maand, nul-opgevul (01-31)"
+FilenameFormatting.TT.H="Uur in 24h-formaat (00-23)"
+FilenameFormatting.TT.I="Uur in 12h-formaat (01-12)"
+FilenameFormatting.TT.m="Maand as desimale getal (01-12)"
+FilenameFormatting.TT.M="Minuut (00-59)"
+FilenameFormatting.TT.S="Sekonde (00-59)"
+FilenameFormatting.TT.y="Jaar, laaste twee syfers (00-99)"
+FilenameFormatting.TT.Y="Jaar"
+FilenameFormatting.TT.FPS="Raampies per sekonde"
+FilenameFormatting.TT.CRES="Basisbeeldskerpte (Doek)"
+FilenameFormatting.TT.ORES="Afvoerbeeldskerpte (Geskaal)"
+FilenameFormatting.TT.VF="Videoformaat"
+Basic.Settings.Video.BaseResolution="Basisbeeldskerpte (Doek)"
+Basic.Settings.Video.ScaledResolution="Afvoerbeeldskerpte (Geskaal)"
+Basic.Settings.Video.FPS="RPS"
+Basic.Settings.Video.FPSCommon="Algemene RPS-waardes"
+Basic.Settings.Video.FPSInteger="Heelgetal-RPS-waarde"
+Basic.Settings.Video.FPSFraction="Breuk-RPS-waarde"
+Basic.Settings.Video.Numerator="Teller"
+Basic.Settings.Video.Denominator="Noemer"
+Basic.Settings.Video.InvalidResolution="Ongeldige beeldskerptewaarde. Moet breedte x hoogte wees (bv. 1920 x 1080)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineêr (Vinnigste, maar wasig by skaling)"
+Basic.Settings.Audio="Oudio"
+Basic.Settings.Audio.Channels="Kanale"
+Basic.Settings.Audio.MeterDecayRate.Fast="Vinnig"
+Basic.Settings.Audio.Disabled="Gedeaktiveer"
+Basic.Settings.Accessibility="Toeganklikheid"
+Basic.Settings.Accessibility.ColorOverrides="Gebruik verskillende kleure"
+Basic.Settings.Accessibility.ColorOverrides.MixerGreen="Mengervolumeband (-60 tot -20dB)"
+Basic.Settings.Accessibility.ColorOverrides.MixerYellow="Mengervolumeband (-20 tot -9dB)"
+Basic.Settings.Accessibility.ColorOverrides.MixerRed="Mengervolumeband (-9 tot -0dB)"
+Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive="Mengervolumeband (-60 tot -20dB) (aktief)"
+Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive="Mengervolumeband (-20 tot -9dB) (aktief)"
+Basic.Settings.Accessibility.ColorOverrides.MixerRedActive="Mengervolumeband (-9 tot -0dB) (aktief)"
+Basic.Settings.Accessibility.ColorOverrides.Preset="Kleurvoorinstelling"
+Basic.Settings.Accessibility.ColorOverrides.Preset.Default="Verstek"
+Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="Pasgemaak"
+Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="Vriendelik vir kleurblind"
+Basic.Settings.Advanced="Gevorderd"
+Basic.Settings.Advanced.General.ProcessPriority.High="Hoog"
+Basic.Settings.Advanced.General.ProcessPriority.Normal="Normaal"
+Basic.Settings.Advanced.Video.ColorFormat="Kleurformaat"
+Basic.Settings.Advanced.Video.ColorSpace="Kleurruimte"
+Basic.Settings.Advanced.Video.ColorRange="Kleurbereik"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Beperk"
+Basic.Settings.Advanced.Video.ColorRange.Full="Volledig"
+Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Verstek"
+Basic.Settings.Advanced.StreamDelay.Duration="Duur"
+Basic.Settings.Advanced.Network="Netwerk"
+Basic.Settings.Advanced.Network.BindToIP="Bind aan IP"
+Basic.Settings.Advanced.AutoRemux="Hermuks outomaties na %1"
+Basic.Settings.Advanced.AutoRemux.MP4="(neem op as mkv)"
+Basic.AdvAudio="Gevorderde oudio-eienskappe"
+Basic.AdvAudio.ActiveOnly="Slegs aktiewe bronne"
+Basic.AdvAudio.Name="Naam"
+Basic.AdvAudio.VolumeSource="Volume vir ‘%1’"
+Basic.AdvAudio.Balance="Balans"
+Basic.AdvAudio.BalanceSource="Balans vir ‘%1’"
+Basic.Settings.Hotkeys="Sneltoetse"
+Basic.Settings.Hotkeys.FilterByHotkey="Filter volgens sneltoets"
+Basic.SystemTray.Show="Toon"
+Basic.SystemTray.Hide="Versteek"
+Hotkeys.Left="Links"
+Hotkeys.Right="Regs"
+Hotkeys.Up="Boontoe"
+Hotkeys.Down="Ondertoe"
+Hotkeys.Menu="Kieslys"
+Hotkeys.Space="Spasie"
+Hotkeys.MouseButton="Muis %1"
+SceneItemShow="Toon ‘%1’"
+SceneItemHide="Versteek ‘%1’"
+OutputWarnings.MP4Recording="Waarskuwing: opnames wat as MP4/MOV bewaar is, is onherstelbaar as die lêer nie korrek afgesluit kan word nie (bv. deur BSOD’s, kragonderbreking ens.). As u meerspoor-oudiosnitte wil opneem, oorweeg dan die gebruik van MKV en hermuks die opname na MP4/MOV nadat dit afgerond is (Lêer → Hermuks opnames)"
+CodecCompat.CodecPlaceholder="Kies enkodeerder…"
+CodecCompat.ContainerPlaceholder="Kies formaat…"
+NoSources.Title="Geen bronne"
+NoSources.Label="U het geen bronne nie.\nKlik op die +-knop hieronder\nof regsklik hier om een toe te voeg."
+ChangeBG="Stel kleur in"
+CustomColor="Pasgemaakte kleur"
+About.Donate="Maak ’n bydrae"
+About.GetInvolved="Raak betrokke"
+About.Authors="Outeurs"
+About.License="Lisensie"
+About.Error="Fout! Lêer kon nie gelees word nie.\n\nGaan na: %1"
+About.Contribute="Ondersteun die OBS-projek"
+PreviewTransition="Oorvangvoorskou"
+ContextBar.NoSelectedSource="Geen bron gekies"
+ContextBar.MediaControls.BlindSeek="Mediasoekdingesie"
+YouTube.Auth.NoChannels="Geen kanaal(e) beskikbaar op gekose rekening"
+YouTube.Actions.Title="Titel*"
+YouTube.Actions.MyBroadcast="My uitsending"
+YouTube.Actions.Description="Beskrywing"
+YouTube.Actions.Privacy="Privaatheid*"
+YouTube.Actions.Privacy.Private="Privaat"
+YouTube.Actions.Privacy.Public="Publiek"
+YouTube.Actions.Privacy.Unlisted="Ongelys"
+YouTube.Actions.Category="Kategorie"
+YouTube.Actions.Thumbnail="Kiekie"
+YouTube.Actions.Thumbnail.SelectFile="Kies lêer…"
+YouTube.Actions.Thumbnail.NoFileSelected="Geen lêer gekies"
+YouTube.Actions.MadeForKids="Is hierdie video vir kinders gemaak?*"
+YouTube.Actions.MadeForKids.Yes="Ja, dit is vir kinders gemaak"
+YouTube.Actions.MadeForKids.No="Nee, dit is nie vir kinders gemaak nie"
+YouTube.Actions.AdditionalSettings="Bykomende instellings"
+YouTube.Actions.Latency="Vertraging"
+YouTube.Actions.Latency.Normal="Normaal"
+YouTube.Actions.Latency.Low="Laag"
+YouTube.Actions.ScheduleForLater="Skeduleer vir later"
+YouTube.Actions.RememberSettings="Onthou hierdie instellings"
+YouTube.Actions.Create_Ready="Skep uitsending"
+YouTube.Actions.Create_GoLive="Skep uitsending en begin stroom"
+YouTube.Actions.Choose_Ready="Kies uitsending"
+YouTube.Actions.Choose_GoLive="Kies uitsending en begin stroom"
+YouTube.Actions.Create_Schedule="Skeduleer uitsending"
+YouTube.Actions.Create_Schedule_Ready="Skeduleer en kies uitsending"
+YouTube.Actions.EventsLoading="Lys met gebeurtenisse word gelaai…"
+YouTube.Actions.EventCreated.Title="Gebeurtenis geskep"
+YouTube.Actions.EventCreated.Text="Gebeurtenis suksesvol geskep."
+YouTube.Actions.Stream="Stroom"
+YouTube.Actions.Stream.ScheduledFor="Geskeduleer vir %1"
+YouTube.Chat.Input.Send="Stuur"
+YouTube.Chat.Input.Placeholder="Voer boodskap hier in…"
+YouTube.Chat.Input.Sending="Stuur tans…"
+YouTube.Chat.Error.Text="Die boodskap kon nie verstuur word nie: %1"
+YouTube.Errors.errorStreamInactive="YouTube ontvang geen data vir u stroom nie. Gaan u opstelling na en probeer weer."
+YouTube.Errors.invalidTransition="Die poging tot oorgang was ongeldig. Dit kan wees omdat die stroom nog nie ’n vorige oorgang afgehandel het nie. Wag ’n paar sekondes en probeer weer."
+YouTube.Errors.liveChatDisabled="Regstreekse klets vir hierdie stroom is gedeaktiveer."
+YouTube.Errors.liveChatEnded="Regstreekse stroom het geëindig."
+YouTube.Errors.messageTextInvalid="Die boodskapteks is nie geldig nie."
+YouTube.Errors.rateLimitExceeded="U verstuur te vinnig boodskappe."
+YouTube.DocksRemoval.Title="Wis legaat YouTube-blaaierdoks"
+YouTube.DocksRemoval.Text="Hierdie blaaierdoks word as verouderd verwyder:\n\n%1\nGebruik “Doks/YouTube Live Control Room” in plaas daarvan."

obs-studio-29.1.3.tar.xz/UI/data/locale/an-ES.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/an-ES.ini Changed

@@ -12,7 +12,7 @@
 Rename="Renombrar"
 Interact="Interactuar"
 Filters="Filtros"
-Properties="Propiedatz"
+Properties="Propiedaz"
 MoveUp="Mover enta alto"
 MoveDown="Mover enta abaixo"
 Settings="Achustes"
@@ -77,6 +77,8 @@
 None="Garra"
 StudioMode.Preview="Vista Previa"
 StudioMode.Program="Programa"
+StudioMode.PreviewSceneName="Vista previa: %1"
+StudioMode.ProgramSceneName="Programa: %1"
 ShowInMultiview="Amostrar en vista multiple"
 VerticalLayout="Interficie Vertical"
 Group="Grupo"
@@ -91,21 +93,21 @@
 LogViewer="Visor de rechistros"
 ShowOnStartup="Amostrar a l'inicio"
 OpenFile="Ubrir fichero"
-AddValue="Anyadir %1"
+AddSource="Anyadir fuent"
 AlreadyRunning.Title="OBS ya se ye executando"
 AlreadyRunning.Text="OBS ya se ye executando! De no estar que quieras fer esto, per favor, zarra totas las finestras de OBS antes d'intentar iniciar una nueva. Si tiens configurau OBS pa que se minimice a la barra de fayenas, compreba si sigue executando-se astí."
 AlreadyRunning.LaunchAnyway="Lanzar de totas trazas"
 ChromeOS.Title="Plataforma no suportada"
 DockCloseWarning.Title="Zarrando finestra acoplable"
 ExtraBrowsers="Panels de navegador personalizaus"
-ExtraBrowsers.Info="Anyade panels dando-les un nombre y una URL, dimpués fe clic en Aplicar u Zarrar pa ubrir los panels. Puetz anyadir u eliminar los panels en qualsequier momento."
+ExtraBrowsers.Info="Anyade panels dando-les un nombre y una URL, dimpués fe clic en Aplicar u Zarrar pa ubrir los panels. Puez anyadir u eliminar los panels en cualsequier momento."
 ExtraBrowsers.DockName="Nombre d'o Panel"
 Auth.Authing.Title="Autentificando..."
 Auth.Authing.Text="Autentificando con %1, per favor aguarda..."
 Auth.AuthFailure.Title="Fallo d'autenticación"
 Auth.AuthFailure.Text="Error en autentificar con %1:\n\n%2: %3"
 Auth.InvalidScope.Title="Se requiere autentificación"
-Auth.InvalidScope.Text="Los requisitos d'autenticación pa %1 han cambiau. Qualques caracteristicas pueden no estar disponibles."
+Auth.InvalidScope.Text="Los requisitos d'autenticación pa %1 han cambiau. Cualques caracteristicas pueden no estar disponibles."
 Auth.LoadingChannel.Title="Cargando información d'a canal..."
 Auth.LoadingChannel.Text="Cargando información d'a canal pa %1, per favor aspere..."
 Auth.LoadingChannel.Error="No s'ha puesto obtener la información d'a canal"
@@ -113,7 +115,7 @@
 Auth.ChannelFailure.Text="Error en cargar la información d'a canal pa %1\n\n%2: %3"
 Auth.StreamInfo="Información de Stream"
 TwitchAuth.Stats="Estatisticas de Twitch"
-TwitchAuth.Feed="Fuent d'actividatz de Twitch"
+TwitchAuth.Feed="Fuent d'actividaz de Twitch"
 TwitchAuth.TwoFactorFail.Title="No se podió obtener la clau de transmisión"
 TwitchAuth.TwoFactorFail.Text="OBS no podió connectar-se a la suya cuenta de Twitch. Per favor, s'asegure que l'autenticación en dos pasos ye configurada en a suya configuración de seguranza <a href='https://www.twitch.tv/settings/security'>Configuración de seguranza de Twitch</a> ya que esto ye necesario pa transmitir."
 RestreamAuth.Channels="Canales Restream"
@@ -137,7 +139,7 @@
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Usar Actual (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Pantalla %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Fer servir l'actual (%1)"
-Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 u 30, pero emplegar 60 quan sía posible"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 u 30, pero emplegar 60 cuan sía posible"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 u 30, pero emplegar alta resolución"
 Basic.AutoConfig.VideoPage.CanvasExplanation="Nota: La resolución d'o lienzo (base) no ye necesariament la mesma que la resolución d'a transmisión u gravación. La resolución actual puede estar reducida d'o lienzo pa reducir l'uso d'os recursos u d'a taxa de bits."
 Basic.AutoConfig.StreamPage="Información de servicio de Stream"
@@ -155,14 +157,13 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Personalizau..."
 Basic.AutoConfig.StreamPage.Server="Servidor"
 Basic.AutoConfig.StreamPage.StreamKey="Clau de retransmisión"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Vinclo)"
 Basic.AutoConfig.StreamPage.EncoderKey="Clau d'o codificador"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Cuenta connectada"
-Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimar taxa de bits con una preba d'amplura de banda (puede tardar bell minuto)"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimar taxa de bits con una preba d'amplura de banda (puede tardar bel minuto)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferir codificación per hardware"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="La codificación per hardware elimina la mayoría de l'uso d'a CPU, pero puede requerir mas taxa de bits pa obtener lo mesmo nivel de calidat."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Alvertencia de transmisión"
-Basic.AutoConfig.StreamPage.StreamWarning.Text="La preba d'amplura de banda ye en momentos de transmitir datos de video aleatorios sin audio a la tuya canal. Si puetz, ye recomendable desactivar temporalment la gravación d'os videos d'as transmisions y fer la transmisión privada dimpués que la preba haiga finalizau. Deseya continar?"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="La preba d'amplura de banda ye en momentos de transmitir datos de video aleatorios sin audio a la tuya canal. Si puez, ye recomendable desactivar temporalment la gravación d'os videos d'as transmisions y fer la transmisión privada dimpués que la preba haiga finalizau. Deseya continar?"
 Basic.AutoConfig.TestPage="Resultau final"
 Basic.AutoConfig.TestPage.SubTitle.Testing="Lo programa agora ye executando un conchunto de prebas pa estimar los achustes optimos"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Preba completada"
@@ -179,7 +180,7 @@
 Basic.AutoConfig.TestPage.Result.Header="Lo programa ha determinau que estes achustes estimaus son los ideyals pa tu:"
 Basic.AutoConfig.TestPage.Result.Footer="Pa utilizar estes achustes, fe clic en \"Aplicar Configuración\". Pa tornar a configurar l'aduyant, fe clic en Dezaga. Pa configurar los achustes per tu mesmo, fe clic en Cancelar y ubre los achustes."
 Basic.AutoConfig.Info="L'aduyant de configuración automatica determinará la millor configuración basada en as especificacions d'o suyo ordinador y la velocidat d'Internet."
-Basic.AutoConfig.RunAnytime="Esto puede executar-se en qualsequier momento dende lo menú Ferramientas."
+Basic.AutoConfig.RunAnytime="Esto puede executar-se en cualsequier momento dende lo menú Ferramientas."
 Basic.Stats="Estatisticas"
 Basic.Stats.CPUUsage="Uso de CPU"
 Basic.Stats.HDDSpaceAvailable="Espacio en disco disponible"
@@ -206,19 +207,15 @@
 Updater.UpdateNow="Actualizar agora"
 Updater.RemindMeLater="Recordar-me-lo mas tarde"
 Updater.Skip="Blincar Versión"
-Updater.Running.Title="Programa actualment activo"
-Updater.Running.Text="Las salidas son activas actualment, per favor amorte qualsequier salida activa antes d'intentar actualizar"
 Updater.NoUpdatesAvailable.Title="No i hai actualizacions disponibles"
 Updater.NoUpdatesAvailable.Text="No i hai actualizacions disponibles actualment"
 Updater.FailedToLaunch="No s'ha puesto lanzar l'actualizador"
-Updater.GameCaptureActive.Title="Captura de chuego activa"
-Updater.GameCaptureActive.Text="La biblioteca de captura de chuegos ye actualment en uso. Zarre los chuegos u programas que se capturan (u reinicie Windows) y lo intente de nuevo."
 QuickTransitions.DuplicateScene="Duplicar scena"
 QuickTransitions.EditProperties="Duplicar fuents"
 QuickTransitions.HotkeyName="Transición Rapida: %1"
 Basic.AddTransition="Anyadir transición configurable"
 Basic.RemoveTransition="Sacar transición configurable"
-Basic.TransitionProperties="Propiedatz d'a transición"
+Basic.TransitionProperties="Propiedaz d'a transición"
 Basic.SceneTransitions="Transicions de scena"
 Basic.TransitionDuration="Duración"
 Basic.TogglePreviewProgramMode="Modo Estudeyo"
@@ -291,6 +288,7 @@
 Output.StartStreamFailed="No s'ha puesto iniciar la emisión"
 Output.StartRecordingFailed="No s'ha puesto iniciar la gravación"
 Output.StartReplayFailed="No s'ha puesto iniciar la memoria intermedia de reproducción"
+Output.StartVirtualCamFailed="No s'ha puesto iniciar una camara virtual"
 Output.StartFailedGeneric="No se podió encetar la salida. Per favor comprebe los logs pa pero detalles. \n\nNota: Si estas usando los codificadors de NVENC u AMD, asegura-te que los tuyos drivers de video son esviellaus."
 Output.ReplayBuffer.PauseWarning.Title="No se pueden alzar repeticions mientres ye pausau"
 Output.ReplayBuffer.PauseWarning.Text="Alvertencia: No se pueden alzar repeticions mientres la gravación ye pausada."
@@ -311,7 +309,7 @@
 Output.RecordError.EncodeErrorMsg="S'ha produciu una error de codificación mientres se gravaba."
 Output.BadPath.Title="Rota de fichero incorrecta"
 LogReturnDialog="Carga de rechistro exitosa"
-LogReturnDialog.Description="Lo tuyo fichero de rechistro ha estau puyau. Agora puetz compartir la URL pa fins de depuración u suporte."
+LogReturnDialog.Description="Lo tuyo fichero de rechistro ha estau puyau. Agora puez compartir la URL pa fins de depuración u suporte."
 LogReturnDialog.Description.Crash="Lo tuyo informe d'error ha estau puyau. Agora puede compartir la URL pa fins de depuración."
 LogReturnDialog.CopyURL="Copiar adreza URL"
 LogReturnDialog.AnalyzeURL="Analisar"
@@ -321,7 +319,7 @@
 Remux.Remux="Convertir"
 Remux.Stop="Aturar la conversión"
 Remux.ClearFinished="Borrar los elementos finalizaus"
-Remux.ClearAll="Borrar totz los elementos"
+Remux.ClearAll="Borrar toz los elementos"
 Remux.OBSRecording="Gravación OBS"
 Remux.FinishedTitle="Conversión finalizada"
 Remux.Finished="Gravación convertida"
@@ -336,7 +334,7 @@
 MissingFiles="Fichers no trobaus"
 MissingFiles.MissingFile="Fichero perdiu"
 MissingFiles.NewFile="Nuevo fichero"
-MissingFiles.HelpText="Faltan qualques fichers dende la zaguera vegada que usés OBS."
+MissingFiles.HelpText="Faltan cualques fichers dende la zaguera vegada que usés OBS."
 MissingFiles.Clear="<vacío>"
 MissingFiles.Search="Directorio de busqueda..."
 MissingFiles.SelectFile="Triar fichero..."
@@ -350,8 +348,6 @@
 MissingFiles.AutoSearchText="OBS ha trobau coincidencias adicionals pa fichers perdius en ixe directorio. Quiers anyadir-los?"
 MissingFiles.NoMissing.Title="Comprebación d'os fichers que faltan"
 MissingFiles.NoMissing.Text="No pareix que falte garra fichero"
-UpdateAvailable="Nueva actualización disponible"
-UpdateAvailable.Text="Versión %1.%2.%3 disponible. <a href='%4'> Faiga clic aquí pa descargar-la</a>"
 Basic.DesktopDevice1="Audio d'o escritorio"
 Basic.DesktopDevice2="Audio d'o escritorio 2"
 Basic.Scene="Scena"
@@ -370,7 +366,7 @@
 VolControl.SliderUnmuted="Eslizador de volumen pa '%1':"
 VolControl.SliderMuted="Eslizador de volumen pa '%1': (actualment silenciau)"
 VolControl.Mute="Silenciar '%1'"
-VolControl.Properties="Propiedatz pa '%1'"
+VolControl.Properties="Propiedaz pa '%1'"
 Basic.Main.AddSceneDlg.Title="Anyadir scena"
 Basic.Main.AddSceneDlg.Text="Per favor, introduzca lo nombre d'a scena"
 Basic.Main.DefaultSceneName.Text="Scena %1"
@@ -392,13 +388,13 @@
 Basic.Main.Sources.VisibilityDescription="Controla la visibilidat de '%1' en o lienzo"
 Basic.Main.Sources.Lock="Blocar"
 Basic.Main.Sources.LockDescription="Bloca la posición y la escala de '%1' en o lienzo"
-Basic.PropertiesWindow="Propiedatz pa '%1'"
+Basic.PropertiesWindow="Propiedaz pa '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (triar: %2)"
 Basic.PropertiesWindow.SelectColor="Triar color"
 Basic.PropertiesWindow.SelectFont="Tríe fuent"
 Basic.PropertiesWindow.ConfirmTitle="Configuración cambiada"
 Basic.PropertiesWindow.Confirm="I hai cambios sin alzar. Deseyas conservar-los?"
-Basic.PropertiesWindow.NoProperties="No i hai propiedatz disponibles"
+Basic.PropertiesWindow.NoProperties="No i hai propiedaz disponibles"
 Basic.PropertiesWindow.AddFiles="Adhibir fichers"
 Basic.PropertiesWindow.AddDir="Anyadir Carpeta"
 Basic.PropertiesWindow.AddURL="Anyadir rota/URL"
@@ -439,11 +435,11 @@
 Basic.TransformWindow.Width="Amplaria"
 Basic.TransformWindow.Height="Altaria"
 Basic.TransformWindow.Alignment="Aliniamiento posicional"
-Basic.TransformWindow.BoundsType="Tipo de quadro delimitador"
-Basic.TransformWindow.BoundsAlignment="Aliniamiento en o quadro delimitador"
-Basic.TransformWindow.Bounds="Grandaria de quadro delimitador"
-Basic.TransformWindow.BoundsWidth="Amplaria d'o quadro delimitador"
-Basic.TransformWindow.BoundsHeight="Altaria d'o quadro delimitador"
+Basic.TransformWindow.BoundsType="Tipo de cuadro delimitador"
+Basic.TransformWindow.BoundsAlignment="Aliniamiento en o cuadro delimitador"
+Basic.TransformWindow.Bounds="Grandaria de cuadro delimitador"
+Basic.TransformWindow.BoundsWidth="Amplaria d'o cuadro delimitador"
+Basic.TransformWindow.BoundsHeight="Altaria d'o cuadro delimitador"
 Basic.TransformWindow.Crop="Retalle"
 Basic.TransformWindow.CropLeft="Retallar per la zurda"
 Basic.TransformWindow.CropRight="Retallar per la dreita"
@@ -495,7 +491,7 @@
 Basic.Main.Group="Grupo %1"
 Basic.Main.GroupItems="Agrupar los elementos triaus"
 Basic.Main.Ungroup="Desagrupar"
-Basic.Main.GridMode="Modo Quadricula"
+Basic.Main.GridMode="Modo Cuadricula"
 Basic.Main.ListMode="Modo Lista"
 Basic.MainMenu.File="&Fichero"
 Basic.MainMenu.File.Export="&Exportar"
@@ -535,12 +531,10 @@
 Basic.MainMenu.Edit.Order.MoveDown="Mover enta abaixo (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="Mover a l'inicio (&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="Mover a la fin (&B)"
-Basic.MainMenu.Edit.AdvAudio="Propiedatz d'&audio abanzadas"
+Basic.MainMenu.Edit.AdvAudio="Propiedaz d'&audio abanzadas"
 Basic.MainMenu.View="&Vista"
 Basic.MainMenu.View.Toolbars="Barra de Ferramien&tas"
-Basic.MainMenu.View.ListboxToolbars="Botons d'a lista de scenas/fuents"
 Basic.MainMenu.View.ContextBar="Barra de ferramientas de fuent"
-Basic.MainMenu.View.SceneTransitions="Transi&ción de Scenas"
 Basic.MainMenu.View.SourceIcons="&Iconos de fuents"
 Basic.MainMenu.View.StatusBar="Barra d'E&stau"
 Basic.MainMenu.View.Fullscreen.Interface="Pantalla completa"
@@ -551,7 +545,6 @@
 Basic.MainMenu.SceneCollection.Import="Importar colección de scenas"
 Basic.MainMenu.SceneCollection.Export="Exportar colección de scenas"
 Basic.MainMenu.Profile.Exists="Lo perfil ya existe"
-Basic.MainMenu.SceneCollection.Exists="La colección de scenas ya existe"
 Basic.MainMenu.Tools="Ferramien&tas"
 Basic.MainMenu.Help="&Aduya"
 Basic.MainMenu.Help.HelpPortal="&Portal d'aduya"
@@ -573,9 +566,9 @@
 Basic.Settings.General.Language="Idioma"
 Basic.Settings.General.EnableAutoUpdates="Comprebar si i hai actualizacions automaticas a l'inicio"
 Basic.Settings.General.OpenStatsOnStartup="Ubrir lo dialogo d'estatisticas a l'inicio"
-Basic.Settings.General.WarnBeforeStartingStream="Amostrar lo dialogo de confirmación quan s'inicie una transmisión"
-Basic.Settings.General.WarnBeforeStoppingStream="Amostrar lo dialogo de confirmación quan s'ature una transmisión"
-Basic.Settings.General.WarnBeforeStoppingRecord="Amostrar lo dialogo de confirmación quan s'inicie una gravación"
+Basic.Settings.General.WarnBeforeStartingStream="Amostrar lo dialogo de confirmación cuan s'inicie una transmisión"
+Basic.Settings.General.WarnBeforeStoppingStream="Amostrar lo dialogo de confirmación cuan s'ature una transmisión"
+Basic.Settings.General.WarnBeforeStoppingRecord="Amostrar lo dialogo de confirmación cuan s'inicie una gravación"
 Basic.Settings.General.Projectors="Prochectors"
 Basic.Settings.General.HideProjectorCursor="Amagar lo cursor sobre los prochectors"
 Basic.Settings.General.ProjectorAlwaysOnTop="Prochectos siempre en o cobalto"
@@ -584,10 +577,10 @@
 Basic.Settings.General.CenterSnapping="Achustar las fuents a lo centro horizontal y vertical"
 Basic.Settings.General.SourceSnapping="Achustar las fuents a atras fuents"
 Basic.Settings.General.SnapDistance="Achustar la sensibilidat"
-Basic.Settings.General.RecordWhenStreaming="Gravar automaticament quan se transmite"
-Basic.Settings.General.KeepRecordingWhenStreamStops="Mantener la gravación quan s'atura la transmisión"
+Basic.Settings.General.RecordWhenStreaming="Gravar automaticament cuan se transmite"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Mantener la gravación cuan s'atura la transmisión"
 Basic.Settings.General.ReplayBufferWhileStreaming="Iniciar automaticament la reprodución d'a memoria intermedia mientres la transmisión"
-Basic.Settings.General.KeepReplayBufferStreamStops="Mantener activa la memoria intermedia de reproducción quan s'ature la transmisión"
+Basic.Settings.General.KeepReplayBufferStreamStops="Mantener activa la memoria intermedia de reproducción cuan s'ature la transmisión"
 Basic.Settings.General.SysTray="Servilla d'o sistema"
 Basic.Settings.General.SysTrayWhenStarted="Minimizar la servilla d'o sistema en iniciar"
 Basic.Settings.General.SystemTrayHideMinimize="Minimizar siempre en a servilla d'o sistema en cuenta d'en a barra de fayenas"
@@ -595,7 +588,7 @@
 Basic.Settings.General.Preview="Vista previa"
 Basic.Settings.General.OverflowHidden="Amagar lo sobreiximiento"
 Basic.Settings.General.OverflowAlwaysVisible="Sobreiximiento siempre visible"
-Basic.Settings.General.OverflowSelectionHidden="Amostrar lo sobreiximiento mesmo quan la fuent ye invisible"
+Basic.Settings.General.OverflowSelectionHidden="Amostrar lo sobreiximiento mesmo cuan la fuent ye invisible"
 Basic.Settings.General.Importers="Importadors"
 Basic.Settings.General.AutomaticCollectionSearch="Mirar ubicacions conoixidas de coleccions de scenas en importar"
 Basic.Settings.General.SwitchOnDoubleClick="Transición ta la scena en fer doble clic"
@@ -613,7 +606,6 @@
 Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Horizontal, Alto (18 Scenas)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, Alto (24 Scenas)"
 Basic.Settings.Stream="Emisión"
-Basic.Settings.Stream.StreamType="Tipo d'Emisión"
 Basic.Settings.Stream.Custom.UseAuthentication="Usar l'autentificación"
 Basic.Settings.Stream.Custom.Username="Nombre d'usuario"
 Basic.Settings.Stream.Custom.Password="Clau"
@@ -636,7 +628,6 @@
 Basic.Settings.Output="Salida"
 Basic.Settings.Output.Format="Formato de gravación"
 Basic.Settings.Output.SelectDirectory="Tríe Directorio de gravación"
-Basic.Settings.Output.SelectFile="Tríe fichero de gravación"
 Basic.Settings.Output.DynamicBitrate="Cambia dinamicament la taxa de bits pa chestionar la conchestión"
 Basic.Settings.Output.DynamicBitrate.Beta="Cambia dinamicament la taxa de bits pa chestionar la conchestión (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="En cuenta de blincar fotogramas pa reducir la conchestión, cambia dinamicament lo bitrate sobre la marcha.\n\nTen en cuenta que esto puede aumentar lo retardo d'a transmisión si i hai una conchestión repentina significativa.\nCuando lo bitrate baixa, puede tardar uns menutos en restaurar-se.\n\nActualmente nomás ye compatible con RTMP."
@@ -661,7 +652,7 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Alvertencia: La taxa de bits d'audio d'o stream s'establirá en %1, que ye lo limite superior pa lo servicio de streaming actual."
 Basic.Settings.Output.Simple.Warn.CannotPause="Alvertencia: Las gravacions no se pueden pausar si la calidat de gravación s'estableix en \"Igual a lo stream\"."
 Basic.Settings.Output.Simple.Warn.Encoder="ALVERTENCIA: Gravar con un codificador de software d'una calidat diferent a la d'a transmisión requerirá un uso adicional d'a CPU si transmite y grava a lo mesmo tiempo."
-Basic.Settings.Output.Simple.Warn.Lossless="ALVERTENCIA: La calidat sin perdidas chenera grandarias de fichero muito grans! La calidat sin perdas puede utilizar mas de 7 chigabytes d'espacio en disco per menuto en alta resolución y con alta taxa de fotogramas. La calidat sin perdas no se recomienda pa gravacions largas, de no estar que tienga una gran cantidat d'espacio en disco disponible."
+Basic.Settings.Output.Simple.Warn.Lossless="PARA CUENTA: La calidat sin perdidas chenera grandarias de fichero muito grans! La calidat sin perdas puede utilizar mas de 7 chigabytes d'espacio en disco per menuto en alta resolución y con alta taxa de fotogramas. La calidat sin perdas no se recomienda pa gravacions largas, de no estar que tienga una gran cantidat d'espacio en disco disponible. Tornar a reproducir lo búfer no ye disponible cuan s'emplega la calidat sin perdidas."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Confirma que deseya utilizar calidat sin perdidas?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Atención de calidat sin perdas!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 baixo uso de CPU, aumenta la grandaria de fichero)"
@@ -701,7 +692,7 @@
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Salida a URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Salida a fichero"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Formatos comuns de gravación"
-Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Totz los Fichers"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Toz los Fichers"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Rota de fichero u URL"
 Basic.Settings.Output.Adv.FFmpeg.Format="Formato d'o contenedor"
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Formato predeterminau"
@@ -715,7 +706,7 @@
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Configuración de codificador d'audio (si existe)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Achustes d'o conversor (si en i hai)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Intervalo de fotogramas clau (en Fotogramas)"
-Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Amostrar totz los codecs (encara que sían potencialment incompatibles)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Amostrar toz los codecs (encara que sían potencialment incompatibles)"
 Screenshot="Salida de captura de pantalla"
 Screenshot.SourceHotkey="Captura de pantalla de fuent triada"
 Screenshot.StudioProgram="Captura de pantalla (Programa)"
@@ -733,12 +724,12 @@
 Basic.Settings.Video.Denominator="Denominador"
 Basic.Settings.Video.Renderer="Renderizador"
 Basic.Settings.Video.InvalidResolution="Valor d'a resolución no valido. Ha d'estar amplo x altura (per eixemplo, 1920 x 1080)"
-Basic.Settings.Video.CurrentlyActive="La salida de video ye actualment activa. Per favor amorte qualsequier salida pa cambiar la configuración de video."
+Basic.Settings.Video.CurrentlyActive="La salida de video ye actualment activa. Per favor amorte cualsequier salida pa cambiar la configuración de video."
 Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineal (mas rapido, pero borroso si s'escala la imachen)"
 Basic.Settings.Video.DownscaleFilter.Bicubic="Bicúbico (Escalau fino, 16 muestras)"
 Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Escalau fino, 36 muestras)"
 Basic.Settings.Video.DownscaleFilter.Area="Aria (Suma ponderada, 4/6/9 muestras)"
-Basic.Settings.Audio.SampleRate="Freqüencia de muestreyo"
+Basic.Settings.Audio.SampleRate="Frecuencia de muestreyo"
 Basic.Settings.Audio.Channels="Canales"
 Basic.Settings.Audio.Meters="Mesuradors"
 Basic.Settings.Audio.MeterDecayRate="Velocidat de decayimiento"
@@ -748,8 +739,7 @@
 Basic.Settings.Audio.PeakMeterType="Tipo de mesurador de pico"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Pico de muestra"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (mayor uso de CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ALVERTENCIA: l'audio de son envolvente ye habilitau."
-Basic.Settings.Audio.MultichannelWarning="Si ye transmitindo, comprebe si lo suyo servicio de transmisión suporta tanto la ingesta de son envolvente como la reproducción de son envolvente. Facebook 360 Live ye un eixemplo an lo son envolvente ye totalment compatible. Encara que Facebook Live y YouTube Live acceptan la ingesta envolvente, Facebook Live mescla a estéreo, y YouTube Live nomás reproduz dos canals.\n\nLos filtros d'audio de OBS son compatibles con son envolvente, encara que lo suporte de plugins VST no ye guarenciau."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ALVERTENCIA: l'audio de son envolvente ye habilitau."
 Basic.Settings.Audio.MultichannelWarning.Title="Habilitar l'audio de son envolvente?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Seguro que quiere habilitar l'audio de son envolvente?"
 Basic.Settings.Audio.Devices="Dispositivos d'audio globals"
@@ -771,11 +761,20 @@
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Mas que lo normal"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Menos que lo normal"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Inactiva"
-Basic.Settings.Advanced.Audio.BufferingTime="Tiempo de bufer d'audio"
 Basic.Settings.Advanced.Video.ColorFormat="Formato de color"
+Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 bit, 4:2:0, 2 planos)"
+Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 planos)"
+Basic.Settings.Advanced.Video.ColorFormat.I444="I444 (8 bit, 4:4:4, 3 planos)"
+Basic.Settings.Advanced.Video.ColorFormat.P010="P010 (10 bit, 4:2:0, 2 planos)"
+Basic.Settings.Advanced.Video.ColorFormat.I010="I010 (10 bit, 4:2:0, 3 planos)"
+Basic.Settings.Advanced.Video.ColorFormat.P216="P216 (16-bit, 4:2:2, 2 planos)"
+Basic.Settings.Advanced.Video.ColorFormat.P416="P416 (16-bit, 4:4:4, 2 planos)"
 Basic.Settings.Advanced.Video.ColorSpace="Espacio de color"
 Basic.Settings.Advanced.Video.ColorRange="Gama de colors"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Limitau"
 Basic.Settings.Advanced.Video.ColorRange.Full="Completo"
+Basic.Settings.Advanced.Video.SdrWhiteLevel="Nivel de blanco SDR"
+Basic.Settings.Advanced.Video.HdrNominalPeakLevel="Nivel de pico nominal HDR"
 Basic.Settings.Advanced.Audio.MonitoringDevice="Dispositivo de monitorización d'audio"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Per defecto"
 Basic.Settings.Advanced.Audio.DisableAudioDucking="Desactivar reducción d'audio de Windows"
@@ -784,16 +783,17 @@
 Basic.Settings.Advanced.StreamDelay.Preserve="Preservar lo punto de corte (aumento de retardo) en tornar a connectar"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Uso estimau de memoria: %1 MB"
 Basic.Settings.Advanced.Network="Ret"
+Basic.Settings.Advanced.Network.Disabled="Lo protocolo de transmisión actualment triau no permite de cambiar la configuración de ret."
 Basic.Settings.Advanced.Network.BindToIP="Enlazar con IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Habilitar optimizacions de ret"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Habilitar lo control de ritmo TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Intenta fer que la salida RTMP sía mas amigable con atras aplicacions sensibles a la latencia en o ret regulando la taxa de transmisión.\nPuede aumentar lo risgo de perdida de fotogramas en connexions inestables."
 Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Comportamiento d'as teclas rapidas"
 Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Nunca desactivar las teclas rapidas"
-Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Deshabilitar teclas d'acceso rapido quan la finestra prencipal se trobe activa"
-Basic.Settings.Advanced.Hotkeys.DisableHotkeysOutOfFocus="Deshabilitar teclas rapidas quan la finestra prencipal no sía en primer plano"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Deshabilitar teclas d'acceso rapido cuan la finestra prencipal se trobe activa"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysOutOfFocus="Deshabilitar teclas rapidas cuan la finestra prencipal no sía en primer plano"
 Basic.Settings.Advanced.AutoRemux.MP4="(gravar como mkv)"
-Basic.AdvAudio="Propiedatz d'Audio abanzadas"
+Basic.AdvAudio="Propiedaz d'Audio abanzadas"
 Basic.AdvAudio.ActiveOnly="Nomás fuents activas"
 Basic.AdvAudio.Name="Nombre"
 Basic.AdvAudio.Volume="Volumen"
@@ -812,6 +812,8 @@
 Basic.Settings.Hotkeys="Alcorces"
 Basic.Settings.Hotkeys.Pair="Combinacions de teclas con '%1' actúan como commutadors"
 Basic.Settings.Hotkeys.Filter="Filtro"
+Basic.Settings.Hotkeys.FilterByHotkey="Filtrar per alcorce"
+Basic.Settings.Hotkeys.DuplicateWarning="Este alcorce s'ha asignau a una u mas accions. Fe clic pa veyer las errors"
 Basic.Hotkeys.SelectScene="Cambiar a la scena"
 Basic.SystemTray.Show="Amostrar"
 Basic.SystemTray.Hide="Amagar"
@@ -859,11 +861,14 @@
 OutputWarnings.NoTracksSelected="Ha de triar a lo menos una pista"
 OutputWarnings.MP4Recording="Alvertencia: Las gravacions alzadas en MP4/MOV serán irrecuperables si lo fichero no puede finalizar-se (y.g. como resultau de BSODs, cortes electricos, etc.). Si quiers gravar multiples pistas d'audio considera usar MKV y convierte la gravación a MP4/MOV dimpués de finalizar (Fichero → Convertir Gravacions)"
 OutputWarnings.CannotPause="Alvertencia: Las gravacions no se pueden pausar si lo codificador de gravación s'estableix en \"(Usar codificador de transmisión)\""
+CodecCompat.CodecPlaceholder="Seleccionar lo codificador..."
+CodecCompat.ContainerPlaceholder="Seleccionar lo formato..."
+CodecCompat.CodecMissingOnExit.Title="Garra codificador seleccionau"
 FinalScene.Title="Eliminar scena"
 FinalScene.Text="Cal que i haiga a lo menos una scena."
 NoSources.Title="Sin recursos"
 NoSources.Text="Pareixe que no has anyadiu garra recurso de video encara, asinas que serás emitindo una pantalla en blanco. Yes seguro que quiers fer esto?"
-NoSources.Text.AddSource="Puetz anyadir recursos fendo clic en l'icono de \"+\" debaixo d'o menú Recursos en a finestra prencipal en qualsequier momento."
+NoSources.Text.AddSource="Puez anyadir recursos fendo clic en l'icono de \"+\" debaixo d'o menú Recursos en a finestra prencipal en cualsequier momento."
 NoSources.Label="No tiens garra fuent.\nHaz clic en o botón +,\no fe clic dreito aquí pa anyadir-ne una."
 ChangeBG="Establir color"
 CustomColor="Color personalizada"
@@ -890,16 +895,14 @@
 NeedsRestart="S'ha de reiniciar OBS Studio. Deseyas reiniciar-lo agora?"
 ContextBar.NoSelectedSource="Garra fuent triada"
 ContextBar.ResetTransform="Restablir transformación"
-ContextBar.FitToCanvas="Achustar a lo lienzo"
 ContextBar.MediaControls.PlayMedia="Reproducir lo conteniu"
 ContextBar.MediaControls.PauseMedia="Pausar lo conteniu"
 ContextBar.MediaControls.StopMedia="Aturar lo conteniu"
 ContextBar.MediaControls.RestartMedia="Reiniciar lo conteniu"
 ContextBar.MediaControls.PlaylistNext="Siguient en a lista de reproducción"
 ContextBar.MediaControls.PlaylistPrevious="Anterior en a lista de reproducción"
-ContextBar.MediaControls.MediaProperties="Propiedatz d'o conteniu"
 ContextBar.MediaControls.BlindSeek="Widget Barra de reproducción"
-YouTube.Auth.Ok="S'ha autorizau correctament.\nYa puetz zarrar esta pachina."
+YouTube.Auth.Ok="S'ha autorizau correctament.\nYa puez zarrar esta pachina."
 YouTube.Auth.NoCode="Lo proceso d'autorización no s'ha rematau."
 YouTube.Auth.NoChannels="No i hai garra canal disponible en a cuenta triada"
 YouTube.Auth.WaitingAuth.Title="Autorización d'usuario de Youtube"

obs-studio-29.1.3.tar.xz/UI/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ar-SA.ini Changed

@@ -5,7 +5,7 @@
 Close="إغلاق"
 Save="حفظ"
 Discard="تجاهل"
-Disable="معطل"
+Disable="تعطيل"
 Yes="نعم"
 No="لا"
 Add="أضف"
@@ -24,7 +24,7 @@
 Browse="استعراض"
 Mono="أُحادي"
 Stereo="ستيريو"
-DroppedFrames="إسقاط المشاهد %1 (%2%)"
+DroppedFrames="إسقاط المشاهد %1 (% %2)"
 StudioProgramProjector="عرض بالشاشة الكاملة (البث الحالي)"
 PreviewProjector="عرض ملء الشاشة (معاينة)"
 SceneProjector="عرض ملء الشاشة (المشهد)"
@@ -95,7 +95,6 @@
 LogViewer="مشاهدة السجل"
 ShowOnStartup="إظهار عند بدء التشغيل"
 OpenFile="فتح ملف"
-AddValue="اضف %1"
 AddSource="أضف مصدراً"
 RemoveScene="أزِل المشهد المحدد"
 RemoveSource="أزِل المورد/الموارد المحددة"
@@ -107,20 +106,28 @@
 SourceFilters="فلاتر مفتوحة المصدر"
 MixerToolbarMenu="قائمة مزج الصوت"
 SceneFilters="افتح فلاتر المشهد"
+List="قائمة"
+Grid="شبكة"
 PluginsFailedToLoad.Title="خطأ في تحميل الإضافات"
 PluginsFailedToLoad.Text="فشل تحميل إضافات OBS التالية:\n\n%1\nالرجاء تحديث أو إزالة هذه الإضافات."
 AlreadyRunning.Title="OBS قيد التشغيل بالفعل"
 AlreadyRunning.Text="OBS قيد التشغيل بالفعل! إلاّ إذا كنت تتعمد هذا, الرجاء إغلاق أي نسخة أخرى قيد التشغيل من OBS قبل محاولة تشغيل واحدة جديدة. إذا كان OBS لديك في وضعية التصغير إلى جانب الساعة, الرجاء التأكد إذا كان لازال يعمل هناك."
 AlreadyRunning.LaunchAnyway="إطلاق على أي حال"
+AutoSafeMode.Title="الوضع الآمن"
+AutoSafeMode.Text="لم يتم إيقاف تشغيل OBS بشكل صحيح أثناء جلستك الأخيرة. \n\nهل ترغب في البَدء في الوضع الآمن (سيتم تعطيل المكونات الإضافية والبرامج النصية ومآخذ الويب (WebSockets))؟"
+AutoSafeMode.LaunchSafe="تشغيل في الوضع الآمن"
+AutoSafeMode.LaunchNormal="تشغيل عادي"
+SafeMode.Restart="هل تريد إعادة تشغيل OBS في الوضع الآمن (سيتم تعطيل المكونات الإضافية والبرمجة النصية و WebSockets)؟"
+SafeMode.RestartNormal="هل ترغب في إعادة تشغيل OBS في الوضع العادي؟"
 ChromeOS.Title="منصة غير مدعومة"
 ChromeOS.Text="يبدو أن OBS يعمل داخل حاوية ChromeOS. هذه المنصة غير مدعومة."
 Wine.Title="تم اكتشاف النبيذ"
 Wine.Text="تشغيل OBS في النبيذ غير مدعوم، والعديد من الميزات مثل مصادر التقاط الجهاز لن تعمل أو لن تعمل إلا بقدرة محدودة. من المستحسن تشغيل نسخة أصلية من OBS بدلاً من ذلك، على سبيل المثال <a href='https://flathub.org/apps/details/com.obsproject.Studio'>إصدار Flatpak</a> أو حزم نظام التشغيل الخاص بك."
-DockCloseWarning.Title="إغلاق إطار قابل للإرساء"
+DockCloseWarning.Title="جارِ إغلاق نافذة قابل للإرساء"
 DockCloseWarning.Text="لقد أغلقت للتو نافذة قابلة للإرسال. إذا كنت ترغب في إظهارها مرة أخرى، استخدم قائمة الأقفال على شريط القائمة."
 ExtraBrowsers="أرصفة المتصفح المخصصة"
 ExtraBrowsers.Info="قم بإضافة الأرصفة بإعطائها اسم و رابط, ثم اضغط على تطبيق أو إغلاق لفتح الأرصفة. يمكنك إضافة أو حذف الأرصفة في أي وقت."
-ExtraBrowsers.DockName="اسم الرصيف"
+ExtraBrowsers.DockName="اسم الإرساء"
 Auth.Authing.Title="جاري المصادقة..."
 Auth.Authing.Text="جارٍ المصادقة مع %1, الرجاء الانتظار..."
 Auth.AuthFailure.Title="فشل المصادقة"
@@ -179,7 +186,6 @@
 Basic.AutoConfig.StreamPage.Server="الخادم"
 Basic.AutoConfig.StreamPage.StreamKey="مفتاح البث"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: أدخل كلمة مرور التشفير.\nRTMP: أدخل المفتاح الذي توفره الخدمة.\nSRT: أدخل التبسيط إذا كانت الخدمة تستخدم واحدة."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(رابط)"
 Basic.AutoConfig.StreamPage.EncoderKey="مفتاح الترميز"
 Basic.AutoConfig.StreamPage.ConnectedAccount="الحساب المتصل"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="تقدير معدل التدفق باستخدام فحص سرعة الانترنت (ربما يحتاج لبعض الوقت)"
@@ -191,6 +197,7 @@
 Basic.AutoConfig.TestPage.SubTitle.Testing="يقوم البرنامج الآن بتنفيذ مجموعة من الإختبارات لتقدير الإعدادات الأكثر مثالية"
 Basic.AutoConfig.TestPage.SubTitle.Complete="انتهى الاختبار"
 Basic.AutoConfig.TestPage.TestingBandwidth="إجراء اختبار النطاق الترددي، قد يستغرق هذا بضع دقائق..."
+Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="لم يتم العثور على مخرجات لبروتوكول هذه الخدمة"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="جاري الاتصال بـ: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="فشل الاتصال بأي سيرفر، رجاءا تحقق من اتصالك بالانترنت وأعد المحاولة."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="اختبار التدفق لـ: %1"
@@ -231,8 +238,6 @@
 Updater.UpdateNow="حدث الآن"
 Updater.RemindMeLater="ذكرني لاحقاً"
 Updater.Skip="تخطي الإصدار"
-Updater.Running.Title="البرنامج نشط حالياً"
-Updater.Running.Text="المخارج نشطة حالياً، الرجاء اغلاق اي مخرج نشط قبل محاولة التحديث"
 Updater.NoUpdatesAvailable.Title="لا توجد تحديثات متوفرة"
 Updater.NoUpdatesAvailable.Text="لا توجد تحديثات متوفرة حاليا"
 Updater.BranchNotFound.Title="تمت إزالة التحديث القناة"
@@ -242,8 +247,6 @@
 Updater.RepairConfirm.Title="تأكيد فحص السلامة"
 Updater.RepairConfirm.Text="بدأ فحص السلامة سوف يقوم بمسح تثبيت OBS الخاص بك للفساد وإعادة تحميل الملفات المعطلة أو المعدلة. قد يستغرق هذا لحظات.\n\n هل ترغب في المتابعة؟"
 Updater.FailedToLaunch="فشل في تشغيل التحديث"
-Updater.GameCaptureActive.Title="إلتقاط الألعاب نشط"
-Updater.GameCaptureActive.Text="مكتبة شبك التقاط الألعاب مشغولة حالياً. الرجاء اغلاء اي لعبة/برنامج يتم إلتقاطه (تصويره) حالياً (أو قم بإعادة تشغيل ويندوز) و حاول مرة أخرى."
 QuickTransitions.SwapScenes="التبديل بين مشهدي المعاينة و الاخراج بعد عملية الانتقال"
 QuickTransitions.SwapScenesTT="مقايضة المعاينة ومشاهد البرنامج بعد الانتقال (إذا كان المشهد الأصلي للبرنامج لا يزال موجوداً).\nهذا لن يلغي أي تغييرات قد تكون أجريت على المشهد الأصلي للبرنامج."
 QuickTransitions.DuplicateScene="استنساخ المشهد"
@@ -257,6 +260,8 @@
 Basic.SceneTransitions="تأثير انتقال المشهد"
 Basic.TransitionDuration="مدة الانتقال"
 Basic.TogglePreviewProgramMode="طور الاستوديو"
+Basic.EnablePreviewProgramMode="تشغيل نمط الأستوديو"
+Basic.DisablePreviewProgramMode="إيقاف نمط الأستوديو"
 Undo.Undo="تراجع"
 Undo.Redo="إعادة"
 Undo.Add="اضف %1'"
@@ -305,6 +310,8 @@
 Undo.GroupItems="تجميع العناصر في '%1'"
 TransitionNameDlg.Text="Text"
 TransitionNameDlg.Title="اسم تأثير الإنتقال"
+TitleBar.SafeMode="الوضع الآمن"
+TitleBar.PortableMode="الوضع المحمول\n"
 TitleBar.Profile="الملف الشخصي"
 TitleBar.Scenes="المشاهد"
 NameExists.Title="الاسم موجود بالفعل"
@@ -329,6 +336,7 @@
 Output.StartStreamFailed="فشل في بدء البث"
 Output.StartRecordingFailed="فشل في بدء التسجيل"
 Output.StartReplayFailed="فشل بدء التخزين المؤقت للإعادة"
+Output.StartVirtualCamFailed="فشل في تشغيل الكاميرا الافتراضية"
 Output.StartFailedGeneric="فشل بدء الإخراج. الرجاء مراجعة السجل للتفاصيل.\n\nملاحظة: اذا كنت تستخدم مُرَمِز NVENC أو مُرَمِز AMD, تأكد من أن تعريف بطاقة الشاشة لديك محدَّث."
 Output.ReplayBuffer.PauseWarning.Title="لا يمكن حفظ الإعادات اثناء التوقف المؤقت"
 Output.ReplayBuffer.PauseWarning.Text="تحذير: لا يمكن حفظ الإعادات اثناء توقيف التسجيل مؤقتاً."
@@ -336,11 +344,12 @@
 Output.ConnectFail.BadPath="مسار أو رابط الاتصال غير صالح. الرجاء التحقق من الإعدادات للتحقق من كونه صالح."
 Output.ConnectFail.ConnectFailed="فشل الاتصال بالسيرفر"
 Output.ConnectFail.InvalidStream="تعذر الوصول إلى القناة أو مفتاح البث المحدد، الرجاء أعد التحقق من صحة مفتاح البث الخاص بك، أما إذا كان صحيحاً، قد تكون المشكلة في الاتصال بالخادم."
+Output.ConnectFail.HdrDisabled="مخرج HDR معطل حاليًا لهذا الإصدار."
 Output.ConnectFail.Error="حدث خطأ غير متوقع عند محاولة الاتصال بالخادم. مزيد من المعلومات في ملف السجل."
 Output.ConnectFail.Disconnected="تم قطع الاتصال من السيرفر."
 Output.StreamEncodeError.Title="خطأ في الترميز"
 Output.StreamEncodeError.Msg="حدث خطأ في الترميز أثناء البث."
-Output.StreamEncodeError.Msg.LastError="حدث خطأ في الترميز أثناء البث:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="حدثَ خطأ في المُرَمِّز خلالَ عمليّة البَّث: %1"
 Output.RecordFail.Title="فشل في بدء التسجيل"
 Output.RecordFail.Unsupported="تنسيق الإخراج أما غير معتمد أو لا يدعم أكثر من مسار للصوت. الرجاء التحقق من الإعدادات الخاصة بك وحاول مرة أخرى."
 Output.RecordNoSpace.Title="مساحة القرص غير كافية"
@@ -348,7 +357,7 @@
 Output.RecordError.Title="خطأ في التسجيل"
 Output.RecordError.Msg="حدث خطأ غير محدد أثناء التسجيل."
 Output.RecordError.EncodeErrorMsg="حدث خطأ في الترميز أثناء التسجيل."
-Output.RecordError.EncodeErrorMsg.LastError="حدث خطأ في الترميز أثناء التسجيل:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="حدثَ خطأ في المُرَمِّز خلالَ عمليّة التَّسجِيل: %1"
 Output.BadPath.Title="مسار الملف غير صحيح"
 Output.BadPath.Text="تعذر فتح مسار التسجيل الذي تم تكوينه. الرجاء التحقق من مسار التسجيل الخاص بك تحت الإعدادات → الإخراج → التسجيل."
 Output.NoBroadcast.Title="لم يتم تكوين البث"
@@ -378,6 +387,8 @@
 Remux.ExitUnfinishedTitle="تقدم عملية التحويل"
 Remux.ExitUnfinished="إيقاف عميلة التحويل الآن قد تجعل الملف غير قابل للاستخدام.\n هل أنت متأكد أنك تريد إيقاف عملية التحويل؟"
 Remux.HelpText="إسقط الملفات في هذه النافذة للremux، أو حدد خلية \"تسجيل OBS\" فارغة للتصفح من اجل ملف."
+Remux.NoFilesAddedTitle="لم يتم إضافة ملف remuxing"
+Remux.NoFilesAdded="لم يتم إضافة ملف إلى remux. قم بإسقاط مجلد يحتوي على ملف فيديو واحد أو أكثر."
 MissingFiles="الملفات المفقودة"
 MissingFiles.MissingFile="ملف مفقود"
 MissingFiles.NewFile="ملف جديد"
@@ -395,6 +406,7 @@
 MissingFiles.AutoSearchText="وجد OBS تطابقات إضافية للملفات المفقودة في هذا المجلد. هل ترغب في إضافتهم؟"
 MissingFiles.NoMissing.Title="التحقق من الملفات المفقودة"
 MissingFiles.NoMissing.Text="لا يبدو أن أي ملفات مفقودة."
+MacPermissions.MenuAction="مراجعة أذونات التطبيق ..."
 MacPermissions.Title="مراجعة أذونات التطبيق"
 MacPermissions.Description="يتطلب OBS Studio إذنك لتتمكن من توفير ميزات معينة. يوصى بتمكين هذه الأذونات ، لكنها غير مطلوبة لاستخدام التطبيق. يمكنك دائمًا تمكينها لاحقًا."
 MacPermissions.Description.OpenDialog="يمكنك إعادة فتح مربع الحوار هذا عبر قائمة OBS Studio."
@@ -404,14 +416,14 @@
 MacPermissions.Item.ScreenRecording="تسجيل الشاشة"
 MacPermissions.Item.ScreenRecording.Details="يطلب OBS هذا الإذن ليكون قادراً على التقاط الشاشة."
 MacPermissions.Item.Camera="الكاميرا"
-MacPermissions.Item.Camera.Details="هذا الإذن مطلوب لالتقاط المحتوى من كاميرا الويب أو بطاقة الالتقاط"
+MacPermissions.Item.Camera.Details="هذا الإذن مطلوب لالتقاط المحتوى من كاميرا الويب أو بطاقة الالتقاط."
 MacPermissions.Item.Microphone="الميكروفون"
 MacPermissions.Item.Microphone.Details="يطلب OBS هذا الإذن للسماح في تسجيل الميكروفون."
 MacPermissions.Item.Accessibility="إمكانية الوصول"
 MacPermissions.Item.Accessibility.Details="لكي تعمل اختصارات لوحة المفاتيح (مفاتيح التشغيل السريع) أثناء تركيز التطبيقات الأخرى ، يرجى تمكين هذا الإذن."
 MacPermissions.Continue="المتابعة"
-UpdateAvailable="تحديث جديد متوفر"
-UpdateAvailable.Text="الإصدار %1.%2.%3 متوفر الآن. <a href='%4'>انقر هنا للتتحميل</a>"
+SourceLeak.Title="خطأ في تنظيف المصدر"
+SourceLeak.Text="حدثت مشكلة أثناء تغيير مجموعات المشهد وتعذر تفريغ بعض المصادر. تحدث هذه المشكلة عادةً بسبب المكونات الإضافية التي لا تصدر الموارد بشكل صحيح. يرجى التأكد من أن أي مكونات إضافية تستخدمها محدثة.\n\nسيتم الآن إنهاء برنامَج OBS Studio لمنع أي تلف محتمل في البيانات."
 Basic.DesktopDevice1="صوت سطح المكتب"
 Basic.DesktopDevice2="صوت سطح المكتب 2"
 Basic.Scene="مشهد"
@@ -444,6 +456,7 @@
 VolControl.Mute="كتم الصوت '%1'"
 VolControl.Properties="خصائص ل '%1'"
 VolControl.UnassignedWarning.Title="مصدر صوتي غير محدد"
+VolControl.UnassignedWarning.Text="لم يتم تعيين \"%1\" لأي مسارات صوتية ولن يكون مسموعًا في التدفقات أو التسجيلات.\n\nلتعيين مصدر صوت إلى مسار، افتح \"خصائص الصوت المتقدمة\" من خلال قائمة النقر بزر الماوس الأيمن أو الزر المسنن في شريط أدوات حوض الخلاط."
 Basic.Main.AddSceneDlg.Title="أضف المشهد"
 Basic.Main.AddSceneDlg.Text="الرجاء إدخال اسم المشهد"
 Basic.Main.DefaultSceneName.Text="المشهد %1"
@@ -469,6 +482,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (اختيار تلقائي: %2)"
 Basic.PropertiesWindow.SelectColor="تحديد اللون"
 Basic.PropertiesWindow.SelectFont="إختيار خط"
+Basic.PropertiesWindow.SelectFont.WindowTitle="اختر نوع الخط"
 Basic.PropertiesWindow.ConfirmTitle="تم تغيير الإعدادات"
 Basic.PropertiesWindow.Confirm="يوجد تعديلات غير محفوظة. هل تريد الإبقاء عليها؟"
 Basic.PropertiesWindow.NoProperties="لا يوجد خصائص متوفرة"
@@ -579,9 +593,9 @@
 Basic.VCam.VirtualCamera="كاميرا افتراضية"
 Basic.VCam.OutputType="نوع الإخراج"
 Basic.VCam.OutputSelection="تحديد الإخراج"
-Basic.VCam.Internal="داخلي"
-Basic.VCam.InternalDefault="إخراج البرنامج (افتراضي)"
-Basic.VCam.InternalPreview="معاينة الإخراج"
+Basic.VCam.OutputType.Program="البرنامج (افتراضي)"
+Basic.VCam.OutputSelection.NoSelection="لا يوجد اختيار لهذا النوع من الإخراج"
+Basic.VCam.RestartWarning="ستتم إعادة تشغيل الكاميرا الافتراضية لتطبيق هذا التغيير"
 Basic.MainMenu.File="ملف (&F)"
 Basic.MainMenu.File.Export="تصدير (6) (&E)"
 Basic.MainMenu.File.Import="استيراد (&I)"
@@ -623,17 +637,18 @@
 Basic.MainMenu.Edit.AdvAudio="خصائص الصوت المتقدمة (&A)"
 Basic.MainMenu.View="عرض (&V)"
 Basic.MainMenu.View.Toolbars="شريط الأدوات (&T)"
-Basic.MainMenu.View.ListboxToolbars="أزرار قائمة المشهد/المصدر"
+Basic.MainMenu.View.ListboxToolbars="أشرطة أدوات الإرساء"
 Basic.MainMenu.View.ContextBar="شريط أدوات المصدر"
-Basic.MainMenu.View.SceneTransitions="انتقالات المشهد"
 Basic.MainMenu.View.SourceIcons="المصدر &أيقونات"
 Basic.MainMenu.View.StatusBar="شريط الحالة (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="ملء الشاشة"
 Basic.MainMenu.View.ResetUI="&إعادة ضبط الواجهة"
 Basic.MainMenu.View.AlwaysOnTop="&دائماً في القمة"
-Basic.MainMenu.Docks="&أرصفة"
+Basic.MainMenu.View.SceneListMode="وضع قائمة المشهد"
+Basic.MainMenu.Docks="&المخزونات"
 Basic.MainMenu.Docks.ResetDocks="&إعادة تعيين المخزونات"
 Basic.MainMenu.Docks.LockDocks="&قفل المخزونات"
+Basic.MainMenu.Docks.SideDocks="&أرصفة كاملة الارتفاع"
 Basic.MainMenu.Docks.CustomBrowserDocks="&أرصفة المتصفح المخصصة..."
 Basic.MainMenu.SceneCollection="مجموعة المشاهد (&S)"
 Basic.MainMenu.Profile="الملف الشخصي (&P)"
@@ -642,7 +657,6 @@
 Basic.MainMenu.SceneCollection.Import="أِضافة مجموعة مَشاهد"
 Basic.MainMenu.SceneCollection.Export="تصدير مجموعة ألمَشاهد"
 Basic.MainMenu.Profile.Exists="الملف الشخصي موجود مسبقاً"
-Basic.MainMenu.SceneCollection.Exists="مجموعة المشاهد موجودة بالفعل"
 Basic.MainMenu.Tools="أدوات (&T)"
 Basic.MainMenu.Help="مساعدة (&H)"
 Basic.MainMenu.Help.HelpPortal="بوابة &المساعدة"
@@ -654,8 +668,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="رفع ملف السجل الحالي (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="رفع &ملف السجل السابق"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&عرض السجل الحالي"
+Basic.MainMenu.Help.ReleaseNotes="ملاحظات الإصدار"
 Basic.MainMenu.Help.CheckForUpdates="التحقق من وجود تحديثات"
 Basic.MainMenu.Help.Repair="التحقق من سلامة الملفات"
+Basic.MainMenu.Help.RestartSafeMode="اعادة تشغيل في الوضع الامن"
+Basic.MainMenu.Help.RestartNormal="اعادة تشغيل في الوضع الامن"
 Basic.MainMenu.Help.CrashLogs="تقارير &الأعطال"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="&عرض تقارير الأعطال"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="رفع &تقرير الكراش السابق"
@@ -725,7 +742,6 @@
 Basic.Settings.General.ChannelName.beta="بيتاس / ترك المرشحين"
 Basic.Settings.General.ChannelDescription.beta="إصدارات ما قبل الإصدار غير مستقرة"
 Basic.Settings.Stream="بث"
-Basic.Settings.Stream.StreamType="نوع البث"
 Basic.Settings.Stream.Custom.UseAuthentication="استخدام المصادقة"
 Basic.Settings.Stream.Custom.Username="اسم المستخدم"
 Basic.Settings.Stream.Custom.Password="كلمة السر"
@@ -753,10 +769,11 @@
 Basic.Settings.Output.Format.MP4="MPEG-4 (mp4)"
 Basic.Settings.Output.Format.fMP4="MP4 مجزأ (.mp4)"
 Basic.Settings.Output.Format.fMOV="MOV مجزأ (.mov)"
+Basic.Settings.Output.Format.TT.fmov="MOV المجزأ يكتب التسجيل في أجزاء ولا يتطلب نفس الصيغة النهائية لملفات MOV التقليدية.\nيضمن هذا بقاء الملف قابلاً للتشغيل حتى في حالة مقاطعة الكتابة على القرص ، على سبيل المثال ، نتيجة الموت الزرقاء أو فقدان الطاقة.\n\nقد لا يكون هذا متوافقًا مع كافة المشغلات والمحررين. استخدم File → Remux Recordings لتحويل الملف إلى تنسيق أكثر توافقًا إذا لزم الأمر."
+Basic.Settings.Output.Format.TT.fmp4="MP4 المجزأ يكتب التسجيل في أجزاء ولا يتطلب نفس اللمسات الأخيرة مثل ملفات MP4 التقليدية.\nيضمن هذا بقاء الملف قابلاً للتشغيل حتى في حالة مقاطعة الكتابة على القرص ، على سبيل المثال ، نتيجة لفقد شاشة الموت الزرقاء أو فقدان الطاقة.\n\nقد لا يكون هذا متوافقًا مع جميع المشغلات والمحررين. استخدم File → Remux Recordings لتحويل الملف إلى تنسيق أكثر توافقًا إذا لزم الأمر."
 Basic.Settings.Output.Encoder.Video="تشفير الفيديو"
 Basic.Settings.Output.Encoder.Audio="تشفير الصوت"
 Basic.Settings.Output.SelectDirectory="حدد دليل التسجيل"
-Basic.Settings.Output.SelectFile="حدد ملف التسجيل"
 Basic.Settings.Output.DynamicBitrate="غير معدل البيتس ديناميكيًا لإدارة الاكتظاظ"
 Basic.Settings.Output.DynamicBitrate.Beta="غير معدل البيتس ديناميكيًا لإدارة الاكتظاظ (بيتا)"
 Basic.Settings.Output.DynamicBitrate.TT="وبدلا من إسقاط الأطر للحد من الاكتظاظ، يغير ديناميكيا معدل البتة على الذباب.\n\nلاحظ أن هذا يمكن أن يزيد من التأخير للمشاهدين إذا كان هناك اكتظاظ مفاجئ كبير.\nعندما ينخفض معدل البت، يمكن أن يستغرق الاستعادة بضع دقائق.\n\nمدعوم حاليا فقط لـ RTMP."
@@ -782,8 +799,9 @@
 Basic.Settings.Output.Simple.Warn.VideoBitrate="تحذير: سيتم تعيين معدل بث الفيديو إلى %1، وهو الحد الأعلى لخدمة البث الحالية."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="تحذير: سيتم تعيين مُعَدَل بث الصوت إلى %1، وهو الحد الأعلى لخدمة البث الحالية."
 Basic.Settings.Output.Simple.Warn.CannotPause="تحذير: لا يمكن إيقاف التسجيلات مؤقتاً إذا تم تعيين جودة التسجيل إلى \"كما في البث\"."
+Basic.Settings.Output.Simple.Warn.IncompatibleContainer="تحذير: تنسيق التسجيل المحدد حاليًا غير متوافق مع برنامج (مشفرات) الدفق المحدد."
 Basic.Settings.Output.Simple.Warn.Encoder="تحذير: التسجيل مع مشفر البرنامج بجودة مختلفة عن البث سيتطلب استخدام وحدة المعالجة المركزية الإضافية إذا قمت بالبث والتسجيل في نفس الوقت."
-Basic.Settings.Output.Simple.Warn.Lossless="تحذير: جودة (عدم فقدان اي بيانات) تولد ملفات كبيرة جداً! ويمكن أن تستخدم ما يزيد على 7 جيجابايت من مساحة القرص في الدقيقة الواحدة على الدقة العالية و معدل الإطارات العالي. لا ينصح بهذه الجودة للتسجيلات الطويلة إلا إذا كان لديك مساحة كبيرة جدا من القرص متاحة."
+Basic.Settings.Output.Simple.Warn.Lossless="تحذير: تؤدي الجودة غير المفقودة إلى إنشاء ملفات ذات أحجام كبيرة جدًا! يمكن أن تستخدم الجودة غير المفقودة ما يصل إلى 7 غيغابايت من مساحة القرص في الدقيقة بدقة ومعدلات إطارات عالية. لا يُنصح باستخدام خاصية Lossless للتسجيلات الطويلة إلا إذا كان لديك مساحة كبيرة جدًا على القرص متوفرة. لا يتوفر المخزن المؤقت لإعادة التشغيل عند استخدام الجودة غير المفقودة."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="هل أنت متأكد أنك تريد استخدام الجودة الغير فقودة؟"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="تحذير الجودة الغير فقودة!"
 Basic.Settings.Output.Simple.Encoder.Software="برمجية (x264)"
@@ -879,13 +897,30 @@
 FilenameFormatting.TT.CCYY="السنة, اربع خانات"
 FilenameFormatting.TT.YY="السنة, أخر خانتين(00-99)"
 FilenameFormatting.TT.MM="الشهر كرقم (01-12)"
+FilenameFormatting.TT.DD="يوم من الشهر، بدون مبطن (01-31)"
+FilenameFormatting.TT.hh="ضبط الوقت في صيغة 24 ساعة (00-23)"
 FilenameFormatting.TT.mm="الدقيقة(00-59)"
 FilenameFormatting.TT.ss="الثانية(00-59)"
+FilenameFormatting.TT.Percent="الإشارة أ%"
+FilenameFormatting.TT.a="اسم يوم من أيام الأسبوع المختصر"
 FilenameFormatting.TT.A="الاسم الكامل ليوم الأسبوع"
+FilenameFormatting.TT.b="اسم أحد الأشهر مختصر"
 FilenameFormatting.TT.B="اسم الشهر كامل"
+FilenameFormatting.TT.d="يوم من الشهر (01-31)"
+FilenameFormatting.TT.H="الساعات في صيغة 24ساعة"
+FilenameFormatting.TT.I="الساعات في صيغة 12ساعة"
+FilenameFormatting.TT.m="الشهر بالأرقام"
+FilenameFormatting.TT.M="الدقائق"
+FilenameFormatting.TT.p="صباحا أو مساء"
+FilenameFormatting.TT.s="الوقت بالثواني منذ عهد UNIX"
+FilenameFormatting.TT.S="الثواني"
+FilenameFormatting.TT.y="السنة"
 FilenameFormatting.TT.Y="السنة"
+FilenameFormatting.TT.z="إزاحة ISO 8601 عن التوقيت العالمي المنسق (UTC) في المنطقة الزمنية"
 FilenameFormatting.TT.Z="اسم المنطقة الزمنية"
 FilenameFormatting.TT.FPS="إطار في الثانية"
+FilenameFormatting.TT.CRES="قرار القاعدة (قماش)"
+FilenameFormatting.TT.ORES="دقة الإخراج (تحجيمها)"
 FilenameFormatting.TT.VF="تنسيق الفيديو"
 Basic.Settings.Video="الفيديو"
 Basic.Settings.Video.Adapter="محول الفيديو"
@@ -916,8 +951,8 @@
 Basic.Settings.Audio.PeakMeterType="نوع متر الذروة"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="عينة الذروة"
 Basic.Settings.Audio.PeakMeterType.TruePeak="الذروة الحقيقية (استخدام المعالج أعلي)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="تحذير: الصوت المحيطي مفعل."
-Basic.Settings.Audio.MultichannelWarning="في حالة البث، تحقق لمعرفة ما إذا كانت خدمة البث الخاصة بك تدعم كلا من تشغيل الصوت المحيط والتشغيل الصوتي المحيط. فيسبوك 360 Live مثال واحد حيث الصوت المحيط مدعوم تماما. على الرغم من أن الفيسبوك المباشر واليوتيوب المباشر يقبلان باللمس المحيط، فإن الفيسبوك المباشر للأسفل للستيريو و يوتيوب المباشر لا يلعب سوى قنتين.\n\nفلاتر الصوت OBS متوافقة مع الصوت المحيط، على الرغم من أن الدعم الإضافي VST غير مضمون."
+Basic.Settings.Audio.MultichannelWarning.Enabled="تحذير: الصوت المحيطي مفعل."
+Basic.Settings.Audio.MultichannelWarning="في حالة البث ، تحقق لمعرفة ما إذا كانت خدمة البث لديك تدعم كلاً من استيعاب الصوت المحيط وتشغيل الصوت المحيط. على سبيل المثال ، يدعم Facebook 360 Live الصوت المحيطي بشكل كامل ؛ يدعم YouTube Live إدخال الصوت 5.1 (والتشغيل على أجهزة التلفزيون).\n\nتتوافق عوامل تصفية الصوت OPS مع الصوت المحيط ، على الرغم من أن دعم المكون الإضافي VST غير مضمون."
 Basic.Settings.Audio.MultichannelWarning.Title="تمكين الصوت المحيط؟"
 Basic.Settings.Audio.MultichannelWarning.Confirm="هل أنت متأكد من أنك تريد تمكين الصوت المحيط؟"
 Basic.Settings.Audio.Devices="أجهزة الصوت الشاملة"
@@ -961,9 +996,8 @@
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="تحت المعدل الطبيعي"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="خامل"
 Basic.Settings.Advanced.FormatWarning="تحذير: صيغ الألوان الأخرى غير NV12/P010 مخصصة في الأساس للتسجيل، ولا ينصح بها عند البث. قد يسبب البث زيادة في استخدام وحدة المعالجة المركزية بسبب تحويل تنسيق الألوان."
-Basic.Settings.Advanced.FormatWarningPreciseSdr="تحذير: الصيغ عالية الدِّقَّة تستخدم غالباً مع مساحات ألوان HDR"
+Basic.Settings.Advanced.FormatWarningPreciseSdr="تحذير: الصيغ عالية الدِّقَّة تستخدم غالباً مع مساحات ألوان HDR."
 Basic.Settings.Advanced.FormatWarning2100="تحذير: التوصية 2100 ينبغي أن تستخدم صيغة أكثر دقة."
-Basic.Settings.Advanced.Audio.BufferingTime="وقت تخزين الصوت"
 Basic.Settings.Advanced.Video.ColorFormat="تنسيق اللون"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 ب (8-بت، 4:2:0، مستويان)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 ب (8-بت، 4:2:0، 3 مستويات)"
@@ -989,6 +1023,7 @@
 Basic.Settings.Advanced.Network="الشبكة"
 Basic.Settings.Advanced.Network.Disabled="بروتوكول البث المحدد حاليا لا يدعم تغيير إعدادات الشبكة."
 Basic.Settings.Advanced.Network.BindToIP="ربط بـ IP"
+Basic.Settings.Advanced.Network.IPFamily="عائلة IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="تمكين تحسينات الشبكة"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="تمكين سرعة TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="• محاولات جعل ناتج برنامج RTMP أكثر ملاءمة للتطبيقات الأخرى الحساسة للوقت على الشبكة عن طريق تنظيم معدل الإرسال.\nقد يزيد من خطر إسقاط الأطر على الاتصالات غير المستقرة."
@@ -1067,15 +1102,20 @@
 SceneItemShow="أظهر '%1'"
 SceneItemHide="اخفِ '%1'"
 OutputWarnings.NoTracksSelected="يجب عليك أن تحدد علي الأقل مسار واحد"
+OutputWarnings.NoTracksSelectedOnExit.Title="خطأ في إعدادات الإخراج"
+OutputWarnings.NoTracksSelectedOnExit.Text="جميع المخرجات يجب أن تحتوي على صوت واحد محدد"
 OutputWarnings.MP4Recording="تحذير: التسجيلات المحفوظة في MP4/MOV سوف تكون غير قابلة للاسترداد إذا لم يكن من الممكن الانتهاء من الملف (على سبيل المثال نتيجة ل BSOD، فقدان الطاقة، إلخ). إذا كنت ترغب في تسجيل مسارات صوتية متعددة تفكر في استخدام MKV وإعادة تعديل التسجيل إلى MP4/MOV بعد الانتهاء (الملف → Remux التسجيلات)"
 OutputWarnings.CannotPause="تحذير: لا يمكن إيقاف التسجيلات مؤقتاً إذا تم تعيين مشفر التسجيل إلى \"(استخدام مشفر البث)\""
+OutputWarnings.CodecIncompatible="تمت إعادة تعيين اختيار برنامج ترميز الصوت أو الفيديو بسبب عدم التوافق. الرجاء تحديد برنامج تشفير متوافق من القائمة."
+CodecCompat.Incompatible="(غير متوافق مع٪ 1)"
+CodecCompat.CodecPlaceholder="حدد التشفير..."
 CodecCompat.ContainerPlaceholder="أختيار الصيغة..."
 CodecCompat.CodecMissingOnExit.Title="لم يتم تحديد برنامَج تشفير"
-CodecCompat.CodecMissingOnExit.Text="لم يتم تعيين برنامَج ترميز فيديو أو صوت واحد في الأقل. يرجى التأكد من تحديد برامج التشفير لكل من التسجيل والبث"
+CodecCompat.CodecMissingOnExit.Text="لم يتم تعيين برنامَج ترميز فيديو أو صوت واحد في الأقل. يرجى التأكد من تحديد برامج التشفير لكل من التسجيل والبث."
 CodecCompat.ContainerMissingOnExit.Title="لا يوجد تنسيق محدد"
 CodecCompat.ContainerMissingOnExit.Text="لم يتم تحديد تنسيق التسجيل. يرجى تحديد تنسيق تسجيل متوافق مع مشفر البث المحدد."
 FinalScene.Title="حذف المشهد"
-FinalScene.Text="يجب أن يكون مشهد واحد على الأقل"
+FinalScene.Text="يجب أن يكون مشهد واحد على الأقل."
 NoSources.Title="لا يوجد مصدر"
 NoSources.Text="يبدو أنك لم تضف أي مصادر فيديو حتى الآن، لذلك ستبث شاشة سوداء فقط. هل أنت متأكد من أنك تريد القيام بهذا؟"
 NoSources.Text.AddSource="يمكنك إضافة مصادر بالنقر على الرمز + تحت مربع المصادر في النافذة الرئيسية في أي وقت."
@@ -1089,6 +1129,7 @@
 About.GetInvolved="شارك معنا"
 About.Authors="المؤلفون"
 About.License="الترخيص"
+About.Error="خطأ! تعذرت قراءة الملف.\n\nانتقل إلى: %1"
 About.Contribute="دعم مشروع OBS"
 AddUrl.Title="إضافة مصدر عبر عنوان URL"
 AddUrl.Text="لقد قمت بسحب عنوان URL إلى OBS. سيؤدي هذا تلقائياً إلى إضافة الرابط كمصدر. هل تريد المتابعة؟"
@@ -1104,20 +1145,18 @@
 Importer.Path="مسار المجموعة"
 Importer.Program="التطبيق المكتشف"
 Importer.AutomaticCollectionPrompt="البحث تلقائياً عن مجموعات المشاهد"
-Importer.AutomaticCollectionText="يمكن لـ OBS العثور تلقائياً على مجموعات مشاهد مستوردة من البرامج المدعومة من أطراف ثالثة. هل ترغب في أن يجد OBS المجموعات لك تلقائياً؟\n\nيمكنك تغيير هذا لاحقًا في الإعدادات > العامة > المستوردين."
+Importer.AutomaticCollectionText="يمكن لـ OBS العثور تلقائياً على مجموعات مشاهد مستوردة من البرامج المدعومة من الأطراف الثالثة. هل ترغب في أن يجد OBS المجموعات لك تلقائياً؟\n\nيمكنك تغيير هذا لاحقًا في الإعدادات > العامة > المستوردين."
 Restart="إعادة التشغيل"
 NeedsRestart="يجب إعادة تشغيل OBS Studio. هل تريد إعادة التشغيل الآن؟"
 LoadProfileNeedsRestart="يحتوي الملف الشخصي على إعدادات تتطلب إعادة تشغيل OBS:\n%1\n\nهل تريد إعادة تشغيل OBS لتفعيل هذه الإعدادات؟"
 ContextBar.NoSelectedSource="لم يتم تحديد مصدر"
 ContextBar.ResetTransform="إعادة تعيين التحويل"
-ContextBar.FitToCanvas="تكيف حسب اللوحة"
 ContextBar.MediaControls.PlayMedia="تشغيل الوسائط"
 ContextBar.MediaControls.PauseMedia="إيقاف الوسائط"
 ContextBar.MediaControls.StopMedia="‮أوقف الوسائط"
 ContextBar.MediaControls.RestartMedia="إعادة تشغيل الوسائط"
 ContextBar.MediaControls.PlaylistNext="التالي في قائمة التشغيل"
 ContextBar.MediaControls.PlaylistPrevious="السابق في قائمة التشغيل"
-ContextBar.MediaControls.MediaProperties="خصائص الوسائط"
 ContextBar.MediaControls.BlindSeek="أداة البحث عن الوسائط"
 YouTube.Auth.Ok="اكتمل التفويض بنجاح.\nيمكنك الآن إغلاق هذه الصفحة."
 YouTube.Auth.NoCode="ولم تكتمل عملية التصريح."
@@ -1176,7 +1215,7 @@
 YouTube.Actions.Error.BroadcastTestStarting="البث ينتقل إلى مرحلة الاختبار، وهذا قد يستغرق بعض الوقت. الرجاء المحاولة مرة أخرى خلال 10-30 ثانية."
 YouTube.Actions.EventsLoading="تحميل قائمة الأحداث..."
 YouTube.Actions.EventCreated.Title="تم إنشاء الحدث"
-YouTube.Actions.EventCreated.Text="تم إنشاء الحدث بنجاح"
+YouTube.Actions.EventCreated.Text="تم إنشاء الحدث بنجاح."
 YouTube.Actions.Stream="بث"
 YouTube.Actions.Stream.ScheduledFor="مجدولة ل %1"
 YouTube.Actions.Stream.Resume="استئناف البث المتقطع"
@@ -1199,3 +1238,5 @@
 YouTube.Errors.liveChatEnded="لقد انتهى البث الحي."
 YouTube.Errors.messageTextInvalid="نص الرسالة غير صالح."
 YouTube.Errors.rateLimitExceeded="أنت ترسل الرسائل بسرعة كبيرة."
+YouTube.DocksRemoval.Title="امسح قواعد متصفح YouTube القديمة"
+YouTube.DocksRemoval.Text="ستتم إزالة قواعد إرساء المتصفح هذه باعتبارها مهملة: \n\n%1\nاستخدم \"Docks / غرفة التحكم المباشر على YouTube\" بدلاً من ذلك."

obs-studio-29.1.3.tar.xz/UI/data/locale/az-AZ.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/az-AZ.ini Changed

@@ -69,6 +69,7 @@
 Next="Növbəti"
 Back="Geri"
 Defaults="İlkin"
+RestoreDefaults="İlkin"
 HideMixer="Mikserdə gizlət"
 TransitionOverride="Keçidə əhəmiyyət vermə"
 ShowTransition="Keçidi göstər"
@@ -76,6 +77,8 @@
 None="Heç biri"
 StudioMode.Preview="Önbaxış"
 StudioMode.Program="Proqram"
+StudioMode.PreviewSceneName="Önbaxış: Səhnə"
+StudioMode.ProgramSceneName="Proqram: Səhnə"
 ShowInMultiview="Çoxlu Ekranda Göstər"
 VerticalLayout="Şaquli Düzüm"
 Group="Qrup"
@@ -90,12 +93,22 @@
 LogViewer="Jurnal bax"
 ShowOnStartup="Başlanğıcda göstər"
 OpenFile="Faylı aç"
-AddValue="%1 əlavə et"
+AddSource="Mənbə Əlavə et"
+RemoveScene="Seçilən səhnəni sil"
+RemoveSource="Seçilən səhnələri sil"
+MoveSceneUp="Səhnəni yuxari köçür"
+MoveSceneDown="Səhnəni aşağı köçür"
+MoveSourceUp="Mənbələri yuxarı köçür"
+MoveSourceDown="Mənbələri aşağı köçür"
+SourceProperties="Mənbə özəlliklərini aç"
+SourceFilters="Mənbə filtirlərini aç"
+MixerToolbarMenu="Səs Düzənləyici"
 AlreadyRunning.Title="OBS artıq işləyir"
 AlreadyRunning.Text="OBS artıq işləyir! Bunu etmək istəmirsinizsə, zəhmət olmasa yeni bir nümunəni işlətməyi sınamazdan əvvəl bütün mövcud OBS nümunələrini söndürün. OBS-i sistem sinisinə kiçilməsi üçün tənzimləmisinizsə, zəhmət olmasa işlədiyini görmək üçün yoxlayın."
 AlreadyRunning.LaunchAnyway="Yenə də başlat"
 ChromeOS.Title="Dəstəklənməyən platform"
 DockCloseWarning.Title="Qoşulan pəncərəni bağla"
+DockCloseWarning.Text="İndicə qoşulan pəncərəni bağladınız. Əgər yenidən göstərmək istəyirsinizsə, Menyu sətrindəki Bax → Yuvalar bölməsinə gedin."
 ExtraBrowsers="Özəl Səyyah Yuvaları"
 ExtraBrowsers.Info="Onlara ad və URL verərək dok əlavə edin,sonra dokları açmaq üçün Tətbiq et və ya Bağlaya vurun.İstədiyiniz zaman dok əlavə edə və ya silə bilərsiniz."
 ExtraBrowsers.DockName="Dok adı"
@@ -155,7 +168,6 @@
 Basic.AutoConfig.StreamPage.Service.ShowAll="Hamısını Göstər..."
 Basic.AutoConfig.StreamPage.Service.Custom="Fərdi..."
 Basic.AutoConfig.StreamPage.StreamKey="Yayım Açarı"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Bağlantı)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kodlayıcı açar kodu"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Hesaba qoşuldu"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Bant genişliyi ilə bit sürətini təxmin et (Bir neçə dəqiqə çəkə bilər)"
@@ -206,18 +218,18 @@
 Updater.UpdateNow="İndi Yenilə"
 Updater.RemindMeLater="Daha sonra xatırlat"
 Updater.Skip="Versiyanı Ötür"
-Updater.Running.Title="Proqram hazırda aktivdir"
-Updater.Running.Text="Çıxışlar hal hazırda aktivdir, zəhmət olmasa güncəlləmədən əvvəl aktif olan çıxışları dayandırın."
 Updater.NoUpdatesAvailable.Title="Yeniləmə yoxdur"
 Updater.NoUpdatesAvailable.Text="Hazırda son yeniləmələr yoxdur"
 Updater.FailedToLaunch="Yeniləyici başladılmadı"
-Updater.GameCaptureActive.Title="Oyun yaxalama aktivdir"
 QuickTransitions.DuplicateScene="Səhnəni Çoxalt"
+QuickTransitions.EditProperties="Mənbələri kopyala"
+Basic.SceneTransitions="Səhnə keçidi"
 Basic.TransitionDuration="Müddət"
 Basic.TogglePreviewProgramMode="Studiya Rejimi"
 Undo.Undo="Geri"
 Undo.Redo="İreli"
 Undo.Add="%1 əlavə et'"
+Undo.Delete="Sil"
 Undo.HideSceneItem="%2 içində %1 gizlət"
 Undo.ReorderSources="%1 içində resursları yenidən sırala"
 Undo.MoveUp="%2 içindəki %1 yuxarı daşı"
@@ -254,7 +266,6 @@
 Remux.ClearAll="Bütün Elementləri Təmizlə"
 Remux.SelectTarget="Hədəf faylı seç..."
 Remux.FileExistsTitle="Hədəf fayllar var"
-UpdateAvailable="Son Yeniləmə Mövcuddur"
 Basic.DesktopDevice1="Masaüstü Səs"
 Basic.DesktopDevice2="Masaüstü Səs 2"
 Basic.Scene="Səhnə"
@@ -340,12 +351,10 @@
 NeedsRestart="OBS Studio yenidən başladılmalıdır. İndi yenidən başlatmaq istəyirsiniz?"
 ContextBar.NoSelectedSource="Mənbə seçilməyib"
 ContextBar.ResetTransform="Çevrilməni sıfırla"
-ContextBar.FitToCanvas="Kətana uyğun"
 ContextBar.MediaControls.PlayMedia="Medianı oynat"
 ContextBar.MediaControls.PauseMedia="Mediaya fasilə ver"
 ContextBar.MediaControls.StopMedia="Medianı dayandır"
 ContextBar.MediaControls.RestartMedia="Medianı yenidən başlat"
 ContextBar.MediaControls.PlaylistNext="Oynatma siyahısında növbəti"
 ContextBar.MediaControls.PlaylistPrevious="Oynatma siyahısında əvvəlki"
-ContextBar.MediaControls.MediaProperties="Media xüsusiyyətləri"
 ContextBar.MediaControls.BlindSeek="Media axtarış viceti"

obs-studio-29.1.3.tar.xz/UI/data/locale/ba-RU.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ba-RU.ini Changed

@@ -86,7 +86,6 @@
 AspectRatio="%1:%2 яҡтарҙың мөнәсәбәттәре"
 LockVolume="Тауышты билдәләү"
 OpenFile="Файл асырға"
-AddValue="Өҫтәргә: %1"
 AlreadyRunning.Title="OBS ҡабыҙылған инде"
 AlreadyRunning.LaunchAnyway="Барабер ебәреү"
 DockCloseWarning.Title="Билдәләп торған тәҙрәне ябыу"
@@ -128,7 +127,6 @@
 Basic.AutoConfig.StreamPage.Service="Сервис"
 Basic.AutoConfig.StreamPage.Server="Сервер"
 Basic.AutoConfig.StreamPage.StreamKey="Стримдың асҡысы"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Һылтанма)"
 Basic.AutoConfig.TestPage.Result.StreamingEncoder="Стрим билдәгәрткесе"
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Яҙманың билдәгәрткесе"
 Basic.Stats="Статистик"
@@ -178,13 +176,11 @@
 Basic.MainMenu.File.Remux="Яҙмаларҙың ремукслау (&M)"
 Basic.MainMenu.File.Settings="Көйләүҙәр (&S)"
 Basic.MainMenu.File.Exit="Сығыу (&X)"
-Basic.MainMenu.View.SceneTransitions="Сәхнә әүрелеүҙәре (&C)"
 Basic.Settings.General.Theme="Тема"
 Basic.Settings.General.Language="Тел"
 Basic.Settings.General.Projectors="Проекторҙар"
 Basic.Settings.General.Preview="Алдынан ҡарау"
 Basic.Settings.Stream="Стрим"
-Basic.Settings.Stream.StreamType="Стримдың төрө"
 Basic.Settings.Stream.TTVAddon.None="Юҡ"
 Basic.Settings.Output.ReplayBuffer.Suffix="Суффикс"
 Basic.Settings.Output.VideoBitrate="Видео битрейты"

obs-studio-29.1.3.tar.xz/UI/data/locale/be-BY.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/be-BY.ini Changed

@@ -32,6 +32,8 @@
 PreviewWindow="Аконны праектар (Прагляд)"
 SceneWindow="Аконны праектар (Сцэна)"
 SourceWindow="Аконны праектар (Крыніца)"
+MultiviewProjector="Мультыпрагляд (на ўвесь экран)"
+MultiviewWindowed="Мультыпрагляд (у акне)"
 ResizeProjectorWindowToContent="Падагнаць акно да змесціва"
 Clear="Ачысьціць"
 Revert="Вярнуць"
@@ -78,6 +80,7 @@
 StudioMode.Program="Праграма"
 StudioMode.PreviewSceneName="Прагляд: %1"
 StudioMode.ProgramSceneName="Праграма: %1"
+ShowInMultiview="Паказаць у Мультыпраглядзе"
 VerticalLayout="Вертыкальны расклад"
 Group="Група"
 DoNotShowAgain="Не паказваць зноў"
@@ -91,7 +94,6 @@
 LogViewer="Журнал адладкі"
 ShowOnStartup="Паказваць пры запуску"
 OpenFile="Адкрыць файл"
-AddValue="Дадаць %1"
 AddSource="Дадаць крыніцу"
 RemoveScene="Выдаліць Абраную Сцэну"
 RemoveSource="Выдаліць Абраную Крыніцу(-цы)"
@@ -103,11 +105,19 @@
 SourceFilters="Паказаць Фільтры Крыніцы"
 MixerToolbarMenu="Меню Мікшэра Аўдыё"
 SceneFilters="Паказаць Фільтры Сцэны"
+List="Спісам"
+Grid="Сеткай"
 PluginsFailedToLoad.Title="Памылка Загрузкі Плагіна"
 PluginsFailedToLoad.Text="Немагчыма запусціць наступныя плагіны OBS:\n\n%1\nКалі ласка, абнавіце ці выдаліце гэтыя плагіны."
 AlreadyRunning.Title="OBS ужо працуе"
 AlreadyRunning.Text="OBS ужо працуе! Калі вы не збіраліся гэтага зрабіць, калі ласка, выключыце ўсе існуючыя копіі OBS перад запускам новай. Калі вы ўсталявалі згортванне OBS да панэлі задач, калі ласка, праверце, ці працуе яно там."
 AlreadyRunning.LaunchAnyway="Усё Роўна Запусціць"
+AutoSafeMode.Title="Бяспечны Рэжым"
+AutoSafeMode.Text="Падчас апошняга сеансу працы OBS не была завершана належным чынам.\n\n Ці жадаеце Вы запусціць працу ў бяспечным рэжыме (адключаныя іншыя плагіны, скрыпты і WebSockets)?"
+AutoSafeMode.LaunchSafe="Запуск у бяспечным рэжыме"
+AutoSafeMode.LaunchNormal="Праца ў нармальным рэжыме"
+SafeMode.Restart="Ці жадаеце Вы перазапусціць OBS у бяспечным рэжыме (адключаныя іншыя плагіны, скрыпты і WebSockets)?"
+SafeMode.RestartNormal="Ці хочаце Вы перазапусціць OBS у нармальным рэжыме?"
 ChromeOS.Title="Платформа не падтрымліваецца"
 ChromeOS.Text="Здаецца, OBS працуе ў кантэйнеры ChromeOS. Гэта платформа не падтрымліваецца."
 Wine.Title="Выяўлены Wine"
@@ -115,31 +125,195 @@
 DockCloseWarning.Title="Закрыццё Стыкуемага Акна"
 DockCloseWarning.Text="Вы толькі што зачынілі стыкуемае акно. Калі вы жадаеце паказаць яго зноў, скарыстайцеся меню Стыкуемыя ў радку меню."
 ExtraBrowsers="Свае Докі Браўзэра"
+ExtraBrowsers.Info="Дадаце докі, даўшы ім імя і URL, потым націсніце Прыменіць але Закрыць каб адкрыць докі. Вы можаце дадаваць ці выдаляць докі ў любы час."
+ExtraBrowsers.DockName="Імя Дока"
 Auth.Authing.Title="Аўтэнтыфікацыя..."
+Auth.Authing.Text="Аўтарызацыя з %1, пачакайце..."
 Auth.AuthFailure.Title="Памылка аўтэнтыфікацыі"
+Auth.AuthFailure.Text="Не атрымалася аўтарызавацца з %1:\n\n%2: %3"
+Auth.InvalidScope.Title="Патрэбна Аўтарызацыя"
+Auth.InvalidScope.Text="Патрабавання для аўтэнтыфікацыі для %1 былі зменены. Некаторыя функцыі могуць быць недаступныя."
+Auth.LoadingChannel.Title="Загрузка інфармацыі аб канале..."
+Auth.LoadingChannel.Text="Загрузка інфармацыі аб канале з %1, пачакайце..."
+Auth.LoadingChannel.Error="Немагчыма атрымаць інфармацыю аб канале."
+Auth.ChannelFailure.Title="Не атрымалася загрузіць інфармацыю аб канале"
+Auth.ChannelFailure.Text="Не атрымалася загрузіць інфармацыю аб канале з %1\n\n%2: %3"
 Auth.Chat="Чат"
+Auth.StreamInfo="Інфармацыя пра Паток"
 TwitchAuth.Stats="Статыстыка Twitch"
 TwitchAuth.Feed="Стужка актыўнасці Twitch"
+TwitchAuth.TwoFactorFail.Title="Не атрымалася запытаць ключ патоку."
+TwitchAuth.TwoFactorFail.Text="OBS не можа далучыцца да вашага ўліковага запісу Twitch. Калі ласка, пераканайцеся, што двухфактарная аўтэнтыфікація ўсталявана ў <a href='https://www.twitch.tv/settings/security'>наладах бяспекі Twitch</a>, таму што яна патрабуецца для трансляцыі."
+RestreamAuth.Channels="Каналы Restream"
 Copy.Filters="Капіраваць фільтры"
 Paste.Filters="Уставіць фільтры"
+BrowserPanelInit.Title="Ініцыялізацыя Браўзера..."
+BrowserPanelInit.Text="Ідзе ініцыялізація браўзера, пачакайце..."
 BandwidthTest.Region="Рэгіён"
 BandwidthTest.Region.US="Злучаныя Штаты"
 BandwidthTest.Region.EU="Еўропа"
 BandwidthTest.Region.Asia="Азія"
 BandwidthTest.Region.Other="Іншы"
+Basic.AutoConfig="Майстар Аўта-Канфігурацыі"
 Basic.AutoConfig.ApplySettings="Ужыць налады"
 Basic.AutoConfig.StartPage="Інфармацыя аб выкарыстанні"
+Basic.AutoConfig.StartPage.SubTitle="Укажыце, для чаго вы хочаце выкарыстоўваць праграму"
+Basic.AutoConfig.StartPage.PrioritizeStreaming="Аптымізаваць для вяшчання, запіс пабочны"
+Basic.AutoConfig.StartPage.PrioritizeRecording="Аптымізаваць толькі для запісу, я не буду весці трансляцыі"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Я буду толькі выкарыстоўваць віртуальную камеру"
 Basic.AutoConfig.VideoPage="Налады відэа"
+Basic.AutoConfig.VideoPage.SubTitle="Укажыце налады відэа, якія вы хочаце выкарыстоўваць"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Выкарыстоўваць Бягучы (%1x%2)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Дысплэй %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Выкарыстоўваць Бягучы (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="Альбо 60 альбо 30, але аддаваць перавагу 60 калі магчыма"
+Basic.AutoConfig.VideoPage.FPS.PreferHighRes="Альбо 60 альбо 30, але аддаваць перавагу больш высокаму памеру"
+Basic.AutoConfig.VideoPage.CanvasExplanation="Заўвага: Дазвол палатна (асновы) неабавязкова супадае з дазволам, з якім выбудзеце весці трансляцыі ці запісваць. Фактычны дазвол патоку/запісу можа быць зменшаны ад дазволу палатна, каб паменшыць выкарыстанне рэсурсаў або патрабаванні да бітрэйту."
+Basic.AutoConfig.StreamPage="Інфармацыя пра Паток"
+Basic.AutoConfig.StreamPage.SubTitle="Калі ласка, увядзіце інфармацыю пра ваш паток"
+Basic.AutoConfig.StreamPage.ConnectAccount="Далучыць уліковы запіс (рэкамендуецца)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Адключыць уліковы запіс"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Адключыць акаўнт?"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Гэта змена будзе ўжыта неадкладна. Вы ўпэўнены, што хочаце адключыць свой акаўнт?"
 Basic.AutoConfig.StreamPage.GetStreamKey="Атрымаць ключ стрыма"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Спасылка)"
+Basic.AutoConfig.StreamPage.MoreInfo="Дакладней"
+Basic.AutoConfig.StreamPage.UseStreamKey="Карыстаць Ключ Патоку"
+Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Карыстаць Ключ Патоку (прасунуты)"
+Basic.AutoConfig.StreamPage.Service="Сэрвіс"
+Basic.AutoConfig.StreamPage.Service.ShowAll="Паказаць усе"
+Basic.AutoConfig.StreamPage.Service.Custom="Уласнае..."
+Basic.AutoConfig.StreamPage.Server="Сервер"
+Basic.AutoConfig.StreamPage.StreamKey="Ключ патоку"
+Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: увядзіце фразу шыфравання.\nRTMP: увядзіце ключ, дадзены сэрвісам.\nSRT: увядзіце streamid, калі сэрвіс такое выкарыстоўвае."
+Basic.AutoConfig.StreamPage.EncoderKey="Ключ Кадавальніка"
+Basic.AutoConfig.StreamPage.ConnectedAccount="Звязаны ўліковы запіс"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Ацаніць бітрэйт з дапамогай тэсту прапускной магчымасці (можа заняць некалькі хвілін)"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Даваць перавагу апаратнаму кадаванню"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Апаратнае Кадаванне ўбірае большую частку нагрузкі на працэсар, але для дасягнення такога ж узроўню якасці можа спатрэбіцца большы бітрэйт."
+Basic.AutoConfig.StreamPage.StreamWarning.Title="Папярэджанне патоку"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Тэст прапускной магчымасці будзе вяшчаць на ваш канал выпадковую відэаінфармацыю без гуку. Калі вы можаце, рэкамендуецца часова адключыць запіс мінулых трансляцый і пазначыць паток як прыватны да канца тэсту. Працягнуць?"
+Basic.AutoConfig.TestPage="Канчатковыя Вынікі"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Зараз праграма выконвае шэраг тэстаў, каб ацаніць найлепшыя налады"
+Basic.AutoConfig.TestPage.SubTitle.Complete="Тэставанне завершана"
+Basic.AutoConfig.TestPage.TestingBandwidth="Ідзе тэст прапускной магчымасці, гэта можа заняць некалькі хвілін..."
+Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Пратакол вываду гэтага сэрвісу не быў знойздены"
+Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Падключэнне да: %1..."
+Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Немагчыма падключыцца да ні аднаго сервера. Калі ласка, праверце падключэнне да Інтэрнэту і паўтарыце спробу."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="Правяраем прапускную магчымасць да: %1"
+Basic.AutoConfig.TestPage.TestingStreamEncoder="Правяраем кадавальнік патоку, гэта можа заняць некаторы час..."
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="Правяраем кадавальнік запісу, гэта можа заняць некаторы час..."
+Basic.AutoConfig.TestPage.TestingRes.Fail="Немагчыма запусціць кадавальнік"
+Basic.AutoConfig.TestPage.TestingRes.Resolution="Правяраем %1x%2 %3 FPS..."
+Basic.AutoConfig.TestPage.Result.StreamingEncoder="Кадавальнік патоку"
+Basic.AutoConfig.TestPage.Result.RecordingEncoder="Кадавальнік запісу"
+Basic.AutoConfig.TestPage.Result.Header="Праграмма вызначыла, што вам найбольш падыходзяць наступныя налады:"
+Basic.AutoConfig.TestPage.Result.Footer="Каб карставацца імі, націсніце Прымяніць Налады. Каб зменіць канфігурацыю майстра і паўтарыць спробу, націсніце Назад. Каб задаць налады ўручную, націсніце Адмена і адкройце Налады."
+Basic.AutoConfig.Info="Майстар Аўта-Канфігурацыі вызначыць найлепшыя налады, зыходзячы з канфігурацыі вашага ПК і хуткасці інтэрнэту."
+Basic.AutoConfig.RunAnytime="Вы можаце запусціць яго ў любой час праз меню Інструменты."
+Basic.Stats="Статыстыка"
+Basic.Stats.CPUUsage="Выкарыстанне працэсара"
+Basic.Stats.HDDSpaceAvailable="Даступная дыскавая прастора"
+Basic.Stats.MemoryUsage="Выкарыстанне памяці"
+Basic.Stats.AverageTimeToRender="Сярэдні час рэндэрынгу кадра"
+Basic.Stats.SkippedFrames="Прапушчаныя кадры з-за затрымкі кадавання"
+Basic.Stats.Status.Live="У ЭФІРЫ!"
 Basic.Stats.Status.Active="Актыўна"
 Basic.Stats.Bitrate="Бітрэйт"
+Basic.Stats.ResetStats="Абнавіць статыстку"
 Updater.UpdateNow="Абнавіць зараз"
 Updater.RemindMeLater="Нагадаць пазней"
+Updater.Skip="Прапусціць версію"
+Updater.NoUpdatesAvailable.Title="Няма даступных абнаўленняў"
+QuickTransitions.HotkeyName="Хуткі пераход: %1"
+Basic.TransitionDuration="Працягласць"
+Basic.TogglePreviewProgramMode="Рэжым студыі"
+Undo.Undo="Скасаваць"
+Undo.Add="Дадаць %1'"
+Undo.Delete="Выдаліць '%1'"
+Undo.Rename="Перайменаваць '%1'"
+Undo.Transform.HFlip="Перавярнуць па гарызанталі ў \"%1\""
+Undo.Transform.VFlip="Перавярнуць па вертыкалі ў \"%1\""
+Undo.Transform.FitToScreen="Упісаць на экран у \"%1\""
+Undo.Transform.StretchToScreen="Расцягнуць на экран у \"%1\""
+Undo.Transform.Center="Па цэнтру экрана ў \"%1\""
+Undo.Transform.VCenter="Цэнтраваць па вертыкалі экрана ў \"%1\""
+Undo.Transform.HCenter="Цэнтраваць па гарызанталі экрана ў \"%1\""
+Undo.Volume.Change="Зменіць гучнасць у \"%1\""
+Undo.Volume.Mute="Прыглушыць \"%1\""
+Undo.Volume.Unmute="Уключыць гук у \"%1\""
+Undo.Balance.Change="Змяніць баланс аўдыё для \"%1\""
+Undo.SyncOffset.Change="Змяніць зрушэнне сінхранізацыі аўдыё для \"%1\""
+Undo.MonitoringType.Change="Змяніць прагляд аўдыё для \"%1\""
+Undo.Mixers.Change="Змяніць міксеры аўдыё для \"%1\""
+Undo.ForceMono.On="Уключыць прымушэнне Мона для \"%1\""
+Undo.ForceMono.Off="Адключыць прымушэнне Мона для \"%1\""
+Undo.Properties="Змяніць уласцівасці для \"%1\""
+Undo.Scene.Duplicate="Дубліраваць сцэну \"%1\""
+Undo.ShowTransition="Пераход паказу для \"%1\""
+Undo.HideTransition="Пераход схавання для \"%1\""
+Undo.ShowSceneItem="Паказаць \"%1\" у \"%2\""
+Undo.HideSceneItem="Схаваць \"%1\" у \"%2\""
+Undo.ReorderSources="Перапарадкаваць крыніцы ў \"%1\""
+Undo.MoveUp="Падвінуць \"%1\" уверх у \"%2\""
+Undo.MoveDown="Падвінуць \"%1\" уніз у \"%2\""
+Undo.MoveToTop="Падвінуць \"%1\" на самы верх у \"%2\""
+Undo.MoveToBottom="Падвінуць \"%1\" на самы ніз у \"%2\""
+Undo.PasteSource="Уставіць крыніцу(ы) ў \"%1\""
+Undo.PasteSourceRef="Уставіць спасылку да крыніц(ы) ў \"%1\""
+Undo.GroupItems="Згрупаваць да \"%1\""
+TransitionNameDlg.Text="Калі ласка, увядзіце назву перахода"
+TransitionNameDlg.Title="Назва Перахода"
+TitleBar.PortableMode="Партатыўны Рэжым"
 TitleBar.Profile="Профіль"
 TitleBar.Scenes="Сцэны"
+NameExists.Title="Назва ўжо існуе"
+NameExists.Text="Назва ўжо выкарыстоўваецца."
+NoNameEntered.Title="Увядзіце правільную назву."
+NoNameEntered.Text="Вы не можаце карыстаць пустыя назвы."
+ConfirmStart.Title="Пачаць трансляцыю?"
+ConfirmStart.Text="Вы ўпэўнены, што хочаце пачаць трансляцыю?"
+ConfirmStop.Title="Выключыць трансляцыю?"
+ConfirmStop.Text="Вы ўпэўнены, што хочаце спыніць трансляцыю?"
+ConfirmStopRecord.Title="Спыніць запіс"
+ConfirmStopRecord.Text="Вы ўпэўнены, што хочаце спыніць трансляцыю?"
+ConfirmBWTest.Title="Пачаць тэст прапускной магчымасці?"
+ConfirmBWTest.Text="OBS настроена ў рэжыме тэста прапускной магчымасці. Гэты рэжым дазваляе правяраць сець без актыўнай трансляцыі на вашым канале. Пасля завяршэння тэста, вам трэба адключыць яго, каб вашы гледачы маглі бачыць ваш паток.\n\nХочаце працягнуць?"
+ConfirmExit.Title="Выйсці з OBS?"
+ConfirmExit.Text="OBS зараз актыўны. Усе трансляцыі і (або) запісы будуць адключаныя. Вы ўпэўненыя, што хочаце выйсці?"
+ConfirmRemove.Title="Падцвердзіць Выдаленне"
+ConfirmRemove.Text="Вы ўпэўнены, што хочаце выдаліць \"%1\"?"
+ConfirmRemove.TextMultiple="Вы ўпэўнены, што хочаце выдаліць %1 прадметаў?"
+ConfirmReset.Title="Скінуць налады"
+ConfirmReset.Text="Вы ўпэўнены, што хочаце вярнуць усе змены да налад па змаўчанні?"
+Output.StartStreamFailed="Не ўдалося пачаць трансляцыю"
+Output.StartRecordingFailed="Не ўдалося пачаць запіс"
+Output.StartReplayFailed="Немагчыма запусціць буфер імгненнага паўтору"
+Output.StartVirtualCamFailed="Немагчыма запусціць віртуальную камеру"
+Output.StartFailedGeneric="Немагчыма пачаць вывад. Падрабязнасці праверце ў журнале адладкі.\n\nЗаўвага: Калі вы карыстаеце кадавальнікі NVENC або AMD, пераканайцеся што вашы відэа драйверы абноўлены."
+Output.ReplayBuffer.PauseWarning.Title="Немагчыма захаваць паўторы падчас паўзы"
+Output.ReplayBuffer.PauseWarning.Text="Папярэджанне: Паўторы нельга захоўваць, калі запіс прыпынены"
+Output.ConnectFail.Title="Не атрымалася падлучыцца"
+Output.ConnectFail.BadPath="Неверны Шлях або URL Злучэння. Калі ласка, пераканайцеся ў правільнасці налад."
+Output.ConnectFail.ConnectFailed="Не атрымалася падключыцца да сервера"
+Output.ConnectFail.InvalidStream="Немагчыма атрымаць доступ да вызначанага канала або ключа патоку, пераканайцеся ў вернасці ключа патоку. Калі ён верны, маглі ўзнікнуць праблемы с далучэннем да сервера."
 LogReturnDialog.CopyURL="Скапіяваць URL"
 MissingFiles.Found="Знойдзены"
+MacPermissions.Continue="Працягнуць"
+Basic.Scene="Сцэна"
+AddProfile.Title="Дадаць профіль"
+AddProfile.Text="Калі ласка, увядзіце назву профілю"
+Basic.Main.Sources.Visibility="Бачнасць"
+Basic.PropertiesWindow.SelectColor="Выбраць колер"
+Basic.PropertiesWindow.SelectFont="Выбраць шрыфт"
+Basic.PropertiesWindow.ConfirmTitle="Змяніць налады?"
+Basic.PropertiesWindow.Confirm="Ёсць незахаваныя змены. Вы хочаце захаваць іх?"
+Basic.TransformWindow.Position="Пазіцыя"
+Basic.TransformWindow.PositionX="Пазіцыя па X"
+Basic.TransformWindow.PositionY="Пазіцыя па Y"
+Basic.TransformWindow.Rotation="Арыентацыя"
+Basic.TransformWindow.Size="Памер"
+Basic.TransformWindow.Width="Шырыня"
+Basic.TransformWindow.Height="Вышыня"
 Basic.MainMenu.File="&Файл"
 Basic.MainMenu.File.Export="&Экспарт"
 Basic.MainMenu.File.Import="&Імпарт"

obs-studio-29.1.3.tar.xz/UI/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/bg-BG.ini Changed

@@ -94,7 +94,6 @@
 LogViewer="Преглед на дневника"
 ShowOnStartup="Покажи при стартиране"
 OpenFile="Отвори Файл"
-AddValue="Добавяне на %1"
 AddSource="Добави източник"
 RemoveScene="Премахни избраната сцена"
 RemoveSource="Премахни избраните източници"
@@ -106,11 +105,16 @@
 SourceFilters="Отвори филтрите на източника"
 MixerToolbarMenu="Аудио-смесително меню"
 SceneFilters="Отвори сценичните филтри"
+List="Списък"
+Grid="Мрежа"
 PluginsFailedToLoad.Title="Грешка при зареждането на плъгина"
 PluginsFailedToLoad.Text="Не успя да се зареди сътветния OBS плъгин:\n\n%1\nМоля обновете или премахнете плъгина/ите"
 AlreadyRunning.Title="OBS вече се изпълнява"
 AlreadyRunning.Text="OBS вече е включен! Освен ако не е по желание, моля изключете другите работещи инстанции на OBS преди да включите нова. Ако сте настроили OBS да се минимизира във системната табла, моля проверете дали все още е включен там."
 AlreadyRunning.LaunchAnyway="Стартирай въпреки това"
+AutoSafeMode.Title="Безопасен режим"\nAutoSafeMode.Text="\nOBS не се затвори коректно по време на последната ви сесия.\n\nИскате ли да стартирате в безопасен режим (изключени са сторонни плъгини, скриптове и уебсокети)?"
+AutoSafeMode.LaunchSafe="Стартиране в безопасен режим\""
+AutoSafeMode.LaunchNormal="Стартиране нормално"
 ChromeOS.Title="Неподдържана платформа"
 ChromeOS.Text="OBS е стартиран в контейнер на ChromeOS. Тази платформа не се поддържа."
 Wine.Title="Wine открит"
@@ -178,8 +182,8 @@
 Basic.AutoConfig.StreamPage.Server="Сървър"
 Basic.AutoConfig.StreamPage.StreamKey="Стрийм ключ"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: Въведете криптиращата фраза.\nRTMP: Въведете ключа предоставен от услугата.\nSRT: Въведете stream ID, ако услугата го използва."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Линк)"
 Basic.AutoConfig.StreamPage.EncoderKey="Енкодер ключ"
+Basic.AutoConfig.StreamPage.BearerToken="Носител Token"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Свързан акаунт"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Прогнозиране на битрейта с тест за трафик (може да отнеме няколко минути)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Предпочитай хардуерно кодиране"
@@ -231,8 +235,6 @@
 Updater.UpdateNow="Обнови сега"
 Updater.RemindMeLater="Напомни ми по-късно"
 Updater.Skip="Пропусни Версията"
-Updater.Running.Title="Програмата е работи във момента"
-Updater.Running.Text="Във момента се предават данни, моля спрете активните канали преди да актуализирате до нова версия"
 Updater.NoUpdatesAvailable.Title="Няма обновявания"
 Updater.NoUpdatesAvailable.Text="Няма текущи обновявания на разположение"
 Updater.BranchNotFound.Title="Каналът за обновления бе премахнат"
@@ -242,8 +244,6 @@
 Updater.RepairConfirm.Title="Потвърди проверка на целостта"
 Updater.RepairConfirm.Text="Стартирането на проверка на целостта ще огледа Вашата OBS инсталация за повреди и изтегли наново повредени/модифицирани файлове. Операцията ще отнеме малко време.\n\nЖелаете ли да продължите?"
 Updater.FailedToLaunch="Неуспешно стартиране на обновителя"
-Updater.GameCaptureActive.Title="Записването на Игра е активно"
-Updater.GameCaptureActive.Text="Заредена е библиотека за прихващане на игри. Моля, затворете записваните игри и програми (или рестартирайте Windows) и опитайте отново."
 QuickTransitions.SwapScenes="Обръщане на местата на сцените за преглед и програми след прехода"
 QuickTransitions.SwapScenesTT="Обръща местата на сцените за преглед и програма след прехода (ако оригиналната сцена на програмата все още съществува).\nТова не отменя промените, които е възможно да са били направени в оригиналната сцена на програмата."
 QuickTransitions.DuplicateScene="Дублиране на Сцената"
@@ -305,6 +305,7 @@
 Undo.GroupItems="Обединяване на елементите в '%1'"
 TransitionNameDlg.Text="Моля въведете имато на преминаването"
 TransitionNameDlg.Title="Има на преминаването"
+TitleBar.SafeMode="БЕЗОПАСЕН РЕЖИМ"
 TitleBar.Profile="Профил"
 TitleBar.Scenes="Сцени"
 NameExists.Title="Името вече съществува"
@@ -340,7 +341,6 @@
 Output.ConnectFail.Disconnected="Изключен от сървъра."
 Output.StreamEncodeError.Title="Грешка при кодиране"
 Output.StreamEncodeError.Msg="По време на стрийминга е възникнала грешка с кодирането."
-Output.StreamEncodeError.Msg.LastError="По време на излъчването възникна грешка на енкодера:\n\n%1"
 Output.RecordFail.Title="Неуспешно стартиране на запис"
 Output.RecordFail.Unsupported="Формата на записа или не е подържа или не подържа повече от една писта за звук. Моля проверете настройките си и опитайте отново."
 Output.RecordNoSpace.Title="Недостатъчно място на диска"
@@ -348,7 +348,6 @@
 Output.RecordError.Title="Грешка при записването"
 Output.RecordError.Msg="Неопределена грешка по време на записването."
 Output.RecordError.EncodeErrorMsg="По време на записа е възникнала грешка с кодирането."
-Output.RecordError.EncodeErrorMsg.LastError="По време на записването възникна грешка на енкодера:\n\n%1"
 Output.BadPath.Title="Неправилен файлов път"
 Output.BadPath.Text="Конфигурираният Път на Запис не можа да бъде отворен. Моля проверете вашия Път на Запис от Настройки -> Излъчване -> Запис"
 Output.NoBroadcast.Title="Излъчването не е настроено"
@@ -396,7 +395,6 @@
 MissingFiles.AutoSearchText="OBS е открила допълнителни съвпадения за липсващи файлове в тази директория. Искате ли да ги добавите?"
 MissingFiles.NoMissing.Title="Проверка за липсващи файлове"
 MissingFiles.NoMissing.Text="Не бяха намерени липсващи файлове"
-MacPermissions.Title="Оглед на разрешенията на приложението"
 MacPermissions.Description="OBS Studio изисква вашето разрешение, за да може да осигури определени функции. Препоръчва се да разрешите тези разрешения, но те не са задължителни за използване на приложението, освен това, Винаги можете да ги активирате по-късно."
 MacPermissions.Description.OpenDialog="Можете повторно да отворите този диалог от менюто на OBS Studio."
 MacPermissions.AccessGranted="Достъпа е позволен"
@@ -411,8 +409,6 @@
 MacPermissions.Item.Accessibility="Достъпност"
 MacPermissions.Item.Accessibility.Details="За да работят клавиатурните комбинации (hotkeys), докато други приложения са фокусирани, моля активирайте това разрешение."
 MacPermissions.Continue="Продължи"
-UpdateAvailable="Има нова актуализация"
-UpdateAvailable.Text="Версия %1.%2.%3 е налична. <a href='%4'> Щракнете тук, за да изтеглите</a>"
 Basic.DesktopDevice1="Аудио - работен плот"
 Basic.DesktopDevice2="Аудио - работен плот 2"
 Basic.AuxDevice1="Микрофон/Aux"
@@ -433,6 +429,7 @@
 BlendingMethod.SrgbOff="SRGB изкл."
 BlendingMode="Режим на смесване"
 BlendingMode.Normal="Нормален"
+BlendingMode.Additive="Добави"
 BlendingMode.Subtract="Разделящ"
 BlendingMode.Screen="Дисплей"
 BlendingMode.Multiply="Умножение"
@@ -471,6 +468,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (автоматично: %2)"
 Basic.PropertiesWindow.SelectColor="Избор на цвят"
 Basic.PropertiesWindow.SelectFont="Избор на шрифт"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Избери шрифт"
 Basic.PropertiesWindow.ConfirmTitle="Настройките са променени"
 Basic.PropertiesWindow.Confirm="Има незаписани промени. Искате ли да ги запишете?"
 Basic.PropertiesWindow.NoProperties="Без налични характеристики"
@@ -580,9 +578,7 @@
 Basic.VCam.VirtualCamera="Виртуална камера"
 Basic.VCam.OutputType="Тип на изходните данни"
 Basic.VCam.OutputSelection="Избор на изходно устройство"
-Basic.VCam.Internal="вътрешен"
-Basic.VCam.InternalDefault="Изходна на програмата (По подразбиране)"
-Basic.VCam.InternalPreview="Предварителен претлед на изходните данни"
+Basic.VCam.OutputType.Program="Програма (По подразбиране)"
 Basic.MainMenu.File="Файл (&F)"
 Basic.MainMenu.File.Export="Експортиране (&E)"
 Basic.MainMenu.File.Import="Импортиране (&I)"
@@ -624,9 +620,7 @@
 Basic.MainMenu.Edit.AdvAudio="Допълнителни Звукови Характеристики (&A)"
 Basic.MainMenu.View="Изглед (&V)"
 Basic.MainMenu.View.Toolbars="Лента с инструменти (&T)"
-Basic.MainMenu.View.ListboxToolbars="Бутони в списъка за панели Сцени и Източници"
 Basic.MainMenu.View.ContextBar="Лента с инструменти на източника"
-Basic.MainMenu.View.SceneTransitions="Преминавания между сцени (&C)"
 Basic.MainMenu.View.SourceIcons="Икони на източника (&I)"
 Basic.MainMenu.View.StatusBar="Статус лента (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Изглед на цял екран"
@@ -641,12 +635,12 @@
 Basic.MainMenu.SceneCollection.Import="Добавяне на Колекция от сцени"
 Basic.MainMenu.SceneCollection.Export="Запис на Колекция от сцени"
 Basic.MainMenu.Profile.Exists="Профилът вече съществува"
-Basic.MainMenu.SceneCollection.Exists="Колекцията сцени вече съществува"
 Basic.MainMenu.Tools="Инструменти (&T)"
 Basic.MainMenu.Help="Помощ (&H)"
 Basic.MainMenu.Help.HelpPortal="Портал за Помощ (&P)"
 Basic.MainMenu.Help.Website="Посети Уебсайта (&W)"
 Basic.MainMenu.Help.Discord="Страница в &Discord"
+Basic.MainMenu.Help.WhatsNew="Какво ново"
 Basic.MainMenu.Help.Logs="\"&Log\" файлове"
 Basic.MainMenu.Help.Logs.ShowLogs="Покажи техническите записи (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Качи текущия \"Log\" файл (&C)"
@@ -716,9 +710,10 @@
 Basic.Settings.General.MultiviewLayout.9Scene="Само сцени (9 сцени)"
 Basic.Settings.General.MultiviewLayout.16Scene="Само сцени (16 сцени)"
 Basic.Settings.General.MultiviewLayout.25Scene="Само сцени (25 сцени)"
+Basic.Settings.General.ChannelName.stable="Стабилна"
 Basic.Settings.General.ChannelDescription.stable="Последна стабилна версия"
+Basic.Settings.General.ChannelName.beta="Бета версии / Кандидати за издаване"
 Basic.Settings.Stream="Стрийм"
-Basic.Settings.Stream.StreamType="Тип Стрийм"
 Basic.Settings.Stream.Custom.UseAuthentication="Използване на удостоверяване"
 Basic.Settings.Stream.Custom.Username="Потребителско име"
 Basic.Settings.Stream.Custom.Password="Парола"
@@ -740,8 +735,14 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Максимални кадри в сек.: %1"
 Basic.Settings.Output="Излъчване"
 Basic.Settings.Output.Format="Формат на Записа"
+Basic.Settings.Output.Format.MKV="Matroska видео (.mkv)"
+Basic.Settings.Output.Format.fMP4="Фрагментиран MP4 (.mp4)"
+Basic.Settings.Output.Format.fMOV="Фрагментиран MOV (.mov)"
+Basic.Settings.Output.Format.TT.fmov="Фрагментирания MOV записва запиза във парчета и не изисква същото финализиране като традиционните MOV файлове.\nТова осигурява че файла остава годен за възпроизвеждане, дори ако записът на диска бъде прекъснат, за пример, в резултат на BSOD или загуба на захранване.\n\nТова може да не е съвместимо с всички плейъри и редактори. Използвайте Файл → Remux Recordings за да конвертирайте файла на по-съвместим формат, ако е необходимо."
+Basic.Settings.Output.Format.TT.fmp4="Фрагментирания MP4 записва запиза във парчета и не изисква същото финализиране като традиционните MP4 файлове.\nТова осигурява че файла остава годен за възпроизвеждане, дори ако записът на диска бъде прекъснат, за пример, в резултат на BSOD или загуба на захранване.\n\nТова може да не е съвместимо с всички плейъри и редактори. Използвайте Файл → Remux Recordings за да конвертирайте файла на по-съвместим формат, ако е необходимо."
+Basic.Settings.Output.Encoder.Video="Видео енкодер"
+Basic.Settings.Output.Encoder.Audio="Звуков енкодер"
 Basic.Settings.Output.SelectDirectory="Настройте папка за записи"
-Basic.Settings.Output.SelectFile="Изберете запис"
 Basic.Settings.Output.DynamicBitrate="Динамичен битрейт за предотвратяване на пренатоварването на мрежата"
 Basic.Settings.Output.DynamicBitrate.Beta="Динамичен битрейт за предотвратяване на пренатоварването на мрежата (Бета)"
 Basic.Settings.Output.DynamicBitrate.TT="Вместо пропускането на кадри, се използва динамично регулиране на битрейта в движение, за да се намали риска от пренатоварване.\n\nИмайте предвид,че това може да увеличи закъснението на сигнала при зрителите, ако се случи неочаквано пренатоварване.\nНормализирането на битрейта, когато той спадне, може да отнеме до няколко минути.\n\nПонастоящем се поддържа само от RTMP."
@@ -753,6 +754,7 @@
 Basic.Settings.Output.ReplayBuffer.SecondsMax="Максимален период за повторение"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимална Памет (Мегабайти)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Приблизително използвана памет: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateTooLarge="Предупреждение: Очакваното използване на памет от %1 MiB е по-голямо от препоръчителния максимум от %2 MiB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Не може да се определи използваната памет. Моля нстройте максималния лимит за паметта."
 Basic.Settings.Output.ReplayBuffer.Prefix="Представка на името на записи от Буферa за Повторение"
 Basic.Settings.Output.ReplayBuffer.Suffix="Надставка"
@@ -766,10 +768,10 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Предупреждение: битрейтът на аудио потока на излъчването ще бъде зададен на %1, което е горната граница на услугата за излъчване."
 Basic.Settings.Output.Simple.Warn.CannotPause="Предупреждение: записите не могат да бъдат преустановявани, ако качеството на запис е зададено като \"Същото като потока\""
 Basic.Settings.Output.Simple.Warn.Encoder="Предупреждение: Записването със програмен енкодер при различно качество от излъчването ще изисква допълнителни ресурси от процесора ако записвате и излъчвате едновременно."
-Basic.Settings.Output.Simple.Warn.Lossless="Предупреждение: Оригиналното качество създава огромни файлове! Запис настроен на Оригинално качество може да заема над 7GB дисково пространство на минута, ако резолюцията и кадрите са високи. Не се препоръчва ако не разполагате със много пространство."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Сигурни ли сте че искате да ползвате оригиналното качество на записа?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Предупреждение при ползване на Оригинално Качество!"
 Basic.Settings.Output.Simple.Encoder.Software="Програмно (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Хардуер (QSV, H.264)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Програмно (x264 ниска употреба на процесора, увеличава размера на записа)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Трасе Twitch VOD (Използва Трасе 2)"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Несъвместими разд. способност/кадри в сек"
@@ -865,8 +867,7 @@
 Basic.Settings.Audio.PeakMeterType="Тип на връхната точка"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Образец на върха"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Истински връх (По-високо използване на CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ПРЕДУПРЕЖДЕНИЕ: Включен е Surround sound."
-Basic.Settings.Audio.MultichannelWarning="При започване на излъчването, е добре да проверите дали ползваната услугата за излъчване поддържа възпроизвеждането и записването на съраунд звук. Някои от услугите, които предлагат пълна поддръжка на съраунд звук, са Facebook 360 Live, YouTube Live. Макар обаче да поддържат съраунд звук, Facebook Live миксира звуковия поток в стерео режим, а YouTube Live го възпроизвежда само в два канала.\n\nЗвуковите филтри на OBS са съвместими със съраунд звук, но поддръжката на VST плугини не се гарантира."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ПРЕДУПРЕЖДЕНИЕ: Включен е Surround sound."
 Basic.Settings.Audio.MultichannelWarning.Title="Включи записването на съраунд звук?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Сигурни ли сте че искате да включите записването на съраунд звук?"
 Basic.Settings.Audio.Devices="Глобални Аудио Устройства"
@@ -895,7 +896,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Свободен"
 Basic.Settings.Advanced.FormatWarning="Предупреждение: Другите цветови формати, с изключение на NV12/P010, са основно предвидени за записване и не се препоръчват при излъчване. При излъчването може да се повиши натоварването на процесора поради смяната на цветовия формат."
 Basic.Settings.Advanced.FormatWarning2100="Предупреждение: Rec. 2100 трябва да използва формат с по-голяма прецизност."
-Basic.Settings.Advanced.Audio.BufferingTime="Време за буфериране на звук"
 Basic.Settings.Advanced.Video.ColorFormat="Формат на цвета"
 Basic.Settings.Advanced.Video.ColorSpace="Цветово пространство"
 Basic.Settings.Advanced.Video.ColorRange="Цветови обхват"
@@ -1023,7 +1023,6 @@
 LoadProfileNeedsRestart="Профилът съдържа настройки, които изискват рестартиране на OBS:\n%1\n\nИскате ли да рестартирате OBS, за да влязат направените промени в сила?"
 ContextBar.NoSelectedSource="Не е избран източник"
 ContextBar.ResetTransform="Нулиране на трансформацията"
-ContextBar.FitToCanvas="Побира се на платно"
 ContextBar.MediaControls.PlayMedia="Възпроизвеждане на медия"
 ContextBar.MediaControls.PauseMedia="Пауза на носителя"
 ContextBar.MediaControls.RestartMedia="Рестартирайте Media"

obs-studio-29.1.3.tar.xz/UI/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/bn-BD.ini Changed

@@ -79,6 +79,8 @@
 None="কোনটি না"
 StudioMode.Preview="প্রাকবীক্ষন"
 StudioMode.Program="প্রোগ্রাম"
+StudioMode.PreviewSceneName="প্রাকদর্শন: %1"
+StudioMode.ProgramSceneName="প্রোগ্রাম: %1"
 ShowInMultiview="মাল্টিভিউতে দেখান"
 VerticalLayout="লম্ব লেআউট"
 Group="দল"
@@ -93,10 +95,24 @@
 LogViewer="ইতিহাস দেখান"
 ShowOnStartup="শুরুতে দেখান"
 OpenFile="ফাইল খুলুন"
-AddValue="%1 যোগ করুন"
+AddSource="উৎস যোগ করো"
+RemoveScene="নির্বাচিত পর্দা অপসারণ করো"
+RemoveSource="নির্বাচিত উৎস অপসারণ করো"
+MoveSceneUp="পর্দা উপরে উঠাও"
+MoveSceneDown="পর্দা নিচে নামাও"
+MoveSourceUp="উৎস উপরে উঠাও"
+MoveSourceDown="উৎস নিচে নামাও"
+SourceProperties="উৎস বৈশিষ্ট্য খুলো"
+SourceFilters="উৎস ছাঁকনি খুলো"
+MixerToolbarMenu="অডিও মিশ্রণ পছন্দসমূহ"
+SceneFilters="পর্দা ছাঁকনি খুলো"
+List="তালিকা"
+Grid="ছক"
+PluginsFailedToLoad.Title="সংযোজক লোড ত্রুটি"
 AlreadyRunning.Title="OBS ইতিমধ্যে চলছে"
 AlreadyRunning.Text="ইতিমধ্যে OBS চলছে! আপনি এটি করতে না চাইলে দয়া করে নতুন ইন্সটেন্স চালানোর চেষ্টা করার আগে OBS এর বিদ্যমান কোনও ইন্সটেন্স বন্ধ করে দিন। যদি আপনার OBS সিস্টেম ট্রেতে থাকার জন্য সেট করে থাকেন তবে দয়া করে এটি এখনও চলছে কিনা তা যাচাই করে দেখুন।"
 AlreadyRunning.LaunchAnyway="যাইহোক চালু করুন"
+AutoSafeMode.Title="নিরাপদ ধরণ"
 ChromeOS.Title="অসমর্থিত প্ল্যাটফর্ম"
 DockCloseWarning.Title="ডকযোগ্য উইন্ডো বন্ধ হচ্ছে"
 ExtraBrowsers="কৃত্রিম ব্রাউজার ডকস"
@@ -159,7 +175,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="কাস্টম..."
 Basic.AutoConfig.StreamPage.Server="সার্ভার"
 Basic.AutoConfig.StreamPage.StreamKey="ষ্টীম কী"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(লিংক)"
 Basic.AutoConfig.StreamPage.EncoderKey="এনকোডার কী"
 Basic.AutoConfig.StreamPage.ConnectedAccount="সংযুক্ত অ্যাকাউন্টে"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="ব্যান্ডউইথ পরীক্ষার মাধ্যমে বিটরেটের নির্ধারণ করুন (কয়েক মিনিট সময় লাগতে পারে)"
@@ -210,13 +225,9 @@
 Updater.UpdateNow="এখনই হালনাগাদ করুন"
 Updater.RemindMeLater="আমাকে পরে স্মরন করিয়ে দিন"
 Updater.Skip="সংস্করণ এড়িয়ে যান"
-Updater.Running.Title="বর্তমানে সক্রিয় কার্যক্রম"
-Updater.Running.Text="আউটপুট বর্তমানে সক্রিয়। আপডেট করার পূর্বে দয়া করে কোনও সক্রিয় আউটপুট বন্ধ করুন"
 Updater.NoUpdatesAvailable.Title="কোন হালনাগাদ উপলব্ধ নেই"
 Updater.NoUpdatesAvailable.Text="বর্তমানে কোন হালনাগাদ উপলব্ধ নেই"
 Updater.FailedToLaunch="হালনাগাদকারী আরম্ভ করতে ব্যর্থ"
-Updater.GameCaptureActive.Title="খেলার অধিগ্রহণ সক্রিয়"
-Updater.GameCaptureActive.Text="খেলার অধিগ্রহণ হুক লাইব্রেরী বর্তমানে ব্যবহার করা হচ্ছে। দয়া করে দখল করা কোন গেম/প্রোগ্রাম বন্ধ করুন (অথবা Windows পুনর্সূচনা করুন) এবং পুনরায় চেষ্টা করুন."
 QuickTransitions.DuplicateScene="অনুরূপ দৃশ্য"
 QuickTransitions.EditProperties="উৎসের অনুলিপি"
 QuickTransitions.HotkeyName="দ্রুত পরিবর্তন: %1"
@@ -344,8 +355,8 @@
 MissingFiles.AutoSearchText="OBS সেই ডিরেক্টরিতে হারিয়ে যাওয়া ফাইলগুলির জন্য অতিরিক্ত মিল খুঁজে পেয়েছে। আপনি কি তাদের যুক্ত করতে চান?"
 MissingFiles.NoMissing.Title="অনুপস্থিত ফাইল চেক"
 MissingFiles.NoMissing.Text="কোনো ফাইলস অখোজ পাওয়া যায়নি।"
-UpdateAvailable="নতুন হালনাগাদ উপলব্ধ"
-UpdateAvailable.Text="সংস্করণ %1.%2.%3 উপলব্ধ। <a href='%4'> ডাউনলোড করতে এখানে ক্লিক করুন।</a>"
+MacPermissions.Item.Camera="ক্যামেরা"
+MacPermissions.Continue="এগিয়ে যাও"
 Basic.DesktopDevice1="ডেস্কটপ অডিও"
 Basic.DesktopDevice2="ডেস্কটপ অডিও 2"
 Basic.AuxDevice1="মাইক/সহায়ক"
@@ -359,6 +370,13 @@
 ScaleFiltering="ফিল্টারিং এর আকার পরিবর্তন করো"
 ScaleFiltering.Point="বিন্দু"
 ScaleFiltering.Area="এলাকা"
+BlendingMethod.Default="সহজাত"
+BlendingMethod.SrgbOff="এসআরজিবি(sRGB) বন্ধ"
+BlendingMode.Normal="সাধারণ"
+BlendingMode.Additive="যোগ"
+BlendingMode.Screen="পর্দা"
+BlendingMode.Lighten="সাদাকরণ"
+BlendingMode.Darken="অন্ধকারাচ্ছন্ন"
 Deinterlacing.Discard="অগ্রাহ্য"
 Deinterlacing.TopFieldFirst="প্রথম ক্ষেত্রে শীর্ষ"
 Deinterlacing.BottomFieldFirst="মাঠে প্রথমে নীচের"
@@ -536,12 +554,11 @@
 Basic.MainMenu.Edit.AdvAudio="এবং অডিও উন্নত বৈশিষ্ট্য (&A)"
 Basic.MainMenu.View="এবং প্রদর্শন করুন (&V)"
 Basic.MainMenu.View.Toolbars="টুলবার (&T)"
-Basic.MainMenu.View.ListboxToolbars="দৃশ্য/উৎস তালিকা বোতাম"
 Basic.MainMenu.View.ContextBar="উৎস সরঞ্জামদণ্ড"
-Basic.MainMenu.View.SceneTransitions="ঘটনাস্থলে অবস্থান্তর (&C)"
 Basic.MainMenu.View.SourceIcons="উৎস আইকন (&I)"
 Basic.MainMenu.View.StatusBar="স্ট্যাটাস বার (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="ফুলস্ক্রিন ইন্টারফেস"
+Basic.MainMenu.Docks="&ডকসমূহ"
 Basic.MainMenu.SceneCollection="দৃশ্য সংগ্রহ (&S)"
 Basic.MainMenu.Profile="প্রোফাইল (&P)"
 Basic.MainMenu.Profile.Import="প্রোফাইল আমদানি করুন"
@@ -549,7 +566,6 @@
 Basic.MainMenu.SceneCollection.Import="দৃশ্য সংগ্রহ আমদানি করুন"
 Basic.MainMenu.SceneCollection.Export="দৃশ্য সংগ্রহ আমদানি করুন"
 Basic.MainMenu.Profile.Exists="প্রোফাইল ইতোমধ্যেই বিদ্যমান"
-Basic.MainMenu.SceneCollection.Exists="দৃশ্য সংগ্রহ ইতোমধ্যে বিদ্যমান"
 Basic.MainMenu.Tools="সরঞ্জাম (&T)"
 Basic.MainMenu.Help="সাহায্য (&H)"
 Basic.MainMenu.Help.HelpPortal="সহায়তা পোর্টাল (&P)"
@@ -569,6 +585,7 @@
 Basic.Settings.General="সাধারণ"
 Basic.Settings.General.Theme="থিম"
 Basic.Settings.General.Language="ভাষা"
+Basic.Settings.General.Updater="হালনাগাদ"
 Basic.Settings.General.EnableAutoUpdates="প্রারম্ভকালে আপডেটের জন্য স্বয়ংক্রিয়ভাবে চেক করুন"
 Basic.Settings.General.OpenStatsOnStartup="শুরুতে পরিসংখ্যান ডায়ালগ খুলুন"
 Basic.Settings.General.WarnBeforeStartingStream="ধারা শুরু করার সময় নিশ্চিতকরণ সংলাপ প্রদর্শন করুন"
@@ -609,8 +626,8 @@
 Basic.Settings.General.MultiviewLayout.Vertical.Left="লম্ব, বাম (৮ টি দৃশ্য)"
 Basic.Settings.General.MultiviewLayout.Vertical.Right="লম্ব, ডান (৮ দৃশ্য)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="অনুভূমিক, শীর্ষ (২৪ টি দৃশ্য)"
+Basic.Settings.General.ChannelName.stable="স্থিতিশীল"
 Basic.Settings.Stream="ধারা"
-Basic.Settings.Stream.StreamType="স্ট্রিম ধরন"
 Basic.Settings.Stream.Custom.UseAuthentication="প্রমাণীকরণ ব্যবহার করুন"
 Basic.Settings.Stream.Custom.Username="ইউজারনেম"
 Basic.Settings.Stream.Custom.Password="পাসওয়ার্ড"
@@ -633,7 +650,6 @@
 Basic.Settings.Output="আউটপুট"
 Basic.Settings.Output.Format="আমল লেখকবৃন্দ বিন্যাস"
 Basic.Settings.Output.SelectDirectory="রেকর্ডিং ডিরেক্টরি নির্বাচন করুন"
-Basic.Settings.Output.SelectFile="রেকর্ড করা ফাইল নির্বাচন করুন"
 Basic.Settings.Output.DynamicBitrate="যানজট পরিচালনা করতে গতিময়ভাবে বিটরেট পরিবর্তন করুন"
 Basic.Settings.Output.DynamicBitrate.Beta="যানজট (পরীক্ষামূলক) পরিচালনা করতে গতিময়ভাবে বিটরেট পরিবর্তন করুন"
 Basic.Settings.Output.DynamicBitrate.TT="ভিড় কমাতে ফ্রেম বাদ দেওয়ার পরিবর্তে, গতিশীলভাবে বিটরেট পরিবর্তন করে।\n\nমনে রাখবেন যে উল্লেখযোগ্য হঠাৎ ভিড় থাকলে এটি দর্শকদের জন্য বিলম্ব বাড়িয়ে তুলতে পারে।\nবিটরেট কমে গেলে, পুনরুদ্ধার করতে কয়েক মিনিট সময় নিতে পারে।\n\nবর্তমানে কেবল আরটিএমপি-র জন্য সমর্থিত।"
@@ -658,7 +674,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="সতর্কতা: স্ট্রিমিং শব্দের বিটরেটটি %1 এ সেট করা হবে, যা বর্তমান স্ট্রিমিং পরিষেবার জন্য সর্বাধিক সীমা।"
 Basic.Settings.Output.Simple.Warn.CannotPause="সতর্কতা: রেকর্ডিংয়ের মানটি \"স্ট্রিম এর সমান\" তে সেট করা থাকলে রেকর্ডিংগুলিকে বিরতি দেওয়া যায় না।"
 Basic.Settings.Output.Simple.Warn.Encoder="সতর্কতা: স্ট্রিমের চেয়ে আলাদা মানের একটি সফ্টওয়্যার এনকোডার দিয়ে রেকর্ডিংয়ের জন্য একই সময়ে স্ট্রিম করে রেকর্ড করলে অতিরিক্ত সিপিইউ ব্যবহারের প্রয়োজন হবে।"
-Basic.Settings.Output.Simple.Warn.Lossless="সতর্কতা: হ্রাসহীন গুণমানটি বৃহৎ আকারের ফাইল উৎপাদন করে! হ্রাসহীন গুণমান উচ্চ রেজোলিউশন এবং ফ্রেমহারগুলিতে প্রতি মিনিটে ৭ গিগাবাইট ডিস্ক জায়গার ওপরে ব্যবহার করতে পারে। হ্রাসহীন দীর্ঘ রেকর্ডিংয়ের জন্য সুপারিশকৃত নয় যদি না আপনার কাছে খুব বেশি পরিমাণে ডিস্কের জায়গা উপলব্ধ থাকে।"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="আপনি কি নিশ্চিতরূপে হ্রাসহীন গুণমানটি ব্যবহার করতে চান?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="হ্রাসহীন মানের সতর্কতা!"
 Basic.Settings.Output.Simple.Encoder.Software="সফটওয়্যার (x২৬৪)"
@@ -722,6 +737,7 @@
 Screenshot.Preview="স্ক্রিনশট (পূর্বরূপ)"
 Screenshot.Scene="স্ক্রিনশট (দৃশ্য)"
 Screenshot.Source="স্ক্রিনশট (উৎস)"
+FilenameFormatting.TT.Y="বছর"
 Basic.Settings.Video="ভিডিও"
 Basic.Settings.Video.Adapter="ভিডিও অভিযোজক"
 Basic.Settings.Video.BaseResolution="বেস (ক্যানভাস) নিয়মন"
@@ -750,8 +766,7 @@
 Basic.Settings.Audio.PeakMeterType="শীর্ষ মিটারের প্রকার"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="নমুনা শীর্ষ"
 Basic.Settings.Audio.PeakMeterType.TruePeak="সত্য পিক (উচ্চতর সিপিইউ ব্যবহার)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="সতর্কতা: চারপাশের শব্দ অডিও সক্ষম হয়েছে।"
-Basic.Settings.Audio.MultichannelWarning="যদি স্ট্রিমিং হয়, আপনার স্ট্রিমিং পরিষেবা আশেপাশের শব্দগুলি নিবিড় করা এবং সাউন্ড প্লেব্যাক উভয় সমর্থন করে কিনা তা পরীক্ষা করে দেখুন। ফেসবুক ৩৬০ লাইভ একটি উদাহরণ যেখানে আশেপাশের শব্দগুলি সম্পূর্ণরূপে সমর্থিত। যদিও ফেসবুক লাইভ এবং YouTube লাইভ উভয়ই আশেপাশে নিবিড়ভাবে গ্রহণ করে, ফেসবুক লাইভ স্টেরিওতে ডাউনমিক্সগুলি এবং YouTube লাইভ কেবল দুটি চ্যানেল প্লে করে।\n\nOBS অডিও ফিল্টারগুলি আশেপাশের শব্দের সাথে সামঞ্জস্যপূর্ণ, যদিও ভিএসটি প্লাগইন সমর্থন প্রতিশ্রুত নয়।"
+Basic.Settings.Audio.MultichannelWarning.Enabled="সতর্কতা: চারপাশের শব্দ অডিও সক্ষম হয়েছে।"
 Basic.Settings.Audio.MultichannelWarning.Title="চারপাশের শব্দ অডিও সক্ষম করবেন?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="আপনি কি আশেপাশের সাউন্ড অডিও সক্ষম করতে চান?"
 Basic.Settings.Audio.Devices="সার্বজনীন শব্দ যন্ত্র"
@@ -767,16 +782,18 @@
 Basic.Settings.Audio.PushToTalkDelay="পুশ করার কথা বিলম্ব"
 Basic.Settings.Audio.UnknownAudioDevice="ডিভাইস সংযুক্ত নয় অথবা বিদ্যমান নয়।"
 Basic.Settings.Audio.Disabled="নিষ্ক্রিয়"
+Basic.Settings.Accessibility.ColorOverrides.Preset.Default="সহজাত"
+Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="বিশেষায়িত"
 Basic.Settings.Advanced="অ্যাডভান্সড"
 Basic.Settings.Advanced.General.ProcessPriority="প্রসেস"
 Basic.Settings.Advanced.General.ProcessPriority.High="বেশি"
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="স্বাভাবিকের উপরে"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="সাধারণের নীচে"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="নিষ্ক্রিয়"
-Basic.Settings.Advanced.Audio.BufferingTime="অডিও বাফারিং সময়"
 Basic.Settings.Advanced.Video.ColorFormat="রঙ বিন্যাস"
 Basic.Settings.Advanced.Video.ColorSpace="রঙের স্থান"
 Basic.Settings.Advanced.Video.ColorRange="রঙ পরিসীমা"
+Basic.Settings.Advanced.Video.ColorRange.Partial="সীমাবদ্ধ"
 Basic.Settings.Advanced.Video.ColorRange.Full="পূর্ণ"
 Basic.Settings.Advanced.Audio.MonitoringDevice="নিরীক্ষণ যন্ত্র"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="পূর্ব-নির্ধারিত"
@@ -896,14 +913,12 @@
 NeedsRestart="OBS Studio পুনরায় চালু করা দরকার। আপনি কি এখনই আবার চালু করতে চান?"
 ContextBar.NoSelectedSource="কোনও উৎস বাছাই করা হয়নি"
 ContextBar.ResetTransform="রিসেট ট্রান্সফরম"
-ContextBar.FitToCanvas="ক্যানভাস ফিট"
 ContextBar.MediaControls.PlayMedia="মিডিয়া চালান"
 ContextBar.MediaControls.PauseMedia="মিডিয়া বিরতি দিন"
 ContextBar.MediaControls.StopMedia="মিডিয়া থামান"
 ContextBar.MediaControls.RestartMedia="মিডিয়া পুনরায় চালু করুন"
 ContextBar.MediaControls.PlaylistNext="প্লেলিস্টে পরবর্তী"
 ContextBar.MediaControls.PlaylistPrevious="প্লেলিস্টে পূর্ববর্তী"
-ContextBar.MediaControls.MediaProperties="মিডিয়া বৈশিষ্ট্য"
 ContextBar.MediaControls.BlindSeek="মিডিয়া সিক উইজেট"
 YouTube.Auth.Ok="অনুমোদন সপূর্ণ।\nএই পেজ টি বন্ধ করতে পারেন।"
 YouTube.Auth.NoCode="অনুমোদন এর প্রক্রিয়া শেষ হয়নি।"
@@ -922,10 +937,14 @@
 YouTube.Actions.Category="তালিকা"
 YouTube.Actions.Thumbnail="থাম্বনেইল"
 YouTube.Actions.Thumbnail.SelectFile="ফাইল নির্বাচন করুন..."
+YouTube.Actions.Thumbnail.ClearFile="পরিষ্কার"
 YouTube.Actions.MadeForKids="এই ভিডিও কি শিশুদের জন্য তৈরি?*"
 YouTube.Actions.MadeForKids.Yes="হ্যা, এটি শিশুদের জন্যে তৈরি"
 YouTube.Actions.MadeForKids.No="না, এটি শিশু দের জন্যে তৈরি নয়"
+YouTube.Actions.Latency="সুপ্তাবস্থা(ল্যাটেন্সি)"
 YouTube.Actions.Latency.Normal="সাধারণ"
 YouTube.Actions.Latency.Low="কম"
 YouTube.Actions.Latency.UltraLow="অনেক বেশি কম"
+YouTube.Actions.Stream="সম্প্রচার"
 YouTube.Actions.Notify.CreatingBroadcast="সরাসরি সম্প্রচার তৈরি হচ্ছে, অপেক্ষা করুন।"
+YouTube.Chat.Input.Send="পাঠাও"

obs-studio-29.1.3.tar.xz/UI/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ca-ES.ini Changed

@@ -93,7 +93,6 @@
 LogViewer="Visor d'informes"
 ShowOnStartup="Mostra a l'inici"
 OpenFile="Obre el fitxer"
-AddValue="Afegeix %1"
 AddSource="Afegeix una font"
 RemoveScene="Elimina l'escena seleccionada"
 RemoveSource="Elimina les fonts seleccionades"
@@ -105,11 +104,19 @@
 SourceFilters="Filtres de codi obert"
 MixerToolbarMenu="Menú del mesclador d'àudio"
 SceneFilters="Obre els filtres d'escena"
+List="Llista"
+Grid="Graella"
 PluginsFailedToLoad.Title="Error en iniciar complements"
 PluginsFailedToLoad.Text="S'ha produït un error en iniciar aquests complements de l'OBS:\n\n%1\nActualitzeu o suprimiu aquests complements."
 AlreadyRunning.Title="L'OBS ja s'està executant"
 AlreadyRunning.Text="L'OBS ja s'està executant! A no ser que vulgueu fer això, tanqueu totes les finestres de l'OBS abans d'intentar iniciar una nova. Si teniu configurat OBS perquè es minimitzi a la barra de tasques, proveu a veure si segueix executant-se aquí."
 AlreadyRunning.LaunchAnyway="Executa de totes maneres"
+AutoSafeMode.Title="Mode segur"
+AutoSafeMode.Text="L'OBS no s'ha tancat correctament durant la darrera sessió.\n\nVoleu iniciar en mode segur (es desactivaran els connectors de tercers, scripts i WebSockets)?"
+AutoSafeMode.LaunchSafe="Inicia en mode segur"
+AutoSafeMode.LaunchNormal="Inicia amb normalitat"
+SafeMode.Restart="Voleu reiniciar l'OBS en mode segur (es desactivaran els connectors de tercers, scripts i WebSockets)?"
+SafeMode.RestartNormal="Voleu reiniciar l'OBS en mode normal?"
 ChromeOS.Title="Plataforma no compatible"
 ChromeOS.Text="Sembla que l'OBS s'està executant dins d'un contenidor del ChromeOS. Aquesta plataforma no és compatible."
 Wine.Title="Wine detectat"
@@ -177,8 +184,8 @@
 Basic.AutoConfig.StreamPage.Server="Servidor"
 Basic.AutoConfig.StreamPage.StreamKey="Clau de la transmissió"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: introduïu la contrasenya de xifratge.\nRTMP: introduïu la clau proporcionada pel servei.\nSRT: introduïu l'identificador de l'emissió si el servei n'utilitza un."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Enllaç)"
 Basic.AutoConfig.StreamPage.EncoderKey="Clau del codificador"
+Basic.AutoConfig.StreamPage.BearerToken="Testimoni d'autorització"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Compte connectat"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estima la taxa de bits amb una prova d'amplada de banda (pot trigar uns minuts)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Prioritza la codificació per maquinari"
@@ -230,8 +237,6 @@
 Updater.UpdateNow="Actualitza ara"
 Updater.RemindMeLater="Recorda-m'ho més tard"
 Updater.Skip="Omet la versió"
-Updater.Running.Title="Programa actualment actiu"
-Updater.Running.Text="Les sortides estan actives actualment. Finalitzeu qualsevol sortida activa abans d'actualitzar"
 Updater.NoUpdatesAvailable.Title="No hi ha actualitzacions disponibles"
 Updater.NoUpdatesAvailable.Text="Actualment no hi ha cap actualització disponible"
 Updater.BranchNotFound.Title="S'ha eliminat el canal d'actualització"
@@ -241,8 +246,6 @@
 Updater.RepairConfirm.Title="Confirmació de verificació d'integritat"
 Updater.RepairConfirm.Text="En iniciar la verificació d'integritat, s'analitzarà la vostra instal·lació de l'OBS i es baixaran i restauraran els components que s'hagin trobat trencats/corruptes. Això trigarà una estona.\n\nVoleu continuar?"
 Updater.FailedToLaunch="Ha fallat en iniciar l'actualitzador"
-Updater.GameCaptureActive.Title="Captura de joc activa"
-Updater.GameCaptureActive.Text="La llibreria de captura de jocs està actualment en ús. Tanqueu qualsevol joc/programa que estigui sent capturat (o reinicieu Windows) i proveu-ho de nou."
 QuickTransitions.SwapScenes="Canvia les escenes de previsualització/programa després de la transició"
 QuickTransitions.SwapScenesTT="Canvia la vista prèvia i les escenes del programa després de la transició (si encara existeix l'escena original del programa).\nAixò no desfarà cap canvi que s'hagi fet a l'escena original del programa."
 QuickTransitions.DuplicateScene="Duplica l'escena"
@@ -256,6 +259,8 @@
 Basic.SceneTransitions="Transicions d'escena"
 Basic.TransitionDuration="Duració"
 Basic.TogglePreviewProgramMode="Mode estudi"
+Basic.EnablePreviewProgramMode="Habilita el Mode estudi"
+Basic.DisablePreviewProgramMode="Deshabilita el Mode estudi"
 Undo.Undo="Desfés"
 Undo.Redo="Refés"
 Undo.Add="Afegeix «%1»"
@@ -304,6 +309,8 @@
 Undo.GroupItems="Agrupa els elements a «%1»"
 TransitionNameDlg.Text="Si us plau, introdueixi el nom de la transició"
 TransitionNameDlg.Title="Nom de la transició"
+TitleBar.SafeMode="MODE SEGUR"
+TitleBar.PortableMode="Mode portable"
 TitleBar.Profile="Perfil"
 TitleBar.Scenes="Escenes"
 NameExists.Title="Aquest nom ja existeix"
@@ -328,6 +335,7 @@
 Output.StartStreamFailed="No s'ha pogut iniciar la transmissió"
 Output.StartRecordingFailed="No s'ha pogut iniciar la gravació"
 Output.StartReplayFailed="No s'ha pogut iniciar la memòria intermèdia de reproducció"
+Output.StartVirtualCamFailed="Ha fallat en iniciar la càmera virtual"
 Output.StartFailedGeneric="Error en iniciar la sortida. Comproveu el registre per més detalls.\n\nAvís: Si utilitzeu els codificadors NVENC o AMD, assegureu-vos que els controladors de vídeo estan actualitzats."
 Output.ReplayBuffer.PauseWarning.Title="No es poden desar les repeticions mentre estigui en pausa"
 Output.ReplayBuffer.PauseWarning.Text="Advertència: No es poden desar les repeticions mentre la gravació estigui en pausa."
@@ -340,7 +348,7 @@
 Output.ConnectFail.Disconnected="Desconnectat del servidor."
 Output.StreamEncodeError.Title="Error de codificació"
 Output.StreamEncodeError.Msg="S'ha produït un error del codificador durant la transmissió."
-Output.StreamEncodeError.Msg.LastError="S'ha produït un error del codificador durant l'emissió:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="S'ha produït un error del codificador durant l'emissió: %1"
 Output.RecordFail.Title="Error en iniciar la gravació"
 Output.RecordFail.Unsupported="El format de sortida és o no compatible o no admet més d'una pista d'àudio. Comproveu la configuració i torneu-ho a provar."
 Output.RecordNoSpace.Title="Espai de disc insuficient"
@@ -348,7 +356,7 @@
 Output.RecordError.Title="Error en l'enregistrament"
 Output.RecordError.Msg="S'ha produït un error desconegut durant l'enregistrament."
 Output.RecordError.EncodeErrorMsg="S'ha produït un error del codificador durant la gravació."
-Output.RecordError.EncodeErrorMsg.LastError="S'ha produït un error del codificador durant la gravació:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="S'ha produït un error del codificador durant la gravació: %1"
 Output.BadPath.Title="Ruta del fitxer no vàlida"
 Output.BadPath.Text="No s'ha pogut obrir la ruta d'enregistrament configurada. Comproveu la ruta d'enregistrament a Configuració → Sortida → Enregistrament."
 Output.NoBroadcast.Title="Cap emissió configurada"
@@ -378,6 +386,8 @@
 Remux.ExitUnfinishedTitle="Conversió en curs"
 Remux.ExitUnfinished="La conversió no ha finalitzat, parar ara pot fer l'arxiu de destinació inservible.\n Esteu segur que voleu aturar la conversió?"
 Remux.HelpText="Arrossegueu fitxers en aquesta finestra per convertir-los o seleccioneu una cel·la buida a «Enregistrament OBS» per cercar un fitxer."
+Remux.NoFilesAddedTitle="No s'ha afegit cap fitxer de conversió"
+Remux.NoFilesAdded="No s'afegeix cap fitxer per convertir. Deixeu anar una carpeta que contingui un o més fitxers de vídeo."
 MissingFiles="Fitxers que falten"
 MissingFiles.MissingFile="Fitxer que falta"
 MissingFiles.NewFile="Fitxer nou"
@@ -396,7 +406,8 @@
 MissingFiles.AutoSearchText="L'OBS ha trobat coincidències addicionals per als fitxers que falten en aquesta carpeta. Voleu afegir-los?"
 MissingFiles.NoMissing.Title="Comprovació de fitxers que falten"
 MissingFiles.NoMissing.Text="Sembla que no falten fitxers."
-MacPermissions.Title="Verifiqueu els permisos de l'aplicació"
+MacPermissions.MenuAction="Revisa els permisos de l'aplicació..."
+MacPermissions.Title="Revisió de permisos"
 MacPermissions.Description="L'OBS Studio requereix el vostre consentiment per utilitzar determinades característiques. Tot i que no són estrictament necessàries per al funcionament de l'aplicació, sí que es recomana habilitar els permisos. També podeu habilitar-ho més tard."
 MacPermissions.Description.OpenDialog="Podeu accedir a aquesta opció en qualsevol moment des del menú de l'OBS Studio."
 MacPermissions.AccessGranted="S'ha habilitat el permís"
@@ -411,8 +422,8 @@
 MacPermissions.Item.Accessibility="Accessibilitat"
 MacPermissions.Item.Accessibility.Details="Perquè les dreceres (tecles d'accés ràpid) del teclat funcionin mentre el focus principal és en altra aplicació, habiliteu aquest permís."
 MacPermissions.Continue="Endavant"
-UpdateAvailable="Hi ha disponible una actualització"
-UpdateAvailable.Text="La versió %1.%2.%3 està disponible. <a href='%4'> feu clic aquí per a baixar-la</a>"
+SourceLeak.Title="Error en buidar els recursos"
+SourceLeak.Text="S'ha produït un error en canviar la col·lecció d'escenes i els recursos d'algunes fonts no s'han aturat correctament. Aquest error és causat per complements que no finalitzen o buiden correctament els seus recursos. Assegureu-vos que tots els complements que utilitzeu estan actualitzats.\n\nL'OBS Studio es tancarà immediatament per evitar qualsevol pèrdua o corrupció de dades."
 Basic.DesktopDevice1="Àudio de l'escriptori"
 Basic.DesktopDevice2="Àudio de l'escriptori 2"
 Basic.Scene="Escena"
@@ -469,6 +480,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (autoselecció: %2)"
 Basic.PropertiesWindow.SelectColor="Seleccioneu un color"
 Basic.PropertiesWindow.SelectFont="Seleccioneu un tipus de lletra"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Trieu una font"
 Basic.PropertiesWindow.ConfirmTitle="Configuració canviada"
 Basic.PropertiesWindow.Confirm="Hi ha canvis no desats. Voleu mantenir-los?"
 Basic.PropertiesWindow.NoProperties="No hi ha propietats disponibles"
@@ -577,9 +589,9 @@
 Basic.VCam.VirtualCamera="Càmera virtual"
 Basic.VCam.OutputType="Tipus de sortida"
 Basic.VCam.OutputSelection="Destinació"
-Basic.VCam.Internal="Interna"
-Basic.VCam.InternalDefault="A l'aplicació (per defecte)"
-Basic.VCam.InternalPreview="Previsualització"
+Basic.VCam.OutputType.Program="Aplicació (per defecte)"
+Basic.VCam.OutputSelection.NoSelection="No hi ha cap selecció per a aquest tipus de sortida"
+Basic.VCam.RestartWarning="La càmera virtual es reiniciarà per aplicar aquest canvi"
 Basic.MainMenu.File="&Fitxer"
 Basic.MainMenu.File.Export="&Exporta"
 Basic.MainMenu.File.Import="&Importa"
@@ -621,17 +633,18 @@
 Basic.MainMenu.Edit.AdvAudio="Propiet&ats avançades d'àudio"
 Basic.MainMenu.View="&Visualitza"
 Basic.MainMenu.View.Toolbars="Barres d'eines (&T)"
-Basic.MainMenu.View.ListboxToolbars="Botons de la llista d'escenes/fonts"
+Basic.MainMenu.View.ListboxToolbars="Barra d'eines flotant"
 Basic.MainMenu.View.ContextBar="Barra d'eines font"
-Basic.MainMenu.View.SceneTransitions="Transi&cions d'escena"
 Basic.MainMenu.View.SourceIcons="&Icones d'origen"
 Basic.MainMenu.View.StatusBar="Barra d'e&stat"
 Basic.MainMenu.View.Fullscreen.Interface="Pantalla completa"
 Basic.MainMenu.View.ResetUI="&Reinicia la interfície d'usuari"
 Basic.MainMenu.View.AlwaysOnTop="&Sempre al davant"
+Basic.MainMenu.View.SceneListMode="Mode de llista d'escenes"
 Basic.MainMenu.Docks="&Acobladors"
 Basic.MainMenu.Docks.ResetDocks="&Reinicia els acobladors"
 Basic.MainMenu.Docks.LockDocks="&Bloca els acobladors"
+Basic.MainMenu.Docks.SideDocks="Barra d'eines a mida de la &finestra"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Acobladors de navegador personalitzats..."
 Basic.MainMenu.SceneCollection="Col·lecció d'e&scenes"
 Basic.MainMenu.Profile="&Perfil"
@@ -640,7 +653,6 @@
 Basic.MainMenu.SceneCollection.Import="Importa col·lecció d'escenes"
 Basic.MainMenu.SceneCollection.Export="Exporta la col·lecció d'escenes"
 Basic.MainMenu.Profile.Exists="El perfil ja existeix"
-Basic.MainMenu.SceneCollection.Exists="La col·lecció d'escenes ja existeix"
 Basic.MainMenu.Tools="Eines (&T)"
 Basic.MainMenu.Help="Ajuda (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal d'ajuda"
@@ -652,8 +664,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Carregar arxiu de registre actual"
 Basic.MainMenu.Help.Logs.UploadLastLog="Carrega el fitxer de registre anterior (&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Visualitza el registre actual"
+Basic.MainMenu.Help.ReleaseNotes="Notes de llançament"
 Basic.MainMenu.Help.CheckForUpdates="Comprova si hi ha cap actualització"
 Basic.MainMenu.Help.Repair="Verifica la integritat de fitxers"
+Basic.MainMenu.Help.RestartSafeMode="Reinicia en mode segur"
+Basic.MainMenu.Help.RestartNormal="Reinicia en mode normal"
 Basic.MainMenu.Help.CrashLogs="Info&rme de fallada"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Mo&stra els informes de fallada"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Carrega l'informe d'error anterior (&P)"
@@ -721,7 +736,6 @@
 Basic.Settings.General.ChannelName.beta="Beta / versio candidata"
 Basic.Settings.General.ChannelDescription.beta="Versions prèvies potencialment inestables"
 Basic.Settings.Stream="Directe"
-Basic.Settings.Stream.StreamType="Tipus de directe"
 Basic.Settings.Stream.Custom.UseAuthentication="Utilitza l'autenticació"
 Basic.Settings.Stream.Custom.Username="Usuari"
 Basic.Settings.Stream.Custom.Password="Contrasenya"
@@ -753,7 +767,6 @@
 Basic.Settings.Output.Encoder.Video="Codificador de vídeo"
 Basic.Settings.Output.Encoder.Audio="Codificador d'àudio"
 Basic.Settings.Output.SelectDirectory="Seleccioneu el directori de gravació"
-Basic.Settings.Output.SelectFile="Seleccioni l'arxiu de gravació"
 Basic.Settings.Output.DynamicBitrate="Canvia dinàmicament la ràtio per manegar la saturació"
 Basic.Settings.Output.DynamicBitrate.Beta="Canvia dinàmicament la ràtio per manegar la saturació (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="En comptes de perdre fotogrames per reduir la saturació, canvia dinàmicament la ràtio al vol.\n\nTingueu en compte que això pot incrementar el retard per als espectadors si hi ha cap saturació important.\nEn baixar la ràtio, pot trigar uns minuts a restaurar el valor original.\n\nActualment només suportat per a RTMP."
@@ -780,7 +793,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Atenció: No es poden pausar els enregistraments si la qualitat està configurada a «Mateixa que en directe»."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Avís: el format d'enregistrament seleccionat actualment és incompatible amb els codificadors de flux seleccionats."
 Basic.Settings.Output.Simple.Warn.Encoder="Nota: Enregistrar amb codificador basat en programari amb una qualitat diferent del directe requerirà ús de CPU addicional si el directe i la gravació es fan alhora."
-Basic.Settings.Output.Simple.Warn.Lossless="Atenció: La qualitat sense pèrdues genera fitxers de mida exagerada! P. ex. pot utilitzar un total de 7 gigabytes d'espai de disc per minut a alta resolució i FPS. Aquesta qualitat no és recomanable per a enregistraments llargs llevat que compteu amb gran quantitat d'espai disponible al disc."
+Basic.Settings.Output.Simple.Warn.Lossless="Atenció: La qualitat sense pèrdues crea fitxers de mida exagerada! Podeu utilitzar p. ex. un total de 7 gigabytes d'espai al disc per a cada minut amb fotogrames i resolucions altes. Aquesta qualitat no és recomanable per a enregistraments llargs llevat que disposeu de gran quantitat d'espai disponible al disc."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Esteu segur que voleu utilitzar qualitat sense pèrdues?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Advertiment de qualitat sense pèrdues!"
 Basic.Settings.Output.Simple.Encoder.Software="Programari (x264)"
@@ -804,8 +817,8 @@
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="Còdec no compatible"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="El servei de retransmissió «%1» no suporta el còdec «%2». Es canviarà a «%3».\n\nVoleu continuar?"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="El servei de retransmissió «%1» no admet els codificadors «%2» i «%3». Aquests codificadors es canviaran per «%4» i «%5».\n\nVoleu continuar?"
-Basic.Settings.Output.VideoBitrate="Bitrate de vídeo"
-Basic.Settings.Output.AudioBitrate="Bitrate d'àudio"
+Basic.Settings.Output.VideoBitrate="Taxa de bits de vídeo"
+Basic.Settings.Output.AudioBitrate="Taxa de bits d'àudio"
 Basic.Settings.Output.Reconnect="Torna a connectar automàticament"
 Basic.Settings.Output.RetryDelay="Retard fins al proper intent"
 Basic.Settings.Output.MaxRetries="Nombre màxim de reintents"
@@ -929,8 +942,8 @@
 Basic.Settings.Audio.PeakMeterType="Tipus de mesurador de pics"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Pic de mostra"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (ús elevat de la CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ATENCIÓ: El so envoltant està habilitat."
-Basic.Settings.Audio.MultichannelWarning="Si esteu retransmetent, verifiqueu que el servei triat suporta el so envoltant, tant a la reproducció d'entrada com de sortida. El Facebook 360 Live, el Mixer RTMP i el Smashcast són exemples on està completament suportat. Encara que el Facebook Live i el YouTube Live accepten l'entrada de so envoltant, el Facebook Live la converteix a estèreo i el YouTube Live la reprodueix només en 2 canals.\n\nEls filtres d'àudio de l'OBS són compatibles amb el so envoltant, encara que no es garanteix la compatibilitat amb connectors VST."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ATENCIÓ: El so envoltant està habilitat."
+Basic.Settings.Audio.MultichannelWarning="Si esteu transmetent, comproveu que el vostre servei de reproducció admet tant la captura com la reproducció de so envoltant. P. ex. el Facebook 360 Live admet totalment el so envoltant. El YouTube Live admet la captura d'àudio 5.1 (i reproducció als televisors).\n\nEls filtres d'àudio de l'OBS són compatibles amb el so envoltant, tot i que no es garanteix el suport del connector VST."
 Basic.Settings.Audio.MultichannelWarning.Title="Voleu habilitar el so envoltant?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Segur que voleu habilitar el so envoltant?"
 Basic.Settings.Audio.Devices="Dispositius d'àudio globals"
@@ -976,7 +989,6 @@
 Basic.Settings.Advanced.FormatWarning="Atenció: Altres formats de color diferents de NV12/P010 estan pensats primàriament per a gravació i no es recomana el seu ús durant la retransmissió. En aquest cas podeu experimentar un increment d'ús de CPU causat per la conversió del format del color."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Advertència: els formats d'alta precisió s'utilitzen més habitualment amb els espais de color HDR."
 Basic.Settings.Advanced.FormatWarning2100="Advertència: el Rec. 2100 hauria d'utilitzar un format amb més precisió."
-Basic.Settings.Advanced.Audio.BufferingTime="Temps de buffer d'àudio"
 Basic.Settings.Advanced.Video.ColorFormat="Format del color"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 bits, 4:2:0, 2 plànols)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 bits, 4:2:0, 3 plànols)"
@@ -1002,6 +1014,7 @@
 Basic.Settings.Advanced.Network="Xarxa"
 Basic.Settings.Advanced.Network.Disabled="El protocol de transmissió seleccionat actualment no admet el canvi de configuració de la xarxa."
 Basic.Settings.Advanced.Network.BindToIP="Enllaçar amb"
+Basic.Settings.Advanced.Network.IPFamily="Família IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Habilita optimitzacions de la xarxa"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Habilita el ritme TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Intenta fer més amigable la sortida RTMP cap a altres aplicacions sensibles a la latència de la xarxa mitjançant la regulació de la velocitat de transmissió.\nPot augmentar el risc de perdre fotogrames en connexions inestables."
@@ -1078,6 +1091,8 @@
 SceneItemShow="Mostra «%1»"
 SceneItemHide="Amaga «%1»"
 OutputWarnings.NoTracksSelected="Heu de seleccionar almenys una cançó"
+OutputWarnings.NoTracksSelectedOnExit.Title="Error de configuració de sortida"
+OutputWarnings.NoTracksSelectedOnExit.Text="Totes les sortides han de tenir almenys una pista d'àudio seleccionada."
 OutputWarnings.MP4Recording="Advertència: els enregistraments creats en MP4/MOV no es podran recuperar si el fitxer no es pot finalitzar (p. ex. degut a un mal funcionament del sistema o interrupcions, etc.) Si voleu enregistrar diverses pistes d'àudio, considereu utilitzar el format MKV i convertir l'enregistrament a MP4/MOV després d'haver finalitzat (Fitxer → Conversió de gravació)"
 OutputWarnings.CannotPause="Advertència: les gravacions no es poden aturar si el codificador de gravació està configurat a «(Utilitza el codificador de flux)»"
 OutputWarnings.CodecIncompatible="La selecció del codificador d'àudio o vídeo s'ha restablert a causa d'una incompatibilitat. Seleccioneu un codificador compatible de la llista."
@@ -1103,6 +1118,7 @@
 About.GetInvolved="Col·laboreu-hi"
 About.Authors="Autoria"
 About.License="Llicència"
+About.Error="El fitxer no es pot llegir i s'ha produït un error.\n\nVeieu: %1"
 About.Contribute="Col·laboreu amb l'OBS Project"
 AddUrl.Title="Afegeix una font mitjançant l'URL"
 AddUrl.Text="Heu arrossegat un URL a l'OBS. Això afegirà automàticament l'enllaç com a font. Voleu continuar?"
@@ -1123,14 +1139,12 @@
 LoadProfileNeedsRestart="El perfil conté paràmetres que requereixen reiniciar l'OBS:\n%1\n\nVoleu reiniciar l'OBS perquè aquests paràmetres tinguin efecte?"
 ContextBar.NoSelectedSource="No s'ha seleccionat cap font"
 ContextBar.ResetTransform="Restableix la transformació"
-ContextBar.FitToCanvas="Ajusta al llenç"
 ContextBar.MediaControls.PlayMedia="Reprodueix el contingut"
 ContextBar.MediaControls.PauseMedia="Pausa el contingut"
 ContextBar.MediaControls.StopMedia="Atura el contingut"
 ContextBar.MediaControls.RestartMedia="Reinicia el contingut"
 ContextBar.MediaControls.PlaylistNext="Següent a la llista de reproducció"
 ContextBar.MediaControls.PlaylistPrevious="Anterior a la llista de reproducció"
-ContextBar.MediaControls.MediaProperties="Propietats del contingut"
 ContextBar.MediaControls.BlindSeek="Giny de recerca de mitjans"
 YouTube.Auth.Ok="L'autorització s'ha completat correctament.\nAra podeu tancar aquesta pàgina."
 YouTube.Auth.NoCode="El procés d'autorització no s'ha completat."
@@ -1211,3 +1225,5 @@
 YouTube.Errors.liveChatEnded="La transmissió en directe ha finalitzat."
 YouTube.Errors.messageTextInvalid="El text del missatge no és vàlid."
 YouTube.Errors.rateLimitExceeded="Esteu enviant missatges massa ràpid."
+YouTube.DocksRemoval.Title="Neteja els acobladors de navegador heretats del YouTube"
+YouTube.DocksRemoval.Text="Aquests acobladors se suprimiran per ser obsolets:\n\n%1\nUtilitzeu \"Acobladors/Control de directes del YouTube\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/cs-CZ.ini Changed

@@ -90,7 +90,6 @@
 LogViewer="Prohlížeč záznamů"
 ShowOnStartup="Zobrazit při spuštění"
 OpenFile="Otevřít soubor"
-AddValue="Přidat %1"
 AddSource="Přidat zdroj"
 RemoveScene="Odebrat vybranou scénu"
 RemoveSource="Odebrat vybraný/é zdroj(e)"
@@ -102,11 +101,19 @@
 SourceFilters="Otevřít filtry zdroje"
 MixerToolbarMenu="Menu audio směšovače"
 SceneFilters="Otevřít filtry scény"
+List="Seznam"
+Grid="Mřížka"
 PluginsFailedToLoad.Title="Chyba při načítání pluginu"
 PluginsFailedToLoad.Text="Následující OBS pluginy se nepodařilo načíst:\n\n%1\nAktualizujte nebo odstraňte tyto pluginy."
 AlreadyRunning.Title="OBS je již spuštěno"
 AlreadyRunning.Text="OBS již běží! Pokud jste to opravdu nechtěli udělat, tak prosím ukončete ostatní běžící instance programu OBS před spuštěním nové. Pokud máte nastavenu minimalizaci do lišty, tak se prosím podívejte, zda neběží tam."
 AlreadyRunning.LaunchAnyway="Spustit tak či tak"
+AutoSafeMode.Title="Nouzový režim"
+AutoSafeMode.Text="OBS zaznamenalo problémy při posledním ukončování.\n\nChcete spustit OBS v nouzovém režimu (pluginy třetích stran, skripty a websockety budou zakázány)?"
+AutoSafeMode.LaunchSafe="Spustit v nouzovém režimu"
+AutoSafeMode.LaunchNormal="Spustit normálně"
+SafeMode.Restart="Chcete restartovat OBS v nouzovém režimu (pluginy třetích stran, skripty a websockety budou zakázány)?"
+SafeMode.RestartNormal="Chcete restartovat OBS v normálním režimu?"
 ChromeOS.Title="Nepodporovaná platforma"
 ChromeOS.Text="Zdá se, že OBS běží uvnitř kontejneru ChromeOS. Tato platforma není podporována."
 Wine.Title="Wine bylo detekováno"
@@ -172,7 +179,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Vlastní ..."
 Basic.AutoConfig.StreamPage.StreamKey="Vysílací klíč"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: zadejte šifrovací frázi.\nRTMP: zadejte klíč poskytnutý službou.\nSRT: zadejte streamid, pokud jej služba používá."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Odkaz)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kódovací klíč"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Připojený účet"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Odhadnout bitrate za pomocí testu rychlosti spojení (může to zabrat pár minut)"
@@ -224,8 +230,6 @@
 Updater.UpdateNow="Aktualizovat nyní"
 Updater.RemindMeLater="Upozornit později"
 Updater.Skip="Přeskočit verzi"
-Updater.Running.Title="Program je stále aktivní"
-Updater.Running.Text="Některé výstupy jsou stále aktivní, zastavte je, prosím, před další pokusem o aktualizaci"
 Updater.NoUpdatesAvailable.Title="Žádná aktualizace"
 Updater.NoUpdatesAvailable.Text="Není dostupná žádná novější verze"
 Updater.BranchNotFound.Title="Kanál aktualizací byl odstraněn"
@@ -235,8 +239,6 @@
 Updater.RepairConfirm.Title="Potvrďte kontrolu integrity"
 Updater.RepairConfirm.Text="Spuštění kontroli integrity projde soubory této instalace OBS a stáhne poškozené/upravené soubory. Může to chvíli trvat.\n\nPřejete si pokračovat?"
 Updater.FailedToLaunch="Nepodařilo se spustit aktualizátor"
-Updater.GameCaptureActive.Title="Snímání hry"
-Updater.GameCaptureActive.Text="Knihovna pro snímání her je aktivní. Ukončete prosím všechny snímané hry/programy (nebo restartujte Windows) a zkuste to znovu."
 QuickTransitions.SwapScenes="Prohodit scénu náhledu a programovou scénu po přechodu"
 QuickTransitions.SwapScenesTT="Prohodí scény náhledu a programu po přechodu (pokud originální programová scéna stále existuje).\nTato funkce nevrátí provedené změny, které byly provedeny v originální programové scéně."
 QuickTransitions.DuplicateScene="Duplikovat scénu"
@@ -250,6 +252,8 @@
 Basic.SceneTransitions="Přechody scény"
 Basic.TransitionDuration="Délka"
 Basic.TogglePreviewProgramMode="Studiový mód"
+Basic.EnablePreviewProgramMode="Povolit režim studia"
+Basic.DisablePreviewProgramMode="Zakázat režim studia"
 Undo.Undo="Vrátit"
 Undo.Redo="Opakovat"
 Undo.Add="přidání '%1'"
@@ -298,6 +302,8 @@
 Undo.GroupItems="seskupení položek do '%1'"
 TransitionNameDlg.Text="Zadejte název přechodu"
 TransitionNameDlg.Title="Název přechodu"
+TitleBar.SafeMode="NOUZOVÝ REŽIM"
+TitleBar.PortableMode="Přenosný režim"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scény"
 NameExists.Title="Jméno již existuje"
@@ -322,6 +328,7 @@
 Output.StartStreamFailed="Chyba při spouštění vysílání"
 Output.StartRecordingFailed="Chyba při spouštění nahrávání"
 Output.StartReplayFailed="Chyba při spouštění nahrávání do paměti"
+Output.StartVirtualCamFailed="Spuštění virtuální kamery se nezdařilo"
 Output.StartFailedGeneric="Nastala chyba při začátku nahrávání. Zkontrolujte, prosím, textový záznam pro další podrobnosti.\n\nPoznámka: Pokud používáte enkodér NVENC či AMD, zkontrolujte zda používáte aktuální verzi grafického ovladače."
 Output.ReplayBuffer.PauseWarning.Title="Při pozastavení nelze ukládat záznamy"
 Output.ReplayBuffer.PauseWarning.Text="Varování: Záznamy nelze ukládat, pokud je nahrávání pozastaveno."
@@ -334,7 +341,7 @@
 Output.ConnectFail.Disconnected="Odpojen od serveru."
 Output.StreamEncodeError.Title="Chyba kodéru"
 Output.StreamEncodeError.Msg="Při vysílání došlo k chybě kodéru."
-Output.StreamEncodeError.Msg.LastError="Při vysílání došlo k chybě kodéru:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Při vysílání došlo k chybě kodéru: %1"
 Output.RecordFail.Title="Chyba při spouštění nahrávání"
 Output.RecordFail.Unsupported="Výstupní formát není podporovaný nebo nepodporuje více než jednu zvukovou stopu. Zkontrolujte nastavení a zkuste to znovu."
 Output.RecordNoSpace.Title="Nedostatek místa na disku"
@@ -342,7 +349,7 @@
 Output.RecordError.Title="Chyba při nahrávání"
 Output.RecordError.Msg="Při nahrávání došlo k nespecifikované chybě."
 Output.RecordError.EncodeErrorMsg="Při nahrávání došlo k chybě kodéru."
-Output.RecordError.EncodeErrorMsg.LastError="Při nahrávání došlo k chybě kodéru:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Při nahrávání došlo k chybě kodéru: %1"
 Output.BadPath.Title="Špatná cesta k souboru"
 Output.BadPath.Text="Nastavenou cestu pro nahrávání nelze otevřít. Zkontrolujte, prosím, cestu uvedenou pod Nastavení → Výstup → Nahrávání."
 Output.NoBroadcast.Title="Není nastaveno žádné vysílání"
@@ -372,6 +379,8 @@
 Remux.ExitUnfinishedTitle="Probíhá převod"
 Remux.ExitUnfinished="Převod nebyl dokončen, zastavení může znemožnit další použití cílového souboru.\nOpravdu chcete převod ukončit ?"
 Remux.HelpText="Natáhněte soubory do tohoto okna k převodu nebo vyberte prázdné pole \"OBS nahrávka\" pro výběr souboru."
+Remux.NoFilesAddedTitle="Žádny soubor k převodu"
+Remux.NoFilesAdded="Nebyl přidán žádný soubor k převodu. Vyberte složku obsahující jeden či více video souborů."
 MissingFiles="Chybějící soubory"
 MissingFiles.MissingFile="Chybějící soubor"
 MissingFiles.NewFile="Nový soubor"
@@ -390,6 +399,7 @@
 MissingFiles.AutoSearchText="OBS našlo další odpovídající soubory ve vybrané složce. Přejete si je přidat ?"
 MissingFiles.NoMissing.Title="Kontrola chybějících souborů"
 MissingFiles.NoMissing.Text="Vypadá to, že nechybí žádné soubory."
+MacPermissions.MenuAction="Kontrola oprávnění aplikace..."
 MacPermissions.Title="Kontrola oprávnění aplikace"
 MacPermissions.Description="OBS Studio vyžaduje oprávnění ke zpřístupnění některých funkcí. Je doporučeno schválit tato oprávnění, ale nejsou potřebná k používání aplikace. Vždy je můžete schválit později."
 MacPermissions.Description.OpenDialog="Toto okno můžete znovu otevřít pomocí položky v menu OBS Studia."
@@ -405,8 +415,8 @@
 MacPermissions.Item.Accessibility="Přístupnost"
 MacPermissions.Item.Accessibility.Details="Pro funkčnost klávesových zkratek, když není okno OBS aktivní, je vyžadováno toto oprávnění."
 MacPermissions.Continue="Pokračovat"
-UpdateAvailable="K dispozici je nová verze"
-UpdateAvailable.Text="Verze %1.%2.%3 je nyní k dispozici. <a href='%4'>Stáhnout</a>"
+SourceLeak.Title="Chyba při čistění zdroje"
+SourceLeak.Text="Při změně kolekce scén se vyskytl problém a některé předchozí scény nemohly být odstraněny. Tento problém je obvykle způsoben pluginy, které správně neuvolňují prostředky. Zkontrolujte, zda jsou všechny pluginy aktuální.\n\nOBS Studio se nyní ukončí, aby se zabránilo případnému poškození dat."
 Basic.DesktopDevice1="Zvuk plochy"
 Basic.DesktopDevice2="Zvuk plochy 2"
 Basic.AuxDevice1="Mikrofon / AUX"
@@ -468,6 +478,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (automatické: %2)"
 Basic.PropertiesWindow.SelectColor="Výběr barvy"
 Basic.PropertiesWindow.SelectFont="Výběr písma"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Vyberte písmo"
 Basic.PropertiesWindow.ConfirmTitle="Nastavení upraveno"
 Basic.PropertiesWindow.Confirm="Chcete ponechat neuložená nastavení ?"
 Basic.PropertiesWindow.NoProperties="Nejsou k dispozici žádné vlatnosti"
@@ -578,9 +589,9 @@
 Basic.VCam.VirtualCamera="Virtuální kamera"
 Basic.VCam.OutputType="Typ výstupu"
 Basic.VCam.OutputSelection="Výběr výstupu"
-Basic.VCam.Internal="Interní"
-Basic.VCam.InternalDefault="Výstup programu (výchozí)"
-Basic.VCam.InternalPreview="Výstup náhledu"
+Basic.VCam.OutputType.Program="Program (Výchozí)"
+Basic.VCam.OutputSelection.NoSelection="Pro tento typ nebyl vybrán žádný výstup"
+Basic.VCam.RestartWarning="Pro aplikování změn bude tato virtuální kamera restartována"
 Basic.MainMenu.File="Soubor (&F)"
 Basic.MainMenu.File.Export="&Exportovat"
 Basic.MainMenu.File.Import="&Importovat"
@@ -622,17 +633,18 @@
 Basic.MainMenu.Edit.AdvAudio="Rozšířené vl&astnosti zvuku"
 Basic.MainMenu.View="Zobrazit (&V)"
 Basic.MainMenu.View.Toolbars="Liš&ty nástrojů"
-Basic.MainMenu.View.ListboxToolbars="Tlačítka pod seznamy scén/zdrojů"
+Basic.MainMenu.View.ListboxToolbars="Dokované lišty nástrojů"
 Basic.MainMenu.View.ContextBar="Lišta nástrojů pro zdroje"
-Basic.MainMenu.View.SceneTransitions="Pře&chody scény"
 Basic.MainMenu.View.SourceIcons="&Ikony zdrojů"
 Basic.MainMenu.View.StatusBar="&Stavový řádek"
 Basic.MainMenu.View.Fullscreen.Interface="Rozhraní přes celou obrazovku"
 Basic.MainMenu.View.ResetUI="&Resetovat rozhraní"
 Basic.MainMenu.View.AlwaysOnTop="Vždy n&avrchu"
+Basic.MainMenu.View.SceneListMode="Režim seznamu scén"
 Basic.MainMenu.Docks="&Doky"
 Basic.MainMenu.Docks.ResetDocks="&Resetovat doky"
 Basic.MainMenu.Docks.LockDocks="Zamknout doky (&L)"
+Basic.MainMenu.Docks.SideDocks="Doky přes celou výšku (&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="Vlastní doky prohlížeče... (&C)"
 Basic.MainMenu.SceneCollection="Kolekce &scén"
 Basic.MainMenu.Profile="&Profil"
@@ -641,7 +653,6 @@
 Basic.MainMenu.SceneCollection.Import="Importovat kolekci scén"
 Basic.MainMenu.SceneCollection.Export="Exportovat kolekci scén"
 Basic.MainMenu.Profile.Exists="Tento profil již existuje"
-Basic.MainMenu.SceneCollection.Exists="Tato kolekce scén již existuje"
 Basic.MainMenu.Tools="Nás&troje"
 Basic.MainMenu.Help="Pomoc (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portál pomoci"
@@ -653,8 +664,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Nahrát aktuální soubor záznamu (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Nahrát &předchozí soubor záznamu"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Zobrazit aktuální záznam (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Novinky"
 Basic.MainMenu.Help.CheckForUpdates="Zkontrolovat aktualizace"
 Basic.MainMenu.Help.Repair="Zkontrolovat integritu souborů"
+Basic.MainMenu.Help.RestartSafeMode="Restartovat v nouzovém režimu"
+Basic.MainMenu.Help.RestartNormal="Restartovat v normálním režimu"
 Basic.MainMenu.Help.CrashLogs="Hlášení o pádech (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Zobrazit hlášení o pádech (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Nahrát &předchozí hlášení o pádu"
@@ -723,7 +737,6 @@
 Basic.Settings.General.ChannelName.beta="Beta / kandidáti vydání"
 Basic.Settings.General.ChannelDescription.beta="Potenciálně nestabilní předběžné verze"
 Basic.Settings.Stream="Vysílání"
-Basic.Settings.Stream.StreamType="Typ vysílání"
 Basic.Settings.Stream.Custom.UseAuthentication="Použít přihlášení"
 Basic.Settings.Stream.Custom.Username="Uživatelské jméno"
 Basic.Settings.Stream.Custom.Password="Heslo"
@@ -754,7 +767,6 @@
 Basic.Settings.Output.Encoder.Video="Enkodér videa"
 Basic.Settings.Output.Encoder.Audio="Enkodér zvuku"
 Basic.Settings.Output.SelectDirectory="Vyberte složku pro nahrávání"
-Basic.Settings.Output.SelectFile="Vyberte soubor pro nahrávání"
 Basic.Settings.Output.DynamicBitrate="Dynamicky měnit bitrate v závislosti na zahlcení sítě"
 Basic.Settings.Output.DynamicBitrate.Beta="Dynamicky měnit bitrate v závislosti na zahlcení sítě (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Místo zahazování snímků, pro snížení zahlcení sítě, bude průběžně měněn bitrate.\n\nMějte na vědomí, že se může zvýšit odezva pro diváky, pokud dojde k náhlému zahlcení sítě.\nPo snížení bitratu to může trvat pár minut, než se zase navýší.\n\nZatím je podporováno pouze RTMP."
@@ -782,7 +794,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Varování: Nahrávání není možné pozastavit, pokud je nahrávací kvalita nastavena na \"Stejná jako vysílaná\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Varování: Aktuálně vybraný formát nahrávání není kompatibilní s vybranými enkodéry vysílání."
 Basic.Settings.Output.Simple.Warn.Encoder="Varování: Nahrávání se softwarovým enkodérem v jiné kvalitě než je vysílaná bude CPU využívat více, pokud budete vysílat a nahrávat současně."
-Basic.Settings.Output.Simple.Warn.Lossless="Varování: Při použití této kvality budou výsledné nahrávky obrovské! Při použití vysokého rozlišení a snímkování mohou využít až 7 GB diskového prostoru za minutu nahrávky. Tato kvalita není doporučena pro dlouhé nahrávky, pokud nemáte opravdu velký volný prostor na disku."
+Basic.Settings.Output.Simple.Warn.Lossless="Varování: Při použití této kvality budou výsledné nahrávky obrovské! Při použití vysokého rozlišení a snímkování mohou využít až 7 GB diskového prostoru za minutu nahrávky. Tato kvalita není doporučena pro dlouhé nahrávky, pokud nemáte opravdu velký volný prostor na disku. Při použití této kvality není dostupný záznam do paměti."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Opravdu chcete použít tuto kvalitu ?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Varování nastavené kvality!"
 Basic.Settings.Output.Simple.Encoder.Software="Softwarový (x264)"
@@ -931,8 +943,8 @@
 Basic.Settings.Audio.PeakMeterType="Typ měřiče špičky"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Špička vzorky"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Pravá špička (Vyšší využití CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="VAROVÁNÍ: Prostorový zvuk je zapnut."
-Basic.Settings.Audio.MultichannelWarning="Předtím než začnete vysílat si zkontrolujte, zda vaše vysílací služba podporuje příjem a přehrávání prostorového zvuku. Facebook 360 Live je příkladem služby, která jej plně podporuje. I když Facebook Live a YouTube Live oba podporují příjem prostorového zvuku, Facebook Live jej převede na stereo a YouTube Live přehrává pouze dva kanály.\n\nOBS filtry zvuku jej plně podporují, ale podpora u pluginu VST není garantována."
+Basic.Settings.Audio.MultichannelWarning.Enabled="VAROVÁNÍ: Prostorový zvuk je zapnut."
+Basic.Settings.Audio.MultichannelWarning="Předtím než začnete vysílat si zkontrolujte, zda vaše vysílací služba podporuje příjem a přehrávání prostorového zvuku. Facebook 360 Live je příkladem služby, která jej plně podporuje; YouTube Live podporuje příjem 5.1 kanálového zvuku (a přehrávání na televizích).\n\nOBS filtry zvuku jej plně podporují, ale podpora u pluginu VST není garantována."
 Basic.Settings.Audio.MultichannelWarning.Title="Povolit prostorový zvuk?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Jste si jisti, že chcete povolit prostorový zvuk?"
 Basic.Settings.Audio.Devices="Globální zvuková zařízení"
@@ -979,7 +991,6 @@
 Basic.Settings.Advanced.FormatWarning="Varování: Jiné formáty barev, než NV12/P010 jsou primárně určeny pro nahrávání a nejsou doporučeny pro vysílání. Použití při vysílání může zvýšit využití CPU kvůli konverzi formátu barev."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Varování: Formáty s vysokou přesností jsou častěji používány s HDR spektry."
 Basic.Settings.Advanced.FormatWarning2100="Varování: Rec .2100 by mělo používat formát s větší přesností."
-Basic.Settings.Advanced.Audio.BufferingTime="Čas vyrovnávací paměti zvuku"
 Basic.Settings.Advanced.Video.ColorFormat="Formát barev"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 roviny)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 roviny)"
@@ -1004,6 +1015,7 @@
 Basic.Settings.Advanced.Network="Síť"
 Basic.Settings.Advanced.Network.Disabled="Aktuálně vybraný protokol vysílání nepodporuje změnu nastavení sítě."
 Basic.Settings.Advanced.Network.BindToIP="Svázat s adresou"
+Basic.Settings.Advanced.Network.IPFamily="Rodina IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Povolit síťové optimalizace"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Povolit TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Bude se snažit přizpůsobit RTMP výstup tak, aby byl přívětivější k dalším aplikacím, které jsou citlivé na odezvu a to regulací rychlosti odesílání.\nMůže zvýšit počet zahozených snímků na nestabilních připojeních."
@@ -1065,6 +1077,8 @@
 SceneItemShow="Zobrazit '%1'"
 SceneItemHide="Skrýt '%1'"
 OutputWarnings.NoTracksSelected="Musíte vybrat alespoň jednu stopu"
+OutputWarnings.NoTracksSelectedOnExit.Title="Chyba nastavení výstupu"
+OutputWarnings.NoTracksSelectedOnExit.Text="Pro každý výstup musí být vybrána alespoň jedna zvuková stopa."
 OutputWarnings.MP4Recording="Varování: Nahrávky uložené v MP4/MOV nebude možné obnovit, pokud soubor nemohl být dokončen (např. po BSOD, výpadku napájení atp.). Pokud chcete nahrávat více zvukových stop, promyslete použití MKV a poté převedení do MP4/MOV (Soubor → Převést nahrávky)"
 OutputWarnings.CannotPause="Varování: Nahrávání není možné pozastavit, pokud je kodér pro nahrávání nastaven na \"(Použít enkodér vysílání)\""
 OutputWarnings.CodecIncompatible="Vybraný enkodér zvuku či videa byl resetován z důvodu nekompatibility. Vyberte kompatibilní enkodér ze seznamu."
@@ -1090,6 +1104,7 @@
 About.GetInvolved="Zapojte se"
 About.Authors="Autoři"
 About.License="Licence"
+About.Error="Chyba! Soubor není možné přečíst.\n\nJděte na: %1"
 About.Contribute="Podpořit projekt OBS"
 AddUrl.Title="Přidat zdroj pomocí URL"
 AddUrl.Text="Přetáhli jste URL do OBS. Tento odkaz bude automaticky přidán jako zdroj. Pokračovat?"
@@ -1110,14 +1125,12 @@
 LoadProfileNeedsRestart="Profil obsahuje nastavení, které vyžaduje restartování OBS:\n%1\n\nPřejete si restartovat OBS pro aplikování těchto změn?"
 ContextBar.NoSelectedSource="Není vybrán žádný zdroj"
 ContextBar.ResetTransform="Obnovit pozici"
-ContextBar.FitToCanvas="Přizpůsobit editoru"
 ContextBar.MediaControls.PlayMedia="Začít přehrávat"
 ContextBar.MediaControls.PauseMedia="Pozastavit přehrávání"
 ContextBar.MediaControls.StopMedia="Zastavit přehrávání"
 ContextBar.MediaControls.RestartMedia="Restartovat přehrávání"
 ContextBar.MediaControls.PlaylistNext="Další v seznamu skladeb"
 ContextBar.MediaControls.PlaylistPrevious="Předchozí v seznamu skladeb"
-ContextBar.MediaControls.MediaProperties="Vlastnosti média"
 ContextBar.MediaControls.BlindSeek="Posuvník přehrávání"
 YouTube.Auth.Ok="Autorizace byla úspěšná.\nTuto stránku můžete nyní zavřít."
 YouTube.Auth.NoCode="Autorizační proces nebyl dokončen."
@@ -1198,3 +1211,5 @@
 YouTube.Errors.liveChatEnded="Živé vysílání skončilo."
 YouTube.Errors.messageTextInvalid="Text zprávy je neplatný."
 YouTube.Errors.rateLimitExceeded="Posíláš zprávy příliš rychle."
+YouTube.DocksRemoval.Title="Vyčistit zastaralé YouTube doky prohlížeče"
+YouTube.DocksRemoval.Text="Tyto doky prohlížeče budou odstraněny jako zasataralé:\n\n%1\nPoužijte \"Doky/Ovládací panel YouTube Live\" místo toho."

obs-studio-29.1.3.tar.xz/UI/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/da-DK.ini Changed

@@ -89,7 +89,6 @@
 LogViewer="Logvisning"
 ShowOnStartup="Vis ved opstart"
 OpenFile="Åbn fil"
-AddValue="Tilføj %1"
 AddSource="Tilføj kilde"
 RemoveScene="Fjern valgte scene"
 RemoveSource="Fjern valgte kilde(r)"
@@ -168,7 +167,6 @@
 Basic.AutoConfig.StreamPage.Service.ShowAll="Vis alle..."
 Basic.AutoConfig.StreamPage.Service.Custom="Tilpasset..."
 Basic.AutoConfig.StreamPage.StreamKey="Streamnøgle"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(link)"
 Basic.AutoConfig.StreamPage.EncoderKey="Encoder-nøgle"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Tilsluttet konto"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimér bit-hastigheden vha. en båndbreddetest (kan tage et par minutter)"
@@ -217,8 +215,6 @@
 Updater.UpdateNow="Opdatér nu"
 Updater.RemindMeLater="Påmind mig senere"
 Updater.Skip="Overspring version"
-Updater.Running.Title="Program pt. aktivt"
-Updater.Running.Text="Outputs er pt. aktive. Luk alle aktive outputs inden forsøg på opdatering"
 Updater.NoUpdatesAvailable.Title="Ingen opdateringer tilgængelige"
 Updater.NoUpdatesAvailable.Text="Ingen opdateringer er pt. tilgængelige"
 Updater.RepairButUpdatesAvailable.Title="Integritetstjek utilgængelig"
@@ -226,8 +222,6 @@
 Updater.RepairConfirm.Title="Bekræft Integritetstjek"
 Updater.RepairConfirm.Text="Start af integritetstjek vil skanne OBS-installationen for beskadigelse og gendownloade evt. ødelagte/ændrede filer. Dette kan tage et øjeblik.\n\nFortsæt?"
 Updater.FailedToLaunch="Mislykkedes at starte opdatering"
-Updater.GameCaptureActive.Title="Spiloptagelse aktiv"
-Updater.GameCaptureActive.Text="Spiloptagelses hook-bibliotek er pt. i brug. Luk alle spil/programmer som optages (eller genstart Windows) og forsøg igen."
 QuickTransitions.SwapScenes="Ombyt forhåndsvisnings-/programscener efter overgang"
 QuickTransitions.SwapScenesTT="Ombyt forhåndsvisnings-/programscener efter overgang (såfremt programmets oprindelige scene stadig eksisterer).\nDette vil ikke omgøre evt. ændringer, som måtte været udført på programmets oprindelige scene."
 QuickTransitions.DuplicateScene="Dublér scene"
@@ -322,7 +316,6 @@
 Output.ConnectFail.Disconnected="Afbrudt fra serveren."
 Output.StreamEncodeError.Title="Kodningsfejl"
 Output.StreamEncodeError.Msg="En kodningsfejl opstod under streamingen."
-Output.StreamEncodeError.Msg.LastError="En indkodningsfejl opstod under streaming:\n\n%1"
 Output.RecordFail.Title="Mislykkedes at starte optagelse"
 Output.RecordFail.Unsupported="Outputformatet er enten uunderstøttet eller understøtter ikke flere end ét lydspor. Tjek dine indstillinger og forsøg igen."
 Output.RecordNoSpace.Title="Utilstrækkelig diskplads"
@@ -330,7 +323,6 @@
 Output.RecordError.Title="Optagelsesfejl"
 Output.RecordError.Msg="En uspecificeret fejl opstod under optagelse."
 Output.RecordError.EncodeErrorMsg="En kodningsfejl opstod under optagelsen."
-Output.RecordError.EncodeErrorMsg.LastError="En indkodningsfejl opstod under optagelse:\n\n%1"
 Output.BadPath.Title="Ugyldig filsti"
 Output.BadPath.Text="Den opsatte Optagelsessti kunne ikke åbnes. Tjek optagelsesstien under Indstillinger → Output → Optagelse."
 Output.NoBroadcast.Title="Ingen Udsendelse opsat"
@@ -376,7 +368,6 @@
 MissingFiles.AutoSearchText="OBS har fundet yderligere matches for manglende filer mappen. Tilføj disse?"
 MissingFiles.NoMissing.Title="Filmangel tjek"
 MissingFiles.NoMissing.Text="Ingen synes at mangle."
-MacPermissions.Title="Gennemgå App Tilladelser"
 MacPermissions.Description="OBS Studio kræver eksplicitte tilladelser for at kunne tilbyde visse funktioner. Det anbefales at tildele disse tilladelser, men kræves ikke for brug af appen. De kan altid tildeles senere."
 MacPermissions.Description.OpenDialog="Denne dialog kan genåbnes via OBS Studio-menuen."
 MacPermissions.AccessGranted="Adgang tildelt"
@@ -391,8 +382,6 @@
 MacPermissions.Item.Accessibility="Tilgængelighed"
 MacPermissions.Item.Accessibility.Details="For at tastaturgenveje (genvejstaster) kan fungere, mens andre apps er fokuserede, så tildel denne tilladelse."
 MacPermissions.Continue="Fortsæt"
-UpdateAvailable="Ny opdatering tilgængelig"
-UpdateAvailable.Text="Version %1.%2.%3 er nu tilgængelig. <a href='%4'>Klik her for at downloade</a>"
 Basic.DesktopDevice1="Computerlyd"
 Basic.DesktopDevice2="Computerlyd 2"
 Basic.DisplayCapture="Skærmoptagelse"
@@ -547,9 +536,6 @@
 Basic.Main.VirtualCamConfig="Indstil Virtuelt Kamera"
 Basic.VCam.VirtualCamera="Virtuelt Kamera"
 Basic.VCam.OutputSelection="Valg Af Output"
-Basic.VCam.Internal="Interne"
-Basic.VCam.InternalDefault="Program Output (Standard)"
-Basic.VCam.InternalPreview="Forhåndsvisningsoutput"
 Basic.MainMenu.File="&Fil"
 Basic.MainMenu.File.Export="&Eksport"
 Basic.MainMenu.File.ShowRecordings="Vis optagelse&r"
@@ -589,9 +575,7 @@
 Basic.MainMenu.Edit.AdvAudio="&Avancerede lydegenskaber"
 Basic.MainMenu.View="&Vis"
 Basic.MainMenu.View.Toolbars="Værk&tøjsbjælker"
-Basic.MainMenu.View.ListboxToolbars="Scene-/Kildeliste-knapper"
 Basic.MainMenu.View.ContextBar="Kildeværktøjsbjælke"
-Basic.MainMenu.View.SceneTransitions="S&ceneovergange"
 Basic.MainMenu.View.SourceIcons="Kildeikoner (&I)"
 Basic.MainMenu.View.StatusBar="&Statusbjælke"
 Basic.MainMenu.View.Fullscreen.Interface="Fuldskærmsgrænseflade"
@@ -608,7 +592,6 @@
 Basic.MainMenu.SceneCollection.Import="Importér scenesamling"
 Basic.MainMenu.SceneCollection.Export="Eksportér scenesamling"
 Basic.MainMenu.Profile.Exists="Profilen findes allerede"
-Basic.MainMenu.SceneCollection.Exists="Scenesamlingen findes allerede"
 Basic.MainMenu.Tools="Værk&tøjer"
 Basic.MainMenu.Help="&Hjælp"
 Basic.MainMenu.Help.HelpPortal="Hjælpe&portal"
@@ -680,7 +663,6 @@
 Basic.Settings.General.MultiviewLayout.9Scene="Kun scener (9 scener)"
 Basic.Settings.General.MultiviewLayout.16Scene="Kun scener (16 scener)"
 Basic.Settings.General.MultiviewLayout.25Scene="Kun scener (25 scener)"
-Basic.Settings.Stream.StreamType="Streamtype"
 Basic.Settings.Stream.Custom.UseAuthentication="Benyt godkendelse"
 Basic.Settings.Stream.Custom.Username="Brugernavn"
 Basic.Settings.Stream.Custom.Password="Adgangskode"
@@ -702,7 +684,6 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Maks. billeder/sekund (FPS): %1"
 Basic.Settings.Output.Format="Optagelsesformat"
 Basic.Settings.Output.SelectDirectory="Vælg optagelsesmappe"
-Basic.Settings.Output.SelectFile="Vælg optagelsesfil"
 Basic.Settings.Output.DynamicBitrate="Skift bithastighed dynamisk for at håndtere overbelastning"
 Basic.Settings.Output.DynamicBitrate.Beta="Skift bithastighed dynamisk for at håndtere overbelastning (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="I stedet for at droppe billeder for at reducere overbelastning, ændrer dette dynamisk bithastigheden løbende.\n\nBemærk at dette kan øge forsinkelsen, som seerne oplever, hvis der opstår betydelig pludselig overbelastning.\nNår bithastigheden falder, kan det tage op til et par få minutter for at gendanne den.\n\nKun RTMP understøttet pt."
@@ -727,7 +708,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Advarsel: Streamingsaudiobithastigheden indstilles til %1, som er den øvre grænse for den aktuelle streamingtjeneste."
 Basic.Settings.Output.Simple.Warn.CannotPause="Advarsel: Optagelser kan ikke pauses, hvis optagekvaliteten er sat til \"Samme som strream\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Advarsel: Optagelse med en software-encoder i en anden kvalitet end den streamede vil medføre ekstra CPU-forbrug, hvis du streamer og optager samtidigt."
-Basic.Settings.Output.Simple.Warn.Lossless="Advarsel: Tabsfri kvalitet genererer gevaldigt store filstørrelser! Tabsfri kvalitet kan forbruge op til 7 GB diskplads pr. minut ved høje opløsninger og billedhastigheder. Tabsfri tilstand anbefales ikke til lange optagelser, medmindre du har masser af tilgængelig diskplads."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sikker på, at du vil benytte tabsfri kvalitet?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Tabsfri kvalitet-advarsel!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 lavt, forvalgt CPU-forbrug, øger filstørrelsen)"
@@ -829,8 +809,7 @@
 Basic.Settings.Audio.PeakMeterType="Peak Meter-type"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Samplingsspidsværdi"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Sand spidsværdi (højere CPU-belastning)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ADVARSEL: Surround Sound-lyd er aktiveret."
-Basic.Settings.Audio.MultichannelWarning="Ved streaming, så tjek, om din streamingtjeneste understøtter både surround sound inddata og afspilning af surround sound. Facebook 360 Live er et eksempel på fuld surround sound-understøttelse. Selvom Facebook Live og YouTube Live begge accepterer surround-inddata, så nedmixer Facebook Live til stereo, mens YouTube Live kun afspiller to kanaler.\n\nOBS-lydfiltre er kompatible med surround-lyd, selvom VST plugin-understøttelse ikke garanteres."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ADVARSEL: Surround Sound-lyd er aktiveret."
 Basic.Settings.Audio.MultichannelWarning.Title="Aktivér Surround Sound-lyd?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sikker på, at du vil aktivere Surround Sound-lyd?"
 Basic.Settings.Audio.Devices="Global Lydenhed"
@@ -875,7 +854,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Inaktiv"
 Basic.Settings.Advanced.FormatWarning="Advarsel: Farveformater ud over NV12/P010 er primært beregnet til optagelse og anbefales ikke brugt under streaming, da det kan medføre øget CPU-forbrug grundet farveformatkonvertering."
 Basic.Settings.Advanced.FormatWarning2100="Advarsel: Rec. 2100 bør bruge et format med større præcision."
-Basic.Settings.Advanced.Audio.BufferingTime="Lyd-bufferinterval"
 Basic.Settings.Advanced.Video.ColorFormat="Farveformat"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 niveauer)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 niveauer)"
@@ -994,14 +972,12 @@
 LoadProfileNeedsRestart="Profilen indeholder indstillinger, som kræver genstart af OBS:\n%1\n\nGenstart OBS for at effektuere disse indstillinger?"
 ContextBar.NoSelectedSource="Ingen kilde valgt"
 ContextBar.ResetTransform="Nulstil Transformering"
-ContextBar.FitToCanvas="Tilpas til lærred"
 ContextBar.MediaControls.PlayMedia="Afspil medie"
 ContextBar.MediaControls.PauseMedia="Pause medie"
 ContextBar.MediaControls.StopMedia="Stop medie"
 ContextBar.MediaControls.RestartMedia="Genstart medie"
 ContextBar.MediaControls.PlaylistNext="Næste på Afspilningsliste"
 ContextBar.MediaControls.PlaylistPrevious="Foregående på Afspilningsliste"
-ContextBar.MediaControls.MediaProperties="Medieegenskaber"
 ContextBar.MediaControls.BlindSeek="Mediesøgnings-widget"
 YouTube.Auth.Ok="Godkendelse fuldført.\nDenne side kan nu lukkes."
 YouTube.Auth.NoCode="Denne godkendelsesproces blev ikke fuldført."

obs-studio-29.1.3.tar.xz/UI/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/de-DE.ini Changed

@@ -83,7 +83,7 @@
 Group="Gruppe"
 DoNotShowAgain="Nicht nochmal anzeigen"
 Default="(Standard)"
-Calculating="Berechne …"
+Calculating="Wird berechnet …"
 Fullscreen="Vollbildmodus"
 Windowed="Fenstermodus"
 RefreshBrowser="Aktualisieren"
@@ -92,7 +92,6 @@
 LogViewer="Log ansehen"
 ShowOnStartup="Beim Start anzeigen"
 OpenFile="Datei öffnen"
-AddValue="%1 hinzufügen"
 AddSource="Quelle hinzufügen"
 RemoveScene="Ausgewählte Szene entfernen"
 RemoveSource="Ausgewählte Quelle(n) entfernen"
@@ -104,11 +103,19 @@
 SourceFilters="Quellfilter öffnen"
 MixerToolbarMenu="Audiomixermenü"
 SceneFilters="Szenenfilter öffnen"
+List="Liste"
+Grid="Raster"
 PluginsFailedToLoad.Title="Fehler beim Laden von Plugins"
 PluginsFailedToLoad.Text="Folgende OBS-Plugins konnten nicht geladen werden:\n\n%1\nBitte aktualisieren oder entfernen Sie sie."
 AlreadyRunning.Title="OBS wird bereits ausgeführt"
-AlreadyRunning.Text="OBS wird bereits ausgeführt und sollte falls gewünscht vor dem Start einer weiteren Instanz (möglicherweise im Infobereich) beendet werden."
+AlreadyRunning.Text="OBS wird bereits ausgeführt und sollte falls gewünscht vor dem Start einer weiteren Instanz (die möglicherweise im Infobereich ist) beendet werden."
 AlreadyRunning.LaunchAnyway="Trotzdem starten"
+AutoSafeMode.Title="Abgesicherter Modus"
+AutoSafeMode.Text="OBS wurde während Ihrer letzten Sitzung nicht ordnungsgemäß beendet.\n\nMöchten Sie im abgesicherten Modus (mit deaktivierten Drittanbieter-Plugins, Skripte und WebSockets) starten?"
+AutoSafeMode.LaunchSafe="Im abgesicherten Modus starten"
+AutoSafeMode.LaunchNormal="Normal starten"
+SafeMode.Restart="Möchten Sie OBS im abgesicherten Modus (mit deaktivierten Drittanbieter-Plugins, Skripte, und WebSockets) neu starten?"
+SafeMode.RestartNormal="Möchten Sie OBS normal neu starten?"
 ChromeOS.Title="Nicht unterstützte Plattform"
 ChromeOS.Text="OBS scheint in einem ChromeOS-Container zu laufen. Diese Plattform wird nicht unterstützt."
 Wine.Title="Wine erkannt"
@@ -121,14 +128,14 @@
 Auth.Authing.Title="Authentifizierung läuft …"
 Auth.Authing.Text="Authentifizierung mit %1, bitte warten …"
 Auth.AuthFailure.Title="Authentifizierungsfehler"
-Auth.AuthFailure.Text="Fehler beim Authentifizieren mit %1:\n\n%2: %3"
+Auth.AuthFailure.Text="Authentifizierung mit %1 fehlgeschlagen:\n\n%2: %3"
 Auth.InvalidScope.Title="Authentifizierung erforderlich"
 Auth.InvalidScope.Text="Die Authentifizierungsanforderungen für %1 haben sich geändert. Einige Funktionen sind möglicherweise nicht verfügbar."
 Auth.LoadingChannel.Title="Kanalinformationen werden geladen …"
 Auth.LoadingChannel.Text="Kanalinformationen für %1 werden geladen, bitte warten …"
 Auth.LoadingChannel.Error="Kanalinformationen konnten nicht abgerufen werden."
-Auth.ChannelFailure.Title="Fehler beim Laden des Kanals"
-Auth.ChannelFailure.Text="Fehler beim Laden der Kanalinformationen für %1\n\n%2: %3"
+Auth.ChannelFailure.Title="Laden des Kanals fehlgeschlagen"
+Auth.ChannelFailure.Text="Laden der Kanalinformationen für %1 fehlgeschlagen\n\n%2: %3"
 Auth.StreamInfo="Streaminformation"
 TwitchAuth.Stats="Twitch-Statistiken"
 TwitchAuth.Feed="Twitch-Aktivitätsfeed"
@@ -167,7 +174,7 @@
 Basic.AutoConfig.StreamPage.GetStreamKey="Streamschlüssel erhalten"
 Basic.AutoConfig.StreamPage.MoreInfo="Mehr Informationen"
 Basic.AutoConfig.StreamPage.UseStreamKey="Streamschlüssel verwenden"
-Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Streamschlüssel verwenden (erweitert)"
+Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Streamschlüssel verwenden (Erweitert)"
 Basic.AutoConfig.StreamPage.Service="Plattform"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Alle anzeigen …"
 Basic.AutoConfig.StreamPage.Service.Custom="Benutzerdefiniert …"
@@ -183,14 +190,14 @@
 Basic.AutoConfig.TestPage="Endergebnisse"
 Basic.AutoConfig.TestPage.SubTitle.Testing="Das Programm führt nun eine Reihe von Tests durch, um optimale Einstellungen zu finden."
 Basic.AutoConfig.TestPage.SubTitle.Complete="Tests abgeschlossen"
-Basic.AutoConfig.TestPage.TestingBandwidth="Führe Bandbreitentests durch, dies kann einige Minuten dauern …"
+Basic.AutoConfig.TestPage.TestingBandwidth="Bandbreitentests werden durchgeführt, dies kann einige Minuten dauern …"
 Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Keine Ausgabe für das Protokoll dieser Plattform wurde gefunden."
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Verbindungsaufbau mit: %1 …"
-Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Keine Verbindung zu den Servern möglich, bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut."
-Basic.AutoConfig.TestPage.TestingBandwidth.Server="Teste Bandbreite für: %1"
-Basic.AutoConfig.TestPage.TestingStreamEncoder="Teste Streamencoder, dies kann einige Minuten dauern …"
-Basic.AutoConfig.TestPage.TestingRecordingEncoder="Teste Aufnahmeencoder, dies kann einige Minuten dauern …"
-Basic.AutoConfig.TestPage.TestingRes.Fail="Fehler beim Starten des Encoders"
+Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Keine Verbindung zu Servern möglich, bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="Bandbreite wird getestet für: %1"
+Basic.AutoConfig.TestPage.TestingStreamEncoder="Streamencoder wird getestet, dies kann einige Minuten dauern …"
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="Aufnahmeencoder wird getestet, dies kann einige Minuten dauern …"
+Basic.AutoConfig.TestPage.TestingRes.Fail="Starten des Encoders fehlgeschlagen"
 Basic.AutoConfig.TestPage.TestingRes.Resolution="%1 × %2 mit %3 FPS wird getestet …"
 Basic.AutoConfig.TestPage.Result.StreamingEncoder="Streamencoder"
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Aufnahmeencoder"
@@ -221,8 +228,6 @@
 Updater.UpdateNow="Jetzt aktualisieren"
 Updater.RemindMeLater="Später erinnern"
 Updater.Skip="Version überspringen"
-Updater.Running.Title="Programm derzeit aktiv"
-Updater.Running.Text="Ausgaben sind derzeit aktiv. Bitte beenden Sie alle aktiven Ausgaben, bevor Sie versuchen, OBS zu aktualisieren."
 Updater.NoUpdatesAvailable.Title="Keine Updates verfügbar"
 Updater.NoUpdatesAvailable.Text="Zurzeit sind keine Updates verfügbar"
 Updater.BranchNotFound.Title="Update-Kanal entfernt"
@@ -231,9 +236,7 @@
 Updater.RepairButUpdatesAvailable.Text="Das Überprüfen der Dateiintegrität ist nur in der aktuellsten Version möglich. Verwenden Sie „Hilfe“ → „Nach Updates suchen“, um Ihre OBS-Installation zu überprüfen und zu aktualisieren."
 Updater.RepairConfirm.Title="Integritätsprüfung bestätigen"
 Updater.RepairConfirm.Text="Beim Starten der Integritätsprüfung wird Ihre OBS-Installation auf Fehler geprüft und fehlerhafte oder modifizierte Dateien werden erneut heruntergeladen, was einen Moment in Anspruch nehmen kann.\n\nFortfahren?"
-Updater.FailedToLaunch="Updater konnte nicht gestartet werden"
-Updater.GameCaptureActive.Title="Spielaufnahme aktiv"
-Updater.GameCaptureActive.Text="Die Spielaufnahmen-Hook-Bibliothek wird zurzeit verwendet. Bitte schließen Sie alle derzeit aufgenommenen Programme und Spiele (oder starten Sie Windows neu) und versuchen Sie es erneut."
+Updater.FailedToLaunch="Starten des Updaters fehlgeschlagen"
 QuickTransitions.SwapScenes="Vorschau- und Programmszenen nach Übergang tauschen"
 QuickTransitions.SwapScenesTT="Tauscht die Vorschau- und Programmszenen nach dem Übergang (falls die ursprüngliche Programmszene noch vorhanden ist).\nEventuelle Änderungen an der originalen Programmszene werden nicht rückgängig gemacht."
 QuickTransitions.DuplicateScene="Szene duplizieren"
@@ -247,6 +250,8 @@
 Basic.SceneTransitions="Szenenübergänge"
 Basic.TransitionDuration="Dauer"
 Basic.TogglePreviewProgramMode="Studio-Modus"
+Basic.EnablePreviewProgramMode="Studio-Modus aktivieren"
+Basic.DisablePreviewProgramMode="Studio-Modus deaktivieren"
 Undo.Undo="Rückgängig machen"
 Undo.Redo="Wiederholen"
 Undo.Add="„%1“ hinzufügen"
@@ -295,6 +300,8 @@
 Undo.GroupItems="Elemente in „%1“ gruppieren"
 TransitionNameDlg.Text="Bitte geben Sie den Namen des Übergangs ein"
 TransitionNameDlg.Title="Übergangsname"
+TitleBar.SafeMode="ABGESICHERTER MODUS"
+TitleBar.PortableMode="Portabler Modus"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Szenen"
 NameExists.Title="Name existiert bereits"
@@ -316,10 +323,11 @@
 ConfirmRemove.TextMultiple="Möchten Sie %1 Elemente wirklich entfernen?"
 ConfirmReset.Title="Eigenschaften zurücksetzen"
 ConfirmReset.Text="Möchten Sie die aktuellen Eigenschaften wirklich zurücksetzen?"
-Output.StartStreamFailed="Fehler beim Starten des Streams"
-Output.StartRecordingFailed="Fehler beim Starten der Aufnahme"
-Output.StartReplayFailed="Fehler beim Starten des Wiederholungspuffers"
-Output.StartFailedGeneric="Start der Ausgabe fehlgeschlagen. Bitte überprüfen Sie die Logdatei für Details.\n\nHinweis: Wenn Sie die NVENC- oder AMD-Encoder verwenden, stellen Sie sicher, dass Ihre Grafiktreiber aktuell sind."
+Output.StartStreamFailed="Starten des Streams fehlgeschlagen"
+Output.StartRecordingFailed="Starten der Aufnahme fehlgeschlagen"
+Output.StartReplayFailed="Starten des Wiederholungspuffers fehlgeschlagen"
+Output.StartVirtualCamFailed="Starten der virtuellen Kamera fehlgeschlagen"
+Output.StartFailedGeneric="Starten der Ausgabe fehlgeschlagen. Bitte überprüfen Sie die Logdatei für Details.\n\nHinweis: Wenn Sie die NVENC- oder AMD-Encoder verwenden, stellen Sie sicher, dass Ihre Grafiktreiber aktuell sind."
 Output.ReplayBuffer.PauseWarning.Title="Beim Pausieren können keine Wiederholungen gespeichert werden."
 Output.ReplayBuffer.PauseWarning.Text="Achtung: Wiederholungen können beim Pausieren der Aufnahme nicht gespeichert werden."
 Output.ConnectFail.Title="Verbindung fehlgeschlagen"
@@ -331,21 +339,21 @@
 Output.ConnectFail.Disconnected="Verbindung zum Server getrennt."
 Output.StreamEncodeError.Title="Codierungsfehler"
 Output.StreamEncodeError.Msg="Ein Encoderfehler ist beim Streamen aufgetreten."
-Output.StreamEncodeError.Msg.LastError="Beim Streamen ist ein Encoderfehler aufgetreten:\n\n%1"
-Output.RecordFail.Title="Fehler beim Starten der Aufnahme"
+Output.StreamEncodeError.Msg.LastError="Beim Streamen ist ein Encoderfehler aufgetreten: %1"
+Output.RecordFail.Title="Starten der Aufnahme fehlgeschlagen"
 Output.RecordFail.Unsupported="Das Ausgabeformat wird entweder nicht unterstützt oder unterstützt nicht mehrere Audiospuren. Bitte überprüfen Sie Ihre Einstellungen und versuchen Sie es erneut."
 Output.RecordNoSpace.Title="Nicht genügend Speicherplatz"
 Output.RecordNoSpace.Msg="Es gibt nicht genügend Speicherplatz, um die Aufnahme fortzusetzen."
 Output.RecordError.Title="Aufnahmefehler"
 Output.RecordError.Msg="Während der Aufnahme ist ein unbekannter Fehler aufgetreten."
 Output.RecordError.EncodeErrorMsg="Ein Encoderfehler ist beim Aufnehmen aufgetreten."
-Output.RecordError.EncodeErrorMsg.LastError="Beim Aufnehmen ist ein Encoderfehler aufgetreten:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Beim Aufnehmen ist ein Encoderfehler aufgetreten: %1"
 Output.BadPath.Title="Ungültiger Dateipfad"
 Output.BadPath.Text="Der konfigurierte Aufnahmepfad konnte nicht geöffnet werden. Bitte überprüfen Sie Ihren Aufnahmepfad unter „Einstellungen“ → „Ausgabe“ → „Aufnahme“."
 Output.NoBroadcast.Title="Keine Übertragung konfiguriert"
 Output.NoBroadcast.Text="Sie müssen eine Übertragung einrichten, bevor Sie mit dem Streamen beginnen können."
-Output.BroadcastStartFailed="Fehler beim Starten der Übertragung"
-Output.BroadcastStopFailed="Fehler beim Beenden der Übertragung"
+Output.BroadcastStartFailed="Starten der Übertragung fehlgeschlagen"
+Output.BroadcastStopFailed="Beenden der Übertragung fehlgeschlagen"
 LogReturnDialog="Log erfolgreich hochgeladen"
 LogReturnDialog.Description="Ihre Logdatei wurde hochgeladen. Sie können die URL jetzt für Debugging- oder Support-Zwecke teilen."
 LogReturnDialog.Description.Crash="Ihr Absturzbericht wurde hochgeladen. Sie können die URL jetzt für Debugging-Zwecke teilen."
@@ -355,20 +363,22 @@
 Remux.SourceFile="OBS-Aufnahme"
 Remux.TargetFile="Zieldatei"
 Remux.Remux="Remuxen"
-Remux.Stop="Muxen beenden"
+Remux.Stop="Remuxen stoppen"
 Remux.ClearFinished="Fertiggestellte Objekte entfernen"
 Remux.ClearAll="Alle Objekte entfernen"
 Remux.OBSRecording="OBS-Aufnahme"
-Remux.FinishedTitle="Remuxen beendet"
+Remux.FinishedTitle="Remuxen abgeschlossen"
 Remux.Finished="Aufnahme remuxed"
 Remux.FinishedError="Aufnahme remuxed, aber die Datei könnte unvollständig sein"
 Remux.SelectRecording="Wählen Sie eine OBS-Aufnahme aus"
 Remux.SelectTarget="Wählen Sie eine Zieldatei aus"
 Remux.FileExistsTitle="Zieldateien existieren bereits"
 Remux.FileExists="Die folgenden Zieldateien existieren bereits. Möchten Sie diese ersetzen?"
-Remux.ExitUnfinishedTitle="Remuxen in Bearbeitung"
+Remux.ExitUnfinishedTitle="Remuxen in Arbeit"
 Remux.ExitUnfinished="Das Remuxen ist noch nicht abgeschlossen. Wenn Sie jetzt beenden, kann die Zieldatei unbrauchbar werden.\nMöchten Sie das Remuxen wirklich abbrechen?"
 Remux.HelpText="Legen Sie Dateien in diesem Fenster ab, um sie zu remuxen oder wählen Sie eine leere „OBS-Aufnahme“-Zelle aus, um nach einer Datei zu suchen."
+Remux.NoFilesAddedTitle="Keine Remuxing-Datei hinzugefügt"
+Remux.NoFilesAdded="Es wurde keine Datei zum Remuxen hinzugefügt. Legen Sie einen Ordner mit Videodateien ab."
 MissingFiles="Fehlende Dateien"
 MissingFiles.MissingFile="Fehlende Datei"
 MissingFiles.NewFile="Neue Datei"
@@ -387,8 +397,9 @@
 MissingFiles.AutoSearchText="OBS hat weitere Treffer für fehlende Dateien in diesem Ordner gefunden. Möchten Sie diese hinzufügen?"
 MissingFiles.NoMissing.Title="Auf fehlende Dateien prüfen"
 MissingFiles.NoMissing.Text="Es wurden keine fehlenden Dateien gefunden."
+MacPermissions.MenuAction="App-Berechtigungen überprüfen …"
 MacPermissions.Title="App-Berechtigungen überprüfen"
-MacPermissions.Description="OBS Studio benötigt für bestimmte Funktionen zusätzliche Berechtigungen, die zwar empfohlen, aber nicht für die Benutzung des Programms erforderlich sind. Sie können sie jederzeit später aktivieren."
+MacPermissions.Description="OBS Studio benötigt für bestimmte Funktionen zusätzliche Berechtigungen, die zwar empfohlen, aber nicht für die Benutzung des Programms erforderlich sind. Sie können diese jederzeit später aktivieren."
 MacPermissions.Description.OpenDialog="Dieses Fenster kann über die Menüleiste in OBS erneut geöffnet werden."
 MacPermissions.AccessGranted="Zugriff erlaubt"
 MacPermissions.RequestAccess="Zugriff anfordern"
@@ -402,8 +413,8 @@
 MacPermissions.Item.Accessibility="Zugänglichkeit"
 MacPermissions.Item.Accessibility.Details="Diese Berechtigung wird benötigt, damit Hotkeys funktionieren, selbst wenn andere Apps im Vordergrund sind."
 MacPermissions.Continue="Fortfahren"
-UpdateAvailable="Neues Update verfügbar"
-UpdateAvailable.Text="Version %1.%2.%3 ist jetzt verfügbar. <a href='%4'>Herunterladen</a>"
+SourceLeak.Title="Quellenbereinigungsfehler"
+SourceLeak.Text="Es gab ein Problem beim Wechseln der Szenensammlung und einige Quellen konnten nicht entladen werden. Dieses Problem wird in der Regel durch Plugins verursacht, die Ressourcen nicht richtig freigeben. Bitte stellen Sie sicher, dass Ihre Plugins auf dem neuesten Stand sind.\n\nOBS Studio wird nun beendet, um mögliche Datenbeschädigung zu vermeiden."
 Basic.DesktopDevice1="Desktop-Audio"
 Basic.DesktopDevice2="Desktop-Audio 2"
 Basic.AuxDevice1="Mikrofon-/AUX-Audio"
@@ -429,7 +440,7 @@
 Deinterlacing.TopFieldFirst="Oberes Feld zuerst"
 Deinterlacing.BottomFieldFirst="Unteres Feld zuerst"
 VolControl.SliderUnmuted="Lautstärkeregler für „%1“:"
-VolControl.SliderMuted="Lautstärkeregler für „%1“: (derzeit stummgeschaltet)"
+VolControl.SliderMuted="Lautstärkeregler für „%1“: (Derzeit stummgeschaltet)"
 VolControl.Mute="„%1“ stummschalten"
 VolControl.Properties="Eigenschaften von „%1“"
 VolControl.UnassignedWarning.Title="Audioquelle nicht zugewiesen"
@@ -456,9 +467,10 @@
 Basic.Main.Sources.Lock="Fixieren"
 Basic.Main.Sources.LockDescription="Fixiert die Position und Größe von „%1“ in der Leinwand"
 Basic.PropertiesWindow="Eigenschaften von „%1“"
-Basic.PropertiesWindow.AutoSelectFormat="%1 (automatisch ausgewählt: %2)"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (Automatisch ausgewählt: %2)"
 Basic.PropertiesWindow.SelectColor="Farbe auswählen"
 Basic.PropertiesWindow.SelectFont="Schriftart auswählen"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Schriftart wählen"
 Basic.PropertiesWindow.ConfirmTitle="Einstellungen geändert"
 Basic.PropertiesWindow.Confirm="Möchten Sie Ihre Änderungen speichern?"
 Basic.PropertiesWindow.NoProperties="Keine Eigenschaften verfügbar"
@@ -551,7 +563,7 @@
 Basic.Main.SetupBroadcast="Übertragung verwalten"
 Basic.Main.StopStreaming="Stream beenden"
 Basic.Main.StopBroadcast="Übertragung beenden"
-Basic.Main.AutoStopEnabled="(beendet automatisch)"
+Basic.Main.AutoStopEnabled="(Beendet automatisch)"
 Basic.Main.StoppingStreaming="Beende Stream …"
 Basic.Main.ForceStopStreaming="Stream beenden (Verzögerung ignorieren)"
 Basic.Main.ShowContextBar="Quellenwerkzeugleiste anzeigen"
@@ -566,17 +578,17 @@
 Basic.VCam.VirtualCamera="Virtuelle Kamera"
 Basic.VCam.OutputType="Ausgabetyp"
 Basic.VCam.OutputSelection="Ausgabeauswahl"
-Basic.VCam.Internal="Intern"
-Basic.VCam.InternalDefault="Programmausgabe (Standard)"
-Basic.VCam.InternalPreview="Vorschauausgabe"
+Basic.VCam.OutputType.Program="Programm (Standard)"
+Basic.VCam.OutputSelection.NoSelection="Keine Auswahl für diesen Ausgabetyp"
+Basic.VCam.RestartWarning="Die virtuelle Kamera wird neugestartet, um die Änderung anzuwenden."
 Basic.MainMenu.File="&Datei"
 Basic.MainMenu.File.Export="&Exportieren"
 Basic.MainMenu.File.Import="&Importieren"
 Basic.MainMenu.File.ShowRecordings="&Aufnahmen anzeigen"
 Basic.MainMenu.File.Remux="A&ufnahmen remuxen"
 Basic.MainMenu.File.Settings="&Einstellungen"
-Basic.MainMenu.File.ShowSettingsFolder="Einstellungsordner anzeigen"
-Basic.MainMenu.File.ShowProfileFolder="Profilordner anzeigen"
+Basic.MainMenu.File.ShowSettingsFolder="Einstellungsordner öffnen"
+Basic.MainMenu.File.ShowProfileFolder="Profilordner öffnen"
 Basic.MainMenu.File.ShowMissingFiles="Auf fehlende Dateien prüfen"
 Basic.MainMenu.File.Exit="&Beenden"
 Basic.MainMenu.Edit="&Bearbeiten"
@@ -610,16 +622,17 @@
 Basic.MainMenu.Edit.AdvAudio="&Erweiterte Audioeigenschaften"
 Basic.MainMenu.View="&Ansicht"
 Basic.MainMenu.View.Toolbars="Werkzeugleis&ten"
-Basic.MainMenu.View.ListboxToolbars="Schaltflächen für Szenen-/Quellenlisten"
+Basic.MainMenu.View.ListboxToolbars="Dock-Werkzeugleisten"
 Basic.MainMenu.View.ContextBar="Quellenwerkzeugleiste"
-Basic.MainMenu.View.SceneTransitions="&Szenenübergänge"
 Basic.MainMenu.View.SourceIcons="&Quellsymbole"
 Basic.MainMenu.View.StatusBar="&Statusleiste"
 Basic.MainMenu.View.Fullscreen.Interface="Vollbild"
 Basic.MainMenu.View.ResetUI="&Benutzeroberfläche zurücksetzen"
 Basic.MainMenu.View.AlwaysOnTop="&Immer im Vordergrund"
+Basic.MainMenu.View.SceneListMode="Szenenlistenmodus"
 Basic.MainMenu.Docks.ResetDocks="D&ocks zurücksetzen"
 Basic.MainMenu.Docks.LockDocks="&Docks sperren"
+Basic.MainMenu.Docks.SideDocks="&Gesamte Höhe verwenden"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Benutzerdefinierte Browser-Docks …"
 Basic.MainMenu.SceneCollection="&Szenensammlung"
 Basic.MainMenu.Profile="&Profil"
@@ -628,7 +641,6 @@
 Basic.MainMenu.SceneCollection.Import="Szenensammlung importieren"
 Basic.MainMenu.SceneCollection.Export="Szenensammlung exportieren"
 Basic.MainMenu.Profile.Exists="Das Profil ist bereits vorhanden"
-Basic.MainMenu.SceneCollection.Exists="Die Szenensammlung existiert bereits"
 Basic.MainMenu.Tools="&Werkzeuge"
 Basic.MainMenu.Help="&Hilfe"
 Basic.MainMenu.Help.HelpPortal="&Hilfeportal"
@@ -642,6 +654,8 @@
 Basic.MainMenu.Help.Logs.ViewCurrentLog="A&ktuelles Log ansehen"
 Basic.MainMenu.Help.CheckForUpdates="Nach Updates suchen"
 Basic.MainMenu.Help.Repair="Dateiintegrität überprüfen"
+Basic.MainMenu.Help.RestartSafeMode="Im abgesicherten Modus neu starten"
+Basic.MainMenu.Help.RestartNormal="Normal neu starten"
 Basic.MainMenu.Help.CrashLogs="&Absturzberichte"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="&Absturzberichte anzeigen"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Vorherigen Absturzbericht hochladen"
@@ -657,7 +671,7 @@
 Basic.Settings.General.UpdateChannelDefault="(Standard)"
 Basic.Settings.General.EnableAutoUpdates="Beim Start nach Updates suchen"
 Basic.Settings.General.OpenStatsOnStartup="Statistikenfenster beim Start öffnen"
-Basic.Settings.General.HideOBSWindowsFromCapture="OBS-Fenster vor Bildschirmaufnahmen verstecken"
+Basic.Settings.General.HideOBSWindowsFromCapture="OBS-Fenster vor Bildschirmaufnahmen verbergen"
 Basic.Settings.General.HideOBSWindowsFromCapture.Tooltip="Diese Einstellung verhindert das Erfassen von OBS-Studio-Fenstern von OBS selbst und anderen Programmen\nfür z. B. Videokonferenzen, Bildschirmübertragungen, Fernunterstützung oder Screenshots.\nOBS-Projektoren werden weiterhin erfasst."
 Basic.Settings.General.HideOBSWindowsFromCapture.Message="Das Aktivieren dieser Option verhindert das Erfassen von OBS-Studio-Fenstern von OBS selbst und anderen Programmen für z. B. Videokonferenzen, Bildschirmübertragungen, Fernunterstützung oder Screenshots. OBS-Projektoren werden weiterhin erfasst."
 Basic.Settings.General.WarnBeforeStartingStream="Bestätigungsdialog beim Starten des Streams anzeigen"
@@ -675,14 +689,14 @@
 Basic.Settings.General.RecordWhenStreaming="Automatisch aufnehmen beim Streamen"
 Basic.Settings.General.KeepRecordingWhenStreamStops="Weiter aufnehmen, wenn der Stream beendet wird"
 Basic.Settings.General.ReplayBufferWhileStreaming="Wiederholungspuffer mit Stream starten"
-Basic.Settings.General.KeepReplayBufferStreamStops="Wiederholungspuffer weiter aktiv lassen, wenn der Stream beendet wird"
+Basic.Settings.General.KeepReplayBufferStreamStops="Wiederholungspuffer laufen lassen, wenn der Stream beendet wird"
 Basic.Settings.General.SysTray="Infobereich"
 Basic.Settings.General.SysTrayWhenStarted="Beim Start zum Infobereich minimieren"
 Basic.Settings.General.SystemTrayHideMinimize="Immer zum Infobereich anstatt zur Taskleiste minimieren"
 Basic.Settings.General.SaveProjectors="Projektoren beim Beenden speichern"
 Basic.Settings.General.CloseExistingProjectors="Auf einen Vollbildprojektor pro Bildschirm begrenzen"
 Basic.Settings.General.Preview="Vorschau"
-Basic.Settings.General.OverflowHidden="Überlauf verstecken"
+Basic.Settings.General.OverflowHidden="Überlauf verbergen"
 Basic.Settings.General.OverflowAlwaysVisible="Überlauf immer anzeigen"
 Basic.Settings.General.OverflowSelectionHidden="Überlauf trotz verborgener Quelle anzeigen"
 Basic.Settings.General.Importers="Importierung"
@@ -704,10 +718,8 @@
 Basic.Settings.General.MultiviewLayout.9Scene="Nur Szenen (9 Szenen)"
 Basic.Settings.General.MultiviewLayout.16Scene="Nur Szenen (16 Szenen)"
 Basic.Settings.General.MultiviewLayout.25Scene="Nur Szenen (25 Szenen)"
-Basic.Settings.General.ChannelName.stable="Stabil"
 Basic.Settings.General.ChannelDescription.stable="Neuster stabiler Release"
 Basic.Settings.General.ChannelDescription.beta="Potenziell instabile Pre-Release-Versionen"
-Basic.Settings.Stream.StreamType="Streamtyp"
 Basic.Settings.Stream.Custom.UseAuthentication="Authentifizierung verwenden"
 Basic.Settings.Stream.Custom.Username="Benutzername"
 Basic.Settings.Stream.Custom.Password="Passwort"
@@ -739,7 +751,6 @@
 Basic.Settings.Output.Encoder.Video="Videoencoder"
 Basic.Settings.Output.Encoder.Audio="Audioencoder"
 Basic.Settings.Output.SelectDirectory="Wählen Sie den Aufnahmeordner aus"
-Basic.Settings.Output.SelectFile="Wählen Sie ein Aufnahmedatei aus"
 Basic.Settings.Output.DynamicBitrate="Bitrate dynamisch verändern, um Überlastung zu kontrollieren"
 Basic.Settings.Output.DynamicBitrate.Beta="Bitrate dynamisch verändern, um Überlastung zu kontrollieren (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Anstatt Frames wegfallen zu lassen, um Überlastung\nzu verringern, wird die Bitrate dynamisch verändert.\n\nBeachten Sie, dass dies die Verzögerung zu den Zuschauern\nbei erheblich unerwartet hoher Überlastung erhöhen kann.\nWenn die Bitrate fällt, kann der Wiederherstellungsvorgang\nein paar Minuten dauern.\n\nDerzeit nur für RTMP unterstützt."
@@ -766,12 +777,12 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Achtung: Aufnahmen können nicht pausiert werden, wenn die Aufnahmequalität „Gleich wie Stream“ ist."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Achtung: Das Aufnahmeformat ist mit dem/den gewählten Streamencoder(n) nicht kompatibel."
 Basic.Settings.Output.Simple.Warn.Encoder="Achtung: Mit einem Softwareencoder in einer anderen Qualität als der des Streams aufzunehmen, erfordert zusätzliche CPU-Auslastung, wenn Sie gleichzeitig streamen und aufnehmen."
-Basic.Settings.Output.Simple.Warn.Lossless="Achtung: Verlustfreie Qualität erzeugt enorm große Dateien und kann bei hohen Auflösungen und Frameraten mehr als 7 GB Speicherplatz pro Minute beanspruchen."
+Basic.Settings.Output.Simple.Warn.Lossless="Achtung: Bei verlustfreier Qualität werden enorm große Dateien erzeugt, was bei hohen Auflösungen und Frameraten mehr als 7 GB Speicherplatz pro Minute beanspruchen kann. Der Wiederholungspuffer steht bei verlustfreier Qualität nicht zur Verfügung."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Möchten Sie verlustfreie Qualität wirklich verwenden?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Warnung zur verlustfreien Qualität"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 niedrige CPU-Auslastungsvoreinstellung, erhöht die Dateigröße)"
 Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Standard)"
-Basic.Settings.Output.Simple.TwitchVodTrack="Twitch-VOD-Spur (verwendet Spur 2)"
+Basic.Settings.Output.Simple.TwitchVodTrack="Twitch-VOD-Spur (Verwendet Spur 2)"
 Basic.Settings.Output.Simple.RecAudioTrack="Audiospur"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Inkompatible Auflösung/Framerate"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Diese Streamingplattform unterstützt Ihre aktuelle Ausgabeauflösung und/oder Framerate nicht. Die Werte werden auf den nächstmöglichen kompatiblen Wert geändert:\n\n%1\n\nFortfahren?"
@@ -784,11 +795,11 @@
 Basic.Settings.Output.Reconnect="Automatisches Wiederverbinden"
 Basic.Settings.Output.RetryDelay="Wiederholungsverzögerung"
 Basic.Settings.Output.MaxRetries="Maximale Wiederholungsversuche"
-Basic.Settings.Output.Advanced="Benutzerdefinierte Encodereinstellungen aktivieren (erweitert)"
+Basic.Settings.Output.Advanced="Benutzerdefinierte Encodereinstellungen aktivieren (Erweitert)"
 Basic.Settings.Output.EncoderPreset="Encodervoreinstellung"
-Basic.Settings.Output.EncoderPreset.ultrafast="%1 (niedrige CPU-Auslastung, niedrigste Qualität)"
-Basic.Settings.Output.EncoderPreset.veryfast="%1 (Standard) (mittlere CPU-Auslastung, Standardqualität)"
-Basic.Settings.Output.EncoderPreset.fast="%1 (hohe CPU-Auslastung, hohe Qualität)"
+Basic.Settings.Output.EncoderPreset.ultrafast="%1 (Niedrige CPU-Auslastung, niedrigste Qualität)"
+Basic.Settings.Output.EncoderPreset.veryfast="%1 (Standard) (Mittlere CPU-Auslastung, Standardqualität)"
+Basic.Settings.Output.EncoderPreset.fast="%1 (Hohe CPU-Auslastung, hohe Qualität)"
 Basic.Settings.Output.CustomEncoderSettings="Benutzerdefinierte Encodereinstellungen"
 Basic.Settings.Output.CustomMuxerSettings="Benutzerdefinierte Muxereinstellungen"
 Basic.Settings.Output.NoSpaceFileName="Dateinamen ohne Leerzeichen generieren"
@@ -884,10 +895,10 @@
 Basic.Settings.Video.Denominator="Nenner"
 Basic.Settings.Video.InvalidResolution="Ungültige Auflösung. Korrekte Formatierung: BreitexHöhe (z. B. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Videoausgabe ist derzeit aktiv. Bitte schalten Sie alle Ausgaben ab, um die Videoeinstellungen zu ändern."
-Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (am schnellsten, aber unscharf bei Skalierung)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (geschärfte Skalierung, 16 Stichproben)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (geschärfte Skalierung, 36 Stichproben)"
-Basic.Settings.Video.DownscaleFilter.Area="Area (gewichtete Summe, 4/6/9 Stichproben)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (Am schnellsten, aber unscharf bei Skalierung)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Geschärfte Skalierung, 16 Stichproben)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Geschärfte Skalierung, 36 Stichproben)"
+Basic.Settings.Video.DownscaleFilter.Area="Area (Gewichtete Summe, 4/6/9 Stichproben)"
 Basic.Settings.Audio.Channels="Kanäle"
 Basic.Settings.Audio.Meters="Meter"
 Basic.Settings.Audio.MeterDecayRate="Zerfallsrate"
@@ -895,9 +906,9 @@
 Basic.Settings.Audio.MeterDecayRate.Medium="Mittel (Type I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Langsam (Type II PPM)"
 Basic.Settings.Audio.PeakMeterType="Spitzenmessertyp"
-Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (höhere CPU-Auslastung)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ACHTUNG: Surround-Sound-Audio ist aktiviert."
-Basic.Settings.Audio.MultichannelWarning="Überprüfen Sie beim Streamen, ob Ihre Streamingplattform sowohl die Einspeisung von Surround-Sound als auch die Surround-Sound-Wiedergabe unterstützt. Facebook 360 Live zum Beispiel unterstützt Surround-Sound vollständig. Obwohl Facebook Live und YouTube Live beide die Surround-Einspeisung akzeptieren, wird Facebook Live auf Stereo heruntergemischt und YouTube Live spielt nur zwei Kanäle ab.\n\nOBS-Audiofilter sind mit Surround-Sound kompatibel, die VST-Pluginunterstützung ist aber nicht garantiert."
+Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Höhere CPU-Auslastung)"
+Basic.Settings.Audio.MultichannelWarning.Enabled="ACHTUNG: Surround-Sound-Audio ist aktiviert."
+Basic.Settings.Audio.MultichannelWarning="Überprüfen Sie für das Streamen, ob Ihre Streamingplattform sowohl die Einspeisung als auch die Wiedergabe von Surround-Sound unterstützt. Beispielsweise unterstützt Facebook 360 Live Surround-Sound vollständig. YouTube Live unterstützt 5.1-Audioeinspeisung (und -Wiedergabe auf Fernsehgeräten).\n\nOBS-Audiofilter sind mit Surround-Sound kompatibel, die VST-Pluginunterstützung ist aber nicht garantiert."
 Basic.Settings.Audio.MultichannelWarning.Title="Surround-Sound-Audio aktivieren?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Möchten Sie Surround-Sound-Audio wirklich aktivieren?"
 Basic.Settings.Audio.Devices="Globale Audiogeräte"
@@ -911,7 +922,7 @@
 Basic.Settings.Audio.PushToMuteDelay="Push-To-Mute-Verzögerung"
 Basic.Settings.Audio.EnablePushToTalk="Push-To-Talk aktivieren"
 Basic.Settings.Audio.PushToTalkDelay="Push-To-Talk-Verzögerung"
-Basic.Settings.Audio.UnknownAudioDevice="Gerät nicht angeschlossen oder nicht verfügbar"
+Basic.Settings.Audio.UnknownAudioDevice="Gerät nicht angeschlossen oder verfügbar"
 Basic.Settings.Audio.Disabled="Deaktiviert"
 Basic.Settings.Audio.LowLatencyBufferingMode="Audiopufferung mit niedriger Latenz (für Decklink-/NDI-Ausgaben)"
 Basic.Settings.Audio.LowLatencyBufferingWarning.Enabled="ACHTUNG: Audiopufferung mit niedriger Latenz ist aktiviert."
@@ -926,9 +937,9 @@
 Basic.Settings.Accessibility.ColorOverrides.MixerGreen="Mixerlautstärkebalken (-60 bis -20 dB)"
 Basic.Settings.Accessibility.ColorOverrides.MixerYellow="Mixerlautstärkebalken (-20 bis -9 dB)"
 Basic.Settings.Accessibility.ColorOverrides.MixerRed="Mixerlautstärkebalken (-9 bis 0 dB)"
-Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive="Mixerlautstärkebalken (-60 bis -20 dB) (aktiv)"
-Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive="Mixerlautstärkebalken (-20 bis -9 dB) (aktiv)"
-Basic.Settings.Accessibility.ColorOverrides.MixerRedActive="Mixerlautstärkebalken (-9 bis 0 dB) (aktiv)"
+Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive="Mixerlautstärkebalken (-60 bis -20 dB) (Aktiv)"
+Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive="Mixerlautstärkebalken (-20 bis -9 dB) (Aktiv)"
+Basic.Settings.Accessibility.ColorOverrides.MixerRedActive="Mixerlautstärkebalken (-9 bis 0 dB) (Aktiv)"
 Basic.Settings.Accessibility.ColorOverrides.Preset="Farbvoreinstellung"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Default="Standard"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="Benutzerdefiniert"
@@ -943,7 +954,6 @@
 Basic.Settings.Advanced.FormatWarning="Achtung: Andere Farbformate als NV12/P010 sind in erster Linie für die Aufnahme bestimmt und für Streaming nicht zu empfehlen. Die erforderliche Farbformatkonvertierung kann eine höhere CPU-Auslastung hervorrufen."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Achtung: Formate mit hoher Präzision werden häufig mit HDR-Farbräumen verwendet."
 Basic.Settings.Advanced.FormatWarning2100="Achtung: Rec. 2100 sollte ein Format mit größerer Genauigkeit verwenden."
-Basic.Settings.Advanced.Audio.BufferingTime="Audiopufferungszeit"
 Basic.Settings.Advanced.Video.ColorFormat="Farbformat"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-Bit, 4:2:0, 2 Ebenen)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-Bit, 4:2:0, 3 Ebenen)"
@@ -964,11 +974,12 @@
 Basic.Settings.Advanced.Audio.DisableAudioDucking="Windows-Audioducking deaktivieren"
 Basic.Settings.Advanced.StreamDelay="Streamverzögerung"
 Basic.Settings.Advanced.StreamDelay.Duration="Dauer"
-Basic.Settings.Advanced.StreamDelay.Preserve="Lückenloses Wiederverbinden (erhöht Verzögerung, um Videoverluste zu vermeiden)"
+Basic.Settings.Advanced.StreamDelay.Preserve="Lückenloses Wiederverbinden (Erhöht Verzögerung, um Videoverluste zu vermeiden)"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Geschätzte Speichernutzung: %1 MB"
 Basic.Settings.Advanced.Network="Netzwerk"
 Basic.Settings.Advanced.Network.Disabled="Das Ändern der Netzwerkeinstellungen wird durch das gewählte Streamingprotokoll nicht unterstützt."
 Basic.Settings.Advanced.Network.BindToIP="An IP binden"
+Basic.Settings.Advanced.Network.IPFamily="IP-Familie"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Netzwerkoptimierung aktivieren"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCP Pacing aktivieren"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Ein Versuch, die RTMP-Ausgabe für andere latenzempfindliche Anwendungen\nim Netzwerk durch Regulierung der Übertragungsrate zu erleichtern, was aber\ndas Risiko für ausgelassene Frames bei instabilen Verbindungen erhöhen kann."
@@ -1040,7 +1051,9 @@
 SceneItemShow="„%1“ zeigen"
 SceneItemHide="„%1“ verbergen"
 OutputWarnings.NoTracksSelected="Sie müssen mindestens eine Spur auswählen"
-OutputWarnings.MP4Recording="Achtung: Aufnahmen, die in MP4/MOV gespeichert werden, sind nicht wiederherstellbar, wenn die Datei nicht beendet werden konnte (z. B. als Folge von BSODs, Stromausfällen, etc.). Wenn Sie mehrere Audiospuren aufnehmen möchten, sollten Sie MKV verwenden und die Aufnahme nach ihrer Fertigstellung zu MP4/MOV remuxen. („Datei“ → „Aufnahmen remuxen“)"
+OutputWarnings.NoTracksSelectedOnExit.Title="Ausgabeeinstellungsfehler"
+OutputWarnings.NoTracksSelectedOnExit.Text="Für jede Ausgabe muss mindestens eine Audiospur ausgewählt sein."
+OutputWarnings.MP4Recording="Achtung: Aufnahmen, die in MP4/MOV gespeichert werden, sind nicht wiederherstellbar, wenn die Datei nicht fertiggestellt werden konnte (z. B. als Folge eines BSOD oder Stromausfalls). Wenn Sie mehrere Audiospuren aufnehmen möchten, sollten Sie MKV verwenden und die Aufnahme nach ihrer Fertigstellung zu MP4/MOV remuxen. („Datei“ → „Aufnahmen remuxen“)"
 OutputWarnings.CannotPause="Achtung: Aufnahmen können nicht pausiert werden, wenn der Aufnahmeencoder auf „(Streamencoder verwenden)“ gesetzt ist."
 OutputWarnings.CodecIncompatible="Der ausgewählte Audio- oder Videoencoder wurde wegen Inkompatibilität zurückgesetzt. Bitte wählen Sie einen passenden Encoder aus der Liste."
 CodecCompat.Incompatible="(Nicht mit %1 kompatibel)"
@@ -1054,8 +1067,8 @@
 FinalScene.Text="Es muss mindestens eine Szene vorhanden sein."
 NoSources.Title="Keine Quellen"
 NoSources.Text="Sie haben noch keine Videoquellen hinzugefügt, sodass nur ein leerer Bildschirm ausgegeben wird. Sind Sie sicher, dass Sie das wollen?"
-NoSources.Text.AddSource="Sie können jederzeit Quellen hinzufügen, indem Sie auf das +-Symbol unter dem Quellenfeld im Hauptfenster klicken."
-NoSources.Label="Sie haben bis jetzt keine Quellen hinzugefügt.\nKlicken Sie auf das +-Symbol oder\nrechtsklicken Sie hier, um welche hinzuzufügen."
+NoSources.Text.AddSource="Sie können jederzeit Quellen hinzufügen, indem Sie auf das + unter dem Quellenfeld im Hauptfenster klicken."
+NoSources.Label="Sie haben bis jetzt keine Quellen hinzugefügt.\nKlicken Sie auf das + oder\nrechtsklicken Sie hier, um welche hinzuzufügen."
 ChangeBG="Farbe auswählen"
 CustomColor="Benutzerdefinierte Farbe"
 BrowserSource.EnableHardwareAcceleration="Browserhardwarebeschleunigung aktivieren"
@@ -1065,6 +1078,7 @@
 About.GetInvolved="Wirken Sie mit"
 About.Authors="Autoren"
 About.License="Lizenzvereinbarung"
+About.Error="Fehler beim Lesen der Datei.\n\nBesuchen Sie: %1"
 About.Contribute="Unterstützen Sie das OBS-Projekt"
 AddUrl.Title="Quelle per URL hinzufügen"
 AddUrl.Text="Sie haben eine URL in OBS gezogen. Dies wird automatisch den Link als Quelle hinzufügen. Fortfahren?"
@@ -1085,14 +1099,12 @@
 LoadProfileNeedsRestart="Das Profil enthält Einstellungen, die einen Neustart von OBS erfordern.\n%1\n\nMöchten Sie OBS jetzt neu starten, damit diese Einstellungen wirksam werden?"
 ContextBar.NoSelectedSource="Keine Quelle ausgewählt"
 ContextBar.ResetTransform="Transformation zurücksetzen"
-ContextBar.FitToCanvas="An Leinwand anpassen"
 ContextBar.MediaControls.PlayMedia="Medien abspielen"
 ContextBar.MediaControls.PauseMedia="Medien pausieren"
 ContextBar.MediaControls.StopMedia="Medien stoppen"
 ContextBar.MediaControls.RestartMedia="Medien neu starten"
 ContextBar.MediaControls.PlaylistNext="Weiter in Playlist"
 ContextBar.MediaControls.PlaylistPrevious="Zurück in Playlist"
-ContextBar.MediaControls.MediaProperties="Medieneigenschaften"
 ContextBar.MediaControls.BlindSeek="Mediensuchelement"
 YouTube.Auth.Ok="Autorisierung erfolgreich abgeschlossen.\nSie können diese Seite jetzt schließen."
 YouTube.Auth.NoCode="Der Autorisierungsprozess wurde nicht abgeschlossen."
@@ -1171,3 +1183,5 @@
 YouTube.Errors.liveChatEnded="Der Livestream hat geendet."
 YouTube.Errors.messageTextInvalid="Die Nachricht ist ungültig."
 YouTube.Errors.rateLimitExceeded="Sie senden Nachrichten zu schnell."
+YouTube.DocksRemoval.Title="Veraltete YouTube-Browser-Docks bereinigen"
+YouTube.DocksRemoval.Text="Folgende Browser-Docks werden entfernt, da diese veraltet sind:\n\n%1\nVerwenden Sie stattdessen „Docks“ → „YouTube Live Control Room“."

obs-studio-29.1.3.tar.xz/UI/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/el-GR.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="Προβολή καταγραφών"
 ShowOnStartup="Εμφάνιση κατά την εκκίνηση"
 OpenFile="Άνοιγμα αρχείου"
-AddValue="Προσθήκη %1"
 AddSource="Προσθήκη Πηγής"
 RemoveScene="Αφαίρεση Επιλεγμένης Σκηνής"
 RemoveSource="Αφαίρεση Επιλεγμένης(ων) Πηγής(ών)"
@@ -107,11 +106,17 @@
 SourceFilters="Άνοιγμα Ιδιοτήτων Φίλτρου"
 MixerToolbarMenu="Μίκτης Ήχου"
 SceneFilters="Άνοιγμα Ιδιοτήτων Φίλτρου"
+List="Λίστα"
+Grid="Πλέγμα"
 PluginsFailedToLoad.Title="Σφάλμα Φόρτωσης Πρόσθετου"
 PluginsFailedToLoad.Text="Τα παρακάτω πρόσθετα του OBS απέτυχαν να φορτωθούν:\n\n%1\nΠαρακαλώ αναβαθμίστε ή αφαιρέστε αυτά τα πρόσθετα."
 AlreadyRunning.Title="Το OBS εκτελείται ήδη"
 AlreadyRunning.Text="Το OBS εκτελείται ήδη! Εκτός αν αυτός ήταν ο σκοπός σας, παρακαλούμε τερματίστε τις τρέχουσες διεργασίες OBS πριν προσπαθήσετε να εκκινήσετε μια καινούρια. Εάν έχετε ρυθμίσει το OBS να ελαχιστοποιείται στην γραμμή εργαλείων, παρακαλούμε να ελέγξετε αν τρέχει ήδη εκεί."
 AlreadyRunning.LaunchAnyway="Εκκίνηση ούτως ή άλλως"
+AutoSafeMode.Title="Ασφαλής Λειτουργία"
+AutoSafeMode.LaunchSafe="Εκτέλεση σε Ασφαλή Λειτουργία"
+AutoSafeMode.LaunchNormal="Εκτέλεση Κανονικά"
+SafeMode.RestartNormal="Θέλετε να επανεκκινήσετε το OBS σε Κανονική Λειτουργία;"
 ChromeOS.Title="Μη υποστηριγμένη πλατφόρμα"
 ChromeOS.Text="Το OBS φαίνεται να τρέχει μέσα σε έναν περιέκτη ChromeOS.Αυτή η πλατφόρμα δεν υποστηρίζεται."
 Wine.Title="Ανιχνεύθηκε το Wine"
@@ -178,8 +183,9 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Προσαρμοσμένο..."
 Basic.AutoConfig.StreamPage.Server="Διακομιστής"
 Basic.AutoConfig.StreamPage.StreamKey="Κλειδί Ροής"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Σύνδεσμος)"
+Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: Εισαγάγετε τον κωδικό πρόσβασης για την κρυπτογράφηση.\nRTMP: Εισαγάγετε το κλειδί που παρέχεται από την υπηρεσία.\nSRT: Εισαγάγετε το αναγνωριστικό ροής εάν η υπηρεσία χρησιμοποιεί ένα."
 Basic.AutoConfig.StreamPage.EncoderKey="Κλειδί Κωδικοποιητή"
+Basic.AutoConfig.StreamPage.BearerToken="Μονάδα Φορέα"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Συνδεδεμένος λογαριασμός"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Εκτίμηση ρυθμού μετάδοσης δεδομένων με δοκιμή εύρους ζώνης (ενδέχεται να χρειαστούν μερικά λεπτά)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Προτίμηση κωδικοποίησης υποβοηθούμενης από το υλισμικό"
@@ -190,6 +196,7 @@
 Basic.AutoConfig.TestPage.SubTitle.Testing="Το πρόγραμμα εκτελεί τώρα ένα σύνολο από δοκιμές, για να εκτιμήσει τις πιο ιδανικές ρυθμίσεις"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Οι δοκιμές ολοκληρώθηκαν"
 Basic.AutoConfig.TestPage.TestingBandwidth="Πραγματοποίηση δοκιμής εύρους ζώνης, αυτό μπορεί να διαρκέσει μερικά λεπτά..."
+Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Δε βρέθηκε καμία έξοδος για το πρωτόκολλο αυτής της υπηρεσίας"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Σύνδεση με %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Αδυναμία σύνδεσης με όλους τους διακομιστές, παρακαλούμε ελέγξτε τη σύνδεση σας με το διαδίκτυο και προσπαθήστε ξανά."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Έλεγχος εύρους ζώνης προς: %1"
@@ -230,8 +237,6 @@
 Updater.UpdateNow="Ενημέρωση Τώρα"
 Updater.RemindMeLater="Υπενθύμιση αργότερα"
 Updater.Skip="Παράλειψη έκδοσης"
-Updater.Running.Title="Το πρόγραμμα είναι ενεργό αυτή τη στιγμή"
-Updater.Running.Text="Οι έξοδοι είναι προσωρινά ενεργές, παρακαλούμε τερματίστε όλες τις ενεργές εξόδους προτού επιχειρήσετε να ενημερώσετε το πρόγραμμα"
 Updater.NoUpdatesAvailable.Title="Δεν υπάρχουν διαθέσιμες ενημερώσεις"
 Updater.NoUpdatesAvailable.Text="Δεν υπάρχουν διαθέσιμες ενημερώσεις αυτή τη στιγμή"
 Updater.BranchNotFound.Title="Το Ενημερωμένο Κανάλι Αφαιρέθηκε"
@@ -241,8 +246,6 @@
 Updater.RepairConfirm.Title="Επιβεβαίωση Ελέγχου Ακεραιότητας"
 Updater.RepairConfirm.Text="Ξεκινώντας τον έλεγχο ακεραιότητας θα σαρώσετε την εγκατάσταση του OBS σας για φθορά και την επαναλήψη κατεστραμένων/τροποποιημένων αρχείων. Αυτό μπορεί να διαρκέσει λίγο.\n\nΘέλετε να συνεχίσετε?"
 Updater.FailedToLaunch="Αποτυχία εκκίνησης της υπηρεσίας ενημέρωσης"
-Updater.GameCaptureActive.Title="Καταγραφή παιχνιδιού ενεργή"
-Updater.GameCaptureActive.Text="Η βιβλιοθήκη προσάρτησης της εγγραφής παιχνιδιού χρησιμοποιείται ήδη. Παρακαλούμε κλείστε όλα τα παιχνίδια/προγράμματα που καταγράφονται (ή επανεκκινήστε τα Windows) και προσπαθήστε ξανά."
 QuickTransitions.SwapScenes="Εναλλαγή Σκηνών Προεπισκόπησης/Προγράμματος μετά τη Μετάβαση"
 QuickTransitions.SwapScenesTT="Εναλλάσσει τις σκηνές προεπισκόπησης και προγράμματος μετά τη μετάβαση (αν η αρχική σκηνή του προγράμματος εξακολουθεί να υπάρχει).\nΑυτό δεν θα αναιρέσει τυχόν αλλαγές που μπορεί να έχουν γίνει στην αρχική σκηνή του προγράμματος."
 QuickTransitions.DuplicateScene="Διπλότυπο Σκηνής"
@@ -256,6 +259,8 @@
 Basic.SceneTransitions="Μεταβάσεις Σκηνών"
 Basic.TransitionDuration="Διάρκεια"
 Basic.TogglePreviewProgramMode="Λειτουργία στούντιο"
+Basic.EnablePreviewProgramMode="Ενεργοποίηση λειτουργίας Στούντιο"
+Basic.DisablePreviewProgramMode="Απενεργοποίηση λειτουργίας Στούντιο"
 Undo.Undo="Αναίρεση"
 Undo.Redo="Επανάληψη"
 Undo.Add="Προσθήκη '%1'"
@@ -304,6 +309,8 @@
 Undo.GroupItems="Ομαδοποίηση αντικειμένων στο '%1'"
 TransitionNameDlg.Text="Παρακαλώ εισάγετε το όνομα της μετάβασης"
 TransitionNameDlg.Title="Όνομα Μετάβασης"
+TitleBar.SafeMode="ΑΣΦΑΛΉΣ ΛΕΙΤΟΥΡΓΊΑ"
+TitleBar.PortableMode="Φορητή Λειτουργία"
 TitleBar.Profile="Προφίλ"
 TitleBar.Scenes="Σκηνές"
 NameExists.Title="Το όνομα υπάρχει ήδη"
@@ -328,6 +335,7 @@
 Output.StartStreamFailed="Αποτυχία εκκίνησης της ροής"
 Output.StartRecordingFailed="Αποτυχία εκκίνησης της καταγραφής"
 Output.StartReplayFailed="Αποτυχία εκκίνησης της προσωρινής μνήμης των επαναλήψεων"
+Output.StartVirtualCamFailed="Απέτυχε η εκκίνηση της εικονικής κάμερας"
 Output.StartFailedGeneric="Αποτυχία εκκίνησης εξόδου. Παρακαλούμε ελέγξτε το αρχείο καταγραφής για λεπτομέρειες.\n\nΣημείωση: Εάν χρησιμοποιείτε τους κωδικοποιητές NVENC ή AMD, βεβαιωθείτε ότι τα προγράμματα οδήγησης της κάρτας γραφικών σας είναι ενημερωμένα."
 Output.ReplayBuffer.PauseWarning.Title="Δεν είναι δυνατή η αποθήκευση των επαναλήψεων κατά την παύση"
 Output.ReplayBuffer.PauseWarning.Text="Προειδοποίηση: Οι επαναλύψεις δεν μπορούν να σωθούν όταν η καταγραφή είναι σε παύση."
@@ -335,11 +343,12 @@
 Output.ConnectFail.BadPath="Μη έγκυρη Διαδρομή ή URL Σύνδεσης. Παρακαλώ ελέγξτε τις ρυθμίσεις σας και επιβεβαιώστε ότι είναι έγκυρες."
 Output.ConnectFail.ConnectFailed="Απέτυχε η σύνδεση στον διακομιστή"
 Output.ConnectFail.InvalidStream="Δεν μπορέσαμε να αποκτήσουμε πρόσβαση στο συγκεκριμένο κανάλι ή κλειδί ροής, παρακαλούμε ελέγξτε ξανά το κλειδί ροής σας. Εάν είναι σωστό, μπορεί να υπάρχει πρόβλημα στη σύνδεση με τον διακομιστή."
+Output.ConnectFail.HdrDisabled="Η έξοδος HDR είναι προς το παρόν απενεργοποιημένη για αυτή την έξοδο."
 Output.ConnectFail.Error="Παρουσιάστηκε μη αναμενόμενο σφάλμα κατά την προσπάθεια σύνδεσης με τον διακομιστή. Περισσότερες πληροφορίες στο αρχείο καταγραφής."
 Output.ConnectFail.Disconnected="Αποσυνδεθήκατε από τον διακομιστή."
 Output.StreamEncodeError.Title="Σφάλμα κωδικοποίησης"
 Output.StreamEncodeError.Msg="Ένα πρόβλημα κωδικοποίησης συνέβει κατά τη ζωντανή ροή."
-Output.StreamEncodeError.Msg.LastError="Ένα πρόβλημα κωδικοποίησης συνέβει κατά τη ζωντανή ροή:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Παρουσιάστηκε σφάλμα κωδικοποιητή κατά τη ροή: %1"
 Output.RecordFail.Title="Αποτυχία εκκίνησης της καταγραφής"
 Output.RecordFail.Unsupported="Η μορφή εξόδου είτε δεν υποστηρίζεται ή δεν υποστηρίζει παραπάνω από ένα κομμάτι ήχου. Παρακαλώ ελέγξτε τις ρυθμίσεις σας και δοκιμάστε ξανά."
 Output.RecordNoSpace.Title="Ανεπαρκής χώρος στον δίσκο"
@@ -347,7 +356,7 @@
 Output.RecordError.Title="Σφάλμα καταγραφής"
 Output.RecordError.Msg="Παρουσιάστηκε ένα αδιευκρίνιστο σφάλμα κατά την καταγραφή."
 Output.RecordError.EncodeErrorMsg="Ένα πρόβλημα κωδικοποίησης συνέβει κατά τη καταγραφή."
-Output.RecordError.EncodeErrorMsg.LastError="Ένα πρόβλημα κωδικοποίησης συνέβει κατά τη καταγραφή:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Παρουσιάστηκε σφάλμα κωδικοποιητή κατά την εγγραφή: %1"
 Output.BadPath.Title="Λάθος Διαδρομή Αρχείου"
 Output.BadPath.Text="Η ορισμένη διαδρομή καταγραφής δεν μπόρεσε να βρεθεί. Ελέγξτε την πηγαίνοντας στις Ρυθμίσεις → Έξοδος → Καταγραφή."
 Output.NoBroadcast.Title="Καμία ρυθμισμένη μετάδοση"
@@ -377,6 +386,8 @@
 Remux.ExitUnfinishedTitle="Μετατροπή σε εξέλιξη"
 Remux.ExitUnfinished="Η Μετατροπή δεν τελείωσε, η διακοπή τώρα μπορεί να καταστήσει το αρχείο προορισμού άχρηστο.\nΕίστε βέβαιοι ότι θέλετε να τερματίσετε την μετατροπή;"
 Remux.HelpText="Αποθέστε τα αρχεία σε αυτό το παράθυρο για να τα μετατρέψετε, ή επιλέξτε ένα άδειο πεδίο \"Kαταγραφή OBS\" για αναζήτηση αρχείου."
+Remux.NoFilesAddedTitle="Δεν προστέθηκε αρχείο επανεμφανισμό."
+Remux.NoFilesAdded="Κανένα αρχείο δεν προστέθηκε για επανεμφανισμό. Αποθέστε ένα φάκελο που περιέχει ένα ή περισσότερα αρχεία βίντεο."
 MissingFiles="Αρχεία που λείπουν"
 MissingFiles.MissingFile="Αρχείο που λείπει"
 MissingFiles.NewFile="Νέο αρχείο"
@@ -395,7 +406,8 @@
 MissingFiles.AutoSearchText="Το OBS βρήκε επιπλέον αντιστοιχίες για τα αρχεία που λείπουν σε αυτόν τον κατάλογο. Θα θέλατε να τα προσθέσετε;"
 MissingFiles.NoMissing.Title="Έλεγχος για αρχεία που λείπουν"
 MissingFiles.NoMissing.Text="Δεν φαίνεται να λείπουν αρχεία."
-MacPermissions.Title="Επανεξέταση Δικαιωμάτων Εφαρμογής"
+MacPermissions.MenuAction="Έλεγχος Δικαιωμάτων Εφαρμογής..."
+MacPermissions.Title="Έλεγχος Δικαιωμάτων Εφαρμογής"
 MacPermissions.Description="Το OBS Studio απαιτεί την άδειά σας για την παροχή συγκεκριμένων λειτουργιών. Συνιστάται να ενεργοποιήσετε αυτά τα δικαιώματα, αλλά δεν απαιτούνται για τη χρήση της εφαρμογής. Μπορείτε πάντα να τα ενεργοποιήσετε αργότερα."
 MacPermissions.Description.OpenDialog="Μπορείτε να ανοίξετε ξανά αυτόν τον διάλογο μέσω του μενού του OBS Studio."
 MacPermissions.AccessGranted="Επιτρέπεται η πρόσβαση"
@@ -410,8 +422,8 @@
 MacPermissions.Item.Accessibility="Προσβασιμότητα"
 MacPermissions.Item.Accessibility.Details="Για τη λειτουργία συντομεύσεων πληκτρολογίου(πλήκτρα συντόμευσης) ενώ άλλες εφαρμογές είναι εστιασμένες, παρακαλώ ενεργοποιήστε αυτό το δικαίωμα."
 MacPermissions.Continue="Συνέχεια"
-UpdateAvailable="Νέα Διαθέσιμη Ενημέρωση"
-UpdateAvailable.Text="Η έκδοση %1.%2.%3 είναι τώρα διαθέσιμη. <a href='%4'>Κάντε κλικ εδώ για να την κατεβάσετε</a>"
+SourceLeak.Title="Σφάλμα Καθαρισμού Πηγής"
+SourceLeak.Text="Παρουσιάστηκε πρόβλημα κατά την αλλαγή των συλλογών σκηνών και κάποιες πηγές δεν μπόρεσαν να αποφορτωθούν. Αυτό το πρόβλημα τυπικά προκαλείται από πρόσθετα τα οποία δεν απελευθερώνουν πόρους κατάλληλα. Παρακαλώ βεβαιωθείτε ότι τα πρόσθετα που χρησιμοποιείται είναι ενημερωμένα.\n\nΤο OBS Studio θα εξέλθει τώρα για να αποτρέψει πιθανή καταστροφή δεδομένων."
 Basic.DesktopDevice1="Ήχος Επιφάνειας Εργασίας"
 Basic.DesktopDevice2="Ήχος Επιφάνειας Εργασίας 2"
 Basic.AuxDevice1="Μικρόφωνο/Aux"
@@ -429,6 +441,7 @@
 BlendingMethod.SrgbOff="SRGB ανενεργό"
 BlendingMode="Λειτουργία ανάμειξης"
 BlendingMode.Normal="Κανονική"
+BlendingMode.Additive="Πρόσθεση"
 BlendingMode.Subtract="Αφαίρεση"
 BlendingMode.Screen="Οθόνη"
 BlendingMode.Multiply="Πολλαπλασιασμός"
@@ -442,6 +455,8 @@
 VolControl.SliderMuted="Ρυθμιστής έντασης για '%1': (αυτή τη στιγμή σε σίγαση)"
 VolControl.Mute="Σίγαση '%1'"
 VolControl.Properties="Ιδιότητες για '%1'"
+VolControl.UnassignedWarning.Title="Μη Ορισμένη Πηγή Ήχου"
+VolControl.UnassignedWarning.Text="\"%1\" δε έχει ανατεθεί σε κανένα κομμάτι ήχου και δε θα είναι ακουστό σε ροές ή εγγραφές.\n\nΓια να αναθέσετε μια πηγή ήχου σε ένα κομμάτι, ανοίξτε τις Προηγμένες Ιδιότητες Ήχου μέσω του μενού δεξιού κλικ ή του κουμπιού τροχαίας στην εργαλειοθήκη του μικτή."
 Basic.Main.AddSceneDlg.Title="Προσθήκη Σκηνής"
 Basic.Main.AddSceneDlg.Text="Παρακαλώ εισάγετε το όνομα της σκηνής"
 Basic.Main.DefaultSceneName.Text="Σκηνή %1"
@@ -467,6 +482,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (αυτόματη επιλογή: %2)"
 Basic.PropertiesWindow.SelectColor="Επιλέξτε χρώμα"
 Basic.PropertiesWindow.SelectFont="Επιλέξτε γραμματοσειρά"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Επιλέξτε μια γραμματοσειρά"
 Basic.PropertiesWindow.ConfirmTitle="Άλλαξαν οι Ρυθμίσεις"
 Basic.PropertiesWindow.Confirm="Υπάρχουν μη αποθηκευμένες αλλαγές. Θέλετε να τις κρατήσετε;"
 Basic.PropertiesWindow.NoProperties="Δεν υπάρχουν διαθέσιμες ιδιότητες"
@@ -577,9 +593,9 @@
 Basic.VCam.VirtualCamera="Εικονική Κάμερα"
 Basic.VCam.OutputType="Τύπος Εξόδου"
 Basic.VCam.OutputSelection="Επιλογή Εξόδου"
-Basic.VCam.Internal="Εσωτερικό"
-Basic.VCam.InternalDefault="Έξοδος Προγράμματος (Προεπιλογή)"
-Basic.VCam.InternalPreview="Προεπισκόπηση Εξόδου"
+Basic.VCam.OutputType.Program="Πρόγραμμα (Προεπιλογή)"
+Basic.VCam.OutputSelection.NoSelection="Καμία επιλογή για αυτό τον τύπο εξόδου"
+Basic.VCam.RestartWarning="Η εικονική κάμερα θα επανεκκινηθεί για να εφαρμοστεί αυτή η αλλαγή"
 Basic.MainMenu.File="Αρχείο(&F)"
 Basic.MainMenu.File.Export="Εξαγωγή(&E)"
 Basic.MainMenu.File.Import="Εισαγωγή(Ι) (&I)"
@@ -621,14 +637,13 @@
 Basic.MainMenu.Edit.AdvAudio="Ιδιότητες Ήχου για Προχωρημένους(&A)"
 Basic.MainMenu.View="Προβολή (&V)"
 Basic.MainMenu.View.Toolbars="Γραμμές εργαλείων (&T)"
-Basic.MainMenu.View.ListboxToolbars="Κουμπιά Λίστας Σκηνής/Πηγής"
 Basic.MainMenu.View.ContextBar="Γραμμή εργαλείων πηγής"
-Basic.MainMenu.View.SceneTransitions="Μεταβάσεις Σκηνών(&C)"
 Basic.MainMenu.View.SourceIcons="Πηγές Εικονίδια"
 Basic.MainMenu.View.StatusBar="Γραμμή κατάστασης(&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Διεπαφή Πλήρους Οθόνης"
 Basic.MainMenu.View.ResetUI="&Επαναφορά διεπαφής χρήστη"
 Basic.MainMenu.View.AlwaysOnTop="&Πάντα στην Κορυφή"
+Basic.MainMenu.View.SceneListMode="Λειτουργία Λίστας Σκηνών"
 Basic.MainMenu.Docks="&Στοιχιζόμενα παράθυρα"
 Basic.MainMenu.Docks.ResetDocks="&Επαναφορά στοιχιζόμενων παραθύρων"
 Basic.MainMenu.Docks.LockDocks="&Κλείδωμα στοιχιζόμενων παραθύρων"
@@ -640,19 +655,22 @@
 Basic.MainMenu.SceneCollection.Import="Εισαγωγή Συλλογής Σκηνών"
 Basic.MainMenu.SceneCollection.Export="Εξαγωγή Συλλογής Σκηνών"
 Basic.MainMenu.Profile.Exists="Το προφίλ υπάρχει ήδη"
-Basic.MainMenu.SceneCollection.Exists="Η συλλογή σκήνων υπάρχει ήδη"
 Basic.MainMenu.Tools="Εργαλεία(&T)"
 Basic.MainMenu.Help="Βοήθεια(&H)"
 Basic.MainMenu.Help.HelpPortal="Πύλη Βοήθειας(&P)"
 Basic.MainMenu.Help.Website="Μετάβαση στην Ιστοσελίδα(&W)"
 Basic.MainMenu.Help.Discord="Βρείτε μας στο &Discord"
+Basic.MainMenu.Help.WhatsNew="Τι Νέο Υπάρχει"
 Basic.MainMenu.Help.Logs="Αρχεία Καταγραφής(&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="Εμφάνιση Αρχείων Καταγραφής(&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Μεταφορτώστε το Τρέχον Αρχείο Καταγραφής(&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Μεταφόρτωση &Προηγούμενου Αρχείου Καταγραφής"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Προβολή Τρέχοντος Αρχείου Καταγραφής(&V)"
+Basic.MainMenu.Help.ReleaseNotes="Σημειώσεις έκδοσης"
 Basic.MainMenu.Help.CheckForUpdates="Ελέγχος Για Ενημερώσεις"
 Basic.MainMenu.Help.Repair="Έλεγχος Ακεραιότητας Αρχείου"
+Basic.MainMenu.Help.RestartSafeMode="Επανεκκίνηση σε Ασφαλή λειτουργία"
+Basic.MainMenu.Help.RestartNormal="Επανεκκίνηση σε Κανονική Λειτουργία"
 Basic.MainMenu.Help.CrashLogs="Αναφορές Σφαλμάτων(&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Εμφάνιση Αναφοράς Σφαλμάτων(&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Μεταφόρτωση &Προηγούμενης αναφοράς Κατάρρευσης"
@@ -718,7 +736,6 @@
 Basic.Settings.General.ChannelName.stable="Σταθερό"
 Basic.Settings.General.ChannelDescription.stable="Τελευταία σταθερή έκδοση"
 Basic.Settings.Stream="Ροή"
-Basic.Settings.Stream.StreamType="Τύπος Ροής"
 Basic.Settings.Stream.Custom.UseAuthentication="Χρήση πιστοποίησης"
 Basic.Settings.Stream.Custom.Username="Όνομα χρήστη"
 Basic.Settings.Stream.Custom.Password="Κωδικός"
@@ -740,8 +757,12 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Μέγιστο FPS: %1"
 Basic.Settings.Output="Έξοδος"
 Basic.Settings.Output.Format="Μορφή Καταγραφής"
+Basic.Settings.Output.Format.MKV="Βίντεο Matroska (.mkv)"
+Basic.Settings.Output.Format.fMP4="Κατακερματισμένο MP4 (.mp4)"
+Basic.Settings.Output.Format.fMOV="Κατακερματισμένο MOV (.mov)"
+Basic.Settings.Output.Encoder.Video="Κωδικοποιητής Βίντεο"
+Basic.Settings.Output.Encoder.Audio="Κωδικοποιητής Ήχου"
 Basic.Settings.Output.SelectDirectory="Επιλέξτε Φάκελο Καταγραφής"
-Basic.Settings.Output.SelectFile="Επιλέξτε Αρχείο Καταγραφής"
 Basic.Settings.Output.DynamicBitrate="Δυναμική αλλαγή ρυθμός μετάδοσης bit για τη διαχείρηση της συμφόρησης"
 Basic.Settings.Output.DynamicBitrate.Beta="Δυναμική αλλαγή ρυθμός μετάδοσης bit για τη διαχείρηση της συμφόρησης(Δοκιμαστική Έκδοση)"
 Basic.Settings.Output.DynamicBitrate.TT="Αντί να ρίχνει καρέ για να μειώσει τη συμφόρηση, αλλάζει δυναμικά bitrate στη μύγα.\n\nΣημειώστε ότι αυτό μπορεί να αυξήσει την καθυστέρηση στους θεατές αν υπάρχει σημαντική ξαφνική συμφόρηση.\nΌταν τα bitrate πέφτουν, μπορεί να χρειαστούν έως και λίγα λεπτά για να επαναφέρετε.\n\nΠρος το παρόν υποστηρίζεται μόνο για RTMP."
@@ -766,26 +787,31 @@
 Basic.Settings.Output.Simple.Warn.VideoBitrate="Προειδοποίηση: Το bitrate βίντεο ροής θα οριστεί σε %1, το οποίο είναι το ανώτερο όριο για την τρέχουσα υπηρεσία μετάδοσης."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Προειδοποίηση: Το bitrate ήχου ροής θα οριστεί σε %1, το οποίο είναι το ανώτερο όριο για την τρέχουσα υπηρεσία ροής."
 Basic.Settings.Output.Simple.Warn.CannotPause="Προειδοποίηση: Δε μπορείτε να σταματήσετε την καταγραφή εάν η ποιότητα εγγραφής έχει οριστεί σε \"Ίδιο με τη ροή\"."
+Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Προειδοποίηση: Η τρέχουσα επιλεγμένη μορφή καταγραφής είναι ασύμβατη με τον επιλεγμένο κωδικοποιητή ροής."
 Basic.Settings.Output.Simple.Warn.Encoder="Προειδοποίηση: Η καταγραφή με χρήση κωδικοποιητή λογισμικού σε διαφορετική ποιότητα από την ροή θα απαιτήσει πρόσθετη χρήση της CPU, αν πραγματοποιήσετε ταυτόχρονα μετάδοση ροής και καταγραφή."
-Basic.Settings.Output.Simple.Warn.Lossless="Προειδοποίηση: Η ποιότητα χωρίς απώλειες αυξάνει πολύ το μέγεθος των αρχείων! Η ποιότητα χωρίς απώλειες ποιότητας θα καταλάβει 7 gigabyte χώρο στον σκληρό δίσκο ανά λεπτό, σε υψηλές αναλύσεις και ρυθμό καρέ. Η επιλογή χωρίς απώλειες δεν συνιστάται για μεγάλες σε διάρκεια καταγραφές, εκτός και αν έχετε πολύ ελεύθερο χώρο διαθέσιμο στο σκληρό σας δίσκο."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Είστε σίγουρος ότι θέλετε να χρησιμοποιήσετε την επιλογή ποιότητα χωρίς απώλειες;"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Προειδοποίηση ποιότητας χωρίς απώλειες!"
 Basic.Settings.Output.Simple.Encoder.Software="Λογισμικό (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Υλικό (QSV, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Υλικό (QSV, AV1)"
 Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Υλικό (AMD, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.AMD.HEVC="Υλικό (AMD, HEVC)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.AV1="Υλικό (AMD, AV1)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.H264="Υλικό (NVENC, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Υλικό (NVENC, AV1)"
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Υλικό (NVENC, HEVC)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Υλικό (Apple, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Υλικό (Apple, HEVC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Λογισμικό (προεπιλογή x264 χαμηλής χρήσης CPU, αυξάνει το μέγεθος αρχείου)"
+Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Προεπιλογή)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Το Twitch Vod Track (Χρησιμοποιεί Track 2)"
+Basic.Settings.Output.Simple.RecAudioTrack="Κομμάτι Ήχου"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Μη Συμβατή Ανάλυση/Πλαίσιο"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Αυτή η υπηρεσία ροής δεν υποστηρίζει την τρέχουσα ανάλυση εξόδου και/ή framerate. Θα αλλάξουν στην πλησιέστερη συμβατή τιμή:\n\n%1\n\nΘέλετε να συνεχίσετε?"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Ανάλυση: %1"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="Μη Συμβατός Κωδικοποιητής"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="Η υπηρεσία ροής \"%1\" δεν υποστηρίζει τον κωδικοποιητή \"%2\". Ο κωδικοποιητής θα αλλάξει σε \"%3\".\n\nΘέλετε να συνεχίσετε;"
+Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="Η υπηρεσία ροής \"%1\" δεν υποστηρίζει τους κωδικοποιητές \"%2\" και \"%3\". Αυτοί οι κωδικοποιητές θα αλλάξουν σε \"%4\" και \"%5\".\n\nΘέλετε να συνεχίσετε;"
 Basic.Settings.Output.VideoBitrate="Ρυθμός Μετάδοσης Bit του Βίντεο"
 Basic.Settings.Output.AudioBitrate="Ρυθμός Μετάδοσης Bit του Ήχου"
 Basic.Settings.Output.Reconnect="Αυτόματη Επανασύνδεση"
@@ -853,6 +879,31 @@
 Screenshot.Preview="Στιγμιότυπο οθόνης(Preview)"
 Screenshot.Scene="Στιγμιότυπο οθόνης(Scene)"
 Screenshot.Source="Στιγμιότυπο οθόνης(Source)"
+FilenameFormatting.TT.CCYY="Έτος, τέσσερα ψηφία"
+FilenameFormatting.TT.YY="Έτος, τελευταία δύο ψηφία (00-99)"
+FilenameFormatting.TT.MM="Μήνας ως δεκαδικό νούμερο (01-12)"
+FilenameFormatting.TT.DD="Ημέρα του μήνα, με μηδέν (01-31)"
+FilenameFormatting.TT.hh="Ώρα σε 24ωρη μορφή (00-23)"
+FilenameFormatting.TT.mm="Λεπτό (00-59)"
+FilenameFormatting.TT.ss="Δευτερόλεπτο (00-59)"
+FilenameFormatting.TT.Percent="Ένα σύμβολο %"
+FilenameFormatting.TT.a="Συντομευμένο όνομα ημέρας"
+FilenameFormatting.TT.A="Πλήρες όνομα ημέρας"
+FilenameFormatting.TT.b="Συντομευμένο όνομα μήνα"
+FilenameFormatting.TT.B="Πλήρες όνομα μήνα"
+FilenameFormatting.TT.d="Ημέρα του μήνα, με μηδέν (01-31)"
+FilenameFormatting.TT.H="Ώρα σε 24ωρη μορφή (00-23)"
+FilenameFormatting.TT.I="Ώρα σε 12ωρη μορφή (01-12)"
+FilenameFormatting.TT.m="Μήνας ως δεκαδικό νούμερο (01-12)"
+FilenameFormatting.TT.M="Λεπτό (00-59)"
+FilenameFormatting.TT.p="Προσδιορισμός ΠΜ ή ΜΜ"
+FilenameFormatting.TT.s="Χρόνος σε δευτερόλεπτα από το UNIX epoch"
+FilenameFormatting.TT.S="Δευτερόλεπτο (00-59)"
+FilenameFormatting.TT.y="Έτος, τελευταία δύο ψηφία (00-99)"
+FilenameFormatting.TT.Y="Έτος"
+FilenameFormatting.TT.Z="Ζώνη ώρας με όνομα ή συντομογραφία"
+FilenameFormatting.TT.FPS="Καρέ ανά δευτερόλεπτο"
+FilenameFormatting.TT.VF="Μορφή βίντεο"
 Basic.Settings.Video="Βίντεο"
 Basic.Settings.Video.Adapter="Προσαρμογέας Βίντεο"
 Basic.Settings.Video.BaseResolution="Ανάλυση Βάσης (Καμβάς)"
@@ -882,8 +933,8 @@
 Basic.Settings.Audio.PeakMeterType="Τύπος Μέτρησης Αιχμής"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Δείγμα Αιχμής"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Πραγματική Αιχμή (Υψηλότερη χρήση της CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Προειδοποίηση: Ο ήχος Surround είναι ενεργοποιημένος."
-Basic.Settings.Audio.MultichannelWarning="Κατά τη ροή, ελέγξτε αν η υπηρεσία ροής υποστηρίζει ήχο surround και ήχο surround αναπαραγωγής. Το Facebook 360 Live, το Mixer RTMP καί το Smashcast αποτελούν παραδείγματα όπου ο surround ήχος υποστηρίζεται πλήρως. Αν και το Facebook Live και το YouTube Live αποδέχονται τον ήχο surround, το Facebook Live τον υποβιβάζει σε stereo, και το YouTube Live παίζει μόνο σε δύο κανάλια.\n\nΤα φίλτρα ήχου του OBS είναι συμβατά με ήχο surround, αν καί δεν είναι εγγυημένη η υποστήριξη για plugins VST."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Προειδοποίηση: Ο ήχος Surround είναι ενεργοποιημένος."
+Basic.Settings.Audio.MultichannelWarning="Σε περίπτωση ροής, ελέγξτε εάν η υπηρεσία ροής σας υποστηρίζει τόσο την απορρόφηση ήχου surround όσο και την αναπαραγωγή ήχου surround. Για παράδειγμα, το Facebook 360 Live υποστηρίζει πλήρως ήχο surround. Το YouTube Live υποστηρίζει λήψη ήχου 5.1 (και αναπαραγωγή σε τηλεοράσεις).\n\nΤα φίλτρα ήχου OBS είναι συμβατά με ήχο surround, αν και η υποστήριξη της προσθήκης VST δεν είναι εγγυημένη."
 Basic.Settings.Audio.MultichannelWarning.Title="Ενεργοποίηση ήχου surround;"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Είστε βέβαιοι ότι θέλετε να ενεργοποιήσετε τον ήχο surround;"
 Basic.Settings.Audio.Devices="Παγκόσμιες συσκευές ήχου"
@@ -908,8 +959,10 @@
 Basic.Settings.Accessibility.ColorOverrides.MixerGreenActive="Μπάντα έντασης μίκτη (-60 to -20dB) (ενεργή)"
 Basic.Settings.Accessibility.ColorOverrides.MixerYellowActive="Μπάντα έντασης μίκτη (-20 to -9dB) (ενεργή)"
 Basic.Settings.Accessibility.ColorOverrides.MixerRedActive="Μπάντα έντασης μίκτη (-9 to 0dB) (ενεργή)"
+Basic.Settings.Accessibility.ColorOverrides.Preset="Προεπιλογές Χρώματος"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Default="Προεπιλογή"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="Προσαρμοσμένη"
+Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="Εναλλακτική Αχρωματοψίας"
 Basic.Settings.Advanced="Για Προχωρημένους"
 Basic.Settings.Advanced.General.ConfirmOnExit="Εμφάνιση προειδοποίησης ενεργών εξόδων κατά την έξοδο"
 Basic.Settings.Advanced.General.ProcessPriority="Προτεραιότητα Διαδικασίας"
@@ -919,7 +972,8 @@
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Κάτω από την Κανονική"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Σε αδράνεια"
 Basic.Settings.Advanced.FormatWarning="Προειδοποίηση: Οι μορφές χρωμάτων εκτός των NV12/P010 προορίζονται κυρίως για καταγραφή, και δεν συνιστώνται κατά τη ροή.Η ροή μπορεί να προκαλέσει αυξημένη χρήση CPU λόγω μετατροπής μορφής χρώματος."
-Basic.Settings.Advanced.Audio.BufferingTime="Χρόνος Προσωρινής Μνήμης Ήχου"
+Basic.Settings.Advanced.FormatWarningPreciseSdr="Προειδοποίηση: οι μορφές υψηλής ακρίβειας χρησιμοποιούνται πιο συχνά με χρωματικούς χώρους HDR."
+Basic.Settings.Advanced.FormatWarning2100="Προειδοποίηση: το Rec. 2100 πρέπει να χρησιμοποιεί μορφή με περισσότερη ακρίβεια."
 Basic.Settings.Advanced.Video.ColorFormat="Μορφή Χρώματος"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 επίπεδα)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 επίπεδα)"
@@ -988,8 +1042,18 @@
 SceneItemShow="Εμφάνιση '%1'"
 SceneItemHide="Απόκρυψη '%1'"
 OutputWarnings.NoTracksSelected="Πρέπει να επιλέξετε τουλάχιστον ένα κομμάτι"
+OutputWarnings.NoTracksSelectedOnExit.Title="Σφάλμα Ρυθμίσεων Εξόδου"
+OutputWarnings.NoTracksSelectedOnExit.Text="Όλες οι έξοδοι πρέπει να έχουν τουλάχιστον ένα κομμάτι ήχου επιλεγμένο."
 OutputWarnings.MP4Recording="Προειδοποίηση: Οι καταγραφές που έχουν αποθηκευτεί σε MP4 δε θα μπορούν να ανακτηθούν αν το αρχείο δεν είναι δυνατόν να ολοκληρωθεί (π.χ. λόγω BSODs, απώλεια ισχύος, κλπ.). Αν θέλετε να καταγράψετε πολλαπλά κομμάτια ήχου χρησιμοποιήστε το MKV και μετατροπή καταγραφής για mp4, αφού ολοκληρωθεί (αρχείο-> Μετατροπή Καταγραφών)"
 OutputWarnings.CannotPause="Προειδοποίηση: Οι καταγραφές δεν μπορούν να γίνουν παύση άμα ο κωδικοποιητής εγγραφής έχει οριστεί \"(Χρησιμοποιήστε κωδικοποιητή ροής)\""
+OutputWarnings.CodecIncompatible="Έγινε επαναφορά της επιλογής κωδικοποιητή ήχου ή βίντεο λόγω ασυμβατότητας. Παρακαλώ επιλέξτε έναν συμβατό κωδικοποιητή από τη λίστα."
+CodecCompat.Incompatible="(Ασύμβατο με %1)"
+CodecCompat.CodecPlaceholder="Επιλέξτε Κωδικοποιητή..."
+CodecCompat.ContainerPlaceholder="Επιλέξτε Μορφή..."
+CodecCompat.CodecMissingOnExit.Title="Δεν Επιλέχθηκε Κωδικοποιητής"
+CodecCompat.CodecMissingOnExit.Text="Δεν έχει οριστεί τουλάχιστον ένας κωδικοποιητής βίντεο ή ήχου. Παρακαλώ βεβαιωθείτε να επιλέξετε κωδικοποιητές για καταγραφή και ροή."
+CodecCompat.ContainerMissingOnExit.Title="Δεν Επιλέχθηκε Μορφή"
+CodecCompat.ContainerMissingOnExit.Text="Δεν επιλέχθηκε καμία μορφή καταγραφής. Παρακαλώ επιλέξτε μια μορφή καταγραφής που να είναι συμβατή με τον επιλεγμένο κωδικοποιητή ροής."
 FinalScene.Title="Διαγραφή σκηνής"
 FinalScene.Text="Πρέπει να υπάρχει τουλάχιστον μία σκηνή."
 NoSources.Title="Δεν Υπάρχουν Πηγές"
@@ -1005,6 +1069,7 @@
 About.GetInvolved="Συμμετάσχετε"
 About.Authors="Δημιουργοί"
 About.License="Άδεια"
+About.Error="Σφάλμα! Το αρχείο δεν μπορούσε να αναγνωσθεί.\n\nΠηγαίνετε στο: %1"
 About.Contribute="Υποστηρίξτε το εργο του OBS"
 AddUrl.Title="Εισάγεται Πηγή μέσω Συνδέσμου"
 AddUrl.Text="Έχετε τραβήξει ένα σύνδεσμο στο OBS. Αυτό αυτόματα θα προσπέσει τον σύνδεσμο ως πηγή. Θέλετε να συνεχίσετε;"
@@ -1026,14 +1091,12 @@
 LoadProfileNeedsRestart="Το προφίλ περιέχει ρυθμίσεις που απαιτούν επανεκκίνηση του OBS:\n%1\n\nΘέλετε να επανεκκινήσετε το OBS για να εφαρμοστούν αυτές οι ρυθμίσεις?"
 ContextBar.NoSelectedSource="Δεν επιλέχθηκε πηγή"
 ContextBar.ResetTransform="Επαναφορά Μετασχηματισμού"
-ContextBar.FitToCanvas="Προσαρμογή στον Καμβά"
 ContextBar.MediaControls.PlayMedia="Αναπαραγωγή Πολυμέσων"
 ContextBar.MediaControls.PauseMedia="Παύση Πολυμέσων"
 ContextBar.MediaControls.StopMedia="Διακοπή Πολυμέσων"
 ContextBar.MediaControls.RestartMedia="Επανεκκίνηση Πολυμέσων"
 ContextBar.MediaControls.PlaylistNext="Επόμενο στη Λίστα"
 ContextBar.MediaControls.PlaylistPrevious="Προηγούμενο στη Λίστα"
-ContextBar.MediaControls.MediaProperties="Ιδιότητες Πολυμέσων"
 ContextBar.MediaControls.BlindSeek="Μενού Αναζήτησης Πολυμέσων"
 YouTube.Auth.Ok="Η εξουσιοδότηση ολοκληρώθηκε επιτυχώς.\n Τώρα μπορείτε να κλείσετε αυτή τη σελίδα."
 YouTube.Auth.NoCode="Η διαδικασία εξουσιοδότησης δεν ολοκληρώθηκε."

obs-studio-29.1.3.tar.xz/UI/data/locale/en-GB.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/en-GB.ini Changed

@@ -9,6 +9,7 @@
 MixerToolbarMenu="Audio mixer menu"
 PluginsFailedToLoad.Title="Plugin load error"
 AlreadyRunning.Text="OBS is already running! Unless you meant to do this, please shut down any existing instances of OBS before trying to run a new instance. If you have OBS set to minimise to the system tray, please check to see if it's still running there."
+AutoSafeMode.LaunchNormal="Run normally"
 Wine.Text="Running OBS in Wine is unsupported, and many features, such as capture or device sources, will not work or only in limited capacity. It is recommended to run a native version of OBS instead, for example <a href='https://flathub.org/apps/details/com.obsproject.Studio'>our Flatpak version</a> or your operating system's packages."
 BrowserPanelInit.Title="Initialising Browser..."
 BrowserPanelInit.Text="Initialising browser, please wait..."
@@ -27,11 +28,10 @@
 Undo.Transform.Center="Centre to Screen in '%1'"
 Undo.Transform.VCenter="Vertical Centre to Screen in '%1'"
 Undo.Transform.HCenter="Horizontal Centre to Screen in '%1'"
-Output.StreamEncodeError.Msg.LastError="An encoding error occurred while streaming:\n\n%1"
-Output.RecordError.EncodeErrorMsg.LastError="An encoding error occurred while recording:\n\n%1"
 Output.BroadcastStartFailed="Failed to start brodcast"
 LogReturnDialog.AnalyzeURL="Analyse"
 Remux.HelpText="Drop files in this window to remux, or select an empty \"OBS Recording\" cell to browse for a file."
+Remux.NoFilesAdded="No file was added for remuxing. Drop a folder containing one or more video files."
 MissingFiles.Search="Search Folder..."
 MissingFiles.SelectFile="Select File..."
 MissingFiles.Missing="Not present"
@@ -66,10 +66,8 @@
 Basic.Settings.General.SystemTrayHideMinimize="Always minimise to system tray instead of task bar"
 Basic.Settings.General.CloseExistingProjectors="Limit to one full-screen projector per screen"
 Basic.Settings.Output.Simple.Warn.CannotPause="Warning: Recordings cannot be paused if the recording quality is set to \"Same as stream\"."
-Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 Gigabytes of disk space per minute at high resolutions and frame rates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available."
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="The streaming service \"%1\" does not support the encoder \"%2\". The encoder will be changed to \"%3\".\n\nDo you want to continue?"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="The streaming service \"%1\" does not support encoders \"%2\" and \"%3\". These encoders will be changed to \"%4\" and \"%5\".\n\nDo you want to continue?"
-Basic.Settings.Audio.MultichannelWarning="If streaming, check to see if your streaming service supports both surround sound ingest and surround sound playback. Facebook 360 Live is one example where surround sound is fully supported. Although Facebook Live and YouTube Live both accept surround ingest, Facebook Live down-mixes to stereo, and YouTube Live plays only two channels.\n\nOBS audio filters are compatible with surround sound, though VST plug-in support isn't guaranteed."
 Basic.Settings.Accessibility.ColorOverrides="Use Different Colours"
 Basic.Settings.Accessibility.ColorOverrides.Preset="Colour Preset"
 Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="Colour Blind Alternative"
@@ -93,3 +91,4 @@
 YouTube.Actions.Error.NoBroadcastCreated="Broadcast creation error '%1'. Detailed error description can be found at <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.EventCreated.Text="Event successfully created."
 YouTube.Actions.AutoStartStreamingWarning="Auto-start is disabled for this event, click \"Go Live\" to start your broadcast."
+YouTube.DocksRemoval.Text="These browser docks will be removed as deprecated:\n\n%1\nUse \"Docks/YouTube Live Control Room\" instead."

obs-studio-29.1.3.tar.xz/UI/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/en-US.ini Changed

@@ -113,6 +113,8 @@
 SourceFilters="Open Source Filters"
 MixerToolbarMenu="Audio Mixer Menu"
 SceneFilters="Open Scene Filters"
+List="List"
+Grid="Grid"
 
 # warning for plugin load failures
 PluginsFailedToLoad.Title="Plugin Load Error"
@@ -123,6 +125,15 @@
 AlreadyRunning.Text="OBS is already running! Unless you meant to do this, please shut down any existing instances of OBS before trying to run a new instance. If you have OBS set to minimize to the system tray, please check to see if it's still running there."
 AlreadyRunning.LaunchAnyway="Launch Anyway"
 
+# warning if auto Safe Mode has engaged
+AutoSafeMode.Title="Safe Mode"
+AutoSafeMode.Text="OBS did not shut down properly during your last session.\n\nWould you like to start in Safe Mode (third-party plugins, scripting, and WebSockets disabled)?"
+AutoSafeMode.LaunchSafe="Run in Safe Mode"
+AutoSafeMode.LaunchNormal="Run Normally"
+## Restart Option
+SafeMode.Restart="Do you want to restart OBS in Safe Mode (third-party plugins, scripting, and WebSockets disabled)?"
+SafeMode.RestartNormal="Do you want to restart OBS in Normal Mode?"
+
 ChromeOS.Title="Unsupported Platform"
 ChromeOS.Text="OBS appears to be running inside a ChromeOS container. This platform is unsupported."
 
@@ -206,6 +217,7 @@
 Basic.AutoConfig.StreamPage.StreamKey="Stream Key"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: enter the encryption passphrase.\nRTMP: enter the key provided by the service.\nSRT: enter the streamid if the service uses one."
 Basic.AutoConfig.StreamPage.EncoderKey="Encoder Key"
+Basic.AutoConfig.StreamPage.BearerToken="Bearer Token"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Connected account"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimate bitrate with bandwidth test (may take a few minutes)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Prefer hardware encoding"
@@ -288,6 +300,8 @@
 Basic.SceneTransitions="Scene Transitions"
 Basic.TransitionDuration="Duration"
 Basic.TogglePreviewProgramMode="Studio Mode"
+Basic.EnablePreviewProgramMode="Enable Studio Mode"
+Basic.DisablePreviewProgramMode="Disable Studio Mode"
 
 # undo
 Undo.Undo="Undo"
@@ -342,6 +356,7 @@
 TransitionNameDlg.Title="Transition Name"
 
 # title bar strings
+TitleBar.SafeMode="SAFE MODE"
 TitleBar.PortableMode="Portable Mode"
 TitleBar.Profile="Profile"
 TitleBar.Scenes="Scenes"
@@ -386,6 +401,7 @@
 Output.StartStreamFailed="Failed to start streaming"
 Output.StartRecordingFailed="Failed to start recording"
 Output.StartReplayFailed="Failed to start replay buffer"
+Output.StartVirtualCamFailed="Failed to start virtual camera"
 Output.StartFailedGeneric="Starting the output failed. Please check the log for details.\n\nNote: If you are using the NVENC or AMD encoders, make sure your video drivers are up to date."
 
 # replay buffer + pause warning message
@@ -404,7 +420,7 @@
 # output streaming-related messages
 Output.StreamEncodeError.Title="Encoding error"
 Output.StreamEncodeError.Msg="An encoder error occurred while streaming."
-Output.StreamEncodeError.Msg.LastError="An encoder error occurred while streaming:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="An encoder error occurred while streaming: %1"
 
 # output recording-related messages
 Output.RecordFail.Title="Failed to start recording"
@@ -414,7 +430,7 @@
 Output.RecordError.Title="Recording error"
 Output.RecordError.Msg="An unspecified error occurred while recording."
 Output.RecordError.EncodeErrorMsg="An encoder error occurred while recording."
-Output.RecordError.EncodeErrorMsg.LastError="An encoder error occurred while recording:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="An encoder error occurred while recording: %1"
 
 # output recording messages
 Output.BadPath.Title="Bad File Path"
@@ -478,6 +494,7 @@
 MissingFiles.NoMissing.Text="No files appear to be missing."
 
 # macOS permissions dialog
+MacPermissions.MenuAction="Review App Permissions..."
 MacPermissions.Title="Review App Permissions"
 MacPermissions.Description="OBS Studio requires your permission to be able to provide certain features. It is recommended to enable these permissions, but they are not required to use the app. You can always enable them later."
 MacPermissions.Description.OpenDialog="You can re-open this dialog via the OBS Studio menu."
@@ -607,6 +624,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (autoselect: %2)"
 Basic.PropertiesWindow.SelectColor="Select color"
 Basic.PropertiesWindow.SelectFont="Select font"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Pick a Font"
 Basic.PropertiesWindow.ConfirmTitle="Settings Changed"
 Basic.PropertiesWindow.Confirm="There are unsaved changes. Do you want to keep them?"
 Basic.PropertiesWindow.NoProperties="No properties available"
@@ -736,9 +754,9 @@
 Basic.VCam.VirtualCamera="Virtual Camera"
 Basic.VCam.OutputType="Output Type"
 Basic.VCam.OutputSelection="Output Selection"
-Basic.VCam.Internal="Internal"
-Basic.VCam.InternalDefault="Program Output (Default)"
-Basic.VCam.InternalPreview="Preview Output"
+Basic.VCam.OutputType.Program="Program (Default)"
+Basic.VCam.OutputSelection.NoSelection="No selection for this output type"
+Basic.VCam.RestartWarning="The virtual camera will be restarted to apply this change"
 
 # basic mode file menu
 Basic.MainMenu.File="&File"
@@ -786,19 +804,21 @@
 # basic mode view menu
 Basic.MainMenu.View="&View"
 Basic.MainMenu.View.Toolbars="&Toolbars"
-Basic.MainMenu.View.ListboxToolbars="Scene/Source List Buttons"
+Basic.MainMenu.View.ListboxToolbars="Dock Toolbars"
 Basic.MainMenu.View.ContextBar="Source Toolbar"
 Basic.MainMenu.View.SourceIcons="Source &Icons"
 Basic.MainMenu.View.StatusBar="&Status Bar"
 Basic.MainMenu.View.Fullscreen.Interface="Fullscreen Interface"
 Basic.MainMenu.View.ResetUI="&Reset UI"
 Basic.MainMenu.View.AlwaysOnTop="&Always On Top"
+Basic.MainMenu.View.SceneListMode="Scene List Mode"
 
 
 #basic mode docks menu
 Basic.MainMenu.Docks="&Docks"
 Basic.MainMenu.Docks.ResetDocks="&Reset Docks"
 Basic.MainMenu.Docks.LockDocks="&Lock Docks"
+Basic.MainMenu.Docks.SideDocks="&Full-Height Docks"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Custom Browser Docks..."
 
 # basic mode profile/scene collection menus
@@ -824,8 +844,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload &Current Log File"
 Basic.MainMenu.Help.Logs.UploadLastLog="Upload &Previous Log File"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&View Current Log"
+Basic.MainMenu.Help.ReleaseNotes="Release Notes"
 Basic.MainMenu.Help.CheckForUpdates="Check For Updates"
 Basic.MainMenu.Help.Repair="Check File Integrity"
+Basic.MainMenu.Help.RestartSafeMode="Restart in Safe Mode"
+Basic.MainMenu.Help.RestartNormal="Restart in Normal Mode"
 Basic.MainMenu.Help.CrashLogs="Crash &Reports"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="&Show Crash Reports"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Upload &Previous Crash Report"
@@ -1141,7 +1164,7 @@
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Sample Peak"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Higher CPU usage)"
 Basic.Settings.Audio.MultichannelWarning.Enabled="WARNING: Surround sound audio is enabled."
-Basic.Settings.Audio.MultichannelWarning="If streaming, check to see if your streaming service supports both surround sound ingest and surround sound playback. Facebook 360 Live is one example where surround sound is fully supported. Although Facebook Live and YouTube Live both accept surround ingest, Facebook Live downmixes to stereo, and YouTube Live plays only two channels.\n\nOBS audio filters are compatible with surround sound, though VST plugin support isn't guaranteed."
+Basic.Settings.Audio.MultichannelWarning="If streaming, check to see if your streaming service supports both surround sound ingest and surround sound playback. For instance, Facebook 360 Live fully supports surround sound; YouTube Live supports 5.1 audio ingest (and playback on TVs).\n\nOBS audio filters are compatible with surround sound, though VST plugin support isn't guaranteed."
 Basic.Settings.Audio.MultichannelWarning.Title="Enable surround sound audio?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Are you sure you want to enable surround sound audio?"
 Basic.Settings.Audio.Devices="Global Audio Devices"
@@ -1222,6 +1245,7 @@
 Basic.Settings.Advanced.Network="Network"
 Basic.Settings.Advanced.Network.Disabled="The currently selected streaming protocol does not support changing network settings."
 Basic.Settings.Advanced.Network.BindToIP="Bind to IP"
+Basic.Settings.Advanced.Network.IPFamily="IP Family"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Enable network optimizations"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Enable TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Attempts to make RTMP output friendlier to other latency sensitive applications on the network by regulating the rate of transmission.\nIt may increase the risk of dropped frames on unstable connections."
@@ -1504,3 +1528,6 @@
 YouTube.Errors.liveChatEnded="Live stream has ended."
 YouTube.Errors.messageTextInvalid="The message text is not valid."
 YouTube.Errors.rateLimitExceeded="You are sending messages too quickly."
+# Browser Dock
+YouTube.DocksRemoval.Title="Clear Legacy YouTube Browser Docks"
+YouTube.DocksRemoval.Text="These browser docks will be removed as deprecated:\n\n%1\nUse \"Docks/YouTube Live Control Room\" instead."

obs-studio-29.1.3.tar.xz/UI/data/locale/eo-UY.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/eo-UY.ini Changed

@@ -71,6 +71,7 @@
 Next="Sekve"
 Back="Antaŭe"
 Defaults="Defaŭltoj"
+RestoreDefaults="Defaŭltoj"
 HideMixer="Malkaŝi en miksilo"
 TransitionOverride="Devigi transpason"
 ShowTransition="Montri transpason"
@@ -92,7 +93,6 @@
 LogViewer="Vidilo de protokoloj"
 ShowOnStartup="Montri je lanĉo"
 OpenFile="Malfermi dosieron"
-AddValue="Aldoni %1"
 AlreadyRunning.Title="OBS jam ruliĝas"
 AlreadyRunning.Text="OBS estas jam ruliĝanta! Krom se vi intencis fari tion, bonvolu fermi ajnajn ekzistantajn aperojn de OBS antaŭ ol provi ruli novan. Se vi agordis OBS por plejetiĝi al la taskopleto, bonvolu kontroli ĉu ĝi ankoraŭ ruliĝas tie."
 AlreadyRunning.LaunchAnyway="Lanĉi ĉiuokaze"
@@ -161,7 +161,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Laŭmenda..."
 Basic.AutoConfig.StreamPage.Server="Servilo"
 Basic.AutoConfig.StreamPage.StreamKey="Elsend-ŝlosilo"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(ligilo)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kodila kodo"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Konektita konto"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Taksi bitrapidon per kapacita testo (eble necesos kelkaj minutoj)"
@@ -213,13 +212,9 @@
 Updater.UpdateNow="Ĝisdatigu Nun"
 Updater.RemindMeLater="Rememorigi al mi Poste"
 Updater.Skip="Preterpasi Version"
-Updater.Running.Title="Programaro aktuale aktiva"
-Updater.Running.Text="Eligoj estas aktuale aktivaj, bonvolu fermi ajnajn aktivajn eligojn antaŭ ol provi ĝisdatigi"
 Updater.NoUpdatesAvailable.Title="Neniuj ĝisdatigoj disponeblas"
 Updater.NoUpdatesAvailable.Text="Neniuj ĝisdatigoj estas nuntempe disponeblaj"
 Updater.FailedToLaunch="Malsukcesis lanĉi ĝisdatigilon"
-Updater.GameCaptureActive.Title="Ludkaptado aktiva"
-Updater.GameCaptureActive.Text="La ludkapta hok-biblioteko estas aktuale uzata. Bonvolu fermi ajnajn ludojn/programarojn kaptatajn (aŭ restartigu Windows) kaj reprovu."
 QuickTransitions.DuplicateScene="Duobligi scenon"
 QuickTransitions.EditProperties="Duobligi fontojn"
 QuickTransitions.HotkeyName="Rapida transpaso: %1"

obs-studio-29.1.3.tar.xz/UI/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/es-ES.ini Changed

@@ -93,7 +93,6 @@
 LogViewer="Visor de registros"
 ShowOnStartup="Mostrar al inicio"
 OpenFile="Abrir archivo"
-AddValue="Agregar %1"
 AddSource="Añadir fuente"
 RemoveScene="Eliminar escena seleccionada"
 RemoveSource="Eliminar fuente(s) seleccionada(s)"
@@ -105,11 +104,19 @@
 SourceFilters="Abrir filtros de la fuente"
 MixerToolbarMenu="Menú del mezclador de audio"
 SceneFilters="Abrir filtros de la escena"
+List="Lista"
+Grid="Cuadrícula"
 PluginsFailedToLoad.Title="Error al cargar el plugin"
 PluginsFailedToLoad.Text="No se han podido cargar los siguientes plugins de OBS:\n\n%1\nPor favor, actualice o elimine estos plugins."
 AlreadyRunning.Title="OBS ya se está ejecutando"
 AlreadyRunning.Text="¡OBS ya se está ejecutando! A no ser que quieras hacer esto, por favor, cierra todas las ventanas de OBS antes de intentar iniciar una nueva. Si tienes configurado OBS para que se minimice a la barra de tareas, comprueba si sigue ejecutándose ahí."
 AlreadyRunning.LaunchAnyway="Lanzar de todas maneras"
+AutoSafeMode.Title="Modo seguro"
+AutoSafeMode.Text="OBS no se cerró correctamente durante la última sesión.\n\n¿Quieres iniciar en modo seguro (plugins de terceros, scripts y websockets deshabilitados)?"
+AutoSafeMode.LaunchSafe="Ejecutar en modo seguro"
+AutoSafeMode.LaunchNormal="Ejecutar normalmente"
+SafeMode.Restart="¿Quieres reiniciar OBS en modo seguro (plugins de terceros, scripts y websockets deshabilitados)?"
+SafeMode.RestartNormal="¿Quieres reiniciar OBS en modo normal?"
 ChromeOS.Title="Plataforma no soportada"
 ChromeOS.Text="OBS parece estar ejecutándose dentro de un contenedor ChromeOS. Esta plataforma no está soportada."
 Wine.Title="Se ha detectado Wine"
@@ -175,8 +182,8 @@
 Basic.AutoConfig.StreamPage.Server="Servidor"
 Basic.AutoConfig.StreamPage.StreamKey="Clave de retransmisión"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: introduzca la contraseña del cifrado.\nRTMP: introduzca la clave proporcionada por el servicio.\nSRT: introduzca el identificador de emisión si el servicio usa uno."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Enlace)"
 Basic.AutoConfig.StreamPage.EncoderKey="Clave del codificador"
+Basic.AutoConfig.StreamPage.BearerToken="Token del portador"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Cuenta conectada"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimar bitrate con una prueba de ancho de banda (puede tardar unos minutos)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferir codificación por hardware"
@@ -227,8 +234,6 @@
 Updater.UpdateNow="Actualizar ahora"
 Updater.RemindMeLater="Recordármelo más tarde"
 Updater.Skip="Saltar versión"
-Updater.Running.Title="Programa actualmente activo"
-Updater.Running.Text="Las salidas están activas actualmente, por favor apague cualquier salida activa antes de intentar actualizar"
 Updater.NoUpdatesAvailable.Title="No hay actualizaciones disponibles"
 Updater.NoUpdatesAvailable.Text="No hay actualizaciones disponibles actualmente"
 Updater.BranchNotFound.Title="Canal de actualización eliminado"
@@ -238,8 +243,6 @@
 Updater.RepairConfirm.Title="Confirmar verificación de integridad"
 Updater.RepairConfirm.Text="Al iniciar la comprobación de integridad se escaneará la instalación de OBS para detectar archivos corruptos/modificados y descargarlos de nuevo. Esto puede llevar un tiempo.\n\n¿Desea continuar?"
 Updater.FailedToLaunch="No se pudo iniciar el actualizador"
-Updater.GameCaptureActive.Title="Captura de juego activa"
-Updater.GameCaptureActive.Text="La biblioteca de captura de juegos está actualmente en uso. Cierre los juegos o programas que se capturan (o reinicie Windows) e inténtelo de nuevo."
 QuickTransitions.SwapScenes="Intercambiar vista previa/Escenas del programa después de la transición"
 QuickTransitions.SwapScenesTT="Intercambia la vista previa y las escenas del programa después de la transición (si la escena original del programa continúa existiendo).\nEsto no deshará ningún cambio que se haya realizado a la escena original del programa."
 QuickTransitions.DuplicateScene="Duplicar escena"
@@ -253,6 +256,8 @@
 Basic.SceneTransitions="Transiciones de escena"
 Basic.TransitionDuration="Duración"
 Basic.TogglePreviewProgramMode="Modo Estudio"
+Basic.EnablePreviewProgramMode="Habilitar modo estudio"
+Basic.DisablePreviewProgramMode="Deshabilitar modo estudio"
 Undo.Undo="Deshacer"
 Undo.Redo="Rehacer"
 Undo.Add="Agregar '%1'"
@@ -301,6 +306,8 @@
 Undo.GroupItems="Agrupar elementos en '%1'"
 TransitionNameDlg.Text="Por favor, introduzca el nombre de la transición"
 TransitionNameDlg.Title="Nombre de la transición"
+TitleBar.SafeMode="MODO SEGURO"
+TitleBar.PortableMode="Modo portable"
 TitleBar.Profile="Perfíl"
 TitleBar.Scenes="Escenas"
 NameExists.Title="Ese nombre ya existe"
@@ -325,6 +332,7 @@
 Output.StartStreamFailed="No se pudo iniciar la emisión"
 Output.StartRecordingFailed="No se pudo iniciar grabación"
 Output.StartReplayFailed="No se pudo iniciar el búfer de repetición"
+Output.StartVirtualCamFailed="Error al iniciar la cámara virtual"
 Output.StartFailedGeneric="No se pudo iniciar la salida. Por favor comprueba el registro para más detalles.\n\nNota: Si estás usando los codificadores NVENC o AMD, asegúrate de que tus drivers de vídeo están actualizados."
 Output.ReplayBuffer.PauseWarning.Title="No se pueden guardar repeticiones mientras está pausado"
 Output.ReplayBuffer.PauseWarning.Text="Advertencia: No se pueden guardar repeticiones mientras la grabación está pausada."
@@ -337,7 +345,7 @@
 Output.ConnectFail.Disconnected="Desconectado del servidor."
 Output.StreamEncodeError.Title="Error de codificación"
 Output.StreamEncodeError.Msg="Un error de codificación se produjo durante el Streaming."
-Output.StreamEncodeError.Msg.LastError="Un error de codificación se produjo durante la transmisión:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Se produjo un error del codificador durante la transmisión: %1"
 Output.RecordFail.Title="No se pudo iniciar grabación"
 Output.RecordFail.Unsupported="El formato de salida no está soportado o no soporta más de una pista de audio. Por favor, comprueba tus ajustes e inténtalo de nuevo."
 Output.RecordNoSpace.Title="No hay suficiente espacio en disco"
@@ -345,7 +353,7 @@
 Output.RecordError.Title="Error en la grabación"
 Output.RecordError.Msg="Se ha producido un error no especificado durante la grabación."
 Output.RecordError.EncodeErrorMsg="Un error de codificación se produjo mientras se grababa."
-Output.RecordError.EncodeErrorMsg.LastError="Un error de codificación se produjo durante la grabación:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Se produjo un error del codificador durante la grabación: %1"
 Output.BadPath.Title="Ruta de archivo incorrecta"
 Output.BadPath.Text="No se pudo abrir la ruta de grabación configurada. Por favor, comprueba la ruta de grabación en Ajustes → Salida → Grabación."
 Output.NoBroadcast.Title="Ninguna emisión configurada"
@@ -375,6 +383,8 @@
 Remux.ExitUnfinishedTitle="Conversión en curso"
 Remux.ExitUnfinished="La conversión no ha finalizado, detenerla ahora puede inutilizar el archivo de destino.\n¿Estás seguro de querer parar la conversión?"
 Remux.HelpText="Suelta los archivos en esta ventana para convertirlos, o selecciona una celda vacía \"OBS Recording\" para buscar un archivo."
+Remux.NoFilesAddedTitle="No se ha añadido ningún archivo para convertir"
+Remux.NoFilesAdded="No se ha añadido ningún archivo para convertir. Arrastra una carpeta que contenga uno o más archivos de video."
 MissingFiles="Archivos no encontrados"
 MissingFiles.MissingFile="Archivo perdido"
 MissingFiles.NewFile="Nuevo archivo"
@@ -393,7 +403,8 @@
 MissingFiles.AutoSearchText="OBS ha encontrado coincidencias adicionales para archivos perdidos en ese directorio. ¿Quieres añadirlos?"
 MissingFiles.NoMissing.Title="Comprobación de archivos faltantes"
 MissingFiles.NoMissing.Text="No parece que falte ningún archivo."
-MacPermissions.Title="Revisar los permisos de la aplicación"
+MacPermissions.MenuAction="Revisar los permisos de la aplicación..."
+MacPermissions.Title="Revisión de permisos de la aplicación"
 MacPermissions.Description="OBS Studio requiere su permiso para proporcionar ciertas características. Se recomienda activar estos permisos, pero no son necesarios para usar la aplicación. Siempre puedes activarlos más tarde."
 MacPermissions.Description.OpenDialog="Puede volver a abrir este diálogo a través del menú de OBS Studio."
 MacPermissions.AccessGranted="Acceso autorizado"
@@ -408,8 +419,8 @@
 MacPermissions.Item.Accessibility="Accesibilidad"
 MacPermissions.Item.Accessibility.Details="Para que los atajos de teclado (teclas directas) funcionen mientras que otras aplicaciones estén en primer plano, por favor habilite este permiso."
 MacPermissions.Continue="Continuar"
-UpdateAvailable="Nueva actualización disponible"
-UpdateAvailable.Text="Versión %1.%2.%3 disponible. <a href='%4'> Haga clic aquí para descargarla</a>"
+SourceLeak.Title="Error al liberar la fuente"
+SourceLeak.Text="Hubo un problema al cambiar las colecciones de escenas y algunas fuentes no se han podido liberar. Este problema generalmente está causado por plugins que no han liberado los recursos correctamente. Asegúrate de que los plugins que estes usando estén actualizados.\n\nOBS Studio se cerrará ahora para evitar cualquier posible corrupción de datos."
 Basic.DesktopDevice1="Audio del escritorio"
 Basic.DesktopDevice2="Audio del escritorio 2"
 Basic.Scene="Escena"
@@ -466,6 +477,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (seleccionar: %2)"
 Basic.PropertiesWindow.SelectColor="Seleccionar color"
 Basic.PropertiesWindow.SelectFont="Elija fuente"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Elige una fuente"
 Basic.PropertiesWindow.ConfirmTitle="Configuración cambiada"
 Basic.PropertiesWindow.Confirm="Hay cambios sin guardar. ¿Deseas conservarlos?"
 Basic.PropertiesWindow.NoProperties="No hay propiedades disponibles"
@@ -575,9 +587,9 @@
 Basic.VCam.VirtualCamera="Cámara virtual"
 Basic.VCam.OutputType="Tipo de salida"
 Basic.VCam.OutputSelection="Selección de salida"
-Basic.VCam.Internal="Interno"
-Basic.VCam.InternalDefault="Salida de programa (por defecto)"
-Basic.VCam.InternalPreview="Salida de vista previa"
+Basic.VCam.OutputType.Program="Programa (Por Defecto)"
+Basic.VCam.OutputSelection.NoSelection="Ninguna selección para este tipo de salida"
+Basic.VCam.RestartWarning="La cámara virtual se reiniciará para aplicar este cambio"
 Basic.MainMenu.File="Archivo (&F)"
 Basic.MainMenu.File.Export="&Exportar"
 Basic.MainMenu.File.Import="&Importar"
@@ -619,17 +631,18 @@
 Basic.MainMenu.Edit.AdvAudio="Propiedades de &audio avanzadas"
 Basic.MainMenu.View="&Vista"
 Basic.MainMenu.View.Toolbars="Barra de Herramien&tas"
-Basic.MainMenu.View.ListboxToolbars="Botones de la lista de escenas/fuentes"
+Basic.MainMenu.View.ListboxToolbars="Barra de herramientas de paneles"
 Basic.MainMenu.View.ContextBar="Barra de herramientas de fuente"
-Basic.MainMenu.View.SceneTransitions="Transi&ción de Escenas"
 Basic.MainMenu.View.SourceIcons="&Iconos de fuentes"
 Basic.MainMenu.View.StatusBar="Barra de e&stado"
 Basic.MainMenu.View.Fullscreen.Interface="Pantalla completa"
 Basic.MainMenu.View.ResetUI="&Restablecer la interfaz de usuario"
 Basic.MainMenu.View.AlwaysOnTop="Siempre en primer pl&ano"
+Basic.MainMenu.View.SceneListMode="Modo lista de escenas"
 Basic.MainMenu.Docks="Paneles (&D)"
 Basic.MainMenu.Docks.ResetDocks="&Restablecer paneles"
 Basic.MainMenu.Docks.LockDocks="&Bloquear paneles"
+Basic.MainMenu.Docks.SideDocks="Paneles a altura completa (&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="Paneles de navegador personalizados... (&C)"
 Basic.MainMenu.SceneCollection="Colección de E&scenas"
 Basic.MainMenu.Profile="&Perfil"
@@ -638,7 +651,6 @@
 Basic.MainMenu.SceneCollection.Import="Importar colección de escenas"
 Basic.MainMenu.SceneCollection.Export="Exportar colección de escenas"
 Basic.MainMenu.Profile.Exists="El perfil ya existe"
-Basic.MainMenu.SceneCollection.Exists="La colección de escenas ya existe"
 Basic.MainMenu.Tools="Herramien&tas"
 Basic.MainMenu.Help="Ayuda (&H)"
 Basic.MainMenu.Help.HelpPortal="Ayuda (&P)"
@@ -650,8 +662,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Cargar el archivo de registro actual"
 Basic.MainMenu.Help.Logs.UploadLastLog="Cargar el archivo de registro anterior (&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ver registro actual"
+Basic.MainMenu.Help.ReleaseNotes="Notas de la versión"
 Basic.MainMenu.Help.CheckForUpdates="Comprobar actualizaciones"
 Basic.MainMenu.Help.Repair="Comprobar integridad de los archivos"
+Basic.MainMenu.Help.RestartSafeMode="Reiniciar en modo seguro"
+Basic.MainMenu.Help.RestartNormal="Reiniciar en modo normal"
 Basic.MainMenu.Help.CrashLogs="Informes de e&rror"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Mo&strar informes de error"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Cargar el informe de error anterior (&P)"
@@ -720,7 +735,6 @@
 Basic.Settings.General.ChannelName.beta="Betas / Candidatos a lanzamiento"
 Basic.Settings.General.ChannelDescription.beta="Versiones pre-lanzamiento potencialmente inestables"
 Basic.Settings.Stream="Emisión"
-Basic.Settings.Stream.StreamType="Tipo de Emisión"
 Basic.Settings.Stream.Custom.UseAuthentication="Usar la autentificación"
 Basic.Settings.Stream.Custom.Username="Nombre de usuario"
 Basic.Settings.Stream.Custom.Password="Contraseña"
@@ -752,7 +766,6 @@
 Basic.Settings.Output.Encoder.Video="Codificador de vídeo"
 Basic.Settings.Output.Encoder.Audio="Codificador de audio"
 Basic.Settings.Output.SelectDirectory="Seleccione Directorio de grabación"
-Basic.Settings.Output.SelectFile="Seleccione archivo de grabación"
 Basic.Settings.Output.DynamicBitrate="Cambia dinámicamente la tasa de bits para gestionar la congestión"
 Basic.Settings.Output.DynamicBitrate.Beta="Cambia dinámicamente la tasa de bits para gestionar la congestión (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="En lugar de saltar fotogramas para reducir la congestión, cambia dinámicamente el bitrate sobre la marcha.\n\nTen en cuenta que esto puede aumentar el retardo de la transmisión si hay una congestión repentina significativa.\nCuando el bitrate baja, puede tardar unos minutos en restaurarse.\n\nActualmente sólo es compatible con RTMP."
@@ -780,7 +793,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Advertencia: Las grabaciones no se pueden pausar si la calidad de grabación se establece en \"Igual a la emisión\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Advertencia: El formato de grabación seleccionado actualmente no es compatible con el codificador o codificadores de transmisión seleccionados."
 Basic.Settings.Output.Simple.Warn.Encoder="ADVERTENCIA: Grabar con un codificador de software de una calidad diferente a la de la transmisión requerirá un uso adicional de la CPU si transmite y graba al mismo tiempo."
-Basic.Settings.Output.Simple.Warn.Lossless="ADVERTENCIA: ¡La calidad sin perdidas genera tamaños de archivo muy grandes! La calidad sin pérdidas puede utilizar más de 7 gigabytes de espacio en disco por minuto en alta resolución y con alta tasa de fotogramas. La calidad sin pérdidas no se recomienda para grabaciones largas, a menos que tenga una gran cantidad de espacio en disco disponible."
+Basic.Settings.Output.Simple.Warn.Lossless="Advertencia: ¡La calidad sin perdidas genera archivos exageradamente grandes! Puede utilizar más de 7 gigabytes de espacio en disco por minuto en altas resoluciones y tasas de fotogramas. La calidad sin pérdidas no se recomienda para grabaciones largas a menos que tengas una gran cantidad de espacio disponible en tu disco. El búfer de repetición no está disponible cuando se utiliza la calidad sin pérdidas."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="¿Confirma que desea utilizar calidad sin perdidas?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="¡Atención de calidad sin pérdidas!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 bajo uso de CPU, aumenta el tamaño de archivo)"
@@ -916,8 +929,8 @@
 Basic.Settings.Audio.PeakMeterType="Tipo de medidor de pico"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Pico de muestra"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (mayor uso de CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ADVERTENCIA: el audio de sonido envolvente está habilitado."
-Basic.Settings.Audio.MultichannelWarning="Si está transmitiendo, compruebe si su servicio de transmisión soporta tanto la ingesta de sonido envolvente como la reproducción de sonido envolvente. Facebook 360 Live es un ejemplo donde el sonido envolvente es totalmente compatible. Aunque Facebook Live y YouTube Live aceptan la ingesta envolvente, Facebook Live mezcla a estéreo, y YouTube Live solo reproduce dos canales.\n\nLos filtros de audio de OBS son compatibles con sonido envolvente, aunque el soporte de plugins VST no está garantizado."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ADVERTENCIA: el audio de sonido envolvente está habilitado."
+Basic.Settings.Audio.MultichannelWarning="Si estás transmitiendo, comprueba si tu servicio de transmisión soporta tanto la ingesta como la reproducción de sonido envolvente. Por ejemplo, Facebook 360 Live soporta completamente el sonido envolvente; YouTube Live soporta la ingesta de audio 5.1 (y la reproducción en TV).\n\nLos filtros de audio de OBS son compatibles con el sonido envolvente, aunque no se garantiza la compatibilidad con plugins VST."
 Basic.Settings.Audio.MultichannelWarning.Title="¿Habilitar el audio de sonido envolvente?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="¿Seguro que quiere habilitar el audio de sonido envolvente?"
 Basic.Settings.Audio.Devices="Dispositivos de audio globales"
@@ -963,7 +976,6 @@
 Basic.Settings.Advanced.FormatWarning="Advertencia: Los formatos de color que no sean NV12/P010 están destinados principalmente a la grabación, y no se recomiendan cuando se emite. Emitir puede incurrir en un mayor uso de la CPU debido a la conversión del formato de color."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Advertencia: Los formatos de alta precisión se utilizan más comúnmente con espacios de color HDR."
 Basic.Settings.Advanced.FormatWarning2100="Advertencia: Rec. 2100 debería usar un formato con más precisión."
-Basic.Settings.Advanced.Audio.BufferingTime="Tiempo de búfer de audio"
 Basic.Settings.Advanced.Video.ColorFormat="Formato de color"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 bit, 4:2:0, 2 planos)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 planos)"
@@ -988,6 +1000,7 @@
 Basic.Settings.Advanced.Network="Red"
 Basic.Settings.Advanced.Network.Disabled="El protocolo de transmisión actualmente seleccionado no permite cambiar la configuración de red."
 Basic.Settings.Advanced.Network.BindToIP="Enlazar con IP"
+Basic.Settings.Advanced.Network.IPFamily="Familia IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Habilitar optimizaciones de red"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Habilitar el control de ritmo TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Intenta hacer que la salida RTMP sea más amigable con otras aplicaciones sensibles a la latencia en la red regulando la tasa de transmisión.\nPuede aumentar el riesgo de pérdida de fotogramas en conexiones inestables."
@@ -1062,6 +1075,8 @@
 SceneItemShow="Mostrar '%1'"
 SceneItemHide="Ocultar '%1'"
 OutputWarnings.NoTracksSelected="Debe seleccionar al menos una pista"
+OutputWarnings.NoTracksSelectedOnExit.Title="Error de configuración de salida"
+OutputWarnings.NoTracksSelectedOnExit.Text="Todas las salidas han de tener al menos una pista de audio seleccionada."
 OutputWarnings.MP4Recording="Advertencia: Las grabaciones guardadas en MP4/MOV serán irrecuperables si el archivo no puede finalizarse (e.g. como resultado de BSODs, cortes eléctricos, etc.). Si quieres grabar múltiples pistas de audio considera usar MKV y convierte la grabación a MP4/MOV después de finalizar (Archivo → Convertir Grabaciones)"
 OutputWarnings.CannotPause="Advertencia: Las grabaciones no se pueden pausar si el codificador de grabación se establece en \"(Usar codificador de transmisión)\""
 OutputWarnings.CodecIncompatible="La selección de codificador de audio o video se restableció debido a una incompatibilidad. Seleccione un codificador compatible de la lista."
@@ -1087,6 +1102,7 @@
 About.GetInvolved="Involúcrate"
 About.Authors="Autores"
 About.License="Licencia"
+About.Error="¡Error! No se ha podido leer el archivo.\n\nVe a: %1"
 About.Contribute="Apoya el proyecto OBS"
 AddUrl.Title="Añadir fuente vía URL"
 AddUrl.Text="Has arrastrado una URL en OBS. Esto añadirá automáticamente el enlace como fuente. ¿Continuar?"
@@ -1107,14 +1123,12 @@
 LoadProfileNeedsRestart="El perfil contiene ajustes que requieren reiniciar OBS:\n%1\n\n¿Desea reiniciar OBS para que estos ajustes surtan efecto?"
 ContextBar.NoSelectedSource="Ninguna fuente seleccionada"
 ContextBar.ResetTransform="Restablecer transformación"
-ContextBar.FitToCanvas="Ajustar al lienzo"
 ContextBar.MediaControls.PlayMedia="Reproducir Medio"
 ContextBar.MediaControls.PauseMedia="Pausar Medio"
 ContextBar.MediaControls.StopMedia="Detener Medio"
 ContextBar.MediaControls.RestartMedia="Reiniciar Medio"
 ContextBar.MediaControls.PlaylistNext="Siguiente en la lista de reproducción"
 ContextBar.MediaControls.PlaylistPrevious="Anterior en la lista de reproducción"
-ContextBar.MediaControls.MediaProperties="Propiedades del Medio"
 ContextBar.MediaControls.BlindSeek="Widget Barra de reproducción"
 YouTube.Auth.Ok="Se completó la autorización correctamente.\nAhora puede cerrar esta página."
 YouTube.Auth.NoCode="No se completó el proceso de autorización."
@@ -1195,3 +1209,5 @@
 YouTube.Errors.liveChatEnded="La transmisión en directo ha terminado."
 YouTube.Errors.messageTextInvalid="El texto del mensaje no es válido."
 YouTube.Errors.rateLimitExceeded="Estás enviando mensajes demasiado rápido."
+YouTube.DocksRemoval.Title="Borrar los paneles de navegador heredados de YouTube"
+YouTube.DocksRemoval.Text="Estos paneles de navegador se eliminarán como obsoletos:\n\n%1\nUtiliza \"Paneles/YouTube Live Control Room\" en su lugar."

obs-studio-29.1.3.tar.xz/UI/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/et-EE.ini Changed

@@ -93,7 +93,6 @@
 LogViewer="Logivaataja"
 ShowOnStartup="Kuva käivitamisel"
 OpenFile="Ava fail"
-AddValue="Lisa %1"
 AddSource="Lisa allikas"
 RemoveScene="Eemalda valitud stseen"
 RemoveSource="Eemalda valitud allikas(ad)"
@@ -105,11 +104,14 @@
 SourceFilters="Ava allika filtrid"
 MixerToolbarMenu="Helimiksri menüü"
 SceneFilters="Ava stseeni filtrid"
+List="Loend"
+Grid="Ruudustik"
 PluginsFailedToLoad.Title="Plugina laadimise viga"
 PluginsFailedToLoad.Text="Järgmiste OBS-i pluginate laadimine ebaõnnestus:\n\n%1\nPalun uuendage või eemaldage need pluginad."
 AlreadyRunning.Title="OBS juba töötab"
 AlreadyRunning.Text="OBS on juba käivitatud! Palun välju olemasolevatest protsessidest enne kui alustad uut. Kui OBS on minimeeritud süsteemi salve, siis kontrolli kas see on seal."
 AlreadyRunning.LaunchAnyway="Käivita siiski"
+AutoSafeMode.Title="Turvarežiim"
 ChromeOS.Title="Toetuseta platvorm"
 ChromeOS.Text="OBS näib jooksvat ChromeOS-i konteineri sees. See platvorm ei ole toetatud."
 Wine.Title="Wine"
@@ -226,8 +228,6 @@
 Updater.UpdateNow="Värskenda kohe"
 Updater.RemindMeLater="Tuleta mulle hiljem meelde"
 Updater.Skip="Jäta vahele versioon"
-Updater.Running.Title="Programm on hetkel aktiivne"
-Updater.Running.Text="Väljundid on hetkel aktiivsed, palun sulgege aktiivsed väljundid enne uuendamist"
 Updater.NoUpdatesAvailable.Title="Uusi värskendusi pole saadaval"
 Updater.NoUpdatesAvailable.Text="Värskendusi pole praegu saadaval"
 Updater.BranchNotFound.Title="Uuenduskanal eemaldatud"
@@ -237,8 +237,6 @@
 Updater.RepairConfirm.Title="Kinnita terviklikkuse kontroll"
 Updater.RepairConfirm.Text="Terviklikkuse kontrollimise käivitamine otsib teie OBS-i installeeringust kahjustusi ja laeb uuesti alla katkised/muudetud failid. See võib võtta veidi aega.\n\nKas soovid jätkata?"
 Updater.FailedToLaunch="Uuendaja käivitamine nurjus"
-Updater.GameCaptureActive.Title="Mängu hõive on aktiivne"
-Updater.GameCaptureActive.Text="Mängu jäädvustamise hook library on praegu kasutusel. Palun sulge kõik salvestatavad mängud/programmid (või taaskäivita Windows) ja proovi uuesti."
 QuickTransitions.SwapScenes="Vaheta eelvaade ja programmi stseenid pärast üleminekut"
 QuickTransitions.SwapScenesTT="Vahetab eelvaate ja programmi stseenid pärast üleminekut (kui programmi algne stseen on veel olemas).\nSee ei pööra programmi algses stseenis tehtud muudatusi tagasi."
 QuickTransitions.DuplicateScene="Tee stseenist koopia"
@@ -304,7 +302,6 @@
 Output.ConnectFail.Disconnected="Ühendus serveriga katkestatud."
 Output.StreamEncodeError.Title="Kodeerimise viga"
 Output.StreamEncodeError.Msg="Voogedastamisel tekkis kodeerija viga."
-Output.StreamEncodeError.Msg.LastError="Voogedastamisel tekkis kodeerija viga.\n\n%1"
 Output.RecordFail.Title="Salvestamise alustamine nurjus"
 Output.RecordFail.Unsupported="Väljundformaat ei ole toetatud või ei toeta rohkem kui ühte helirada. Palun kontrolli oma seadeid ja proovi uuesti."
 Output.RecordNoSpace.Title="Kettaruumi pole piisavalt"
@@ -312,7 +309,6 @@
 Output.RecordError.Title="Salvestamise tõrge"
 Output.RecordError.Msg="Salvestamise ajal ilmnes tundmatu tõrge."
 Output.RecordError.EncodeErrorMsg="Salvestamise ajal ilmnes kodeerija viga."
-Output.RecordError.EncodeErrorMsg.LastError="Salvestamise ajal ilmnes kodeerija viga:\n\n%1"
 Output.BadPath.Title="Halb failitee"
 Output.NoBroadcast.Title="Ühtegi saadet pole konfigureeritud"
 Output.NoBroadcast.Text="Enne voogesituse alustamist pead seadistama saate."
@@ -346,6 +342,7 @@
 MissingFiles.NewFile="Uus fail"
 MissingFiles.HelpText="Peale viimast OBS'i kasutamist on mõned failid kaotsi läinud."
 MissingFiles.NumFound="%1 leitud %2-st"
+MissingFiles.Search="Otsi Kaust..."
 MissingFiles.SelectFile="Vali fail..."
 MissingFiles.SelectDir="Valige kaust, milles otsida"
 MissingFiles.State="Olek"
@@ -355,7 +352,6 @@
 MissingFiles.Found="Leitud"
 MissingFiles.NoMissing.Title="Puuduvate failide kontroll"
 MissingFiles.NoMissing.Text="Ühtegi faili ei tundu olevat puudu."
-MacPermissions.Title="Rakenduse lubade ülevaatamine"
 MacPermissions.Description="OBS Studio vajab teatud funktsioonide võimaldamiseks sinu luba. Soovitatav on need õigused anda, kuid rakenduse kasutamiseks ei ole need nõutavad. Võid neid alati hiljem lubada."
 MacPermissions.Description.OpenDialog="Seda dialoogi saab uuesti avada OBS Studio menüüst."
 MacPermissions.AccessGranted="Ligipääs on lubatud"
@@ -370,8 +366,6 @@
 MacPermissions.Item.Accessibility="Juurdepääsetavus"
 MacPermissions.Item.Accessibility.Details="Selleks, et klaviatuurikombinatsioonid (kiirklahvid) töötaksid, kui teised rakendused on hõivatud, luba see kasutusõigus."
 MacPermissions.Continue="Jätka"
-UpdateAvailable="Värskendus on saadaval"
-UpdateAvailable.Text="Saadaval on version %1.%2.%3. <a href='%4'>Allalaadimiseks vajuta siia</a>"
 Basic.DesktopDevice1="Töölaua heli"
 Basic.DesktopDevice2="Töölaua heli 2"
 Basic.AuxDevice1="Mikrofon/Aux"
@@ -392,6 +386,7 @@
 BlendingMethod.SrgbOff="SRGB väljalülitatud"
 BlendingMode="Segunemise viis"
 BlendingMode.Normal="Normaalne"
+BlendingMode.Additive="Lisa"
 BlendingMode.Subtract="Lahutamine"
 BlendingMode.Screen="Ekraan"
 BlendingMode.Multiply="Korrutamine"
@@ -399,6 +394,8 @@
 BlendingMode.Darken="Tumendamine"
 Deinterlacing="Põimingu eemaldamine"
 Deinterlacing.Discard="Loobu"
+Deinterlacing.TopFieldFirst="Ülemine väli esimesena"
+Deinterlacing.BottomFieldFirst="Alumine väli esimesena"
 VolControl.Mute="Summuta „%1“"
 VolControl.Properties="'%1' atribuudid"
 Basic.Main.AddSceneDlg.Title="Stseeni lisamine"
@@ -445,6 +442,8 @@
 Basic.Filters.AddFilter.Title="Filtri nimi"
 Basic.Filters.AddFilter.Text="Palun määrake filtri nimi"
 Basic.TransformWindow.Position="Asukoht"
+Basic.TransformWindow.PositionX="Positsioon X"
+Basic.TransformWindow.PositionY="Positsioon Y"
 Basic.TransformWindow.Rotation="Pööramine"
 Basic.TransformWindow.Size="Suurus"
 Basic.TransformWindow.Width="Laius"
@@ -476,6 +475,7 @@
 Basic.Main.Connecting="Ühendamine..."
 Basic.Main.StartRecording="Alusta salvestamist"
 Basic.Main.StartReplayBuffer="Võta taasesituse puhver kasutusele"
+Basic.Main.SaveReplay="Salvesta Taasesitus"
 Basic.Main.StartStreaming="Alusta voogedastust"
 Basic.Main.StartBroadcast="Käivita otseülekanne"
 Basic.Main.StopRecording="Lõpeta salvestamine"
@@ -499,9 +499,6 @@
 Basic.VCam.VirtualCamera="Virtuaalne kaamera"
 Basic.VCam.OutputType="Väljundi tüüp"
 Basic.VCam.OutputSelection="Väljundi valik"
-Basic.VCam.Internal="Sisemine"
-Basic.VCam.InternalDefault="Programmi väljund (vaikimisi)"
-Basic.VCam.InternalPreview="Eelvaate väljund"
 Basic.MainMenu.File="&Fail"
 Basic.MainMenu.File.Export="&Ekspordi"
 Basic.MainMenu.File.Import="&Impordi"
@@ -536,7 +533,6 @@
 Basic.MainMenu.View="&Vaade"
 Basic.MainMenu.View.Toolbars="&Tööriistaribad"
 Basic.MainMenu.View.ContextBar="Allika tööriistariba"
-Basic.MainMenu.View.SceneTransitions="Stseeni üleminekud (&C)"
 Basic.MainMenu.View.StatusBar="Olekuriba (&S)"
 Basic.MainMenu.View.ResetUI="&Lähtesta UI"
 Basic.MainMenu.View.AlwaysOnTop="&Alati pealmine"
@@ -551,12 +547,12 @@
 Basic.MainMenu.SceneCollection.Import="Impordi stseeni kollektsioon"
 Basic.MainMenu.SceneCollection.Export="Ekspordi stseeni kollektsioon"
 Basic.MainMenu.Profile.Exists="Profiil on juba olemas"
-Basic.MainMenu.SceneCollection.Exists="Stseeni kollektsioon on juba olemas"
 Basic.MainMenu.Tools="&Tööriistad"
 Basic.MainMenu.Help="Abi (&H)"
 Basic.MainMenu.Help.HelpPortal="Abi &portaal"
 Basic.MainMenu.Help.Website="Külasta Kodulehte (&W)"
 Basic.MainMenu.Help.Discord="Liituge &Discord-i serveriga"
+Basic.MainMenu.Help.WhatsNew="Mis on uut"
 Basic.MainMenu.Help.Logs="&Logifailid"
 Basic.MainMenu.Help.Logs.ShowLogs="Näita logifaile (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Lae ülesse praegune logifail (&C)"
@@ -597,12 +593,19 @@
 Basic.Settings.General.SwitchOnDoubleClick="Üleminek stseenile topeltklõpsamisel"
 Basic.Settings.General.TogglePreviewProgramLabels="Näita eelvaate/programmi silte"
 Basic.Settings.General.Multiview.MouseSwitch="Klõpsa stseenide ümbervahetamiseks"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horisontaalne, Üleval (8 stseeni)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horisontaalne, All (8 stseeni)"
+Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Horisontaalne, Üleval (18 stseeni)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horisontaalne, Üleval (24 stseeni)"
+Basic.Settings.General.MultiviewLayout.4Scene="Ainult stseenid (4 stseeni)"
+Basic.Settings.General.MultiviewLayout.9Scene="Ainult stseenid (9 stseeni)"
+Basic.Settings.General.MultiviewLayout.16Scene="Ainult stseenid (16 stseeni)"
+Basic.Settings.General.MultiviewLayout.25Scene="Ainult stseenid (25 stseeni)"
 Basic.Settings.General.ChannelName.stable="Stabiilne"
 Basic.Settings.General.ChannelDescription.stable="Viimane stabiilne väljalase"
 Basic.Settings.General.ChannelName.beta="Beetad / väljalaske kandidaadid"
 Basic.Settings.General.ChannelDescription.beta="Potentsiaalselt ebastabiilsed väljalaske-eelsed versioonid"
 Basic.Settings.Stream="Voogedastus"
-Basic.Settings.Stream.StreamType="Voogedastuse tüüp"
 Basic.Settings.Stream.Custom.UseAuthentication="Kasuta autentimist"
 Basic.Settings.Stream.Custom.Username="Kasutajanimi"
 Basic.Settings.Stream.Custom.Password="Salasõna"
@@ -616,6 +619,7 @@
 Basic.Settings.Stream.MissingUrlAndApiKey="URL ja voogedastuse võti on puudu.\n\nAva seaded, et sisestada URL ja voogedastuse võti vahekaardil \"Voogedastus\"."
 Basic.Settings.Stream.MissingUrl="Voogedastuse URL on puudu.\n\nAva seaded, et sisestada URL vahekaardil \"Voogedastus\"."
 Basic.Settings.Stream.MissingStreamKey="Voogedastuse võti on puudu.\n\nAva seaded, et sisestada voogedastuse võti vahekaardil \"Voogedastus\"."
+Basic.Settings.Stream.IgnoreRecommended="Ignoreeri otseülekande teenuse sätete soovitusi"
 Basic.Settings.Stream.IgnoreRecommended.Warn.Title="Soovitatud seadete asendamine"
 Basic.Settings.Stream.IgnoreRecommended.Warn.Text="Hoiatus: Teenuse piirangute eiramine võib põhjustada voogedastuse kvaliteedi halvenemist või takistada voogedastust.\n\nJätkata?"
 Basic.Settings.Stream.Recommended.MaxVideoBitrate="Video maksimaalne bitikiirus: %1 kbps"
@@ -624,8 +628,9 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Maksimaalne FPS: %1"
 Basic.Settings.Output="Väljund"
 Basic.Settings.Output.Format="Salvestusvorming"
+Basic.Settings.Output.Encoder.Video="Video kodeerija"
+Basic.Settings.Output.Encoder.Audio="Heli kodeerija"
 Basic.Settings.Output.SelectDirectory="Vali salvestuskaust"
-Basic.Settings.Output.SelectFile="Vali salvestus fail"
 Basic.Settings.Output.DynamicBitrate.TT="Selle asemel, et vähendada ülekoormust, muudetakse bitikiirust dünaamiliselt.\n\nPane tähele, et see võib suurendada viivitust vaatajate jaoks, kui tekib märkimisväärne äkiline ülekoormus.\nBitikiiruse languse korral võib selle taastamine võtta kuni paar minutit.\n\n Praegu on toetatud ainult RTMP."
 Basic.Settings.Output.Mode="Väljundrežiim"
 Basic.Settings.Output.Mode.Simple="Lihtne"
@@ -640,6 +645,7 @@
 Basic.Settings.Output.ReplayBuffer.Prefix="Taasesituse puhvri failinime eesliide"
 Basic.Settings.Output.ReplayBuffer.Suffix="järelliide"
 Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Taasesituse puhvrit ei saa kasutada, kui salvestuse tüübiks on määratud kohandatud väljund (FFmpeg)."
+Basic.Settings.Output.Simple.SavePath="Salvestuse koht"
 Basic.Settings.Output.Simple.RecordingQuality="Salvestuse kvaliteet"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Sama nagu voogedastus"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Hea kvaliteet, keskmine failimaht"
@@ -649,7 +655,7 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Hoiatus: Audio voogedastuse bitikiiruseks määratakse %1, mis on praeguse voogedastusteenuse ülempiir."
 Basic.Settings.Output.Simple.Warn.CannotPause="Hoiatus: Salvestusi ei saa peatada, kui salvestuskvaliteediks on seatud \"Sama nagu voogedastus\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Hoiatus: Salvestamine tarkvara-kodeerijaga teistsuguse kvaliteediga kui voogedastus nõuab täiendavat protsessori kasutamist, kui te voogedastate ja salvestate samal ajal."
-Basic.Settings.Output.Simple.Warn.Lossless="Hoiatus: Kadudeta kvaliteet tekitab tohutult suuri faile! Kadudeta kvaliteet võib kasutada kuni 7 Gb kettaruumi minuti kohta, kõrge eraldusvõime ja kaadrisagedusega. Kadudeta kvaliteeti ei ole soovitatav kasutada pikkade salvestiste jaoks, kui teil just ei ole väga palju vaba kettaruumi."
+Basic.Settings.Output.Simple.Warn.Lossless="Hoiatus. Kadudeta kvaliteet tekitab tohutult suuri failimahtusid! Kadudeta kvaliteet võib kasutada kuni 7 gigabaiti kettaruumi minutis kõrge eraldusvõime ja kaadrisageduse korral. Kadudeta kvaliteet ei ole soovitatav pikkade salvestuste jaoks, kui teil ei ole väga palju kettaruumi. Kadudeta kvaliteedi kasutamisel ei ole taasesituse puhver saadaval."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Kas soovite kindlasti kasutada kadudeta kvaliteeti?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Kadudeta kvaliteedi hoiatus!"
 Basic.Settings.Output.Simple.Encoder.Software="Tarkvara (x264)"
@@ -664,6 +670,7 @@
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Riistvara (Apple, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Riistvara (Apple, HEVC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Tarkvara (x264 madal CPU kasutus, suurendab faili suurust)"
+Basic.Settings.Output.Simple.RecAudioTrack="Helirada"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Ühildumatu eraldusvõime/kaadrisagedus"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="See voogedastusteenus ei toeta teie praegust väljundresolutsiooni ja/või kaadrisagedust. Need muudetakse lähima ühilduva väärtusega:\n\n%1\n\n\nKas soovid jätkata?"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Eraldusvõime: %1"
@@ -730,6 +737,15 @@
 Screenshot.Preview="Ekraanipilt (Eelvaade)"
 Screenshot.Scene="Ekraanipilt (Stseen)"
 Screenshot.Source="Ekraanipilt (Allikas)"
+FilenameFormatting.TT.A="Terve nädalapäeva nimi"
+FilenameFormatting.TT.b="Lühendatud kuu nimi"
+FilenameFormatting.TT.B="Terve kuu nimi"
+FilenameFormatting.TT.d="Kuupäev, nulliga (01-31)"
+FilenameFormatting.TT.M="Minut (00-59)"
+FilenameFormatting.TT.S="Sekund (00-59)"
+FilenameFormatting.TT.y="Aasta, viimased kaks numbrit (00-99)"
+FilenameFormatting.TT.Y="Aasta"
+FilenameFormatting.TT.FPS="Kaadrid sekundis"
 Basic.Settings.Video.Adapter="Kuvaadapter"
 Basic.Settings.Video.BaseResolution="Alus (lõuendi) resolutsioon"
 Basic.Settings.Video.Numerator="Lugeja"
@@ -742,8 +758,7 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="Kiire"
 Basic.Settings.Audio.MeterDecayRate.Medium="Keskmine (tüüp I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Aeglane (tüüp II PPM)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="HOIATUS: ruumiline heli on sisse lülitatud."
-Basic.Settings.Audio.MultichannelWarning="Kui voogedastad, kontrolli, kas sinu voogedastusteenus toetab nii ruumilise heli sissetoomist kui ka ruumilise heli taasesitust. Facebook 360 Live on üks näide, kus ruumiline heli on täielikult toetatud. Kuigi nii Facebook Live kui ka YouTube Live aktsepteerivad ruumilise heli sissetoomist, vähendab Facebook Live selle stereoks ja YouTube Live mängib ainult kahte kanalit.\n\nOBS-i audiofiltrid ühilduvad ruumilise heliga, kuigi VST pistikprogrammide tugi ei ole tagatud."
+Basic.Settings.Audio.MultichannelWarning.Enabled="HOIATUS: ruumiline heli on sisse lülitatud."
 Basic.Settings.Audio.MultichannelWarning.Title="Luba ruumiline heli?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Kas oled kindel, et soovid lubada ruumilise heli kasutamist?"
 Basic.Settings.Audio.Devices="Globaalsed audioseadmed"
@@ -840,6 +855,7 @@
 OutputWarnings.NoTracksSelected="Pead valima vähemalt ühe raja"
 OutputWarnings.MP4Recording="Hoiatus: MP4/MOV-i salvestusi ei saa taastada, kui faili ei saa lõplikult vormistada (nt BSOD-i, voolukatkestuse jms tõttu). Kui soovid salvestada mitu helirada, kaalu MKV kasutamist ja salvestuse konverteerimist MP4/MOV-i pärast selle lõpetamist (Fail → Konverteeri salvestusi)."
 OutputWarnings.CannotPause="Hoiatus: Salvestusi ei saa peatada, kui salvestuse kodeerija on seadistatud \"(Kasuta voogedastuse kodeerijat)\""
+CodecCompat.CodecPlaceholder="Vali kodeerija..."
 FinalScene.Title="Kustuta stseen"
 NoSources.Title="Pole Allikaid"
 NoSources.Text="Paistab, et sa ei ole veel ühtegi videoallikat lisanud, nii et sa väljastad ainult tühja ekraani. Kas oled kindel, et soovid seda teha?"
@@ -867,8 +883,9 @@
 ContextBar.MediaControls.PauseMedia="Peata meedia"
 ContextBar.MediaControls.StopMedia="Lõpeta meedia"
 ContextBar.MediaControls.RestartMedia="Taaskäivita meedia"
-ContextBar.MediaControls.MediaProperties="Meedia atribuudid"
+YouTube.Actions.CreateNewEvent="Alusta uus otseülekanne"
 YouTube.Actions.Title="Pealkiri*"
+YouTube.Actions.MyBroadcast="Minu otseülekanne"
 YouTube.Actions.Description="Kirjeldus"
 YouTube.Actions.Privacy="Privaatsus*"
 YouTube.Actions.Privacy.Private="Privaatne"

obs-studio-29.1.3.tar.xz/UI/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/eu-ES.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="Ikusi Erregistroa"
 ShowOnStartup="Ireki hasterakoan"
 OpenFile="Ireki fitxategia"
-AddValue="Gehitu %1"
 AddSource="Iturria gehitu"
 RemoveScene="Kendu aukeratutako eszenak"
 RemoveSource="Kendu hautatutako iturria(k)"
@@ -107,19 +106,27 @@
 SourceFilters="Kode irekiko iragazkiak"
 MixerToolbarMenu="Audio nahasgailuaren menua"
 SceneFilters="Ireki eszena-iragazkiak"
+List="Zerrenda"
+Grid="Sareta"
 PluginsFailedToLoad.Title="Plugin-a kargatzeko errorea"
 PluginsFailedToLoad.Text="OBS plugin hauek ezin izan dira kargatu:\n\n%1\nMesedez, eguneratu edo kendu plugin hauek."
 AlreadyRunning.Title="OBS dagoeneko martxan dago"
 AlreadyRunning.Text="OBS dagoeneko martxan dago! Bestelakorik nahi ez baduzu Itxi irekita dagoen saioa beste saio bat ireki baino lehen. Ezarri baduzu OBS agertzea minimizatua sistemaren erretiluan begiratu eta oraindik exekutatzen ari den bertan."
 AlreadyRunning.LaunchAnyway="Abiarazi hala ere"
+AutoSafeMode.Title="Modu segurua"
+AutoSafeMode.Text="OBS ez da behar bezala itzali zure azken saioan.\n\nModu seguruan hasi nahi al duzu (hirugarrenen pluginak, script-ak eta WebSockets desgaituta)?"
+AutoSafeMode.LaunchSafe="Exekutatu modu seguruan"
+AutoSafeMode.LaunchNormal="Exekutatu normal"
+SafeMode.Restart="OBS modu seguruan berrabiarazi nahi duzu (hirugarrenen pluginak, script-ak eta WebSockets desgaituta)?"
+SafeMode.RestartNormal="Nahi duzu OBS modu normalean berrabiarazi ?"
 ChromeOS.Title="Euskarririk gabeko plataforma"
 ChromeOS.Text="Badirudi OBS ChromeOS edukiontzi baten barruan dabilela. Plataforma hau ez da onartzen."
 Wine.Title="Wine detektatu da"
 Wine.Text="OBS Wine-n exekutatzea ez da onartzen, eta, kaptura edo gailuen iturriak bezalako eginbide askok ez dute funtzionatuko edo gaitasun mugatuan bakarrik. OBSren jatorrizko bertsioa exekutatzea gomendatzen da, adibidez <a href='https://flathub.org/apps/details/com.obsproject.Studio'>gure Flatpak bertsioa</a> edo zure sistema eragilearen paketeak."
 DockCloseWarning.Title="Leiho moldagarria ixten"
-DockCloseWarning.Text="Leiho moldagarri bat itxi berri duzu. Berriro bistaratu nahi baduzu, erabili menu barrako Ikusi → Leiho moldagarriak menua."
-ExtraBrowsers="Nabigatzailearen atrake pertsonalizatuak"
-ExtraBrowsers.Info="Gehitu panelak izena eta URLa emanda, orduan egin klik Aplikatu-n edo Itxi panelak irekitzeko. Edozein unean gehitu edo kendu ditzakezu panelak."
+DockCloseWarning.Text="Panel bat itxi berri duzu. Berriro bistaratu nahi baduzu, erabili menu barrako Ikusi → Panelak menua."
+ExtraBrowsers="Nabigatzailearen panel pertsonalizatuak"
+ExtraBrowsers.Info="Gehitu panelak haien izena eta URLa emanda, orduan egin klik Aplikatu-n edo Itxi panelak irekitzeko. Edozein unean gehitu edo kendu ditzakezu panelak."
 ExtraBrowsers.DockName="Atrakearen izena"
 Auth.Authing.Title="Egiaztatzen..."
 Auth.Authing.Text="%1(r) ekin egiaztatzen, itxaron..."
@@ -178,8 +185,8 @@
 Basic.AutoConfig.StreamPage.Server="Zerbitzaria"
 Basic.AutoConfig.StreamPage.StreamKey="Transmisio giltza"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: sartu enkriptazio pasa-esaldia.\nRTMP: sartu zerbitzuak emandako gakoa.\nSRT: sartu korronte-id-a zerbitzuak erabiltzen badu."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Esteka)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kodetzailearen gakoa"
+Basic.AutoConfig.StreamPage.BearerToken="Eramailearen Tokena"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Lotutako kontua"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Kalkulatu bit emaria banda zabaleraren testaren bidez (minutu batzuk beharko ditu)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Hobetsi hardware-kodeketa"
@@ -225,14 +232,12 @@
 Basic.Stats.DiskFullIn="Disko betea (gutxi gora behera)"
 Basic.Stats.ResetStats="Berrezarri estatistikak"
 ResetUIWarning.Title="Ziur zaude interfaze grafikoa berrabiarazi nahi duzula?"
-ResetUIWarning.Text="Interfaze grafikoa berrezartzeak ezkuta ditzake panel moldagarriak. Panel moldagarriak bistaratu nahi baduzu menuko Ikusi atalean agerrarazi beharko dituzu.\n\nZiur zaude interfaze grafikoa berrezarri nahi duzula?"
+ResetUIWarning.Text="Interfaze grafikoa berrezartzeak ezkuta ditzake panelak. Panelak bistaratu nahi baduzu menuko Ikusi atalean agerrarazi beharko dituzu.\n\nZiur zaude interfaze grafikoa berrezarri nahi duzula?"
 Updater.Title="Eguneraketa berria eskuragarri"
 Updater.Text="Eguneraketa berri bat eskuragarri dago:"
 Updater.UpdateNow="Eguneratu orain"
 Updater.RemindMeLater="Gogoratu geroago"
 Updater.Skip="Baztertu bertsioa"
-Updater.Running.Title="Uneko programa aktiboa"
-Updater.Running.Text="Une honetan irteerak aktibo daude, itzali aktibo dauden irteerak eguneratzen saiatu aurretik"
 Updater.NoUpdatesAvailable.Title="Ez dago eguneraketarik eskuragarri"
 Updater.NoUpdatesAvailable.Text="Une honetan ez dago eguneraketarik eskuragarri"
 Updater.BranchNotFound.Title="Eguneratu kendutako kanala"
@@ -242,8 +247,6 @@
 Updater.RepairConfirm.Title="Berretsi osotasuna egiaztatzea"
 Updater.RepairConfirm.Text="Osotasun egiaztapena abiarazteak zure OBS instalazioa eskaneatu egingo du galeren bila eta hautsitako/aldatutako fitxategiak berriro deskargatuko dira. Baliteke une bat behar izatea.\n\nJarraitu nahi duzu?"
 Updater.FailedToLaunch="Huts egin du eguneratzailea abiarazten"
-Updater.GameCaptureActive.Title="Jolasen kaptura aktiboa"
-Updater.GameCaptureActive.Text="Jolasen kapturaren liburutegia erabiltzen ari da. Itxi kapturatzen ari den jolasa/programa (edo berrabiarazi Windows) eta saiatu berriro."
 QuickTransitions.SwapScenes="Txandakatu Aurrebista/Programatu eszenak trantsizioa egin ondoren"
 QuickTransitions.SwapScenesTT="Txandakatu aurrebistak eta programatutako eszenak trantsizioen ondoren (baldin eta programatutako jatorrizkoa eszena badago).\n Honek ez du desegingo programatutako jatorrizko eszenari egindako aldaketak."
 QuickTransitions.DuplicateScene="Bikoiztu eszena"
@@ -257,6 +260,8 @@
 Basic.SceneTransitions="Eszena-trantsizioak"
 Basic.TransitionDuration="Iraupena"
 Basic.TogglePreviewProgramMode="Estudio modua"
+Basic.EnablePreviewProgramMode="Gaitu Estudio modua"
+Basic.DisablePreviewProgramMode="Desgaitu Estudio modua"
 Undo.Undo="Desegin"
 Undo.Redo="Berregin"
 Undo.Add="Gehitu '%1'"
@@ -305,6 +310,8 @@
 Undo.GroupItems="Talde elementuak '%1'-en"
 TransitionNameDlg.Text="Sartu trantsizioaren izena"
 TransitionNameDlg.Title="Trantsizioaren Izena"
+TitleBar.SafeMode="MODU SEGURUA"
+TitleBar.PortableMode="Modu eramangarria"
 TitleBar.Profile="Profila"
 TitleBar.Scenes="Eszenak"
 NameExists.Title="Izena badago jadanik"
@@ -329,6 +336,7 @@
 Output.StartStreamFailed="Huts egin du transmisioak"
 Output.StartRecordingFailed="Huts egin du grabazioak"
 Output.StartReplayFailed="Huts egin du erreprodukzio bufferrak"
+Output.StartVirtualCamFailed="Ezin izan da abiarazi kamera birtuala"
 Output.StartFailedGeneric="Huts egin du irteeraren abioak. Begiratu erregistroa zehaztasunak ikusteko.\n\nOharra: NVENC edo AMD kodetzaileak erabiltzen ari bazara segurtatu haien kontrolatzaileak eguneratuta daudela."
 Output.ReplayBuffer.PauseWarning.Title="Ezin dira errepikapenak dauden pausatuta dagoenean"
 Output.ReplayBuffer.PauseWarning.Text="Kontuz: errepikapenak ezin dira gorde grabaketa pausatuta dagoenean."
@@ -341,7 +349,7 @@
 Output.ConnectFail.Disconnected="Zerbitzaritik deskonektatuta."
 Output.StreamEncodeError.Title="Kodeketa errorea"
 Output.StreamEncodeError.Msg="Kodetzailearen errore bat gertatu da transmititzean."
-Output.StreamEncodeError.Msg.LastError="Kodetzailearen errore bat gertatu da transmititzean:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Kodetzailearen errore bat gertatu da transmititzean: %1"
 Output.RecordFail.Title="Huts egin du grabazioa hastean"
 Output.RecordFail.Unsupported="Irteera formatua ez da onartzen edo ez du audio pista bat baino gehiago onartzen. Egiaztatu zure ezarpenak eta saiatu berriro."
 Output.RecordNoSpace.Title="Ez dago nahiko tokirik diskoan"
@@ -349,7 +357,7 @@
 Output.RecordError.Title="Grabazio akatsa"
 Output.RecordError.Msg="Zehaztugabeko akats bat gertatu da grabatzerakoan."
 Output.RecordError.EncodeErrorMsg="Kodetzailearen errore bat gertatu da grabatzean."
-Output.RecordError.EncodeErrorMsg.LastError="Kodetzailearen errore bat gertatu da transmititzean:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Kodetzailearen errore bat gertatu da grabatzean: %1"
 Output.BadPath.Title="Fitxategi-bide okerra"
 Output.BadPath.Text="Ezin izan da ireki konfiguratutako grabaketa-bidea. Mesedez, egiaztatu zure Grabaketa-bidea Ezarpenak → Irteera → Grabaketa atalean."
 Output.NoBroadcast.Title="Ez dago emankizunik konfiguratuta"
@@ -379,6 +387,8 @@
 Remux.ExitUnfinishedTitle="Multiplexazioa martxan"
 Remux.ExitUnfinished="Bihurketa ez da amaitu, orain gelditzeak fitxategi-helburua erabiltezin bihur dezake.\nZiur zaude bihurtzea gelditu nahi duzula?"
 Remux.HelpText="Jaregin itzazu fitxategiak leiho honetan aldatzeko, edo hauta ezazu \"OBS Grabazioa\"-gelaxka huts bat fitxategia arakatzeko."
+Remux.NoFilesAddedTitle="Ez da remux fitxategirik gehitu"
+Remux.NoFilesAdded="Ez da fitxategirik gehitu remux-era. Jaregin bideo fitxategi bat edo gehiago dituen karpeta bat."
 MissingFiles="Galdutako fitxategiak"
 MissingFiles.MissingFile="Galdutako fitxategia"
 MissingFiles.NewFile="Fitxategi berria"
@@ -397,6 +407,7 @@
 MissingFiles.AutoSearchText="OBS-ek direktorio honetan falta diren fitxategiekin bat egiten duten osagarriak topatu ditu. Nahi al duzu gehitzea?"
 MissingFiles.NoMissing.Title="Falta diren fitxategiak egiaztatzea"
 MissingFiles.NoMissing.Text="Ez dirudi fitxategirik falta denik."
+MacPermissions.MenuAction="Berrikusi aplikazioaren baimenak..."
 MacPermissions.Title="Berrikusi aplikazioaren baimenak"
 MacPermissions.Description="OBS Studio-k zure baimena behar du eginbide batzuk eman ahal izateko. Baimen hauek ematea gomendatzen da, baina ez dira beharrezkoak aplikazioa erabiltzeko. Geroago gaitu ditzakezu beti."
 MacPermissions.Description.OpenDialog="Elkarrizketa hau berriro ireki dezakezu OBS Studio menuaren bidez."
@@ -412,8 +423,8 @@
 MacPermissions.Item.Accessibility="Irisgarritasuna"
 MacPermissions.Item.Accessibility.Details="Teklatuko lasterbideek (laster-teklak) erabiltzeko beste aplikazio fokuratuta dauden bitartean funtziona dezaten, gaitu baimen hau."
 MacPermissions.Continue="Jarraitu"
-UpdateAvailable="Eguneraketa eskuragarria"
-UpdateAvailable.Text="%1.%2.%3 bertsioa eskuragarri dago. <a href='%4'>Klikatu hemen deskargatzeko</a>"
+SourceLeak.Title="Iturria garbitzeko errorea"
+SourceLeak.Text="Arazo bat izan da eszena bildumak aldatzean eta iturri batzuk ezin izan dira deskargatu. Arazo hau normalean baliabideak behar bezala askatzen ez dituzten pluginek eragiten dute. Mesedez, ziurtatu erabiltzen ari zaren pluginak eguneratuta daudela.\n\nOBS Studio orain itxiko da, datuak hondatzea saihesteko."
 Basic.DesktopDevice1="Mahaigaineko audioa"
 Basic.DesktopDevice2="Mahaigaineko audioa 2"
 Basic.AuxDevice1="Mikro/Osag"
@@ -474,6 +485,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (berez-hautatu: %2)"
 Basic.PropertiesWindow.SelectColor="Hautatu kolorea"
 Basic.PropertiesWindow.SelectFont="Hautatu letra-mota"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Aukeratu letra-tipo bat"
 Basic.PropertiesWindow.ConfirmTitle="Ezarpenak aldatuta"
 Basic.PropertiesWindow.Confirm="Gorde gabeko aldaketak daude. Nahi duzu dagoena mantentzea?"
 Basic.PropertiesWindow.NoProperties="Ezaugarriak ez daude eskuragarri"
@@ -584,9 +596,9 @@
 Basic.VCam.VirtualCamera="Kamera birtuala"
 Basic.VCam.OutputType="Irteera mota"
 Basic.VCam.OutputSelection="Irteera hautapena"
-Basic.VCam.Internal="Barnekoa"
-Basic.VCam.InternalDefault="Programaren irteera (lehenetsia)"
-Basic.VCam.InternalPreview="Aurreikusi irteera"
+Basic.VCam.OutputType.Program="Programa (lehenetsia)"
+Basic.VCam.OutputSelection.NoSelection="Ez dago aukerarik hautatu irteera mota honetarako"
+Basic.VCam.RestartWarning="Kamera birtuala berrabiaraziko da aldaketa hau aplikatzeko"
 Basic.MainMenu.File="&Fitxategia"
 Basic.MainMenu.File.Export="&Esportatu"
 Basic.MainMenu.File.Import="&Inportatu"
@@ -628,18 +640,19 @@
 Basic.MainMenu.Edit.AdvAudio="&Audio ezarpen aurreratuak"
 Basic.MainMenu.View="Ikusi (&V)"
 Basic.MainMenu.View.Toolbars="&Tresna-barrak"
-Basic.MainMenu.View.ListboxToolbars="Eszena/Iturburuko zerrenda botoiak"
+Basic.MainMenu.View.ListboxToolbars="Atrakea tresna-barrak"
 Basic.MainMenu.View.ContextBar="iturburuaren tresna-barra"
-Basic.MainMenu.View.SceneTransitions="Eszenen trantsizioak (&C)"
 Basic.MainMenu.View.SourceIcons="Iturburuen &ikonoak"
 Basic.MainMenu.View.StatusBar="Egoera-barra (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Pantaila osoa"
 Basic.MainMenu.View.ResetUI="&Berezarri erabiltzaile-interfazea"
 Basic.MainMenu.View.AlwaysOnTop="&Beti gainean"
+Basic.MainMenu.View.SceneListMode="Eszena zerrenda modua"
 Basic.MainMenu.Docks="&Panel moldagarriak"
 Basic.MainMenu.Docks.ResetDocks="&Berrezarri panelak"
 Basic.MainMenu.Docks.LockDocks="&Blokeatu panelak"
-Basic.MainMenu.Docks.CustomBrowserDocks="&Nabigatzailearen leiho moldagarri pertsonalizatuak..."
+Basic.MainMenu.Docks.SideDocks="&Altuera osoko panelak"
+Basic.MainMenu.Docks.CustomBrowserDocks="&Nabigatzailearen panel pertsonalizatuak..."
 Basic.MainMenu.SceneCollection="E&szena-bilduma"
 Basic.MainMenu.Profile="&Profila"
 Basic.MainMenu.Profile.Import="Inportatu profila"
@@ -647,7 +660,6 @@
 Basic.MainMenu.SceneCollection.Import="Inportatu eszena bilduma"
 Basic.MainMenu.SceneCollection.Export="Esportatu eszena bilduma"
 Basic.MainMenu.Profile.Exists="Profila lehendik ere badago"
-Basic.MainMenu.SceneCollection.Exists="Eszena bilduma lehendik ere badago"
 Basic.MainMenu.Tools="&Tresnak"
 Basic.MainMenu.Help="Laguntza (&H)"
 Basic.MainMenu.Help.HelpPortal="Laguntza ataria (&P)"
@@ -659,8 +671,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Kargatu uneko egunkari-fitxategiak (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Igo &Aurreko Log fitxategia"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Ikusi uneko egunkari-fitxategia (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Argitalpen-oharrak"
 Basic.MainMenu.Help.CheckForUpdates="Begiratu eguneraketak"
 Basic.MainMenu.Help.Repair="Egiaztatu fitxategiaren osotasuna"
+Basic.MainMenu.Help.RestartSafeMode="Berrabiarazi modu seguruan"
+Basic.MainMenu.Help.RestartNormal="Berrabiarazi modu normalean"
 Basic.MainMenu.Help.CrashLogs="Matxuren jakinarazpenak (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Erakut&si matxuren jakinarazpenak"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Igo &Aurreko matxura jakinarazpena"
@@ -730,7 +745,6 @@
 Basic.Settings.General.ChannelName.beta="Betak / Argitaratzeko hautagaiak"
 Basic.Settings.General.ChannelDescription.beta="Ezegonkorrak izan daitezkeen aurreko bertsioak"
 Basic.Settings.Stream="Transmisioa"
-Basic.Settings.Stream.StreamType="Transmisio-mota"
 Basic.Settings.Stream.Custom.UseAuthentication="Erabili autentifikazioa"
 Basic.Settings.Stream.Custom.Username="Erabiltzaile izena"
 Basic.Settings.Stream.Custom.Password="Pasahitza"
@@ -762,7 +776,6 @@
 Basic.Settings.Output.Encoder.Video="Bideo Kodeatzailea"
 Basic.Settings.Output.Encoder.Audio="Audio Kodeatzailea"
 Basic.Settings.Output.SelectDirectory="Hautatu grabazioaren karpeta"
-Basic.Settings.Output.SelectFile="Hautatu grabazioaren fitxategia"
 Basic.Settings.Output.DynamicBitrate="Aldatu bit-emaria dinamikoki pilaketa kudeatzeko"
 Basic.Settings.Output.DynamicBitrate.Beta="Aldatu bit-emaria dinamikoki pilaketa kudeatzeko (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Pilaketa murrizteko fotogramak askatu beharrean, abiadura dinamikoki aldatzen du.\n\n Kontuan izan horrek ikuslearentzat atzerapena areagotu dezakeela bat-bateko pilaketak nabarmenak badira.\nBit-emaria jaisten denean, minutu batzuk iraun dezake berreskuratzeak.\n\nUne honetan bakarrik RTMPrako onartzen da."
@@ -790,7 +803,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Kontuz: grabazioa ezin da pausatu grabazioaren kalitatearen konfigurazioa \"jarioaren berdina\" bada."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Abisua: une honetan hautatutako grabazio-formatua ez da bateragarria hautatutako korronte-kodetzailearekin."
 Basic.Settings.Output.Simple.Warn.Encoder="Oharra: Transmisioak duen kalitatea ez bestelako kalitate batez grabatzeak PUZ-ren aparteko erabilera eskatzen du une berean transmititzen eta grabatzen baduzu."
-Basic.Settings.Output.Simple.Warn.Lossless="Oharra: Galerarik gabeko kalitateak neurri izugarri handiko fitxategiak sortzen ditu! Galerarik gabeko kalitateak minutuko 7 gigabytetik gorako tokia erabili dezake diskoan bereizmen eta fotograma-emari handietan. Galerarik gabeko kalitatea ez dago gomendatua grabazio luzeetarako disko toki eskuragarri oso handi bat ez baduzu."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Ziur zaude galerarik gabeko kalitatea erabili nahi duzula?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Galerarik gabeko kalitateaz oharra!"
 Basic.Settings.Output.Simple.Encoder.Software="Softwarea (x264)"
@@ -938,8 +950,8 @@
 Basic.Settings.Audio.PeakMeterType="Gailurren neurgailu mota"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Lagin-gailurra"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Benetako gailurra (CPUaren erabilera handiagoa)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Kontu: soinu inguratzailea aktibatuta dago."
-Basic.Settings.Audio.MultichannelWarning="Transmititzen ari bazara, begiratu ea zure transmisio-zerbitzuak onartzen duen soinu inguratzailea sarrerako soinuan zein irteerakoan. Facebook 360 LIve, Mixer RTMP, Samashcast esate baterako guztiz onartzen dute soinu inguratzailea. Facebook Live eta Youtube Live sarrerako soinu inguratzailea onartzen badute ere, Facebook Livek estereo bihurtzen du, eta Youtube Livek bakarrik bi kanal erreproduzitzen ditu.\n\nOBS audio iragazkiak soinu inguratzailearekin bateragarriak badira ere, ezin da bermatu VST pluginaren bateragarritasuna."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Kontu: soinu inguratzailea aktibatuta dago."
+Basic.Settings.Audio.MultichannelWarning="Erreproduzitzen baduzu, egiaztatu zure igorpen-zerbitzuak soinu inguratzailea hartzen eta soinu inguratzailea erreproduzitzea onartzen duen. Esate baterako, Facebook 360 Live-k guztiz onartzen du soinu inguratzailea; YouTube Live-k 5.1 audioa hartzea onartzen du (eta telebistetan erreproduzitzea).\n\nOBS audio-iragazkiak soinu inguratzailearekin bateragarriak dira, nahiz eta VST pluginen laguntza ez dagoen bermatuta."
 Basic.Settings.Audio.MultichannelWarning.Title="Nahi duzu soinu inguratzailea aktibatzea?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Seguru zaude soinu inguratzailea aktibatu nahi duzula?"
 Basic.Settings.Audio.Devices="Audio-Gailu Globala"
@@ -986,7 +998,6 @@
 Basic.Settings.Advanced.FormatWarning="Oharra: NV12/P010 ez diren kolore formatuak grabaziorako dira gehienbat, eta ez daude gomendatuta transmisiorako. Transmisioak PUZ erabilpena handitu dezake kolore formatu bihurketa dela medio."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Abisua: zehaztasun handiko formatuak erabili ohi dira HDR kolore-espazioekin."
 Basic.Settings.Advanced.FormatWarning2100="Oharra: Rec. 2100 zehaztasun gehiagoko formatu bat erabili beharko luke"
-Basic.Settings.Advanced.Audio.BufferingTime="Audio bufferratze denbora"
 Basic.Settings.Advanced.Video.ColorFormat="Kolore formatua"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 bit, 4:2:0, 2 plano)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 bit, 4:2:0, 3 plano)"
@@ -1011,6 +1022,7 @@
 Basic.Settings.Advanced.Network="Sarea"
 Basic.Settings.Advanced.Network.Disabled="Une honetan hautatutako transmisio-protokoloak ez du onartzen sarearen ezarpenak aldatzea."
 Basic.Settings.Advanced.Network.BindToIP="IP bidez lotu"
+Basic.Settings.Advanced.Network.IPFamily="IP familia"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Gaitu sarearen optimizazioak"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Gaitu TCP erritmoa"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="RTMP irteera sareko latentziarekiko sentikorrak diren beste aplikazio batzuekin bateragarriagoa izan dadin saiatzen da transmisio-abiadura erregulatuz.\nHonek konexio ezegonkorretan fotogramak galtzeko arriskua areagotu dezake."
@@ -1085,6 +1097,8 @@
 SceneItemShow="Erakutsi '%1'"
 SceneItemHide="Ezkutatu '%1'"
 OutputWarnings.NoTracksSelected="Gutxienez pista bat hautatu behar duzu"
+OutputWarnings.NoTracksSelectedOnExit.Title="Irteerako ezarpenen errorea"
+OutputWarnings.NoTracksSelectedOnExit.Text="Gakoa: OutputWarnings.NoTracksSelectedOnExit.Text\nIrteeraWarnings.NoTracksSelectedOnExit.Text"
 OutputWarnings.MP4Recording="Kontuz: MP4 formatuz gordetako grabazioak izan daitezke berreskuraezinak fitxategia ezin bada bukatu (esate baterako BSODs-ren emaitza bat, energia etenak eta abar). Hainbat audio pista grabatu nahi baduzu erabil dezakezu MKV formatua eta mp4 bihurtu grabazioa bukatu ondoren (Fitxategia->Bihurtu grabazioak)"
 OutputWarnings.CannotPause="Kontuz: Grabazioak ezin dira pausatu grabazioaren kodetzailea \"(Erabili transmisioaren kodetzailea)\" konfigurazioa badu"
 OutputWarnings.CodecIncompatible="Audio- edo bideo-kodetzaileen aukeraketa berrezarri da bateraezintasunagatik. Hautatu zerrendako kodetzaile bateragarri bat."
@@ -1110,6 +1124,7 @@
 About.GetInvolved="Parte hartu"
 About.Authors="Egileak"
 About.License="Lizentzia"
+About.Error="Errorea! Ezin izan da fitxategia irakurri.\n\nJoan: %1-ra"
 About.Contribute="Sostengatu OBS proiektua"
 AddUrl.Title="Gehitu iturburua URL bidez"
 AddUrl.Text="Arrastatu duzu URL bat OBSra. Honek automatikoki gehituko du esteka hori iturburu moduan. Jarraitu?"
@@ -1131,14 +1146,12 @@
 LoadProfileNeedsRestart="Profilak OBS berrabiarazi behar duten ezarpenak ditu:\n%1\n\nOBS berrabiarazi nahi duzu ezarpen hauek eragina izan dezaten?"
 ContextBar.NoSelectedSource="Ez da iturririk hautatu"
 ContextBar.ResetTransform="Berrezarri eraldaketa"
-ContextBar.FitToCanvas="Doitu oihalera"
 ContextBar.MediaControls.PlayMedia="Erreproduzitu Media"
 ContextBar.MediaControls.PauseMedia="Media Pausatu"
 ContextBar.MediaControls.StopMedia="Gelditu media"
 ContextBar.MediaControls.RestartMedia="Berrabiarazi Media"
 ContextBar.MediaControls.PlaylistNext="Hurrengoa Erreprodukzio-zerrendan"
 ContextBar.MediaControls.PlaylistPrevious="Aurrekoa Erreprodukzio-zerrendan"
-ContextBar.MediaControls.MediaProperties="Media propietateak"
 YouTube.Auth.Ok="Baimena eskuratu da.\nOrain orri hau itxi dezakezu."
 YouTube.Auth.NoCode="Baimen-prozesua ez da burutu."
 YouTube.Auth.NoChannels="Hautatutako kontuan ez dago kanal erabilgarririk"
@@ -1219,3 +1232,5 @@
 YouTube.Errors.liveChatEnded="Zuzeneko transmisioa bukatu da."
 YouTube.Errors.messageTextInvalid="Mezuaren testua ez da baliozkoa."
 YouTube.Errors.rateLimitExceeded="Mezuak azkarregi bidaltzen ari zara."
+YouTube.DocksRemoval.Title="Garbitu Legacy YouTube arakatzailearen panelak"
+YouTube.DocksRemoval.Text="Arakatzailearen panel hauek zaharkituta daudelako kenduko dira:\n\n%1\nErabili \"Panelak/YouTube Live Control Room\" haren ordez."

obs-studio-29.1.3.tar.xz/UI/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/fa-IR.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="نمایشگر گزارش"
 ShowOnStartup="نمایش هنگام راه اندازی"
 OpenFile="گشودن پرونده"
-AddValue="افزودن %1"
 AddSource="افزودن منبع"
 RemoveScene="حذف صحنه انتخاب شده"
 RemoveSource="حذف منبع(های) انتخاب شده"
@@ -107,11 +106,19 @@
 SourceFilters="فیلتر های منبع باز"
 MixerToolbarMenu="منوی ترکیب صدا"
 SceneFilters="فیلترهای صحنه را باز کنید"
+List="فهرست"
+Grid="جدول"
 PluginsFailedToLoad.Title="خطا بارگذاری افزونه"
 PluginsFailedToLoad.Text="افزونه‌های OBS زیر بارگیری نشدند:\n\n%1\nلطفاً این افزونه‌ها را به‌روزرسانی یا حذف کنید."
 AlreadyRunning.Title="برنامه OBS از قبل در حال اجراست"
 AlreadyRunning.Text="برنامه OBS از قبل در حال اجراست! در صورتی که به صورت عمد این کار را کرده‌اید، لطفاً قبل از اجرای یک نمونه جدید سایر نمونه‌های باز OBS را ببندید. اگر OBS را در حالت کوچک کردن در نوار ابزار قرار داده‌اید، لطفاً بررسی کنید که آیا در آن جا هنوز در حال اجراست یا خیر."
 AlreadyRunning.LaunchAnyway="در هر حال اجرا کن"
+AutoSafeMode.Title="حالت ایمن"
+AutoSafeMode.Text="نرم افزار OBS در جلسه قبلی به صورت صحیح خاموش نشده است.\n\nآیا مایل هستید در حالت ایمن (غیر فعال بودن پلاگین های شخص ثالث، اسکریپت‌ها و وب‌سوکت‌ها) اجرا شود؟"
+AutoSafeMode.LaunchSafe="اجرا در حالت ایمن"
+AutoSafeMode.LaunchNormal="اجرا به صورت عادی"
+SafeMode.Restart="آیا مایل هستید OBS را در حالت ایمن (غیر فعال بودن پلاگین های شخص ثالث، اسکریپت‌ها و وب‌سوکت‌ها) ری‌استارت کنید؟"
+SafeMode.RestartNormal="آیا مایل هستید OBS را در حالت عادی ری‌استارت کنید؟"
 ChromeOS.Title="پلتفرم پشتیبانی نشده"
 ChromeOS.Text="به نظر می رسد OBS در داخل ظرف سیستم عامل Chrome در حال اجرا است. این سیستم عامل پشتیبانی نمی شود."
 Wine.Title="Wine شناسایی شد"
@@ -179,8 +186,8 @@
 Basic.AutoConfig.StreamPage.Server="کارساز"
 Basic.AutoConfig.StreamPage.StreamKey="کلید جریان"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: عبارت عبور رمزگذاری را وارد کنید.\nRTMP: کلید ارائه شده توسط سرویس را وارد کنید.\nSRT: در صورتی که سرویس از یکی استفاده می کند، streamid را وارد کنید."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(پیوند)"
 Basic.AutoConfig.StreamPage.EncoderKey="کلید رمزگذار"
+Basic.AutoConfig.StreamPage.BearerToken="توکن رمز"
 Basic.AutoConfig.StreamPage.ConnectedAccount="حساب وصل شده"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="برآورد میزان بیت ریت بر ثانیه با تست پهنای باند (ممکن است چند دقیقه طول بکشد)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="کد گذاری سخت افزاری را ترجیح می دهم"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="اکنون بروزرسانی شود"
 Updater.RemindMeLater="بعدا یادآوری کن"
 Updater.Skip="رد شدن از نسخه"
-Updater.Running.Title="درحال حاضر برنامه فعال است"
-Updater.Running.Text="درحال حاضر خروجی ها فعال هستند ، لطفا پیش از بروزرسانی هر خروجی فعال را خاموش کنید"
 Updater.NoUpdatesAvailable.Title="بروزرسانی موجود نیست"
 Updater.NoUpdatesAvailable.Text="در حال حاظر بروزرسانی در دسترس نیست"
 Updater.BranchNotFound.Title="به روز رسانی کانال حذف شد"
@@ -243,8 +248,6 @@
 Updater.RepairConfirm.Title="بررسی یکپارچگی را تأیید کنید"
 Updater.RepairConfirm.Text="شروع بررسی یکپارچگی، نصب OBS شما را از نظر خرابی اسکن می کند و فایل های شکسته/تغییر شده را دوباره دانلود می کند. ممکن است کمی طول بکشد.\n\nآیا می‌خواهید ادامه دهید؟"
 Updater.FailedToLaunch="اجرای بروزرسانی کننده ناموفق بود"
-Updater.GameCaptureActive.Title="گیم کپچر فعال است"
-Updater.GameCaptureActive.Text="گیرنده کتابخانه گیم کپچر درحال استفاده شدن است. لطفا هر گیم / برنامه ای را قبل از گرفتن ببندید. (یا ویندوز را راه اندازی مجدد کنید) و دوباره تلاش کنید."
 QuickTransitions.SwapScenes="پیش‌نمایش/صحنه‌های برنامه را پس از انتقال عوض کنید"
 QuickTransitions.SwapScenesTT="پیش‌نمایش و صحنه‌های برنامه را پس از انتقال عوض می‌کند (اگر صحنه اصلی برنامه هنوز وجود داشته باشد).\nبا این کار هیچ تغییری که ممکن است در صحنه اصلی برنامه ایجاد شده باشد، لغو نمی‌شود."
 QuickTransitions.DuplicateScene="صحنه تکراری"
@@ -258,6 +261,8 @@
 Basic.SceneTransitions="انتقال صحنه‌ها"
 Basic.TransitionDuration="مدت زمان"
 Basic.TogglePreviewProgramMode="حالت استودیو"
+Basic.EnablePreviewProgramMode="فعال کردن حالت استودیو"
+Basic.DisablePreviewProgramMode="غیر‌فعال کردن حالت استودیو"
 Undo.Undo="بازگرد"
 Undo.Redo="مجدد"
 Undo.Add="اضافه \"%1\""
@@ -306,6 +311,8 @@
 Undo.GroupItems="موارد را در \"%1\" گروه بندی کنید"
 TransitionNameDlg.Text="لطفا نام انتقال را وارد کنید"
 TransitionNameDlg.Title="نام انتقال"
+TitleBar.SafeMode="حالت ایمن"
+TitleBar.PortableMode="حالت قابل حمل"
 TitleBar.Profile="نمایه"
 TitleBar.Scenes="صحنه ها"
 NameExists.Title="نام از قبل وجود دارد"
@@ -330,6 +337,7 @@
 Output.StartStreamFailed="شروع پخش ناموفق بود"
 Output.StartRecordingFailed="شروع ضبط ناموفق بود"
 Output.StartReplayFailed="بافر پخش دوباره شروع نشد"
+Output.StartVirtualCamFailed="شکست در راه‌اندازی دوربین مجازی"
 Output.StartFailedGeneric="شروع خروجی ناموفق بود. لطفاً جزئیات گزارش را چک کنید.\n\nتوجه: اگر از انکودرهای NVENC یا AMD استفاده می کنید، مطمئن شوید که درایورهای ویدئویی شما به روز هستند."
 Output.ReplayBuffer.PauseWarning.Title="ذخیره مجدد هنگام مکث امکان پذیر نیست"
 Output.ReplayBuffer.PauseWarning.Text="هشدار: هنگام مکث ضبط، امکان بارگیری مجدد وجود ندارد."
@@ -342,7 +350,7 @@
 Output.ConnectFail.Disconnected="اتصال به سرور قطع شد."
 Output.StreamEncodeError.Title="خطای رمزگذاری"
 Output.StreamEncodeError.Msg="هنگام پخش خطایی در انکودر رخ داد."
-Output.StreamEncodeError.Msg.LastError="هنگام پخش جریانی یک خطای رمزگذار روی داد:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="هنگام پخش جریانی یک خطای رمزگذار روی داد: %1"
 Output.RecordFail.Title="شروع ضبط ناموفق بود"
 Output.RecordFail.Unsupported="فرمت خروجی پشتیبانی نمی شود یا بیش از یک لایه صوتی را پشتیبانی نمی کند. لطفاً تنظیمات خود را بررسی کرده و دوباره امتحان کنید."
 Output.RecordNoSpace.Title="فضای ناکافی دیسک"
@@ -350,7 +358,7 @@
 Output.RecordError.Title="خطای ضبط"
 Output.RecordError.Msg="هنگام ضبط خطای نامشخص رخ داده است."
 Output.RecordError.EncodeErrorMsg="هنگام ضبط خطایی در انکودر رخ داده است."
-Output.RecordError.EncodeErrorMsg.LastError="هنگام ضبط یک خطای رمزگذار روی داد:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="یک خطای رمزگذار هنگام ضبط روی داد: % 1"
 Output.BadPath.Title="مسیر پروندهٔ بد"
 Output.BadPath.Text="مسیر ضبط پیکربندی شده باز نشد. لطفاً مسیر ضبط خود را در قسمت تنظیمات → خروجی → ضبط بررسی کنید."
 Output.NoBroadcast.Title="پخش تنظیم نشده"
@@ -380,6 +388,8 @@
 Remux.ExitUnfinishedTitle="بازسازی در حال انجام"
 Remux.ExitUnfinished="بازسازی به پایان نرسیده است ، توقف اکنون ممکن است فایل هدف را غیر قابل استفاده کند.\nآیا مطمئن هستید که می خواهید بازسازی را متوقف کنید?"
 Remux.HelpText="پرونده ها را در این پنجره رها کنید تا دوباره اصلاح شود، یا یک سلول خالی \"ضبط OBS\" را انتخاب کنید تا یک فایل را مرور کنید."
+Remux.NoFilesAddedTitle="هیچ فایل ریموکس اضافه نشده است"
+Remux.NoFilesAdded="هیچ فایلی به ریموکس اضافه نشده است. یک پوشه حاوی یک یا چند فایل ویدیویی در آن بگذارید."
 MissingFiles="پرونده ها وجود ندارد"
 MissingFiles.MissingFile="پرونده موجود نیست"
 MissingFiles.NewFile="پروندهٔ جدید"
@@ -397,7 +407,8 @@
 MissingFiles.AutoSearchText="OBS موارد منطبق دیگری را برای پرونده های گمشده در آن فهرست پیدا کرده است. آیا می خواهید آنها را اضافه کنید؟"
 MissingFiles.NoMissing.Title="بررسی فایل های گمشده"
 MissingFiles.NoMissing.Text="به نظر می رسد هیچ فایلی گم نشده است."
-MacPermissions.Title="بررسی مجوزهای برنامه"
+MacPermissions.MenuAction="بازبینی اجازه‌های دسترسی اپلیکیشن..."
+MacPermissions.Title="بازبینی اجازه‌های دسترسی اپلیکیشن"
 MacPermissions.Description="OBS Studio برای اینکه بتواند ویژگی های خاصی را ارائه دهد به اجازه شما نیاز دارد. توصیه می شود این مجوزها را فعال کنید، اما برای استفاده از برنامه نیازی به آنها نیست. همیشه می توانید بعداً آنها را فعال کنید."
 MacPermissions.Description.OpenDialog="می توانید این گفتگو را از طریق منوی OBS Studio دوباره باز کنید."
 MacPermissions.AccessGranted="دسترسی ممکن"
@@ -412,8 +423,8 @@
 MacPermissions.Item.Accessibility="قابلیت دسترسی"
 MacPermissions.Item.Accessibility.Details="برای اینکه میانبرهای صفحه کلید (کلیدهای فوری) در زمانی که سایر برنامه‌ها متمرکز هستند کار کنند، لطفاً این مجوز را فعال کنید."
 MacPermissions.Continue="ادامه"
-UpdateAvailable="بروزرسانی جدید در دسترس است"
-UpdateAvailable.Text="نسخه %1.%2.%3 اکنون در دسترس است. <a href='%4'> برای بارگیری اینجا کلیک کنید </a>"
+SourceLeak.Title="خطای پاک‌سازی منبع"
+SourceLeak.Text="در خلال تغییر مجموعه‌های صحنه مشکلی پیش آمد و برخی منابع به درستی حذف نشدند. این مشکل معمولا به واسطه افزونه‌هایی پیش می‌آید که به درستی منابع را آزاد نمی‌کنند. لطفا اطمینان حاصل کنید که همه افزونه‌هایی که استفاده می‌کنید به‌روز باشند.\n\nاستودیوی BBS به منظور جلوگیری از هرگونه احتمال خرابی داده‌ها، از برنامه خارج نمی‌شود."
 Basic.DesktopDevice1="صدای دسکتاپ"
 Basic.DesktopDevice2="صدای دسکتاپ 2"
 Basic.AuxDevice1="صدابَر / Aux"
@@ -476,6 +487,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (انتخاب خودکار: %2)"
 Basic.PropertiesWindow.SelectColor="انتخاب رنگ"
 Basic.PropertiesWindow.SelectFont="انتخاب فونت"
+Basic.PropertiesWindow.SelectFont.WindowTitle="یک فونت را انتخاب کنید"
 Basic.PropertiesWindow.ConfirmTitle="تنظیمات تغییر یافت"
 Basic.PropertiesWindow.Confirm="تغییرات ذخیره نشده‌ای وجود دارند، آیا می‌خواهید آن‌ها را نگه دارید؟"
 Basic.PropertiesWindow.NoProperties="ویژگی موجود نیست"
@@ -586,9 +598,9 @@
 Basic.VCam.VirtualCamera="دوربین مجازی"
 Basic.VCam.OutputType="نوع خروجی"
 Basic.VCam.OutputSelection="انتخاب خروجی"
-Basic.VCam.Internal="داخلی"
-Basic.VCam.InternalDefault="خروجی برنامه (پیش فرض)"
-Basic.VCam.InternalPreview="پیش نمایش خروجی"
+Basic.VCam.OutputType.Program="برنامه (پیش‌فرض)"
+Basic.VCam.OutputSelection.NoSelection="هیچ انتخابی برای این نوع خروجی وجود ندارد"
+Basic.VCam.RestartWarning="برای اعمال این تغییر، دوربین مجازی مجددا راه‌اندازی می شود"
 Basic.MainMenu.File="&پرونده"
 Basic.MainMenu.File.Export="&خروجی گرفتن"
 Basic.MainMenu.File.Import="&وارد کردن"
@@ -630,17 +642,18 @@
 Basic.MainMenu.Edit.AdvAudio="&خصوصیات پیشرفته صدا"
 Basic.MainMenu.View="&نما"
 Basic.MainMenu.View.Toolbars="&نوار ابزارها"
-Basic.MainMenu.View.ListboxToolbars="دکمه های صحنه/منبع"
+Basic.MainMenu.View.ListboxToolbars="نوار ابزار اسکله"
 Basic.MainMenu.View.ContextBar="منبع نوار ابزار"
-Basic.MainMenu.View.SceneTransitions="انتقال ص&حنه"
 Basic.MainMenu.View.SourceIcons="منبع & نمادها"
 Basic.MainMenu.View.StatusBar="& نوار وضعیت"
 Basic.MainMenu.View.Fullscreen.Interface="رابط تمام صفحه"
 Basic.MainMenu.View.ResetUI="&بازنشانی رابط"
 Basic.MainMenu.View.AlwaysOnTop="&همیشه در بالا"
+Basic.MainMenu.View.SceneListMode="حالت فهرست صحنه"
 Basic.MainMenu.Docks="و بارانداز"
 Basic.MainMenu.Docks.ResetDocks="&بازنشانی پایه‌ها"
 Basic.MainMenu.Docks.LockDocks="&قفل کردن اسکله ها"
+Basic.MainMenu.Docks.SideDocks="و اسکله های تمام ارتفاع"
 Basic.MainMenu.Docks.CustomBrowserDocks="&بارگیری مرورگر سفارشی..."
 Basic.MainMenu.SceneCollection="& مجموعه صحنه"
 Basic.MainMenu.Profile="&نمایه"
@@ -649,7 +662,6 @@
 Basic.MainMenu.SceneCollection.Import="وارد کردن مجموعه صحنه"
 Basic.MainMenu.SceneCollection.Export="صادرات مجموعه صحنه"
 Basic.MainMenu.Profile.Exists="نمایه از قبل وجود دارد"
-Basic.MainMenu.SceneCollection.Exists="مجموعه صحنه از قبل وجود دارد"
 Basic.MainMenu.Tools="&ابزارها"
 Basic.MainMenu.Help="&راهنما"
 Basic.MainMenu.Help.HelpPortal="راهنما& پورتال"
@@ -661,8 +673,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="بارگذاری &پرونده ورود به سیستم فعلی"
 Basic.MainMenu.Help.Logs.UploadLastLog="بارگذاری پروندهٔ گزارش &Previous"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="& مشاهده گزارش فعلی"
+Basic.MainMenu.Help.ReleaseNotes="یادداشت های انتشار"
 Basic.MainMenu.Help.CheckForUpdates="بررسی برای بروزرسانی"
 Basic.MainMenu.Help.Repair="بررسی یکپارچکی پرونده"
+Basic.MainMenu.Help.RestartSafeMode="ری‌استارت در حالت ایمن"
+Basic.MainMenu.Help.RestartNormal="ری‌استارت در حالت عادی"
 Basic.MainMenu.Help.CrashLogs="گزارش ها و خرابی"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="& نمایش گزارشهای خرابی"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="بارگذاری گزارش خرابی &Previous"
@@ -732,7 +747,6 @@
 Basic.Settings.General.ChannelName.beta="بتا / انتشار داوطلبان"
 Basic.Settings.General.ChannelDescription.beta="نسخه های پیش از انتشار بالقوه ناپایدار"
 Basic.Settings.Stream="پخش"
-Basic.Settings.Stream.StreamType="نوع پخش"
 Basic.Settings.Stream.Custom.UseAuthentication="استفاده از تایید اعتبار"
 Basic.Settings.Stream.Custom.Username="نام کاربری"
 Basic.Settings.Stream.Custom.Password="رمزعبور"
@@ -764,7 +778,6 @@
 Basic.Settings.Output.Encoder.Video="انکودر ویدئو"
 Basic.Settings.Output.Encoder.Audio="انکودر صدا"
 Basic.Settings.Output.SelectDirectory="انتخاب پوشه ضبط"
-Basic.Settings.Output.SelectFile="ضبط پرونده را انتخاب کنید"
 Basic.Settings.Output.DynamicBitrate="برای مدیریت ازدحام میزان بیت بصورت پویا تغییر دهید"
 Basic.Settings.Output.DynamicBitrate.Beta="تغییر دینامیک بیت ریت برای مدیریت ازدحام (بتا)"
 Basic.Settings.Output.DynamicBitrate.TT="به جای انداختن فریم برای کاهش لگ ، میزان بیت ریت به صورت پویا تغییر می کند.\n\nتوجه داشته باشید که در صورت لگ ناگهانی قابل توجه، این امر می تواند تأخیر را برای بینندگان افزایش دهد.\nوقتی بیت ریت کاهش یابد، بازیابی آن ممکن است چند دقیقه طول بکشد.\n\nدر حال حاضر فقط برای RTMP پشتیبانی می شود."
@@ -792,7 +805,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="هشدار: اگر کیفیت ضبط روی \"همان جریان\" تنظیم شود، ضبط ها متوقف نمی شوند."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="هشدار: فرمت ضبط انتخابی فعلی با رمزگذار(های) جریان انتخابی سازگار نیست."
 Basic.Settings.Output.Simple.Warn.Encoder="هشدار: اگر همزمان با پخش، ضبط هم می‌کنید، ضبط با کدگذار نرم‌افزاری با کیفیتی متفاوت از پخش، به پردازش اضافی نیاز دارد."
-Basic.Settings.Output.Simple.Warn.Lossless="هشدار: کیفیت بدون از دست دادن حجم فایل های فوق العاده زیادی ایجاد می کند! کیفیت بدون افت می تواند از 7 گیگابایت فضای دیسک در دقیقه با وضوح بالا و فریم ریت بالا استفاده کند. بدون افت برای ضبط طولانی توصیه نمی شود مگر اینکه فضای دیسک بسیار زیادی در دسترس داشته باشید."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="آیا مطمئن هستید که می خواهید از کیفیت بدون افت استفاده کنید?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="هشدار کیفیت بدون افت!"
 Basic.Settings.Output.Simple.Encoder.Software="نرم افزار (x264)"
@@ -943,8 +955,8 @@
 Basic.Settings.Audio.PeakMeterType="نوع حد سنج"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="حد نمونه"
 Basic.Settings.Audio.PeakMeterType.TruePeak="حد واقعی (استفاده بالاتر از پردازنده)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="هشدار: صدای صوتی فراگیر فعال است."
-Basic.Settings.Audio.MultichannelWarning="در صورت پخش زنده، بررسی کنید که آیا خدمت پخش جریانی شما هم از جذب صدای فراگیر و هم از پخش صدای فراگیر پشتیبانی می‌کند. Facebook 360 Live یکی از نمونه‌هایی است که در آن صدای فراگیر به طور کامل پشتیبانی می‌شود. اگرچه Facebook Live و YouTube Live هردو پذیرش فراگیر را قبول می‌کنند، Facebook Live صدا را به صورت استریو ترکیب و YouTube Live فقط دو کانال را پخش می‌کند.\n\nفیلترهای صوتی OBS با صدای فراگیر سازگار هستند، اگرچه پشتیبانی از پلاگین VST تضمین نشده است."
+Basic.Settings.Audio.MultichannelWarning.Enabled="هشدار: صدای صوتی فراگیر فعال است."
+Basic.Settings.Audio.MultichannelWarning="در صورت پخش جریانی، بررسی کنید که آیا سرویس پخش شما هم از پخش صدای فراگیر و هم از ضبط صدای فراگیر پشتیبانی می‌کند. به عنوان مثال، Facebook 360 Live به طور کامل از صدای فراگیر پشتیبانی می کند. YouTube Live از دریافت صدا 5.1 (و پخش در تلویزیون‌ها) پشتیبانی می‌کند.\n\nفیلترهای صوتی OBS با صدای فراگیر سازگار هستند، اگرچه پشتیبانی از افزونه VST تضمین نشده است."
 Basic.Settings.Audio.MultichannelWarning.Title="صدای صوتی فراگیر فعال شود؟"
 Basic.Settings.Audio.MultichannelWarning.Confirm="آیا مطمئن هستید که می خواهید صدای فراگیر را فعال کنید?"
 Basic.Settings.Audio.Devices="دستگاه های صوتی کلی"
@@ -991,7 +1003,6 @@
 Basic.Settings.Advanced.FormatWarning="هشدار: فرمت‌های رنگی غیر از NV12/P010 عمدتاً برای ضبط در نظر گرفته شده‌اند و هنگام پخش جریانی توصیه نمی‌شوند. پخش جریانی ممکن است باعث افزایش استفاده از CPU به دلیل تبدیل فرمت رنگ شود."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="هشدار: فرمت‌های با دقت بالا بیشتر با فضاهای رنگی HDR استفاده می‌شوند."
 Basic.Settings.Advanced.FormatWarning2100="هشدار: Rec. 2100 باید از فرمت با دقت بیشتری استفاده کند."
-Basic.Settings.Advanced.Audio.BufferingTime="زمان بافر صوتی"
 Basic.Settings.Advanced.Video.ColorFormat="فرمت رنگ"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 بیتی، 4:2:0، 2 سطح)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 بیتی، 4:2:0، 3 سطح)"
@@ -1016,6 +1027,7 @@
 Basic.Settings.Advanced.Network="شبکه"
 Basic.Settings.Advanced.Network.Disabled="پروتکل پخش جریانی انتخاب شده فعلی از تغییر تنظیمات شبکه پشتیبانی نمی کند."
 Basic.Settings.Advanced.Network.BindToIP="اتصال به IP"
+Basic.Settings.Advanced.Network.IPFamily="آی پی خانواده"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="بهینه سازی شبکه را فعال کنید"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="قدم زدن TCP را فعال کنید"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="تلاش می شود تا با تنظیم میزان انتقال، خروجی RTMP با سایر برنامه های حساس به تأخیر در شبکه دوستانه تر شود.\nممکن است خطر افت فریم در اتصالات ناپایدار را افزایش دهد."
@@ -1093,6 +1105,8 @@
 SceneItemShow="نمایش \"%1\""
 SceneItemHide="مخفی کردن \"%1\""
 OutputWarnings.NoTracksSelected="شما حداقل باید یک لایه صوتی را انتخاب کنید"
+OutputWarnings.NoTracksSelectedOnExit.Title="خطای تنظیمات خروجی"
+OutputWarnings.NoTracksSelectedOnExit.Text="همه خروجی ها باید حداقل یک تراک صوتی انتخاب شده داشته باشند."
 OutputWarnings.MP4Recording="هشدار: اگر پرونده نتواند نهایی شود ، فایل ضبط شده در MP4 / MOV قابل بازیابی نیست (به عنوان مثال در نتیجه صفحه آبی مرگ ، افت برق و غیره). اگر می خواهید چندین لایه صوتی ضبط کنید ، از MKV استفاده کنید و پس از پایان ضبط به فرمت MP4 / MOV تغییر دهید (فایل-> بازسازی مجدد ضبط )"
 OutputWarnings.CannotPause="هشدار: اگر کدگذار ضبط روی «(استفاده از کدگذار پخش)» تنظیم شود، ضبط‌ها نمی‌توانند متوقف شوند"
 OutputWarnings.CodecIncompatible="انتخاب رمزگذار صوتی یا تصویری به دلیل ناسازگاری بازنشانی شد. لطفاً یک رمزگذار سازگار از لیست انتخاب کنید."
@@ -1118,6 +1132,7 @@
 About.GetInvolved="مشارکت کنید"
 About.Authors="سازنده ها"
 About.License="مجوز"
+About.Error="خطا! پرونده قابل خواند نیست.\n\nبرو به: %1"
 About.Contribute="از پروژه OBS پشتیبانی کنید"
 AddUrl.Title="منبع را از طریق نشانی اضافه کنید"
 AddUrl.Text="شما یک نشانی را به OBS کشیده اید. با این کار پیوند بطور خودکار به عنوان منبع اضافه می شود. ادامه هید؟"
@@ -1139,14 +1154,12 @@
 LoadProfileNeedsRestart="نمایه شامل تنظیماتی است که نیاز به آغاز دوبارهٔ OBS دارند:\n%1\n\nمی‌خواهید برای اثر گرفتن این تنظیمات OBS را دوباره آغاز کنید؟"
 ContextBar.NoSelectedSource="بدون انتخاب منبع"
 ContextBar.ResetTransform="تنظیم مجدد تبدیل"
-ContextBar.FitToCanvas="متناسب با بوم"
 ContextBar.MediaControls.PlayMedia="اجرا رسانه"
 ContextBar.MediaControls.PauseMedia="مکث رسانه"
 ContextBar.MediaControls.StopMedia="توقف رسانه"
 ContextBar.MediaControls.RestartMedia="راه اندازی دوباره رسانه"
 ContextBar.MediaControls.PlaylistNext="بعدی در لیست پخش"
 ContextBar.MediaControls.PlaylistPrevious="قبلی در لیست پخش"
-ContextBar.MediaControls.MediaProperties="ویژگی های رسانه"
 ContextBar.MediaControls.BlindSeek="ویجت جستجوی رسانه"
 YouTube.Auth.Ok="مجوز با موفقیت انجام شد.\nاکنون می توانید این صفحه را ببندید."
 YouTube.Auth.NoCode="فرایند مجوز کامل نشده است."
@@ -1228,3 +1241,5 @@
 YouTube.Errors.liveChatEnded="پخش جریانی تمام شد."
 YouTube.Errors.messageTextInvalid="پیام معتبر نیست."
 YouTube.Errors.rateLimitExceeded="شما خیلی سریع پیام می فرستید."
+YouTube.DocksRemoval.Title="پایگاه‌های مرورگر YouTube قدیمی را پاک کنید"
+YouTube.DocksRemoval.Text="این پایه‌های مرورگر به‌عنوان منسوخ شده حذف خواهند شد:\n\n%1\nبه‌جای آن از «Docks/YouTube Live Control Room» استفاده کنید."

obs-studio-29.1.3.tar.xz/UI/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/fi-FI.ini Changed

@@ -92,7 +92,6 @@
 LogViewer="Näytä loki"
 ShowOnStartup="Näytä käynnistyksessä"
 OpenFile="Avaa tiedosto"
-AddValue="Lisää %1"
 AddSource="Lisää lähde"
 RemoveScene="Poista valittu näkymä"
 RemoveSource="Poista valitut näkymät"
@@ -104,11 +103,19 @@
 SourceFilters="Avoimen lähdekoodin suodattimet"
 MixerToolbarMenu="Äänen Mikserivalikko"
 SceneFilters="Avaa näkymän suodattimet"
+List="Lista"
+Grid="Ruudukko"
 PluginsFailedToLoad.Title="Liitännäisen latausvirhe"
 PluginsFailedToLoad.Text="Seuraavien OBS-liitännäisten lataaminen epäonnistui:\n\n%1\nPäivitä tai poista kyseiset liitänäiset."
 AlreadyRunning.Title="OBS on jo käynnissä"
 AlreadyRunning.Text="OBS on jo käynnissä! Ellet tarkoittanut tehdä näin, ole hyvä ja sulje aikaisemmat OBS-prosessit ennen uuden käynnistämistä. Jos olet asettanut OBS:n pienentymään ilmaisinalueelle, varmista ettei se ole siellä yhä päällä."
 AlreadyRunning.LaunchAnyway="Käynnistä joka tapauksessa"
+AutoSafeMode.Title="Vikasietotila"
+AutoSafeMode.Text="OBS ei sammunut oikeaoppisesti viimeisen istunnon päätteeksi.\n\nHaluatko käynnistää OBS:n vikasietotilassa (kolmannen osapuolen liitännäiset, komentosarjat ja WebSocketit poistetaan käytöstä)?"
+AutoSafeMode.LaunchSafe="Suorita vikasietotilassa"
+AutoSafeMode.LaunchNormal="Suorita normaalisti"
+SafeMode.Restart="Haluatko käynnistää OBS:n uudelleen vikasietotilaan (kolmannen osapuolen liitännäiset, komentosarjat ja WebSocketit poistetaan käytöstä)?"
+SafeMode.RestartNormal="Haluatko käynnistää OBS:n uudelleen normaalissa tilassa?"
 ChromeOS.Title="Alustaa ei tueta"
 ChromeOS.Text="OBS vaikuttaa olevan käynnissä ChromeOS-kontissa. Tämä alusta ei ole tuettu."
 Wine.Title="Wine-ohjelmiston kautta ajaminen havaittu"
@@ -175,8 +182,8 @@
 Basic.AutoConfig.StreamPage.Server="Palvelin"
 Basic.AutoConfig.StreamPage.StreamKey="Striimiavain"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: kirjoita salaussalasana.\nRTMP: kirjoita avain, jonka palvelu tarjoaa.\nSRT: kirjoita streamin id, jos palvelu käyttää sitä."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Linkki)"
 Basic.AutoConfig.StreamPage.EncoderKey="Enkooderin avain"
+Basic.AutoConfig.StreamPage.BearerToken="Kantoaalto"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Yhdistetty tili"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Arvioi bittinopeus kaistan nopeustestin avulla (saattaa kestää muutaman minuutin)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Suosi laitteistokoodausta"
@@ -228,8 +235,6 @@
 Updater.UpdateNow="Päivitä nyt"
 Updater.RemindMeLater="Muistuta myöhemmin"
 Updater.Skip="Ohita versio"
-Updater.Running.Title="Ohjelma on käytössä"
-Updater.Running.Text="Tallentaminen/lähetys on aktiivinen. Sulje kaikki ulostulo ennen päivityksen jatkamista"
 Updater.NoUpdatesAvailable.Title="Päivityksiä ei ole saatavilla"
 Updater.NoUpdatesAvailable.Text="Päivityksiä ei ole tällä hetkellä saatavilla"
 Updater.BranchNotFound.Title="Päivityskanava poistettu"
@@ -239,8 +244,6 @@
 Updater.RepairConfirm.Title="Vahvistua eheystarkistus"
 Updater.RepairConfirm.Text="Eheyden tarkistus tarkistaa OBS-asennuksesi vioittumisen varalta ja lataa rikkinäiset/muokatut tiedostot uudelleen. Tämä voi kestää hetken.\n\nHaluatko jatkaa?"
 Updater.FailedToLaunch="Päivittäjän käynnistäminen epäonnistui"
-Updater.GameCaptureActive.Title="Pelikaappaus on aktiivinen"
-Updater.GameCaptureActive.Text="Game capture -kirjasto on yhä käytössä. Sulje kaikki pelit/ohjelmat, joita on kaapattu (tai käynnistä Windows uudelleen) ja yritä uudelleen."
 QuickTransitions.SwapScenes="Vaihda esikatselu-/ohjelman näkymät siirtymisen jälkeen"
 QuickTransitions.SwapScenesTT="Vaihtaa esikatselun ja ohjelman kohtauksia siirtymisen jälkeen (jos ohjelman alkuperäinen kohtaus on vielä olemassa).\nTämä ei kumoa mitään muutoksia, jotka on mahdollisesti tehty ohjelman alkuperäiseen kohtaukseen."
 QuickTransitions.DuplicateScene="Kahdenna näkymä"
@@ -254,6 +257,8 @@
 Basic.SceneTransitions="Näkymäsiirtymät"
 Basic.TransitionDuration="Kesto"
 Basic.TogglePreviewProgramMode="Studio-tila"
+Basic.EnablePreviewProgramMode="Käytä studiotilaa"
+Basic.DisablePreviewProgramMode="Poista studiotila käytöstä"
 Undo.Undo="Kumoa"
 Undo.Redo="Tee uudelleen"
 Undo.Add="Lisää %1'"
@@ -302,6 +307,8 @@
 Undo.GroupItems="Ryhmittele kohteet '%1'"
 TransitionNameDlg.Text="Syötä siirtymän nimi"
 TransitionNameDlg.Title="Siirtymän nimi"
+TitleBar.SafeMode="VIKASIETOTILA"
+TitleBar.PortableMode="Siirrettävä tila"
 TitleBar.Profile="Profiili"
 TitleBar.Scenes="Näkymät"
 NameExists.Title="Nimi on jo olemassa"
@@ -326,6 +333,7 @@
 Output.StartStreamFailed="Lähetyksen aloittaminen epäonnistui"
 Output.StartRecordingFailed="Tallennuksen aloittaminen epäonnistui"
 Output.StartReplayFailed="Toistopuskurin käynnistäminen epäonnistui"
+Output.StartVirtualCamFailed="Virtuaalikameran käynnistäminen epäonnistui"
 Output.StartFailedGeneric="Ulostulon käynnistäminen epäonnistui. Tarkista loki lisätietoja varten.\n\nHuomio: Jos käytät NVENC tai AMD -enkoodereita, varmista, että näytönohjaimen ajurit on päivitetty ajantasalle."
 Output.ReplayBuffer.PauseWarning.Title="Uusintoja ei voi tallentaa pysäytettynä"
 Output.ReplayBuffer.PauseWarning.Text="Varoitus: Uusintoja ei voi tallentaa kun tallennus on pysäytetty."
@@ -338,7 +346,7 @@
 Output.ConnectFail.Disconnected="Yhteys palvelimeen katkaistiin."
 Output.StreamEncodeError.Title="Enkoodausvirhe"
 Output.StreamEncodeError.Msg="Lähetyksen aikana tapahtui enkoodausvirhe."
-Output.StreamEncodeError.Msg.LastError="Striimauksen aikana tapahtui virhe:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Striimauksen aikana tapahtui virhe: %1"
 Output.RecordFail.Title="Tallennuksen aloittaminen epäonnistui"
 Output.RecordFail.Unsupported="Ulostulon muoto ei ole tuettu tai se ei tue useampaa kuin yhtä ääniraitaa. Tarkista asetuksesi ja yritä uudelleen."
 Output.RecordNoSpace.Title="Liian vähän levytilaa"
@@ -346,7 +354,7 @@
 Output.RecordError.Title="Tallennusvirhe"
 Output.RecordError.Msg="Tallennuksen aikana tapahtui määrittelemätön virhe."
 Output.RecordError.EncodeErrorMsg="Tallennuksen aikana tapahtui enkoodausvirhe."
-Output.RecordError.EncodeErrorMsg.LastError="Tallennuksen aikana tapahtui virhe:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Striimauksen aikana tapahtui virhe: %1"
 Output.BadPath.Title="Viallinen tiedostopolku"
 Output.BadPath.Text="Määritettyä tallennuspolkua ei voitu avata. Tarkista polku kohdasta Asetukset → Ulostulo → Tallennus."
 Output.NoBroadcast.Title="Lähetystä ei ole määritetty"
@@ -376,6 +384,8 @@
 Remux.ExitUnfinishedTitle="Muunto on käynnissä"
 Remux.ExitUnfinished="Muunto ei ole valmis. Jos keskeytät nyt, kohdetiedostosta saattaa tulla käyttökelvoton.\nHaluatko varmasti pysäyttää muunnon?"
 Remux.HelpText="Pudota tiedostoja tähän ikkunaan muuntaaksesi ne tai valitse tyhjä \"OBS-tallenne\" -sarake selataksesi tiedoston."
+Remux.NoFilesAddedTitle="Remuxing-tiedostoa ei ole lisätty"
+Remux.NoFilesAdded="Remux ei sisällä tiedostoa. Pudota kansio, joka sisältää yhden tai useamman videon."
 MissingFiles="Tiedostoja puuttuu"
 MissingFiles.MissingFile="Puuttuva tiedosto"
 MissingFiles.NewFile="Uusi tiedosto"
@@ -394,6 +404,7 @@
 MissingFiles.AutoSearchText="OBS on löytänyt lisäisiä vastaavuuksia puuttuville tiedostoille kyseisessä hakemistossa. Haluatko lisätä ne?"
 MissingFiles.NoMissing.Title="Puuttuvien tiedostojen tarkistus"
 MissingFiles.NoMissing.Text="Yksikään tiedosto ei vaikuta puuttuvan."
+MacPermissions.MenuAction="Tarkista sovelluksen käyttöoikeudet..."
 MacPermissions.Title="Tarkista sovelluksen käyttöoikeudet"
 MacPermissions.Description="OBS Studio vaatii luvat voidakseen tarjota tiettyjä ominaisuuksia. Suositeltavaa ottaa nämä käyttöoikeudet käyttöön, mutta niitä ei vaadita sovelluksen käyttämiseen. Voit aina ottaa ne myöhemmin käyttöön."
 MacPermissions.Description.OpenDialog="Voit avata tämän ikkunan uudelleen OBS Studio valikon kautta."
@@ -409,8 +420,8 @@
 MacPermissions.Item.Accessibility="Esteettömyys"
 MacPermissions.Item.Accessibility.Details="Jos haluat pikanäppäimet (hotkeys) toimintaan, kun muut sovellukset ovat kohdistettuna, ota tämä lupa käyttöön."
 MacPermissions.Continue="Jatka"
-UpdateAvailable="Uusi päivitys saatavilla"
-UpdateAvailable.Text="Versio %1.%2.%3 on nyt saatavilla. <a href='%4'>Lataa tästä</a>"
+SourceLeak.Title="Puhdistusvirhe"
+SourceLeak.Text="Kohtausta vaihtaessa tapahtui ongelma, eikä kaikkia lähteitä voitu poistaa. Tämä ongelma johtuu yleensä laajennuksista, jotka eivät vapauta resursseja oikein. Varmista, että kaikki käyttämäsi laajennukset ovat ajan tasalla.\n\nOBS Studio sulkeutuu nyt mahdollisen tietojen vioittumisen estämiseksi."
 Basic.DesktopDevice1="Äänentoistolaite"
 Basic.DesktopDevice2="Äänentoistolaite 2"
 Basic.Scene="Näkymä"
@@ -466,6 +477,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (automaat.: %2)"
 Basic.PropertiesWindow.SelectColor="Valitse väri"
 Basic.PropertiesWindow.SelectFont="Valitse kirjasin"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Valitse fontti"
 Basic.PropertiesWindow.ConfirmTitle="Asetukset ovat muuttuneet"
 Basic.PropertiesWindow.Confirm="Muutoksia ei ole vielä tallennettu. Haluatko pitää muutokset?"
 Basic.PropertiesWindow.NoProperties="Ominaisuuksia ei ole saatavilla"
@@ -576,9 +588,9 @@
 Basic.VCam.VirtualCamera="Virtuaalikamera"
 Basic.VCam.OutputType="Ulostulon tyyppi"
 Basic.VCam.OutputSelection="Ulostulon valinta"
-Basic.VCam.Internal="Sisäinen"
-Basic.VCam.InternalDefault="Ohjelman ulostulo (oletus)"
-Basic.VCam.InternalPreview="Esikatselun ulostulo"
+Basic.VCam.OutputType.Program="Ohjelma (oletus)"
+Basic.VCam.OutputSelection.NoSelection="Ei valintaa tälle ulostulotyypille"
+Basic.VCam.RestartWarning="Virtuaalikamera käynnistetään uudelleen, jotta tämä muutos tulee voimaan"
 Basic.MainMenu.File="&Tiedosto"
 Basic.MainMenu.File.Export="Vi&e"
 Basic.MainMenu.File.Import="T&uo"
@@ -620,17 +632,18 @@
 Basic.MainMenu.Edit.AdvAudio="Äänen lisäomin&aisuudet"
 Basic.MainMenu.View="&Näytä"
 Basic.MainMenu.View.Toolbars="&Työkalurivit"
-Basic.MainMenu.View.ListboxToolbars="Näkymä/Lähde-listan painikkeet"
+Basic.MainMenu.View.ListboxToolbars="Telakoi työkalupalkit"
 Basic.MainMenu.View.ContextBar="Lähdetyökalurivi"
-Basic.MainMenu.View.SceneTransitions="Näkymäsiirtymät (&C)"
 Basic.MainMenu.View.SourceIcons="Lähte&iden kuvakkeet"
 Basic.MainMenu.View.StatusBar="Ti&lapalkki"
 Basic.MainMenu.View.Fullscreen.Interface="Koko näytön käyttöliittymä"
 Basic.MainMenu.View.ResetUI="&Palauta käyttöliittymä"
 Basic.MainMenu.View.AlwaysOnTop="Aina &päällimmäisenä"
+Basic.MainMenu.View.SceneListMode="Kohtaus luettelo"
 Basic.MainMenu.Docks="&Telakat"
 Basic.MainMenu.Docks.ResetDocks="&Palauta telakat"
 Basic.MainMenu.Docks.LockDocks="&Lukitse telakat"
+Basic.MainMenu.Docks.SideDocks="&Täyden korkeuden telakat"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Mukautetut selaintelakat..."
 Basic.MainMenu.SceneCollection="&Näkymäkokoelma"
 Basic.MainMenu.Profile="&Profiili"
@@ -639,7 +652,6 @@
 Basic.MainMenu.SceneCollection.Import="Tuo näkymäkokoelma"
 Basic.MainMenu.SceneCollection.Export="Vie näkymäkokoelma"
 Basic.MainMenu.Profile.Exists="Profiili on jo olemassa"
-Basic.MainMenu.SceneCollection.Exists="Näkymäkokoelma on jo olemassa"
 Basic.MainMenu.Tools="&Työkalut"
 Basic.MainMenu.Help="&Ohje"
 Basic.MainMenu.Help.HelpPortal="O&hjekeskus"
@@ -651,8 +663,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Lähetä &nykyinen lokitiedosto"
 Basic.MainMenu.Help.Logs.UploadLastLog="Lähetä &edellinen lokitiedosto"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Näytä nykyinen &loki"
+Basic.MainMenu.Help.ReleaseNotes="Julkaisutiedot"
 Basic.MainMenu.Help.CheckForUpdates="Tarkista päivitykset"
 Basic.MainMenu.Help.Repair="Tarkista tiedoston eheys"
+Basic.MainMenu.Help.RestartSafeMode="Käynnistä uudelleen vikasietotilassa"
+Basic.MainMenu.Help.RestartNormal="Käynnistä uudelleen normaalissa tilassa"
 Basic.MainMenu.Help.CrashLogs="Kaatumis&raportit"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Näytä kaatumi&sraportit"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Lähetä &edellinen kaatumisraportti"
@@ -722,7 +737,6 @@
 Basic.Settings.General.ChannelName.beta="Beetat / julkaisuehdokkaat"
 Basic.Settings.General.ChannelDescription.beta="Mahdollisesti epävakaat esijulkaisuversiot"
 Basic.Settings.Stream="Lähetys"
-Basic.Settings.Stream.StreamType="Lähetystyyppi"
 Basic.Settings.Stream.Custom.UseAuthentication="Käytä todennusta"
 Basic.Settings.Stream.Custom.Username="Käyttäjätunnus"
 Basic.Settings.Stream.Custom.Password="Salasana"
@@ -750,10 +764,9 @@
 Basic.Settings.Output.Format.fMOV="Hajanainen MOV (.mov)"
 Basic.Settings.Output.Format.TT.fmov="HajanainenMOV kirjoittaa tallennuksen lohkoilla ja ei vaadi samaa viimeistelyä kuin perinteinen MOV-tiedosto.\nTämä varmistaa, että tiedosto pysyy toistettavana, vaikka kirjoittaminen levylle keskeytyisi, mikä aiheutuu esimerkiksi sähkökatkon vuoksi.\n\nTämä ei välttämättä ole yhteensopiva kaikkien ohjelmien ja editorien kanssa. Käytä Tiedosto → Muunna tallenteita muuntaaksesi tiedoston yhteensopivaan muotoon tarvittaessa."
 Basic.Settings.Output.Format.TT.fmp4="Hajanainen MP4 kirjoittaa tallennuksen lohkoilla ja ei vaadi samaa viimeistelyä kuin perinteinen MP4-tiedosto.\nTämä varmistaa, että tiedosto pysyy toistettavana, vaikka kirjoittaminen levylle keskeytyisi, mikä aiheutuu esimerkiksi sähkökatkon vuoksi.\n\nTämä ei välttämättä ole yhteensopiva kaikkien ohjelmien ja editorien kanssa. Käytä Tiedosto → Muunna tallenteita muuntaaksesi tiedoston yhteensopivaan muotoon tarvittaessa."
-Basic.Settings.Output.Encoder.Video="Video pakkaus"
-Basic.Settings.Output.Encoder.Audio="Audio pakkaus"
+Basic.Settings.Output.Encoder.Video="Videokooderi"
+Basic.Settings.Output.Encoder.Audio="Äänikooderi"
 Basic.Settings.Output.SelectDirectory="Valitse tallennuskansio"
-Basic.Settings.Output.SelectFile="Valitse tallennustiedosto"
 Basic.Settings.Output.DynamicBitrate="Muuta bittinopeutta verkon ruuhkautumisen mukaan"
 Basic.Settings.Output.DynamicBitrate.Beta="Muuta bittinopeutta verkon ruuhkautumisen mukaan (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Kuvaruutujen pudottamisen sijaan vähentää bittinopeutta automaattisesti, kun verkko ruuhkautuu.\n\nHuomaathan, että tämä saattaa lisätä viivettä katsojille, mikäli verkko ruuhkautuu merkittävästi.\nKun bittinopeus tippuu, sen nousemisessa saattaa kestää muutamia minuutteja.\n\nTällä hetkellä tuettu vain RTMP:ssä."
@@ -781,7 +794,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Varoitus: Tallennusta ei voi pysäyttää jos laatu on asetettu olemaan \"Sama kuin lähetyksessä\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Varoitus: Tällä hetkellä valittu tallennuksen formaatti ei ole yhteensopiva valittun suoratoiston pakkaajan kanssa."
 Basic.Settings.Output.Simple.Warn.Encoder="Varoitus: Tallentaminen lähetyksestä eroavalla laadulla vaatii prosessorilta lisätyötä jos lähetät ja tallennat samanaikaisesti."
-Basic.Settings.Output.Simple.Warn.Lossless="Varoitus: häviötön laatu luo järjettömän kokoisia tiedostoja! Häviötön laatu saattaa käyttää jopa 7 gigatavua levytilastasi minuutissa, mikäli käytät suuria resoluutioita ja korkeita ruutunopeuksia. Häviötöntä pakkausta ei suositella pitkiin tallennuksiin ellei sinulla ole todella paljon tallennustilaa käytettävissäsi."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Haluatko varmasti käyttää häviötöntä laatua?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Häviötön laatu!"
 Basic.Settings.Output.Simple.Encoder.Software="Ohjelmistopohjainen (x264)"
@@ -930,8 +942,8 @@
 Basic.Settings.Audio.PeakMeterType="Huippumittarin tyyppi"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Huippuarvon näyte"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Todellinen huippuarvo (Korkeampi CPU:n käyttö)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="VAROITUS: Monikanavaääni on käytössä."
-Basic.Settings.Audio.MultichannelWarning="Varmista lähettäessä että palvelu tukee sekä monikanavaäänen lähettämistä, että toistamista. Facebook 360 Live on esimerkiksi palvelu jossa monikanavaääni on täysin tuettu. Vaikka Facebook Live ja YouTube Live hyväksyvät monikanavaäänen lähettämisen, Facebook Live miksaa äänen stereoksi ja YouTube Live toistaa vain kaksi kanavaa.\n\nOBS:n äänisuodattimet tukevat monikanavaääntä, mutta VST-liitännäiset eivät välttämättä tue."
+Basic.Settings.Audio.MultichannelWarning.Enabled="VAROITUS: Monikanavaääni on käytössä."
+Basic.Settings.Audio.MultichannelWarning="Varmista striimatessa että palvelu tukee sekä monikanavaisen äänen lähettämistä, että toistamista. Facebook 360 Live on esimerkiksi palvelu jossa tämä on täysin tuettu. Vaikka Facebook Live ja YouTube Live hyväksyvät monikanavaisen äänen lähettämisen, Facebook Live miksaa äänen stereoksi ja YouTube Live toistaa vain kaksi kanavaa.\n\nOBS suodattimet tukevat monikanavaista ääntä, mutta VST-liitännäiset eivät välttämättä sitä tue."
 Basic.Settings.Audio.MultichannelWarning.Title="Käytä monikanava-ääntä?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Haluatko varmasti käyttää monikanavaista ääntä?"
 Basic.Settings.Audio.Devices="Yleiset äänilaitteet"
@@ -978,7 +990,6 @@
 Basic.Settings.Advanced.FormatWarning="Varoitus: Muut värimuodot kuin NV12/P010 on ensisijaisesti tarkoitettu tallentamiseen, eikä niitä suositella suoratoiston aikana. Suoratoisto voi aiheuttaa lisääntynyttä suorittimen käyttöä värimuodon muuntamisen vuoksi."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Varoitus: Korkean tarkkuuden formaatteja käytetään yleisemmin HDR-väritiloissa."
 Basic.Settings.Advanced.FormatWarning2100="Varoitus: Rec. 2100:n tulisi käyttää muotoa, joka on tarkempi."
-Basic.Settings.Advanced.Audio.BufferingTime="Äänen puskurointiaika"
 Basic.Settings.Advanced.Video.ColorFormat="Värimuoto"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2-tasoa)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3-tasoa)"
@@ -1003,6 +1014,7 @@
 Basic.Settings.Advanced.Network="Verkko"
 Basic.Settings.Advanced.Network.Disabled="Valittu suoratoistoprotokolla ei tue verkkoasetusten vaihtamista."
 Basic.Settings.Advanced.Network.BindToIP="Liitä IP:seen"
+Basic.Settings.Advanced.Network.IPFamily="IP-perhe"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Käytä verkon optimointeja"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Käytä TCP:n tahdistusta"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Yrittää tehdä RTMP:n ulostulosta ystävällisemmän muita verkon viiveherkkiä sovelluksia varten säätelemällä tiedonsiirron nopeutta.\nTämä saattaa kasvattaa ruutujen pudotusten riskiä epävakailla yhteyksillä."
@@ -1059,6 +1071,8 @@
 SceneItemShow="Näytä '%1'"
 SceneItemHide="Piilota '%1'"
 OutputWarnings.NoTracksSelected="Sinun täytyy valita ainakin yksi raita"
+OutputWarnings.NoTracksSelectedOnExit.Title="Virhe ulostuloasetuksissa"
+OutputWarnings.NoTracksSelectedOnExit.Text="Kaikilla ulostuloilla täytyy olla valittuna vähintään yksi ääniraita."
 OutputWarnings.MP4Recording="Varoitus: MP4/MOV-muotoon tallentaessa tiedostoista tulee lukukelvottomia, mikäli niitä ei voi viimeistellä. (esim. johtuen BSOD:sta, sähkökatkosta jne.) Jos haluat tallentaa useampaa ääniraitaa, kannattaa käyttää MKV-muotoa ja muuntaa jälkikäteen MP4/MOV-muotoon. (Tiedosto → Muunna tallenteita)"
 OutputWarnings.CannotPause="Varoitus: Tallennusta ei voi pysäyttää jos tallennusenkooderi on asetettu olemaan \"(Käytä lähetysenkooderia)\""
 OutputWarnings.CodecIncompatible="Ääni- tai videokooderin valinta nollattiin yhteensopimattomuuden vuoksi. Valitse pakkauskooderi luettelosta."
@@ -1084,6 +1098,7 @@
 About.GetInvolved="Osallistu"
 About.Authors="Tekijät"
 About.License="Lisenssi"
+About.Error="Virhe! Tiedostoa ei voitu lukea.\n\nMene: %1"
 About.Contribute="Tue OBS-projektia"
 AddUrl.Title="Lisää lähde URL-osoitteesta"
 AddUrl.Text="Olet raahannut URL-osoitteen OBS-ohjelmistoon. Haluatko lisätä URL-osoitteen lähteeksi?"
@@ -1104,14 +1119,12 @@
 LoadProfileNeedsRestart="Profiili sisältää asetuksia, jotka vaativat OBS:n uudelleenkäynnistyksen:\n%1\n\nHaluatko käynnistää OBS:n uudelleen, jotta muutokset tulevat voimaan?"
 ContextBar.NoSelectedSource="Lähdettä ei ole valittu"
 ContextBar.ResetTransform="Nollaa muunnos"
-ContextBar.FitToCanvas="Sovita piirtoalueeseen"
 ContextBar.MediaControls.PlayMedia="Toista media"
 ContextBar.MediaControls.PauseMedia="Keskeytä media"
 ContextBar.MediaControls.StopMedia="Pysäytä media"
 ContextBar.MediaControls.RestartMedia="Uudelleenkäynnistä media"
 ContextBar.MediaControls.PlaylistNext="Seuraava soittolistalla"
 ContextBar.MediaControls.PlaylistPrevious="Edellinen soittolistalla"
-ContextBar.MediaControls.MediaProperties="Median ominaisuudet"
 ContextBar.MediaControls.BlindSeek="Median hakutyökalu"
 YouTube.Auth.Ok="Valtuutus suoritettu onnistuneesti.\nVoit nyt sulkea tämän sivun."
 YouTube.Auth.NoCode="Valtuutusprosessia ei saatettu valmiiksi."
@@ -1192,3 +1205,5 @@
 YouTube.Errors.liveChatEnded="Suora lähetys on päättynyt."
 YouTube.Errors.messageTextInvalid="Viestin teksti ei kelpaa."
 YouTube.Errors.rateLimitExceeded="Lähetät viestejä liian nopeasti."
+YouTube.DocksRemoval.Title="Tyhjennä vanhat YouTube selaimen telakat"
+YouTube.DocksRemoval.Text="Nämä selaimen telakoinnit poistetaan vanhentuneina:\n\n%1\nKäytä sen sijaan \"Docks/YouTube Live Control Room\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/fil-PH.ini Changed

@@ -89,7 +89,6 @@
 LogViewer="Pantingin sa Log"
 ShowOnStartup="Ipakita pagbukas"
 OpenFile="Buksan ang file"
-AddValue="Magdagdag ng %1"
 AddSource="Magdagdag ng Pinagmulan"
 RemoveScene="Alisin ang Napiling Eksena"
 RemoveSource="Alisin ang Napiling Eksena(s)"
@@ -101,11 +100,18 @@
 SourceFilters="Buksan Ang Pinagmulan Ng Filters"
 MixerToolbarMenu="Tunog ng Mixer Menu"
 SceneFilters="Buksan Ang Eskena Filters"
+List="Listahan"
 PluginsFailedToLoad.Title="Ang mga Plugin ay nag error sa pag-load."
 PluginsFailedToLoad.Text="Nabigong mag-load ang mga sumusunod na plugin ng OBS:\n\n%1\nPaki-update o alisin ang mga plugin na ito."
 AlreadyRunning.Title="Tumatakbo na ang OBS"
 AlreadyRunning.Text="Tumatakbo na ang OBS! Maliban na lamang kung gusto mong gawin ito, pakiusap patayin ang anomang umiiral na instansiya ng OBS bago subukang magpatakbo ng panibagong instansiya. Kung itinakda sa OBS na lumiit tungo sa system tray, pakitingnan kung ito ay tumatakbo pa rin doon."
 AlreadyRunning.LaunchAnyway="Patakbuhin pa rin"
+AutoSafeMode.Title="Ligtas Na Mode"
+AutoSafeMode.Text="Ang OBS ay hindi isinara nang maayos sa iyong huling sesyon. \n\nGusto mo bang magsimula sa Ligtas na Mode (hindi pinagana ang mga third-party na plugin, scripting, at WebSockets)?"
+AutoSafeMode.LaunchSafe="Patakbuhin sa Ligtas na Mode"
+AutoSafeMode.LaunchNormal="Tumakbo Nang Normal"
+SafeMode.Restart="Nais mo bang i-restart ang OBS sa Ligtas na Mode (hindi pinagana ang mga third-party na plugin, scripting, at WebSockets)?"
+SafeMode.RestartNormal="Nais mo bang i-restart ang OBS sa Normal na Mode?"
 ChromeOS.Title="Hindi suportadong Plataporma"
 ChromeOS.Text="Mukhang tumatakbo ang OBS sa loob ng isang lalagyan ng ChromeOS. Ang platform na ito ay hindi na suportado."
 Wine.Title="May natuklasan na wine"
@@ -170,8 +176,8 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Pasadya..."
 Basic.AutoConfig.StreamPage.Server="Serber"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: ilagay ang encryption passphrase \nRTMP: ilagay ang key na ibinigay ng serbisyo.\nSRT: ilagay ang streamid kung gumagamit ng isa ang serbisyo."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(kawing)"
 Basic.AutoConfig.StreamPage.EncoderKey="Susi ng Encoder"
+Basic.AutoConfig.StreamPage.BearerToken="Token Ng Tagapagdala"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Nakaconnect na account"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Tantiyahin ang bitrate sa pamamagitan ng pagsubok ng bandwidth (maaaring tumagal ng ilang minuto)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Pasyahin ang hardware encoding"
@@ -182,6 +188,7 @@
 Basic.AutoConfig.TestPage.SubTitle.Testing="Ang program ay nagsasagawa na ng isang set ng mga pagsusuri para matantiya ang mga pinakamainam na settings"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Tapos na ang pagsusuri"
 Basic.AutoConfig.TestPage.TestingBandwidth="Pagsasagawa ng bandwidth test, ito ay maaaring tumagal ng ilang minuto..."
+Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Walang output para sa protocol ng serbisyong ito ang natagpuan"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Kumukunekta sa: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Bigong kumonekta sa alin mang server, paki-tingnan ang iyong koneksyon sa internet at subukan ulit."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Sinusuri ang bandwidth ng: %1"
@@ -217,8 +224,6 @@
 Updater.UpdateNow="I-update Ngayon"
 Updater.RemindMeLater="Ipa-alala mo Mamaya"
 Updater.Skip="Laktawan ang Bersyon"
-Updater.Running.Title="Programa na kasalukuyang aktibo"
-Updater.Running.Text="Ang mga output ay kasalukuyang aktibo, mangyaring i-shut down ang anumang mga aktibong output bago sinusubukang i-update"
 Updater.NoUpdatesAvailable.Title="Walang magagamit na mga update"
 Updater.NoUpdatesAvailable.Text="Walang mga update ang kasalukuyang magagamit"
 Updater.BranchNotFound.Title="Ang Update Channel ay inalis"
@@ -228,8 +233,6 @@
 Updater.RepairConfirm.Title="Kumpirmahin ang Integrity Check"
 Updater.RepairConfirm.Text="Ang pagsisimula ng pagsusuri sa integridad ay mai-scan ang iyong pag-install ng OBS para sa sirang at muling i-download ang mga sirang/binagong file. Maaaring tumagal ito ng ilang sandali.\n\nGusto mo bang magpatuloy?"
 Updater.FailedToLaunch="Nabigong ilunsad ang updater"
-Updater.GameCaptureActive.Title="Kumuha ng laro na aktibo"
-Updater.GameCaptureActive.Text="Ang hook library ng game capture ay kasalukuyang ginagamit. Mangyari lamang isara ang anumang mga laro/programang nahuli (o i-start muli ang Windows) at subukan muli."
 QuickTransitions.SwapScenes="Magpalit ng Pribyu/Programa ng Eksena Pagkatapos Mag-transition"
 QuickTransitions.SwapScenesTT="Pinagpapalit ang mga pribyu at bunga na eksena matapos ang pagbabago (kung umiiral pa ang orihinal na eksena ng bunga).\nHindi nito ibabalik ang mga pagkakaibang nagawa orihinal na eksena ng bunga."
 QuickTransitions.DuplicateScene="I-duplicate ang Eksena"
@@ -243,6 +246,8 @@
 Basic.SceneTransitions="Mga Pagpapalit-eksena"
 Basic.TransitionDuration="Tagal"
 Basic.TogglePreviewProgramMode="Ang Studio Mode"
+Basic.EnablePreviewProgramMode="Paganahin Ang Studio Mode"
+Basic.DisablePreviewProgramMode="Huwag Paganahin Ang Studio Mode"
 Undo.Undo="Ibalik"
 Undo.Redo="Ulitin"
 Undo.Add="Pagdagdag ng '%1'"
@@ -291,6 +296,7 @@
 Undo.GroupItems="Pagtitipon ng mga items sa '%1'"
 TransitionNameDlg.Text="Pakilagay ang pangalan ng transisyon"
 TransitionNameDlg.Title="Pangalan ng Transisyon"
+TitleBar.SafeMode="LIGTAS NA MODE"
 TitleBar.Profile="Ang Profile"
 TitleBar.Scenes="Mga Eksena"
 NameExists.Title="Ang pangalan ay umiiral na"
@@ -310,9 +316,12 @@
 ConfirmRemove.Title="I-kumpirma ang pagtangal"
 ConfirmRemove.Text="Sigurado ka bang nais mong tanggalin ang '$1'?"
 ConfirmRemove.TextMultiple="Sigurado ka bang nais mong alisin ang %1 na mga bagay?"
+ConfirmReset.Title="I-Reset Ang Mga Katangian"
+ConfirmReset.Text="Sigurado ka bang nais mong i-reset ang kasalukuyang mga properties sa kanilang mga default?"
 Output.StartStreamFailed="Nabigong simulan ang pag-stream"
 Output.StartRecordingFailed="Nabigong simulan ang pag-record"
 Output.StartReplayFailed="Nabigong simulan ang replay buffer"
+Output.StartVirtualCamFailed="Nabigo upang simulan ang virtual camera"
 Output.StartFailedGeneric="Bigong simulang ang output. Pakitingnan ang talaan ng mga detalye.\n\nNote: kung ikaw ay gumagamit ng NVENC or AMD encoders, siguraduhin na nag video drivers ay naka update."
 Output.ReplayBuffer.PauseWarning.Title="Hindi makapagsa-save ng mga replay habang naka-pause"
 Output.ReplayBuffer.PauseWarning.Text="Babala: Ang mga muling pagpapalabas ay hindi maaring ma-save kapag nakahinto ang recording."
@@ -320,11 +329,12 @@
 Output.ConnectFail.BadPath="Hindi wasto ang Path or ang Connection URL. Pakitingnan ang settings para ma kumpirma na ito ay pwede."
 Output.ConnectFail.ConnectFailed="Bigong kumunekta sa serber"
 Output.ConnectFail.InvalidStream="Di maka pasok sa tinutukoy na channel or stream key, pakitignan ng maayos ang stream key. Kung tama, Maaaring may problema sa pagkunekta sa serber."
+Output.ConnectFail.HdrDisabled="Ang output ng HDR ay kasalukuyang hindi pinagana para sa output na ito."
 Output.ConnectFail.Error="Isang di-inaasahang error ng subukang kumunekta sa serber. Karagdagang impormasyon ay nasa log file."
 Output.ConnectFail.Disconnected="Nadiskonek mula sa serber."
 Output.StreamEncodeError.Title="May error sa pag-encode"
 Output.StreamEncodeError.Msg="Mayroong error ang lumabas habang ikaw ay nag-si-stream."
-Output.StreamEncodeError.Msg.LastError="Mayroong error ang lumabas habang ikaw ay nag-si-stream."
+Output.StreamEncodeError.Msg.LastError="Isang error sa encoder ang naganap habang nag streaming: %1"
 Output.RecordFail.Title="Bigong simulang ang pag record"
 Output.RecordFail.Unsupported="Ang output format ay maaring di suportado or di sinusuportahan ang higit sa isang audio track. Pakitingnan ang iyong settings at simulan ulet."
 Output.RecordNoSpace.Title="Hindi sapat ang iyong espasyo"
@@ -332,7 +342,7 @@
 Output.RecordError.Title="May error sa pagrekord"
 Output.RecordError.Msg="Hindi tiyak na error habang nagrerekord."
 Output.RecordError.EncodeErrorMsg="Mayroong error ang lumabas habang ikaw ay nag-re-rekord."
-Output.RecordError.EncodeErrorMsg.LastError="Mayroong error na lumabas habang ikaw ay nag-re-rekord."
+Output.RecordError.EncodeErrorMsg.LastError="Isang error sa encoder ang naganap habang nagre-record: %1"
 Output.BadPath.Title="Di mabuting File Path"
 Output.BadPath.Text="Hindi mabuksan ang na-configure na Pagre-record na Path Pakisuri ang iyong Pag-record na Path Pakiusap pakisuri sa ilalim ng Setting → Output → Pagre-record."
 Output.NoBroadcast.Title="Walang Broadcast na Kinunfigure"
@@ -359,6 +369,8 @@
 Remux.ExitUnfinishedTitle="Ang remuxing ay naka progress"
 Remux.ExitUnfinished="Di pa tapos ang Remuxing, pag itigil ang render ang napiling file ay di magagamit.\nGusto mo bang huminto sa pag remuxing?"
 Remux.HelpText="Mag-drop ng mga file sa window na ito para mag-remux, o pumili ng walang laman na cell na \"OBS Recording\" para mag-browse ng file."
+Remux.NoFilesAddedTitle="Walang idinagdag na remuxing file"
+Remux.NoFilesAdded="Walang idinagdag na file sa remux. Mag-Drop ng isang folder na naglalaman ng isa o higit pang mga file ng video."
 MissingFiles="Nawawalang mga Files"
 MissingFiles.MissingFile="Nawawalang File"
 MissingFiles.NewFile="Bagong File"
@@ -377,6 +389,7 @@
 MissingFiles.AutoSearchText="Nakahanap ng OBS ng mga karagdagang ugnay para sa mga nawawalang files sa direktoring iyon. Gusto mo bang idagdag sila?"
 MissingFiles.NoMissing.Title="Pagsusuri ng Nawawalang mga Files"
 MissingFiles.NoMissing.Text="Parang walang files na nawawala."
+MacPermissions.MenuAction="Suriin ang Mga Pahintulot sa App..."
 MacPermissions.Title="Suriin ang Mga Pahintulot sa App"
 MacPermissions.Description="Kinakailangan ng OBS Studio ang iyong pahintulot upang makapagbigay ng ilang partikular na feature. Inirerekomenda na i-enable ang mga pahintulot na ito, ngunit hindi kinakailangang gamitin ang mga ito sa app. Maaari mong paganahin ang mga ito sa ibang pagkakataon."
 MacPermissions.Description.OpenDialog="Maaari mong muling buksan ang dialog na ito sa pamamagitan ng menu ng OBS Studio."
@@ -392,8 +405,8 @@
 MacPermissions.Item.Accessibility="Aksesibilidad"
 MacPermissions.Item.Accessibility.Details="Para gumana ang mga keyboard shortcut (hotkey) habang nakatutok ang iba pang app, paki-enable ang pahintulot."
 MacPermissions.Continue="Ipagpatuloy"
-UpdateAvailable="May bagong update na available"
-UpdateAvailable.Text="Ang Version %1.%2.%3 ay available na. <a href='%4'>Pindutin para i-download</a>"
+SourceLeak.Title="Error Sa Paglilinis Ng Pinagmulan"
+SourceLeak.Text="May problema habang binabago ang mga koleksyon ng eksena at ang ilang mga mapagkukunan ay hindi maaaring i-unload. Ang isyung ito ay karaniwang sanhi ng mga plugin na hindi naglalabas ng mga mapagkukunan nang maayos. Pakiusap tiyakin na ang anumang mga plugin na iyong ginagamit ay napapanahon.\n\nOBS Studio ay lalabas na ngayon para maiwasan ang anumang potensyal na katiwalian ng data."
 Basic.DesktopDevice1="Tinig ng Desktop"
 Basic.DesktopDevice2="Ika-2 Tinig ng Desktop"
 Basic.AuxDevice1="Ang Mic/Aux"
@@ -411,6 +424,7 @@
 BlendingMethod.Default="I-Default"
 BlendingMethod.SrgbOff="Naka-off ang SRGB"
 BlendingMode="Paraan ng Pagbeblend"
+BlendingMode.Additive="Magdagdag"
 BlendingMode.Multiply="Multiplikahin"
 BlendingMode.Lighten="Papusawin"
 BlendingMode.Darken="Padilimin"
@@ -420,6 +434,8 @@
 VolControl.SliderUnmuted="Pandausdos ng lakas ng tunog ng '%1':"
 VolControl.SliderMuted="Pandausdos ng lakas ng tunog ng '%1': (kasalukuyang nakatahimik)"
 VolControl.Properties="Mga Katangian para sa '%1'"
+VolControl.UnassignedWarning.Title="Hindi Nakatalagang Mapagkukunan Ng Audio"
+VolControl.UnassignedWarning.Text="Ang \"%1 \" ay hindi nakatalaga sa anumang mga audio track at hindi ito maririnig sa mga stream o pag-record.\n\n upang magtalaga ng isang mapagkukunan ng audio sa isang track, buksan ang mga advanced na properties ng Audio sa pamamagitan ng menu ng pag-click sa kanan o ang pindutan ng cog sa toolbar ng mixer dock"
 Basic.Main.AddSceneDlg.Title="Magdagdag ng mga Eksena"
 Basic.Main.AddSceneDlg.Text="Pakilagay ang pangalan ng eksena"
 Basic.Main.DefaultSceneName.Text="Eksena %1"
@@ -445,6 +461,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (awtomatikang-pagpili: %2)"
 Basic.PropertiesWindow.SelectColor="Pumili ng kulay"
 Basic.PropertiesWindow.SelectFont="Piliin ang font"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Pumili ng isang Font"
 Basic.PropertiesWindow.ConfirmTitle="Binago ang Mga Setting"
 Basic.PropertiesWindow.Confirm="Mayroong mga hindi nai-save na pagbabago. Gusto mo bang panatilihin ang mga ito?"
 Basic.PropertiesWindow.NoProperties="Walang makikitang mga katangian"
@@ -553,8 +570,9 @@
 Basic.VCam.VirtualCamera="Bertwal na Kamera"
 Basic.VCam.OutputType="Uri ng Output"
 Basic.VCam.OutputSelection="Pagpili ng Output"
-Basic.VCam.InternalDefault="Output ng Programa (Default)"
-Basic.VCam.InternalPreview="Pribyu Ng Output"
+Basic.VCam.OutputType.Program="Programa (Default)"
+Basic.VCam.OutputSelection.NoSelection="Walang pagpipilian para sa uri ng output na ito"
+Basic.VCam.RestartWarning="Ang virtual camera ay mai-restart upang mailapat ang pagbabagong nito"
 Basic.MainMenu.File="Talaksan (&F)"
 Basic.MainMenu.File.Export="I-&export"
 Basic.MainMenu.File.Import="Angkat (&I)"
@@ -589,13 +607,13 @@
 Basic.MainMenu.Edit.Order.MoveToTop="Ilipat sa &Tuktok"
 Basic.MainMenu.Edit.Order.MoveToBottom="Ilipat sa Ilalim (&B)"
 Basic.MainMenu.View.Toolbars="Mga &Toolbar"
-Basic.MainMenu.View.ListboxToolbars="Listahan ng Pindutan ng Eksena/Bukal"
+Basic.MainMenu.View.ListboxToolbars="Mga Toolbar Ng Dock"
 Basic.MainMenu.View.ContextBar="Pinagmulan ng Toolbar"
-Basic.MainMenu.View.SceneTransitions="Pagbabagong Eksena (&c)"
 Basic.MainMenu.View.SourceIcons="Mga &Icon ng mga Pinagtutukan"
 Basic.MainMenu.View.StatusBar="&Status bar"
 Basic.MainMenu.View.ResetUI="&I-reset ang UI"
 Basic.MainMenu.View.AlwaysOnTop="&Laging Nasa Tuktok"
+Basic.MainMenu.View.SceneListMode="Mode Ng Listahan Ng Eksena"
 Basic.MainMenu.Docks.ResetDocks="&I-reset ang Docks"
 Basic.MainMenu.Docks.LockDocks="& I-Lock ang Docks"
 Basic.MainMenu.SceneCollection="Koleksyon ng Ek&sena"
@@ -604,12 +622,12 @@
 Basic.MainMenu.SceneCollection.Import="Umangkat ng Koleksyon ng Eksena"
 Basic.MainMenu.SceneCollection.Export="Magluwas ng Koleksyon ng Eksena"
 Basic.MainMenu.Profile.Exists="Ang Profile ay umiiral na ngayon"
-Basic.MainMenu.SceneCollection.Exists="Ang Koleksyon ng Eksena ay umiiral na"
 Basic.MainMenu.Tools="Mga Kasangkapan (&T)"
 Basic.MainMenu.Help="Tulong (&H)"
 Basic.MainMenu.Help.HelpPortal="Tulong (&P)"
 Basic.MainMenu.Help.Website="Pagbisita &website"
 Basic.MainMenu.Help.Discord="Sumali sa &Discord Server"
+Basic.MainMenu.Help.WhatsNew="Anong Bago"
 Basic.MainMenu.Help.Logs="Mag-&log ng mga File"
 Basic.MainMenu.Help.Logs.ShowLogs="ipakita ang Pag-log ng mga File (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Mag-upload Kasalukuyang Mag-log ng File (&C)"
@@ -683,7 +701,6 @@
 Basic.Settings.General.ChannelDescription.stable="Pinakabagong stable ay inilabas"
 Basic.Settings.General.ChannelName.beta="Betas/ Ilabas ang candidates"
 Basic.Settings.General.ChannelDescription.beta="Potensyal na hindi matatag na mga bersyon ng pre-release"
-Basic.Settings.Stream.StreamType="Mga uri ng Stream"
 Basic.Settings.Stream.Custom.UseAuthentication="Gumamit ng pagpapatunay"
 Basic.Settings.Stream.Custom.Username.ToolTip="RIST: ilagay ang srp_username.\nRTMP: ilagay ang username.\nSRT: hindi ginamit."
 Basic.Settings.Stream.Custom.Password.ToolTip="RIST: ilagay ang srp_password.\nRTMP: ilagay ang password.\nSRT: ilagay ang encryption passphrase."
@@ -704,8 +721,11 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Pinakamataas na FPS: %1"
 Basic.Settings.Output="Pagtutunguan"
 Basic.Settings.Output.Format="Porma ng recording"
+Basic.Settings.Output.Format.TT.fmov="Sinusulat ng Fragmented MOV ang pag-record sa mga chunks at hindi nangangailangan ng parehong pagtatapos tulad ng tradisyonal na mga file ng MOV.tinitiyak nito na ang file ay mananatiling mai-play kahit na ang pagsulat sa disk ay nagambala, halimbawa, bilang isang resulta ng isang BSOD o pagkawala ng kuryente.\n\nmaaaring hindi ito tugma sa lahat ng mga manlalaro at editor. Gumamit ng File → Remux Recordings upang mai-convert ang file sa isang mas katugmang format kung kinakailangan."
+Basic.Settings.Output.Format.TT.fmp4="Sinusulat ng Fragmented mp4 ang pag-record sa mga chunks at hindi nangangailangan ng parehong pagtatapos tulad ng tradisyonal na mga MP4 file.tinitiyak nito na ang file ay mananatiling mai-play kahit na ang pagsulat sa disk ay nagambala, halimbawa, bilang isang resulta ng isang BSOD o pagkawala ng kuryente.\n\nmaaaring hindi ito tugma sa lahat ng mga manlalaro at editor. Gumamit ng File → Remux Recordings upang mai-convert ang file sa isang mas katugmang format kung kinakailangan."
+Basic.Settings.Output.Encoder.Video="Bidyo Encoder"
+Basic.Settings.Output.Encoder.Audio="Tonog ng Encoder"
 Basic.Settings.Output.SelectDirectory="Piliin ang Lagayan ng Recording"
-Basic.Settings.Output.SelectFile="Piliin ang File ng Pagrerecord"
 Basic.Settings.Output.DynamicBitrate="Dynamically Baguhin ang bitrate para pamahalaan ang congestion"
 Basic.Settings.Output.DynamicBitrate.Beta="Dynamically Baguhin ang bitrate para pamahalaan ang congestion (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Sa halip na mag-drop ng mga frame para mabawasan ang congestion, dynamically na nagbabago ang bitrate sa mabilisang paraan.\n\nTandaan na maaari nitong dagdagan ang pagkaantala sa mga manonood kung may makabuluhang biglaang pagsisikip.\nKapag bumaba ang bitrate, maaaring tumagal ng hanggang ilang minuto upang maibalik. \n\nKasalukuyang sinusuportahan lamang para sa RTMP."
@@ -720,6 +740,7 @@
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Hindi ma-estima ang nagamit na memorya. Pakilagay ng pinakamataas na limitasyon ng memorya."
 Basic.Settings.Output.ReplayBuffer.Prefix="Ang panlapi ng Replay Buffer Filename"
 Basic.Settings.Output.ReplayBuffer.Suffix="Hulapi"
+Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Ang Replay Buffer ay hindi maaaring gamitin kapag ang uri ng pag-record ay nakatakda sa pasadyang Output (FFmpeg)."
 Basic.Settings.Output.Simple.RecordingQuality="Pagrekord ng Kalidad"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Parehong stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Mataas na Kalidad, Katamtamang Laki ng File"
@@ -727,8 +748,8 @@
 Basic.Settings.Output.Simple.Warn.VideoBitrate="Babala: Itatakda ang bitrate ng streaming video sa %1, na siyang pinakamataas na limitasyon para sa kasalukuyang serbisyo ng streaming."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Babala: Ang streaming audio bitrate ay itatakda sa %1, na siyang pinakamataas na limitasyon para sa kasalukuyang serbisyo ng streaming."
 Basic.Settings.Output.Simple.Warn.CannotPause="Babala: Ang mga pag-record ay hindi maaaring i-pause kung ang kalidad ng pag-record ay nakatakda sa \"Kapareho ng stream\"."
+Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Babala: ang kasalukuyang napiling format ng pag-record ay hindi tugma sa(mga) napiling stream encoder."
 Basic.Settings.Output.Simple.Warn.Encoder="Babala: Ang pagrekord sa isang encoder ng software sa ibang kalidad kaysa sa stream ay mangangailangan ng dagdag na paggamit ng CPU kung mag-stream at mag-record ka sa parehong oras."
-Basic.Settings.Output.Simple.Warn.Lossless="Babala: Hindi mawawalan ng kalidad ang bumubuo ng napakalaking malalaking sukat ng file! Maaaring gumamit ng walang humpay na kalidad ng hanggang 7 gigabytes ng puwang ng disk kada minuto sa mataas na resolution at framerates. Ang hindi nawawala ay hindi inirerekomenda para sa mahabang pag-record maliban kung mayroon kang isang napakalaking halaga ng disk space na magagamit."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sigurado ka bang gusto mong gumamit ng kalidad na walang pagkawala?"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 mababang preset ng paggamit ng CPU, nagpapataas ng laki ng file)"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Hindi Nagaakmang Resolusyon o Bilis ng Frames"
@@ -737,6 +758,7 @@
 Basic.Settings.Output.Warn.EnforceResolutionFPS.FPS="Bilis ng Frames: %1"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="Hindi tugmang Encoder"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="Hindi sinusuportahan ng streaming service na \"%1\" ang encoder na \"%2\". Ang encoder ay gagawing \"%3\".\n\nGusto mo bang magpatuloy?"
+Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="Ang streaming service na\" %1 \"ay hindi sumusuporta sa mga encoder na\" %2 \"at\"%3\". Ang mga encoder na ito ay mababago sa \"%4\" at \"%5\".\n\n Gusto mo bang magpatuloy?"
 Basic.Settings.Output.VideoBitrate="Bitrate ng Video"
 Basic.Settings.Output.AudioBitrate="Bitrate ng Audio"
 Basic.Settings.Output.Reconnect="Awtomatikong mag-reconnect"
@@ -794,6 +816,18 @@
 Screenshot.Preview="Screenshot (Prebiyu)"
 Screenshot.Scene="Kuha ng Screen (Eksena)"
 Screenshot.Source="Screenshot (Pinagtututukan)"
+FilenameFormatting.TT.CCYY="Taon, apat na digit"
+FilenameFormatting.TT.YY="Taon, huling dalawang digit (00-99)"
+FilenameFormatting.TT.MM="Buwan bilang isang decimal number (01-12)"
+FilenameFormatting.TT.DD="Araw ng buwan, zero-padded (01-31)"
+FilenameFormatting.TT.hh="Oras sa format na 24h (00-23)"
+FilenameFormatting.TT.mm="Minuto (00-59)"
+FilenameFormatting.TT.ss="Pangalawa (00-59)"
+FilenameFormatting.TT.a="Pinaikli na pangalan sa araw ng linggo"
+FilenameFormatting.TT.A="Buong pangalan sa araw ng linggo"
+FilenameFormatting.TT.b="Pinaikling pangalan ng buwan"
+FilenameFormatting.TT.B="Buong pangalan ng buwan"
+FilenameFormatting.TT.d="Araw ng buwan, zero-padded (01-31)"
 Basic.Settings.Video="Bidyo"
 Basic.Settings.Video.Adapter="Adapter ng Bidyo"
 Basic.Settings.Video.BaseResolution="Base (Kanbas) Resolusyon"
@@ -817,8 +851,7 @@
 Basic.Settings.Audio.MeterDecayRate.Slow="Mabagal (Tipo II PPM)"
 Basic.Settings.Audio.PeakMeterType="Uri ng Tuktok ng Metro"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Pinakamaraming gamit ng CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Babala: Ang Surround sound audio ay naka andar."
-Basic.Settings.Audio.MultichannelWarning="Kung streaming, tingnan kung sinusuportahan ng iyong streaming service ang parehong surround sound ingest at surround sound playback. Ang Facebook 360 Live ay isang halimbawa kung saan ganap na sinusuportahan ang surround sound. Bagama't ang Facebook Live at YouTube Live ay parehong tumatanggap ng surround ingest, ang Facebook Live ay nag-downmix sa stereo, at ang YouTube Live ay nagpe-play lamang ng dalawang channel.\n\nAng mga audio filter ng OBS ay tugma sa surround sound, bagaman hindi ginagarantiyahan ang suporta ng VST plugin."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Babala: Ang Surround sound audio ay naka andar."
 Basic.Settings.Audio.MultichannelWarning.Title="Paganahin ang surround sound audio?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sigurado ka ba gusto mong paganahin ang surround sound audio?"
 Basic.Settings.Audio.Devices="Pangkalahataang Audio Devices"
@@ -960,14 +993,12 @@
 LoadProfileNeedsRestart="Ang profile ay naglalaman ng mga setting na nangangailangan ng pag-restart ng OBS:\n%1\n\nGusto mo bang i-restart ang OBS para magkabisa ang mga setting na ito?"
 ContextBar.NoSelectedSource="Walang piniling source"
 ContextBar.ResetTransform="I-reset ang Pag-transform"
-ContextBar.FitToCanvas="Ayusin sa Canvas"
 ContextBar.MediaControls.PlayMedia="Maglaro ng Media"
 ContextBar.MediaControls.PauseMedia="I-pause ang Media"
 ContextBar.MediaControls.StopMedia="I-tigil ang Media"
 ContextBar.MediaControls.RestartMedia="Ulitin ang Media"
 ContextBar.MediaControls.PlaylistNext="Kasunod sa Playlist"
 ContextBar.MediaControls.PlaylistPrevious="Nakaraan sa Playlist"
-ContextBar.MediaControls.MediaProperties="Mga Katangian ng Media"
 YouTube.Auth.Ok="Ang Awtorisasyon ay nakumpletong Tagumpay\nMaaari mo na ngayong isara ang pahinang ito."
 YouTube.Auth.NoCode="Hindi natapos ang proseso ng awtorisasyon."
 YouTube.Auth.NoChannels="Walang channel (s) na available sa napiling account"

obs-studio-29.1.3.tar.xz/UI/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/fr-FR.ini Changed

@@ -46,7 +46,7 @@
 Enable="Activer"
 DisableOSXVSync="Désactiver la synchronisation verticale de macOS (V-Sync)"
 ResetOSXVSyncOnExit="Réinitialiser la synchronisation verticale de macOS à la fermeture"
-HighResourceUsage="L'encodeur est en surcharge ! Revoyez à la baisse vos réglages vidéo ou utilisez un préréglage d'encodage plus rapide."
+HighResourceUsage="L'encodeur est en surcharge ! Revoyez à la baisse vos paramètres vidéo ou utilisez un préréglage d'encodage plus rapide."
 QuickTransitions="Transitions rapides"
 FadeToBlack="Fondu au noir"
 Left="À gauche"
@@ -92,7 +92,6 @@
 LogViewer="Voir les logs"
 ShowOnStartup="Afficher au démarrage"
 OpenFile="Ouvrir le fichier"
-AddValue="Ajouter %1"
 AddSource="Ajouter une source"
 RemoveScene="Supprimer la scène sélectionnée"
 RemoveSource="Supprimer les sources sélectionnées"
@@ -104,11 +103,19 @@
 SourceFilters="Ouvrir les filtres de la source"
 MixerToolbarMenu="Menu du mixeur audio"
 SceneFilters="Ouvrir les filtres de la scène"
+List="Liste"
+Grid="Grille"
 PluginsFailedToLoad.Title="Erreur de chargement du plugin"
 PluginsFailedToLoad.Text="Les plugins OBS suivants n'ont pas pu être chargés :\n\n%1\nVeuillez mettre à jour ou supprimer ces plugins."
 AlreadyRunning.Title="OBS est déjà en cours d'exécution"
 AlreadyRunning.Text="OBS est déjà en cours d'exécution ! À moins que cela soit délibéré, veuillez fermer toute autre instance d'OBS (y compris celles minimisées dans la zone de notifications) avant d'en démarrer une nouvelle."
 AlreadyRunning.LaunchAnyway="Démarrer tout de même"
+AutoSafeMode.Title="Mode sans échec"
+AutoSafeMode.Text="OBS ne s'est pas fermé correctement lors de votre dernière session.\n\nSouhaitez-vous démarrer en mode sans échec (plugins tiers, scripts et WebSockets désactivés) ?"
+AutoSafeMode.LaunchSafe="Lancer en mode sans échec"
+AutoSafeMode.LaunchNormal="Lancer normalement"
+SafeMode.Restart="Souhaitez-vous redémarrer OBS en mode sans échec (plugins tiers, scripts et WebSockets désactivés) ?"
+SafeMode.RestartNormal="Souhaitez-vous redémarrer OBS normalement ?"
 ChromeOS.Title="Plateforme non prise en charge"
 ChromeOS.Text="OBS semble fonctionner dans un conteneur ChromeOS. Cette plateforme n'est pas prise en charge."
 Wine.Title="Wine détecté"
@@ -116,7 +123,7 @@
 DockCloseWarning.Title="Fermeture d'une fenêtre dockable"
 DockCloseWarning.Text="Vous venez de fermer une fenêtre dockable. Si vous souhaitez l'afficher à nouveau, utilisez le menu Docks dans la barre de menus."
 ExtraBrowsers="Docks Internet personnalisés"
-ExtraBrowsers.Info="Ajoutez des docks en leur donnant un nom et une URL, puis cliquez sur Appliquer or Fermer pour les ouvrir. Vous pouvez en ajouter d'autres ou en supprimer plus tard à votre guise."
+ExtraBrowsers.Info="Ajoutez des docks en leur donnant un nom et une URL, puis cliquez sur Appliquer ou Fermer pour les ouvrir. Vous pouvez en ajouter ou en supprimer à tout moment."
 ExtraBrowsers.DockName="Nom du dock"
 Auth.Authing.Title="Connexion en cours ..."
 Auth.Authing.Text="Connexion sur %1 en cours, veuillez patienter ..."
@@ -173,8 +180,8 @@
 Basic.AutoConfig.StreamPage.Server="Serveur"
 Basic.AutoConfig.StreamPage.StreamKey="Clé de stream"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST : entrez la clé de chiffrement.\nRTMP : entrez la clé fournie par le service.\nSRT : entrez le streamid si le service en utilise un."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Lien)"
 Basic.AutoConfig.StreamPage.EncoderKey="Clé de l'encodeur"
+Basic.AutoConfig.StreamPage.BearerToken="Jeton du porteur"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Compte connecté"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Test de la bande passantes pour estimer le débit (peut prendre quelques minutes)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Préférer l’encodage matériel"
@@ -189,7 +196,7 @@
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Connexion à : %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Impossible de se connecter aux serveurs, veuillez vérifier votre connexion internet et réessayez."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Test de la bande passante pour : %1"
-Basic.AutoConfig.TestPage.TestingStreamEncoder="Test de l'encodeur de diffusion (stream), veuillez patienter un instant..."
+Basic.AutoConfig.TestPage.TestingStreamEncoder="Test de l'encodeur de streaming, veuillez patienter un instant..."
 Basic.AutoConfig.TestPage.TestingRecordingEncoder="Test de l'encodeur d'enregistrement, veuillez patienter un instant..."
 Basic.AutoConfig.TestPage.TestingRes.Fail="L'encodeur n'a pas pu être démarré"
 Basic.AutoConfig.TestPage.TestingRes.Resolution="Test %1x%2 %3 FPS..."
@@ -226,8 +233,6 @@
 Updater.UpdateNow="Mettre à jour maintenant"
 Updater.RemindMeLater="Me le rappeler ultérieurement"
 Updater.Skip="Ignorer la version"
-Updater.Running.Title="Programme actuellement en cours d’exécution"
-Updater.Running.Text="Des sorties sont actuellement actives. Veuillez couper toutes les sorties actives avant de tenter une mise à jour."
 Updater.NoUpdatesAvailable.Title="Aucune mise à jour disponible"
 Updater.NoUpdatesAvailable.Text="Aucune mise à jour n’est actuellement disponible"
 Updater.BranchNotFound.Title="Canal de mise à jour supprimé"
@@ -237,8 +242,6 @@
 Updater.RepairConfirm.Title="Confirmer la vérification d'intégrité"
 Updater.RepairConfirm.Text="La vérification d'intégrité va analyser votre installation d'OBS pour chercher des corruptions et retélécharger les fichiers cassés/modifiés. Cela peut prendre un moment.\n\nVoulez-vous continuer ?"
 Updater.FailedToLaunch="Impossible de démarrer la mise à jour"
-Updater.GameCaptureActive.Title="Capture de jeu active"
-Updater.GameCaptureActive.Text="Le composant (« hook ») de capture de jeu est déjà en cours d'utilisation. Veuillez fermer tous les jeux/programmes en cours de capture (ou redémarrez Windows) puis réessayez."
 QuickTransitions.SwapScenes="Échanger les scènes d'aperçu et de sortie après la transition"
 QuickTransitions.SwapScenesTT="Échange les scènes d'aperçu et de sortie après la transition (si la scène d'origine de la sortie existe toujours).\nCela n'annulera pas les modifications qui auront pu être faites sur la scène d'origine de la sortie."
 QuickTransitions.DuplicateScene="Dupliquer la scène"
@@ -252,6 +255,8 @@
 Basic.SceneTransitions="Transition de scènes"
 Basic.TransitionDuration="Durée"
 Basic.TogglePreviewProgramMode="Mode Studio"
+Basic.EnablePreviewProgramMode="Activer le mode Studio"
+Basic.DisablePreviewProgramMode="Désactiver le mode Studio"
 Undo.Undo="Annuler"
 Undo.Redo="Rétablir"
 Undo.Add="Ajouter '%1'"
@@ -300,6 +305,8 @@
 Undo.GroupItems="Grouper les éléments dans '%1'"
 TransitionNameDlg.Text="Veuillez entrer le nom de la transition"
 TransitionNameDlg.Title="Nom de la transition"
+TitleBar.SafeMode="MODE SANS ECHEC"
+TitleBar.PortableMode="Mode portable"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scènes"
 NameExists.Title="Ce nom existe déjà"
@@ -324,6 +331,7 @@
 Output.StartStreamFailed="Impossible de démarrer le streaming"
 Output.StartRecordingFailed="Impossible de démarrer l'enregistrement"
 Output.StartReplayFailed="Impossible de démarrer le tampon de relecture"
+Output.StartVirtualCamFailed="Échec du démarrage de la caméra virtuelle"
 Output.StartFailedGeneric="Le démarrage de la sortie a échoué. Veuillez consulter le journal pour plus de détails.\n\nRemarque : si vous utilisez les encodeurs NVENC ou AMD, assurez-vous que vos pilotes vidéo soient à jour."
 Output.ReplayBuffer.PauseWarning.Title="Impossible d'enregistrer des replays quand l'enregistrement est en pause"
 Output.ReplayBuffer.PauseWarning.Text="Attention : les replays ne peuvent pas être enregistrés lorsque l'enregistrement est en pause."
@@ -336,7 +344,7 @@
 Output.ConnectFail.Disconnected="Déconnecté du serveur."
 Output.StreamEncodeError.Title="Erreur d'encodage"
 Output.StreamEncodeError.Msg="L'encodeur a rencontré une erreur pendant la diffusion."
-Output.StreamEncodeError.Msg.LastError="Une erreur d'encodeur s'est produite durant la diffusion:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Une erreur d'encodeur s'est produite durant le streaming : %1"
 Output.RecordFail.Title="Impossible de démarrer l'enregistrement"
 Output.RecordFail.Unsupported="Le format de sortie n'est pas pris en charge ou ne supporte qu'une piste audio. Veuillez vérifier vos paramètres et réessayez."
 Output.RecordNoSpace.Title="Espace disque insuffisant"
@@ -344,7 +352,7 @@
 Output.RecordError.Title="Erreur d'enregistrement"
 Output.RecordError.Msg="Une erreur non spécifiée s'est produite lors de l'enregistrement."
 Output.RecordError.EncodeErrorMsg="L'encodeur a rencontré une erreur pendant l'enregistrement."
-Output.RecordError.EncodeErrorMsg.LastError="Une erreur d'encodeur s'est produite durant l'enregistrement:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Une erreur d'encodeur s'est produite durant l'enregistrement : %1"
 Output.BadPath.Title="Chemin d'accès au fichier incorrect"
 Output.BadPath.Text="Le chemin d'enregistrement configuré n'a pas pu être ouvert. Veuillez vérifier votre chemin d'enregistrement dans Réglages → Sortie → Enregistrement."
 Output.NoBroadcast.Title="Aucune diffusion configurée"
@@ -374,6 +382,8 @@
 Remux.ExitUnfinishedTitle="Conversion en cours"
 Remux.ExitUnfinished="La conversion n'est pas terminée, arrêter maintenant peut rendre le fichier final inutilisable.\nVoulez-vous vraiment arrêter la conversion ?"
 Remux.HelpText="Déposez des fichiers dans cette fenêtre pour les convertir, ou sélectionnez une cellule « Enregistrement OBS » vide pour rechercher un fichier."
+Remux.NoFilesAddedTitle="Aucun fichier de remultiplexage ajouté"
+Remux.NoFilesAdded="Aucun fichier n'est ajouté au remultiplexage. Déposez un dossier contenant un ou plusieurs fichiers vidéo."
 MissingFiles="Fichiers manquants"
 MissingFiles.MissingFile="Fichier manquant"
 MissingFiles.NewFile="Nouveau fichier"
@@ -392,6 +402,7 @@
 MissingFiles.AutoSearchText="OBS a trouvé des correspondances supplémentaires pour les fichiers manquants dans ce dossier. Voulez-vous les ajouter ?"
 MissingFiles.NoMissing.Title="Vérification des fichiers manquants"
 MissingFiles.NoMissing.Text="Aucun fichier ne semble manquer."
+MacPermissions.MenuAction="Vérifiez les permissions de l'application..."
 MacPermissions.Title="Vérifiez les permissions de l'application"
 MacPermissions.Description="OBS Studio à besoin de votre permission pour pouvoir proposer certaines fonctionnalités. Il est recommandé d'activer ces permissions, mais elles ne sont pas requises pour utiliser l'application. Vous pouvez les activer plus tard."
 MacPermissions.Description.OpenDialog="Vous pouvez réouvrir ce dialogue via le menu OBS Studio"
@@ -406,8 +417,8 @@
 MacPermissions.Item.Accessibility="Accessibilité"
 MacPermissions.Item.Accessibility.Details="Pour que les raccourcis clavier (hotkeys) fonctionnent pendant que d'autres applications sont au premier plan, activez cette permission."
 MacPermissions.Continue="Continuer"
-UpdateAvailable="Nouvelle mise à jour disponible"
-UpdateAvailable.Text="La version %1.%2.%3 est désormais disponible. <a href='%4'>Cliquez ici pour la télécharger</a>"
+SourceLeak.Title="Erreur de nettoyage des sources"
+SourceLeak.Text="Un problème est survenu lors du changement de collection de scènes et certaines sources n'ont pas pu être déchargées. Ce problème est généralement causé par des modules dont les ressources ne sont pas correctement publiées. Veuillez vous assurer que tous les modules que vous utilisez sont à jour.\n\nOBS Studio va maintenant se fermer pour éviter tout risque de corruption des données."
 Basic.DesktopDevice1="Audio du Bureau"
 Basic.DesktopDevice2="Audio du Bureau 2"
 Basic.Scene="Scène"
@@ -463,6 +474,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (sélection automatique : %2)"
 Basic.PropertiesWindow.SelectColor="Sélectionner une couleur"
 Basic.PropertiesWindow.SelectFont="Sélectionner la police"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Choisir une police"
 Basic.PropertiesWindow.ConfirmTitle="Paramètres modifiés"
 Basic.PropertiesWindow.Confirm="Des modifications n'ont pas été enregistrées. Voulez-vous les conserver ?"
 Basic.PropertiesWindow.NoProperties="Aucune propriété disponible"
@@ -566,9 +578,9 @@
 Basic.VCam.VirtualCamera="Caméra virtuelle"
 Basic.VCam.OutputType="Type de sortie"
 Basic.VCam.OutputSelection="Sélection de sortie"
-Basic.VCam.Internal="Interne"
-Basic.VCam.InternalDefault="Sortie du programme (par défaut)"
-Basic.VCam.InternalPreview="Aperçu de la sortie"
+Basic.VCam.OutputType.Program="Programme (par défaut)"
+Basic.VCam.OutputSelection.NoSelection="Aucune sélection pour ce type de sortie"
+Basic.VCam.RestartWarning="La caméra virtuelle sera redémarrée pour appliquer cette modification"
 Basic.MainMenu.File="&Fichier"
 Basic.MainMenu.File.Export="&Exporter"
 Basic.MainMenu.File.Import="&Importer"
@@ -609,16 +621,17 @@
 Basic.MainMenu.Edit.AdvAudio="Propriétés &audio avancées"
 Basic.MainMenu.View="Afficher (&V)"
 Basic.MainMenu.View.Toolbars="Barres d'ou&tils"
-Basic.MainMenu.View.ListboxToolbars="Boutons de la liste Scène/Source"
+Basic.MainMenu.View.ListboxToolbars="Barres d'outils des Docks"
 Basic.MainMenu.View.ContextBar="Barre d'outils Sources"
-Basic.MainMenu.View.SceneTransitions="Transition de s&cènes"
 Basic.MainMenu.View.SourceIcons="&Icônes de source"
 Basic.MainMenu.View.StatusBar="Barre d'état (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Interface plein écran"
 Basic.MainMenu.View.ResetUI="&Réinitialiser l'interface"
 Basic.MainMenu.View.AlwaysOnTop="&Toujours au premier plan"
+Basic.MainMenu.View.SceneListMode="Mode d'affichage des scènes"
 Basic.MainMenu.Docks.ResetDocks="&Réinitialiser les Docks"
 Basic.MainMenu.Docks.LockDocks="Verrouiller les Docks"
+Basic.MainMenu.Docks.SideDocks="&Docks en pleine hauteur"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Docks Internet personnalisés..."
 Basic.MainMenu.SceneCollection="Collection de &scènes"
 Basic.MainMenu.Profile="&Profil"
@@ -627,7 +640,6 @@
 Basic.MainMenu.SceneCollection.Import="Importer une collection de scènes"
 Basic.MainMenu.SceneCollection.Export="Exporter une collection de scènes"
 Basic.MainMenu.Profile.Exists="Ce profil existe déjà"
-Basic.MainMenu.SceneCollection.Exists="Cette collection de scène existe déjà"
 Basic.MainMenu.Tools="Ou&tils"
 Basic.MainMenu.Help="Aide (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portail d'aide"
@@ -639,8 +651,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Mettre en ligne le fi&chier journal actuel"
 Basic.MainMenu.Help.Logs.UploadLastLog="Envoyer le fichier journal &précédent"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Voir le journal actuel"
+Basic.MainMenu.Help.ReleaseNotes="Notes de version"
 Basic.MainMenu.Help.CheckForUpdates="Rechercher des mises à jour"
 Basic.MainMenu.Help.Repair="Vérifier l'intégrité du fichier"
+Basic.MainMenu.Help.RestartSafeMode="Redémarrer en mode sans échec"
+Basic.MainMenu.Help.RestartNormal="Redémarrer normalement"
 Basic.MainMenu.Help.CrashLogs="&Rapports d'erreurs"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Montrer le&s rapports d'erreur"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Envoyer le rapport de plantage &Précédent"
@@ -708,7 +723,6 @@
 Basic.Settings.General.ChannelName.beta="Bêtas / Versions de pré-sortie"
 Basic.Settings.General.ChannelDescription.beta="Pré-versions potentiellement instables"
 Basic.Settings.Stream="Stream (flux)"
-Basic.Settings.Stream.StreamType="Type de Streaming"
 Basic.Settings.Stream.Custom.UseAuthentication="Utiliser l'authentification"
 Basic.Settings.Stream.Custom.Username="Nom d'utilisateur"
 Basic.Settings.Stream.Custom.Password="Mot de passe"
@@ -740,7 +754,6 @@
 Basic.Settings.Output.Encoder.Video="Encodeur vidéo"
 Basic.Settings.Output.Encoder.Audio="Encodeur audio"
 Basic.Settings.Output.SelectDirectory="Sélectionnez le répertoire d'enregistrement"
-Basic.Settings.Output.SelectFile="Sélectionnez le fichier cible"
 Basic.Settings.Output.DynamicBitrate="Ajuster dynamiquement le débit de streaming en cas de congestion réseau"
 Basic.Settings.Output.DynamicBitrate.Beta="Ajuster dynamiquement le débit de streaming en cas de congestion réseau (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Ajuste automatiquement le débit de streaming pour éviter les pertes d'images en cas de congestion ou de surcharge réseau.\n\nCela peut augmenter le délai entre vous et vos spectateurs si la congestion est significative.\nQuand le débit est réduit automatiquement, plusieurs minutes peuvent s'écouler avant qu'il ne revienne à la normale.\n\nN'est supporté que pour RTMP pour l'instant."
@@ -767,7 +780,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Attention : l'enregistrement ne peut pas être mis en pause si la qualité d'enregistrement est configurée sur \"Identique au stream\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Attention : le format d'enregistrement actuellement sélectionné est incompatible avec le(s) encodeur(s) de diffusion actuellement sélectionné(s)."
 Basic.Settings.Output.Simple.Warn.Encoder="Attention : enregistrer via un encodeur logiciel avec une qualité autre que celle du stream sollicitera encore plus le CPU si vous streamez et enregistrez simultanément."
-Basic.Settings.Output.Simple.Warn.Lossless="Attention: la qualité sans perte génère des fichiers de taille énorme ! Elle peut utiliser jusqu'à 7 gigaoctets d'espace disque par minute pour de hautes résolutions et fréquences d'image. Cette qualité n'est pas recommandée pour de longs enregistrements à moins d'avoir énormément d'espace disque disponible."
+Basic.Settings.Output.Simple.Warn.Lossless="Attention : la qualité sans perte génère des fichiers extrêmement volumineux ! La qualité sans perte peut utiliser jusqu'à 7 Go d'espace disque par minute à des résolutions et des fréquences d'images élevées. Le mode sans perte n'est pas recommandé pour les enregistrements longs, sauf si vous disposez d'une très grande quantité d'espace disque disponible. Le tampon de relecture n’est pas disponible lors de l’utilisation de la qualité sans perte."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Êtes-vous certain de vouloir utiliser la qualité sans perte ?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Avertissement de qualité sans perte"
 Basic.Settings.Output.Simple.Encoder.Software="Logiciel (x264)"
@@ -900,7 +913,7 @@
 Basic.Settings.Video.Renderer="Rendu"
 Basic.Settings.Video.InvalidResolution="Valeurs de résolution non-valides. Elles doivent être au format largeurxhauteur (par exemple 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="La sortie vidéo est actuellement active. Veuillez éteindre toutes les sorties avant de modifier vos paramètres vidéo."
-Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinéaire (plus rapide, mais flou en cas de mise à l'échelle)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinéaire (le plus rapide, mais flou en cas de mise à l'échelle)"
 Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubique (mise à l'échelle avec netteté accentuée, 16 échantillons)"
 Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (mise à l'échelle avec netteté accentuée, 36 échantillons)"
 Basic.Settings.Video.DownscaleFilter.Area="Zone (somme pondérée, 4/6/9 échantillons)"
@@ -914,8 +927,8 @@
 Basic.Settings.Audio.PeakMeterType="Type de crête-mètre"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Pic d'échantillon audio"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Crête exacte (plus grande utilisation du CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ATTENTION : le son multicanal est activé."
-Basic.Settings.Audio.MultichannelWarning="Pour de besoins de diffusion, vérifiez que votre service de diffusion supporte l'intégration et la lecture du son multicanal. Facebook 360 Live est un exemples de service où le son multicanal est entièrement supporté. Bien que Facebook Live et YouTube Live acceptent en entrée un flux avec son multicanal, Facebook Live le transcode en stéréo, et YouTube Live ne lit que deux canaux.\n\nLes filtres audio d'OBS sont compatibles avec le son multicanal, toutefois le support des plugins VST est variable."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ATTENTION : le son multicanal est activé."
+Basic.Settings.Audio.MultichannelWarning="Si vous diffusez en direct, vérifiez que votre service de diffusion prend en charge à la fois l'acquisition et la lecture du son surround. Par exemple, Facebook 360 Live prend entièrement en charge le son surround ; YouTube Live prend en charge l'acquisition audio 5.1 (et la lecture sur les téléviseurs).\n\nLes filtres audio OBS sont compatibles avec le son surround, bien que la prise en charge des plugins VST ne soit pas garantie."
 Basic.Settings.Audio.MultichannelWarning.Title="Activer le son multicanal ?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Êtes vous sûr de vouloir activer le son multicanal ?"
 Basic.Settings.Audio.Devices="Périphériques audio globaux"
@@ -962,7 +975,6 @@
 Basic.Settings.Advanced.FormatWarning="Attention : les formats de couleur autres que NV12/P010 sont principalement destinés à l'enregistrement, et ne sont pas recommandés pour le streaming. Le streaming peut pâtir d'une utilisation élevée du CPU due à la conversion de format de couleur."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Attention : les formats haute précision sont plus couramment utilisés avec les espaces colorimétriques HDR."
 Basic.Settings.Advanced.FormatWarning2100="Avertissement : Rec. 2100 devrait utiliser un format avec plus de précision."
-Basic.Settings.Advanced.Audio.BufferingTime="Temps de mise en mémoire tampon audio"
 Basic.Settings.Advanced.Video.ColorFormat="Format de couleur"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 niveaux)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 niveaux)"
@@ -988,6 +1000,7 @@
 Basic.Settings.Advanced.Network="Carte réseau (adresse IP source du flux)"
 Basic.Settings.Advanced.Network.Disabled="Le protocole de streaming actuellement sélectionné ne prend pas en charge la modification des paramètres réseau."
 Basic.Settings.Advanced.Network.BindToIP="Lier à :"
+Basic.Settings.Advanced.Network.IPFamily="Famille d'IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Activer les optimisations réseau"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Activer la régulation TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Tente de rendre le flux RTMP plus coopératif avec les autres applications sensibles à la latence sur le réseau en régulant la vitesse de transmission.\nCela peut augmenter le risque d'images perdues sur les connexions instables."
@@ -1057,6 +1070,8 @@
 SceneItemShow="Afficher '%1'"
 SceneItemHide="Cacher '%1'"
 OutputWarnings.NoTracksSelected="Vous devez sélectionner au moins une piste"
+OutputWarnings.NoTracksSelectedOnExit.Title="Erreur dans les paramètres de sortie"
+OutputWarnings.NoTracksSelectedOnExit.Text="Toutes les sorties doivent avoir au moins une piste audio sélectionnée."
 OutputWarnings.MP4Recording="Avertissement : les enregistrements sauvegardés en MP4/MOV seront irrécupérables si le fichier ne peut pas être finalisé (ex. : à cause des BSOD, pannes de l'alimentation, etc...). Si vous voulez enregistrer plusieurs pistes audio, pensez à utiliser le format MKV et à convertir l'enregistrement en MP4/MOV après avoir terminé (Fichier → Convertir un enregistrement)"
 OutputWarnings.CannotPause="Attention : l'enregistrement ne peut pas être mis en pause si l'encodeur d'enregistrement est configuré sur \"(Utiliser le même encodeur que pour le stream)\""
 OutputWarnings.CodecIncompatible="La sélection de l'encodeur audio ou vidéo a été réinitialisée pour cause d'incompatibilité. Veuillez sélectionner un encodeur compatible depuis la liste."
@@ -1064,9 +1079,9 @@
 CodecCompat.CodecPlaceholder="Sélectionner un encodeur..."
 CodecCompat.ContainerPlaceholder="Sélectionner un format..."
 CodecCompat.CodecMissingOnExit.Title="Aucun encodeur sélectionné"
-CodecCompat.CodecMissingOnExit.Text="Au moins un encodeur audio ou vidéo n'est pas défini. Veuillez vous assurer de sélectionner des encodeurs pour l'enregistrement et la diffusion."
+CodecCompat.CodecMissingOnExit.Text="Au moins un encodeur vidéo ou audio n'est pas défini. Veillez à sélectionner les encodeurs pour l'enregistrement et le streaming."
 CodecCompat.ContainerMissingOnExit.Title="Aucun format sélectionné"
-CodecCompat.ContainerMissingOnExit.Text="Aucun format d'enregistrement sélectionné. Veuillez sélectionner un format d'enregistrement compatible avec l'encodeur de diffusion sélectionné."
+CodecCompat.ContainerMissingOnExit.Text="Aucun format d'enregistrement n'a été sélectionné. Veuillez choisir un format d'enregistrement compatible avec l'encodeur de streaming sélectionné."
 FinalScene.Title="Supprimer la scène"
 FinalScene.Text="Il doit y avoir au moins une scène."
 NoSources.Title="Aucune source"
@@ -1077,12 +1092,13 @@
 CustomColor="Couleur personnalisée"
 BrowserSource.EnableHardwareAcceleration="Activer l’accélération matérielle de la source « navigateur »"
 About="À propos"
-About.Info="OBS Studio est un logiciel libre open source pour l'enregistrement vidéo et le streaming en direct."
-About.Donate="Aider le Projet"
+About.Info="OBS Studio est un logiciel libre et open source d'enregistrement vidéo et de diffusion en direct."
+About.Donate="Faire un don"
 About.GetInvolved="Contribuer"
 About.Authors="Auteurs"
 About.License="Licence"
-About.Contribute="Soutenir le Projet d'OBS"
+About.Error="Erreur ! Impossible de lire le fichier.\n\nAccédez à : %1"
+About.Contribute="Soutenir le projet OBS"
 AddUrl.Title="Ajouter une source via une URL"
 AddUrl.Text="Vous avez glissé une URL dans OBS. Cela va automatiquement ajouter le lien comme une source. Continuer ?"
 AddUrl.Text.Url="URL : %1"
@@ -1103,14 +1119,12 @@
 LoadProfileNeedsRestart="Le profil contient des paramètres qui requiert un redémarrage d'OBS:\n%1\n\nVoulez-vous redémarrer OBS pour que ces paramètres prennent effet ?"
 ContextBar.NoSelectedSource="Aucune source sélectionnée"
 ContextBar.ResetTransform="Réinitialiser la transformation"
-ContextBar.FitToCanvas="Ajuster à la toile"
 ContextBar.MediaControls.PlayMedia="Lire le média"
 ContextBar.MediaControls.PauseMedia="Mettre en pause les médias"
 ContextBar.MediaControls.StopMedia="Arrêter les médias"
 ContextBar.MediaControls.RestartMedia="Redémarrer le média"
 ContextBar.MediaControls.PlaylistNext="Suivant dans la playlist"
 ContextBar.MediaControls.PlaylistPrevious="Précédent dans la playlist"
-ContextBar.MediaControls.MediaProperties="Propriétés du média"
 ContextBar.MediaControls.BlindSeek="Widget de Navigation dans le Média"
 YouTube.Auth.Ok="Autorisation obtenue avec succès.\nVous pouvez maintenant fermer cette page."
 YouTube.Auth.NoCode="Le processus d'autorisation n'est pas terminé."
@@ -1191,3 +1205,5 @@
 YouTube.Errors.liveChatEnded="La diffusion en direct est terminée."
 YouTube.Errors.messageTextInvalid="Le texte du message n'est pas valide."
 YouTube.Errors.rateLimitExceeded="Vous envoyez des messages trop rapidement."
+YouTube.DocksRemoval.Title="Effacer les anciens Docks Internet de YouTube"
+YouTube.DocksRemoval.Text="Ces Docks Internet seront enlevés car obsolètes :\n\n%1\nUtilisez les \"Docks/YouTube Live Control Room\" à la place."

obs-studio-29.1.3.tar.xz/UI/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/gd-GB.ini Changed

@@ -77,6 +77,8 @@
 None="Chan eil gin"
 StudioMode.Preview="Ro-shealladh"
 StudioMode.Program="Prògram"
+StudioMode.PreviewSceneName="Ro-sheall: %1"
+StudioMode.ProgramSceneName="Prògram: %1"
 ShowInMultiview="Seall san ioma-shealladh"
 VerticalLayout="Co-dhealbhachd inghearach"
 Group="Buidhnich"
@@ -91,7 +93,7 @@
 LogViewer="Sealladair logaichean"
 ShowOnStartup="Seall aig an toiseach"
 OpenFile="Fosgail am faidhle"
-AddValue="Cuir %1 ris"
+AddSource="Cuir na Tùs"
 AlreadyRunning.Title="Tha OBS ’ga ruith mar-thà"
 AlreadyRunning.Text="Tha OBS ’ga ruith mar-thà! Mur ann gun robh thu airson seo a dhèanamh, dùin sìos gach ionstans de dh’OBS mus fheuch thu ri ionstans eile dheth a ruith. Ma shuidhich thu OBS ach an dèid fhìor-lùghdachadh gu treidhe an t-siostaim thoir sùil a bheil e ’ga ruith an-siud fhathast."
 AlreadyRunning.LaunchAnyway="Cuir gu dol e co-dhiù"
@@ -157,7 +159,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Gnàthaichte…"
 Basic.AutoConfig.StreamPage.Server="Frithealaiche"
 Basic.AutoConfig.StreamPage.StreamKey="Iuchair an t-sruthaidh"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Ceangal)"
 Basic.AutoConfig.StreamPage.EncoderKey="Iuchair an inneil-chòdachaidh"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Cunntas ceangailte"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Dèan tuairmse air reat bhiodan le deuchainn air an leud-bhanna (dh’fhaoidte gun doir seo mionaid no dhà)"
@@ -208,13 +209,9 @@
 Updater.UpdateNow="Ùraich an-dràsta"
 Updater.RemindMeLater="Cuir nam chuimhne uaireigin eile"
 Updater.Skip="Leig seachad an tionndadh"
-Updater.Running.Title="Tha am prògram gnìomhach"
-Updater.Running.Text="Tha às-chur gnìomhach ann, cuir stad air gach às-chur mus fheuch thu ris an ùrachadh"
 Updater.NoUpdatesAvailable.Title="Chan eil ùrachadh ri fhaighinn"
 Updater.NoUpdatesAvailable.Text="Chan eil ùrachadh ri fhaighinn an-dràsta"
 Updater.FailedToLaunch="Cha deach leinn an t-inneal-ùrachaidh a chur gu dol"
-Updater.GameCaptureActive.Title="Tha glacadh geama gnìomhach"
-Updater.GameCaptureActive.Text="Tha leabharlann huca glacadh geama ’ga chleachdadh. Dùin gach geama no prògram a tha ’ga ghlacadh (no ath-thòisich Windows) is feuch ris a-rithist."
 QuickTransitions.DuplicateScene="Dùblaich an t-sealladh"
 QuickTransitions.EditProperties="Dùblaich na tùsan"
 QuickTransitions.HotkeyName="Tar-mhùthadh luath: %1"
@@ -304,7 +301,6 @@
 Output.ConnectFail.Disconnected="Chaidh an ceangal dhan fhrithealaiche a bhriseadh."
 Output.StreamEncodeError.Title="Mearachd còdachaidh"
 Output.StreamEncodeError.Msg="Thachair mearachd còdachaidh rè an t-sruthaidh."
-Output.StreamEncodeError.Msg.LastError="Thachair mearachd còdachaidh rè an t-sruthaidh:\n\n%1"
 Output.RecordFail.Title="Cha deach leinn tòiseachadh air a’ chlàradh"
 Output.RecordFail.Unsupported="Cha chuirear taic ri fòrmat an às-chuir no cha chuir e taic ri corr is aon traca fuaime. Thoir sùil air na roghainnean agad is feuch ris a-rithist."
 Output.RecordNoSpace.Title="Chan eil àite gu leòr air an diosga"
@@ -312,7 +308,6 @@
 Output.RecordError.Title="Mearachd clàraidh"
 Output.RecordError.Msg="Thachair mearachd nach deach a shònrachadh rè a’ chlàraidh."
 Output.RecordError.EncodeErrorMsg="Thachair mearachd còdachaidh rè a’ chlàraidh."
-Output.RecordError.EncodeErrorMsg.LastError="Thachair mearachd còdachaidh rè a’ chlàraidh:\n\n%1"
 Output.BadPath.Title="Droch-shlighe faidhle"
 Output.NoBroadcast.Title="Cha deach craoladh a rèiteachadh"
 Output.NoBroadcast.Text="Feumaidh tu craoladh a shuidheachadh mus urrainn dhut tòiseachadh air an t-sruthadh."
@@ -358,8 +353,8 @@
 MissingFiles.AutoSearchText="Lorg OBS barrachd sheisean dha na faidhlichean a tha a dhìth sa phasgan seo. A bheil thu airson an cur ris?"
 MissingFiles.NoMissing.Title="A’ sgrùdadh faidhlichean a dhìth"
 MissingFiles.NoMissing.Text="Tha coltas nach eil faidhle a dhìth."
-UpdateAvailable="Tha ùrachadh ri fhaighinn"
-UpdateAvailable.Text="Tha tionndadh %1.%2.%3 ri fhaighinn a-nis. <a href='%4'>Briog an-seo gus a luchdadh a-nuas</a>"
+MacPermissions.Item.Camera="Camara"
+MacPermissions.Item.Microphone="Maicreafòn"
 Basic.DesktopDevice1="Fuaim an deasg"
 Basic.DesktopDevice2="Fuaim an deasg 2"
 Basic.AuxDevice1="Micreofon/Taic"
@@ -375,6 +370,8 @@
 ScaleFiltering.Bilinear="Dà-loidhneach"
 ScaleFiltering.Bicubic="Dà-chiùbach"
 ScaleFiltering.Area="Raon"
+BlendingMode.Additive="Cuir ris"
+BlendingMode.Multiply="Iomadaich"
 Deinterlacing="Dì-fhilleadh"
 Deinterlacing.Discard="Tilg air falbh"
 Deinterlacing.TopFieldFirst="An raon air a’ bhàrr an toiseach"
@@ -553,9 +550,7 @@
 Basic.MainMenu.Edit.AdvAudio="Roghainnean &adhartach na fuaime"
 Basic.MainMenu.View="Seall (&V)"
 Basic.MainMenu.View.Toolbars="Bàraichean-inneal (&T)"
-Basic.MainMenu.View.ListboxToolbars="Putanan liosta nan seallaidhean/tùsan"
 Basic.MainMenu.View.ContextBar="Bàr-inneal nan tùsan"
-Basic.MainMenu.View.SceneTransitions="Tar-mhùthaidhean an t-seallaidh (&C)"
 Basic.MainMenu.View.SourceIcons="Ìomha&igheagan nan tùsan"
 Basic.MainMenu.View.StatusBar="Bàr-&staide"
 Basic.MainMenu.View.Fullscreen.Interface="Eadar-aghaidh làn-sgrìn"
@@ -566,7 +561,6 @@
 Basic.MainMenu.SceneCollection.Import="Ion-phortaich cruinneachadh sheallaidhean"
 Basic.MainMenu.SceneCollection.Export="Às-phortaich cruinneachadh sheallaidhean"
 Basic.MainMenu.Profile.Exists="Tha a’ phròifil ann mu thràth"
-Basic.MainMenu.SceneCollection.Exists="Tha an cruinneachadh sheallaidhean ann mu thràth"
 Basic.MainMenu.Tools="Innealan (&T)"
 Basic.MainMenu.Help="Cob&hair"
 Basic.MainMenu.Help.HelpPortal="&Portal na cobharach"
@@ -628,7 +622,6 @@
 Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Còmhnard, bàrr (18 seallaidhean)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Còmhnard, bàrr (24 sealladh)"
 Basic.Settings.Stream="Sruthadh"
-Basic.Settings.Stream.StreamType="Seòrsa an t-sruthaidh"
 Basic.Settings.Stream.Custom.UseAuthentication="Cleachd dearbh-aithneachadh"
 Basic.Settings.Stream.Custom.Username="Ainm-cleachdaiche"
 Basic.Settings.Stream.Custom.Password="Facal-faire"
@@ -650,8 +643,9 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Na FPS as motha: %1"
 Basic.Settings.Output="Às-chur"
 Basic.Settings.Output.Format="Fòrmat a’ chlàraidh"
+Basic.Settings.Output.Encoder.Video="Còdaichean Bhidio"
+Basic.Settings.Output.Encoder.Audio="Còdaichean Fhuaime"
 Basic.Settings.Output.SelectDirectory="Tagh pasgan a’ chlàraidh"
-Basic.Settings.Output.SelectFile="Tagh faidhle clàraidh"
 Basic.Settings.Output.DynamicBitrate="Atharraich an reat bhiodan gu h-innsgineach a sheachnadh dùmhlachd"
 Basic.Settings.Output.DynamicBitrate.Beta="Atharraich an reat bhiodan gu h-innsgineach a sheachnadh dùmhlachd (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Atharraichidh seo an reat bhiodan seach tuiteam fhrèaman nuair a bhios dùmhlachd ann.\n\nThoir an aire gum bi barrachd dàil air dhan amharc ma dh’fhaoidte ma thachras dùmhlachd gu h-obann.\nNuair a thuiteas an reat bhiodan, dh’fhaoidte gun toir e mionaid no dhà mus dèid a shlànachadh.\n\nCha chuir sinn taic ach ri RTMP aig an àm seo."
@@ -676,7 +670,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Rabhadh: Thèid reat bhiotaichean fuaim an t-sruthaidh a shuidheachadh air %1, seo a’ chrìoch as àirde aig an t-seirbheis sruthaidh làithreach."
 Basic.Settings.Output.Simple.Warn.CannotPause="Rabhadh: Cha ghabh clàradh a chur ’na stad nuair a bhios càileachd “Co-ionnann ri tè an t-sruthaidh” air a’ chlàradh."
 Basic.Settings.Output.Simple.Warn.Encoder="Rabhadh: Ma nì thu clàradh le inneal-còdachaidh bathair-bhog air nach eil an aon chàileachd ’s a th’ air an t-sruthadh, bi feum air barrachd cleachdadh a’ CPU nuair a bhios tu a’ sruthadh ’s a’ clàradh aig an aon àm."
-Basic.Settings.Output.Simple.Warn.Lossless="Rabhadh: Cruthaichidh càileachd gun chall faidhlichean uabhasach mòr! Faodaidh càileachd gun chall corr is 7 gigabaidht a dh’àite a chleachdadh air an diosg gach mionaid ma tha an dùmhlachd-bhreacaidh agus an reat fhrèaman àrd. Cha mholamaid càileachd gun chall airson clàraidhean fada ach ma tha tòrr àite agad air an diosg."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="A bheil thu cinnteach gu bheil thu airson càileachd gun chall a chleachdadh?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Rabhadh a thaobh càileachd gun chall!"
 Basic.Settings.Output.Simple.Encoder.Software="Bathar-bog (x264)"
@@ -738,6 +731,8 @@
 Screenshot.Preview="Glacadh-sgrìn (ro-shealladh)"
 Screenshot.Scene="Glacadh-sgrìn (sealladh)"
 Screenshot.Source="Glacadh-sgrìn (tùs)"
+FilenameFormatting.TT.M="Mionaid (00-59)"
+FilenameFormatting.TT.Y="Bliadhna"
 Basic.Settings.Video.Adapter="Adaptar video"
 Basic.Settings.Video.BaseResolution="Dùmhlachd-bhreacaidh bhunasach (a’ chanabhais)"
 Basic.Settings.Video.ScaledResolution="Dùmhlachd-bhreacaidh (sgèilichte) an às-chuir"
@@ -765,8 +760,7 @@
 Basic.Settings.Audio.PeakMeterType="Seòrsa a’ mheidheadair-bharran"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Ball-sampaill de bhàrr"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Bàrr fìrinneach (cleachdadh nas àirde a’ CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="RABHADH: Tha fuaim cuairteachaidh an comas."
-Basic.Settings.Audio.MultichannelWarning="Ma tha thu a’ dèanamh sruthadh, dearbh gun doir an t-seirbheis sruthaidh agad taic an dà chuid ri ion-chur is cluich fuaime cuairteachaidh. Mar eisimpleir, cuiridh Facebook 360 Live làn-taic ri fuaim cuairteachaidh. Ged a ghabhas Facebook Live is youTube Live ri sruthan fuaime cuairteachaidh, nì Facebook Live measgachadh sìos stereo dheth agus cha chluich YouTube live ach dà sheanail.\n\nTha criathragan fuaime OBS co-chòrdail ri fuaim cuairteachaidh ged nach doir sinn barantas gun obraich plugain VST."
+Basic.Settings.Audio.MultichannelWarning.Enabled="RABHADH: Tha fuaim cuairteachaidh an comas."
 Basic.Settings.Audio.MultichannelWarning.Title="A bheil thu airson fuaim cuairteachaidh a chur an comas?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="A bheil thu cinnteach gu bheil thu airson fuaim cuairteachaidh a chur an comas?"
 Basic.Settings.Audio.Devices="Uidheaman fuaime uile-choitcheann"
@@ -782,6 +776,7 @@
 Basic.Settings.Audio.PushToTalkDelay="Dàil air brùth-airson-bruidhinn"
 Basic.Settings.Audio.UnknownAudioDevice="Chan eil uidheam ceangailte no ri fhaighinn"
 Basic.Settings.Audio.Disabled="À comas"
+Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="Gnàthaichte"
 Basic.Settings.Advanced="Adhartach"
 Basic.Settings.Advanced.General.ConfirmOnExit="Seall rabhadh air às-chuir ghnìomhach leis an fhàgail"
 Basic.Settings.Advanced.General.ProcessPriority="Prìomhachas a’ phròiseis"
@@ -790,7 +785,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Àbhaisteach"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Nas ìsle na àbhaisteach"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="’Na tàmh"
-Basic.Settings.Advanced.Audio.BufferingTime="Ùine bufair na fuaime"
 Basic.Settings.Advanced.Video.ColorFormat="Fòrmat nan dathan"
 Basic.Settings.Advanced.Video.ColorSpace="Spàs dhathan"
 Basic.Settings.Advanced.Video.ColorRange="Rainse dhathan"
@@ -884,6 +878,7 @@
 About.Contribute="Cuidich am pròiseact OBS"
 AddUrl.Title="Cuir tùs o URL ris"
 AddUrl.Text="Shlaod thu URL gu OBS. Cuiridh seo an ceangal ’na thùs ris gu fèin-obrachail. A bheil thu airson leantainn air adhart?"
+ResizeOutputSizeOfSource.Continue="A bheil thu airson leantainn air adhart?"
 PreviewTransition="Ro-sheall an tar-mhùthadh"
 Importer="Ion-phortadh cruinneachadh sheallaidhean"
 Importer.SelectCollection="Tagh cruinneachadh sheallaidhean"
@@ -898,14 +893,12 @@
 LoadProfileNeedsRestart="Tha roghainnean aig a’ phròifil a tha feumach air ath-thòiseachadh OBS:\n%1\n\nA bheil thu airson OBS ath-thòiseachadh gus na roghainnean sin a chur an sàs?"
 ContextBar.NoSelectedSource="Cha deach tùs a thaghadh"
 ContextBar.ResetTransform="Ath-shuidhich an tar-mhùthadh"
-ContextBar.FitToCanvas="Co-fhreagair ris a’ chanabhas"
 ContextBar.MediaControls.PlayMedia="Cluich meadhan"
 ContextBar.MediaControls.PauseMedia="Cuir am meadhan ’na stad"
 ContextBar.MediaControls.StopMedia="Cuir stad air a’ mheadhan"
 ContextBar.MediaControls.RestartMedia="Ath-thòisich am meadhan"
 ContextBar.MediaControls.PlaylistNext="An ath-fhear air an liosta-chluich"
 ContextBar.MediaControls.PlaylistPrevious="An fhear roimhe air an liosta-chluich"
-ContextBar.MediaControls.MediaProperties="Roghainnean a’ mheadhain"
 ContextBar.MediaControls.BlindSeek="Widget sireadh meadhain"
 YouTube.Auth.Ok="Chaidh leis an ùghdarrachadh.\n’S urrainn dhut an duilleag seo a dhùnadh a-nis."
 YouTube.Auth.NoCode="Cha deach an t-ùghdarrachadh a choileanadh."
@@ -972,6 +965,8 @@
 YouTube.Actions.AutoStartStreamingWarning.Title="Tha feum air ath-thòiseachadh a làimh"
 YouTube.Actions.AutoStartStreamingWarning="Chaidh an tòiseachadh fèin-obrachail a chur à comas dhan tachartas seo, briog air “Cuir beò e” gus tòiseachadh air a’ chraoladh agad."
 YouTube.Actions.AutoStopStreamingWarning="Chan urrainn dhut ath-cheangal a dhèanamh. Thèid stad a chur air an t-sruthadh agad is cha bhi e beò tuilleadh."
+YouTube.Chat.Input.Send="Cuir"
+YouTube.Chat.Input.Sending="A' cur..."
 YouTube.Errors.liveStreamingNotEnabled="Chan eil sruthadh beò an comas air an t-seanail YouTube a thagh thu. Faic <a href='https://www.youtube.com/features'>youtube.com/features</a> airson barrachd fiosrachaidh."
 YouTube.Errors.livePermissionBlocked="Chan eil sruthadh beò ri fhaighinn air an t-seanail YouTube a thagh thu. Thoir an aire gun doir e gu ruige 24 uair a thìde gus am bi sruthadh beò ri fhaighinn às dhèidh dhut a chur an comas ann an roghainnean na seanail agad. Faic <a href='https://www.youtube.com/features'>youtube.com/features</a> airson mion-fhiosrachadh."
 YouTube.Errors.errorExecutingTransition="Dh’fhàillig leis a’ chraoladh ri linn mearachd a’ backend. Feuch ris a-rithist an ceann diog no dhà."

obs-studio-29.1.3.tar.xz/UI/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/gl-ES.ini Changed

@@ -92,12 +92,11 @@
 LogViewer="Visor de rexistros"
 ShowOnStartup="Amosar ao iniciar"
 OpenFile="Abrir ficheiro"
-AddValue="Engadir %1"
 AlreadyRunning.Title="O OBS xa está en execución"
 AlreadyRunning.Text="O OBS xa está en execución. A non ser que quixeses facer isto, apaga as instancias existentes do OBS antes de tentar executar unha nova instancia. Se tes o OBS configurado para minimizar na bandexa do sistema, comproba se aínda está en execución alí."
 AlreadyRunning.LaunchAnyway="Iniciar de todos os xeitos"
 ChromeOS.Title="Plataforma non compatíbel"
-Wine.Title="Detectado Wine"
+Wine.Title="Wine detectado"
 DockCloseWarning.Title="Pechar a xanela ancorábel"
 ExtraBrowsers="Docas personalizadas do navegador"
 ExtraBrowsers.Info="Engade docas dándolles un nome e URL, após preme en Aplicar ou en Pechar para abrir as docas. Podes engadir ou retirar docas en calquera intre."
@@ -152,12 +151,12 @@
 Basic.AutoConfig.StreamPage.GetStreamKey="Obter chave da emisión"
 Basic.AutoConfig.StreamPage.MoreInfo="Máis Información"
 Basic.AutoConfig.StreamPage.UseStreamKey="Empregar chave da emisión"
+Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Use Stream Key (avanzado)"
 Basic.AutoConfig.StreamPage.Service="Servizo"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Amosar todo..."
 Basic.AutoConfig.StreamPage.Service.Custom="Personalizado..."
 Basic.AutoConfig.StreamPage.Server="Servidor"
 Basic.AutoConfig.StreamPage.StreamKey="Chave da emisión"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Ligazón)"
 Basic.AutoConfig.StreamPage.EncoderKey="Chave do codificador"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Contas conectadas"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimar a taxa de bits coa proba de largo de banda (pode levar uns minutos)"
@@ -208,13 +207,9 @@
 Updater.UpdateNow="Actualizar agora"
 Updater.RemindMeLater="Lembrarmo máis tarde"
 Updater.Skip="Omitir a versión"
-Updater.Running.Title="Programa activo actualmente"
-Updater.Running.Text="As saídas están activas neste momento. Peche todas as saídas activas antes de tentar actualizar"
 Updater.NoUpdatesAvailable.Title="Non hai actualizacións dispoñíbeis"
 Updater.NoUpdatesAvailable.Text="Non hai actualizacións dispoñíbeis actualmente"
 Updater.FailedToLaunch="Produciuse un fallo ao iniciar o actualizador"
-Updater.GameCaptureActive.Title="Captura do xogo activa"
-Updater.GameCaptureActive.Text="A biblioteca de captura de xogos está activa neste intre. Pecha todos os xogos/programas que estean a se capturar (ou reinicia Windows) e téntao de novo."
 QuickTransitions.DuplicateScene="Escena duplicada"
 QuickTransitions.EditProperties="Fontes duplicadas"
 QuickTransitions.HotkeyName="Transición rápida: %1"
@@ -263,7 +258,7 @@
 Undo.MoveDown="Mover '%1' cara abaixo en '%2'"
 Undo.MoveToTop="Mover '%1' o mais alto en '%2'"
 Undo.MoveToBottom="Mover '%1' ó fondo en '%2'"
-Undo.PasteSource="pegar fonte(s) en '%1'"
+Undo.PasteSource="Pegar fonte(s) en «%1»"
 Undo.GroupItems="Agrupar elementos en '%1'"
 TransitionNameDlg.Text="Insira o nome da transición"
 TransitionNameDlg.Title="Nome da transición"
@@ -299,7 +294,6 @@
 Output.ConnectFail.Disconnected="Desconectado do servidor."
 Output.StreamEncodeError.Title="Produciuse un erro de codificación"
 Output.StreamEncodeError.Msg="Produciuse un erro de codificación durante a emisión."
-Output.StreamEncodeError.Msg.LastError="Produciuse un erro de codificación durante a emisión:\n\n%1"
 Output.RecordFail.Title="Produciuse un erro ao iniciar a gravación"
 Output.RecordFail.Unsupported="O formato de saída non é compatíbel ou non admite máis dunha pista de son. Verifique a súa configuración e ténteo de novo."
 Output.RecordNoSpace.Title="Non hai espazo abondo no disco"
@@ -307,7 +301,6 @@
 Output.RecordError.Title="Produciuse un erro de gravación"
 Output.RecordError.Msg="Produciuse un erro non especificado durante a gravación."
 Output.RecordError.EncodeErrorMsg="Produciuse un erro de codificación durante a gravación."
-Output.RecordError.EncodeErrorMsg.LastError="Produciuse un erro de codificación durante a gravación:\n\n%1"
 Output.BadPath.Title="Ruta do ficheiro incorrecta"
 Output.BadPath.Text="Non se puido abrir a ruta de gravación configurada. Comprobe a súa ruta de gravación en Configuración → Saída → Gravación."
 Output.NoBroadcast.Title="Sen emisión configurada"
@@ -350,13 +343,12 @@
 MissingFiles.Found="Atopado"
 MissingFiles.AutoSearch="Atopáronse coincidencias de ficheiros adicionais"
 MissingFiles.AutoSearchText="OBS atopou coincidencias adicionais para os ficheiros que faltan nese directorio. Quere engadilos?"
+MacPermissions.MenuAction="Review App Permissions…"
 MacPermissions.AccessGranted="Acceso permitido"
 MacPermissions.Item.Camera="Cámara"
 MacPermissions.Item.Microphone="Micrófono"
 MacPermissions.Item.Accessibility="Accesibilidade"
 MacPermissions.Continue="Continuar"
-UpdateAvailable="Hai dispoñíbel unha nova actualización"
-UpdateAvailable.Text="A versión %1.%2.%3 xa está dispoñíbel. <a href='%4'>Prema aquí para descargala</a>"
 Basic.DesktopDevice1="Son do escritorio"
 Basic.DesktopDevice2="Son do escritorio 2"
 Basic.Scene="Escena"
@@ -369,7 +361,7 @@
 ScaleFiltering.Area="Área"
 BlendingMethod="Método de Mestura"
 BlendingMethod.Default="Predeterminado"
-BlendingMethod.SrgbOff="SRGB Desactivado"
+BlendingMethod.SrgbOff="SRGB desactivado"
 BlendingMode="Modo de Mestura"
 BlendingMode.Subtract="Restar"
 BlendingMode.Screen="Pantalla"
@@ -494,6 +486,7 @@
 Basic.Main.StoppingRecording="Detendo a gravación..."
 Basic.Main.StopReplayBuffer="Deter a reprodución da memoria temporal"
 Basic.Main.StoppingReplayBuffer="Detendo a reprodución da memoria temporal..."
+Basic.Main.SetupBroadcast="Xestionar emisión en vivo"
 Basic.Main.StopStreaming="Deter a emisión"
 Basic.Main.StopBroadcast="Rematar Transmisión"
 Basic.Main.AutoStopEnabled="(Parada automática)"
@@ -507,11 +500,9 @@
 Basic.Main.Ungroup="Desagrupar"
 Basic.Main.GridMode="Modo grella"
 Basic.Main.ListMode="Modo lista"
-Basic.Main.VirtualCamConfig="Configurar Cámara Virtual"
-Basic.VCam.VirtualCamera="Cámara Virtual"
+Basic.Main.VirtualCamConfig="Configurar cámara virtual"
+Basic.VCam.VirtualCamera="Cámara virtual"
 Basic.VCam.OutputType="Tipo de saída"
-Basic.VCam.Internal="Interno"
-Basic.VCam.InternalPreview="Mostrar a Saida"
 Basic.MainMenu.File="&Ficheiro"
 Basic.MainMenu.File.Export="&Exportar"
 Basic.MainMenu.File.Import="&Importar"
@@ -520,6 +511,7 @@
 Basic.MainMenu.File.Settings="Axu&stes"
 Basic.MainMenu.File.ShowSettingsFolder="Amosar o cartafol dos axustes"
 Basic.MainMenu.File.ShowProfileFolder="Amosar o cartafol do perfil"
+Basic.MainMenu.File.ShowMissingFiles="Comprobar se hai ficheiros que faltan"
 Basic.MainMenu.File.Exit="Saír (&X)"
 Basic.MainMenu.Edit="&Editar"
 Basic.MainMenu.Edit.Undo="Desfacer (&U)"
@@ -552,12 +544,11 @@
 Basic.MainMenu.Edit.AdvAudio="Propiedades &avanzadas de son"
 Basic.MainMenu.View="&Ver"
 Basic.MainMenu.View.Toolbars="Barras de ferramentas (&T)"
-Basic.MainMenu.View.ListboxToolbars="Botóns da listaxe de escenas/fontes"
 Basic.MainMenu.View.ContextBar="Barra de ferramentas da fonte"
-Basic.MainMenu.View.SceneTransitions="Transicións de e&scena"
 Basic.MainMenu.View.SourceIcons="&Iconas de fontes"
 Basic.MainMenu.View.StatusBar="Barra de e&stado"
 Basic.MainMenu.View.Fullscreen.Interface="Interface de pantalla completa"
+Basic.MainMenu.Docks.CustomBrowserDocks="&Custom Browser Docks…"
 Basic.MainMenu.SceneCollection="Colección de e&scenas"
 Basic.MainMenu.Profile="&Perfil"
 Basic.MainMenu.Profile.Import="Importar perfil"
@@ -565,7 +556,6 @@
 Basic.MainMenu.SceneCollection.Import="Importar colección de escenas"
 Basic.MainMenu.SceneCollection.Export="Exportar colección de escenas"
 Basic.MainMenu.Profile.Exists="O perfil xa existe"
-Basic.MainMenu.SceneCollection.Exists="A colección de escenas xa existe"
 Basic.MainMenu.Tools="Ferramen&tas"
 Basic.MainMenu.Help="Axuda (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal de axuda"
@@ -627,7 +617,6 @@
 Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Horizontal, arriba (18 escenas)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontal, arriba (24 escenas)"
 Basic.Settings.Stream="Emisión"
-Basic.Settings.Stream.StreamType="Tipo de emisión"
 Basic.Settings.Stream.Custom.UseAuthentication="Usar a autenticación"
 Basic.Settings.Stream.Custom.Username="Nome de usuario"
 Basic.Settings.Stream.Custom.Password="Contrasinal"
@@ -650,7 +639,6 @@
 Basic.Settings.Output="Saída"
 Basic.Settings.Output.Format="Formato de gravación"
 Basic.Settings.Output.SelectDirectory="Seleccionar o directorio de gravación"
-Basic.Settings.Output.SelectFile="Seleccionar o ficheiro de gravación"
 Basic.Settings.Output.DynamicBitrate="Mudar de xeito dinámico a taxa de bits para xestionar a conxestión"
 Basic.Settings.Output.DynamicBitrate.Beta="Mudar dinamicamente a taxa de bits para xestionar a conxestión (beta)"
 Basic.Settings.Output.DynamicBitrate.TT="No canto de deixar perder cadros para reducir a conxestión, cambia dinamicamente a taxa de bits.\n\nTeña en conta que isto pode aumentar o atraso para os espectadores se hai unha conxestión súbita importante.\n\n Cando a taxa de bits cae, pode tardar uns minutos en restaurarse.\n\nActualmente só é compatible con RTMP."
@@ -675,7 +663,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Advertencia: a taxa de bits de son en transmisión estabelecerase en %1, que é o límite superior para o servizo de transmisión actual."
 Basic.Settings.Output.Simple.Warn.CannotPause="Aviso: Non é posíbel deter as gravacións se a calidade da gravación está estabelecida como «A mesma da emisión»."
 Basic.Settings.Output.Simple.Warn.Encoder="Aviso: a gravación cun codificador de software cunha calidade diferente á da emisión requirirá un uso de CPU adicional se se emite e grava ao mesmo tempo."
-Basic.Settings.Output.Simple.Warn.Lossless="Aviso: A calidade sen perda xera tamaños de ficheiro inmensamente grandes. A calidade sen perdas pode empregar á alza de 7 xigabytes de espazo de disco por minuto a altas resolucións e taxa de cadros. Non se recomenda a calidade sen perdas para gravacións longas a menos que dispoñas dunha cantidade moi grande de espazo no disco."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Confirma que quere empregar unha calidade sen perda?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Aviso de calidade sen perda!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 preaxustado o uso de CPU baixo, aumenta o tamaño do ficheiro)"
@@ -766,8 +753,7 @@
 Basic.Settings.Audio.PeakMeterType="Tipo de medidor de pico"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Pico de mostra"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Pico verdadeiro (maior uso de CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="AVISO: O son envolvente está activado."
-Basic.Settings.Audio.MultichannelWarning="Se se emite, comproba se o servizo de emisión admite a inxección e a reprodución de son envolvente. O Facebook 360 Live é un exemplo onde o son envolvente é totalmente compatíbel. Aínda que o Facebook Live e o YouTube Live aceptan a inxección de son envolvente, o Facebook Live remestura a estéreo e o YouTube Live reproduce só dúas canles.\n\nOs filtros de son do OBS son compatíbeis co son envolvente, aínda que non está garantida a compatibilidade co engadido VST."
+Basic.Settings.Audio.MultichannelWarning.Enabled="AVISO: O son envolvente está activado."
 Basic.Settings.Audio.MultichannelWarning.Title="Activar o son envolvente?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Confirma que quere activar o son envolvente?"
 Basic.Settings.Audio.Devices="Dispositivos de son globais"
@@ -792,7 +778,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Por riba do normal"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Por baixo do normal"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Inactivo"
-Basic.Settings.Advanced.Audio.BufferingTime="Tempo da memoria temporal de son"
 Basic.Settings.Advanced.Video.ColorFormat="Formato da cor"
 Basic.Settings.Advanced.Video.ColorSpace="Espazo de cor"
 Basic.Settings.Advanced.Video.ColorRange="Gama de cores"
@@ -831,6 +816,7 @@
 Basic.Settings.Hotkeys="Teclas rápidas"
 Basic.Settings.Hotkeys.Pair="As combinacións de teclas compartidas con «%1» actúan como conmutadores"
 Basic.Settings.Hotkeys.Filter="Filtro"
+Basic.Settings.Hotkeys.PleaseWait="Loading hotkeys, please wait…"
 Basic.Hotkeys.SelectScene="Cambiar á escena"
 Basic.SystemTray.Show="Amosar"
 Basic.SystemTray.Hide="Agochar"
@@ -877,6 +863,8 @@
 OutputWarnings.NoTracksSelected="Debe seleccionar, cando menos, unha pista"
 OutputWarnings.MP4Recording="Advertencia: as gravacións gardadas en MP4/MOV non serán recuperábeis se non se pode rematar o ficheiro (por exemplo, como resultado de BSOD, perdas de enerxía, etc.). Se quere gravar varias pistas de son, considere empregar MKV e converter a gravación a MP4/MOV unha vez rematada (Ficheiro → Gravacións de conversións)"
 OutputWarnings.CannotPause="Aviso: Non é posíbel deter as gravacións se está estabelecido o codificador da gravación «(Utilizar o codificador da emisión)»"
+CodecCompat.CodecPlaceholder="Select Encoder…"
+CodecCompat.ContainerPlaceholder="Select Format…"
 FinalScene.Title="Eliminar escena"
 FinalScene.Text="Debe haber polo menos unha escena."
 NoSources.Title="Non hai fontes"
@@ -908,14 +896,12 @@
 NeedsRestart="É preciso reiniciar o OBS Studio. Quere reinicialo agora?"
 ContextBar.NoSelectedSource="Non hai ningunha fonte seleccionada"
 ContextBar.ResetTransform="Restabelecer a transformación"
-ContextBar.FitToCanvas="Axustar ao lenzo"
 ContextBar.MediaControls.PlayMedia="Reproducir o medio"
 ContextBar.MediaControls.PauseMedia="Pausar o medio"
 ContextBar.MediaControls.StopMedia="Deter o medio"
 ContextBar.MediaControls.RestartMedia="Reiniciar o medio"
 ContextBar.MediaControls.PlaylistNext="Seguinte na lista de reproducción"
 ContextBar.MediaControls.PlaylistPrevious="Anterior na lista de reproducción"
-ContextBar.MediaControls.MediaProperties="Propiedades do medio"
 ContextBar.MediaControls.BlindSeek="Trebello de busca de medios"
 YouTube.Auth.NoCode="O proceso de autorización non se completou."
 YouTube.Auth.NoChannels="Non hai canles dispoñibles na conta seleccionada"
@@ -934,10 +920,10 @@
 YouTube.Actions.Privacy.Unlisted="Non listado"
 YouTube.Actions.Category="Categoría"
 YouTube.Actions.Thumbnail="Miniatura"
-YouTube.Actions.Thumbnail.SelectFile="Escoller ficheiro"
+YouTube.Actions.Thumbnail.SelectFile="Seleccionar ficheiro…"
 YouTube.Actions.Thumbnail.NoFileSelected="Ficheiro non seleccionado"
 YouTube.Actions.Thumbnail.ClearFile="Limpar"
-YouTube.Actions.MadeForKids="Este vídeo está feito para nenos?"
+YouTube.Actions.MadeForKids="Este vídeo está feito para nenos?*"
 YouTube.Actions.MadeForKids.Yes="Si, está feito para nenos"
 YouTube.Actions.MadeForKids.No="Non, non está feito para nenos"
 YouTube.Actions.Latency="Latencia"
@@ -956,29 +942,30 @@
 YouTube.Actions.Create_Schedule="Programar a emisión"
 YouTube.Actions.Create_Schedule_Ready="Programar e escoller emisión"
 YouTube.Actions.Dashboard="Abrir YouTube Studio"
-YouTube.Actions.Error.Title="Erro na creación da emisión en vivo."
+YouTube.Actions.Error.Title="Produciuse un erro na creación da emisión en vivo"
 YouTube.Actions.Error.Text="Error de acceso a YouTube '%1'. Pódese atopar unha descrición detallada do erro en <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.General="Erro de acceso a YouTube. Comproba a túa conexión de rede ou o acceso ao teu servidor de YouTube."
 YouTube.Actions.Error.NoBroadcastCreated="Erro na creación da emisión '%1'. Pódese atopar unha descrición detallada do erro en <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.NoStreamCreated="Non se creou ningunha emisión. Volve vincular a túa conta."
 YouTube.Actions.Error.YouTubeApi="Erro na API de YouTube. Consulte o ficheiro de rexistro para obter máis información."
 YouTube.Actions.Error.BroadcastNotFound="Non se atopou a emisión escollida."
-YouTube.Actions.Error.FileMissing="Non se atopa o ficheiro escollido"
+YouTube.Actions.Error.FileMissing="O ficheiro seleccionado non existe"
 YouTube.Actions.Error.FileOpeningFailed="Erro o abrir o ficheiro escollido."
 YouTube.Actions.Error.FileTooLarge="O ficheiro escollido e moi grande (Limite: 2 MiB)."
 YouTube.Actions.Error.BroadcastTransitionFailed="Produciuse un erro ao realizar a transición da emisión: %1 Se este erro persiste <a href='https://studio.youtube.com/video/%2/livestreaming'>abre a emisión en YouTube Studio </a> e proba manualmente."
 YouTube.Actions.Error.BroadcastTestStarting="A emisión está en transición á fase de proba, isto pode levar algún tempo. Téntao de novo en 10–30 segundos."
-YouTube.Actions.EventsLoading="Cargando lista de eventos..."
+YouTube.Actions.EventsLoading="Cargando lista de eventos…"
 YouTube.Actions.EventCreated.Title="Evento creado"
 YouTube.Actions.EventCreated.Text="Evento creado con éxito."
 YouTube.Actions.Stream="Fluxo"
 YouTube.Actions.Stream.ScheduledFor="Programado para %1"
 YouTube.Actions.Stream.Resume="Retomar o fluxo interrompido"
-YouTube.Actions.Stream.YTStudio="Feito automaticamente por YouTube Studio"
-YouTube.Actions.Notify.CreatingBroadcast="Facendo unha nova emisión en directo, agarda..."
+YouTube.Actions.Stream.YTStudio="Creado automaticamente por YouTube Studio"
+YouTube.Actions.Notify.CreatingBroadcast="Facendo unha nova emisión en directo, agarda…"
 YouTube.Actions.AutoStartStreamingWarning.Title="Requírese inicio manual"
-YouTube.Actions.AutoStartStreamingWarning="O inicio automático está desactivado para este evento, fai clic en \"En directo\" para iniciar a túa emisión."
-YouTube.Actions.AutoStopStreamingWarning="Non poderás volver conectarte. A túa emisión deterase e xa non estarás en directo."
+YouTube.Actions.AutoStartStreamingWarning="O inicio automático está desactivado para este evento, fai clic en «En directo» para iniciar a túa emisión."
+YouTube.Actions.AutoStopStreamingWarning="Non poderás volver a conectarte. A túa emisión deterase e xa non estarás en directo."
 YouTube.Chat.Input.Send="Enviar"
-YouTube.Chat.Input.Sending="Enviando..."
-YouTube.Errors.liveStreamingNotEnabled="A emisión en directo non está habilitada na canle de YouTube escollida Consulta <a href='https://www.youtube.com/features'>youtube.com/features</a> para obter máis información."
+YouTube.Chat.Input.Placeholder="Enter message here…"
+YouTube.Chat.Input.Sending="Enviando…"
+YouTube.Errors.liveStreamingNotEnabled="A emisión en directo non está habilitada na canle de YouTube escollida. Consulta <a href='https://www.youtube.com/features'>youtube.com/features</a> para obter máis información."

obs-studio-29.1.3.tar.xz/UI/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/he-IL.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="מציג היומן"
 ShowOnStartup="הצג בעת הפעלה"
 OpenFile="פתיחת קובץ"
-AddValue="הוספת %1"
 AddSource="הוספת מקור"
 RemoveScene="הסרת הסצנה הנבחרת"
 RemoveSource="הסרת המקורות הנבחרים"
@@ -107,11 +106,19 @@
 SourceFilters="פתיחת מסנני מקור"
 MixerToolbarMenu="תפריט מערבל שמע"
 SceneFilters="פתיחת מסנני סצנה"
+List="רשימה"
+Grid="טבלה"
 PluginsFailedToLoad.Title="שגיאה בטעינת תוסף"
 PluginsFailedToLoad.Text="טעינת תוספי OBS הבאים נכשלה:\n\n%1\nנא לעדכן או להסיר תוספים אלה."
 AlreadyRunning.Title="OBS פועל כבר"
 AlreadyRunning.Text="‏OBS כבר פעיל! אלא אם התכוונת לעשות זאת, נא לכבות את כל התהליכים הקיימים של OBS לפני ניסיון הפעלת תהליך חדש. אם OBS מוזער למגש המערכת, נא לבדוק אם הוא עדיין פעיל שם."
 AlreadyRunning.LaunchAnyway="הפעלה בכל מקרה"
+AutoSafeMode.Title="מצב בטוח"
+AutoSafeMode.Text="OBS לא נכבה כראוי בפעם האחרונה.\n\nלהפעיל אותו מחדש במצב בטוח (תוספי צד־שלישי, סקריפטים ו־WebSockets מושבתים)?"
+AutoSafeMode.LaunchSafe="הפעלה במצב בטוח"
+AutoSafeMode.LaunchNormal="הפעלה כרגיל"
+SafeMode.Restart="להפעיל את OBS מחדש במצב בטוח (תוספי צד־שלישי, סקריפטים ו־WebSockets מושבתים)?"
+SafeMode.RestartNormal="להפעיל את OBS מחדש כרגיל?"
 ChromeOS.Title="פלטפורמה לא נתמכת"
 ChromeOS.Text="נראה ש־OBS פועל בתוך קונטיינר של ChromeOS. פלטפורמה זו אינה נתמכת."
 Wine.Title="זוהה Wine"
@@ -179,8 +186,8 @@
 Basic.AutoConfig.StreamPage.Server="שרת"
 Basic.AutoConfig.StreamPage.StreamKey="מפתח שידורים חיים"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: נא למלא את מילת צופן ההצפנה.\nRTMP: נא למלא את המפתח שסופק על ידי השירות.\nSRT: נא למלא את מזהה התזרים (streamid) אם השירות משתמש באחד."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(קישור)"
 Basic.AutoConfig.StreamPage.EncoderKey="מפתח מקודד"
+Basic.AutoConfig.StreamPage.BearerToken="אסימון נושא"
 Basic.AutoConfig.StreamPage.ConnectedAccount="חשבון מחובר"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="הערכת קצב נתונים עם בדיקת רוחב פס (עשוי להימשך דקות אחדות)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="העדף קידוד בחומרה"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="עדכון כעת"
 Updater.RemindMeLater="דחייה למועד מאוחר יותר"
 Updater.Skip="לא לעדכן"
-Updater.Running.Title="תוכנית פעילה כעת"
-Updater.Running.Text="הפלט פעיל כרגע, נא לכבות כל פלט פעיל לפני העדכון"
 Updater.NoUpdatesAvailable.Title="אין עדכונים זמינים"
 Updater.NoUpdatesAvailable.Text="אין עדכונים זמינים כעת"
 Updater.BranchNotFound.Title="ערוץ העדכונים הוסר"
@@ -243,8 +248,6 @@
 Updater.RepairConfirm.Title="ווידוא בדיקת תקינות"
 Updater.RepairConfirm.Text="התחלת בדיקת התקינות תסרוק שיבושים בהתקנת ה-OBS שלך ותבצע הורדה מחדש של קבצים משובשים/שעברו שינוי. הפעולה עשויה לקחת זמן מה.\n\nהאם ברצונך להמשיך?"
 Updater.FailedToLaunch="הפעלת אשף העדכון נכשלה"
-Updater.GameCaptureActive.Title="הקלטת משחק פעילה"
-Updater.GameCaptureActive.Text="הספרייה של הקלטת המשחקים נמצאת בשימוש כרגע. נא לסגור כל המשחקים או התוכנית שנמצאים בהקלטה (או להפעיל את Windows מחדש) ולנסות שוב."
 QuickTransitions.SwapScenes="החלפת סצנות תצוגה מקדימה/סצנות תוכנית לאחר המעבר"
 QuickTransitions.SwapScenesTT="החלפת הסצנות של התצוגה המקדימה ושל התוכנית לאחר המעבר (במידה שהסצינה המקורית של התוכנית עדיין קיימת).\n פעולה זו לא תבטל כל שינוי שייתכן שבוצע לסצינה המקורית של התוכנית."
 QuickTransitions.DuplicateScene="שכפול הסצנה"
@@ -258,6 +261,8 @@
 Basic.SceneTransitions="מעברי סצינות"
 Basic.TransitionDuration="משך זמן"
 Basic.TogglePreviewProgramMode="מצב סטודיו"
+Basic.EnablePreviewProgramMode="הפעלת מצב סטודיו"
+Basic.DisablePreviewProgramMode="השבתת מצב סטודיו"
 Undo.Undo="בטל"
 Undo.Redo="בצע מחדש"
 Undo.Add="הוספת \"%1\""
@@ -306,6 +311,8 @@
 Undo.GroupItems="קבץ פריטים לכדי '%1'"
 TransitionNameDlg.Text="נא לתת שם למעבר"
 TransitionNameDlg.Title="שם מעבר"
+TitleBar.SafeMode="מצב בטוח"
+TitleBar.PortableMode="מצב נייד"
 TitleBar.Profile="פרופיל"
 TitleBar.Scenes="סצנות"
 NameExists.Title="השם כבר קיים"
@@ -330,6 +337,7 @@
 Output.StartStreamFailed="התחלת השידור החי נכשלה"
 Output.StartRecordingFailed="התחלת ההקלטה נכשלה"
 Output.StartReplayFailed="הפעלת אוגר ההילוך החוזר נכשלה"
+Output.StartVirtualCamFailed="הפעלת המצלמה הווירטואלית נכשלה"
 Output.StartFailedGeneric="הפלט נכשל. לפרטים נוספים נא לבדוק את קובץ היומן.\n\nלתשומת ליבך: אם נעשה שימוש במקודדי NVENC או AMD, נא לוודא שמנהלי ההתקן של כרטיס המסך שלך מעודכנים."
 Output.ReplayBuffer.PauseWarning.Title="לא ניתן לשמור הילוכים חוזרים בזמן השהיה"
 Output.ReplayBuffer.PauseWarning.Text="אזהרה: הילוכים חוזרים לא ניתנים לשמירה כאשר ההקלטה מושהית."
@@ -342,7 +350,7 @@
 Output.ConnectFail.Disconnected="התנתקת מהשרת."
 Output.StreamEncodeError.Title="שגיאת קידוד"
 Output.StreamEncodeError.Msg="אירעה שגיאת מקודד במהלך השידור החי."
-Output.StreamEncodeError.Msg.LastError="אירעה שגיאה במצפין במהלך ההזרמה:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="אירעה שגיאה במצפין במהלך ההזרמה: %1"
 Output.RecordFail.Title="התחלת ההקלטה נכשלה"
 Output.RecordFail.Unsupported="תבנית הפלט לא נתמכת או לא תומכת ביותר מרצועת שמע אחת. נא בדוק את ההגדרות ונסה שוב."
 Output.RecordNoSpace.Title="אין די שטח דיסק"
@@ -350,7 +358,7 @@
 Output.RecordError.Title="שגיאת הקלטה"
 Output.RecordError.Msg="אירעה שגיאה לא מוגדרת בזמן ההקלטה."
 Output.RecordError.EncodeErrorMsg="התרחשה שגיאת מקודד בזמן הקלטה."
-Output.RecordError.EncodeErrorMsg.LastError="אירעה שגיאה במצפין במהלך ההקלטה:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="אירעה שגיאה במצפין במהלך ההקלטה: %1"
 Output.BadPath.Title="נתיב קובץ לא תקין"
 Output.BadPath.Text="לא ניתן לפתוח את נתיב ההקלטה המוגדר. נא לבדוק את נתיב ההקלטה שלך תחת הגדרות ← פלט ← הקלטה."
 Output.NoBroadcast.Title="אין הגדרת שידור"
@@ -380,6 +388,8 @@
 Remux.ExitUnfinishedTitle="המרה בתהליך"
 Remux.ExitUnfinished="ההמרה לא הסתיימה, עצירה עכשיו עלולה להפוך את קובץ היעד לא שמיש.\nלעצור את ההמרה?"
 Remux.HelpText="אפשר לגרור קבצים להמרה לחלון זה, או לבחור את תא \"הקלטת OBS\" ריק כדי לבחור קובץ ידנית."
+Remux.NoFilesAddedTitle="לא נוסף קובץ ריבוב"
+Remux.NoFilesAdded="לא נוסף קובץ לריבוב. יש להשליך לכאן תיקייה שמכילה קובץ וידאו אחד או יותר."
 MissingFiles="קבצים חסרים"
 MissingFiles.MissingFile="קובץ חסר"
 MissingFiles.NewFile="קובץ חדש"
@@ -398,7 +408,8 @@
 MissingFiles.AutoSearchText="OBS מצא התאמות נוספות לקבצים חסרים בתיקייה זו. להוסיף אותם?"
 MissingFiles.NoMissing.Title="בדיקת קבצים חסרים"
 MissingFiles.NoMissing.Text="לא קיימים קבצים חסרים."
-MacPermissions.Title="בדוק את הרשאות האפליקציה"
+MacPermissions.MenuAction="סקירת הרשאות היישום…"
+MacPermissions.Title="סקירת הרשאות היישום"
 MacPermissions.Description="OBS Studio דורשת הרשאה בכדי לספק תכונות מסוימות. מומלץ להפעיל הרשאות אלו, אך הן לא נדרשות בכדי להשתמש באפליקציה. ניתן תמיד להפעיל אותן מאוחר יותר."
 MacPermissions.Description.OpenDialog="ניתן לפתוח מחדש את תיבת דו-שיח זו דרך תפריט OBS Studio."
 MacPermissions.AccessGranted="גישה הוענקה"
@@ -413,8 +424,8 @@
 MacPermissions.Item.Accessibility="נגישות"
 MacPermissions.Item.Accessibility.Details="בכדי שקיצורי מקלדת (מקשים-חמים) יעבדו גם כאשר תוכנות אחרות בפוקוס, נא לאשר הרשאה זו."
 MacPermissions.Continue="הבא"
-UpdateAvailable="עדכון חדש זמין"
-UpdateAvailable.Text="גרסה %1.%2.%3 זמינה כעת. <a href='%4'> יש ללחוץ כאן כדי להורידה</a>"
+SourceLeak.Title="שגיאת פינוי מקור"
+SourceLeak.Text="אירעה תקלה בשינוי אוספי הסצנות ולא ניתן לפרוק חלק מהמקורות. התקלה הזאת בדרך כלל נגרמת על ידי תוספים שאינם משחררים משאבים כראוי. נא לוודא שהתוספים שמשמשים אותך הם עדכניים.\n\nOBS Studio ייסגר כעת כדי למנוע אפשרות של השחתת נתונים."
 Basic.DesktopDevice1="שמע בשולחן העבודה"
 Basic.DesktopDevice2="שמע בשולחן העבודה 2"
 Basic.AuxDevice1="מיקרופון/Aux"
@@ -477,6 +488,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (בחירה אוטומטית: %2)"
 Basic.PropertiesWindow.SelectColor="בחירת צבע"
 Basic.PropertiesWindow.SelectFont="בחירת גופן"
+Basic.PropertiesWindow.SelectFont.WindowTitle="נא לבחור גופן"
 Basic.PropertiesWindow.ConfirmTitle="הגדרות שונו"
 Basic.PropertiesWindow.Confirm="יש שינויים שלא נשמרו. לשמור אותם?"
 Basic.PropertiesWindow.NoProperties="אין מאפיינים זמינים"
@@ -587,9 +599,9 @@
 Basic.VCam.VirtualCamera="מצלמה וירטואלית"
 Basic.VCam.OutputType="סוג פלט"
 Basic.VCam.OutputSelection="בחירת פלט"
-Basic.VCam.Internal="פנימי"
-Basic.VCam.InternalDefault="פלט תוכנית (ברירת מחדל)"
-Basic.VCam.InternalPreview="תצוגה מקדימה של פלט"
+Basic.VCam.OutputType.Program="תוכנית (ברירת מחדל)"
+Basic.VCam.OutputSelection.NoSelection="אין בחירה לסוג פלט זה"
+Basic.VCam.RestartWarning="המצלמה הווירטואלית תופעל מחדש כדי להחיל את השינוי הזה"
 Basic.MainMenu.File="&קובץ"
 Basic.MainMenu.File.Export="יי&צוא"
 Basic.MainMenu.File.Import="יי&בוא"
@@ -631,17 +643,18 @@
 Basic.MainMenu.Edit.AdvAudio="מאפייני שמע &מתקדמים"
 Basic.MainMenu.View="&תצוגה"
 Basic.MainMenu.View.Toolbars="&סרגלי כלים"
-Basic.MainMenu.View.ListboxToolbars="כפתורי רישמת המקורות\סצנות"
+Basic.MainMenu.View.ListboxToolbars="עיגון סרגלי כלים"
 Basic.MainMenu.View.ContextBar="סרגל הכלים של המקורות"
-Basic.MainMenu.View.SceneTransitions="מע&ברי סצנות"
 Basic.MainMenu.View.SourceIcons="&סמלי מקורות"
 Basic.MainMenu.View.StatusBar="&שורת מצב"
 Basic.MainMenu.View.Fullscreen.Interface="ממשק מסך מלא"
 Basic.MainMenu.View.ResetUI="אי&פוס הממשק"
 Basic.MainMenu.View.AlwaysOnTop="תמיד &עליון"
+Basic.MainMenu.View.SceneListMode="מצב רשימת סצנות"
 Basic.MainMenu.Docks="חלונות נ&צמדים"
 Basic.MainMenu.Docks.ResetDocks="אי&פוס החלון הנצמד"
 Basic.MainMenu.Docks.LockDocks="נ&עילת החלונות הנצמדים"
+Basic.MainMenu.Docks.SideDocks="מעגנים ב&גובה מלא"
 Basic.MainMenu.Docks.CustomBrowserDocks="&חלונות דפדפן נצמדים בהתאמה אישית…"
 Basic.MainMenu.SceneCollection="אוסף &סצנות"
 Basic.MainMenu.Profile="&פרופיל"
@@ -650,7 +663,6 @@
 Basic.MainMenu.SceneCollection.Import="ייבוא אוסף סצנות"
 Basic.MainMenu.SceneCollection.Export="ייצוא אוסף סצנות"
 Basic.MainMenu.Profile.Exists="הפרופיל כבר קיים"
-Basic.MainMenu.SceneCollection.Exists="אוסף הסצנות כבר קיים"
 Basic.MainMenu.Tools="&כלים"
 Basic.MainMenu.Help="עז&רה"
 Basic.MainMenu.Help.HelpPortal="&פורטל עזרה"
@@ -662,8 +674,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="העלאת קובץ יומן &נוכחי"
 Basic.MainMenu.Help.Logs.UploadLastLog="העלאת קובץ יומן &קודם"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="הצגת היומן הנוכחי"
+Basic.MainMenu.Help.ReleaseNotes="הערות למהדורה"
 Basic.MainMenu.Help.CheckForUpdates="בדיקת עדכונים"
 Basic.MainMenu.Help.Repair="בדיקת תקינות קבצים"
+Basic.MainMenu.Help.RestartSafeMode="להפעיל מחדש במצב בטוח"
+Basic.MainMenu.Help.RestartNormal="להפעיל מחדש כרגיל"
 Basic.MainMenu.Help.CrashLogs="דוחות &קריסה"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="ה&צגת דוחות קריסה"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="העלאת יומן קריסה &קודם"
@@ -733,7 +748,6 @@
 Basic.Settings.General.ChannelName.beta="מהדורות ניסוי (בטא) / מועמדות להפצה"
 Basic.Settings.General.ChannelDescription.beta="גרסאות מפוקפקות טרום הפצה"
 Basic.Settings.Stream="שידורים חיים"
-Basic.Settings.Stream.StreamType="סוג שידור חי"
 Basic.Settings.Stream.Custom.UseAuthentication="שימוש באימות"
 Basic.Settings.Stream.Custom.Username="שם משתמש"
 Basic.Settings.Stream.Custom.Password="סיסמה"
@@ -765,7 +779,6 @@
 Basic.Settings.Output.Encoder.Video="מצפין וידאו"
 Basic.Settings.Output.Encoder.Audio="מצפין שמע"
 Basic.Settings.Output.SelectDirectory="בחירת תיקיית הקלטות"
-Basic.Settings.Output.SelectFile="בחירת קובץ הקלטה"
 Basic.Settings.Output.DynamicBitrate="התאם דינאמית את קצב הביטים בהתאם לעומס על הרשת"
 Basic.Settings.Output.DynamicBitrate.Beta="התאם דינאמית את קצב הביטים בהתאם לעומס על הרשת (בטא)"
 Basic.Settings.Output.DynamicBitrate.TT="במקום שפריימים יפלו כתוצאה מעומס על הרשת, קצב הביטים ישתנה באופן דינאמי.\n\nיש לשים לב כי הגדרה זו עלולה להעלות את ההשהייה לצופים בעת עומס פתאומי על הרשת.\nכאשר קצב הביטים יורד, עשויות לעבור כמה דקות עד שישוחזר.\n\nכרגע נתמך רק עבור RTMP."
@@ -793,7 +806,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="אזהרה: לא ניתן להשהות הקלטות אם מקודד ההקלטה מוגדר ל־\"כמו בשידורים החיים\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="אזהרה: ההקלטה הנבחרת אינה תואמת למצפיני השידור הנבחרים."
 Basic.Settings.Output.Simple.Warn.Encoder="אזהרה: הקלטה עם מקודד תוכנה באיכות שונה מהשידור החי תדרוש שימוש במשאבי מעבד נוספים אם מתבצעים הקלטה ושידור חי במקביל."
-Basic.Settings.Output.Simple.Warn.Lossless="אזהרה: איכות ללא אבדן יוצרת גודלי קבצים גדולים מאוד! איכות ללא אבדן נתונים יכולה להשתמש ביותר מ־7 ג׳יגה־בתים משטח הכונן לדקה ברזולוציות גבוהות וקצב פריימים גבוה. שימוש באיכות ללא אבדן אינו מומלץ להקלטות ארוכות אלא אם קיים שטח כונן פנוי גדול מאוד."
+Basic.Settings.Output.Simple.Warn.Lossless="אזהרה: איכות ללא אובדן יוצרת גודלי קבצים גדולים מאוד! איכות ללא אובדן נתונים יכולה להשתמש ביותר מ־7 גיגה־בתים משטח הכונן לדקה ברזולוציות גבוהות וקצב תמוניות גבוה. שימוש באיכות ללא אובדן אינו מומלץ להקלטות ארוכות אלא אם יש מספיק מקום פנוי בכונן. הזיכרון החוצץ לנגינה חוזרת לא זמין בעת שימוש באיכות ללא אובדן."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="להשתמש באיכות ללא אובדן איכות?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="אזהרה איכות ללא אובדן איכות!"
 Basic.Settings.Output.Simple.Encoder.Software="תוכנה (x264)"
@@ -944,8 +957,8 @@
 Basic.Settings.Audio.PeakMeterType="סוג שיא המד"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="שיא דגימה"
 Basic.Settings.Audio.PeakMeterType.TruePeak="שיא אמיתי (שימוש גבוה יותר במעבד)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="אזהרה: שמע צליל היקפי מאופשר."
-Basic.Settings.Audio.MultichannelWarning="עבור שידורים חיים, כדאי לבדוק אם שירות השידורים החיים שלך תומך בקבלה והשמעה של צליל סראונד. דוגמאות לשירותים התומכים בצלילי סראונד באופן מלא: Facebook 360 Live,‏ Mixer RTMP‏, Smashcast. למרות שגם Facebook Live וגם YouTube Live תומכים בקבלת סראונד, שירות Facebook Live מבצע הפחתת ערבול לסטריאו, בעוד YouTube Live מנגן רק שני ערוצים.\n\nערוצי השמע של OBS מותאמים לסאונד סראונד, אך תמיכה בתוספי VST אינה מובטחת."
+Basic.Settings.Audio.MultichannelWarning.Enabled="אזהרה: שמע צליל היקפי מאופשר."
+Basic.Settings.Audio.MultichannelWarning="עבור שידורים חיים, כדאי לבדוק אם שירות השידורים החיים תומך בקבלה והשמעה של צליל סראונד. למשל, Facebook 360 Live תומך בסראונד באופן מלא, YouTube Live תומך בקבלה של שמע 5.1 (ובנגינה בטלוויזיות).\n\nמסנני השמע של OBS תומכים בסראונד, למרות שהתמיכה בתוסף VST אינה מובטחת."
 Basic.Settings.Audio.MultichannelWarning.Title="להפעיל קול שמע מקיף?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="האם להפעיל קול שמע מקיף?"
 Basic.Settings.Audio.Devices="התקני קול גלובליים"
@@ -992,7 +1005,6 @@
 Basic.Settings.Advanced.FormatWarning="אזהרה: תבניות צבע שונות מ־NV12/P010 נועדו בעיקר להקלטה, ואינן מומלצות בעת שידורים חיים. שידורים חיים עלולים לגרום למשאבי עיבוד מוגברים כתוצאה מהמרת תבנית צבע."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="אזהרה: תצורות דיוק גבוה נפוצות יותר לשימוש במרחבי צבע HDR."
 Basic.Settings.Advanced.FormatWarning2100="אזהרה: Rec. 2100 אמור להשתמש בתצורה עם יותר דיוק."
-Basic.Settings.Advanced.Audio.BufferingTime="זמן אוגר שמע"
 Basic.Settings.Advanced.Video.ColorFormat="תבנית צבע"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 סיביות, 4:2:0, 2 מישורים)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 סיביות, 4:2:0, 3 מישורים)"
@@ -1018,6 +1030,7 @@
 Basic.Settings.Advanced.Network="רשת"
 Basic.Settings.Advanced.Network.Disabled="הפרוטוקול הנוכחי שנבחר לשידורים החיים לא תומך בשינוי הגדרות הרשת."
 Basic.Settings.Advanced.Network.BindToIP="אגד ל- IP"
+Basic.Settings.Advanced.Network.IPFamily="משפחת IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="הפעלת מיטובי רשת"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="אפשר TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="מנסה להפוך את פלט RTMP לידידותי יותר עבור אפליקציות רגישות ל-latency ברשת על ידי ויסות קצב השידור.\nזה עלול להעלות את הסיכון לנפילת פריימים בחיבורים לא יציבים."
@@ -1093,6 +1106,8 @@
 SceneItemShow="הצגת \"%1\""
 SceneItemHide="הסתר '%1'"
 OutputWarnings.NoTracksSelected="חובה לבחור רצועה אחת לפחות"
+OutputWarnings.NoTracksSelectedOnExit.Title="שגיאת הגדרות פלט"
+OutputWarnings.NoTracksSelectedOnExit.Text="בכל ערוצי הפלט אמורה להיות לפחות רצועת שמע אחת שנבחרה."
 OutputWarnings.MP4Recording="אזהרה: הקלטות שיישמרו בתור MP4/MOV יהיו בלתי־שמישות אם לא הקובץ לא ייצא בשלמותו (למשל, בגלל שגיאות מערכת, אובדן מתח חשמלי, וכו׳). אם ברצונך להקליט רצועות שמע מרובות, נא לשקול להשתמש בפורמט MKV ואז להמיר את ההקלטה לפורמט MP4/MOV לאחר סיום ההקלטה (קובץ←המרת הקלטות)"
 OutputWarnings.CannotPause="אזהרה: לא ניתן להשהות הקלטות אם מקודד ההקלטה מוגדר ל־\"(שימוש במקודד לשידורים החיים)\""
 OutputWarnings.CodecIncompatible="בחירת מצפיני השמע או הווידאו אופסה עקב חוסר תאימות. נא לבחור במצפינים נתמכים מהרשימה."
@@ -1118,6 +1133,7 @@
 About.GetInvolved="לקיחת חלק"
 About.Authors="יוצרים"
 About.License="רישיון"
+About.Error="שגיאה! לא ניתן לקרוא את הקובץ.\n\nנא לגשת אל: %1"
 About.Contribute="תמיכה במיזם OBS"
 AddUrl.Title="הוספת מקור דרך כתובת"
 AddUrl.Text="גררת כתובת לתוך OBS. זה יוסיף אוטומטית את הקישור כמקור. להמשיך?"
@@ -1139,14 +1155,12 @@
 LoadProfileNeedsRestart="הפרופיל מכיל הגדרות הדורשות הפעלת OBS מחדש:\n%1\n\nלהפעיל את OBS מחדש להחלת הגדרות אלה?"
 ContextBar.NoSelectedSource="לא נבחר מקור"
 ContextBar.ResetTransform="אפס שינויים"
-ContextBar.FitToCanvas="התאם למשטח העבודה"
 ContextBar.MediaControls.PlayMedia="ניגון מדיה"
 ContextBar.MediaControls.PauseMedia="השהה מדיה"
 ContextBar.MediaControls.StopMedia="עצור מדיה"
 ContextBar.MediaControls.RestartMedia="התחל מדיה מחדש"
 ContextBar.MediaControls.PlaylistNext="הבא בפלייליסט"
 ContextBar.MediaControls.PlaylistPrevious="הקודם בפלייליסט"
-ContextBar.MediaControls.MediaProperties="מאפייני מדיה"
 ContextBar.MediaControls.BlindSeek="יישומון חיפוש מדיה"
 YouTube.Auth.Ok="ההזדהות הושלמה בהצלחה.\nכעת ניתן לסגור את העמוד הזה."
 YouTube.Auth.NoCode="תהליך ההזדהות לא הושלם."
@@ -1228,3 +1242,5 @@
 YouTube.Errors.liveChatEnded="השידור הסתיים."
 YouTube.Errors.messageTextInvalid="תוכן ההודעה שגוי."
 YouTube.Errors.rateLimitExceeded="שלחת הודעות מהר מדי."
+YouTube.DocksRemoval.Title="מחיקת מעגנים מיושנים של דפדפן YouTube"
+YouTube.DocksRemoval.Text="מעגני דפדפן אלה יוסרו כיוון שיצאו משימוש.\n\n%1\nאפשר להשתמש ב„מעגנים/חדר בקרה ל־YouTube חי” במקום."

obs-studio-29.1.3.tar.xz/UI/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/hi-IN.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="लॉग देखने वाला"
 ShowOnStartup="स्टार्टअप पर दिखाएँ"
 OpenFile="फ़ाइल खोलें"
-AddValue="%1 जोड़ें"
 AddSource="स्रोत जोड़ें"
 RemoveScene="चयनित दृश्य को हटाएँ"
 RemoveSource="चयनित स्रोत(तों) को हटाएँ"
@@ -107,11 +106,19 @@
 SourceFilters="स्रोत फ़िल्टर खोलें"
 MixerToolbarMenu="ऑडियो मिक्सर मेनू"
 SceneFilters="दृश्य फ़िल्टर खोलें"
+List="सूची"
+Grid="ग्रिड"
 PluginsFailedToLoad.Title="प्लगइन लोड त्रुटि"
 PluginsFailedToLoad.Text="निम्‍न OBS प्‍लग इन लोड होने में विफल :\n\n%1\nकृपया इन प्‍लग इन को अपडेट करें या निकालें."
 AlreadyRunning.Title="OBS चल रहा है"
 AlreadyRunning.Text="OBS पहले से ही चल रहा है! अगर आप ऐसा नहीं करना चाहते हैं, कृपया एक नया उदाहरण चलाने की कोशिश करने से पहले OBS के किसी भी मौजूदा उदाहरण को बंद कर दें। यदि आपके पास सिस्टम ट्रे को कम करने के लिए OBS सेट है, तो कृपया जांचें कि क्या यह अभी भी वहां चल रहा है।"
 AlreadyRunning.LaunchAnyway="फिर भी लॉन्च करें"
+AutoSafeMode.Title="सुरक्षित मोड"
+AutoSafeMode.Text="आपके पिछले सत्र में OBS ठीक से बंद नहीं हुआ.\n\nक्या आप सुरक्षित मोड में प्रारंभ करना चाहेंगे (तृतीय-पक्ष प्लगइन्स, स्क्रिप्टिंग और वेबसॉकेट्स अक्षम)?"
+AutoSafeMode.LaunchSafe="सुरक्षित मोड में चलाएं"
+AutoSafeMode.LaunchNormal="सामान्य रूप से चलाएँ"
+SafeMode.Restart="क्या आप ओबीएस को सुरक्षित मोड में पुनः आरंभ करना चाहते हैं (तृतीय-पक्ष प्लगइन्स, स्क्रिप्टिंग और वेबसॉकेट्स अक्षम)?"
+SafeMode.RestartNormal="क्या आप ओबीएस को सामान्य मोड में पुनः आरंभ करना चाहते हैं?"
 ChromeOS.Title="असमर्थित प्लेटफार्म"
 ChromeOS.Text="OBS ChromeOS कंटेनर के अंदर चलता हुआ दिखाई देता है. यह प्लेटफार्म असमर्थित है."
 Wine.Title="Wine उपलब्थ है"
@@ -179,8 +186,8 @@
 Basic.AutoConfig.StreamPage.Server="सर्वर"
 Basic.AutoConfig.StreamPage.StreamKey="स्ट्रीमिंग चाबी"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: एन्क्रिप्शन पासफ़्रेज़ डालें.\nRTMP: सेवा द्वारा प्रदान की गई कुंजी डालें.\nSRT: यदि सेवा किसी स्ट्रीम ID का उपयोग करती है तो उसे यहाँ लिखें."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(लिंक)"
 Basic.AutoConfig.StreamPage.EncoderKey="एनकोडर कुंजी"
+Basic.AutoConfig.StreamPage.BearerToken="बियरर टोकन"
 Basic.AutoConfig.StreamPage.ConnectedAccount="जुड़ा हुआ खाता"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="बैंडविड्थ परीक्षण कर बिटरेट का अनुमान लगाएं (कुछ मिनट लग सकते हैं)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="हार्डवेयर एन्कोडिंग को प्राथमिकता दें"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="अभी अपडेट करें"
 Updater.RemindMeLater="मुझे बाद में याद दिलाएं"
 Updater.Skip="इस संस्करण को छोड़ें"
-Updater.Running.Title="प्रोग्राम अभी सक्रिय है"
-Updater.Running.Text="वर्तमान में आउटपुट सक्रिय है, कृपया अपडेट करने का प्रयास करने से पहले किसी भी सक्रिय आउटपुट को बंद कर दें"
 Updater.NoUpdatesAvailable.Title="कोई अपडेट उपलब्ध नहीं"
 Updater.NoUpdatesAvailable.Text="अभी कोई अपडेट उपलब्ध नहीं है"
 Updater.BranchNotFound.Title="अद्यतन चैनल हटा दिया गया"
@@ -243,8 +248,6 @@
 Updater.RepairConfirm.Title="अखंडता जाँच की पुष्टि करें"
 Updater.RepairConfirm.Text="अखंडता जाँच शुरू हो रही है जिसमें त्रुतियुक्त फ़ाइलों के लिए आपके ओबीएस इंस्टॉलेशन को स्कैन किया जाएगा और टूटी/संशोधित फाइलों को फिर से डाउनलोड किया जाएगा. इसमें कुछ समय लग सकता है.\n\nक्या आप आगे बढ़ना चाहते हैं?"
 Updater.FailedToLaunch="अपडेटर शुरू करने में विफल हुआ"
-Updater.GameCaptureActive.Title="गेम कैप्चर सक्रिय"
-Updater.GameCaptureActive.Text="गेम कैप्चर हुक लाइब्रेरी वर्तमान में उपयोग में है. कृपया कैप्चर किए जा रहे किसी भी गेम या प्रोग्राम को बंद करें (या विंडोज को पुनरारंभ करें) और फिर से प्रयास करें."
 QuickTransitions.SwapScenes="स्वैप पूर्वावलोकन/ संक्रांति के बाद प्रोग्राम दृश्य"
 QuickTransitions.SwapScenesTT="संक्रांति के बाद पूर्वावलोकन और आउटपुट दृश्यों को अदल-बदल करता है (यदि प्रोग्राम का मूल दृश्य अभी भी मौजूद है).\nयह प्रोग्राम के मूल दृश्य में किए गए किसी भी परिवर्तन को पूर्ववत नहीं करेगा."
 QuickTransitions.DuplicateScene="डुप्लिकेट दृश्य"
@@ -258,6 +261,8 @@
 Basic.SceneTransitions="दृश्य संक्रांति"
 Basic.TransitionDuration="अंतराल"
 Basic.TogglePreviewProgramMode="स्टूडियो मोड"
+Basic.EnablePreviewProgramMode="स्टूडियो मोड सक्षम करें"
+Basic.DisablePreviewProgramMode="स्टूडियो मोड अक्षम करें"
 Undo.Undo="पूर्ववत"
 Undo.Redo="दुहराएं"
 Undo.Add="जोड़ें '%1'"
@@ -306,6 +311,8 @@
 Undo.GroupItems="'%1' में चीजों को संगठित करें"
 TransitionNameDlg.Text="कृपया संक्रांति का नाम लिखें"
 TransitionNameDlg.Title="संक्रांति का नाम"
+TitleBar.SafeMode="सुरक्षित मोड"
+TitleBar.PortableMode="पोर्टेबल मोड"
 TitleBar.Profile="प्रोफ़ाइल"
 TitleBar.Scenes="दृश्य"
 NameExists.Title="नाम पहले से विद्यमान है"
@@ -330,6 +337,7 @@
 Output.StartStreamFailed="स्ट्रीम आरंभ करने में विफल"
 Output.StartRecordingFailed="रिकॉर्डिंग आरंभ करने में विफल"
 Output.StartReplayFailed="रिप्ले बफ़र आरंभ करने में विफल"
+Output.StartVirtualCamFailed="वर्चुअल कैमरा प्रारंभ करने में विफल"
 Output.StartFailedGeneric="आउटपुट प्रारंभ करना विफल रहा. कृपया विवरण के लिए लॉग देखें.\n\nनोट: यदि आप NVENC या AMD एन्कोडर का उपयोग कर रहे हैं, तो सुनिश्चित करें कि आपके वीडियो ड्राइवर अद्यतित हैं."
 Output.ReplayBuffer.PauseWarning.Title="रुके हुए रिप्ले सहेजे नहीं जा सकते"
 Output.ReplayBuffer.PauseWarning.Text="चेतावनी: रिकॉर्डिंग ठहरे होने पर रिप्ले सहेजे नहीं जा सकते."
@@ -342,7 +350,7 @@
 Output.ConnectFail.Disconnected="सर्वर से डिस्कनेक्टेड है"
 Output.StreamEncodeError.Title="एन्कोडिंग त्रुटि"
 Output.StreamEncodeError.Msg="रिकॉर्डिंग के समय एक एनकोडर त्रुटि हुई."
-Output.StreamEncodeError.Msg.LastError="स्ट्रीमिंग के समय एक एनकोडर त्रुटि हुई :\n\n%1"
+Output.StreamEncodeError.Msg.LastError="स्ट्रीमिंग के समय एक एनकोडर त्रुटि हुई : %1"
 Output.RecordFail.Title="रिकॉर्डिंग आरंभ करने में विफल"
 Output.RecordFail.Unsupported="आउटपुट स्वरूप या तो असमर्थित है या एक से अधिक ऑडियो ट्रैक का समर्थन नहीं करता है. कृपया अपनी सेटिंग देखें और पुनः प्रयास करें."
 Output.RecordNoSpace.Title="डिस्क में स्थान अपर्याप्त है"
@@ -350,7 +358,7 @@
 Output.RecordError.Title="रिकॉर्डिंग त्रुटि"
 Output.RecordError.Msg="रिकॉर्डिंग करते समय एक अनिर्दिष्ट त्रुटि हुई."
 Output.RecordError.EncodeErrorMsg="रिकॉर्डिंग करते समय एक एनकोडर त्रुटि हुई."
-Output.RecordError.EncodeErrorMsg.LastError="रिकॉर्डिंग करते समय एक एनकोडर त्रुटि हुई :\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="रिकॉर्डिंग के समय एक एनकोडर त्रुटि हुई : %1"
 Output.BadPath.Title="अमान्य फ़ाइल पथ"
 Output.BadPath.Text="निर्धारित रिकॉर्डिंग पथ खोला नहीं जा सका. कृपया सेटिंग → आउटपुट → रिकॉर्डिंग के अंतर्गत अपना रिकॉर्डिंग पथ जाँचें."
 Output.NoBroadcast.Title="कोई प्रसारण कॉन्फ़िगरर्ड नहीं है"
@@ -380,6 +388,8 @@
 Remux.ExitUnfinishedTitle="रीमक्सिंग हो रहा है"
 Remux.ExitUnfinished="रीमक्सिंग पूरा नहीं हुआ है, अभी रोकना लक्ष्य फ़ाइल को अनुपयोगी बना सकता है.\nक्या आप सचमुच रीमक्सिंग को रोकना चाहते हैं?"
 Remux.HelpText="फ़ाइलों को रीमक्स करने के लिए इस विंडो में गिराएं, या किसी फ़ाइल को ब्राउज़ करने के लिए एक खाली \"OBS रिकॉर्डिंग\" सेल का चयन करें."
+Remux.NoFilesAddedTitle="कोई रीमक्सिंग फ़ाइल नहीं जोड़ी गई"
+Remux.NoFilesAdded="रीमक्स में कोई फ़ाइल नहीं जोड़ी गई है. एक या अनेक वीडियो फ़ाइल वाले किसी फ़ोल्डर को हटा दें."
 MissingFiles="अनुपलब्ध फाइलें"
 MissingFiles.MissingFile="अनुपलब्ध फाइल"
 MissingFiles.NewFile="नई फ़ाइल"
@@ -398,6 +408,7 @@
 MissingFiles.AutoSearchText="OBS ने उस डायरेक्टरी में अनुपलब्ध फ़ाइलों के लिए अतिरिक्त मिलान पाया है. क्या आप उन्हें जोड़ना चाहेंगे?"
 MissingFiles.NoMissing.Title="अनुपलब्ध फाइलों की जाँच"
 MissingFiles.NoMissing.Text="एक भी फ़ाइल अनुपलब्ध नहीं है."
+MacPermissions.MenuAction="ऐप अनुमतियों की समीक्षा करें..."
 MacPermissions.Title="ऐप अनुमतियों की समीक्षा करें"
 MacPermissions.Description="OBS Studio को कुछ सुविधाएँ प्रदान करने में सक्षम होने के लिए आपकी अनुमति की आवश्यकता होती है. इन अनुमतियों को सक्षम करने की अनुशंसा की जाती है, लेकिन यह ऐप के प्रयोग के लिए आवश्यक नहीं हैं. आप उन्हें बाद में कभी भी सक्षम कर सकते हैं."
 MacPermissions.Description.OpenDialog="आप OBS स्टूडियो मेनू के माध्यम से इस संवाद को फिर से खोल सकते हैं."
@@ -413,8 +424,8 @@
 MacPermissions.Item.Accessibility="पहुँच-योग्यता"
 MacPermissions.Item.Accessibility.Details="अन्य ऐप्स पर फ़ोकस होने पर कीबोर्ड शॉर्टकट (हॉटकी) काम करने के लिए, कृपया इस अनुमति को सक्षम करें."
 MacPermissions.Continue="आगे बढ़ें"
-UpdateAvailable="नया अपडेट उपलब्ध है"
-UpdateAvailable.Text="संस्करण %1.%2.%3 अब उपलब्ध है. <a href='%4'>डाउनलोड के लिये यहाँ क्लिक करें</a>"
+SourceLeak.Title="स्रोत सफाई त्रुटि"
+SourceLeak.Text="दृश्य संग्रह बदलते समय एक समस्या हुई और कुछ स्रोत अनलोड नहीं किए जा सके. यह समस्या आमतौर पर प्लगइन्स के कारण होती है जो संसाधनों की बिदाई ठीक से नहीं कर रहे हैं. कृपया सुनिश्चित करें कि आपके द्वारा उपयोग किए जा रहे सभी प्लगइन्स अद्यतित हैं.\n\nकिसी भी संभावित डेटा भ्रष्टाचार को रोकने के लिए Obs स्टूडियो अब बाहर निकल जाएगा."
 Basic.DesktopDevice1="डेस्कटॉप ऑडियो"
 Basic.DesktopDevice2="डेस्कटॉप ऑडियो 2"
 Basic.Scene="दृश्य"
@@ -446,6 +457,7 @@
 VolControl.Mute="'%1' मौन करें"
 VolControl.Properties="'%1' के गुण"
 VolControl.UnassignedWarning.Title="अनिर्दिष्ट ऑडियो स्रोत"
+VolControl.UnassignedWarning.Text="\"%1\" किसी भी ऑडियो ट्रैक को निर्दिष्ट नहीं किया गया है और यह किसी स्ट्रीम या रिकॉर्डिंग में श्रव्य नहीं होगा.\n\n ट्रैक को एक ऑडियो स्रोत निर्दिष्ट करने के लिए, मिक्सर डॉक टूलबार में राइट-क्लिक मेनू या कॉग बटन के माध्यम से उन्नत ऑडियो गुण खोलें."
 Basic.Main.AddSceneDlg.Title="दृश्य जोड़ें"
 Basic.Main.AddSceneDlg.Text="कृपया दृश्य का नाम लिखें"
 Basic.Main.DefaultSceneName.Text="दृश्य %1"
@@ -471,6 +483,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (स्वतः चयन : %2)"
 Basic.PropertiesWindow.SelectColor="रंग चुनें"
 Basic.PropertiesWindow.SelectFont="फ़ॉन्ट चुनें"
+Basic.PropertiesWindow.SelectFont.WindowTitle="एक फ़ॉन्ट चुनें"
 Basic.PropertiesWindow.ConfirmTitle="सेटिंग्स बदल गईं"
 Basic.PropertiesWindow.Confirm="आपके पास असंचित परिवर्तन हैं. क्या आप इन्हें सहेजना चाहते हैं?"
 Basic.PropertiesWindow.NoProperties="कोई गुण उपलब्ध नहीं है"
@@ -580,9 +593,9 @@
 Basic.VCam.VirtualCamera="आभासी कैमरा"
 Basic.VCam.OutputType="आउटपुट प्रकार"
 Basic.VCam.OutputSelection="आउटपुट चयन"
-Basic.VCam.Internal="आंतरिक"
-Basic.VCam.InternalDefault="प्रोग्राम आउटपुट(आरंभिक)"
-Basic.VCam.InternalPreview="पूर्वावलोकन आउटपुट"
+Basic.VCam.OutputType.Program="प्रोग्राम (आरंभिक)"
+Basic.VCam.OutputSelection.NoSelection="इस आउटपुट प्रकार के लिए कोई चयन उपलब्ध नहीं है"
+Basic.VCam.RestartWarning="इस बदलाव को लागू करने के लिए वर्चुअल कैमरा फिर से शुरू किया जाएगा"
 Basic.MainMenu.File="फ़ाइल (&F)"
 Basic.MainMenu.File.Export="निर्यात (&E)"
 Basic.MainMenu.File.Import="आयात (&I)"
@@ -624,17 +637,18 @@
 Basic.MainMenu.Edit.AdvAudio="उन्नत ऑडियो गुण (&A)"
 Basic.MainMenu.View="देखें (&V)"
 Basic.MainMenu.View.Toolbars="टूलबार (&T)"
-Basic.MainMenu.View.ListboxToolbars="दृश्य/स्रोत सूची बटन"
+Basic.MainMenu.View.ListboxToolbars="डॉक टूलबार"
 Basic.MainMenu.View.ContextBar="स्रोत टूलबार"
-Basic.MainMenu.View.SceneTransitions="दृश्य संक्रांति (&c)"
 Basic.MainMenu.View.SourceIcons="स्रोत आइकन्स (&I)"
 Basic.MainMenu.View.StatusBar="स्टेटस बार (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="फ़ुलस्क्रीन इंटरफ़ेस"
 Basic.MainMenu.View.ResetUI="UI &रीसेट करें"
 Basic.MainMenu.View.AlwaysOnTop="हरदम ऊपर (&A)"
+Basic.MainMenu.View.SceneListMode="दृश्य सूची मोड"
 Basic.MainMenu.Docks="&डॉक्स"
 Basic.MainMenu.Docks.ResetDocks="डॉक्स &रीसेट करें"
 Basic.MainMenu.Docks.LockDocks="डॉक्स &लॉक करें"
+Basic.MainMenu.Docks.SideDocks="पूर्ण-ऊंचाई वाले डॉक्स(&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="&कस्टम ब्राउज़र डॉक्स..."
 Basic.MainMenu.SceneCollection="दृश्य संग्रह (&S)"
 Basic.MainMenu.Profile="प्रोफ़ाइल (&P)"
@@ -643,19 +657,22 @@
 Basic.MainMenu.SceneCollection.Import="दृश्य संग्रह आयात करें"
 Basic.MainMenu.SceneCollection.Export="दृश्य संग्रह निर्यात करें"
 Basic.MainMenu.Profile.Exists="प्रोफ़ाइल पहले ही विद्यमान है"
-Basic.MainMenu.SceneCollection.Exists="दृश्य संग्रह पहले ही विद्यमान है"
 Basic.MainMenu.Tools="टूल्स (&T)"
 Basic.MainMenu.Help="मदद (&H)"
 Basic.MainMenu.Help.HelpPortal="मदद पोर्टल (&P)"
 Basic.MainMenu.Help.Website="वेबसाइट पर जाएँ (&W)"
 Basic.MainMenu.Help.Discord="&Discord सर्वर से जुड़ें"
+Basic.MainMenu.Help.WhatsNew="इसमें क्या नया है"
 Basic.MainMenu.Help.Logs="लॉग फ़ाइलें (&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="लॉग फ़ाइलें दिखाएं (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="वर्तमान लॉग फ़ाइल अपलोड करें (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="पिछली लॉग फ़ाइल अपलोड करें (&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="वर्तमान लॉग देखें (&V)"
+Basic.MainMenu.Help.ReleaseNotes="रिलीज नोट्स"
 Basic.MainMenu.Help.CheckForUpdates="अपडेट के लिए देखें"
 Basic.MainMenu.Help.Repair="फ़ाइल की अखंडता की जाँच करें"
+Basic.MainMenu.Help.RestartSafeMode="सुरक्षित मोड में पुनरारंभ करें"
+Basic.MainMenu.Help.RestartNormal="सामान्य मोड में पुनरारंभ करें"
 Basic.MainMenu.Help.CrashLogs="क्रैश रिपोर्ट (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="क्रैश रिपोर्ट दिखाएं (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="पिछला क्रैश रिपोर्ट अपलोड करें (&P)"
@@ -725,7 +742,6 @@
 Basic.Settings.General.ChannelName.beta="बीटा / रिलीज़ उम्मीदवार"
 Basic.Settings.General.ChannelDescription.beta="संभावित रूप से अस्थिर पूर्व-रिलीज़ संस्करण"
 Basic.Settings.Stream="स्ट्रीम"
-Basic.Settings.Stream.StreamType="स्ट्रीम प्रकार"
 Basic.Settings.Stream.Custom.UseAuthentication="प्रमाणीकरण का प्रयोग करें"
 Basic.Settings.Stream.Custom.Username="उपयोगकर्ता का नाम"
 Basic.Settings.Stream.Custom.Password="पासवर्ड"
@@ -749,10 +765,14 @@
 Basic.Settings.Stream.Recommended.MaxFPS="अधिकतम FPS: %1"
 Basic.Settings.Output="आउटपुट"
 Basic.Settings.Output.Format="रिकॉर्डिंग प्रारूप"
+Basic.Settings.Output.Format.MKV="मत्रोस्का वीडियो (.mkv)"
+Basic.Settings.Output.Format.fMP4="खंडित MP4 (.mp4)"
+Basic.Settings.Output.Format.fMOV="खंडित MOV (.mov)"
+Basic.Settings.Output.Format.TT.fmov="खंडित MOV रिकॉर्डिंग को विखंडों में लिखता है और पारंपरिक MOV फ़ाइलों के समान इन्हेंअंतिम रूप देने की आवश्यकता नहीं होती है.\nयह सुनिश्चित करता है कि डिस्क पर लिखने में बाधा होने पर भी फ़ाइल चलने योग्य बनी रहे, उदाहरण के लिए, BSOD या पावर लॉस के परिणामस्वरूप.\n\nयह सभी प्लेअर्स और संपादकों के साथ संगत नहीं भी हो सकता है. यदि आवश्यक हो तो फ़ाइल को अधिक संगत प्रारूप में बदलने के लिए फ़ाइल → रीमक्स रिकॉर्डिंग का उपयोग करें."
+Basic.Settings.Output.Format.TT.fmp4="खंडित MP4 रिकॉर्डिंग को विखंडों में लिखता है और पारंपरिक MP4 फ़ाइलों के समान अंतिम रूप देने की आवश्यकता नहीं होती है.\n यह सुनिश्चित करता है कि डिस्क पर लेखन बाधित होने पर भी फ़ाइल देय बनी रहती है, उदाहरण के लिए, BSOD या पावर लॉस के परिणामस्वरूप.\n\n यह सभी प्लेअर और संपादकों के साथ संगत नहीं हो सकता है. यदि आवश्यक हो तो फ़ाइल को अधिक संगत प्रारूप में बदलने के लिए फ़ाइल → रीमक्स रिकॉर्डिंग का उपयोग करें."
 Basic.Settings.Output.Encoder.Video="वीडियो एनकोडर"
 Basic.Settings.Output.Encoder.Audio="ऑडियो एनकोडर"
 Basic.Settings.Output.SelectDirectory="रिकॉर्डिंग डायरेक्टरी चुनें"
-Basic.Settings.Output.SelectFile="रिकॉर्डिंग फ़ाइल चुनें"
 Basic.Settings.Output.DynamicBitrate="भीड़भाड़ को प्रबंधित करने के लिए गतिशील रूप से बिटरेट बदलें"
 Basic.Settings.Output.DynamicBitrate.Beta="भीड़भाड़ को प्रबंधित करने के लिए गतिशील रूप से बिटरेट बदलें (बीटा)"
 Basic.Settings.Output.DynamicBitrate.TT="भीड़-भाड़ को कम करने के लिए फ़्रेम छोड़ने के बजाय, गतिशील रूप से बिटरेट को बदलता है.\n\nध्यान दें कि अगर अचानक से अत्यधिक भीड़ हो जाती है तो इससे दर्शकों के लिए विलंब बढ़ सकता है.\nजब बिटरेट गिर जाता है, तो इसे पुनर्स्थापित करने में कुछ मिनट लग सकते हैं.\n\nवर्तमान में केवल RTMP के लिए समर्थित है."
@@ -778,8 +798,8 @@
 Basic.Settings.Output.Simple.Warn.VideoBitrate="चेतावनी : स्ट्रीमिंग वीडियो बिटरेट को %1 पर सेट किया जाएगा, जो वर्तमान स्ट्रीमिंग सेवा की ऊपरी सीमा है."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="चेतावनी : स्ट्रीमिंग ऑडियो बिटरेट को %1 पर सेट किया जाएगा, जो वर्तमान स्ट्रीमिंग सेवा की ऊपरी सीमा है."
 Basic.Settings.Output.Simple.Warn.CannotPause="चेतावनी : यदि रिकॉर्डिंग गुणवत्ता \"स्ट्रीम के समान\" पर सेट है, तो रिकॉर्डिंग को रोका नहीं जा सकता."
+Basic.Settings.Output.Simple.Warn.IncompatibleContainer="चेतावनी: वर्तमान में चयनित रिकॉर्डिंग प्रारूप चयनित स्ट्रीम एन्कोडर के साथ असंगत है."
 Basic.Settings.Output.Simple.Warn.Encoder="चेतावनी : यदि आप एक ही समय में स्ट्रीम और रिकॉर्ड करते हैं, तो स्ट्रीम से भिन्न गुणवत्ता वाले सॉफ़्टवेयर एन्कोडर के साथ रिकॉर्डिंग के लिए अतिरिक्त CPU उपयोग की आवश्यकता होगी."
-Basic.Settings.Output.Simple.Warn.Lossless="चेतावनी : दोषरहित गुणवत्ता अत्यधिक बड़े फ़ाइल आकार उत्पन्न करती है! दोषरहित गुणवत्ता उच्च रिज़ॉल्यूशन और फ़्रैमरेट्स पर प्रति मिनट 7 गीगाबाइट डिस्क स्थान का उपयोग कर सकती है. लंबी रिकॉर्डिंग के लिए दोषरहित की अनुशंसा नहीं की जाती है जब तक कि आपके पास बहुत बड़ी मात्रा में डिस्क स्थान उपलब्ध न हो."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="क्या आप वाकई दोषरहित गुणवत्ता का उपयोग करना चाहते हैं?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="दोषरहित गुणवत्ता चेतावनी!"
 Basic.Settings.Output.Simple.Encoder.Software="सॉफ्टवेयर (x264)"
@@ -802,6 +822,7 @@
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="रिजॉल्यूशन : %1"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="असंगत एनकोडर"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="स्ट्रीमिंग सेवा \"%1\" एन्कोडर \"%2\" का समर्थन नहीं करती है. इस एन्कोडर को \"%3\" में बदल दिया जाएगा.\n\nक्या आप जारी रखना चाहते हैं?"
+Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="स्ट्रीमिंग सेवा \"%1\" एनकोडर \"%2\" और \"%3\" का समर्थन नहीं करती है. ये एन्कोडर \"%4\" और \"%5\" में बदल दिए जाएंगे.\n\nक्या आप आगे बढ़ना चाहते हैं?"
 Basic.Settings.Output.VideoBitrate="वीडियो बिटरेट"
 Basic.Settings.Output.AudioBitrate="ऑडियो बिटरेट"
 Basic.Settings.Output.Reconnect="स्वचालित रूप से पुन: कनेक्ट करें"
@@ -874,6 +895,7 @@
 FilenameFormatting.TT.YY="वर्ष, अंतिम दो अंक (00-99)"
 FilenameFormatting.TT.MM="दशमलव संख्या के रूप में माह (01-12)"
 FilenameFormatting.TT.DD="महीने का दिन, शून्य-पूरित (01-31)"
+FilenameFormatting.TT.hh="24 घंटों के प्रारूप में घंटा (00-23)"
 FilenameFormatting.TT.mm="मिनट (00-59)"
 FilenameFormatting.TT.ss="सेकेंड (00-59)"
 FilenameFormatting.TT.Percent="एक % चिह्न"
@@ -887,9 +909,16 @@
 FilenameFormatting.TT.m="दशमलव संख्या के रूप में महीना (01-12)"
 FilenameFormatting.TT.M="मिनट (00-59)"
 FilenameFormatting.TT.p="पूर्वाह्न या अपराह्न प्रहर नाम"
+FilenameFormatting.TT.s="UNIX युग से सेकंड में समय"
 FilenameFormatting.TT.S="सेकेंड (00-59)"
 FilenameFormatting.TT.y="वर्ष, अंतिम दो अंक (00-99)"
 FilenameFormatting.TT.Y="वर्ष"
+FilenameFormatting.TT.z="समयक्षेत्र में UTC से ISO 8601 ऑफसेट"
+FilenameFormatting.TT.Z="समय क्षेत्र का नाम या संक्षिप्त नाम"
+FilenameFormatting.TT.FPS="प्रति सेकंड फ्रेम्स"
+FilenameFormatting.TT.CRES="मूल (कैनवास) रिजॉल्यूशन"
+FilenameFormatting.TT.ORES="आउटपुट (स्केल्ड) रिजॉल्यूशन"
+FilenameFormatting.TT.VF="वीडियो प्रारूप"
 Basic.Settings.Video="वीडियो"
 Basic.Settings.Video.Adapter="वीडियो अडैप्टर"
 Basic.Settings.Video.BaseResolution="मूल (कैनवास) रिजॉल्यूशन"
@@ -919,8 +948,8 @@
 Basic.Settings.Audio.PeakMeterType="पीक मीटर प्रकार"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="सैम्पल पीक"
 Basic.Settings.Audio.PeakMeterType.TruePeak="ट्रू पीक (उच्च CPU उपयोग)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="चेतावनी: सराउंड साउंड ऑडियो सक्षम किया हुआ है."
-Basic.Settings.Audio.MultichannelWarning="यदि स्ट्रीमिंग हो रही है, तो यह देखने के लिए जांचें कि क्या आपकी स्ट्रीमिंग सेवा सराउंड साउंड इंजेस्ट और सराउंड साउंड प्लेबैक दोनों का समर्थन करती है. फेसबुक 360 लाइव एक ऐसा उदाहरण है जहां सराउंड साउंड पूरी तरह से समर्थित है. हालांकि फेसबुक लाइव और यूट्यूब लाइव दोनों सराउंड इंजेस्ट को स्वीकार करते हैं, फेसबुक लाइव स्टीरियो में डाउनमिक्स करता है, और यूट्यूब लाइव केवल दो चैनल चलाता है.\n\nOBS ऑडियो फिल्टर सराउंड साउंड के साथ संगत हैं, हालांकि VST प्लगइन समर्थन की गारंटी नहीं है."
+Basic.Settings.Audio.MultichannelWarning.Enabled="चेतावनी: सराउंड साउंड ऑडियो सक्षम किया हुआ है."
+Basic.Settings.Audio.MultichannelWarning="यदि स्ट्रीमिंग कर रहे हैं, तो यह देखने के लिए जांचें कि क्या आपकी स्ट्रीमिंग सेवा सराउंड साउंड इंजेस्ट और सराउंड साउंड प्लेबैक दोनों का समर्थन करती है. उदाहरण के लिए, फेसबुक 360 लाइव पूरी तरह से सराउंड साउंड का समर्थन करता है; YouTube लाइव 5.1 ऑडियो इंजेस्ट (और टीवी पर प्लेबैक) का समर्थन करता है।\n\nOBS ऑडियो फिल्टर सराउंड साउंड के साथ संगत हैं, हालांकि VST प्लगइन समर्थन की गारंटी नहीं है."
 Basic.Settings.Audio.MultichannelWarning.Title="सराउंड साउंड ऑडियो सक्षम करें?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="क्या आप वाकई सराउंड साउंड ऑडियो सक्षम करना चाहते हैं?"
 Basic.Settings.Audio.Devices="ग्लोबल ऑडियो उपकरण"
@@ -967,7 +996,6 @@
 Basic.Settings.Advanced.FormatWarning="चेतावनी : NV12/P010 के अलावा अन्य रंग प्रारूप प्राथमिक रूप से रिकॉर्डिंग के लिए अभिप्रेत हैं, और स्ट्रीमिंग करते समय अनुशंसित नहीं हैं. रंग प्रारूप रूपांतरण के कारण स्ट्रीमिंग में CPU के उपयोग में वृद्धि हो सकती है."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="चेतावनी : HDR रंग व्योम में सामान्यतः उच्च-सुक्ष्मता प्रारूपों का अधिक उपयोग किया जाता है."
 Basic.Settings.Advanced.FormatWarning2100="चेतावनी : Rec. 2100 को अधिक सटीकता वाले प्रारूप का उपयोग करना चाहिए।"
-Basic.Settings.Advanced.Audio.BufferingTime="ऑडियो बफ़रिंग का समय"
 Basic.Settings.Advanced.Video.ColorFormat="रंग प्रारुप"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-बिट्, 4:2:0, 2 प्लेन्स)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-बिट्, 4:2:0, 3 प्लेन्स)"
@@ -993,6 +1021,7 @@
 Basic.Settings.Advanced.Network="नेटवर्क"
 Basic.Settings.Advanced.Network.Disabled="वर्तमान में चयनित स्ट्रीमिंग प्रोटोकॉल, नेटवर्क सेटिंग्स को बदलने का समर्थन नहीं करता है."
 Basic.Settings.Advanced.Network.BindToIP="IP से जोड़ें"
+Basic.Settings.Advanced.Network.IPFamily="IP परिवार"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="नेटवर्क अनुकूलन सक्षम करें"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCP pacing सक्षम करें"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="ट्रांसमिशन की दर को विनियमित करके नेटवर्क पर अन्य विलंबता संवेदनशील ऐप्लिकेशन्स के लिए RTMP आउटपुट को अनुकूल बनाने का प्रयास करता है.\nयह अस्थिर कनेक्शन पर फ्रेम्स के छूट जाने का जोखिम बढ़ा सकता है."
@@ -1068,8 +1097,18 @@
 SceneItemShow="'%1' दिखाएं"
 SceneItemHide="'%1' छुपाएं"
 OutputWarnings.NoTracksSelected="आपको कम से कम एक ट्रैक चुनना ही होगा"
+OutputWarnings.NoTracksSelectedOnExit.Title="आउटपुट सेटिंग्स त्रुटि"
+OutputWarnings.NoTracksSelectedOnExit.Text="सभी आउटपुट में कम से कम एक ऑडियो ट्रैक चयनित होना चाहिए."
 OutputWarnings.MP4Recording="चेतावनी: यदि फ़ाइल को अंतिम रूप नहीं दिया जा सका (जैसे कि BSODs, बत्ती गुल, आदि के परिणामस्वरूप) तो MP4/MOV में सहेजी गई रिकॉर्डिंग अप्राप्य होगी. यदि आप एक से अधिक ऑडियो ट्रैक रिकॉर्ड करना चाहते हैं, तो MKV का उपयोग करने पर विचार करें और रिकॉर्डिंग समाप्त होने के बाद MP4/MOV में रीमक्स रिकॉर्डिंग करें (फाइल → रीमक्स रिकॉर्डिंग)"
 OutputWarnings.CannotPause="चेतावनी: यदि रिकॉर्डिंग एनकोडर \"(स्ट्रीम एनकोडर का उपयोग करें)\" के लिए सेट है तो रिकॉर्डिंग को रोक कर नहीं रखा जा सकता"
+OutputWarnings.CodecIncompatible="असंगतता के कारण ऑडियो या वीडियो एन्कोडर चयन रीसेट किया गया था. कृपया सूची से संगत एनकोडर चुनें."
+CodecCompat.Incompatible="(%1 से असंगत)"
+CodecCompat.CodecPlaceholder="एनकोडर चुनें..."
+CodecCompat.ContainerPlaceholder="प्रारूप चुनें..."
+CodecCompat.CodecMissingOnExit.Title="कोई एन्कोडर नहीं चुना गया"
+CodecCompat.CodecMissingOnExit.Text="कम से कम एक वीडियो या ऑडियो एन्कोडर सेट नहीं है. कृपया रिकॉर्डिंग और स्ट्रीमिंग दोनों के लिए एन्कोडर चुनना सुनिश्चित करें."
+CodecCompat.ContainerMissingOnExit.Title="कोई प्रारूप नहीं चुना गया"
+CodecCompat.ContainerMissingOnExit.Text="कोई रिकॉर्डिंग प्रारूप नहीं चुना गया है. कृपया एक रिकॉर्डिंग प्रारूप चुनें जो चयनित स्ट्रीम एन्कोडर के साथ संगत हो."
 FinalScene.Title="दृश्य हटाएं"
 FinalScene.Text="कम से कम एक दृश्य होना चाहिए."
 NoSources.Title="कोई स्रोत नहीं"
@@ -1085,6 +1124,7 @@
 About.GetInvolved="शामिल हो जाइए"
 About.Authors="लेखकगण"
 About.License="लाइसेंस"
+About.Error="त्रुटि! फ़ाइल को पढ़ा नहीं जा सका.\n\nजाएँ: %1"
 About.Contribute="OBS प्रोजेक्ट का समर्थन करें"
 AddUrl.Title="URL के माध्यम से स्रोत जोड़ें"
 AddUrl.Text="आपने एक URL को OBS में खींच लिया है. यह स्वचालित रूप से लिंक को एक स्रोत के रूप में जोड़ देगा. आगे चलें?"
@@ -1105,14 +1145,12 @@
 LoadProfileNeedsRestart="प्रोफ़ाइल में ऐसी सेटिंग्स हैं जिनके लिए OBS को पुन: आरंभ करने की आवश्यकता है :\n%1\n\nक्या आप इन सेटिंग्स के प्रभावी होने के लिए OBS को पुन: आरंभ करना चाहते हैं?"
 ContextBar.NoSelectedSource="कोई स्रोत नहीं चुना गया"
 ContextBar.ResetTransform="रूपांतर रीसेट करें"
-ContextBar.FitToCanvas="कैनवास में फ़िट करें"
 ContextBar.MediaControls.PlayMedia="मीडिया चलाएं"
 ContextBar.MediaControls.PauseMedia="मीडिया को रोकें"
 ContextBar.MediaControls.StopMedia="मीडिया रोक दें"
 ContextBar.MediaControls.RestartMedia="मीडिया पुन: चलाएं"
 ContextBar.MediaControls.PlaylistNext="प्लेलिस्ट में अगला"
 ContextBar.MediaControls.PlaylistPrevious="प्लेलिस्ट में पिछला"
-ContextBar.MediaControls.MediaProperties="मीडिया गुण"
 ContextBar.MediaControls.BlindSeek="मीडिया Seek Widget"
 YouTube.Auth.Ok="प्राधिकरण सफलतापूर्वक पूर्ण.\nअब आप इस पृष्ठ को बंद कर सकते हैं."
 YouTube.Auth.NoCode="प्राधिकरण प्रक्रिया संपूर्ण नहीं हुई."
@@ -1194,3 +1232,5 @@
 YouTube.Errors.liveChatEnded="लाइव स्ट्रीम समाप्त हो गया है."
 YouTube.Errors.messageTextInvalid="इस संदेश का आलेख मान्य नहीं है."
 YouTube.Errors.rateLimitExceeded="आप संदेश बहुत शीघ्रता से भेज रहे हैं."
+YouTube.DocksRemoval.Title="लीगेसी यूट्यूब ब्राउज़र डॉक्स साफ़ करें"
+YouTube.DocksRemoval.Text="इन ब्राउज़र डॉक को अप्रचलित मानकर हटा दिया जाएगा:\n\n%1\nइसके बजाय \"डॉक्स/यूट्यूब लाइव कंट्रोल रूम\" का उपयोग करें."

obs-studio-29.1.3.tar.xz/UI/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/hr-HR.ini Changed

@@ -92,22 +92,30 @@
 LogViewer="Prikaz zapisnika"
 ShowOnStartup="Prikaži pri pokretanju"
 OpenFile="Otvori datoteku"
-AddValue="Dodaj %1"
 AddSource="Dodaj izvor"
 RemoveScene="Ukloni odabranu scenu"
-RemoveSource="Uklonite odabrane izvore"
-MoveSceneUp="Pomakni scenu gore"
-MoveSceneDown="Pomakni scenu dolje"
-MoveSourceUp="Pomakni izvore gore"
-MoveSourceDown="Pomakni izvore dolje"
-SourceProperties="Svojstva otvoreni izvore"
+RemoveSource="Ukloni odabrane izvore"
+MoveSceneUp="Premjesti scenu gore"
+MoveSceneDown="Premjesti scenu dolje"
+MoveSourceUp="Premjesti izvore gore"
+MoveSourceDown="Premjesti izvore dolje"
+SourceProperties="Otvori Svojstva izvora"
 SourceFilters="Filtri otvorenog izvora"
 MixerToolbarMenu="Audio mikser jelovnik"
+SceneFilters="Otvorite Filtere Scene"
+List="Popis"
+Grid="Rešetka"
 PluginsFailedToLoad.Title="Greška u učitavanju plugin"
 PluginsFailedToLoad.Text="Naredni OBS plugins nisu uspjelo utvarati:\n\n%1\nMolim vas ažuriranje ili sklanjajte ovi plugins."
 AlreadyRunning.Title="OBS je već pokrenut"
 AlreadyRunning.Text="OBS je već pokrenut! Osim ako to niste namjeravali učiniti, isključite sve postojeće OBS instance prije nego što pokušate pokrenuti novu instancu. Ako imate OBS postavljen na minimiziraj u traku sustava, provjerite radi li još uvijek tamo."
 AlreadyRunning.LaunchAnyway="Svejedno pokreni"
+AutoSafeMode.Title="Sigurni način"
+AutoSafeMode.Text="OBS se nije pravilno zatvorio tijekom posljednje sesije.\n\nŽelite li započeti sesiju u sigurnom načinu (strani dodatci, skripte i WebSocketi onemogućeni)?"
+AutoSafeMode.LaunchSafe="Pokreni u sigurnom načinu"
+AutoSafeMode.LaunchNormal="Pokreni normalno"
+SafeMode.Restart="Želite li ponovno pokrenuti OBS u sigurnom načinu (strani dodatci, skripte i WebSocketi onemogućeni)?"
+SafeMode.RestartNormal="Želite li ponovno pokrenuti OBS u normalnom načinu?"
 ChromeOS.Title="Nepodržana platforma"
 ChromeOS.Text="OBS čini se trčanje unutar ChromeOS spremnika. Ova platforma je bez podrške."
 Wine.Title="Wine otkriveno"
@@ -132,7 +140,7 @@
 Auth.StreamInfo="Informacije o stream"
 TwitchAuth.Stats="Twitch statistike"
 TwitchAuth.Feed="Aktivnost od Twitch feed"
-TwitchAuth.TwoFactorFail.Title="Nije mogao upisati ključ stream"
+TwitchAuth.TwoFactorFail.Title="Nije moguće upisati ključ stream"
 TwitchAuth.TwoFactorFail.Text="OBS se nije uspio povezati s vašim Twitch računom. Provjerite je li u <a href='https://www.twitch.tv/settings/security'>sigurnosnim postavkama vašeg Twitch računa</a> uključena provjera identiteta u dva koraka."
 RestreamAuth.Channels="Restream-kanali"
 Copy.Filters="Kopiraj filtere"
@@ -173,18 +181,22 @@
 Basic.AutoConfig.StreamPage.Service.ShowAll="Prikaži sve..."
 Basic.AutoConfig.StreamPage.Service.Custom="Prilagođeno..."
 Basic.AutoConfig.StreamPage.StreamKey="Stream ključ"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Poveznica)"
 Basic.AutoConfig.StreamPage.EncoderKey="Encoder ključ"
+Basic.AutoConfig.StreamPage.BearerToken="Token nositelj"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Poveži Account"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Procijenite brzinu prijenosa sa testom propusnosti (može potrajati nekoliko minuta)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Više volim hardversko kodiranje"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Hardversko kodiranje eliminira većinu upotrebe CPU, ali može zahtijevati veću brzinu prijenosa za postizanje iste razine kvalitete."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Stream upozorenje"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Test mrežne propusnosti će na vašem kanalu streamati nasumične videopodatke bez zvuka. Ako ste u mogućnosti, preporučeno je privremeno isključiti spremanje videozapisa od streamova i postaviti stream kao privatan do završetka testa. Nastaviti?"
 Basic.AutoConfig.TestPage="Završni rezultat"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Program trenutno provodi niz testova kako bi procjenio idealne postavke"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Testiranje završeno"
+Basic.AutoConfig.TestPage.TestingBandwidth="Provođenje testa propusnosti, ovo bi moglo potrajati nekoliko minuta..."
 Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Za protokol te usluge nije pronađen nijedan izlaz"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Povezivanje na: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Ne može se spojiti na nijedan server. Provjerite jeste li povezani na internet i pokušajte kasnije."
+Basic.AutoConfig.TestPage.TestingBandwidth.Server="Testiranje mrežne propusnosti za: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="Testiranje kodiranja streama. Ovo bi moglo potrajati..."
 Basic.AutoConfig.TestPage.TestingRecordingEncoder="Testiranje kodiranja za snimanje. Ovo bi moglo potrajati..."
 Basic.AutoConfig.TestPage.TestingRes.Fail="Ne uspjelo pokretanje kodiranja"
@@ -192,24 +204,35 @@
 Basic.AutoConfig.TestPage.Result.StreamingEncoder="Koder Streama"
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Greška pri kodiranju"
 Basic.AutoConfig.TestPage.Result.Header="Program je utvrdio da su ove predložene postavke idealne za tebe:"
+Basic.AutoConfig.TestPage.Result.Footer="Za korištenje ovih postavki, kliknite Primijeni postavke. Za ponovnu konfiguraciju čarobnjaka i ponovnog pokušaja, kliknite Natrag. Za ručnu konfiguraciju postavki, kliknite Poništi i otvorite Postavke."
+Basic.AutoConfig.Info="Čarobnjak za automatsku konfiguraciju odredit će najbolje postavke na temelju specifikacija vašeg računala i brzine interneta."
 Basic.AutoConfig.RunAnytime="Ovo može biti pokrenuto u bilo kojem trenutku odlaskom na izborniku Alati."
 Basic.Stats="Statistika"
 Basic.Stats.CPUUsage="Koristenje CPU-a"
 Basic.Stats.HDDSpaceAvailable="Dostupan prostor na disku"
 Basic.Stats.MemoryUsage="Korištenje memorije"
+Basic.Stats.AverageTimeToRender="Prosječno vrijeme renderiranja slike"
 Basic.Stats.SkippedFrames="Preskočeni okviri zbog zaostajanja kodiranja"
+Basic.Stats.MissedFrames="Propuštene slike zbog zaostajanja u renderiranju"
+Basic.Stats.Output.Stream="Prijenos"
 Basic.Stats.Output.Recording="Snimak"
 Basic.Stats.Status.Recording="Snimanje"
 Basic.Stats.Status.Live="UŽIVO"
 Basic.Stats.Status.Reconnecting="Ponovo povezivanje"
 Basic.Stats.Status.Inactive="Neaktivno"
 Basic.Stats.Status.Active="Aktivan"
+Basic.Stats.DroppedFrames="Ispuštene Slike (Mreža)"
+Basic.Stats.MegabytesSent="Ukupni Izlaz Podataka"
 Basic.Stats.Bitrate="Stopa bitova"
+Basic.Stats.DiskFullIn="Disk pun za (pribl.)"
+Basic.Stats.ResetStats="Resetiraj Statistiku"
+ResetUIWarning.Title="Jeste li sigurni da želite resetirati korisničko sučelje?"
+ResetUIWarning.Text="Ponovno postavljanje sučelja sakrit će dodatna sidrišta. Trebat ćete omogućiti prikaz tih sidrišta iz izbornika Sidrišta ako ih želite vidjeti.\n\nJeste li sigurni da želite ponovno postaviti sučelje?"
+Updater.Title="Novo ažuriranje dosutpno"
 Updater.Text="Novo je ažuriranje dostupno:"
 Updater.UpdateNow="Ažuriraj Sada"
 Updater.RemindMeLater="Podsjeti me kasnije"
 Updater.Skip="Preskoči Verziju"
-Updater.Running.Title="Trenutno ste aktivni"
 Updater.NoUpdatesAvailable.Title="Nema dostupnih ažuriranja"
 Updater.NoUpdatesAvailable.Text="Trenutno nema dostupnih ažuriranja"
 QuickTransitions.SwapScenes="Zamijeni scene pregledanja i programa nakon plrijelaza"
@@ -222,6 +245,8 @@
 Basic.SceneTransitions="Prijelazi scena"
 Basic.TransitionDuration="Trajanje"
 Basic.TogglePreviewProgramMode="Studijski način rada"
+Basic.EnablePreviewProgramMode="Omogući studijski način"
+Basic.DisablePreviewProgramMode="Onemogući studijski način"
 Undo.Undo="Poništi"
 Undo.Redo="Ponovi"
 Undo.Add="Dodaj %1'"
@@ -235,6 +260,8 @@
 Undo.Volume.Unmute="Uključi zvuk za „%1”"
 TransitionNameDlg.Text="Unesite ime prijelaza"
 TransitionNameDlg.Title="Ime prijelaza"
+TitleBar.SafeMode="SIGURNI NAČIN"
+TitleBar.PortableMode="Prijenosni način"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scene"
 NameExists.Title="Ime već postoji"
@@ -251,6 +278,7 @@
 ConfirmRemove.TextMultiple="Jeste li sigurni da želite ukloniti %1 stavke?"
 ConfirmReset.Title="Ponovno postavi postavke"
 ConfirmReset.Text="Jeste li sigurni da želite vratiti postavke na zadane vrijednosti?"
+Output.StartVirtualCamFailed="Neuspješno pokretanje virtualne kamere"
 Output.ConnectFail.Title="Neuspješno povezivanje"
 Output.ConnectFail.BadPath="Neispravna putanja ili URL veze. Provjerite jesu li Vam postavke ispravne."
 Output.ConnectFail.ConnectFailed="Neuspješno povezivanje s poslužiteljem"
@@ -258,14 +286,14 @@
 Output.ConnectFail.HdrDisabled="Ovaj izlaz trenutačno ne podržava HDR izlaz."
 Output.ConnectFail.Error="Neočekivana greška u povezivanju s poslužiteljem. Više informacija nalazi se u zapisniku."
 Output.ConnectFail.Disconnected="Prekinuta veza s poslužiteljem."
-Output.StreamEncodeError.Msg.LastError="Došlo je do greške kodera tijekom emitiranja:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Došlo je do greške kodera tijekom emitiranja: %1"
 Output.RecordFail.Title="Neuspješno započinjanje snimanja"
 Output.RecordFail.Unsupported="Izlazni format ili nije podržan ili ne podržava više od jedne zvučne trake. Provjerite postavke i pokušajte ponovno."
 Output.RecordNoSpace.Title="Nedovoljno prostora na disku"
 Output.RecordNoSpace.Msg="Nema dovoljno prostora na disku da se nastavi snimanje."
 Output.RecordError.Title="Greška pri snimanju"
 Output.RecordError.Msg="Neodređena greška se dogodila pri snimanju."
-Output.RecordError.EncodeErrorMsg.LastError="Došlo je do greške kodera tijekom snimanja:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Došlo je do greške kodera tijekom snimanja: %1"
 Output.BadPath.Title="Neispravna putanja datoteke"
 LogReturnDialog="Slanje zapisnika uspješno"
 LogReturnDialog.CopyURL="Kopiraj URL"
@@ -284,11 +312,13 @@
 MissingFiles.NewFile="Nova datoteka"
 MissingFiles.Missing="Nedostaje"
 MissingFiles.Found="Pronađeno"
+MacPermissions.MenuAction="Pregledaj dopuštenja aplikacije..."
+MacPermissions.Title="Pregledaj dopuštenja aplikacije"
 MacPermissions.Item.Camera="Kamera"
 MacPermissions.Item.Microphone="Mikrofon"
 MacPermissions.Continue="Nastavi"
-UpdateAvailable="Dostupno je novo ažuriranje"
-UpdateAvailable.Text="Verzija %1.%2.%3 je dostupna. <a href='%4'>Kliknite ovdje da ju preuzmete</a>"
+SourceLeak.Title="Greška pri čišćenju izvora"
+SourceLeak.Text="Došlo je do problema pri promjeni zbirke scena te neke izvore nije moguće ukloniti. Taj problem obično uzrokuju dodatci koji nepravilno otpuštaju resurse. Molimo provjerite jesu li dodatci koje upotrebljavate ažurni.\n\nOBS Studio zatvorit će se kako bi se spriječila moguća oštećenja podataka."
 Basic.DesktopDevice1="Zvuk s računala"
 Basic.DesktopDevice2="Zvuk s računala 2"
 Basic.AuxDevice1="Mikrofon/ulaz"
@@ -296,7 +326,7 @@
 Basic.AuxDevice3="Mikrofon/ulaz 3"
 Basic.AuxDevice4="Mikrofon/ulaz 4"
 Basic.Scene="Scena"
-Basic.DisplayCapture="Prikaži ulaz"
+Basic.DisplayCapture="Snimanje ekrana"
 Basic.Main.PreviewConextMenu.Enable="Omogući pregled"
 Basic.Main.Preview.Disable="Onemogući pregled"
 ScaleFiltering="Filter uvećanja"
@@ -328,6 +358,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (automatski odabir: %2)"
 Basic.PropertiesWindow.SelectColor="Odaberi boju"
 Basic.PropertiesWindow.SelectFont="Odaberi font"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Odaberi font"
 Basic.PropertiesWindow.ConfirmTitle="Postavke promijenjene"
 Basic.PropertiesWindow.Confirm="Imate nespremljenih promjena. Želite li ih spremiti?"
 Basic.PropertiesWindow.NoProperties="Nema dostupnih svojstava"
@@ -433,9 +464,14 @@
 Basic.MainMenu.Edit.AdvAudio="&Napredne postavke zvuka"
 Basic.MainMenu.View="Prikaz (&V)"
 Basic.MainMenu.View.Toolbars="Alatne &trake"
-Basic.MainMenu.View.SceneTransitions="Prijelazi s&cena"
 Basic.MainMenu.View.StatusBar="Traka &stanja"
 Basic.MainMenu.View.Fullscreen.Interface="Sučelje preko cijelog zaslona"
+Basic.MainMenu.View.SceneListMode="Način popisa scena"
+Basic.MainMenu.Docks="&Sidrišta"
+Basic.MainMenu.Docks.ResetDocks="&Ponovno postavi sidrišta"
+Basic.MainMenu.Docks.LockDocks="&Zaključaj sidrišta"
+Basic.MainMenu.Docks.SideDocks="&Sidrišta pune veličine"
+Basic.MainMenu.Docks.CustomBrowserDocks="&Prilagođena sidrišta za preglednik..."
 Basic.MainMenu.SceneCollection="Zbirka &scena"
 Basic.MainMenu.Profile="&Profil"
 Basic.MainMenu.Profile.Import="Uvoz profila"
@@ -443,7 +479,6 @@
 Basic.MainMenu.SceneCollection.Import="Dodaj zbirku scena"
 Basic.MainMenu.SceneCollection.Export="Izvezi zbirku scena"
 Basic.MainMenu.Profile.Exists="Profil već postoji"
-Basic.MainMenu.SceneCollection.Exists="Zbirka scena već postoji"
 Basic.MainMenu.Tools="Ala&ti"
 Basic.MainMenu.Help="Pomoć (&H)"
 Basic.MainMenu.Help.HelpPortal="Centar za &pomoć"
@@ -454,7 +489,10 @@
 Basic.MainMenu.Help.Logs.ShowLogs="Prikaži zapisnike (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Pošalji trenutačni zapisnik (&C)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Prikaži trenutačni zapisnik (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Napomene uz izdane verzije"
 Basic.MainMenu.Help.CheckForUpdates="Proveri verziju programa"
+Basic.MainMenu.Help.RestartSafeMode="Ponovno pokreni u sigurnom načinu"
+Basic.MainMenu.Help.RestartNormal="Ponovno pokreni u normalnom načinu"
 Basic.MainMenu.Help.CrashLogs="Izvješča o prekidu &rada"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Prikaži izvješča o prekidu rada (&S)"
 Basic.MainMenu.Help.About="Više o &aplikaciji"
@@ -480,7 +518,6 @@
 Basic.Settings.General.SysTrayWhenStarted="Pri pokretanju minimiziraj na ikonicu u sistemskom panelu"
 Basic.Settings.General.SwitchOnDoubleClick="Prijelaz na scenu dvostrukim pritiskom"
 Basic.Settings.Stream="Strim"
-Basic.Settings.Stream.StreamType="Vrsta strima"
 Basic.Settings.Output="Izlaz"
 Basic.Settings.Output.Format="Format snimanja"
 Basic.Settings.Output.Format.MKV="Matroska video (.mkv)"
@@ -491,7 +528,6 @@
 Basic.Settings.Output.Encoder.Video="Enkoder za video"
 Basic.Settings.Output.Encoder.Audio="Enkoder za audio"
 Basic.Settings.Output.SelectDirectory="Odaberi direktorijum za snimanje"
-Basic.Settings.Output.SelectFile="Odaberi datoteku za snimanje"
 Basic.Settings.Output.Mode="Režim izlaza"
 Basic.Settings.Output.Mode.Simple="Jednostavno"
 Basic.Settings.Output.Mode.Adv="Napredno"
@@ -506,7 +542,7 @@
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Kvalitet bez gubitka, izričito velika datoteka"
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Upozorenje: Odabrani format za snimanje nije kompatibilan s enkoderima za prijenos."
 Basic.Settings.Output.Simple.Warn.Encoder="Upozorenje: Snimanje sa softverskim enkoderom drugačijeg kvaliteta u odnosu na strim će zahtevati dodatnu procesorsku snagu ako strimujete i snimate u isto vreme."
-Basic.Settings.Output.Simple.Warn.Lossless="Upozorenje: Kvalitet bez gubitka stvara izričito velike datoteke! Kvalitet bez gubitka može koristiti više od 7 gigabajta prostora na disku po minutu pri visokim rezolucijama i framerate-om. Kvalitet bez gubitka nije preporučen za duže snimanje osim ako imate veliku količinu slobodnog prostora na disku."
+Basic.Settings.Output.Simple.Warn.Lossless="Upozorenje: Kvaliteta bez gubitka stvara iznimno velike datoteke! Kvaliteta bez gubitka može koristiti do 7 gigabajta prostora na disku po minutu pri visokim rezolucijama i framerateu. Kvaliteta bez gubitka ne preporuča se za dulje snimanje osim ako imate veliku količinu slobodnog prostora na disku. Međuspremnik ponovne reprodukcije nije dostupan pri uporabi kvalitete bez gubitka."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Da li ste sigurni da želite koristiti kvalitet bez gubitka?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Upozorenje za kvalitet bez gubitka!"
 Basic.Settings.Output.Simple.Encoder.Software="Softverski (x264)"
@@ -614,7 +650,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Iznad normalnog"
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Normalni"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Besposleni"
-Basic.Settings.Advanced.Audio.BufferingTime="Vreme baferovanja zvuka"
 Basic.Settings.Advanced.Video.ColorFormat="Format boja"
 Basic.Settings.Advanced.Video.ColorRange.Full="Potpuno"
 Basic.Settings.Advanced.StreamDelay="Odlaganje strima"
@@ -622,6 +657,7 @@
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Procenjena upotreba memorije: %1 MB"
 Basic.Settings.Advanced.Network="Mreža"
 Basic.Settings.Advanced.Network.BindToIP="Veži se za IP"
+Basic.Settings.Advanced.Network.IPFamily="IP obitelj"
 Basic.AdvAudio="Napredne postavke zvuka"
 Basic.AdvAudio.Name="Ime"
 Basic.AdvAudio.AudioTracks="Izvori"
@@ -652,6 +688,8 @@
 SceneItemShow="Prikaži '%1'"
 SceneItemHide="Sakrij '%1'"
 OutputWarnings.NoTracksSelected="Morate odabrati makar jednu traku"
+OutputWarnings.NoTracksSelectedOnExit.Title="Greška u postavkama izlaza"
+OutputWarnings.NoTracksSelectedOnExit.Text="Za sve izlaze mora biti odabrana barem jedna audiotraka."
 OutputWarnings.CodecIncompatible="Odabir enkodera videa ili zvuka ponovno postavljen zbog nekompatibilnosti. Molimo odaberite kompatibilni enkoder."
 CodecCompat.Incompatible="(Nekompatibilno s %1)"
 CodecCompat.CodecPlaceholder="Odaberi enkoder..."
@@ -662,6 +700,7 @@
 CodecCompat.ContainerMissingOnExit.Text="Nijedan format za snimanje nije odabran. Molimo odaberite format kompatibilan s odabranim enkoderom za prijenos."
 NoSources.Title="Nema izvora"
 About="O programu"
+About.Error="Greška! Datoteka se ne može pročitati.\n\nIdite na: %1"
 PreviewTransition="Pregledaj prijelaz"
 Importer.Program="Izbrisana aplikacija"
 YouTube.Actions.Title="Naslov*"
@@ -682,3 +721,5 @@
 YouTube.Actions.AutoStopStreamingWarning="Nećete se moći ponovno povezati. Vaš će prijenos prestati i više nećete biti uživo."
 YouTube.Errors.liveStreamingNotEnabled="Prijenos uživo nije omogućen na odabranom YouTube kanalu. Pogledaj <a href='https://www.youtube.com/features'>youtube.com/features</a> za više informacija."
 YouTube.Errors.livePermissionBlocked="Prijenos uživo nije dostupan na odabranom YouTube kanalu. Može proći i do 24 sata da prijenos uživo postane dostupan nakon što ga omogućite u postavkama kanala. Pogledaj <a href='https://www.youtube.com/features'>youtube.com/features</a> za detalje."
+YouTube.DocksRemoval.Title="Očisti stara sidrišta preglednika za YouTube"
+YouTube.DocksRemoval.Text="Ova sidrišta za preglednik uklonit će se na zahtjev:\n\n%1\nUpotrijebite \"Docks/YouTube Live Control Room\" umjesto njih."

obs-studio-29.1.3.tar.xz/UI/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/hu-HU.ini Changed

@@ -31,8 +31,8 @@
 PreviewWindow="Ablakos projektor (Előnézet)"
 SceneWindow="Ablakos projektor (Jelenet)"
 SourceWindow="Ablakos projektor (Forrás)"
-MultiviewProjector="Multiview (Teljes képernyő)"
-MultiviewWindowed="Multiview (Ablakos)"
+MultiviewProjector="Több nézet (teljes képernyő)"
+MultiviewWindowed="Több nézet (ablakos)"
 ResizeProjectorWindowToContent="Ablak tartalomhoz igazítása"
 Clear="Törlés"
 Revert="Visszavonás"
@@ -91,7 +91,6 @@
 LogViewer="Naplómegjelenítő"
 ShowOnStartup="Mutatás indításkor"
 OpenFile="Fájl megnyitása"
-AddValue="%1 hozzáadása"
 AddSource="Forrás hozzáadása"
 RemoveScene="Kiválasztott forrás eltávolítása"
 RemoveSource="Kiválasztott források eltávolítása"
@@ -103,11 +102,19 @@
 SourceFilters="Nyílt forráskódú szűrők"
 MixerToolbarMenu="Hangkeverő menü"
 SceneFilters="Jelenetszűrők megnyitása"
+List="Lista"
+Grid="Rács"
 PluginsFailedToLoad.Title="Hiba a bővítmény betöltése során"
 PluginsFailedToLoad.Text="A következő OBS bővítmények betöltése sikertelen:\n\n%1\nFrissítse vagy távolítsa el ezeket a bővítményeket."
 AlreadyRunning.Title="Az OBS már fut"
 AlreadyRunning.Text="Az OBS már fut. Hacsak nem ez volt a célja, akkor állítsa le az OBS összes futó példányát egy új indítása előtt. Ha úgy állította be az OBS-t, hogy rendszertálcára minimalizálódjon, akkor ellenőrizze, hogy ott fut-e még."
 AlreadyRunning.LaunchAnyway="Indítás mindenképpen"
+AutoSafeMode.Title="Csökkentett mód"
+AutoSafeMode.Text="Az OBS nem szabályosan állt le az előző munkamenet során.\n\nSzeretné csökkentett módban indítani (letiltja a harmadik féltől származó bővítményeket, szkripteket és WebSocketeket)?"
+AutoSafeMode.LaunchSafe="Futtatás csökkentett módban"
+AutoSafeMode.LaunchNormal="Futtatás normálisan"
+SafeMode.Restart="Újraindítja csökkentett módban az OBS-t (letiltja a harmadik féltől származó bővítményeket, szkripteket és WebSocketeket)?"
+SafeMode.RestartNormal="Újraindítja normál módban az OBS-t?"
 ChromeOS.Title="Nem támogatott platform"
 ChromeOS.Text="Úgy néz ki, hogy az OBS ChromeOS konténerben fut. Ez a platform nem támogatott."
 Wine.Title="Wine észlelve"
@@ -161,22 +168,22 @@
 Basic.AutoConfig.VideoPage.CanvasExplanation="Megjegyzés: A vászon (alap) felbontása nem feltétlenül ugyanaz, mint a stream vagy felvétel felbontása. A tényleges stream/felvétel felbontása esetlegesen lefele lesz skálázva az erőforrások leterheltsége vagy a bitsebesség követelmények elérése érdekében."
 Basic.AutoConfig.StreamPage="Stream információ"
 Basic.AutoConfig.StreamPage.SubTitle="Adja meg a stream információit"
-Basic.AutoConfig.StreamPage.ConnectAccount="Felhasználó hozzákapcsolás (Ajánlott)"
+Basic.AutoConfig.StreamPage.ConnectAccount="Fiók hozzákapcsolása (ajánlott)"
 Basic.AutoConfig.StreamPage.DisconnectAccount="Felhasználó szétkapcsolása"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Felhasználó szétkapcsolása?"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Ez a változtatás azonnal érvénybe lép. Biztos, hogy megszakítja a kapcsolatot a fiókjával?"
 Basic.AutoConfig.StreamPage.GetStreamKey="Stream Kulcs lekérése"
 Basic.AutoConfig.StreamPage.MoreInfo="További információk"
 Basic.AutoConfig.StreamPage.UseStreamKey="Stream kulcs használata"
-Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Streamkulcs használata (Haladó)"
+Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Közvetítési kulcs használata (speciális)"
 Basic.AutoConfig.StreamPage.Service="Szolgáltatás"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Összes megjelenítése..."
 Basic.AutoConfig.StreamPage.Service.Custom="Egyéni…"
 Basic.AutoConfig.StreamPage.Server="Kiszolgáló"
 Basic.AutoConfig.StreamPage.StreamKey="Stream kulcs"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: adja meg a titkosítási jelmondatot.\nRTMP: adja meg a szolgáltatás által biztosított kulcsot.\nSRT: adja meg a „streamid” azonosítót, ha a szolgáltatás használja."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Hivatkozás)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kódoló kulcs"
+Basic.AutoConfig.StreamPage.BearerToken="Bemutatandó token"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Csatlakoztatott fiók"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Bitsebesség megbecsülése sávszélesség teszttel (néhány percig is eltarthat)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Hardveres kódolás előnyben részesítése"
@@ -227,8 +234,6 @@
 Updater.UpdateNow="Frissítés most"
 Updater.RemindMeLater="Emlékeztessen később"
 Updater.Skip="Verzió átugrása"
-Updater.Running.Title="A program jelenleg aktív"
-Updater.Running.Text="Valamely kimenet jelenleg aktív, állítsa le az aktív kimenetet, mielőtt frissíteni próbál"
 Updater.NoUpdatesAvailable.Title="Nincs elérhető frissítés"
 Updater.NoUpdatesAvailable.Text="Jelenleg nincs elérhető frissítés"
 Updater.BranchNotFound.Title="Frissítési csatorna eltávolítva"
@@ -237,9 +242,7 @@
 Updater.RepairButUpdatesAvailable.Text="A fájl épségének ellenőrzése csak a legfrissebb elérhető verzió esetén érhető el. Használja a Súgó → Frissítések keresése lehetőséget az ellenőrzéshez és az OBS telepítés frissítéséhez."
 Updater.RepairConfirm.Title="Épségellenőrzés megerősítése"
 Updater.RepairConfirm.Text="Az épségellenőrzés elindítása átvizsgálja az OBS telepítést sérült fájlokat keresve, és újra letölti a sérült/módosított fájlokat. Ez eltarthat egy ideig.\n\nFolytatja?"
-Updater.FailedToLaunch="Frissítő alkalmazás indítása sikertelen"
-Updater.GameCaptureActive.Title="Játékfelvétel aktív"
-Updater.GameCaptureActive.Text="A játékfelvételi könyvtár még használatban van. Zárjon be valamennyi játékot/programot, amely felvétel alatt áll (vagy indítsa újra a Windowst) és próbálja újra."
+Updater.FailedToLaunch="A frissítő indítása sikertelen"
 QuickTransitions.SwapScenes="Előnézet/programjelenetek cseréje átmenet után"
 QuickTransitions.SwapScenesTT="Az előnézet és a programjelenet cseréje átmenet után (ha a program eredeti jelenete még létezik).\nEz nincs kihatással a program eredeti jelenetére."
 QuickTransitions.DuplicateScene="Jelenet kettőzése"
@@ -253,6 +256,8 @@
 Basic.SceneTransitions="Jelenet átmenetek"
 Basic.TransitionDuration="Időtartam"
 Basic.TogglePreviewProgramMode="Stúdió mód"
+Basic.EnablePreviewProgramMode="Stúdió mód engedélyezése"
+Basic.DisablePreviewProgramMode="Stúdió mód letiltása"
 Undo.Undo="Visszavonás"
 Undo.Redo="Mégis"
 Undo.Add="„%1” hozzáadása"
@@ -301,6 +306,8 @@
 Undo.GroupItems="Elemek csoportosítása ebbe: „%1”"
 TransitionNameDlg.Text="Adja meg az átmenet nevét"
 TransitionNameDlg.Title="Átmenet neve"
+TitleBar.SafeMode="CSÖKKENTETT MÓD"
+TitleBar.PortableMode="Hordozható mód"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Jelenetek"
 NameExists.Title="A megadott név már létezik"
@@ -325,6 +332,7 @@
 Output.StartStreamFailed="Stream indítása sikertelen"
 Output.StartRecordingFailed="Felvétel indítása sikertelen"
 Output.StartReplayFailed="Visszajátszás puffer indítása sikertelen"
+Output.StartVirtualCamFailed="A virtuális kamera indítása sikertelen"
 Output.StartFailedGeneric="A kimenet indítása sikertelen. Ellenőrizze az eseménynaplóban a részleteket.\n\nMegjegyzés: NVENC vagy AMD kódoló használata esetén, győződjön meg arról, hogy az illesztőprogramok naprakészek."
 Output.ReplayBuffer.PauseWarning.Title="Szünet esetén nem lehet visszajátszást menteni"
 Output.ReplayBuffer.PauseWarning.Text="Figyelmeztetés: Visszajátszást nem lehet menteni, amíg a felvétel szünetel."
@@ -337,7 +345,7 @@
 Output.ConnectFail.Disconnected="Kiszolgálóról lecsatlakoztatva."
 Output.StreamEncodeError.Title="Kódolási hiba"
 Output.StreamEncodeError.Msg="Kódolási hiba történt közvetítés közben."
-Output.StreamEncodeError.Msg.LastError="Kódolási hiba történt közvetítés közben:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Kódolóhiba történt közvetítés közben: %1"
 Output.RecordFail.Title="Felvétel indítása sikertelen"
 Output.RecordFail.Unsupported="A kimeneti formátum vagy nem támogatott, vagy nem támogatja az egynél több hangsávot. Kérem, ellenőrizze a beállításait és próbálkozzon újra."
 Output.RecordNoSpace.Title="Nincs elég szabad lemezterület"
@@ -345,7 +353,7 @@
 Output.RecordError.Title="Felvételi hiba"
 Output.RecordError.Msg="Ismeretlen hiba lépett fel a felvétel során."
 Output.RecordError.EncodeErrorMsg="Kódolási hiba történt felvétel készítése közben."
-Output.RecordError.EncodeErrorMsg.LastError="Kódolási hiba történt felvétel készítése közben:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Kódolóhiba történt a felvétel közben: %1"
 Output.BadPath.Title="A fájl elérési útja hibás"
 Output.BadPath.Text="A beállított felvételi elérési út nem nyitható meg. Ellenőrizze a felvételi útvonalat a Beállítások → Kimenet → Felvétel alatt."
 Output.NoBroadcast.Title="Nincs adás beállítva"
@@ -374,6 +382,8 @@
 Remux.ExitUnfinishedTitle="Remuxolás folyamatban"
 Remux.ExitUnfinished="A remuxolás nincs kész, a leállítása használhatatlanná teheti a célfájlt.\nBiztos, hogy leállítja a remuxolást?"
 Remux.HelpText="Dobja a fájlokat ebbe az ablakba a remuxoláshoz, vagy válasszon egy üres \"OBS felvétel\" cellát fájlok tallózásához."
+Remux.NoFilesAddedTitle="Nincs remuxolási fájl hozzáadva"
+Remux.NoFilesAdded="Nincs fájl hozzáadva a remuxoláshoz. Ejtsen ide egy mappát, amely egy vagy több videófájlt tartalmaz."
 MissingFiles="Hiányzó fájlok"
 MissingFiles.MissingFile="Hiányzó fájl"
 MissingFiles.NewFile="Új fájl"
@@ -392,6 +402,7 @@
 MissingFiles.AutoSearchText="Az OBS további egyezéseket talált hiányzó fájlokhoz abban a könyvtárban. Hozzáadja őket?"
 MissingFiles.NoMissing.Title="Hiányzó fájlok ellenőrzése"
 MissingFiles.NoMissing.Text="Úgy tűnik, hogy egy fájl sem hiányzik."
+MacPermissions.MenuAction="Alkalmazás engedélyeinek áttekintése..."
 MacPermissions.Title="Alkalmazás engedélyeinek áttekintése"
 MacPermissions.Description="Az OBS Studio az engedélyét kéri, hogy bizonyos funkciókat szolgáltathasson. Ajánlott, hogy megadja ezeket az engedélyeket, de nem szükségesek az alkalmazás használatához. Ezeket később is bármikor megadhatja."
 MacPermissions.Description.OpenDialog="Újra megnyithatja ezt a párbeszédablakot az OBS Studio menüből."
@@ -407,8 +418,8 @@
 MacPermissions.Item.Accessibility="Akadálymentesítés"
 MacPermissions.Item.Accessibility.Details="Hogy a gyorsbillentyűk akkor is működjenek, ha más alkalmazások vannak fókuszban, adja meg ezt az engedélyt."
 MacPermissions.Continue="Folytatás"
-UpdateAvailable="Elérhető újabb programváltozat"
-UpdateAvailable.Text="Verzió: %1.%2.%3 most elérhető. <a href='%4'>Kattintson ide a letöltéshez</a>"
+SourceLeak.Title="Forrástisztítási hiba"
+SourceLeak.Text="Probléma volt a jelenetgyűjtemények váltásakor, és egyes források eltávolítása nem sikerült. A problémát rendszerint olyan bővítmények okozzák, amelyek nem engedik el megfelelően az erőforrásokat. Győződjön meg róla, hogy minden bővítmény naprakész.\n\nAz OBS Studio most kilép, hogy megakadályozza az esetleges adatsérüléseket."
 Basic.DesktopDevice1="Asztal audio"
 Basic.DesktopDevice2="Asztal audio 2"
 Basic.AuxDevice1="Mikrofon/Aux"
@@ -470,6 +481,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (autokiválasztás: %2)"
 Basic.PropertiesWindow.SelectColor="Szín kiválasztása"
 Basic.PropertiesWindow.SelectFont="Betűtípus kiválasztása"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Válasszon egy betűkészletet"
 Basic.PropertiesWindow.ConfirmTitle="Beállítások módosultak"
 Basic.PropertiesWindow.Confirm="Változtatásai nincsenek elmentve. Szeretné megtartani őket?"
 Basic.PropertiesWindow.NoProperties="Nincsenek elérhető tulajdonságok"
@@ -549,18 +561,18 @@
 Basic.Main.Controls="Vezérlés"
 Basic.Main.Connecting="Kapcsolódás..."
 Basic.Main.StartRecording="Felvétel indítása"
-Basic.Main.StartReplayBuffer="Visszajátszás puffer indítása"
+Basic.Main.StartReplayBuffer="Visszajátszási puffer indítása"
 Basic.Main.SaveReplay="Visszajátszás mentése"
 Basic.Main.StartStreaming="Stream indítása"
 Basic.Main.StartBroadcast="Élő adás indítása"
-Basic.Main.StartVirtualCam="Virtuális Kamera indítása"
+Basic.Main.StartVirtualCam="Virtuális kamera indítása"
 Basic.Main.StopRecording="Felvétel leállítása"
 Basic.Main.PauseRecording="Felvétel szüneteltetése"
 Basic.Main.UnpauseRecording="Felvétel folytatása"
 Basic.Main.SplitFile="Felvétel fájljának felosztása"
 Basic.Main.StoppingRecording="Felvétel leállítása..."
-Basic.Main.StopReplayBuffer="Visszajátszás puffer megállítása"
-Basic.Main.StoppingReplayBuffer="Visszajátszás puffer leáll..."
+Basic.Main.StopReplayBuffer="Visszajátszási puffer megállítása"
+Basic.Main.StoppingReplayBuffer="Visszajátszási puffer megállítása…"
 Basic.Main.SetupBroadcast="Adás kezelése"
 Basic.Main.StopStreaming="Stream leállítása"
 Basic.Main.StopBroadcast="Közvetítés leállítása"
@@ -569,7 +581,7 @@
 Basic.Main.ForceStopStreaming="Stream leállítása (Késleltetés elvetése)"
 Basic.Main.ShowContextBar="A Forrás Eszköztár Megjelenítése"
 Basic.Main.HideContextBar="Forrás Eszköztár Elrejtése"
-Basic.Main.StopVirtualCam="Virtuális Kamera leállítása"
+Basic.Main.StopVirtualCam="Virtuális kamera leállítása"
 Basic.Main.Group="Csoport %1"
 Basic.Main.GroupItems="Kijelölt elemek csoportosítása"
 Basic.Main.Ungroup="Csoport megszüntetése"
@@ -579,9 +591,9 @@
 Basic.VCam.VirtualCamera="Virtuális kamera"
 Basic.VCam.OutputType="Kimenet típusa"
 Basic.VCam.OutputSelection="Kimenetválasztás"
-Basic.VCam.Internal="Belső"
-Basic.VCam.InternalDefault="Programkimenet (alapértelmezett)"
-Basic.VCam.InternalPreview="Előnézeti kimenet"
+Basic.VCam.OutputType.Program="Program (alapértelmezett)"
+Basic.VCam.OutputSelection.NoSelection="Nincsenek lehetőségek ehhez a kimenettípushoz"
+Basic.VCam.RestartWarning="A változtatás érvénybe lépéséhez újra kell indítani a virtuális kamerát"
 Basic.MainMenu.File="&Fájl"
 Basic.MainMenu.File.Export="&Exportálás"
 Basic.MainMenu.File.Import="&Importálás"
@@ -623,17 +635,18 @@
 Basic.MainMenu.Edit.AdvAudio="Speciális h&angtulajdonságok"
 Basic.MainMenu.View="&Nézet"
 Basic.MainMenu.View.Toolbars="Eszköz&tárak"
-Basic.MainMenu.View.ListboxToolbars="Jelenet/forrás listagombok"
+Basic.MainMenu.View.ListboxToolbars="Dokk eszköztárak"
 Basic.MainMenu.View.ContextBar="Forrás eszköztár"
-Basic.MainMenu.View.SceneTransitions="Jelenet á&tmenetek"
 Basic.MainMenu.View.SourceIcons="Forrás&ikonok"
 Basic.MainMenu.View.StatusBar="Állapot&sor"
 Basic.MainMenu.View.Fullscreen.Interface="Teljes képernyős felület"
 Basic.MainMenu.View.ResetUI="&Felület visszaállítása"
 Basic.MainMenu.View.AlwaysOnTop="&Mindig legfelül"
+Basic.MainMenu.View.SceneListMode="Jelenetlista módja"
 Basic.MainMenu.Docks="&Dokkok"
 Basic.MainMenu.Docks.ResetDocks="&Dokkok visszaállítása"
 Basic.MainMenu.Docks.LockDocks="&Dokkok zárolása"
+Basic.MainMenu.Docks.SideDocks="&Teljes magasságú dokkok"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Egyéni böngésződokkok…"
 Basic.MainMenu.SceneCollection="&Jelenetgyűjtemény"
 Basic.MainMenu.Profile="&Profil"
@@ -642,7 +655,6 @@
 Basic.MainMenu.SceneCollection.Import="Jelenetgyűjtemény importálása"
 Basic.MainMenu.SceneCollection.Export="Jelenetgyűjtemény exportálása"
 Basic.MainMenu.Profile.Exists="A profil már létezik"
-Basic.MainMenu.SceneCollection.Exists="A jelenetgyűjtemény már létezik"
 Basic.MainMenu.Tools="&Eszközök"
 Basic.MainMenu.Help="&Súgó"
 Basic.MainMenu.Help.HelpPortal="Súgó&portál"
@@ -654,8 +666,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Jelenlegi naplófájl feltöltése"
 Basic.MainMenu.Help.Logs.UploadLastLog="&Előző naplófájl feltöltése"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Jelenlegi napló meg&tekintése"
+Basic.MainMenu.Help.ReleaseNotes="Kiadási megjegyzések"
 Basic.MainMenu.Help.CheckForUpdates="Frissítések ellenőrzése"
 Basic.MainMenu.Help.Repair="Fájl épségének ellenőrzése"
+Basic.MainMenu.Help.RestartSafeMode="Újraindítás csökkentett módban"
+Basic.MainMenu.Help.RestartNormal="Újraindítás normál módban"
 Basic.MainMenu.Help.CrashLogs="Összeomlás&jelentés"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Összeomlásjelentések &megjelenítése"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Következő naplófájl feltöltése"
@@ -725,7 +740,6 @@
 Basic.Settings.General.ChannelName.beta="Béták / kiadásra jelölt változatok"
 Basic.Settings.General.ChannelDescription.beta="Potenciálisan instabil előzetes verziók"
 Basic.Settings.Stream="Közvetítés"
-Basic.Settings.Stream.StreamType="Közvetítés típusa"
 Basic.Settings.Stream.Custom.UseAuthentication="Hitelesítés használata"
 Basic.Settings.Stream.Custom.Username="Felhasználónév"
 Basic.Settings.Stream.Custom.Password="Jelszó"
@@ -756,23 +770,22 @@
 Basic.Settings.Output.Encoder.Video="Videó kódoló"
 Basic.Settings.Output.Encoder.Audio="Hang kódoló"
 Basic.Settings.Output.SelectDirectory="Felvételi könyvtár kiválasztása"
-Basic.Settings.Output.SelectFile="Felvétel fájljának kiválasztása"
 Basic.Settings.Output.DynamicBitrate="Dinamikus bitráta változtatás a hálózati terheléssel való megbirkózás érdekében"
 Basic.Settings.Output.DynamicBitrate.Beta="Dinamikus bitráta változtatás a hálózati terheléssel való megbirkózás érdekében (Béta)"
 Basic.Settings.Output.DynamicBitrate.TT="Hálózati terhelés esetén a képkockák eldobása helyett, dinamikusan változik a bitráta menet közben.\n\nTartsa észben, hogy ez növelheti a késleltetést ön és a nézők között, hogyha hirtelen megnövekszik a terhelés.\nAmikor a bitráta lezuhan, akár percekig is eltarthat, amíg helyreáll.\n\nAktuálisan csak RTMP használata esetén támogatott."
 Basic.Settings.Output.Mode="Kimeneti mód"
 Basic.Settings.Output.Mode.Simple="Egyszerű"
-Basic.Settings.Output.Mode.Adv="Haladó"
+Basic.Settings.Output.Mode.Adv="Speciális"
 Basic.Settings.Output.Mode.FFmpeg="FFmpeg kimenet"
-Basic.Settings.Output.UseReplayBuffer="Visszajátszás puffer engedélyezése"
-Basic.Settings.Output.ReplayBuffer.SecondsMax="Maximális Visszajátszási Idő"
-Basic.Settings.Output.ReplayBuffer.MegabytesMax="Maximális memória (Megabájt)"
+Basic.Settings.Output.UseReplayBuffer="Visszajátszási puffer engedélyezése"
+Basic.Settings.Output.ReplayBuffer.SecondsMax="Legrövidebb visszajátszási idő"
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Legtöbb memória (megabájt)"
 Basic.Settings.Output.ReplayBuffer.Estimate="Becsült memóriaigény: %1 MB"
 Basic.Settings.Output.ReplayBuffer.EstimateTooLarge="Figyelem: A becsült memóriahasználat %1 MiB-tal nagyobb, mint a megengedett %2 MiB-os maximum"
-Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nem lehet megbecsülni a memóriaigényt. Kérem állítson be egy maximális memória limitet."
-Basic.Settings.Output.ReplayBuffer.Prefix="Visszajátszási puffer fájlév előtag"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nem lehet megbecsülni a memóriaigényt. Állítson be egy felső memóriakorlátot."
+Basic.Settings.Output.ReplayBuffer.Prefix="Visszajátszási puffer fájlnévelőtagja"
 Basic.Settings.Output.ReplayBuffer.Suffix="Utótag"
-Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="A visszajátszási puffer nem használható, ha a felvétel típusa Egyéni kimenetre (FFmpeg) van állítva."
+Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="A visszajátszási puffer nem használható, ha a felvétel típusa „Egyéni kimenet (FFmpeg)”."
 Basic.Settings.Output.Simple.SavePath="Felvételek elérési útja"
 Basic.Settings.Output.Simple.RecordingQuality="Felvétel minősége"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Ugyanaz, mint a stream"
@@ -784,7 +797,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Figyelmeztetés: A felvételeket nem lehet szüneteltetni, ha a felvétel minősége \"Ugyanaz mint a stream\"-re van állítva."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Figyelmeztetés: A jelenleg kiválasztott felvételi formátum nem kompatibilis a kiválasztott közvetítéshez használt kódolókkal."
 Basic.Settings.Output.Simple.Warn.Encoder="Figyelem: A közvetítéstől eltérő minőséggel történő rögzítés további CPU erőforrásokat igényel, ha egyidejűleg használja mindkettőt."
-Basic.Settings.Output.Simple.Warn.Lossless="Figyelem: A veszteségmentes minőséggel történő felvétel hatalmas fájlméretet eredményez. Ezzel a minőséggel percenként akár 7 gigabájt adatot is használhat nagy felbontás és képkockasebesség mellett. Ez az eljárás nem ajánlott a hosszú felvételekhez, kivéve ha hatalmas lemezterület áll rendelkezésre."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Biztos, hogy veszteségmentes minőséget használ?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Veszteségmentes minőség figyelem!"
 Basic.Settings.Output.Simple.Encoder.Software="Szoftver (x264)"
@@ -808,8 +820,8 @@
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="Nem kompatibilis kódoló"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="A(z) „%1” közvetítési szolgáltatás nem támogatja a(z) „%2” kódolót. A kódoló a következőre lesz módosítva: „%3”.\n\nFolytatja?"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="A(z) „%1” közvetítési szolgáltatás nem támogatja a(z) „%2” és a(z) „%3” kódolót. Ezek a kódolók a következőkre lesznek módosítva: „%4” és „%5”.\n\nFolytatja?"
-Basic.Settings.Output.VideoBitrate="Videó bitsebesség"
-Basic.Settings.Output.AudioBitrate="Audio bitsebesség"
+Basic.Settings.Output.VideoBitrate="Videó bitsebessége"
+Basic.Settings.Output.AudioBitrate="Hang bitsebessége"
 Basic.Settings.Output.Reconnect="Automatikus újracsatlakozás"
 Basic.Settings.Output.RetryDelay="Újrapróbálási késleltetés"
 Basic.Settings.Output.MaxRetries="Újrapróbálkozások maximális száma"
@@ -933,8 +945,8 @@
 Basic.Settings.Audio.PeakMeterType="Csúcsmérték típusa"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Csúcsminta"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Valós csúcs (magasabb CPU használat)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Figyelmeztetés: a térhangzású hang engedélyezett."
-Basic.Settings.Audio.MultichannelWarning="Ha közvetít, ellenőrizze, hogy a szolgáltatója támogatja-e mind a térhangzású hang kezelését és lejátszását. Például a Facebook 360 Live teljes támogatást biztosít. Bár a Facebook Live és a YouTube Live elfogadja a térhangzású hangot, a Facebook Live lekeveri sztereóra, a YouTube Live pedig csak két csatornát játszik le.\n\nAz OBS hangszűrők kompatibilisek a térhangzású hanggal, viszont a VST bővítmények támogatása nem garantált."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Figyelmeztetés: a térhangzású hang engedélyezett."
+Basic.Settings.Audio.MultichannelWarning="Ha közvetít, ellenőrizze, hogy a szolgáltatója támogatja-e mind a térhangzású hang kezelését és lejátszását. Például a Facebook 360 Live teljes támogatást biztosít; a YouTube Live támogatja az 5.1-es hangfelvételeket (és a TV-n történő lejátszásukat).\n\nAz OBS hangszűrők kompatibilisek a térhangzású hanggal, viszont a VST bővítmények támogatása nem garantált."
 Basic.Settings.Audio.MultichannelWarning.Title="Engedélyezi a térhangzást?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Biztos, hogy engedélyezi a térhangzást?"
 Basic.Settings.Audio.Devices="Globális hangeszközök"
@@ -971,7 +983,7 @@
 Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="Egyéni"
 Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="Színtévesztő változat"
 Basic.Settings.Advanced="Speciális"
-Basic.Settings.Advanced.General.ConfirmOnExit="Aktív kimenetek figyelmeztetés megjelenítése kilépéskor"
+Basic.Settings.Advanced.General.ConfirmOnExit="Aktív kimenetek figyelmeztetésének megjelenítése kilépéskor"
 Basic.Settings.Advanced.General.ProcessPriority="Folyamat prioritása"
 Basic.Settings.Advanced.General.ProcessPriority.High="Magas"
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Normál feletti"
@@ -981,7 +993,6 @@
 Basic.Settings.Advanced.FormatWarning="Figyelem: Az NV12/P010-től eltérő színformátumok elsősorban felvételhez valók, és használatuk közvetítéshez nem ajánlott. A közvetítés megnövekedett processzorhasználatot okozhat a színformátum átalakítása miatt."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Figyelem: a magas precizitású formátumokat jellemzően HDR színterekkel együtt használják."
 Basic.Settings.Advanced.FormatWarning2100="Figyelem: Rec. 2100 esetén használjon nagyobb pontosságú formátumot."
-Basic.Settings.Advanced.Audio.BufferingTime="Hangpufferelési idő"
 Basic.Settings.Advanced.Video.ColorFormat="Színformátum"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 bites, 4:2:0, 2 sík)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 bites, 4:2:0, 3 sík)"
@@ -1007,6 +1018,7 @@
 Basic.Settings.Advanced.Network="Hálózat"
 Basic.Settings.Advanced.Network.Disabled="A jelenleg kiválasztott közvetítési protokoll nem támogatja a hálózati beállítások módosítását."
 Basic.Settings.Advanced.Network.BindToIP="IP-hez rendelés"
+Basic.Settings.Advanced.Network.IPFamily="IP-család"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Hálózati optimalizálás engedélyezése"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCP ütemezés engedélyezése"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Megpróbálja barátságosabbá tenni az RTMP kimenetet más késleltetésre érzékeny alkalmazások számára a hálózaton azáltal, hogy szabályozza az átvitel sebességét.\nInstabil kapcsolatoknál ez növelheti az eldobott képkockát kockázatát."
@@ -1071,6 +1083,8 @@
 SceneItemShow="„%1” megjelenítése"
 SceneItemHide="„%1” elrejtése"
 OutputWarnings.NoTracksSelected="Legalább egy sávot ki kell választania"
+OutputWarnings.NoTracksSelectedOnExit.Title="Kimeneti beállítási hiba"
+OutputWarnings.NoTracksSelectedOnExit.Text="Minden kimenetnél ki kell választani legalább egy hangsávot."
 OutputWarnings.MP4Recording="Figyelem: Az MP4/MOV-ban mentett felvételek javíthatatlanok, ha a fájl nem kerül lezárásra (például BSOD vagy áramkimaradás esetén). Ha mindenképpen több hangsávval kíván felvételt készíteni, akkor használjon MKV-t és remuxolja a felvételt MP4/MOV-ba, miután elkészült. (Fájl -> Felvételek remuxolása)"
 OutputWarnings.CannotPause="Figyelmeztetés: A felvételeket nem lehet szüneteltetni, ha a felvétel kódolója a „(Közvetítés kódolójának használata)” lehetőségre van állítva."
 OutputWarnings.CodecIncompatible="A hang- és videókódoló kiválasztása inkompatibilitás miatt alaphelyzetbe állt. Válasszon egy kompatibilis kódolót a listából."
@@ -1096,6 +1110,7 @@
 About.GetInvolved="Részvétel"
 About.Authors="Készítők"
 About.License="Licenc"
+About.Error="Hiba! A fájl nem olvasható.\n\nUgrás ide: %1"
 About.Contribute="Támogassa az OBS Projektet"
 AddUrl.Title="Forrás hozzáadása URL-en keresztül"
 AddUrl.Text="Behúzott egy URL-t az OBS-be. Ez automatikusan forrásként adja hozzá a hivatkozást. Folytatja?"
@@ -1116,26 +1131,24 @@
 LoadProfileNeedsRestart="A profil olyan beállításokat tartalmaz, melyhez az OBS újraindítása szükséges:\n%1\n\nBiztos, hogy újraindítja az OBS-t a változások érvénybe lépéséhez?"
 ContextBar.NoSelectedSource="Nincs forrás kiválasztva"
 ContextBar.ResetTransform="Átalakítás visszaállítása"
-ContextBar.FitToCanvas="Vászonhoz igazítás"
 ContextBar.MediaControls.PlayMedia="Média lejátszása"
 ContextBar.MediaControls.PauseMedia="Média szüneteltetése"
 ContextBar.MediaControls.StopMedia="Média leállítása"
 ContextBar.MediaControls.RestartMedia="Média újraindítása"
 ContextBar.MediaControls.PlaylistNext="Következő a listán"
 ContextBar.MediaControls.PlaylistPrevious="Előző a listán"
-ContextBar.MediaControls.MediaProperties="Média tulajdonságai"
 ContextBar.MediaControls.BlindSeek="Média tekerési ablakelem"
 YouTube.Auth.Ok="Az engedélyezés sikeresen befejeződött.\nMost már bezárhatja ezt az oldalt."
 YouTube.Auth.NoCode="Az engedélyezési folyamat nem fejeződött be."
 YouTube.Auth.NoChannels="Nem érhető el csatorna a kiválasztott fiókban"
-YouTube.Auth.WaitingAuth.Title="YouTube Felhasználó Hitelesítés"
+YouTube.Auth.WaitingAuth.Title="YouTube felhasználóhitelesítés"
 YouTube.Auth.WaitingAuth.Text="Fejezze be az engedélyezést a külső böngészőben. Ha a külső böngésző nem nyílik meg, akkor kövesse ezt a hivatkozást és fejezze be az engedélyezést: %1"
 YouTube.AuthError.Text="A csatornainformációk lekérése sikertelen: %1."
 YouTube.Actions.WindowTitle="YouTube adás beállítása – Csatorna: %1"
 YouTube.Actions.CreateNewEvent="Új adás létrehozása"
 YouTube.Actions.ChooseEvent="Meglévő adás kiválasztása"
 YouTube.Actions.Title="Cím*"
-YouTube.Actions.MyBroadcast="A közvetítésem"
+YouTube.Actions.MyBroadcast="Saját közvetítés"
 YouTube.Actions.Description="Leírás"
 YouTube.Actions.Privacy="Láthatóság*"
 YouTube.Actions.Privacy.Private="Privát"
@@ -1168,7 +1181,7 @@
 YouTube.Actions.Create_Schedule="Adás ütemezése"
 YouTube.Actions.Create_Schedule_Ready="Ütemezés és adás kiválasztása"
 YouTube.Actions.Dashboard="YouTube Studio megnyitása"
-YouTube.Actions.Error.Title="Hiba az elő közvetítés létrehozásakor"
+YouTube.Actions.Error.Title="Hiba az elő adás létrehozásakor"
 YouTube.Actions.Error.Text="YouTube hozzáférési hiba: „%1”. A részletes hibaleírás megtalálható a <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a> oldalon."
 YouTube.Actions.Error.General="YouTube hozzáférési hiba. Ellenőrizze a hálózati kapcsolatát, vagy a hozzáférését a YouTube kiszolgálóhoz."
 YouTube.Actions.Error.NoBroadcastCreated="Közvetítés létrehozási hiba: „%1”. A részletes hibaleírás megtalálható a <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a> oldalon."
@@ -1205,3 +1218,5 @@
 YouTube.Errors.liveChatEnded="Az élő közvetítés véget ért."
 YouTube.Errors.messageTextInvalid="Az üzenet szövege érvénytelen."
 YouTube.Errors.rateLimitExceeded="Túl gyorsan küld üzeneteket."
+YouTube.DocksRemoval.Title="Örökölt YouTube böngésződokkok törlése"
+YouTube.DocksRemoval.Text="Ezek a böngésződokkok el lesznek távolítva, mert elavultak:\n\n%1\nHelyette használja a „Dokkok/YouTube Élő irányítóközpont” lehetőséget."

obs-studio-29.1.3.tar.xz/UI/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/hy-AM.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="Մատյանների դիտիչ"
 ShowOnStartup="Ցույց տալ գործարկման ժամանակ"
 OpenFile="Բացել ֆայլը"
-AddValue="Ավելացնել %1"
 AddSource="Ավելացնել Աղբյուր"
 RemoveScene="Ջնջել ընտրված տեսարանը"
 RemoveSource="Ջնջել ընտրված աղբյուր(ներ)ը"
@@ -107,11 +106,16 @@
 SourceFilters="Բացել աղբյուրի զտիչները"
 MixerToolbarMenu="Ձայնային խառնիչի ընտրացանկ"
 SceneFilters="Բացել աղբյուրի զտիչները"
+List="Ցանկ"
+Grid="Ցանց"
 PluginsFailedToLoad.Title="Միացնիչի բեռնման սխալ"
 PluginsFailedToLoad.Text="Հետևյալ OBS հավելումները չհաջողվեց բեռնել։\n\n%1\nԽնդրում ենք թարմացնել կամ հեռացնել այս միացնիչները:"
 AlreadyRunning.Title="OBS-ն արդեն աշխատում է"
 AlreadyRunning.Text="OBS-ն արդեն աշխատում է: Եթե դուք չեք ցանկանում դա անել, խնդրում ենք փակել OBS-ի բոլոր գոյություն ունեցող օրինակները՝ նախքան նոր օրինակ գործարկելը: Եթե դուք ունեք OBS համակարգային սկուտեղի նվազագույնի հասցնելու համար, խնդրում ենք ստուգել՝ արդյոք այն դեռ աշխատում է այնտեղ:"
 AlreadyRunning.LaunchAnyway="Գործարկել ամեն դեպքում"
+AutoSafeMode.Title="Անվտանգ ռեժիմ"
+AutoSafeMode.LaunchSafe="Գործարկել անվտանգ ռեժիմում"
+AutoSafeMode.LaunchNormal="Գործարկել նորմալ"
 ChromeOS.Title="Չաջակցվող հարթակ"
 ChromeOS.Text="Կարծես թե OBS-ն գործակում է Chrome OS կոնտեյների ներսում: Այս հարթակը չի աջակցվում."
 Wine.Title="Հայտնաբերվել է գինի"
@@ -179,8 +183,8 @@
 Basic.AutoConfig.StreamPage.Server="Սերվեր"
 Basic.AutoConfig.StreamPage.StreamKey="Հոսքի բանալի"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST․ մուտքագրեք ծածկագրված գաղտնաբառը։\nRTMP․ մուտքագրեք ծառայության կողմից տրամադրվող բանալին։\nSRT․ մուտքագրեք եթերի id-ն, երբ ծառայությունը կօգտագործվի։"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Հղում)"
 Basic.AutoConfig.StreamPage.EncoderKey="Կոդավորման բանալի"
+Basic.AutoConfig.StreamPage.BearerToken="Պատվերով Տոկեն"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Միացված հաշիվ"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Հաշվարկել բիթային արագությունը թողունակության փորձարկման ընթացքում (կարող է տևել մի քանի րոպե)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Նախընտրել ապարատային կոդավորումը"
@@ -232,8 +236,6 @@
 Updater.UpdateNow="Թարմացնել հիմա"
 Updater.RemindMeLater="Հիշեցնել ինձ ավելի ուշ"
 Updater.Skip="Բաց թողնել տարբերակը"
-Updater.Running.Title="Ծրագիրը ներկայումս ակտիվ է"
-Updater.Running.Text="Հայտնաբերվել է ակտիվ ելքային գործողություն: Անջատեք բոլոր ակտիվ դուրսբերումները թարմացումից առաջ"
 Updater.NoUpdatesAvailable.Title="Հասանելի թարմացումներ չկան"
 Updater.NoUpdatesAvailable.Text="Թարմացումներ չեն գտնվել"
 Updater.BranchNotFound.Title="Թարմացման Ալիքը Հեռացված է"
@@ -243,8 +245,6 @@
 Updater.RepairConfirm.Title="Վավերացրեք ամբողջականության ստուգումը"
 Updater.RepairConfirm.Text="Անձեռնմխելիության ստուգումն իրականացնելը կսկանավորի ձեր OBS-ի տեղադրումը և կներբեռնի վնասված/փոփոխված ֆայլերը: Սա կարող է որոշ ժամանակ տևել:\n\nՑանկանու՞մ եք շարունակել:"
 Updater.FailedToLaunch="Չհաջողվեց ստուգել թարմացումների առկայությունը"
-Updater.GameCaptureActive.Title="Խաղի նկարահանումն ընթացքի մեջ է"
-Updater.GameCaptureActive.Text="Խաղերի նկարահանման գրադարանը բեռնված է: Փակեք բոլոր նկարված խաղերն ու ծրագրերը (կամ վերագործարկեք Windows-ը) և նորից փորձեք:"
 QuickTransitions.SwapScenes="Փոխանակեք նախադիտումը/ծրագրի տեսարանները անցումից հետո"
 QuickTransitions.SwapScenesTT="Փոխանակում է նախադիտումը և ծրագրի տեսարանները անցումից հետո (եթե ծրագրի սկզբնական տեսարանը դեռ գոյություն ունի):\nՍա չի չեղարկի որևէ փոփոխություն, որը կարող է կատարվել ծրագրի սկզբնական տեսարանում:"
 QuickTransitions.DuplicateScene="Կրկնվող տեսարան"
@@ -306,6 +306,7 @@
 Undo.GroupItems="Խմբավորված տարրեր «%1»-ում"
 TransitionNameDlg.Text="Խնդրում ենք մուտքագրել անուն անցման համար"
 TransitionNameDlg.Title="Անցումային անուն"
+TitleBar.PortableMode="Տեղափոխման ռեժիմ"
 TitleBar.Profile="Պրոֆիլ"
 TitleBar.Scenes="Տեսարաններ"
 NameExists.Title="Անունն արդեն գոյություն ունի"
@@ -330,6 +331,7 @@
 Output.StartStreamFailed="Չհաջողվեց սկսել հեռարձակումը"
 Output.StartRecordingFailed="Չհաջողվեց սկսել տեսագրությունը"
 Output.StartReplayFailed="Չհաջողվեց վերագործարկել բուֆերը"
+Output.StartVirtualCamFailed="Չհաջողվեց գործարկել վիրտուալ տեսախցիկը"
 Output.StartFailedGeneric="Ելքի ձախողում. Մանրամասների համար տես գրանցամատյանը:\n\nՆշում. Եթե օգտագործում եք NVENC կամ AMD կոդավորիչներ, համոզվեք, որ տեղադրված եք վերջին վիդեո դրայվերը:"
 Output.ReplayBuffer.PauseWarning.Title="Դուք չեք կարող կրկնել կրկնությունները դադարի ժամանակ"
 Output.ReplayBuffer.PauseWarning.Text="Զգուշացում. կրկնությունները չեն կարող պահպանվել, երբ տեսագրությունը դադարեցված է:"
@@ -337,11 +339,11 @@
 Output.ConnectFail.BadPath="Անվավեր կապի ուղի կամ URL: Խնդրում ենք ստուգել ձեր կարգավորումները՝ հաստատելու համար, որ դրանք վավեր են:"
 Output.ConnectFail.ConnectFailed="Չհաջողվեց միանալ սերվերին"
 Output.ConnectFail.InvalidStream="Անհնար է մուտք գործել նշված ալիք կամ հեռարձակման բանալի, խնդրում ենք կրկին ստուգել բանալին: Եթե դա ճիշտ է, ապա խնդիրը կարող է կապված լինել սերվերին միանալու հետ:"
+Output.ConnectFail.HdrDisabled="HDR ելքը ներկայումս անջատված է այդ ելքի համար:"
 Output.ConnectFail.Error="Սերվերին միանալու փորձի ժամանակ անսպասելի սխալ առաջացավ: Մանրամասները գրանցամատյանում:"
 Output.ConnectFail.Disconnected="Անջատված է սերվերից:"
 Output.StreamEncodeError.Title="Կոդավորման սխալ"
 Output.StreamEncodeError.Msg="Հեռարձակման ընթացքում կոդավորման սխալ է տեղի ունեցել:"
-Output.StreamEncodeError.Msg.LastError="Հեռարձակման ընթացքում տեղի է ունեցել կոդավորման սխալ՝\n\n%1"
 Output.RecordFail.Title="Չհաջողվեց սկսել տեսագրությունը"
 Output.RecordFail.Unsupported="Ելքային ձևաչափը կա՛մ չի աջակցվում, կա՛մ չի աջակցում մեկից ավելի աուդիո կատարում: Խնդրում ենք ստուգել ձեր կարգավորումները և նորից փորձել:"
 Output.RecordNoSpace.Title="Սկավառակի բավարար տարածք չկա"
@@ -349,7 +351,6 @@
 Output.RecordError.Title="Տեսագրման սխալ"
 Output.RecordError.Msg="Տեսագրման ընթացքում տեղի է ունեցել չճանաչված սխալ:"
 Output.RecordError.EncodeErrorMsg="Տեսագրման ընթացքում տեղի է ունեցել կոդավորման սխալ:"
-Output.RecordError.EncodeErrorMsg.LastError="Կոդավորիչի սխալ է տեղի ունեցել գրելիս:\n\n%1"
 Output.BadPath.Title="Ֆայլի սխալ ուղի"
 Output.BadPath.Text="Կազմաձև մուտքի ուղին չի կարող բացվել: Խնդրում ենք ստուգել ձայնագրությունների ուղին Կարգավորումներ → Ելք → Տեսագրում:"
 Output.NoBroadcast.Title="Հեռարձակումը կարգավորված չէ"
@@ -379,6 +380,8 @@
 Remux.ExitUnfinishedTitle="Ռեմուլտիպլեքսիան ընթացքի մեջ է"
 Remux.ExitUnfinished="Ռեմուլտիպլեքսիան չի ավարտվել, գործընթացի հիմա դադարեցումը կարող է անօգտագործելի դարձնել ֆայլը:\nԻսկապե՞ս ուզում եք դադարեցնել վերամիքսումը:"
 Remux.HelpText="Քաշեք և գցեք ֆայլերը այս պատուհանում՝ ռեմուքդի համար, կամ ընտրեք դատարկ «OBS Տեսագրում» վանդակը՝ ֆայլ ընտրելու համար:"
+Remux.NoFilesAddedTitle="Վերամիավորման ֆայլը չի ավելացվել"
+Remux.NoFilesAdded="Ոչ մի ֆայլ չի ավելացվել վերափոխման համար։ Քաշեք մեկ կամ մի քանի տեսանյութ պարունակող պանակը։"
 MissingFiles="Ֆայլերը բացակայում է"
 MissingFiles.MissingFile="Ֆայլը բացակայում է"
 MissingFiles.NewFile="Նոր ֆայլ"
@@ -397,6 +400,7 @@
 MissingFiles.AutoSearchText="OBS-ն այս պանակում բացակայող ֆայլերի հավելյալ համընկնում է գտել: Ցանկանու՞մ եք դրանք ավելացնել:"
 MissingFiles.NoMissing.Title="Բացակայող ֆայլերի ստուգում"
 MissingFiles.NoMissing.Text="Բացակայող ֆայլերը չեն գտնվել։"
+MacPermissions.MenuAction="Դիտեք հավելվածի թույլտվությունները..."
 MacPermissions.Title="Դիտեք հավելվածի թույլտվությունները"
 MacPermissions.Description="OBS Studio-ն պահանջում է ձեր թույլտվությունը որոշակի հնարավորություններ տրամադրելու համար: Խորհուրդ է տրվում միացնել այս թույլտվությունները, սակայն դրանք չեն պահանջվում հավելվածն օգտագործելու համար: Դուք միշտ կարող եք դրանք միացնել ավելի ուշ:"
 MacPermissions.Description.OpenDialog="Այս երկխոսությունը կարող է վերաբացվել OBS Studio մենյուի միջոցով:"
@@ -412,8 +416,8 @@
 MacPermissions.Item.Accessibility="Հասանելիություն"
 MacPermissions.Item.Accessibility.Details="Խնդրում ենք միացնել այս թույլտվությունը, որպեսզի ստեղնաշարի դյուրանցումները (թեժ ստեղները) աշխատեն, մինչ մյուս հավելվածները կենտրոնանան:"
 MacPermissions.Continue="Շարունակել"
-UpdateAvailable="Հասանելի է նոր թարմացում"
-UpdateAvailable.Text="Հասանելի է %1.%2.%3 տարբերակը: <a href='%4'>Ներբեռնելու համար սեղմեք այստեղ</a>"
+SourceLeak.Title="Աղբյուրի մաքրման սղալը"
+SourceLeak.Text="Տեսարանների հավաքածուները փոխելիս խնդիր առաջացավ, և որոշ աղբյուրներ չկարողացան բեռնաթափվել: Այս խնդիրը սովորաբար առաջանում է պլագինների կողմից, որոնք պատշաճ կերպով չեն ազատում ռեսուրսները: Խնդրում ենք համոզվել, որ ձեր օգտագործած բոլոր պլագինները թարմացված էն:\n\nOBS Studio-ն ավարտում է աշխատանքը՝ տվյալների հնարավոր վնասը կանխելու համար:"
 Basic.DesktopDevice1="Նվագարկման սարք"
 Basic.DesktopDevice2="Նվագարկման սարք 2"
 Basic.AuxDevice1="Միկ/Aux"
@@ -449,6 +453,7 @@
 VolControl.SliderMuted="Ձայնի վերահսկում '%1': (այժմ խլացված է)"
 VolControl.Mute="Ձայնը անջատել «%1»"
 VolControl.Properties="Մանրամասններ '%1'"
+VolControl.UnassignedWarning.Title="Չնշված ձայնի աղբյուր"
 Basic.Main.AddSceneDlg.Title="Ավելացնել տեսարան"
 Basic.Main.AddSceneDlg.Text="Խնդրում ենք մուտքագրել տեսարանի անունը"
 Basic.Main.DefaultSceneName.Text="Տեսարան %1"
@@ -474,6 +479,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (ինքնաընտրություն: %2)"
 Basic.PropertiesWindow.SelectColor="Ընտրել գույնը"
 Basic.PropertiesWindow.SelectFont="Ընտրել տառատեսակ"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Ընտրեք տառատեսակ"
 Basic.PropertiesWindow.ConfirmTitle="Կարգավորումները փոխվել են"
 Basic.PropertiesWindow.Confirm="Կան չպահված փոփոխություններ: Կցանկանա՞ք դրանք պահել։"
 Basic.PropertiesWindow.NoProperties="Ընտրանքներ չկան"
@@ -583,9 +589,9 @@
 Basic.VCam.VirtualCamera="Վիրտուալ տեսախցիկ"
 Basic.VCam.OutputType="Ելքի տիպը"
 Basic.VCam.OutputSelection="Ելքի ընտրություն"
-Basic.VCam.Internal="Ներքին"
-Basic.VCam.InternalDefault="Ծրագրի ելքը (Լռելյայն)"
-Basic.VCam.InternalPreview="Նախադիտման ելքը"
+Basic.VCam.OutputType.Program="Ծրագիրը (Լռելյայն)"
+Basic.VCam.OutputSelection.NoSelection="Այս ելքի տեսակի համար ընտրություն չկա"
+Basic.VCam.RestartWarning="Այս փոփոխությունը կիրառելու համար վիրտուալ տեսախցիկը կվերագործարկվի"
 Basic.MainMenu.File="Ֆայլ (&F)"
 Basic.MainMenu.File.Export="Արտահանել (&E)"
 Basic.MainMenu.File.Import="Ներմուծել (&I)"
@@ -627,9 +633,7 @@
 Basic.MainMenu.Edit.AdvAudio="Ընդլայնված աուդիո հատկություններ (&A)"
 Basic.MainMenu.View="Դիտել (&V)"
 Basic.MainMenu.View.Toolbars="Գործիքադարակ (&T)"
-Basic.MainMenu.View.ListboxToolbars="Ցույց տալ պատկերակները «Տեսարաններ» և «Աղբյուրներ» նավահանգիստների տակ"
 Basic.MainMenu.View.ContextBar="Աղբյուրի գործիքագոտին"
-Basic.MainMenu.View.SceneTransitions="Անցումային տեսարան (&C)"
 Basic.MainMenu.View.SourceIcons="Աղբյուրի պատկերակները (&I)"
 Basic.MainMenu.View.StatusBar="Կարգավիճակի բար (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Ամբողջ էկրանով"
@@ -646,7 +650,6 @@
 Basic.MainMenu.SceneCollection.Import="Ներմուծել տեսարանների հավաքածու"
 Basic.MainMenu.SceneCollection.Export="Արտահանման տեսարանների հավաքածու"
 Basic.MainMenu.Profile.Exists="Պրոֆիլն արդեն գոյություն ունի"
-Basic.MainMenu.SceneCollection.Exists="Տեսարանների հավաքածուն արդեն կա"
 Basic.MainMenu.Tools="Գործիքներ (&T)"
 Basic.MainMenu.Help="Օգնություն (&H)"
 Basic.MainMenu.Help.HelpPortal="Օգնության պորտալ (&P)"
@@ -660,6 +663,8 @@
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Բացել ընթացիկ մատյանը (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Ստուգել թարմացումները"
 Basic.MainMenu.Help.Repair="Ֆայլի ամբողջականության ստուգում"
+Basic.MainMenu.Help.RestartSafeMode="Վերագործարկեք անվտանգ ռեժիմում"
+Basic.MainMenu.Help.RestartNormal="Վերագործարկեք նորմալ ռեժիմում"
 Basic.MainMenu.Help.CrashLogs="Սխալների մասին հաղորդել (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Ցույց տալ սխալների մասին հաշվետվությունները (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Ուղարկել սխալի նախորդ զեկույցը (&P)"
@@ -729,7 +734,6 @@
 Basic.Settings.General.ChannelName.beta="Բետա / Թողարկվողները"
 Basic.Settings.General.ChannelDescription.beta="Պոտենցիալ ոչ կայուն նախաթողարկվղ տարբերակները"
 Basic.Settings.Stream="Հեռարձակում"
-Basic.Settings.Stream.StreamType="Հեռարձակման տեսակը"
 Basic.Settings.Stream.Custom.UseAuthentication="Օգտագործե; թույլտվությունը"
 Basic.Settings.Stream.Custom.Username="Օգտանուն"
 Basic.Settings.Stream.Custom.Password="Գաղտնաբառ"
@@ -756,7 +760,6 @@
 Basic.Settings.Output.Encoder.Video="Տեսանյութի կոդավորիչ"
 Basic.Settings.Output.Encoder.Audio="Աուդիո կոդավորիչ"
 Basic.Settings.Output.SelectDirectory="Ընտրել տեսագրման գրացուցակը"
-Basic.Settings.Output.SelectFile="Ընտրեք տեսագրման ֆայլը"
 Basic.Settings.Output.DynamicBitrate="Դինամիկ փոխել բիթրեյթի՝ ցանցի գերբեռնվածությունը կառավարելու համար"
 Basic.Settings.Output.DynamicBitrate.Beta="Դինամիկ փոխեք բիթերի արագությունը՝ ցանցի գերբեռնվածությունը կառավարելու համար (բետա)"
 Basic.Settings.Output.DynamicBitrate.TT="Կադրերն իջեցնելու փոխարեն կօգտագործվի արագընթաց բիթրեյթ դինամիկ փոփոխություն՝ ցանցի գերբեռնվածությունը նվազեցնելու համար:\n\nԽնդրում ենք նկատի ունենալ, որ դա կարող է մեծացնել հեռուստադիտողների հապաղումը ալիքի հանկարծակի խցանման դեպքում:\nԲիթրեյթը նվազեցնելուց հետո, վերականգնման համար կարող է տևել մի քանի րոպե:\n\nՆերկայումս աջակցվում է միայն RTMP-ի համար:"
@@ -783,7 +786,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Զգուշացում. Աուդիո հոսքի բիթրեյթը կսահմանվի %1, որը ընթացիկ հոսքային ծառայության վերին սահմանն է:"
 Basic.Settings.Output.Simple.Warn.CannotPause="Զգուշացում․ ձայնագրությունները չեն կարող դադարեցվել, եթե ձայնագրման կոդավորիչը դրված է «(Օգտագործել հոսքի կոդավորիչ)» արժեքը։"
 Basic.Settings.Output.Simple.Warn.Encoder="Զգուշացում: Հեռարձակման որակից տարբերվող ծրագրային կոդավորիչով ձայնագրելու համար կպահանջվի լրացուցիչ պրոցեսորի օգտագործում՝ միաժամանակ ձայնագրման և հեռարձակման դեպքում:"
-Basic.Settings.Output.Simple.Warn.Lossless="Զգուշացում. անկորուստ որակը ստեղծում է չափազանց մեծ ֆայլեր: Այս որակը կարող է օգտագործել ավելի քան 7 գիգաբայթ սկավառակի տարածություն րոպեում բարձր լուծաչափերով և կադրերի արագությամբ: Խորհուրդ չի տրվում երկար ձայնագրել, եթե սկավառակի վրա շատ տարածություն չկա:"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Իսկապե՞ս ուզում եք տեսագրել առանց որակի կորստի:"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Անկորուստ որակի նախազգուշացում:"
 Basic.Settings.Output.Simple.Encoder.Software="Ծրագրային ապահովում (x264)"
@@ -798,7 +800,9 @@
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Սարքավորում (Apple, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Սարքավորում (Apple, HEVC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Ծրագրային ապահովում (x264 ցածր պրոցեսորի օգտագործմամբ, մեծացնում է ֆայլի չափը)"
+Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Լռելյայն)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD-ի արահետը (օգտագործում է 2-րդ ուղին)"
+Basic.Settings.Output.Simple.RecAudioTrack="Ձայնանյութ"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Անհամատեղելի լուծում կամ կադրի արագություն"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Այս հոսքային ծառայությունը չի աջակցում ձեր ընթացիկ ելքային լուծաչափը և/կամ կադրերի արագությունը: Դրանք կփոխվեն ամենամոտ համատեղելի արժեքով.\n\n%1\n\nՑանկանու՞մ եք շարունակել:"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Թույլտվություն: %1"
@@ -874,6 +878,32 @@
 Screenshot.Preview="Էկրանակադր անել (Նախադիտում)"
 Screenshot.Scene="Էկրանակադր անել (տեսարաններ)"
 Screenshot.Source="Էկրանակադր անել (աղբյուր)"
+FilenameFormatting.TT.CCYY="Տարի, չորս նիշ"
+FilenameFormatting.TT.YY="Տարի, վերջին երկու նիշը (00-99)"
+FilenameFormatting.TT.MM="Ամիսը որպես թիվ (01-12)"
+FilenameFormatting.TT.DD="Ամսաթիվը, զրոյով (01-31)"
+FilenameFormatting.TT.hh="24 ժամային ձևաչափ (00-23)"
+FilenameFormatting.TT.mm="Րոպե (00-59)"
+FilenameFormatting.TT.ss="Վայրկյան (00-59)"
+FilenameFormatting.TT.Percent="% նշան"
+FilenameFormatting.TT.a="Շաբաթվա օրվա կրճատ անվանումը"
+FilenameFormatting.TT.A="Շաբաթվա օրվա լրիվ անվանումը"
+FilenameFormatting.TT.b="Ամսվա կրճատ անվանունը"
+FilenameFormatting.TT.B="Ամսվա ամբողջ անվանումը"
+FilenameFormatting.TT.H="24 ժամային ձևաչափ (00-23)"
+FilenameFormatting.TT.I="12 ժամային ձևաչափ (01-12)"
+FilenameFormatting.TT.m="Ամիսը որպես թիվ (01-12)"
+FilenameFormatting.TT.M="Րոպե (00-59)"
+FilenameFormatting.TT.p="AM կամ PM"
+FilenameFormatting.TT.S="Վայրկյան (00-59)"
+FilenameFormatting.TT.y="Տարի, վերջին երկու նիշը (00-99)"
+FilenameFormatting.TT.Y="Տարի"
+FilenameFormatting.TT.z="ISO 8601-ի տեղաշարժը UTC-ից ժամային գոտում"
+FilenameFormatting.TT.Z="Ժամային գոտու անվանումը կամ հապավումը"
+FilenameFormatting.TT.FPS="Կադր մեկ վայրկյանում"
+FilenameFormatting.TT.CRES="Հիմնական լուծաչափը (կտավ)"
+FilenameFormatting.TT.ORES="Ելքային (մասշտաբավորված) լուծաչափ"
+FilenameFormatting.TT.VF="Տեսանյութի ձևաչափը"
 Basic.Settings.Video="Տեսանյութ"
 Basic.Settings.Video.Adapter="Վիդեո ադապտեր"
 Basic.Settings.Video.BaseResolution="Հիմնական լուծում (կտավ)"
@@ -904,8 +934,7 @@
 Basic.Settings.Audio.PeakMeterType="Պիկ հաշվիչի տեսակը"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Պարզեցված"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Ճշգրիտ (ԿՄՀ-ի օգտագործման ավելացում)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ շրջապատող ձայնը միացված է:"
-Basic.Settings.Audio.MultichannelWarning="Երբ սկսում եք հեռարձակում, համոզվեք, որ ձեր հոսքային ծառայությունն աջակցում է շրջապատող ձայնին: Facebook 360 Live-ը, Mixer RTMP-ը և Smashcast-ը ծառայությունների օրինակներ են, որոնք լիովին աջակցում են շրջապատող ձայնին: Թեև Facebook Live-ը և Youtube Live-ն ընդունում են շրջապատող ձայնը, Facebook Live-ը միացնում է այն ստերեոի, մինչդեռ Youtube Live-ը նվագարկում է միայն երկու ալիք:\n\nOBS ձայնային զտիչները համատեղելի են շրջապատող ձայնի հետ, թեև VST հավելվածների աջակցությունը երաշխավորված չէ:"
+Basic.Settings.Audio.MultichannelWarning.Enabled="ՈՒՇԱԴՐՈՒԹՅՈՒՆ՝ շրջապատող ձայնը միացված է:"
 Basic.Settings.Audio.MultichannelWarning.Title="Միացնե՞լ շրջապատող ձայնը:"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Ցանկանու՞մ եք միացնել շրջապատող ձայնը:"
 Basic.Settings.Audio.Devices="Համաշխարհային աուդիո սարքեր"
@@ -952,7 +981,6 @@
 Basic.Settings.Advanced.FormatWarning="Զգուշացում. NV12/P010-ից տարբեր գունային ձևաչափերը հիմնականում նախատեսված են ձայնագրման համար և խորհուրդ չեն տրվում հեռարձակման ժամանակ: Հոսքային հոսքը կարող է առաջացնել պրոցեսորի ավելացված օգտագործում՝ գունային ձևաչափի փոխակերպման պատճառով:"
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Զգուշացում. բարձր ճշգրտության ձևաչափերն ավելի հաճախ օգտագործվում են HDR գունային տարածքներում:"
 Basic.Settings.Advanced.FormatWarning2100="Զգուշացում՝ Միջ. 2100-ը պետք է օգտագործի ավելի ճշգրիտ ձևաչափ:"
-Basic.Settings.Advanced.Audio.BufferingTime="Աուդիո բուֆերացման ժամանակը"
 Basic.Settings.Advanced.Video.ColorFormat="Գունավոր ձևաչափ"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 բիթ, 4:2:0, 2 մակարդակ)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 բիթ, 4:2:0, 3 մակարդակ)"
@@ -978,6 +1006,7 @@
 Basic.Settings.Advanced.Network="Ցանց"
 Basic.Settings.Advanced.Network.Disabled="Ներկայիս ընտրված հոսքային արձանագրությունը չի աջակցում ցանցի կարգավորումները փոխելը:"
 Basic.Settings.Advanced.Network.BindToIP="Կապել IP-ին"
+Basic.Settings.Advanced.Network.IPFamily="IP ընտանիք"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Միացնել ցանցի օպտիմիզացումը"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Միացնել TCP ռիթմը"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Փորձում է նվազեցնել բացասական ազդեցությունը այլ հավելվածների վրա՝ օգտագործելով RTMP ելքը՝ նվազեցնելով բիթերի արագությունը:\nԿարող է մեծացնել անկայուն միացումների դեպքում շրջանակի անկման վտանգը:"
@@ -1040,8 +1069,14 @@
 SceneItemShow="Ցույց տալ '%1'"
 SceneItemHide="Թաքցնել '%1'"
 OutputWarnings.NoTracksSelected="Դուք պետք է ընտրեք առնվազն մեկ աուդիո կատարում"
+OutputWarnings.NoTracksSelectedOnExit.Title="Արդյունքի պարամետրերի սխալը"
 OutputWarnings.MP4Recording="Ուշադրություն. MP4/MOV-ում պահպանված ձայնագրությունները անընթեռնելի կլինեն, եթե ֆայլը ավարտված չէ (օրինակ՝ BSOD, հոսանքի կորստի և այլնի պատճառով): Եթե ցանկանում եք մի քանի աուդիո հետքեր ձայնագրել, մտածեք MKV-ի օգտագործման մասին, այնուհետև ձայնագրման ավարտից հետո նորից միացնել MP4/MOV-ին (Ֆայլ → Ռեմուքսի տեսագրում)"
 OutputWarnings.CannotPause="Զգուշացում․ ձայնագրությունները չեն կարող դադարեցվել, եթե «Ձայնագրման կոդավորիչը» դրված է «(Օգտագործել հոսքի կոդավորիչը)»"
+CodecCompat.Incompatible="(Անհամատեղելի է %1-ի հետ)"
+CodecCompat.CodecPlaceholder="Ընտրել կոդավորիչը․.."
+CodecCompat.ContainerPlaceholder="Ընտրել ձևաչափը..."
+CodecCompat.CodecMissingOnExit.Title="Կոդավորիչը ընտրված չէ"
+CodecCompat.ContainerMissingOnExit.Title="Ձևաչափը ընտրված չէ"
 FinalScene.Title="Ջնջել տեսարանը"
 FinalScene.Text="Դուք չեք կարող ջնջել վերջին տեսարանը:"
 NoSources.Title="Աղբյուրներ չկան"
@@ -1078,14 +1113,12 @@
 LoadProfileNeedsRestart="Պրոֆիլը պարունակում է կարգավորումներ, որոնք պահանջում են OBS-ի վերագործարկում.\n%1\n\nՑանկանու՞մ եք վերագործարկել OBS-ը, որպեսզի այս կարգավորումներն ուժի մեջ մտնեն:"
 ContextBar.NoSelectedSource="Աղբյուրը ընտրված չէ"
 ContextBar.ResetTransform="Վերականգնել վերափոխումը"
-ContextBar.FitToCanvas="Հարմարվում է կտավին"
 ContextBar.MediaControls.PlayMedia="Նվագարկել մեդիան"
 ContextBar.MediaControls.PauseMedia="Դադարեցնել մեդիան"
 ContextBar.MediaControls.StopMedia="Ավարտել մեդիան"
 ContextBar.MediaControls.RestartMedia="Վերագործարկել մեդիան"
 ContextBar.MediaControls.PlaylistNext="Հաջորդը տեսացանկում"
 ContextBar.MediaControls.PlaylistPrevious="Նախորդը տեսացանկում"
-ContextBar.MediaControls.MediaProperties="Մեդիան հատկությունները"
 ContextBar.MediaControls.BlindSeek="Մեդիա հետադարձ վիջեթ"
 YouTube.Auth.Ok="Թույլտվությունը հաջողությամբ ավարտվեց:\nԱյժմ կարող եք փակել այս էջը:"
 YouTube.Auth.NoCode="Թույլտվության գործընթացը չի ավարտվել։"

obs-studio-29.1.3.tar.xz/UI/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/id-ID.ini Changed

@@ -91,7 +91,6 @@
 LogViewer="Penampil Catatan"
 ShowOnStartup="Tampilkan saat memulai"
 OpenFile="Buka berkas"
-AddValue="Tambah %1"
 AddSource="Tambahkan Sumber"
 RemoveScene="Hapus Adegan yang Dipilih"
 RemoveSource="Hapus Adegan-Adegan yang Dipilih"
@@ -103,11 +102,19 @@
 SourceFilters="Buka Properti Filter"
 MixerToolbarMenu="Menu Mixer Audio"
 SceneFilters="Buka Filter Adegan"
+List="Daftar"
+Grid="Kisi-kisi"
 PluginsFailedToLoad.Title="Kesalahan Memuat Plugin"
 PluginsFailedToLoad.Text="Plugin OBS berikut ini gagal untuk memuat:\n\n%1\nMohon perbarui atau hapus plugin tersebut."
 AlreadyRunning.Title="OBS sudah berjalan"
 AlreadyRunning.Text="OBS sudah berjalan! Kecuali jika Anda bermaksud melakukan ini, harap matikan semua instansi-instansi OBS yang ada sebelum mencoba menjalankan instansi baru. Jika Anda memiliki OBS yang diatur untuk di minimalkan ke baki sistem, mohon diperiksa apakah OBS masih berjalan atau tidak."
 AlreadyRunning.LaunchAnyway="Tetap Luncurkan"
+AutoSafeMode.Title="Mode Aman"
+AutoSafeMode.Text="OBS tidak dinonaktifkan dengan benar selama sesi terakhir Anda.\n\nApakah Anda ingin memulai dalam Mode Aman (plugin pihak ketiga, skriping, dan WebSockets dinonaktifkan)?"
+AutoSafeMode.LaunchSafe="Berjalan dalam Mode Aman"
+AutoSafeMode.LaunchNormal="Berjalan seperti Biasa"
+SafeMode.Restart="Apakah Anda ingin mengaktifkan ulang OBS dalam Mode Aman (plugin pihak ketiga, skriping, dan WebSockets dinonaktifkan)?"
+SafeMode.RestartNormal="Apakah Anda ingin mengaktifkan ulang OBS dalam Mode Biasa?"
 ChromeOS.Title="Platform Tidak Didukung"
 ChromeOS.Text="Tampaknya OBS berjalan di dalam kontainer ChromeOS. Platform ini tidak didukung."
 Wine.Title="Terdeteksi Wine"
@@ -173,7 +180,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Sesuaikan..."
 Basic.AutoConfig.StreamPage.StreamKey="Kunci Stream"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: masukkan frasa sandi enkripsi nya.\nRTMP: masukkan kunci yang di sediakan oleh layanan nya.\nSRT: masukkan streamid nya jika layanan menggunakan nya."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Tautan)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kunci Pengkodean"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Akun yang terhubung"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Perkirakan bitrate dengan uji bandwidth (mungkin perlu beberapa menit)"
@@ -224,8 +230,6 @@
 Updater.UpdateNow="Perbarui sekarang"
 Updater.RemindMeLater="Ingatkan saya nanti"
 Updater.Skip="Lewati Versi"
-Updater.Running.Title="Program sedang aktif"
-Updater.Running.Text="Output saat ini aktif, mohon nonaktifkan semua output yang aktif sebelum mencoba memperbarui"
 Updater.NoUpdatesAvailable.Title="Tidak ada pembaruan yang tersedia"
 Updater.NoUpdatesAvailable.Text="Tidak ada pembaruan yang tersedia saat ini"
 Updater.BranchNotFound.Title="Pembaruan Saluran Dihapus"
@@ -235,8 +239,6 @@
 Updater.RepairConfirm.Title="Konfirmasi Pengecekan Integritas"
 Updater.RepairConfirm.Text="Memulai pengecekan integritas akan memindai pemasangan OBS Anda jika ada yang korup dan mengunduh kembali berkas yang rusak/diubah. Ini membutuhkan waktu beberapa saat.\n\nAnda yakin ingin lanjut?"
 Updater.FailedToLaunch="Gagal menjalankan pembaru"
-Updater.GameCaptureActive.Title="Penangkap gim aktif"
-Updater.GameCaptureActive.Text="Pengait pustaka penangkap gim sedang digunakan. Mohon tutup semua permainan/program yang sedang ditangkap (atau aktifkan ulang Windows) dan coba lagi."
 QuickTransitions.SwapScenes="Tukar Pratinjau/Program Adegan Setelah Transisi"
 QuickTransitions.SwapScenesTT="Tukar pratinjau dan program adegan setelah transisi (jika program adegan asli masih ada).\nIni tidak akan dapat membatalkan perubahan apa pun yang mungkin telah dilakukan pada program adegan asli."
 QuickTransitions.DuplicateScene="Duplikat Adegan"
@@ -250,6 +252,8 @@
 Basic.SceneTransitions="Transisi Adegan"
 Basic.TransitionDuration="Durasi"
 Basic.TogglePreviewProgramMode="Mode Studio"
+Basic.EnablePreviewProgramMode="Aktifkan Mode Studio"
+Basic.DisablePreviewProgramMode="Nonaktifkan Mode Studio"
 Undo.Undo="Mundur"
 Undo.Redo="Ulangi"
 Undo.Add="Tambah '%1'"
@@ -298,6 +302,8 @@
 Undo.GroupItems="Kelompokkan Item ke dalam '%1'"
 TransitionNameDlg.Text="Silakan masukkan nama transisi"
 TransitionNameDlg.Title="Nama Transisi"
+TitleBar.SafeMode="MODE AMAN"
+TitleBar.PortableMode="Mode Portabel"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Adegan"
 NameExists.Title="Nama sudah ada"
@@ -322,6 +328,7 @@
 Output.StartStreamFailed="Gagal memulai streaming"
 Output.StartRecordingFailed="Gagal memulai rekaman"
 Output.StartReplayFailed="Gagal memulai replay buffer"
+Output.StartVirtualCamFailed="Gagal untuk memulai kamera virtual"
 Output.StartFailedGeneric="Gagal memulai output. Silakan periksa catatan untuk detail lebih lanjut. \n\nCatatan: Jika Anda menggunakan pengkodean NVENC atau AMD, pastikan versi driver video Anda adalah yang terbaru."
 Output.ReplayBuffer.PauseWarning.Title="Tidak dapat menyimpan tayangan ulang saat dijeda"
 Output.ReplayBuffer.PauseWarning.Text="Peringatan: Tayangan ulang tidak dapat disimpan saat rekaman dijeda."
@@ -334,7 +341,7 @@
 Output.ConnectFail.Disconnected="Terputus dari sever."
 Output.StreamEncodeError.Title="Galat enkode"
 Output.StreamEncodeError.Msg="Kesalahan pengkodean terjadi saat streaming."
-Output.StreamEncodeError.Msg.LastError="Sebuah kesalahan pengkodean terjadi saat streaming:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Sebuah kesalahan pengkodean terjadi saat streaming: %1"
 Output.RecordFail.Title="Gagal memulai rekaman"
 Output.RecordFail.Unsupported="Format outputnya antara tidak didukung atau tidak mendukung lebih dari satu trek audio. Mohon periksa pengaturan Anda dan coba lagi."
 Output.RecordNoSpace.Title="Ruang penyimpanan tidak cukup"
@@ -342,7 +349,7 @@
 Output.RecordError.Title="Kesalahan rekaman"
 Output.RecordError.Msg="Terjadi kesalahan yang tidak spesifik saat merekam."
 Output.RecordError.EncodeErrorMsg="Kesalahan pengkodean terjadi saat merekam."
-Output.RecordError.EncodeErrorMsg.LastError="Sebuah kesalahan pengkodean terjadi saat merekam:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Sebuah kesalahan pengkodean terjadi saat merekam: %1"
 Output.BadPath.Title="Jalur Berkas Tidak Sah"
 Output.BadPath.Text="Jalur Rekaman yang terkonfigurasi tidak dapat dibuka. Mohon cek Jalur Rekaman Anda di Pengaturan → Output → Rekaman."
 Output.NoBroadcast.Title="Tidak Ada Siaran yang Terkonfigurasi"
@@ -371,6 +378,8 @@
 Remux.ExitUnfinishedTitle="Remuxing sedang diproses"
 Remux.ExitUnfinished="Remuxing belum selesai, menghentikan sekarang dapat membuat berkas targetnya tidak bisa digunakan.\nApakah Anda yakin ingin menghentikan remuxing?"
 Remux.HelpText="Seret berkas ke jendela ini untuk di-remux, atau pilih baris \"Rekaman OBS\" yang kosong untuk memilih berkas."
+Remux.NoFilesAddedTitle="Tidak ada berkas remux-an yang ditambahkan"
+Remux.NoFilesAdded="Tidak ada berkas yang ditambahkan ke remux. Letakkan sebuah folder yang berisi satu atau lebih berkas video."
 MissingFiles="Berkas Tidak Ditemukan"
 MissingFiles.MissingFile="Berkas yang Hilang"
 MissingFiles.NewFile="Berkas yang Baru"
@@ -389,6 +398,7 @@
 MissingFiles.AutoSearchText="OBS telah menemukan kecocokan tambahan pada berkas yang hilang dalam direktori tersebut. Apakah Anda ingin menambahkannya?"
 MissingFiles.NoMissing.Title="Pemeriksaan Kehilangan Berkas"
 MissingFiles.NoMissing.Text="Tidak ada berkas yang terlihat menghilang."
+MacPermissions.MenuAction="Tinjau Perizinan Aplikasi..."
 MacPermissions.Title="Tinjau Perizinan Aplikasi"
 MacPermissions.Description="OBS Studio perlu izin Anda untuk dapat menyediakan fitur-fitur tertentu. Disarankan untuk mengaktifkan izin berikut ini, tetapi tidak diperlukan untuk penggunaan aplikasi. Anda dapat selalu mengaktifkannya nanti."
 MacPermissions.Description.OpenDialog="Anda dapat membuka kembali dialog ini melalui menu OBS Studio."
@@ -404,8 +414,8 @@
 MacPermissions.Item.Accessibility="Aksesibilitas"
 MacPermissions.Item.Accessibility.Details="Untuk pintasan papan ketik (hotkey) agar dapat bekerja ketika aplikasi lain sedang fokus, mohon aktifkan izin ini."
 MacPermissions.Continue="Selanjutnya"
-UpdateAvailable="Pembaruan Terbaru Tersedia"
-UpdateAvailable.Text="Versi %1.%2.%3 telah tersedia. <a href='%4'>Klik disini untuk mengunduh</a>"
+SourceLeak.Title="Pembersihan Sumber Galat"
+SourceLeak.Text="Ada masalah saat mengubah koleksi adegan dan beberapa sumber tidak dapat dibongkar muat. Masalah ini biasanya disebabkan oleh plugin yang tidak melepaskan sumber daya nya secara benar. Mohon pastikan plugin apapun yang Anda gunakan adalah yang terbaru.\n\nOBS Studio sekarang akan ditutup untuk mencegah potensi terjadi nya kerusakan data."
 Basic.DesktopDevice1="Audio Desktop"
 Basic.DesktopDevice2="Audio Desktop 2"
 Basic.Scene="Adegan"
@@ -458,6 +468,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (pilih-otomatis: %2)"
 Basic.PropertiesWindow.SelectColor="Pilih warna"
 Basic.PropertiesWindow.SelectFont="Pilih fon"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Pilih Fon"
 Basic.PropertiesWindow.ConfirmTitle="Pengaturan Berubah"
 Basic.PropertiesWindow.Confirm="Ada perubahan yang belum disimpan. Apakah Anda ingin menyimpannya?"
 Basic.PropertiesWindow.NoProperties="Tidak ada properti-properti yang tersedia"
@@ -567,8 +578,9 @@
 Basic.VCam.VirtualCamera="Kamera Virtual"
 Basic.VCam.OutputType="Tipe Output"
 Basic.VCam.OutputSelection="Pilih Output"
-Basic.VCam.InternalDefault="Output Pratinjau (Bawaan)"
-Basic.VCam.InternalPreview="Output Pratinjau"
+Basic.VCam.OutputType.Program="Program (Bawaan)"
+Basic.VCam.OutputSelection.NoSelection="Tidak ada pilihan untuk jenis output ini"
+Basic.VCam.RestartWarning="Kamera virtual akan diaktifkan ulang untuk menerapkan perubahan ini"
 Basic.MainMenu.File="Berkas (&F)"
 Basic.MainMenu.File.Export="&Ekspor"
 Basic.MainMenu.File.Import="&Impor"
@@ -609,17 +621,18 @@
 Basic.MainMenu.Edit.AdvAudio="Properti Lanjutan &Audio"
 Basic.MainMenu.View="Tampilan (&V)"
 Basic.MainMenu.View.Toolbars="Bilah Ala&t"
-Basic.MainMenu.View.ListboxToolbars="Tombol Daftar Adegan/Sumber"
+Basic.MainMenu.View.ListboxToolbars="Dok Bilah Alat"
 Basic.MainMenu.View.ContextBar="Bilah Alat Sumber"
-Basic.MainMenu.View.SceneTransitions="Transisi Adegan (&C)"
 Basic.MainMenu.View.SourceIcons="&Ikon Sumber"
 Basic.MainMenu.View.StatusBar="Bar &Status"
 Basic.MainMenu.View.Fullscreen.Interface="Antarmuka Layar Penuh"
 Basic.MainMenu.View.ResetUI="Atu&r Ulang UI"
 Basic.MainMenu.View.AlwaysOnTop="Selalu di &Atas"
+Basic.MainMenu.View.SceneListMode="Mode Daftar Adegan"
 Basic.MainMenu.Docks="&Dok"
 Basic.MainMenu.Docks.ResetDocks="Atu&r Ulang Dok"
 Basic.MainMenu.Docks.LockDocks="Kunci Dok (&L)"
+Basic.MainMenu.Docks.SideDocks="Dok tinggi penuh (&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Penyesuaian Dok Peramban..."
 Basic.MainMenu.SceneCollection="Kolek&si Adegan"
 Basic.MainMenu.Profile="&Profil"
@@ -628,7 +641,6 @@
 Basic.MainMenu.SceneCollection.Import="Impor Koleksi Adegan"
 Basic.MainMenu.SceneCollection.Export="Ekspor Koleksi Adegan"
 Basic.MainMenu.Profile.Exists="Profil sudah ada"
-Basic.MainMenu.SceneCollection.Exists="Koleksi adegan sudah ada"
 Basic.MainMenu.Tools="Ala&t"
 Basic.MainMenu.Help="Bantuan (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal Bantuan"
@@ -640,8 +652,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Unggah &Catatan Berkas Saat Ini"
 Basic.MainMenu.Help.Logs.UploadLastLog="Unggah Berkas Catatan Sebelumnya (&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Tampilkan Catatan Saat Ini (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Catatan Rilis"
 Basic.MainMenu.Help.CheckForUpdates="Periksa Pembaruan"
 Basic.MainMenu.Help.Repair="Cek Integritas Berkas"
+Basic.MainMenu.Help.RestartSafeMode="Aktifkan Ulang dalam Mode Aman"
+Basic.MainMenu.Help.RestartNormal="Aktifkan Ulang dalam Mode Biasa"
 Basic.MainMenu.Help.CrashLogs="Lapo&ran Galat"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Tampilkan Laporan Galat (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Unggah La&poran Galat Sebelumnya"
@@ -711,7 +726,6 @@
 Basic.Settings.General.ChannelName.beta="Percobaan / Kandidat Rilisan"
 Basic.Settings.General.ChannelDescription.beta="Potensi versi pra-rilisan tidak stabil"
 Basic.Settings.Stream="Streaming"
-Basic.Settings.Stream.StreamType="Jenis Streaming"
 Basic.Settings.Stream.Custom.UseAuthentication="Gunakan autentikasi"
 Basic.Settings.Stream.Custom.Username="Nama Pengguna"
 Basic.Settings.Stream.Custom.Password="Kata Sandi"
@@ -742,7 +756,6 @@
 Basic.Settings.Output.Encoder.Video="Pengkodean Video"
 Basic.Settings.Output.Encoder.Audio="Pengkodean Audio"
 Basic.Settings.Output.SelectDirectory="Pilih Direktori Rekaman"
-Basic.Settings.Output.SelectFile="Pilih Berkas Rekaman"
 Basic.Settings.Output.DynamicBitrate="Ubah bitrate secara dinamis untuk mengelola kemacetan"
 Basic.Settings.Output.DynamicBitrate.Beta="Ubah bitrate secara dinamis untuk mengelola kemacetan (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Alih-alih menurunkan frame untuk mengurangi kemacetan, Anda dapat mengubah bitrate langsung secara dinamis.\n\nMohon diingat bahwa ini dapat meningkatkan waktu tunda (delay) bagi penonton jika tiba-tiba ada kemacetan yang signifikan.\nKetika bitrate berkurang, diperlukan waktu beberapa menit untuk pulih kembali.\n\nSaat ini hanya mendukung RTMP."
@@ -770,7 +783,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Peringatan: Rekaman tidak dapat dijeda jika kualitas rekaman diatur ke \"Sama seperti streaming\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Peringatan: Format rekaman yang saat ini dipilih tidak kompatibel dengan pengkodean-pengkodean stream yang dipilih."
 Basic.Settings.Output.Simple.Warn.Encoder="Peringatan: Perekaman dengan pengkodean perangkat lunak pada kualitas yang berbeda dengan streaming akan membutuhkan penggunaan CPU tambahan jika Anda melakukan streaming dan rekaman secara bersamaan."
-Basic.Settings.Output.Simple.Warn.Lossless="Peringatan: Kualitas lossless menghasilkan ukuran berkas yang sangat besar! Kualitas lossless dapat menggunakan ruang penyimpanan hingga 7 gigabyte per menit pada resolusi dan framerate yang tinggi. Lossless tidak disarankan untuk rekaman yang panjang. Kecuali Anda memiliki jumlah ruang penyimpanan tersedia yang sangat besar."
+Basic.Settings.Output.Simple.Warn.Lossless="Peringatan: Kualitas lossless menghasilkan ukuran berkas yang amat sangat besar! Kualitas lossless dapat mengkonsumsi ruang penyimpanan lebih dari 7 gigabyte per menit pada resolusi dan framerate yang tinggi. Lossless tidak disarankan untuk rekaman yang panjang. Kecuali, Anda memiliki jumlah ruang penyimpanan tersedia yang sangat besar. Buffer replay tidak tersedia ketika menggunakan kualitas lossless."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Apakah Anda yakin ingin menggunakan kualitas lossless?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Peringatan kualitas lossless!"
 Basic.Settings.Output.Simple.Encoder.Software="Perangkat Lunak (x264)"
@@ -910,8 +923,8 @@
 Basic.Settings.Audio.MeterDecayRate.Slow="Lambat (PPM Tipe II)"
 Basic.Settings.Audio.PeakMeterType="Tipe Peak Meter"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Penggunaan CPU lebih tinggi)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="PERINGATAN: Audio suara surround diaktifkan."
-Basic.Settings.Audio.MultichannelWarning="Jika streaming, periksa untuk melihat apakah layanan streaming Anda mendukung suara surround ingest dan pemutaran suara surround. Facebook 360 Live adalah salah satu contoh yang mendukung suara surround secara penuh. Meskipun Facebook Live dan YouTube Live sama-sama menerima surround ingest, Facebook Live men-downmix audio ke stereo, dan YouTube Live hanya memutar dua saluran.\n\nFilter audio OBS kompatibel dengan suara surround, meskipun dukungan plugin VST tidak dijamin."
+Basic.Settings.Audio.MultichannelWarning.Enabled="PERINGATAN: Audio suara surround diaktifkan."
+Basic.Settings.Audio.MultichannelWarning="Jika streaming, periksa untuk melihat apakah layanan streaming Anda mendukung dua fitur ini. Yakni, ingest suara surround dan pemutaran suara surround. Contohnya, Facebook 360 Live mendukung penuh suara surround; YouTube Live mendukung ingest audio 5.1 (dan pemutaran nya di TV).\n\nFilter audio OBS kompatibel dengan suara surround, meskipun dukungan plugin VST tidak dijamin."
 Basic.Settings.Audio.MultichannelWarning.Title="Aktifkan audio suara surround?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Anda yakin ingin mengaktifkan audio suara surround?"
 Basic.Settings.Audio.Devices="Perangkat Global Audio"
@@ -957,7 +970,6 @@
 Basic.Settings.Advanced.FormatWarning="Peringatan: Format warna selain NV12/P010 utamanya ditujukan untuk perekaman, dan tidak dianjurkan saat streaming. Streaming dapat meningkatkan penggunaan CPU karena konversi format warna."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Peringatan: Format berpresisi tinggi lebih umum digunakan dengan ruang warna HDR."
 Basic.Settings.Advanced.FormatWarning2100="Peringatan: Rec. 2100 semestinya menggunakan format yang lebih presisi."
-Basic.Settings.Advanced.Audio.BufferingTime="Waktu Buffering Audio"
 Basic.Settings.Advanced.Video.ColorFormat="Format Warna"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 bidang)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 bidang)"
@@ -982,6 +994,7 @@
 Basic.Settings.Advanced.Network="Jaringan"
 Basic.Settings.Advanced.Network.Disabled="Protokol streaming yang saat ini dipilih tidak mendukung pengaturan mengubah jaringan."
 Basic.Settings.Advanced.Network.BindToIP="Kaitkan ke IP"
+Basic.Settings.Advanced.Network.IPFamily="Keluarga IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Aktifkan optimisasi jaringan"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Aktifkan TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Mencoba membuat output RTMP lebih ramah untuk aplikasi lain yang sensitif latensi di jaringan dengan mengatur laju transmisi.\nIni dapat meningkatkan risiko frame yang drop pada koneksi yang tidak stabil."
@@ -1039,6 +1052,8 @@
 SceneItemShow="Tampilkan '%1'"
 SceneItemHide="Sembunyikan '%1'"
 OutputWarnings.NoTracksSelected="Anda harus memilih setidaknya satu trek"
+OutputWarnings.NoTracksSelectedOnExit.Title="Galat Pengaturan Output"
+OutputWarnings.NoTracksSelectedOnExit.Text="Semua output harus ada sedikitnya satu trek audio yang dipilih."
 OutputWarnings.MP4Recording="Peringatan: Rekaman yang disimpan ke format MP4/MOV tidak akan dapat dipulihkan jika berkas tidak dapat diselesaikan (mis. Akibat BSOD, kehilangan daya, dll.). Jika Anda ingin merekam beberapa trek audio, pertimbangkan memakai format MKV dan remux rekaman ke MP4/MOV setelah selesai (File → Remux Rekaman)"
 OutputWarnings.CannotPause="Peringatan: Rekaman tidak dapat dijeda jika pengkodean rekaman diatur ke \"(Gunakan pengkodean streaming)\""
 OutputWarnings.CodecIncompatible="Pilihan pengkodean audio atau video telah di atur ulang dikarenakan tidak kompatibel. Mohon pilih pengkodean yang kompatibel dari daftar berikut ini."
@@ -1064,6 +1079,7 @@
 About.GetInvolved="Ayo terlibat"
 About.Authors="Pencipta"
 About.License="Lisensi"
+About.Error="Galat! Berkas tidak dapat bisa di baca.\n\nPergi ke: %1"
 About.Contribute="Dukung proyek OBS"
 AddUrl.Title="Tambahkan Sumber melalui URL"
 AddUrl.Text="Anda telah menyeret URL ke OBS. Ini secara otomatis akan menambahkan tautan sebagai sumber. Lanjutkan?"
@@ -1084,14 +1100,12 @@
 LoadProfileNeedsRestart="Profil mengandung pengaturan yang membutuhkan pengaktifan ulang OBS:\n%1\n\nApakah Anda ingin mengaktifkan ulang OBS agar pengaturan tersebut di terapkan?"
 ContextBar.NoSelectedSource="Tidak ada sumber yang dipilih"
 ContextBar.ResetTransform="Atur Ulang Transformasi"
-ContextBar.FitToCanvas="Pas dengan Kanvas"
 ContextBar.MediaControls.PlayMedia="Putar Media"
 ContextBar.MediaControls.PauseMedia="Jeda Media"
 ContextBar.MediaControls.StopMedia="Hentikan Media"
 ContextBar.MediaControls.RestartMedia="Putar Ulang Media"
 ContextBar.MediaControls.PlaylistNext="Selanjutnya dalam Daftar Putar"
 ContextBar.MediaControls.PlaylistPrevious="Sebelumnya dalam Daftar Putar"
-ContextBar.MediaControls.MediaProperties="Properti Media"
 ContextBar.MediaControls.BlindSeek="Widget Media Seek"
 YouTube.Auth.Ok="Otorisasi berhasil diselesaikan.\nSekarang Anda dapat menutup halaman ini."
 YouTube.Auth.NoCode="Proses otorisasi tidak selesai."
@@ -1171,3 +1185,5 @@
 YouTube.Errors.liveChatEnded="Siaran langsung telah berakhir."
 YouTube.Errors.messageTextInvalid="Teks pesan tidak sah."
 YouTube.Errors.rateLimitExceeded="Anda mengirim pesan terlalu cepat."
+YouTube.DocksRemoval.Title="Bersihkan Dok Peramban Lawas YouTube"
+YouTube.DocksRemoval.Text="Dok peramban berikut ini akan dihapus sebagai fitur usang:\n\n%1\nSebagai gantinya, gunakan \"Dok/Ruang Live Control YouTube\"."

obs-studio-30.0.2.tar.xz/UI/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/UI/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/it-IT.ini Changed

@@ -91,7 +91,6 @@
 LogViewer="Visualizzatore Log"
 ShowOnStartup="Mostra all'avvio"
 OpenFile="Apri file"
-AddValue="Aggiungi %1"
 AddSource="Aggiungi fonte"
 RemoveScene="Rimuovi scena selezionata"
 RemoveSource="Rimuovi fonti selezionate"
@@ -103,11 +102,19 @@
 SourceFilters="Apri filtri della fonte"
 MixerToolbarMenu="Menu mixer audio"
 SceneFilters="Apri filtri scena"
+List="Elenco"
+Grid="Griglia"
 PluginsFailedToLoad.Title="Errore caricamento plugin"
 PluginsFailedToLoad.Text="Non sono stati caricati i seguenti plugin OBS :\n\n%1\nAggiorna o rimuovi questi plugin."
 AlreadyRunning.Title="OBS è già in esecuzione"
 AlreadyRunning.Text="OBS è già in esecuzione! A meno che non si intendeva effettuare questa operazione, chiudere tutte le istanze esistenti di OBS prima di provare a eseguirne una nuova. Se avete OBS impostato per minimizzarsi nell'area di notifica, si prega di controllare per vedere se è ancora in esecuzione."
 AlreadyRunning.LaunchAnyway="Avvia comunque"
+AutoSafeMode.Title="Modalità provvisoria"
+AutoSafeMode.Text="OBS durante l'ultima sessione non si è chiuso correttamente.\n\nVuoi avviarlo in modalità provvisoria (verranno disattivati plugin di terze parti, script e websocket)?"
+AutoSafeMode.LaunchSafe="Esegui in modalità provvisoria"
+AutoSafeMode.LaunchNormal="Esegui normalmente"
+SafeMode.Restart="Vuoi riavviare OBS in modalità provvisoria (verranno disattivati plugin di terze parti, script, e websocket)?"
+SafeMode.RestartNormal="Vuoi riavviare OBS in modalità normale?"
 ChromeOS.Title="Piattaforma non supportata"
 ChromeOS.Text="OBS sembra essere in esecuzione all'interno di un contenitore ChromeOS. \nQuesta piattaforma non è supportata."
 Wine.Title="Rilevato Wine"
@@ -173,6 +180,7 @@
 Basic.AutoConfig.StreamPage.StreamKey="Chiave Stream"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: inserisci la frase segreta di cifratura.\nRTMP: inserisci la chiave fornita dal servizio.\nSRT: inserisci lo streamid se il servizio ne usa una."
 Basic.AutoConfig.StreamPage.EncoderKey="Chiave Codificatore"
+Basic.AutoConfig.StreamPage.BearerToken="Tohen Bearer"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Account collegato"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Calcola la velocità in bit tramite un test di larghezza di banda (richiede alcuni minuti)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferisci la codifica hardware"
@@ -224,8 +232,6 @@
 Updater.UpdateNow="Aggiorna ora"
 Updater.RemindMeLater="Ricordamelo più tardi"
 Updater.Skip="Salta versione"
-Updater.Running.Title="Programma attualmente attivo"
-Updater.Running.Text="La registrazione o la diretta è ancora in corso. Prima di tentare un aggiornamento, disattiva la registrazione o la diretta"
 Updater.NoUpdatesAvailable.Title="Nessun aggiornamento disponibile"
 Updater.NoUpdatesAvailable.Text="Nessun aggiornamento attualmente disponibile"
 Updater.BranchNotFound.Title="Canale aggiornamenti rimosso"
@@ -235,8 +241,6 @@
 Updater.RepairConfirm.Title="Conferma controllo integrità"
 Updater.RepairConfirm.Text="L'avvio del controllo di integrità eseguirà la scansione dell'installazione di OBS alla ricerca di danneggiamenti e scaricherà nuovamente i file danneggiati/modificati.\nPotrebbe volerci un momento.\n\nVuoi procedere?"
 Updater.FailedToLaunch="Avvio dello strumento di aggiornamento non riuscito"
-Updater.GameCaptureActive.Title="Cattura gioco attivo"
-Updater.GameCaptureActive.Text="L'hook della libreria di cattura gioco è attualmente in uso. Chiudi qualsiasi gioco/programma che viene catturato (o riavvia Windows) e riprova."
 QuickTransitions.SwapScenes="Scambia scene anteprima/programma dopo la transizione"
 QuickTransitions.SwapScenesTT="Scambia l'anteprima e le scene del programma dopo la transizione (se la scena originale del programma esiste ancora).\nQuesto non annullerà le modifiche che potrebbero essere state apportate alla scena originale del programma."
 QuickTransitions.DuplicateScene="Duplica la scena"
@@ -250,6 +254,8 @@
 Basic.SceneTransitions="Transizioni di scena"
 Basic.TransitionDuration="Durata"
 Basic.TogglePreviewProgramMode="Modalità studio"
+Basic.EnablePreviewProgramMode="Abilita modalità Studio"
+Basic.DisablePreviewProgramMode="Disabilita modalità Studio"
 Undo.Undo="Annulla"
 Undo.Redo="Ripeti"
 Undo.Add="Aggiungi '%1'"
@@ -298,6 +304,8 @@
 Undo.GroupItems="Raggruppa elementi in '%1'"
 TransitionNameDlg.Text="Inserisci il nome della transizione"
 TransitionNameDlg.Title="Nome della transizione"
+TitleBar.SafeMode="MODALITA' PROVVISORIA"
+TitleBar.PortableMode="Modalità portatile"
 TitleBar.Profile="Profilo"
 TitleBar.Scenes="Scene"
 NameExists.Title="Il nome esiste già"
@@ -322,6 +330,7 @@
 Output.StartStreamFailed="Impossibile avviare la diretta"
 Output.StartRecordingFailed="Impossibile avviare la registrazione"
 Output.StartReplayFailed="Impossibile avviare il buffer di replay"
+Output.StartVirtualCamFailed="Impossibile avviare la videocamera virtuale"
 Output.StartFailedGeneric="Impossibile creare il file di uscita. Controlla il log per i dettagli.\n\nNota: se utilizzi la codifica NVENC o AMD, assicurati che i driver video siano aggiornati all'ultima versione."
 Output.ReplayBuffer.PauseWarning.Title="Impossibile salvare i replay mentre si è in pausa"
 Output.ReplayBuffer.PauseWarning.Text="Attenzione: i Replay non possono essere salvati mentre la registrazione è in pausa."
@@ -334,7 +343,7 @@
 Output.ConnectFail.Disconnected="Disconnesso dal server."
 Output.StreamEncodeError.Title="Errore di codifica"
 Output.StreamEncodeError.Msg="Si è verificato un errore di codifica durante lo streaming."
-Output.StreamEncodeError.Msg.LastError="Si è verificato un errore di codifica durante lo streaming:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Durante lo streaming si è verificato un errore dell'encoder : %1"
 Output.RecordFail.Title="Impossibile avviare la registrazione"
 Output.RecordFail.Unsupported="Il formato del file di uscita non è supportato o non supporta più di una traccia audio. Per favore, controlla le tue impostazioni e riprova."
 Output.RecordNoSpace.Title="Spazio su disco insufficiente"
@@ -342,7 +351,7 @@
 Output.RecordError.Title="Errore di registrazione"
 Output.RecordError.Msg="Si è verificato un errore non specificato durante la registrazione."
 Output.RecordError.EncodeErrorMsg="Si è verificato un errore di codifica durante la registrazione."
-Output.RecordError.EncodeErrorMsg.LastError="Si è verificato un errore di codifica durante la registrazione:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Durante la registrazione si è verificato un errore dell'encoder : %1"
 Output.BadPath.Title="Percorso del file non valido"
 Output.BadPath.Text="Impossibile aprire il percorso di registrazione configurato. Controlla il percorso di registrazione in Impostazioni → Output → Recording."
 Output.NoBroadcast.Title="Nessuna trasmissione configurata"
@@ -372,6 +381,8 @@
 Remux.ExitUnfinishedTitle="Conversione in corso"
 Remux.ExitUnfinished="La conversione non è finita, interromperla ora potrebbe rendere il file di destinazione inutilizzabile.\nSei sicuro di voler interrompere la conversione?"
 Remux.HelpText="Trascina i file da convertire in questa finestra, oppure seleziona una casella «Registrazioni di OBS» vuota per sfogliare i file."
+Remux.NoFilesAddedTitle="Nessun remuxing per i file aggiunti"
+Remux.NoFilesAdded="Nessun file è stato aggiunto nel remux. Scelgi una cartella contenente uno o più file video."
 MissingFiles="File non trovati"
 MissingFiles.MissingFile="File non trovato"
 MissingFiles.NewFile="Nuovo file"
@@ -390,6 +401,7 @@
 MissingFiles.AutoSearchText="OBS ha trovato file somiglianti ai file mancanti nella stessa cartella. Vuoi aggiungerli?"
 MissingFiles.NoMissing.Title="Controllo file mancanti"
 MissingFiles.NoMissing.Text="Nessun file sembra mancare."
+MacPermissions.MenuAction="Controlla autorizzazioni app..."
 MacPermissions.Title="Controlla autorizzazioni app"
 MacPermissions.Description="OBS Studio richiedel'autorizzazione per essere in grado di fornire alcune funzionalità.\nTi consigliamo di abilitare questi permessi, ma non sono necessari per usare l'app.\nÈ sempre possibile attivarli più tardi."
 MacPermissions.Description.OpenDialog="È possibile riaprire questa finestra di dialogo tramite il menu OBS Studio."
@@ -405,8 +417,8 @@
 MacPermissions.Item.Accessibility="Accessibilità"
 MacPermissions.Item.Accessibility.Details="Abilita questa autorizzazione per far funzionare le scorciatoie da tastiera (tasti di scelta rapida) mentre altre applicazioni sono attivate."
 MacPermissions.Continue="Continua"
-UpdateAvailable="È disponibile un nuovo aggiornamento"
-UpdateAvailable.Text="La versione %1.%2.%3 è ora disponibile. <a href='%4'>Fai clic qui per scaricarla</a>"
+SourceLeak.Title="Errore pulizia sorgente"
+SourceLeak.Text="Si è verificato un problema durante la modifica delle raccolte di scene e non è stato possibile scaricare alcune sorgenti.\n\nQuesto problema è in genere causato da plug-in che non rilasciano correttamente le risorse.\nAssicurati che tutti i plugin che stai usando siano aggiornati.\n\nOBS Studio ora verrà chiuso per prevenire qualsiasi potenziale danneggiamento dei dati."
 Basic.DesktopDevice1="Audio del desktop"
 Basic.DesktopDevice2="Audio del desktop 2"
 Basic.AuxDevice1="Microfono/disp. ausiliario"
@@ -468,6 +480,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (autoseleziona: %2)"
 Basic.PropertiesWindow.SelectColor="Seleziona il colore"
 Basic.PropertiesWindow.SelectFont="Seleziona il tipo di carattere"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Scegli un font"
 Basic.PropertiesWindow.ConfirmTitle="Impostazioni modificate"
 Basic.PropertiesWindow.Confirm="Sono state apportate delle modifiche. Vuoi salvarle?"
 Basic.PropertiesWindow.NoProperties="Nessuna proprietà disponibile"
@@ -576,9 +589,9 @@
 Basic.VCam.VirtualCamera="Fotocamera virtuale"
 Basic.VCam.OutputType="Tipo output"
 Basic.VCam.OutputSelection="Selezione output"
-Basic.VCam.Internal="Interna"
-Basic.VCam.InternalDefault="Output programma (predefinito)"
-Basic.VCam.InternalPreview="Output anteprima"
+Basic.VCam.OutputType.Program="Programma (predefinito)"
+Basic.VCam.OutputSelection.NoSelection="Nessuna selezione per questa tipologia di output"
+Basic.VCam.RestartWarning="Per applicare la modifica sarà riavviata la camera virtuale "
 Basic.MainMenu.File.Export="&Esporta"
 Basic.MainMenu.File.Import="&Importa"
 Basic.MainMenu.File.ShowRecordings="Visualizza &registrazioni"
@@ -619,17 +632,18 @@
 Basic.MainMenu.Edit.AdvAudio="Proprietà &audio avanzate"
 Basic.MainMenu.View="&Visualizza"
 Basic.MainMenu.View.Toolbars="Barre degli s&trumenti"
-Basic.MainMenu.View.ListboxToolbars="Elenco pulsanti scena/fonte"
+Basic.MainMenu.View.ListboxToolbars="Pannelli barre strumenti"
 Basic.MainMenu.View.ContextBar="Barra degli strumenti delle fonti"
-Basic.MainMenu.View.SceneTransitions="Transizioni di s&cena"
 Basic.MainMenu.View.SourceIcons="&Icone fonti"
 Basic.MainMenu.View.StatusBar="Barra di &stato"
 Basic.MainMenu.View.Fullscreen.Interface="Interfaccia a schermo intero"
 Basic.MainMenu.View.ResetUI="&Ripristina UI"
 Basic.MainMenu.View.AlwaysOnTop="Sempre in primo pi&ano"
+Basic.MainMenu.View.SceneListMode="Modalità elenco scene"
 Basic.MainMenu.Docks="&Pannelli"
 Basic.MainMenu.Docks.ResetDocks="&Ripristina pannelli"
 Basic.MainMenu.Docks.LockDocks="&Blocca pannelli"
+Basic.MainMenu.Docks.SideDocks="&Pannelli ad altezza intera"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Pannelli browser personalizzati..."
 Basic.MainMenu.SceneCollection="Collezione &scene"
 Basic.MainMenu.Profile="P&rofilo"
@@ -638,7 +652,6 @@
 Basic.MainMenu.SceneCollection.Import="Importa una collezione di scene"
 Basic.MainMenu.SceneCollection.Export="Esporta la collezione di scene"
 Basic.MainMenu.Profile.Exists="Il profilo esiste già"
-Basic.MainMenu.SceneCollection.Exists="La collezione di scene esiste già"
 Basic.MainMenu.Tools="S&trumenti"
 Basic.MainMenu.Help="&Aiuto"
 Basic.MainMenu.Help.HelpPortal="&Portale di assistenza"
@@ -650,8 +663,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Carica il file di log attuale"
 Basic.MainMenu.Help.Logs.UploadLastLog="Carica il file di log &precedente"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Visualizza il file di log attuale"
+Basic.MainMenu.Help.ReleaseNotes="Note di rilascio"
 Basic.MainMenu.Help.CheckForUpdates="Controlla gli aggiornamenti"
 Basic.MainMenu.Help.Repair="Controlla integrità file"
+Basic.MainMenu.Help.RestartSafeMode="Riavvia in modalità provvisoria"
+Basic.MainMenu.Help.RestartNormal="Riavvia in modalità normale"
 Basic.MainMenu.Help.CrashLogs="&Registro degli arresti anomali"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Vi&sualizza i registri dei crash"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Carica &Precedente Rapporto Crash"
@@ -721,7 +737,6 @@
 Basic.Settings.General.ChannelName.beta="Beta / versioni Candidate"
 Basic.Settings.General.ChannelDescription.beta="Versioni pre-rilascio potenzialmente instabili"
 Basic.Settings.Stream="Dirette"
-Basic.Settings.Stream.StreamType="Tipo di diretta"
 Basic.Settings.Stream.Custom.UseAuthentication="Usa autenticazione"
 Basic.Settings.Stream.Custom.Username.ToolTip="RIST: inserisci srp_username.\nRTMP: inserisci il nome utente.\nSRT: non utilizzato."
 Basic.Settings.Stream.Custom.Password.ToolTip="RIST: inserisci srp_password.\nRTMP: inserisci la password.\nSRT: inserisci la passphrase."
@@ -751,7 +766,6 @@
 Basic.Settings.Output.Encoder.Video="Encoder video"
 Basic.Settings.Output.Encoder.Audio="Encoder audio"
 Basic.Settings.Output.SelectDirectory="Seleziona la cartella di registrazione"
-Basic.Settings.Output.SelectFile="Seleziona il file di registrazione"
 Basic.Settings.Output.DynamicBitrate="Cambia in modo dinamico il bitrate per gestire la congestione"
 Basic.Settings.Output.DynamicBitrate.Beta="Cambia in modo dinamico il bitrate per gestire la congestione (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Invece di saltare fotogrammi per ridurre la congestione, cambia dinamicamente il bitrate al volo.\n\nNota che questo potrebbe aumentare il ritardo agli spettatori se c'è una significante congestione improvvisa.\nQuando il bitrate diminuisce, potrebbero volerci fino ad alcuni minuti per ripristinarlo.\n\nAttualmente è solo supportato per RTMP."
@@ -779,7 +793,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Attenzione: Le registrazioni non possono essere sospese se la qualità di registrazione è impostata su \"La stessa della diretta\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Attenzione: il formato di registrazione attualmente selezionato non è compatibile con l'encoder per lo streaming selezionati."
 Basic.Settings.Output.Simple.Warn.Encoder="Attenzione: registrare con una codifica software a una qualità diversa dalla diretta richiederà un utilizzo aggiuntivo della CPU se esegui dirette e registri allo stesso tempo."
-Basic.Settings.Output.Simple.Warn.Lossless="Attenzione: la qualità lossless genera file estremamente grandi! Può occupare fino a 7 gigabyte di spazio al minuto con alte risoluzioni e framerate. Non è consigliata per lunghe registrazioni a meno che tu non abbia molto spazio disponibile sul disco rigido."
+Basic.Settings.Output.Simple.Warn.Lossless="Avviso: la qualità senza perdita di dati genera file di dimensioni tremendamente grandi! La qualità senza perdite può usare fino a 7 gigabyte di spazio su disco al minuto a risoluzioni e frame rate elevati. La modalità senza perdita dati non è consigliata per registrazioni lunghe, a meno che non si disponga di una grande quantità di spazio su disco. Il buffer di riproduzione non è disponibile quando si utilizza la qualità senza perdita dati."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sei sicuro di volere utilizzare la qualità lossless?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Avviso sulla qualità lossless!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264, preset con basso utilizzo della CPU, aumenta le dimensioni dei file)"
@@ -912,8 +926,8 @@
 Basic.Settings.Audio.PeakMeterType="Tipo di misuratore di picco"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Picco a campionamento"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Picco esatto (alto utilizzo della CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ATTENZIONE: L'audio surround è attivato."
-Basic.Settings.Audio.MultichannelWarning="Se stai effettuando le modifiche per le dirette, controlla che il servizio di dirette offra l'integrazione e la riproduzione di audio surround. Facebook 360 Live, è un esempio di servizio che offre l'audio surround. Le dirette su Facebook e YouTube accettano l'audio surround, ma Facebook lo converte in stereo e YouTube riproduce solo due canali.\n\nI filtri audio di OBS sono compatibili con l'audio surround, ma il supporto al plugin VST non è garantito."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ATTENZIONE: L'audio surround è attivato."
+Basic.Settings.Audio.MultichannelWarning="In caso di streaming, controlla se il servizio di streaming supporta sia l'acquisizione del suono surround che la riproduzione del suono surround. \nAd esempio, Facebook 360 Live supporta completamente il suono surround e YouTube Live supporta l'importazione audio 5.1 (e la riproduzione su TV).\n\nI filtri audio OBS sono compatibili con l'audio surround, anche se il supporto del plug-in VST non è garantito."
 Basic.Settings.Audio.MultichannelWarning.Title="Vuoi attivare l'audio surround?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sei sicuro di voler attivare l'audio surround?"
 Basic.Settings.Audio.Devices="Dispositivi audio globali"
@@ -960,7 +974,6 @@
 Basic.Settings.Advanced.FormatWarning="Attenzione: formati di colore diversi da NV12/P010 sono principalmente destinati alla registrazione, e non sono raccomandati durante lo streaming. \nA causa della conversione del formato colore lo streaming potrebbe comportare un maggiore uso della CPU."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Avviso: i formati ad alta precisione sono più comunemente usati con gli spazi colore HDR."
 Basic.Settings.Advanced.FormatWarning2100="Attenzione: Rec. 2100 dovrebbe usare un formato con più precisione."
-Basic.Settings.Advanced.Audio.BufferingTime="Tempo di buffer audio"
 Basic.Settings.Advanced.Video.ColorFormat="Formato colore"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8bit, 4.2:0, 2 piani)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8bit, 4.2:0, 3 piani)"
@@ -988,6 +1001,7 @@
 Basic.Settings.Advanced.Network="Rete"
 Basic.Settings.Advanced.Network.Disabled="Il protocollo di streaming attualmente selezionato non supporta la modifica delle impostazioni di rete."
 Basic.Settings.Advanced.Network.BindToIP="Associa all'indirizzo IP"
+Basic.Settings.Advanced.Network.IPFamily="Famiglia IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Abilita ottimizzazioni di rete"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Abilita pacing TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Tentativi di rendere l'output RTMP compatibile ad altre applicazioni sensibili alla latenza sulla rete regolando il tasso di trasmissione.\nPuò aumentare il rischio di fotogrammi persi su connessioni instabili."
@@ -1058,6 +1072,8 @@
 SceneItemShow="Mostra «%1»"
 SceneItemHide="Nascondi «%1»"
 OutputWarnings.NoTracksSelected="Devi selezionare almeno una traccia"
+OutputWarnings.NoTracksSelectedOnExit.Title="Errore impostazioni output"
+OutputWarnings.NoTracksSelectedOnExit.Text="Tutti gli output devono avere almeno una traccia audio selezionata."
 OutputWarnings.MP4Recording="Attenzione: le registrazioni salvate in MP4/MOV non saranno recuperabili se il file non può essere completato (ad es. a seguito di un BSOD, perdite di corrente, ecc.). Se desideri registrare più tracce audio, consigliamo l'utilizzo di MKV e, una volta terminato, eseguire la conversione della registrazione in MP4/MOV (File → Converti le registrazioni)"
 OutputWarnings.CannotPause="Attenzione: Le registrazioni non possono essere sospese se la codifica di registrazione è impostata su \"(Utilizza codifica flusso)\""
 OutputWarnings.CodecIncompatible="L'encoder audio o video è stata reimpostato a causa di una incompatibilità.\nSeleziona nell'elenco un encoder compatibile."
@@ -1083,6 +1099,7 @@
 About.GetInvolved="Partecipa allo sviluppo"
 About.Authors="Autori"
 About.License="Licenza"
+About.Error="Errore! Impossibile leggere il file.\n\nVai a: %1"
 About.Contribute="Sostieni il progetto OBS"
 AddUrl.Title="Aggiungi origine tramite URL"
 AddUrl.Text="Hai spostato un URL in OBS. Questo aggiungerà automaticamente il collegamento come fonte. Continuare?"
@@ -1103,14 +1120,12 @@
 LoadProfileNeedsRestart="Il profilo contiene impostazioni che richiedono il riavvio di OBS:\n%1\n\nVuoi riavviare OBS affinché queste impostazioni vengano applicate?"
 ContextBar.NoSelectedSource="Nessuna fonte selezionata"
 ContextBar.ResetTransform="Ripristina trasformazione"
-ContextBar.FitToCanvas="Adatta allo schermo"
 ContextBar.MediaControls.PlayMedia="Riproduci media"
 ContextBar.MediaControls.PauseMedia="Sospendi media"
 ContextBar.MediaControls.StopMedia="Ferma media"
 ContextBar.MediaControls.RestartMedia="Riavvia media"
 ContextBar.MediaControls.PlaylistNext="Successivo nella scaletta"
 ContextBar.MediaControls.PlaylistPrevious="Precedente nella scaletta"
-ContextBar.MediaControls.MediaProperties="Proprietà media"
 ContextBar.MediaControls.BlindSeek="Widget ricerca multimediale"
 YouTube.Auth.Ok="Autorizzazione completata con successo.\nOra puoi chiudere questa pagina."
 YouTube.Auth.NoCode="Il processo di autorizzazione non è stato completato."
@@ -1190,3 +1205,5 @@
 YouTube.Errors.liveChatEnded="La trasmissione in diretta è terminata."
 YouTube.Errors.messageTextInvalid="Il testo del messaggio non è valido."
 YouTube.Errors.rateLimitExceeded="Stai inviando messaggi troppo velocemente."
+YouTube.DocksRemoval.Title="Rimuovi i panelli YouTube legacy del browser"
+YouTube.DocksRemoval.Text="Questi pannelli del browser verranno rimossi perché obsoleti:\n\n%1\nUsa invece \"Pannello/Controllo regia YouTube Live\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ja-JP.ini Changed

@@ -4,7 +4,7 @@
 Close="閉じる"
 Save="保存"
 Discard="破棄"
-Disable="無効化"
+Disable="無効"
 Yes="はい"
 No="いいえ"
 Add="追加"
@@ -94,7 +94,6 @@
 LogViewer="ログビューア"
 ShowOnStartup="起動時に表示"
 OpenFile="ファイルを開く"
-AddValue="%1 を追加"
 AddSource="ソース追加"
 RemoveScene="選択したシーンを削除"
 RemoveSource="選択したソースを削除"
@@ -106,11 +105,19 @@
 SourceFilters="ソースのフィルタを開く"
 MixerToolbarMenu="音声ミキサーメニュー"
 SceneFilters="シーンのフィルタを開く"
+List="リスト"
+Grid="グリッド"
 PluginsFailedToLoad.Title="プラグイン読み込みエラー"
 PluginsFailedToLoad.Text="以下のOBSプラグイン読み込みに失敗しました:\n\n%1\nこれらのプラグインを更新または削除してください。"
 AlreadyRunning.Title="OBSは既に実行中です"
 AlreadyRunning.Text="OBSは既に実行中です！ 意図的でない限り新しいインスタンスを実行する前に既存のOBSインスタンスをシャットダウンしてください。 もしOBSをシステムトレイに最小化されるように設定されている場合は、まだ実行中であるかどうかを確認してください。"
 AlreadyRunning.LaunchAnyway="とにかく起動する"
+AutoSafeMode.Title="セーフモード"
+AutoSafeMode.Text="前回のセッション中にOBSが正しくシャットダウンされませんでした。\n\nセーフモード (サードパーティプラグイン、スクリプト、WebSocketが無効) で起動しますか？"
+AutoSafeMode.LaunchSafe="セーフモードで実行"
+AutoSafeMode.LaunchNormal="通常通り実行"
+SafeMode.Restart="OBSをセーフモード (サードパーティプラグイン、スクリプト、WebSocketが無効) で再起動しますか？"
+SafeMode.RestartNormal="OBSを通常モードで再起動しますか？"
 ChromeOS.Title="サポートされていないプラットフォーム"
 ChromeOS.Text="OBSはChromeOSのコンテナ内で実行されているようです。このプラットフォームはサポートされていません。"
 Wine.Title="Wineが検出されました"
@@ -134,7 +141,7 @@
 Auth.Chat="チャット"
 Auth.StreamInfo="配信情報"
 TwitchAuth.Stats="Twitch統計"
-TwitchAuth.Feed="Twitch アクティビティフィード"
+TwitchAuth.Feed="Twitchアクティビティフィード"
 TwitchAuth.TwoFactorFail.Title="ストリームキーを照会できませんでした"
 TwitchAuth.TwoFactorFail.Text="OBSはあなたのTwitchアカウントに接続できませんでした。 配信をするには2要素認証が必要なので <a href='https://www.twitch.tv/settings/security'>Twitchセキュリティ設定</a> で2要素認証が設定されていることを確認してください。"
 Copy.Filters="フィルタをコピー"
@@ -177,8 +184,8 @@
 Basic.AutoConfig.StreamPage.Server="サーバー"
 Basic.AutoConfig.StreamPage.StreamKey="ストリームキー"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: 暗号化パスフレーズ を入力します。\nRTMP: サービスから提供された キー を入力します。\nSRT: サービスが streamid を使用する場合は streamid を入力します。"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(リンク)"
 Basic.AutoConfig.StreamPage.EncoderKey="エンコーダキー"
+Basic.AutoConfig.StreamPage.BearerToken="Bearerトークン"
 Basic.AutoConfig.StreamPage.ConnectedAccount="接続されたアカウント"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="帯域幅のテストでビットレートを推定する (数分かかることがあります)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="ハードウェアエンコードを優先する"
@@ -230,8 +237,6 @@
 Updater.UpdateNow="今すぐ更新"
 Updater.RemindMeLater="後で通知"
 Updater.Skip="バージョンをスキップする"
-Updater.Running.Title="現在アクティブなプログラム"
-Updater.Running.Text="出力が現在アクティブです。更新を試みる前にアクティブな出力をシャットダウンしてください。"
 Updater.NoUpdatesAvailable.Title="更新はありません"
 Updater.NoUpdatesAvailable.Text="現在利用可能な更新はありません"
 Updater.BranchNotFound.Title="更新チャンネルが削除されました"
@@ -241,8 +246,6 @@
 Updater.RepairConfirm.Title="整合性の確認"
 Updater.RepairConfirm.Text="整合性の確認を開始するとOBSのインストールに破損がないかスキャンし壊れた/変更されたファイルが再ダウンロードされます。 これには少し時間がかかる場合があります。\n\n続行しますか？"
 Updater.FailedToLaunch="アップデータの起動に失敗しました"
-Updater.GameCaptureActive.Title="ゲームキャプチャがアクティブ"
-Updater.GameCaptureActive.Text="ゲームキャプチャフックライブラリが現在使用中です。キャプチャされているすべてのゲーム/プログラムを閉じて (またはWindowsを再起動して) からもう一度やり直してください。"
 QuickTransitions.SwapScenes="トランジション後に プレビュー/プログラム シーンを入れ替え"
 QuickTransitions.SwapScenesTT="トランジション後にプレビューとプログラムシーンを入れ替えます。(プログラムのオリジナルシーンがまだ存在する場合)\nこれはプログラムのオリジナルシーンに加えられた可能性があるすべての変更を元に戻しません。"
 QuickTransitions.DuplicateScene="シーンを複製"
@@ -256,6 +259,8 @@
 Basic.SceneTransitions="シーントランジション"
 Basic.TransitionDuration="期間"
 Basic.TogglePreviewProgramMode="スタジオモード"
+Basic.EnablePreviewProgramMode="スタジオモードを有効化"
+Basic.DisablePreviewProgramMode="スタジオモードを無効化"
 Undo.Undo="元に戻す"
 Undo.Redo="やり直し"
 Undo.Add="'%1' を追加"
@@ -264,7 +269,7 @@
 Undo.SceneCollection.Switch="'%1' 切り替え"
 Undo.Item.Undo="%1 を元に戻す"
 Undo.Item.Redo="%1 をやり直す"
-Undo.Sources.Multi="%1 のソース削除"
+Undo.Sources.Multi="%1 個のソース削除"
 Undo.Filters="'%1' のフィルタ変更"
 Undo.Filters.Paste.Single="フィルタ '%1' を '%2' に貼り付け"
 Undo.Filters.Paste.Multiple="'%1' から '%2' にフィルタをコピー"
@@ -304,6 +309,8 @@
 Undo.GroupItems="アイテムを '%1' にグループ化"
 TransitionNameDlg.Text="トランジションの名前を入力してください"
 TransitionNameDlg.Title="トランジション名"
+TitleBar.SafeMode="セーフモード"
+TitleBar.PortableMode="ポータブルモード"
 TitleBar.Profile="プロファイル"
 TitleBar.Scenes="シーン"
 NameExists.Title="名前が使用中"
@@ -328,6 +335,7 @@
 Output.StartStreamFailed="配信開始に失敗しました"
 Output.StartRecordingFailed="録画開始に失敗しました"
 Output.StartReplayFailed="リプレイバッファの開始に失敗しました"
+Output.StartVirtualCamFailed="仮想カメラの開始に失敗しました"
 Output.StartFailedGeneric="出力開始に失敗しました。詳細はログを確認してください。\n\n注: NVENC または AMDエンコーダ を使用している場合は、ビデオドライバーが最新のものであるかを確認してください。"
 Output.ReplayBuffer.PauseWarning.Title="一時停止中はリプレイを保存できません"
 Output.ReplayBuffer.PauseWarning.Text="警告: 録画の一時停止中はリプレイを保存できません。"
@@ -340,7 +348,7 @@
 Output.ConnectFail.Disconnected="サーバーから切断されました。"
 Output.StreamEncodeError.Title="エンコードエラー"
 Output.StreamEncodeError.Msg="配信中にエンコーダでエラーが発生しました。"
-Output.StreamEncodeError.Msg.LastError="配信中にエンコーダでエラーが発生しました:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="配信中にエンコーダでエラーが発生しました: %1"
 Output.RecordFail.Title="録画を開始できませんでした"
 Output.RecordFail.Unsupported="出力フォーマットがサポートされていないか複数の音声トラックをサポートしていません。 設定を確認してもう一度やり直してください。"
 Output.RecordNoSpace.Title="ディスク領域の不足"
@@ -348,7 +356,7 @@
 Output.RecordError.Title="録画エラー"
 Output.RecordError.Msg="録画中に不明なエラーが発生しました。"
 Output.RecordError.EncodeErrorMsg="録画中にエンコーダでエラーが発生しました。"
-Output.RecordError.EncodeErrorMsg.LastError="録画中にエンコーダでエラーが発生しました:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="録画中にエンコーダでエラーが発生しました: %1"
 Output.BadPath.Title="無効なパス"
 Output.BadPath.Text="設定した録画パスを開くことができませんでした。 設定 → 出力 → 録画 で録画パスを確認してください。"
 Output.NoBroadcast.Title="配信が設定されていません"
@@ -378,6 +386,8 @@
 Remux.ExitUnfinishedTitle="再多重化が進行中です"
 Remux.ExitUnfinished="再多重化が完了しておらず、今停止すると対象ファイルが使用不能になる可能性があります。\n再多重化を停止しますか？"
 Remux.HelpText="再多重化するにはファイルをこのウィンドウにドロップするか、空の \"OBS 録画\" セルを選択してファイルを参照してください。"
+Remux.NoFilesAddedTitle="再多重化ファイルは追加されていません"
+Remux.NoFilesAdded="最多重化にファイルは追加されていません。 1つ以上のビデオファイルを含むフォルダをドロップしてください。"
 MissingFiles="不足しているファイル"
 MissingFiles.MissingFile="不足ファイル"
 MissingFiles.NewFile="新規ファイル"
@@ -396,6 +406,7 @@
 MissingFiles.AutoSearchText="OBSはそのディレクトリで不足しているファイルに一致するものを追加で検出しました。それらを追加しますか？"
 MissingFiles.NoMissing.Title="不足ファイルの確認"
 MissingFiles.NoMissing.Text="不足しているファイルはありません。"
+MacPermissions.MenuAction="アプリの権限を確認する..."
 MacPermissions.Title="アプリの権限を確認する"
 MacPermissions.Description="OBS Studioで特定の機能を使用するには権限の許可が必要です。 これらの権限を有効にすることをお勧めしますが、アプリを使用するために必須ではありません。 後でいつでも有効にすることができます。"
 MacPermissions.Description.OpenDialog="このダイアログはOBS Studioメニューから再度開くことができます。"
@@ -411,8 +422,8 @@
 MacPermissions.Item.Accessibility="アクセシビリティ"
 MacPermissions.Item.Accessibility.Details="他のアプリケーションがフォーカスされているときにキーボードショートカット (ホットキー) を動作させるには、この権限を有効にしてください。"
 MacPermissions.Continue="続行"
-UpdateAvailable="更新が利用可能"
-UpdateAvailable.Text="バージョン %1.%2.%3 が利用可能です。<a href='%4'>ダウンロードはこちら</a>"
+SourceLeak.Title="ソースクリーンアップエラー"
+SourceLeak.Text="シーンコレクションの変更中に問題が発生し一部のソースをアンロードできませんでした。 この問題は通常プラグインがリソースを適切に解放していないことが原因で発生します。 使用しているプラグインが最新であることを確認してください。\n\n潜在的なデータ破損を防ぐためにOBS Studioを終了します。"
 Basic.DesktopDevice1="デスクトップ音声"
 Basic.DesktopDevice2="デスクトップ音声 2"
 Basic.AuxDevice1="マイク"
@@ -475,6 +486,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (自動選択: %2)"
 Basic.PropertiesWindow.SelectColor="色を選択"
 Basic.PropertiesWindow.SelectFont="フォントを選択"
+Basic.PropertiesWindow.SelectFont.WindowTitle="フォントを選択"
 Basic.PropertiesWindow.ConfirmTitle="設定の変更"
 Basic.PropertiesWindow.Confirm="保存されていない変更があります。それらを維持しますか？"
 Basic.PropertiesWindow.NoProperties="有効なプロパティがありません"
@@ -572,8 +584,8 @@
 Basic.Main.AutoStopEnabled="(自動停止)"
 Basic.Main.StoppingStreaming="配信停止処理中..."
 Basic.Main.ForceStopStreaming="配信停止 (遅延破棄)"
-Basic.Main.ShowContextBar="ソースツールバーを表示"
-Basic.Main.HideContextBar="ソースツールバーを非表示"
+Basic.Main.ShowContextBar="ソース ツールバーを表示"
+Basic.Main.HideContextBar="ソース ツールバーを非表示"
 Basic.Main.StopVirtualCam="仮想カメラ停止"
 Basic.Main.Group="グループ化 %1"
 Basic.Main.GroupItems="選択したアイテムをグループ化"
@@ -584,9 +596,9 @@
 Basic.VCam.VirtualCamera="仮想カメラ"
 Basic.VCam.OutputType="出力の種類"
 Basic.VCam.OutputSelection="出力の選択"
-Basic.VCam.Internal="インターナル"
-Basic.VCam.InternalDefault="プログラムを出力 (既定値)"
-Basic.VCam.InternalPreview="プレビューを出力"
+Basic.VCam.OutputType.Program="プログラム (既定)"
+Basic.VCam.OutputSelection.NoSelection="この出力タイプには選択がありません"
+Basic.VCam.RestartWarning="この変更を適用するために仮想カメラは再起動されます"
 Basic.MainMenu.File="ファイル(&F)"
 Basic.MainMenu.File.Export="エクスポート(&E)"
 Basic.MainMenu.File.Import="インポート(&I)"
@@ -628,17 +640,18 @@
 Basic.MainMenu.Edit.AdvAudio="オーディオの詳細プロパティ(&A)"
 Basic.MainMenu.View="表示(&V)"
 Basic.MainMenu.View.Toolbars="ツールバー(&T)"
-Basic.MainMenu.View.ListboxToolbars="シーン/ソース リストボタン"
+Basic.MainMenu.View.ListboxToolbars="ドック ツールバー"
 Basic.MainMenu.View.ContextBar="ソース ツールバー"
-Basic.MainMenu.View.SceneTransitions="シーントランジション(&C)"
 Basic.MainMenu.View.SourceIcons="ソース アイコン(&I)"
 Basic.MainMenu.View.StatusBar="ステータスバー(&S)"
 Basic.MainMenu.View.Fullscreen.Interface="全画面インターフェイス"
 Basic.MainMenu.View.ResetUI="UIをリセット(&R)"
 Basic.MainMenu.View.AlwaysOnTop="常に手前に表示(&A)"
+Basic.MainMenu.View.SceneListMode="シーン リストモード"
 Basic.MainMenu.Docks="ドック(&D)"
 Basic.MainMenu.Docks.ResetDocks="ドックをリセット(&R)"
 Basic.MainMenu.Docks.LockDocks="ドックをロック(&L)"
+Basic.MainMenu.Docks.SideDocks="フルハイト ドック(&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="カスタムブラウザドック...(&D)"
 Basic.MainMenu.SceneCollection="シーンコレクション(&S)"
 Basic.MainMenu.Profile="プロファイル(&P)"
@@ -647,7 +660,6 @@
 Basic.MainMenu.SceneCollection.Import="シーンコレクションをインポート"
 Basic.MainMenu.SceneCollection.Export="シーンコレクションをエクスポート"
 Basic.MainMenu.Profile.Exists="プロファイルは既に存在します"
-Basic.MainMenu.SceneCollection.Exists="シーンコレクションは既に存在します"
 Basic.MainMenu.Tools="ツール(&T)"
 Basic.MainMenu.Help="ヘルプ(&H)"
 Basic.MainMenu.Help.HelpPortal="ヘルプポータル(&P)"
@@ -659,8 +671,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="現在のログファイルをアップロード(&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="前回のログファイルをアップロード(&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="現在のログを表示(&V)"
+Basic.MainMenu.Help.ReleaseNotes="リリースノート"
 Basic.MainMenu.Help.CheckForUpdates="更新を確認"
 Basic.MainMenu.Help.Repair="ファイルの整合性を確認"
+Basic.MainMenu.Help.RestartSafeMode="セーフモードで再起動"
+Basic.MainMenu.Help.RestartNormal="通常モードで再起動"
 Basic.MainMenu.Help.CrashLogs="クラッシュレポート(&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="クラッシュレポートを表示(&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="前回のクラッシュレポートをアップロード(&P)"
@@ -730,7 +745,6 @@
 Basic.Settings.General.ChannelName.beta="ベータ / リリース候補"
 Basic.Settings.General.ChannelDescription.beta="潜在的に不安定なプレリリースバージョン"
 Basic.Settings.Stream="配信"
-Basic.Settings.Stream.StreamType="配信種別"
 Basic.Settings.Stream.Custom.UseAuthentication="認証を使用する"
 Basic.Settings.Stream.Custom.Username="ユーザー名"
 Basic.Settings.Stream.Custom.Password="パスワード"
@@ -759,7 +773,6 @@
 Basic.Settings.Output.Encoder.Video="映像エンコーダ"
 Basic.Settings.Output.Encoder.Audio="音声エンコーダ"
 Basic.Settings.Output.SelectDirectory="録画ディレクトリを選択"
-Basic.Settings.Output.SelectFile="録画ファイルを選択"
 Basic.Settings.Output.DynamicBitrate="輻輳を管理するためにビットレートを動的に変更する"
 Basic.Settings.Output.DynamicBitrate.Beta="輻輳を管理するためにビットレートを動的に変更する (ベータ版)"
 Basic.Settings.Output.DynamicBitrate.TT="フレームをドロップして輻輳を減らす代わりに、ビットレートを動的に変更します。\n\n突然の大幅な輻輳が発生した場合には視聴者の遅延が増大する可能性があることに注意してください。\nビットレートが低下すると、復元に数分かかることがあります。\n\n現時点ではRTMPでのみサポートされています。"
@@ -787,7 +800,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="警告: 録画品質が \"配信と同じ\" に設定されている場合は録画を一時停止することはできません。"
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="警告: 現在選択されている録画フォーマットは選択されている配信エンコーダと互換性がありません。"
 Basic.Settings.Output.Simple.Warn.Encoder="警告: 配信と録画を同時に行う場合に配信と異なる品質でソフトウェアエンコーダで録画する場合にはさらなるCPU使用率が必要になります。"
-Basic.Settings.Output.Simple.Warn.Lossless="警告: 無損失品質は途方もなく大きなファイルサイズになります！無損失品質は高解像度と高フレーム レートで 1 分あたり 7 ギガバイト以上のディスク容量を使用します。 非常に大量のディスクの空き容量がない場合の長時間録画には無損失設定の使用はお勧めしません。"
+Basic.Settings.Output.Simple.Warn.Lossless="警告: 無損失品質は非常に大きなファイルサイズが生成されます！ 無損失品質は高解像度と高フレームレートで1分あたり7ギガバイト以上のディスク容量を使用します。 非常に大きなディスク空き容量がない限り長時間録画には無損失設定の使用はお勧めできません。 無損失品質を使用してる場合はリプレイバッファを使用できません。"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="無損失品質を使用してもよろしいですか？"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="無損失品質警告！"
 Basic.Settings.Output.Simple.Encoder.Software="ソフトウェア (x264)"
@@ -821,8 +834,8 @@
 Basic.Settings.Output.EncoderPreset.ultrafast="%1 (低CPU使用率、最低品質)"
 Basic.Settings.Output.EncoderPreset.veryfast="%1 (既定値) (中程度のCPU使用率、標準品質)"
 Basic.Settings.Output.EncoderPreset.fast="%1 (高いCPU使用率、高品質)"
-Basic.Settings.Output.CustomEncoderSettings="エンコーダのカスタム設定"
-Basic.Settings.Output.CustomMuxerSettings="カスタムマルチプレクサーの設定"
+Basic.Settings.Output.CustomEncoderSettings="カスタムエンコーダ設定"
+Basic.Settings.Output.CustomMuxerSettings="カスタムマルチプレクサ設定"
 Basic.Settings.Output.NoSpaceFileName="スペースなしのファイル名を生成する"
 Basic.Settings.Output.Adv.Rescale="出力をリスケールする"
 Basic.Settings.Output.Adv.AudioTrack="音声トラック"
@@ -845,7 +858,7 @@
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(配信エンコーダを使用)"
 Basic.Settings.Output.Adv.Recording.Filename="ファイル名書式設定"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="ファイルが存在する場合は上書きする"
-Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg の出力の種類"
+Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg出力の種類"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="URLに出力"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="ファイルに出力"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="共通の録画フォーマット"
@@ -936,8 +949,8 @@
 Basic.Settings.Audio.PeakMeterType="ピークメーターの種類"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="サンプルピーク"
 Basic.Settings.Audio.PeakMeterType.TruePeak="トゥルーピーク (CPU使用率高い)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="警告: サラウンド音声が有効になっています。"
-Basic.Settings.Audio.MultichannelWarning="配信する場合、配信サービスがサラウンド音声の取り込みと再生の両方をサポートしているかどうかを確認してください。Facebook 360 Liveは、サラウンド音声が完全にサポートされている例です。しかしFacebook LiveとYouTube Liveはどちらもサラウンド取り込みを受信しますが、Facebook Liveはステレオにダウンミックスし、YouTube Liveは2チャンネルのみしか再生できません。\n\nVSTプラグインのサポートは保証されていませんが、OBS音声フィルタはサラウンド音声と互換性があります。"
+Basic.Settings.Audio.MultichannelWarning.Enabled="警告: サラウンド音声が有効になっています。"
+Basic.Settings.Audio.MultichannelWarning="配信の場合、配信サービスがサラウンド音声の取り込みとサラウンド音声の再生の両方をサポートしているかどうかを確認してください。 例えば、Facebook 360 Liveはサラウンド音声を完全にサポートし、YouTube Liveは 5.1 音声の取り込み (およびテレビでの再生) をサポートしています。\n\nOBS音声フィルタはサラウンド音声と互換性がありますが、VSTプラグインのサポートは保証されていません。"
 Basic.Settings.Audio.MultichannelWarning.Title="サラウンド音声を有効にしますか？"
 Basic.Settings.Audio.MultichannelWarning.Confirm="サラウンド音声を有効にしてもよろしいですか？"
 Basic.Settings.Audio.Devices="グローバル音声デバイス"
@@ -972,7 +985,7 @@
 Basic.Settings.Accessibility.ColorOverrides.Preset="カラープリセット"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Default="既定"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="カスタム"
-Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="色覚異常の代替"
+Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="色覚異常の代替案"
 Basic.Settings.Advanced="詳細設定"
 Basic.Settings.Advanced.General.ConfirmOnExit="終了時にアクティブな出力の警告を表示する"
 Basic.Settings.Advanced.General.ProcessPriority="プロセスの優先度"
@@ -981,10 +994,9 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="通常"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="通常以下"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="低"
-Basic.Settings.Advanced.FormatWarning="警告: NV12/P010 以外の カラーフォーマット は主に録画を想定しており、配信には非推奨です。配信では カラーフォーマット の変換による CPU使用率 の増加が発生する可能性があります。"
-Basic.Settings.Advanced.FormatWarningPreciseSdr="警告: 高精度フォーマット は HDR色空間 でより一般的に使用されます。"
+Basic.Settings.Advanced.FormatWarning="警告: NV12/P010 以外のカラーフォーマットは主に録画を想定しており、配信には非推奨です。配信ではカラーフォーマットの変換によるCPU使用率の増加が発生する可能性があります。"
+Basic.Settings.Advanced.FormatWarningPreciseSdr="警告: 高精度フォーマットは HDR色空間 でより一般的に使用されます。"
 Basic.Settings.Advanced.FormatWarning2100="警告: Rec. 2100はより精度の高いフォーマットを使用する必要があります。"
-Basic.Settings.Advanced.Audio.BufferingTime="音声バッファ処理時間"
 Basic.Settings.Advanced.Video.ColorFormat="カラーフォーマット"
 Basic.Settings.Advanced.Video.ColorSpace="色空間"
 Basic.Settings.Advanced.Video.ColorRange="色範囲"
@@ -1001,7 +1013,8 @@
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="推定メモリ使用量: %1 MB"
 Basic.Settings.Advanced.Network="ネットワーク"
 Basic.Settings.Advanced.Network.Disabled="現在選択されている配信プロトコルはネットワーク設定の変更をサポートしていません。"
-Basic.Settings.Advanced.Network.BindToIP="IP選択"
+Basic.Settings.Advanced.Network.BindToIP="IPにバインド"
+Basic.Settings.Advanced.Network.IPFamily="IP ファミリー"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="ネットワークの最適化を有効にする"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCPペーシングを有効にする"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="遅延の影響を受けやすいネットワーク上の他のアプリケーションに対応するため、RTMP出力の伝送速度を制限します。\n接続が不安定な場合、コマ落ちするリスクを高めることがあります。"
@@ -1037,7 +1050,7 @@
 Basic.Hotkeys.SelectScene="シーン切り替え"
 Basic.SystemTray.Show="表示"
 Basic.SystemTray.Hide="非表示"
-Basic.SystemTray.Message.Reconnecting="切断。 再接続中..."
+Basic.SystemTray.Message.Reconnecting="切断されました。 再接続中..."
 Hotkeys.Insert="Insertキー"
 Hotkeys.Delete="Deleteキー"
 Hotkeys.Home="Homeキー"
@@ -1080,17 +1093,19 @@
 Push-to-talk="プッシュツートーク"
 SceneItemShow="'%1' を表示"
 SceneItemHide="'%1' を非表示"
-OutputWarnings.NoTracksSelected="少なくとも 1 つのトラックを選択する必要があります"
+OutputWarnings.NoTracksSelected="少なくとも1つのトラックを選択する必要があります"
+OutputWarnings.NoTracksSelectedOnExit.Title="出力設定エラー"
+OutputWarnings.NoTracksSelectedOnExit.Text="すべての出力には少なくとも1つの音声トラックが選択されている必要があります。"
 OutputWarnings.MP4Recording="警告: MP4/MOV に保存された録画はファイルをファイナライズ(完成処理)出来ない場合 (例えば、ブルースクリーン、電源断など。) 回復不能になります。 複数の音声トラックを録画する場合は MKV の使用を検討して録画の終了後に MP4/MOV に再多重化してください。 (ファイル → 録画の再多重化)"
 OutputWarnings.CannotPause="警告: 録画エンコーダが \"(配信エンコーダを使用)\" に設定されている場合は録画を一時停止することはできません"
-OutputWarnings.CodecIncompatible="互換性がないため 音声 または 映像 エンコーダの選択がリセットされました。 リストから互換性のあるエンコーダを選択してください。"
+OutputWarnings.CodecIncompatible="互換性がないため音声または映像エンコーダの選択がリセットされました。 リストから互換性のあるエンコーダを選択してください。"
 CodecCompat.Incompatible="(%1 と互換性がありません)"
 CodecCompat.CodecPlaceholder="エンコーダを選択..."
 CodecCompat.ContainerPlaceholder="フォーマットを選択..."
 CodecCompat.CodecMissingOnExit.Title="エンコーダが選択されていません"
-CodecCompat.CodecMissingOnExit.Text="少なくとも 1つ の 映像 または 音声 エンコーダ が設定されていません。 録画 と 配信 の両方で必ず エンコーダ を選択してください。"
+CodecCompat.CodecMissingOnExit.Text="少なくとも1つの映像または音声エンコーダが設定されていません。 録画と配信の両方で必ずエンコーダを選択してください。"
 CodecCompat.ContainerMissingOnExit.Title="フォーマットが選択されていません"
-CodecCompat.ContainerMissingOnExit.Text="録画フォーマット が選択されていません。 選択した 配信エンコーダ と互換性のある 録画フォーマット を選択してください。"
+CodecCompat.ContainerMissingOnExit.Text="録画フォーマットが選択されていません。 選択した配信エンコーダと互換性のある録画フォーマットを選択してください。"
 FinalScene.Title="シーンを削除"
 FinalScene.Text="1つ以上のシーンが必要です。"
 NoSources.Title="ソース無し"
@@ -1106,6 +1121,7 @@
 About.GetInvolved="参加する"
 About.Authors="作者"
 About.License="ライセンス"
+About.Error="エラー！ ファイルを読み取れませんでした。\n\n次へ移動: %1"
 About.Contribute="OBS Projectを支援する"
 AddUrl.Title="URL経由でソースを追加"
 AddUrl.Text="URLをOBSにドラッグしました。これによりリンクがソースとして自動的に追加されます。続行しますか？"
@@ -1126,14 +1142,12 @@
 LoadProfileNeedsRestart="プロファイルにはOBSの再起動を必要とする設定が含まれています:\n%1\n\nこれらの設定を有効にするためにOBSを再起動しますか？"
 ContextBar.NoSelectedSource="ソースが選択されていません"
 ContextBar.ResetTransform="変換をリセット"
-ContextBar.FitToCanvas="キャンバスに合わせる"
 ContextBar.MediaControls.PlayMedia="メディアを再生"
 ContextBar.MediaControls.PauseMedia="メディアを一時停止"
 ContextBar.MediaControls.StopMedia="メディアを停止"
 ContextBar.MediaControls.RestartMedia="メディアを再開"
 ContextBar.MediaControls.PlaylistNext="プレイリスト内の次"
 ContextBar.MediaControls.PlaylistPrevious="プレイリスト内の前"
-ContextBar.MediaControls.MediaProperties="メディアプロパティ"
 ContextBar.MediaControls.BlindSeek="メディアシークウィジェット"
 YouTube.Auth.Ok="認証が正常に完了しました。\nこのページを閉じることができます。"
 YouTube.Auth.NoCode="認証プロセスが完了しませんでした。"
@@ -1215,3 +1229,5 @@
 YouTube.Errors.liveChatEnded="ライブ配信が終了しました。"
 YouTube.Errors.messageTextInvalid="メッセージテキストが無効です。"
 YouTube.Errors.rateLimitExceeded="メッセージの送信が速すぎます。"
+YouTube.DocksRemoval.Title="従来のYouTubeブラウザドックをクリア"
+YouTube.DocksRemoval.Text="これらのブラウザドックは非推奨として削除されます。\n\n%1\n代わりに「ドック/YouTube Live Control Room」を使用してください。"

obs-studio-29.1.3.tar.xz/UI/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ka-GE.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="აღრიცხვის მნახველი"
 ShowOnStartup="ჩვენება გაშვებისას"
 OpenFile="ფაილის გახსნა"
-AddValue="დაემატოს %1"
 AddSource="წყაროს დამატება"
 RemoveScene="შერჩეული სცენის მოცილება"
 RemoveSource="შერჩეული წყარო(ები)ს მოცილება"
@@ -107,11 +106,19 @@
 SourceFilters="ფილტრები ღია საწყისი კოდით"
 MixerToolbarMenu="ხმის შემრევის მენიუ"
 SceneFilters="სცენის ფილტრების გახსნა"
+List="სია"
+Grid="ცხრილი"
 PluginsFailedToLoad.Title="მოდულის ჩატვირთვის შეცდომ"
 PluginsFailedToLoad.Text="OBS-ის მოცემული მოდულები ვერ ჩაიტვირთა:\n\n%1\nგთხოვთ, განაახლოთ ან მოაცილოთ აღნიშნული მოდულები."
 AlreadyRunning.Title="OBS უკვე გაშვებულია"
 AlreadyRunning.Text="OBS უკვე გაშვებულია! გთხოვთ, ჯერ დახუროთ OBS-ის ყველა გაშვებული პროცესი, სანამ ახლის გაშვებას შეეცდებით. თუ მითითებული გაქვთ, რომ დახურვის ნაცვლად, OBS სისტემურ არეში უნდა ჩაიკეცოს, გთხოვთ მანდაც გადაამოწმოთ, დარჩენილი ხომ არაა."
 AlreadyRunning.LaunchAnyway="მაინც გაშვება"
+AutoSafeMode.Title="უსაფრთხო რეჟიმი"
+AutoSafeMode.Text="OBS ვერ დაიხურა სათანადოდ წინა გამოყენებისას.\n\nგსურთ გაეშვას უსაფრთხო რეჟიმში (გარეშე დანამატები, სკრიპტები და ქსელის მაკავშირებლები გაითიშება)?"
+AutoSafeMode.LaunchSafe="გაეშვას უსაფრთხო რეჟიმში"
+AutoSafeMode.LaunchNormal="გაეშვას ჩვეულებრივ"
+SafeMode.Restart="გსურთ გაეშვას OBS უსაფრთხო რეჟიმში (გარეშე დანამატები, სკრიპტები და ქსელის მაკავშირებლები გაითიშება)?"
+SafeMode.RestartNormal="გსურთ ახლიდან გაეშვას OBS ჩვეულებრივ რეჟიმში?"
 ChromeOS.Title="მხარდაუჭერელი პლატფორმა"
 ChromeOS.Text="OBS ჩანს, გაშვებულია ChromeOS-სათავსში. ეს პლატფორმა არაა მხარდაჭერილი."
 Wine.Title="აღმოჩენილია Wine"
@@ -162,7 +169,7 @@
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="მიმდინარეს გამოყენება (%1)"
 Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 ან 30, თუმცა უმჯობესია 60, როცა შესაძლებელია"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 ან 30, თუმცა უმჯობესია მაღალი გარჩევადობით"
-Basic.AutoConfig.VideoPage.CanvasExplanation="შენიშვნა: ეკრანის ფონის (ძირითადი) გაფართოება არაა აუცილებელი, გაშვებული ნაკადის ან გადაღებული ვიდეოს გაფართოებას ემთხვეოდეს. ცალკეული ნაკადის/ვიდეოს ზომები შეიძლება შემცირდეს დატვირთვის ან ბიტური სიხშირის შესამცირებლად."
+Basic.AutoConfig.VideoPage.CanvasExplanation="შენიშვნა: ეკრანის ფონის (ძირითადი) გაფართოება არაა აუცილებელი, გაშვებული ნაკადის ან გადაღებული ვიდეოს გაფართოებას ემთხვეოდეს. ცალკეული ნაკადის/ვიდეოს ზომები შეიძლება შემცირდეს დატვირთვის ან ბიტური სიხშირის მიხედვით."
 Basic.AutoConfig.StreamPage="ნაკადის მონაცემები"
 Basic.AutoConfig.StreamPage.SubTitle="გთხოვთ მიუთითოთ ნაკადის მონაცემები"
 Basic.AutoConfig.StreamPage.ConnectAccount="ანგარიშთან დაკავშირება (სასურველია)"
@@ -179,8 +186,8 @@
 Basic.AutoConfig.StreamPage.Server="სერვერი"
 Basic.AutoConfig.StreamPage.StreamKey="ნაკადის გასაღები"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: შეიყვანეთ დაშიფვრის პაროლი.\nRTMP: შეიყვანეთ მომსახურების მიერ მოწოდებული გასაღები.\nSRT: შეიყვანეთ ნაკადის კოდი, თუ გააჩნია მომსახურებას."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(ბმული)"
 Basic.AutoConfig.StreamPage.EncoderKey="დამშიფრავის გასაღები"
+Basic.AutoConfig.StreamPage.BearerToken="საშუამავლო საცნობი"
 Basic.AutoConfig.StreamPage.ConnectedAccount="დაკავშირებული ანაგრიში"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="მიახლოებითი ბიტური სიხშირე, გამოთვლილი ქსელის გამტარუნარიანობის შემოწმებით (რამდენიმე წუთს შესაძლოა გასტანოს)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="აპარატურული დაშიფვრის გამოყენება"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="ახლავე განახლება"
 Updater.RemindMeLater="მოგვიანებით შეხსენება"
 Updater.Skip="ვერსიის გამოტოვება"
-Updater.Running.Title="პროგრამა ამჟამად გაშვებულია"
-Updater.Running.Text="მიმდინარეობს სიგნალის გამოტანა, გთხოვთ, ჯერ გათიშოთ ყველა მოქმედი გამოტანა, სანამ განახლებას შეეცდებით"
 Updater.NoUpdatesAvailable.Title="განახლებები არაა ხელმისაწვდომი"
 Updater.NoUpdatesAvailable.Text="ამჟამად, განახლებები არაა ხელმისაწვდომი"
 Updater.BranchNotFound.Title="განახლების არხი მოცილებულია"
@@ -243,8 +248,6 @@
 Updater.RepairConfirm.Title="მთლიანობის გადამოწმების დასტური"
 Updater.RepairConfirm.Text="მთლიანობის შემოწმებით მოინახება დაყენებული OBS-ის დაზიანებული ფაილები და ახლიდან ჩამოიტვირთება მათი შემცვლელი. გარკვეულ ხანს შეიძლება გასტანოს.\n\nგსურთ, განაგრძოთ?"
 Updater.FailedToLaunch="განახლების გაშვება ვერ მოხერხდა"
-Updater.GameCaptureActive.Title="მიმდინარეობს თამაშის ჩაწერა"
-Updater.GameCaptureActive.Text="ამჟამად გაშვებულია თამაშის ჩამწერი ბიბლიოთეკა. გთხოვთ, შეწყვიტოთ ყველა თამაშის/პროგრამის ჩაწერა (ან თავიდან ჩართოთ Windows) და სცადოთ ხელახლა."
 QuickTransitions.SwapScenes="გადასვლისას შესათვალიერებელი/გადაცემის სცენების შენაცვლება"
 QuickTransitions.SwapScenesTT="გადასვლისას შესათვალიერებელი და გადასაცემად გამოტანილი სცენები ადგილებს გაცვლის (თუ გადაცემის თავდაპირველი სცენა კიდევ შემორჩენილია).\nგადაცემის თავდაპირველ სცენაზე გაკეთებული ცვლილებები არ გაუქმდება."
 QuickTransitions.DuplicateScene="სცენის გაორკეცება"
@@ -258,6 +261,8 @@
 Basic.SceneTransitions="სცენებს შორის გადასვლები"
 Basic.TransitionDuration="ხანგრძლივობა"
 Basic.TogglePreviewProgramMode="სტუდიური რეჟიმი"
+Basic.EnablePreviewProgramMode="სტუდიური რეჟიმის ჩართვა"
+Basic.DisablePreviewProgramMode="სტუდიური რეჟიმის გამორთვა"
 Undo.Undo="გაუქმება"
 Undo.Redo="კვლავ"
 Undo.Add="დამატება – „%1“"
@@ -306,6 +311,8 @@
 Undo.GroupItems="დაჯგუფება „%1“"
 TransitionNameDlg.Text="გთხოვთ, მიუთითოთ გადასვლის სახელი"
 TransitionNameDlg.Title="გადასვლის სახელი"
+TitleBar.SafeMode="უსაფრთხო რეჟიმი"
+TitleBar.PortableMode="გადასატანი რეჟიმი"
 TitleBar.Profile="პროფილი"
 TitleBar.Scenes="სცენები"
 NameExists.Title="სახელი უკვე არსებობს"
@@ -330,6 +337,7 @@
 Output.StartStreamFailed="ნაკადის გაშვება ვერ მოხერხდა"
 Output.StartRecordingFailed="ჩაწერის დაწყება ვერ მოხერხდა"
 Output.StartReplayFailed="გადახვევის ჩართვა ვერ მოხერხდა"
+Output.StartVirtualCamFailed="ვერ გაეშვა წარმოსახვითი კამერა"
 Output.StartFailedGeneric="სიგნალის გაშვება ვერ მოხერხდა. გთხოვთ, შეამოწმეთ აღრიცხვის ფაილი, დამატებითი ინფორმაციისთვის.\n\nშენიშვნა: თუ იყენებთ NVENC ან AMD დამშიფრავებს, დარწმუნდით რომ თქვენი ვიდეოდაფის პროგრამა განახლებულია."
 Output.ReplayBuffer.PauseWarning.Title="როცა შეჩერებულია, გადასახვევი მასალა ვერ შეინახება"
 Output.ReplayBuffer.PauseWarning.Text="შენიშვნა: უკან გადასახვევი მასალა ვერ შეინახება, როცა ჩაწერა შეჩერებულია."
@@ -342,7 +350,7 @@
 Output.ConnectFail.Disconnected="სერვერთან კავშირი გაწყვეტილია."
 Output.StreamEncodeError.Title="შეცდომა დაშიფვრისას"
 Output.StreamEncodeError.Msg="დამშიფრავის შეცდომა ნაკადის გაშვებისას."
-Output.StreamEncodeError.Msg.LastError="დამშიფრავის შეცდომა ნაკადის გაშვებისას:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="დამშიფრავის შეცდომა ნაკადის გაშვებისას: %1"
 Output.RecordFail.Title="ჩაწერის დაწყება ვერ მოხერხდა"
 Output.RecordFail.Unsupported="გამოტანის ეს სახეობა ან არაა მხარდაჭერილი, ან არ იძლევა ერთზე მეტი ხმოვანი ფაილის გამოყენების საშუალებას. გთხოვთ, გადაამოწმოთ თქვენი პარამეტრები და სცადოთ ხელახლა."
 Output.RecordNoSpace.Title="არასაკმარისი ადგილი დისკზე"
@@ -350,7 +358,7 @@
 Output.RecordError.Title="შეცდომა ჩაწერისას"
 Output.RecordError.Msg="ჩაწერის დროს დაუდგენელი სახის შეცდომა წარმოიშვა."
 Output.RecordError.EncodeErrorMsg="დამშიფრავის შეცდომა წარმოიშვა ჩაწერისას."
-Output.RecordError.EncodeErrorMsg.LastError="დამშიფრავის შეცდომა ჩაწერისას:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="დამშიფრავის შეცდომა ჩაწერისას: %1"
 Output.BadPath.Title="ფაილის არამართებული მისამართი"
 Output.BadPath.Text="ჩაწერისთვის შერჩეული საქაღალდე ვერ იხსნება. გთხოვთ გადაამოწმოთ მისამართი – პარამეტრები → გამოტანა → ჩაწერა."
 Output.NoBroadcast.Title="გადაცემა არაა გამართული"
@@ -380,6 +388,8 @@
 Remux.ExitUnfinishedTitle="მიმდინარეობს გადაფუთვა"
 Remux.ExitUnfinished="გადაფუთვა ჯერ არ დასრულებულა, ახლავე შეწყვეტის შედეგად, დასამუშავებელი საბოლოო ფაილი გამოუსადეგარი გახდება.\nნამდვილად გსურთ გადაფუთვის შეწყვეტა?"
 Remux.HelpText="გადმოიტანეთ ფაილები გადასაფუთად ამ ფანჯარაში ან დაწკაპეთ „OBS ჩანაწერის“ ველის მარჯვენა კიდეზე, ფაილის ასარჩევად."
+Remux.NoFilesAddedTitle="გადასაფუთი ფაილი არ დამატებულა"
+Remux.NoFilesAdded="გადასაფუთი ფაილი არაა. მოათავსეთ ერთი ან რამდენიმე ვიდეოს შემცველი საქაღალდე."
 MissingFiles="ფაილები აკლია"
 MissingFiles.MissingFile="დაკარგული ფაილი"
 MissingFiles.NewFile="ახალი ფაილი"
@@ -398,6 +408,7 @@
 MissingFiles.AutoSearchText="OBS-მა ამ საქაღალდეში დაკარგული ფაილების შესაბამისი სხვა ფაილებიც იპოვა. გსურთ მათი დამატება?"
 MissingFiles.NoMissing.Title="ნაკლული ფაილების შემოწმება"
 MissingFiles.NoMissing.Text="ფაილები, წესით არ აკლია."
+MacPermissions.MenuAction="პროგრამის ნებართვების გადახედვა..."
 MacPermissions.Title="პროგრამის ნებართვების გადახედვა"
 MacPermissions.Description="OBS Studio საჭიროებს თქვენგან ნებართვის მინიჭებას სხვადასხვა შესაძლებლობის შემოთავაზებლად. ამიტომ სასურველია, რომ დართოთ ნება, თუმცა აუცილებელი არაა პროგრამის გამოსაყენებლად. შეგიძლიათ, მოგვიანებით ჩართოთ."
 MacPermissions.Description.OpenDialog="ამ ფანჯრის კვლავ გახსნა OBS Studio-ს მენიუდანაა შესაძლებელი."
@@ -413,13 +424,13 @@
 MacPermissions.Item.Accessibility="ხელმისაწვდომობა"
 MacPermissions.Item.Accessibility.Details="საჭიროა კლავიატურის მალსახმობების (სწრაფი ღილაკების) გამოსაყენებლად, რომ სხვა პროგრამის ქვეშაა."
 MacPermissions.Continue="განაგრძეთ"
-UpdateAvailable="განახლება ხელმისაწვდომია"
-UpdateAvailable.Text="ხელმისაწვდომია ვერსია %1.%2.%3. <a href='%4'>დააწკაპეთ ჩამოსატვირთად</a>"
+SourceLeak.Title="წყაროს გასუფთავების შეცდომა"
+SourceLeak.Text="ხარვეზი წარმოიშვა სცენის კრებულის ცვლილებისას და ზოგიერთი წყაროს მოცილება ვერ მოხერხდა. ჩვეულებრივ, ამის მიზეზია ხოლმე დამატებითი მოდულები, რომლებიც ვერ ახერხებს მასალების სათანადოდ გამოთავისუფლებას. გთხოვთ დარწმუნდეთ, რომ ყველა მოდული განახლებულია.\n\nOBS Studio ახლა დაიხურება მონაცემთა დაზიანების ასარიდებლად."
 Basic.Scene="სცენა"
 Basic.DisplayCapture="ეკრანის გადაღება"
 Basic.Main.PreviewConextMenu.Enable="შეთვალიერების ჩართვა"
 Basic.Main.Preview.Disable="შეთვალიერების გამორთვა"
-ScaleFiltering="ზომის შეცვლის ფილტრი"
+ScaleFiltering="ზომების შეცვლის ფილტრი"
 ScaleFiltering.Point="წერტილოვანი"
 ScaleFiltering.Bilinear="ორხაზოვანი"
 ScaleFiltering.Bicubic="ბიკუბური"
@@ -470,6 +481,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (თვითშერჩევა: %2)"
 Basic.PropertiesWindow.SelectColor="ფერის შერჩევა"
 Basic.PropertiesWindow.SelectFont="შრიფტის შერჩევა"
+Basic.PropertiesWindow.SelectFont.WindowTitle="შრიფტის შერჩევა"
 Basic.PropertiesWindow.ConfirmTitle="პარამეტრები შეცვლილია"
 Basic.PropertiesWindow.Confirm="ცვლილებები არაა დამახსოვრებული. გსურთ მათი შენახვა?"
 Basic.PropertiesWindow.NoProperties="პარამეტრები მიუწვდომელია"
@@ -535,10 +547,10 @@
 Basic.TransformWindow.Alignment.BottomRight="მარჯვნივ ქვემოთ"
 Basic.TransformWindow.BoundsType.None="საზღვრების გარეშე"
 Basic.TransformWindow.BoundsType.MaxOnly="მხოლოდ უმაღლესი ზომა"
-Basic.TransformWindow.BoundsType.ScaleInner="ზომის მიყვანა შიდა საზღვრებამდე"
-Basic.TransformWindow.BoundsType.ScaleOuter="ზომის მიყვანა გარე საზღვრებამდე"
-Basic.TransformWindow.BoundsType.ScaleToWidth="ზომის დაყვანა საზღვრების სიგანემდე"
-Basic.TransformWindow.BoundsType.ScaleToHeight="ზომის დაყვანა საზღვრების სიმაღლემდე"
+Basic.TransformWindow.BoundsType.ScaleInner="ზომების მიყვანა შიდა საზღვრებამდე"
+Basic.TransformWindow.BoundsType.ScaleOuter="ზომების მიყვანა გარე საზღვრებამდე"
+Basic.TransformWindow.BoundsType.ScaleToWidth="ზომების დაყვანა საზღვრების სიგანემდე"
+Basic.TransformWindow.BoundsType.ScaleToHeight="ზომების დაყვანა საზღვრების სიმაღლემდე"
 Basic.TransformWindow.BoundsType.Stretch="გაწელვა საზღვრებამდე"
 Basic.TransformWindow.Title="გარდაქმნის შესწორება – „%1“"
 Basic.TransformWindow.NoSelectedSource="წყარო არაა შერჩეული"
@@ -580,9 +592,9 @@
 Basic.VCam.VirtualCamera="წარმოსახვითი კამერა"
 Basic.VCam.OutputType="გამოტანის სახეობა"
 Basic.VCam.OutputSelection="გამოტანის არჩევა"
-Basic.VCam.Internal="შიდა"
-Basic.VCam.InternalDefault="გამოტანილი (ნაგულისხმევი)"
-Basic.VCam.InternalPreview="გამოტანის შეთვალიერება"
+Basic.VCam.OutputType.Program="პროგრამა (ნაგულისხმევი)"
+Basic.VCam.OutputSelection.NoSelection="ასარჩევი არაა გამოტანის ამ სახეობისთვის"
+Basic.VCam.RestartWarning="წარმოსახვითი კამერა კვლავ გაეშვება ცვლილების ასახვისთვის"
 Basic.MainMenu.File="ფაილი (&F)"
 Basic.MainMenu.File.Export="შენახვა (&E)"
 Basic.MainMenu.File.Import="შემოტანა (&I)"
@@ -597,7 +609,7 @@
 Basic.MainMenu.Edit.Undo="დაბრუნება (&U)"
 Basic.MainMenu.Edit.Redo="კვლავ შესრულება (&R)"
 Basic.MainMenu.Edit.LockPreview="შეთვალიერების ჩაკეტვა (&L)"
-Basic.MainMenu.Edit.Scale="შეთვალიერების ზომის შეცვლა (&S)"
+Basic.MainMenu.Edit.Scale="შეთვალიერების ზომების ცვლა (&S)"
 Basic.MainMenu.Edit.Scale.Window="ფანჯრის ზომამდე"
 Basic.MainMenu.Edit.Scale.Canvas="ფონის ზომამდე (%1x%2)"
 Basic.MainMenu.Edit.Scale.Output="გამოტანის ზომამდე (%1x%2)"
@@ -624,17 +636,18 @@
 Basic.MainMenu.Edit.AdvAudio="ხმის გაფართოებული პარამეტრები (&A)"
 Basic.MainMenu.View="ხედი (&V)"
 Basic.MainMenu.View.Toolbars="ხელსაწყოები (&T)"
-Basic.MainMenu.View.ListboxToolbars="სცენის/წყაროს სიის ღილაკები"
+Basic.MainMenu.View.ListboxToolbars="იერსახის დანაწილება"
 Basic.MainMenu.View.ContextBar="წყაროს ხელსაწყოთა ზოლი"
-Basic.MainMenu.View.SceneTransitions="სცენებს შორის გადასვლები (&C)"
 Basic.MainMenu.View.SourceIcons="წყაროს ხატულები (&I)"
 Basic.MainMenu.View.StatusBar="მდგომარეობის ზოლი (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="სრულეკრანიანი"
 Basic.MainMenu.View.ResetUI="&იერსახის აღდგენა"
 Basic.MainMenu.View.AlwaysOnTop="ყოველთვის ზემოთ (&A)"
+Basic.MainMenu.View.SceneListMode="სცენა სიის სახით"
 Basic.MainMenu.Docks="&იერსახის ნაწილები"
-Basic.MainMenu.Docks.ResetDocks="&იერსახის ნაწილების აღდგენა"
+Basic.MainMenu.Docks.ResetDocks="&იერსახის აღდგენა"
 Basic.MainMenu.Docks.LockDocks="&იერსახის ჩაკეტვა"
+Basic.MainMenu.Docks.SideDocks="&ნაწილები სრული სიმაღლით"
 Basic.MainMenu.Docks.CustomBrowserDocks="&შერჩეული ვებგვერდის ნაწილები..."
 Basic.MainMenu.SceneCollection="სცენის კრებული (&S)"
 Basic.MainMenu.Profile="პროფილი (&P)"
@@ -643,7 +656,6 @@
 Basic.MainMenu.SceneCollection.Import="სცენის კრებულის შემოტანა"
 Basic.MainMenu.SceneCollection.Export="სცენის კრებულის შენახვა"
 Basic.MainMenu.Profile.Exists="ასეთი პროფილი უკვე არსებობს"
-Basic.MainMenu.SceneCollection.Exists="ამ სცენის კრებული უკვე არსებობს"
 Basic.MainMenu.Tools="ხელსაწყოები (&T)"
 Basic.MainMenu.Help="დახმარება (&H)"
 Basic.MainMenu.Help.HelpPortal="დახმარების გვერდი (&P)"
@@ -655,8 +667,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="მიმდინარე აღრიცხვის ფაილის ატვირთვა (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="წინა აღრიცხვის ფაილის ატვირთვა (&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="მიმდინარე აღრიცხვის ნახვა (&V)"
+Basic.MainMenu.Help.ReleaseNotes="გამოშვების ცნობები"
 Basic.MainMenu.Help.CheckForUpdates="განახლებებზე შემოწმება"
 Basic.MainMenu.Help.Repair="ფაილის მთლიანობის შემოწმება"
+Basic.MainMenu.Help.RestartSafeMode="კვლავ გაეშვას უსაფრთხო რეჟიმში"
+Basic.MainMenu.Help.RestartNormal="კვლავ გაეშვას ჩვეულებრივ რეჟიმში"
 Basic.MainMenu.Help.CrashLogs="უეცარი გათიშვების მოხსენებები (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="გათიშვების მოხსენებების ჩვენება (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="წინა მოხსენების ატვირთვა (&P)"
@@ -726,7 +741,6 @@
 Basic.Settings.General.ChannelName.beta="საცდელი / გამოსაშვებად მომზადებული"
 Basic.Settings.General.ChannelDescription.beta="სავარაუდოდ არამდგრადი გამოშვებამდელი ვერსიები"
 Basic.Settings.Stream="ნაკადი"
-Basic.Settings.Stream.StreamType="ნაკადის სახეობა"
 Basic.Settings.Stream.Custom.UseAuthentication="ანგარიშზე შესვლით"
 Basic.Settings.Stream.Custom.Username="მომხმარებლის სახელი"
 Basic.Settings.Stream.Custom.Password="პაროლი"
@@ -758,7 +772,6 @@
 Basic.Settings.Output.Encoder.Video="ვიდეოს დამშიფრავი"
 Basic.Settings.Output.Encoder.Audio="ხმის დამშიფრავი"
 Basic.Settings.Output.SelectDirectory="საქაღალდის არჩევა ჩანაწერისთვის"
-Basic.Settings.Output.SelectFile="ფაილის არჩევა ჩანაწერისთვის"
 Basic.Settings.Output.DynamicBitrate="ბიტური სიხშირის ცვალებადობა ქსელის გადატვირთულობის ასარიდებლად"
 Basic.Settings.Output.DynamicBitrate.Beta="ბიტური სიხშირის ცვალებადობა ქსელის გადატვირთულობის ასარიდებლად (საცდელი)"
 Basic.Settings.Output.DynamicBitrate.TT="ქსელის გადატვირთულობის შესამცირებლად კადრების გამოტოვების ნაცვლად, მიმდინარე ბიტური სიხშირის ცვალებადობა.\n\nგაითვალისწინეთ, რომ შედეგად შესაძლოა გაიზარდოს დაყოვნება მაყურებლებისთვის, დატვირთვის უეცარი მატებისას.\nბიტური სიხშირის ვარდნის შემდეგ, აღდგენა რამდენიმე წუთს გასტანს.\n\nამჟამად მხარდაჭერილია მხოლოდ RTMP."
@@ -786,7 +799,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="შენიშვნა: ჩაწერა ვერ შეჩერდება, თუ ჩაწერის ხარისხად მითითებულია „გაშვებული ნაკადის შესაბამისი“."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="გაფრთხილება: ჩაწერის მითითებული ფორმატი შეუთავსებელია ნაკადის შერჩეულ დამშიფრავ(ებ)თან."
 Basic.Settings.Output.Simple.Warn.Encoder="გაფრთხილება: გაშვებული ნაკადისგან განსხვავებულ ხარისხში ჩაწერის დაშიფვრა ზრდის პროცესორის დატვირთვას, როცა ნაკადის გაშვება და ჩაწერა ერთდროულად მიმდინარეობს."
-Basic.Settings.Output.Simple.Warn.Lossless="გაფრთხილება: უდანაკარგო ხარისხის მითითებისას შეიქმნება მეტისმეტად დიდი ზომის ფაილები! უდანაკარგო ხარისხის ვიდეოს თითოეული წუთმა დისკზე შეიძლება დაიკავოს 7 გიგაბაიტზე მეტი მაღალი გარჩევადობისა და კადრის სიხშირისას. ხანგრძლივი ჩანაწერებისთვის უდანაკარგოს არჩევა არაა მიზანშეწონილი, თუ არ გაქვთ საკმარისად დიდი თავისუფალი ადგილი დისკზე."
+Basic.Settings.Output.Simple.Warn.Lossless="გაფრთხილება: უდანაკარგო ხარისხით იქმნება მეტისმეტად დიდი ზომის ფაილები! უდანაკარგო ხარისხის ვიდეოს თითოეულმა წუთმა დისკზე შეიძლება 7 გიგაბაიტს გადააჭარბოს მაღალი გარჩევადობისა და კადრის სიხშირისას. ხანგრძლივი ჩანაწერებისთვის უდანაკარგო ხარისხი არაა მიზანშეწონილი, თუ არ გაქვთ საკმარისად დიდი თავისუფალი ადგილი დისკზე. უკან გადახვევის მომარაგება მიუწვდომელია უდანაკარგო ჩაწერისას."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="ნამდვილად გსურთ უდანაკარგო ხარისხის მითითება?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="გაფრთხილება უდანაკარგო ხარისხის შესახებ!"
 Basic.Settings.Output.Simple.Encoder.Software="პროგრამული (x264)"
@@ -822,9 +835,9 @@
 Basic.Settings.Output.EncoderPreset.veryfast="%1 (ნაგულისხმევი) (პროცესორის ზომიერად დატვირთვა, საშუალო ხარისხი)"
 Basic.Settings.Output.EncoderPreset.fast="%1 (პროცესორის მეტად დატვირთვა, მაღალი ხარისხი)"
 Basic.Settings.Output.CustomEncoderSettings="დამშიფრავის პარამეტრების მითითება"
-Basic.Settings.Output.CustomMuxerSettings="შემფუთავის პარამეტრების მითითება"
+Basic.Settings.Output.CustomMuxerSettings="მფუთავის პარამეტრების მითითება"
 Basic.Settings.Output.NoSpaceFileName="ფაილის სახელის შექმნა გამოტოვებული ადგილების გარეშე"
-Basic.Settings.Output.Adv.Rescale="გამოტანის ზომების შეცვლა"
+Basic.Settings.Output.Adv.Rescale="გამოტანის ზომების ცვლა"
 Basic.Settings.Output.Adv.AudioTrack="ხმოვანი ჩანაწერი"
 Basic.Settings.Output.Adv.Streaming="ნაკადი"
 Basic.Settings.Output.Adv.Streaming.Settings="ნაკადის პარამეტრები"
@@ -863,7 +876,7 @@
 Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="ვიდეოს დამშიფრავის პარამეტრები (თუ არის)"
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="ხმის დამშიფრავი"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="ხმის დამშიფრავის პარამეტრები (თუ არის)"
-Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="შემფუთავის პარამეტრები (თუ არის)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="მფუთავის პარამეტრები (თუ არის)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="საკვანძო კადრების დაშორება (კადრი)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="ყველა მშიფრავის ჩვენება (მათ შორის შეუთავსებლებისაც)"
 Basic.Settings.Output.Adv.FFmpeg.Settings="FFmpeg-ის პარამეტრები"
@@ -921,9 +934,9 @@
 Basic.Settings.Video.Renderer="დამმუშავებელი"
 Basic.Settings.Video.InvalidResolution="გაფართოების არასწორი მნიშვნელობა. უნდა იყოს widthxheight (მაგ. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="მიმდინარეობს ვიდეოს გამოტანა. გთხოვთ, გათიშოთ ყველა გამოტანილი სიგნალი, ვიდეოს პარამეტრების ჩასასწორებლად."
-Basic.Settings.Video.DownscaleFilter.Bilinear="ორხაზოვანი (უსწრაფესი, მაგრამ ბუნდოვანი მასშტაბირება)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="ბიკუბური (მკვეთრი მასშტაბირება, 16 შერჩევა)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (მკვეთრი მასშტაბირება, 36 შერჩევა)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="ორხაზოვანი (უსწრაფესი, მაგრამ ბუნდოვანი ზომაცვლა)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="ბიკუბური (მკვეთრი ზომაცვლა, 16 შერჩევა)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (მკვეთრი ზომაცვლა, 36 შერჩევა)"
 Basic.Settings.Video.DownscaleFilter.Area="სივრცული (შეწონილი ჯამი, 4/6/9 შერჩევა)"
 Basic.Settings.Audio="ხმა"
 Basic.Settings.Audio.SampleRate="შერჩევის სიხშირე"
@@ -936,8 +949,8 @@
 Basic.Settings.Audio.PeakMeterType="ხმის სიმაღლის მზომის სახეები"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="გამარტივებული"
 Basic.Settings.Audio.PeakMeterType.TruePeak="ზუსტი (პროცესორის მაღალი მოხმარებით)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="გაფრთხულება: ჩართულია მოცულობითი ხმა."
-Basic.Settings.Audio.MultichannelWarning="ნაკადის გაშვებისას გადაამოწმეთ, მომსახურების მომწოდებელი, იძლევა თუ არა მოცულობითი ხმოვანი სიგნალის როგორც მიღების, ასევე მოსმენის შესაძლებლობას. ერთ-ერთი მაგალითია Facebook 360 Live, სადაც სრულადაა მხარდაჭერილი მოცულობითი ხმოვანი სიგნალი. ხოლო Facebook Live და YouTube Live, მიუხედავად იმისა, რომ ორივე იღებს მოცულობით ხმოვან სიგნალს, Facebook Live გარდაქმნის მას სტერეო-სიგნალად, ხოლო YouTube Live უშვებს მხოლოდ ორი არხით.\n\nOBS-ის ხმოვანი ფილტრები თავსებადია მოცულობით ხმოვან სიგნალთან, მაგრამ VST-მოდულის მხარდაჭერა, შესაძლოა არ იყოს უზრუნველყოფილი."
+Basic.Settings.Audio.MultichannelWarning.Enabled="გაფრთხილება: ჩართულია მოცულობითი ხმა."
+Basic.Settings.Audio.MultichannelWarning="ნაკადის გაშვებისას გადაამოწმეთ, მომსახურების მომწოდებელი იძლევა თუ არა მოცულობითი ხმოვანი სიგნალის როგორც მიღების, ასევე მოსმენის საშუალებას. მაგალითად, Facebook 360 Live სრულად უჭერს მხარს მოცულობითი ხმის გამოყენებას; YouTube Live შეძლებს მიიღოს 5.1 ხმოვანი სიგნალი (და გაუშვას ტელევიზორში).\n\nOBS-ის ხმოვანი ფილტრები თავსებადია მოცულობით ხმოვან სიგნალთან, მაგრამ VST-მოდულის მხარდაჭერა შეიძლება არ იყოს უზრუნველყოფილი."
 Basic.Settings.Audio.MultichannelWarning.Title="ჩაირთოს მოცულობითი ხმოვანი სიგნალი?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="ნამდვილად გსურთ, ჩართოთ მოცულობითი ხმოვანი სიგნალი?"
 Basic.Settings.Audio.Devices="საერთო ხმის მოწყობილობები"
@@ -984,7 +997,6 @@
 Basic.Settings.Advanced.FormatWarning="გაფრთხილება: ფერთა სახეობები, გარდა NV12/P010, ძირითადად განკუთვნილია ჩაწერისთვის და არა ეთერში გასასვლელად. ნაკადის ეთერში გაშვებისას, ფერთა სახეების მუდმივმა გარდაქმნამ, შესაძლოა გამოიწვიოს პროცესორის ზედმეტად დატვირთვა."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="გაფრთხილება: მაღალი სიზუსტის ფორმატები უფრო ხშირად გამოიყენება HDR ფერთა სივრცეებში."
 Basic.Settings.Advanced.FormatWarning2100="გაფრთხილება: Rec. 2100 მეტი სიზუსტის ფორმატს უნდა იყენებდეს."
-Basic.Settings.Advanced.Audio.BufferingTime="ხმის ბუფერის დრო"
 Basic.Settings.Advanced.Video.ColorFormat="ფერთა ფორმატი"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-ბიტიანი, 4:2:0, 2-განზომილებიანი)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-ბიტიანი, 4:2:0, 3-განზომილებიანი)"
@@ -1010,6 +1022,7 @@
 Basic.Settings.Advanced.Network="ქსელი"
 Basic.Settings.Advanced.Network.Disabled="ამჟამად მითითებული ნაკადის ოქმი არ იძლევა ქსელის პარამეტრების ცვლილების საშუალებას."
 Basic.Settings.Advanced.Network.BindToIP="დაკავშირება IP-მისამართზე"
+Basic.Settings.Advanced.Network.IPFamily="IP-ჯგუფი"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="ქსელის გამოყენების გაუმჯობესება"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCP-კავშირების გამართვა"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="მცდელობა, RTMP-გამოტანა იყოს მეტად თავსებადი დაყოვნებაზე დამოკიდებულ სხვა პროგრამებთან ქსელში, გადაცემის სიხშირის მოწესრიგებით.\nამან შესაძლოა გაზარდოს კადრების გამოტოვების ალბათობა, არამდგრადი კავშირებისას."
@@ -1072,6 +1085,8 @@
 SceneItemShow="გამოჩნდეს „%1“"
 SceneItemHide="დაიმალოს „%1“"
 OutputWarnings.NoTracksSelected="უნდა მიუთითოთ ერთი ხმოვანი ჩანაწერი მაინც"
+OutputWarnings.NoTracksSelectedOnExit.Title="გამოტანის პარამეტრების შეცდომა"
+OutputWarnings.NoTracksSelectedOnExit.Text="თითოეული გამოტანისთვის ერთი ხმოვანი ჩანაწერი მაინც უნდა იყოს მითითებული."
 OutputWarnings.MP4Recording="გაფრთხილება: MP4/MOV სახით შენახული ჩანაწერები ვეღარ აღდგება, მუშაობის შეწყვეტის შემთხვევაში (მაგ. ლურჯი ეკრანის ამოგდებისას, ძაბვის ვარდნისას და ა.შ.). თუ გსურთ რამდენიმე ხმოვანი ფაილის ჩაწერა, სასურველია ამისთვის გამოიყენოთ MKV და დასრულების შემდეგ გადაფუთოთ MP4/MOV-ფაილად. (ფაილი → ჩანაწერების გადაფუთვა)"
 OutputWarnings.CannotPause="შენიშვნა: ჩაწერა ვერ შეჩერდება, თუ ჩაწერისთვის მითითებულია „(ნაკადის დამშიფრავის გამოყენება)“"
 OutputWarnings.CodecIncompatible="ხმისა და ვიდეოს დამშიფრავების შერჩევა გაუქმებულია შეუთავსებლობის გამო. გთხოვთ, მიუთითოთ თავსებადი დამშიფრავი სიიდან."
@@ -1097,6 +1112,7 @@
 About.GetInvolved="ჩაერთეთ შემუშავებაში"
 About.Authors="შემქმნელები"
 About.License="ლიცენზია"
+About.Error="შეცდომა! ფაილის წაკითხვა ვერ მოხერხდა.\n\nიხილეთ: %1"
 About.Contribute="მხარი დაუჭირეთ OBS-პროექტს"
 AddUrl.Title="წყაროს დამატება ბმულიდან"
 AddUrl.Text="ბმული გადმოტანილია OBS-ში. შედეგად, ბმული წყაროს სახით დაემატება. გსურთ, განაგრძოთ?"
@@ -1118,14 +1134,12 @@
 LoadProfileNeedsRestart="პროფილი შეიცავს პარამეტრებს, რომლებიც საჭიროებს, ახლიდან გაეშვას OBS:\n%1\n\nგსურთ, ხელახლა ჩაირთოს OBS ამ პარამეტრების ასამოქმედებლად?"
 ContextBar.NoSelectedSource="წყარო არაა შერჩეული"
 ContextBar.ResetTransform="გარდაქმნის გაუქმება"
-ContextBar.FitToCanvas="ფონზე მორგება"
 ContextBar.MediaControls.PlayMedia="მასალის გაშვება"
 ContextBar.MediaControls.PauseMedia="გაშვებულის შეჩერება"
 ContextBar.MediaControls.StopMedia="გაშვებულის შეწყვეტა"
 ContextBar.MediaControls.RestartMedia="მასალის ხელახლა გაშვება"
 ContextBar.MediaControls.PlaylistNext="მომდევნო, სიაში"
 ContextBar.MediaControls.PlaylistPrevious="წინა, სიაში"
-ContextBar.MediaControls.MediaProperties="მასალის თვისებები"
 ContextBar.MediaControls.BlindSeek="მასალის ძიების ხელსაწყო"
 YouTube.Auth.Ok="შესვლა წარმატებით დამოწმდა.\nშეგიძლიათ დახუროთ ეს გვერდი."
 YouTube.Auth.NoCode="შესვლა ვერ დამოწმდა."
@@ -1207,3 +1221,5 @@
 YouTube.Errors.liveChatEnded="პირდაპირი ეთერი დასრულებულია."
 YouTube.Errors.messageTextInvalid="ნაწერი გაუმართავია."
 YouTube.Errors.rateLimitExceeded="ზედმეტად სწრაფად აგზავნით."
+YouTube.DocksRemoval.Title="YouTube-ბრაუზერის მოძველებული ნაწილების მოცილება"
+YouTube.DocksRemoval.Text="ბრაუზერის ეს ნაწილები მოცილდება, როგორც მოძველებული:\n\n%1\nსანაცვლოდ იხილეთ „იერსახის ნაწილები/YouTube Live Control Room“."

obs-studio-29.1.3.tar.xz/UI/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/kab-KAB.ini Changed

@@ -92,7 +92,6 @@
 LogViewer="Wali aɣmmis"
 ShowOnStartup="Sken di tnekra"
 OpenFile="Ldi afaylu"
-AddValue="Rnu %1"
 AddSource="Rnu aɣbalu"
 AlreadyRunning.Title="OBS itteddu yakan"
 AlreadyRunning.Text="OBS itteddu yakan! Ma yella ur teɛmideḍ ara i waya, ttxil-k msens kra n tummanin n OBS send ad tɛerḍeḍ ad tsekkereḍ tummant tamaynutt. Ma tesɛiḍ OBS yettusɣewren ɣer talɣa taddayt di teɣzut n telɣa, ttxil-k m selken ma yella itteddu dina."
@@ -152,7 +151,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Yugen..."
 Basic.AutoConfig.StreamPage.Server="Aqeddac"
 Basic.AutoConfig.StreamPage.StreamKey="Tasarut n usuddem"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Aseɣwen)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Smenyif asettengel n warrum"
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Alɣu n usuddem"
 Basic.AutoConfig.TestPage="Igmaḍ n taggara"
@@ -190,13 +188,9 @@
 Updater.UpdateNow="Leqqem Tura"
 Updater.RemindMeLater="Smekti-yi-d areḍqal"
 Updater.Skip="Ttu lqem"
-Updater.Running.Title="Ahil itteddu akka tura"
-Updater.Running.Text="Llant tuffɣiwin turmidin akka tura, ma ulac uɣilif sens kra tuffɣiwin turmidin send ad tɛerḍeḍ ad tleqqemeḍ"
 Updater.NoUpdatesAvailable.Title="Ulac ileqman iwejden"
 Updater.NoUpdatesAvailable.Text="Ulac ileqman iwejden akka tura"
 Updater.FailedToLaunch="Ulamek asekker n uleqqem"
-Updater.GameCaptureActive.Title="Tuṭṭfa n wurar termed"
-Updater.GameCaptureActive.Text="Tamkarḍit n tuṭṭfa n wuraren « hook » tettwaseqdac akka tura. Ma ulac uɣilif sens kra n wuraren/wahilen i yettwaṭṭafen akka tura (neɣ ales asekker n Windows) sakin eɛreḍ tikkelt-nniḍen."
 QuickTransitions.DuplicateScene="Sisleg asayes"
 QuickTransitions.EditProperties="Sisleg iɣbula"
 QuickTransitions.HotkeyName="Asaka arurad: %1"
@@ -266,8 +260,6 @@
 Remux.FileExists="Ifuyla-agi inicanen llan yakan. Tebɣiḍ ad ten-tsemselsiḍ?"
 Remux.HelpText="Sers ifuyla deg usfaylu-agi akken ad ten-tselkteḍ, neɣ fren tabniqt \"Asekles OBS\" akken ad tnadiḍ afaylu."
 MissingFiles.NewFile="Afaylu amaynut"
-UpdateAvailable="Yewjed lqem amaynut"
-UpdateAvailable.Text="Lqem %1.%2.%3 yewjed tura. <a href='%4'>Ssit dagi akken ad t-tsidreḍ</a>"
 Basic.DesktopDevice1="Ameslaw n tnarit"
 Basic.DesktopDevice2="Ameslaw n tnarit 2"
 Basic.Scene="Asayes"
@@ -416,9 +408,7 @@
 Basic.MainMenu.Edit.AdvAudio="Ir&aten inaẓiyen n uvidyu"
 Basic.MainMenu.View="Tamuɣli (&V)"
 Basic.MainMenu.View.Toolbars="Afeggag n yifecka (&T)"
-Basic.MainMenu.View.ListboxToolbars="Tiqeffalin n tebdart Asayes/Aɣbalu"
 Basic.MainMenu.View.ContextBar="Afeggag n yifecka Iɣbula"
-Basic.MainMenu.View.SceneTransitions="Asaka n yisuyas (&C)"
 Basic.MainMenu.View.SourceIcons="T&ignitin n uɣbalu"
 Basic.MainMenu.View.StatusBar="Afeggag n waddad (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Agrudem n ugdil aččuran"
@@ -429,7 +419,6 @@
 Basic.MainMenu.SceneCollection.Import="Kter talkensit n yisuyas"
 Basic.MainMenu.SceneCollection.Export="Sifeḍ talkensit n yisuyas"
 Basic.MainMenu.Profile.Exists="Amaɣnu yella yakan"
-Basic.MainMenu.SceneCollection.Exists="Talkensit n yisuyas tella yakan"
 Basic.MainMenu.Tools="Ifecka (&T)"
 Basic.MainMenu.Help="Tallelt (&H)"
 Basic.MainMenu.Help.HelpPortal="Tawwurt n tallelt (&P)"
@@ -485,7 +474,6 @@
 Basic.Settings.General.MultiviewLayout.Vertical.Right="Ubdid, Ayfus (8 n yisuyas)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Aglawan, Afella (24 n yisuyas)"
 Basic.Settings.Stream="Asuddem"
-Basic.Settings.Stream.StreamType="Anaw n usuddem"
 Basic.Settings.Stream.Custom.UseAuthentication="Seqdec asesteb"
 Basic.Settings.Stream.Custom.Username="Isem n useqdac"
 Basic.Settings.Stream.Custom.Password="Awal uffir"
@@ -505,7 +493,6 @@
 Basic.Settings.Output="Tuffɣa"
 Basic.Settings.Output.Format="Amasal n usekles"
 Basic.Settings.Output.SelectDirectory="Fren akaram n usekles"
-Basic.Settings.Output.SelectFile="Fren afaylu n usekles"
 Basic.Settings.Output.Mode="Askar n tuffɣa"
 Basic.Settings.Output.Mode.Simple="Aḥerfi"
 Basic.Settings.Output.Mode.Adv="Anaẓi"
@@ -675,14 +662,12 @@
 NeedsRestart="OBS Studio yesra ad yales tanekra. Tebɣiḍ ad talseḍ asekker tura?"
 ContextBar.NoSelectedSource="Ulac aɣbalu yettwafernen"
 ContextBar.ResetTransform="Ales awennez n uselket"
-ContextBar.FitToCanvas="Sezg ɣer teɣzut n usuneɣ"
 ContextBar.MediaControls.PlayMedia="Ɣer amidya"
 ContextBar.MediaControls.PauseMedia="Ḥbes amidya"
 ContextBar.MediaControls.StopMedia="Seḥbes amidya"
 ContextBar.MediaControls.RestartMedia="Ales asekker n umidya"
 ContextBar.MediaControls.PlaylistNext="Uḍfir di tebdart n tɣuri"
 ContextBar.MediaControls.PlaylistPrevious="D uzwir di tebdart n tɣuri"
-ContextBar.MediaControls.MediaProperties="Iraten n umidya"
 ContextBar.MediaControls.BlindSeek="Awiǧit n tunigin deg umidya"
 YouTube.Actions.Title="Azwel*"
 YouTube.Actions.Description="Aglam"

obs-studio-29.1.3.tar.xz/UI/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/kmr-TR.ini Changed

@@ -93,7 +93,6 @@
 LogViewer="Nîşanderê têketinê"
 ShowOnStartup="Li ser destpêkirinê nîşan bide"
 OpenFile="Pelê veke"
-AddValue="Tevlî bike %1"
 AddSource="Çavkanî tevlî bike"
 RemoveScene="Dîmena hilbijartî rake"
 RemoveSource="Dîmenên hilbijartî rake"
@@ -177,7 +176,6 @@
 Basic.AutoConfig.StreamPage.Server="Rajekar"
 Basic.AutoConfig.StreamPage.StreamKey="kilîdê weşanê"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: borînpeyva şîfrekirinê têxe.\nRTMP: kilîta ku ji aliyê rajeyên ve hatiye peydakirin têxe.\nSRT: ku raje yekê bi kar tîne nasnameya weşanê têxe."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Girêdan)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kilîdê şîfreker"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Ajimêrên girêdayî"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Pîvandina rêjeya herîkê bi riya karanîna kontrolkirina leza înternetê (dibe ku hin çend xulekan dirêj bike)"
@@ -230,8 +228,6 @@
 Updater.UpdateNow="Niha rojane bike"
 Updater.RemindMeLater="Paşê bîne bîra min"
 Updater.Skip="Guhertoyê derbas bike"
-Updater.Running.Title="Bername niha çalak e"
-Updater.Running.Text="Deran niha çalak in, jkx re çi deran çalak hebê bigire berî ku hewl bidî bo nûvekirinê"
 Updater.NoUpdatesAvailable.Title="Tu rojanekirin tune ne"
 Updater.NoUpdatesAvailable.Text="Niha tu rojanekirin tune ne"
 Updater.BranchNotFound.Title="Kanala rojanekirinê hate rakirin"
@@ -241,8 +237,6 @@
 Updater.RepairConfirm.Title="Kontrola destpakiyê bipejirîne"
 Updater.RepairConfirm.Text="Destpêkirina kontrolkirina destpakiyê wê sazkirina OBS a te bişopîne ji bo pelên têkçûyî û pelên şikestî/guhertî ji nû ve daxînne. Dibe ku ev demekê bidome.\n\nTu dixwazî bidomînî?"
 Updater.FailedToLaunch="Vekirina rojaneker bi ser neket"
-Updater.GameCaptureActive.Title="Girtina lîstikê çalak e"
-Updater.GameCaptureActive.Text="Pirtûkxaneya girtina lîstika niha tê bikaranîn. Ji kerema xwe her lîstik/bername têne girtin bigire (an Windows-ê ji nû ve dest pê bike) û dîsa biceribîne."
 QuickTransitions.SwapScenes="Di navbera dîmenên pêşdîtin/bername de biguherîne piştî pêvajoya derbasbûnê"
 QuickTransitions.SwapScenesTT="Di navbera dîmenên pêşdîtin û bername de diguherîne piştî pêvajoya derbasbûnê (heke bernameyên dîmenê resen hebin hebê.\nEv wê guhartinên ku te li ser dîmenê bernameyên resen pêk aniye venagerînê."
 QuickTransitions.DuplicateScene="Dîmenê cêwî bike"
@@ -340,7 +334,6 @@
 Output.ConnectFail.Disconnected="Girêdan ji rajekar ve qut bû."
 Output.StreamEncodeError.Title="Çewtiya kodkirinê"
 Output.StreamEncodeError.Msg="Di dema weşanê de çewtiyeke kodkirinê çêbû."
-Output.StreamEncodeError.Msg.LastError="Di dema weşanê de çewtiyeke kodker çêbû:\n\n%1"
 Output.RecordFail.Title="Destpêkirina tomarkirinê têkçû"
 Output.RecordFail.Unsupported="Formata deranê an nayê piştgirîkirin an jî ji herîkek bêtir piştgirî nade. Jkx sazkariyên xwe kontrol bike û dîsa biceribîne."
 Output.RecordNoSpace.Title="Cihê dîskê têrê nake"
@@ -348,7 +341,6 @@
 Output.RecordError.Title="Çewtiya tomarkirinê"
 Output.RecordError.Msg="Di dema tomarkirinê de çewtiyeke nediyar çêbû."
 Output.RecordError.EncodeErrorMsg="Di dema tomarkirinê de çewtiyeke kodker çêbû."
-Output.RecordError.EncodeErrorMsg.LastError="Di dema weşanê de çewtiyeke kodker çêbû:\n\n%1"
 Output.BadPath.Title="Riya pelê çewt e"
 Output.BadPath.Text="Riya tomarkirinê ya pevsazkirî nehate vekirin. Ji kerema xwe rêgeha tomarkirin kontrol bike di beşa Sazkarî → Deran → Tomarkirin."
 Output.NoBroadcast.Title="Weşan çê nebû"
@@ -396,7 +388,6 @@
 MissingFiles.AutoSearchText="OBS pelên lihevhatî ji bo pelên windayî di vê rêgehê de dîte. Tu dixwî wan tevlî bikî?"
 MissingFiles.NoMissing.Title="Kontrolkirina pelên windayî"
 MissingFiles.NoMissing.Text="Nayê xuyakirin ku tu pel windabûne"
-MacPermissions.Title="Mafdana sepanê binirxîne"
 MacPermissions.Description="OBS Studio mafdayîna te daxwaz dike ku tu bikaribî hinek taybetmendiyan pêkan bin. Tê pêşniyar kirin ku van mafdayînan çalak bikî, lê ne pêdivî ye ku ew sepan were bikaranîn. Tu dikarî her dem wan paşê çalak bikî."
 MacPermissions.Description.OpenDialog="Tu dikarî vê gotûbêjê ji menuya OBS Studio ji nû ve vekî"
 MacPermissions.AccessGranted="Mafê gihîştinê hate dayîn"
@@ -411,8 +402,6 @@
 MacPermissions.Item.Accessibility="Gihiştin"
 MacPermissions.Item.Accessibility.Details="Ji bo ku kurteyên klavyeyê (bişkokên germ) bixebitîne dema ku sepanên din balê dikişînin, ji kerema xwe vê mafdayînê çalak bike."
 MacPermissions.Continue="Bidomîne"
-UpdateAvailable="Rojanekirina nû heye"
-UpdateAvailable.Text="Guhertoya %1.%2.%3 niha peyda dibe. <a href='%4'> li vir bitikîne bo daxistinê</a>"
 Basic.DesktopDevice1="Dengê sermaseyê"
 Basic.DesktopDevice2="Dengê sermaseyê 2"
 Basic.Scene="Dîmen"
@@ -577,9 +566,6 @@
 Basic.VCam.VirtualCamera="Kameraya rastekî"
 Basic.VCam.OutputType="Cureya deranê"
 Basic.VCam.OutputSelection="Hilbijartina deranê"
-Basic.VCam.Internal="Navxweyî"
-Basic.VCam.InternalDefault="Derana bernameyê (Berdest)"
-Basic.VCam.InternalPreview="Pêşdîtina deranê"
 Basic.MainMenu.File="Pel (&F)"
 Basic.MainMenu.File.Export="D&erxistin"
 Basic.MainMenu.File.Import="Têx&istin"
@@ -620,9 +606,7 @@
 Basic.MainMenu.Edit.AdvAudio="T&aybetiyên pêşketî yên dengê"
 Basic.MainMenu.View="Dîtin (&V)"
 Basic.MainMenu.View.Toolbars="Alavdank (&T)"
-Basic.MainMenu.View.ListboxToolbars="Bişkokên rêzoka Çavkanî/Dîmen"
 Basic.MainMenu.View.ContextBar="Alavdankê çavkaniyan"
-Basic.MainMenu.View.SceneTransitions="Derbasbûnên dîmenê (&C)"
 Basic.MainMenu.View.SourceIcons="Sembolê çavkan&iyan"
 Basic.MainMenu.View.StatusBar="Darika rewşê (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Navrûya dîmendera tije"
@@ -639,7 +623,6 @@
 Basic.MainMenu.SceneCollection.Import="Berhevoka dîmenan têxe"
 Basic.MainMenu.SceneCollection.Export="Berhevoka dîmenan derxe"
 Basic.MainMenu.Profile.Exists="Profîl jixwe heye"
-Basic.MainMenu.SceneCollection.Exists="Berhevoka dîmenan jixwe heye"
 Basic.MainMenu.Tools="Alav (&T)"
 Basic.MainMenu.Help="Alîkarî (&H)"
 Basic.MainMenu.Help.HelpPortal="Alîkariya dergevan (&P)"
@@ -722,7 +705,6 @@
 Basic.Settings.General.ChannelName.beta="Beta / Namzetên weşanê"
 Basic.Settings.General.ChannelDescription.beta="Guhertoyên pêş-weşanê yên potansiyel ne stabîl in"
 Basic.Settings.Stream="Weşan"
-Basic.Settings.Stream.StreamType="Cureya weşanê"
 Basic.Settings.Stream.Custom.UseAuthentication="Rastandinê bi kar bîne"
 Basic.Settings.Stream.Custom.Username="Navê bikarhêneriyê"
 Basic.Settings.Stream.Custom.Password="Pêborîn"
@@ -754,7 +736,6 @@
 Basic.Settings.Output.Encoder.Video="Kodkerê vîdyo"
 Basic.Settings.Output.Encoder.Audio="Kodkerê dengê"
 Basic.Settings.Output.SelectDirectory="Peldanka tomarkirinê hilbijêre"
-Basic.Settings.Output.SelectFile="Pelê tomarkirinê hilbijêre"
 Basic.Settings.Output.DynamicBitrate="Rêjeya bitê biguherîne da ku bargiraniyê birêve bibe"
 Basic.Settings.Output.DynamicBitrate.Beta="Rêjaya bît biguherîne da ku bargiraniyê birêve bibe (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Li şûna ku çarçoveyên kêmkirina tevliheviyê kêm bike, bi awayekî dînamîk bitrate di firînê de diguherîne.\n\nNîşe ku heke ji nişka ve tevliheviyek mezin hebe ev dikare derengbûnê li temaşevanan zêde bike.\nDema ku rêjeya bît dakeve, ji bo sererastkirinê dikare heta çend deqeyan berdewam bike.\n\nNiha tenê ji bo RTMP tê piştgirî kirin."
@@ -782,7 +763,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Hişyarî: Ku kalîteya tomarkirinê ku wekî \"wekî weşanê\" hatiye sazkirin, tomarkirin nayê rawestandin bi awayekî demkî."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Hişyarî: Formata tomarkirinê heyî ya hilbijartî bi (kodkera) weşanê a hilbijartî re ne lihevhatî ye."
 Basic.Settings.Output.Simple.Warn.Encoder="Hişyarî: Tomarkirin bi riya bernameyeke kodker di kalîteyeke cuda ji weşanê, dibe sedema ku CPU bêtir werê bikaranîn heke di heman demê tu weşan û tomarkirinê tê bi rê ve bibî."
-Basic.Settings.Output.Simple.Warn.Lossless="Hişyarî: Kalîteya bêkêmasî mezinahiya mezin a pelan çê dike! Kalîteya bêkêmasî dikare 7 gigabayt cihê dîskê di her xulekekê li gor çareseriya bilind û rêjeya çarçoveyê bi kar bînê. Ku cihê dîskê pir mezin tune bê, ji bo tomarên dirêj nayê pêşniyarkirin."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Tu bawer î ku tu dixwazî kalîteya bêkêmasî bi kar bîne?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Hişyariya kalîteya bêkêmasî!"
 Basic.Settings.Output.Simple.Encoder.Software="Nermalav (x264)"
@@ -929,8 +909,7 @@
 Basic.Settings.Audio.PeakMeterType="Cureya metre ya serî"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Mînaka serî"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Bikaranîna CPU ya bilind)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="HIŞYARÎ: Denga derdorê hatiye çalakkirin."
-Basic.Settings.Audio.MultichannelWarning="Ger bilivîne, binihêrin ka xizmeta te ya weşan hem dengê dorpêç dike û hem jî lêdanka deng dorpêç dike yan na. Facebook 360 Live yek mînak e ku dengê dorpêçê bi tevahî tê piştgirî kirin. Her çiqas Facebook Live û YouTube Live her du dorpêçê qebûl bikin, Facebook Live downmixs li stereo, û YouTube Live tenê du kanalan dilîze.\n\nOBS parzûnên deng bi dengê dorpêçê re hevgirtî ne, lê piştgiriya pêveka VST ne garantî ye."
+Basic.Settings.Audio.MultichannelWarning.Enabled="HIŞYARÎ: Denga derdorê hatiye çalakkirin."
 Basic.Settings.Audio.MultichannelWarning.Title="Denga derdorê çalak bike?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Ma tu dixwazî denga derdorê çalak bikî?"
 Basic.Settings.Audio.Devices="Amûrên dengê yên gerdûnî"
@@ -976,7 +955,6 @@
 Basic.Settings.Advanced.FormatWarning="Hişyarî: Formatên rengan ên ji bilî NV12/P010 di serî de ji bo tomarkirinê têne armanckirin, û di dema weşanê de nayê pêşniyarkirin. Weşan dibe sedema pirbûna karanîna YKN ji ber guhertina formatên rengan."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Hişyarî: Formatên pêbawer bi gelemperî bi cihên rengê HDR re têne bikaranîn."
 Basic.Settings.Advanced.FormatWarning2100="Hişyarî: Rec. 2100 divê formateke lihevhatî bi kar bîne."
-Basic.Settings.Advanced.Audio.BufferingTime="Dema pêşbîra demkî ya dengê"
 Basic.Settings.Advanced.Video.ColorFormat="Formata rengê"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 duz)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 duz)"
@@ -1112,14 +1090,12 @@
 LoadProfileNeedsRestart="Di profîlê de sazkarî hene ku pêdiviya bi ji nû ve destpêkirina OBS dike :\n%1\n\n Ma tu dixwazî OBS ji nû ve bidî destpêkirin ji bo ku ev sazkarî bi bandorbar be?"
 ContextBar.NoSelectedSource="Ti çavkanî nehate hilbijartin"
 ContextBar.ResetTransform="Guherandinê ji nû ve saz bike"
-ContextBar.FitToCanvas="Li gor tabloyê guncav bike"
 ContextBar.MediaControls.PlayMedia="Medya lê de"
 ContextBar.MediaControls.PauseMedia="Medya rawestîne"
 ContextBar.MediaControls.StopMedia="Medya bi dawî bike"
 ContextBar.MediaControls.RestartMedia="Medya ji nû ve dest pê bike"
 ContextBar.MediaControls.PlaylistNext="A pêş di rêzoka lêdanan de"
 ContextBar.MediaControls.PlaylistPrevious="A paş di rêzoka lêdanan de"
-ContextBar.MediaControls.MediaProperties="Taybetmendiyên medyayê"
 ContextBar.MediaControls.BlindSeek="Alava lêgerînê bo medyayê"
 YouTube.Auth.Ok="Mafdayîn bi awayekî serkeftî qediya.\nTu niha dikarî vê rûpelê bigire."
 YouTube.Auth.NoCode="Pêvajoya mafdayînê ne qediya ye."

obs-studio-29.1.3.tar.xz/UI/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ko-KR.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="로그 보기"
 ShowOnStartup="시작 시 보기"
 OpenFile="파일 열기"
-AddValue="%1 추가"
 AddSource="소스 추가"
 RemoveScene="선택한 장면 제거"
 RemoveSource="선택한 소스 제거"
@@ -107,11 +106,19 @@
 SourceFilters="소스 필터 열기"
 MixerToolbarMenu="오디오 믹서 메뉴"
 SceneFilters="장면 필터 열기"
+List="목록"
+Grid="격자"
 PluginsFailedToLoad.Title="플러그인 로딩 오류"
 PluginsFailedToLoad.Text="다음 플러그인을 로딩하는데 실패했습니다:\n\n%1\n이 플러그인을 업데이트 하거나 삭제하십시오."
 AlreadyRunning.Title="OBS가 이미 실행 중입니다"
 AlreadyRunning.Text="OBS가 이미 실행 중입니다! 의도한 것이 아니라면 새로운 OBS를 실행하기 전에 이미 동작 중인 프로그램을 종료하십시오. OBS가 시스템 트레이에 최소화되어 있는지도 확인하십시오."
 AlreadyRunning.LaunchAnyway="경고를 무시하고 실행"
+AutoSafeMode.Title="안전 모드"
+AutoSafeMode.Text="이전 세션이 정상적으로 종료되지 않았습니다.\n\n안전모드에서 시작하시겠습니까? (3자 제공 플러그인, 스크립트, 웹소켓 꺼짐)"
+AutoSafeMode.LaunchSafe="안전 모드로 실행"
+AutoSafeMode.LaunchNormal="일반 모드로 실행"
+SafeMode.Restart="안전모드에서 OBS를 다시 시작하시겠습니까? (3자 제공 플러그인, 스크립트, 웹소켓 꺼짐)"
+SafeMode.RestartNormal="OBS를 일반 모드로 다시 실행하시겠습니까?"
 ChromeOS.Title="지원하지 않는 플랫폼"
 ChromeOS.Text="OBS가 ChromeOS 컨테이너 안에서 작동 중입니다. 이 플랫폼은 지원되지 않습니다."
 Wine.Title="Wine 감지됨"
@@ -179,8 +186,8 @@
 Basic.AutoConfig.StreamPage.Server="서버"
 Basic.AutoConfig.StreamPage.StreamKey="스트림 키"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: 암호화 구문을 입력하십시오. \nRTMP: 서비스에서 제공하는 키를 입력하십시오. \nSRT: 서비스에서 사용하는 streamid가 있다면 입력하십시오."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(링크)"
 Basic.AutoConfig.StreamPage.EncoderKey="인코더 키"
+Basic.AutoConfig.StreamPage.BearerToken="Bearer 토큰"
 Basic.AutoConfig.StreamPage.ConnectedAccount="연결된 계정"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="대역폭 검사로 비트레이트 계산 (몇 분 정도 걸릴 수 있음)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="하드웨어 인코딩 선호"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="지금 업데이트"
 Updater.RemindMeLater="나중에 다시 알림"
 Updater.Skip="업데이트 건너뛰기"
-Updater.Running.Title="현재 활성화된 프로그램"
-Updater.Running.Text="출력이 활성화되어 있으므로, 업데이트를 시도하기 전에 활성화되어 있는 출력을 중단해주세요."
 Updater.NoUpdatesAvailable.Title="사용 가능한 업데이트가 없습니다"
 Updater.NoUpdatesAvailable.Text="현재 사용 가능한 업데이트가 없습니다"
 Updater.BranchNotFound.Title="업데이트 채널 제거됨"
@@ -243,8 +248,6 @@
 Updater.RepairConfirm.Title="무결성 점검 확인"
 Updater.RepairConfirm.Text="무결성 점검을 시작하면 OBS 설치를 스캔하여 잘못되거나 수정된 파일들을 다시 다운로드하게 됩니다. 이 작업에는 시간이 소요됩니다.\n\n계속 하시겠습니까?"
 Updater.FailedToLaunch="업데이트 관리자를 실행할 수 없습니다"
-Updater.GameCaptureActive.Title="게임 캡쳐 기능 사용 증"
-Updater.GameCaptureActive.Text="게임 캡쳐 라이브러리가 현재 사용 중입니다. 캡쳐 중인 게임/프로그램 혹은 윈도우를 종료 후 다시 시작하세요."
 QuickTransitions.SwapScenes="전환 후 미리 보기/프로그램 장면을 교체"
 QuickTransitions.SwapScenesTT="(만약 프로그램 쪽 원본 장면이 있을 때) 전환 작업 이후 미리 보기와 프로그램 장면을 교체합니다.\n프로그램 쪽 원본 장면에서 변경한 내용은 사라지지 않습니다."
 QuickTransitions.DuplicateScene="장면 복제"
@@ -258,6 +261,8 @@
 Basic.SceneTransitions="장면 전환"
 Basic.TransitionDuration="지속 시간"
 Basic.TogglePreviewProgramMode="스튜디오 모드"
+Basic.EnablePreviewProgramMode="스튜디오 모드 켜기"
+Basic.DisablePreviewProgramMode="스튜디오 모드 끄기"
 Undo.Undo="실행 취소"
 Undo.Redo="다시 실행"
 Undo.Add="'%1' 추가"
@@ -306,6 +311,8 @@
 Undo.GroupItems="'%1'(으)로 항목 묶기"
 TransitionNameDlg.Text="화면 전환 이름을 입력하세요"
 TransitionNameDlg.Title="화면 전환 이름"
+TitleBar.SafeMode="안전 모드"
+TitleBar.PortableMode="호환성 모드"
 TitleBar.Profile="프로파일"
 TitleBar.Scenes="장면"
 NameExists.Title="해당 이름이 이미 존재합니다"
@@ -330,6 +337,7 @@
 Output.StartStreamFailed="방송을 시작하지 못했습니다"
 Output.StartRecordingFailed="녹화를 시작하지 못했습니다"
 Output.StartReplayFailed="리플레이 버퍼를 시작하지 못했습니다"
+Output.StartVirtualCamFailed="가상 카메라 시작 실패"
 Output.StartFailedGeneric="출력을 시작하지 못했습니다. 로그 파일을 확인하세요.\n\n참고: NVENC나 AMD 인코더를 사용 중이라면 드라이버가 최신 버전인지 확인하세요."
 Output.ReplayBuffer.PauseWarning.Title="일시정지 상태에서는 리플레이를 저장할 수 없습니다"
 Output.ReplayBuffer.PauseWarning.Text="경고: 녹화가 일시정지되어 있는 상태에서는 리플레이를 저장할 수 없습니다."
@@ -342,7 +350,7 @@
 Output.ConnectFail.Disconnected="서버로부터 접속이 끊겼습니다."
 Output.StreamEncodeError.Title="인코딩 오류"
 Output.StreamEncodeError.Msg="방송 중 인코더 오류가 발생했습니다."
-Output.StreamEncodeError.Msg.LastError="방송 중 인코더 오류가 발생했습니다:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="스트리밍 중 인코더 오류가 발생했습니다: %1"
 Output.RecordFail.Title="녹화에 실패했습니다"
 Output.RecordFail.Unsupported="이 출력 형식은 지원되지 않거나, 둘 이상의 오디오 트랙을 지원하지 않습니다. 설정을 확인하고 다시 시도하세요."
 Output.RecordNoSpace.Title="디스크 공간 부족"
@@ -350,7 +358,7 @@
 Output.RecordError.Title="녹화 오류"
 Output.RecordError.Msg="녹화 중 예기치 못한 오류가 발생했습니다."
 Output.RecordError.EncodeErrorMsg="녹화 중 인코더 오류가 발생했습니다."
-Output.RecordError.EncodeErrorMsg.LastError="녹화 중 인코더 오류가 발생했습니다:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="녹화 중 인코더 오류가 발생했습니다: %1"
 Output.BadPath.Title="잘못된 파일 경로"
 Output.BadPath.Text="설정한 녹화본 경로를 열 수 없습니다. 설정 → 출력 → 녹화에서 녹화 경로를 확인하세요."
 Output.NoBroadcast.Title="설정된 방송 없음"
@@ -379,6 +387,8 @@
 Remux.ExitUnfinishedTitle="Remux 변환 작업 중"
 Remux.ExitUnfinished="Remux 변환 작업이 끝나지 않았습니다. 지금 중단하면 대상 파일은 사용할 수 없는 상태가 됩니다.\n정말로 변환을 중단하시겠습니까?"
 Remux.HelpText="Remux 작업할 파일을 이 창에 드래그하거나, 비어 있는 'OBS 녹화' 칸을 눌러 파일을 지정하세요."
+Remux.NoFilesAddedTitle="Remux 작업할 파일이 추가되지 않음"
+Remux.NoFilesAdded="Remux 작업할 파일이 추가되지 않았습니다. 하나 이상의 동영상 파일을 담은 폴더를 끌어다 놓으세요."
 MissingFiles="누락된 파일"
 MissingFiles.MissingFile="누락된 파일"
 MissingFiles.NewFile="새 파일"
@@ -397,6 +407,7 @@
 MissingFiles.AutoSearchText="OBS 가 해당 디렉토리에서 누락된 파일과 일치하는 건을 발견했습니다. 추가하시겠습니까?"
 MissingFiles.NoMissing.Title="무결성 검사"
 MissingFiles.NoMissing.Text="문제가 있는 파일이 없습니다"
+MacPermissions.MenuAction="앱 권한 검토..."
 MacPermissions.Title="앱 권한 검토"
 MacPermissions.Description="OBS Studio에서 특정 기능을 제공하기 위해 권한이 필요합니다. 권한을 부여하는 것을 권장드리지만, 부여하지 않더라도 앱을 사용할 수는 있습니다. 나중에 언제든지 권한을 부여할 수 있습니다."
 MacPermissions.Description.OpenDialog="OBS Studio 메뉴에서 이 대화 상자를 다시 열 수 있습니다."
@@ -412,8 +423,8 @@
 MacPermissions.Item.Accessibility="접근성"
 MacPermissions.Item.Accessibility.Details="다른 응용프로그램에 포커스가 있을 때 키보드 단축키(핫키)가 작동하게 하려면 이 권한을 사용하도록 설정합니다."
 MacPermissions.Continue="계속"
-UpdateAvailable="새 업데이트 사용 가능"
-UpdateAvailable.Text="버전 %1.%2.%3이 나왔습니다. <a href='%4'>다운로드</a>"
+SourceLeak.Title="소스 정리 오류"
+SourceLeak.Text="장면 모음을 바꾸는 동안 문제가 발생하여 일부 소스를 불러오기 해제할 수 없습니다. 보통 플러그인이 리소스를 올바르게 송출하지 않아 문제가 발생합니다. 사용 중인 플러그인이 최신 버전인지 확인하십시오.\n\n데이터 손상을 막기 위해 OBS Studio를 종료합니다."
 Basic.DesktopDevice1="데스크탑 오디오"
 Basic.DesktopDevice2="데스크탑 오디오 2"
 Basic.AuxDevice1="마이크/Aux"
@@ -475,6 +486,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (자동 선택: %2)"
 Basic.PropertiesWindow.SelectColor="색상 지정"
 Basic.PropertiesWindow.SelectFont="글꼴 선택"
+Basic.PropertiesWindow.SelectFont.WindowTitle="글꼴을 선택하세요"
 Basic.PropertiesWindow.ConfirmTitle="설정이 변경됨"
 Basic.PropertiesWindow.Confirm="아직 저장하지 않은 변경 사항이 있습니다. 변경을 유지하겠습니까?"
 Basic.PropertiesWindow.NoProperties="설정 가능한 속성이 없음"
@@ -584,9 +596,9 @@
 Basic.VCam.VirtualCamera="가상 카메라"
 Basic.VCam.OutputType="출력 유형"
 Basic.VCam.OutputSelection="출력 선택"
-Basic.VCam.Internal="내부"
-Basic.VCam.InternalDefault="프로그램 출력 (기본값)"
-Basic.VCam.InternalPreview="미리보기 출력"
+Basic.VCam.OutputType.Program="프로그램 (기본값)"
+Basic.VCam.OutputSelection.NoSelection="이 출력 형식에는 선택할 항목이 없습니다"
+Basic.VCam.RestartWarning="변경 사항을 적용하기 위해 가상 카메라가 다시 시작됩니다"
 Basic.MainMenu.File="파일(&F)"
 Basic.MainMenu.File.Export="내보내기(&E)"
 Basic.MainMenu.File.Import="가져오기(&I)"
@@ -628,17 +640,18 @@
 Basic.MainMenu.Edit.AdvAudio="오디오 고급 설정(&A)"
 Basic.MainMenu.View="보기(&V)"
 Basic.MainMenu.View.Toolbars="도구 모음(&T)"
-Basic.MainMenu.View.ListboxToolbars="장면/소스 목록 버튼"
+Basic.MainMenu.View.ListboxToolbars="도구모음 도킹"
 Basic.MainMenu.View.ContextBar="소스 도구 모음"
-Basic.MainMenu.View.SceneTransitions="장면 전환(&C)"
 Basic.MainMenu.View.SourceIcons="소스 아이콘(&I)"
 Basic.MainMenu.View.StatusBar="상태 표시줄(&S)"
 Basic.MainMenu.View.Fullscreen.Interface="전체화면 인터페이스"
 Basic.MainMenu.View.ResetUI="UI 초기화(&R)"
 Basic.MainMenu.View.AlwaysOnTop="항상 맨 위(&A)"
+Basic.MainMenu.View.SceneListMode="장면 목록 방식"
 Basic.MainMenu.Docks="독(&D)"
 Basic.MainMenu.Docks.ResetDocks="독 초기화(&R)"
 Basic.MainMenu.Docks.LockDocks="독 잠그기(&L)"
+Basic.MainMenu.Docks.SideDocks="최대 높이 도킹(&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="사용자 브라우저 독(&C)..."
 Basic.MainMenu.SceneCollection="장면 모음(&S)"
 Basic.MainMenu.Profile="프로파일(&P)"
@@ -647,7 +660,6 @@
 Basic.MainMenu.SceneCollection.Import="장면 모음 가져오기"
 Basic.MainMenu.SceneCollection.Export="장면 모음 내보내기"
 Basic.MainMenu.Profile.Exists="이미 존재하는 프로파일입니다."
-Basic.MainMenu.SceneCollection.Exists="이미 존재하는 장면 모음입니다."
 Basic.MainMenu.Tools="도구(&T)"
 Basic.MainMenu.Help="도움말(&H)"
 Basic.MainMenu.Help.HelpPortal="도움말 포털(&P)"
@@ -659,8 +671,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="현재 로그 파일 올리기(&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="이전 로그 파일 올리기(&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="현재 로그 보기(&V)"
+Basic.MainMenu.Help.ReleaseNotes="릴리스 노트"
 Basic.MainMenu.Help.CheckForUpdates="업데이트 확인"
 Basic.MainMenu.Help.Repair="파일 무결성 점검"
+Basic.MainMenu.Help.RestartSafeMode="안전 모드로 다시 시작"
+Basic.MainMenu.Help.RestartNormal="일반 모드로 다시 시작"
 Basic.MainMenu.Help.CrashLogs="오류 보고서(&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="오류 보고서 보기(&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="이전 오류 보고서 전송하기(&P)"
@@ -730,7 +745,6 @@
 Basic.Settings.General.ChannelName.beta="베타 / 릴리스 후보"
 Basic.Settings.General.ChannelDescription.beta="불안정할 수 있는 사전 릴리스 버전"
 Basic.Settings.Stream="방송"
-Basic.Settings.Stream.StreamType="방송 형식"
 Basic.Settings.Stream.Custom.UseAuthentication="인증 기능 사용"
 Basic.Settings.Stream.Custom.Username="사용자 이름"
 Basic.Settings.Stream.Custom.Password="비밀번호"
@@ -762,7 +776,6 @@
 Basic.Settings.Output.Encoder.Video="비디오 인코더"
 Basic.Settings.Output.Encoder.Audio="오디오 인코더"
 Basic.Settings.Output.SelectDirectory="녹화 경로 선택"
-Basic.Settings.Output.SelectFile="녹화 파일 선택"
 Basic.Settings.Output.DynamicBitrate="네트워크 혼잡 상태를 관리하기 위해서 비트레이트를 동적으로 변경합니다"
 Basic.Settings.Output.DynamicBitrate.Beta="네트워크 혼잡 상태를 관리하기 위해 비트레이트를 동적으로 변경 (베타)"
 Basic.Settings.Output.DynamicBitrate.TT="혼잡을 줄이기 위해 프레임을 떨어뜨리는 대신, 적용 중인 비트레이트를 동적으로 조절합니다.\n\n중대한 혼잡 상태가 급작스럽게 발생할 때 시청자들이 접하는 화면이 어느 정도 지연될 수 있습니다.\n비트레이트가 감소하면 복구하는데 수 분이 소요될 수 있습니다.\n\n이 기능은 현재 RTMP에서만 지원됩니다."
@@ -790,7 +803,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="경고: 녹화 품질이 \"방송과 동일\"로 설정되어 있으면 녹화를 일시정지할 수 없습니다."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="경고: 현재 선택한 녹화 형식이 스트림 인코더와 호환되지 않습니다."
 Basic.Settings.Output.Simple.Warn.Encoder="경고: 소프트웨어 인코더로 방송과 녹화를 동시에 진행할 때, 품질 설정이 서로 다르면 CPU에 더 큰 부하가 발생합니다."
-Basic.Settings.Output.Simple.Warn.Lossless="경고: 무손실 품질로 녹화하면 파일 크기가 매우 커집니다! 해당 설정은 높은 해상도 및 프레임에서 분당 7기가바이트 이상 필요합니다. 따라서 디스크에 아주 큰 공간을 확보하지 않는 이상 장시간 녹화에는 추천하지 않습니다."
+Basic.Settings.Output.Simple.Warn.Lossless="경고: 무손실 품질로 녹화하면 파일 크기가 매우 커집니다! 해당 설정은 높은 해상도 및 프레임에서 분당 7기가바이트 이상 필요합니다. 따라서 디스크에 아주 큰 공간을 확보하지 않는 이상 장시간 녹화에는 추천하지 않습니다. 무손실 품질로 녹화하는 중에는 리플레이 버퍼를 이용할 수 없습니다."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="정말로 무손실 품질로 녹화하겠습니까?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="무손실 품질 설정 경고!"
 Basic.Settings.Output.Simple.Encoder.Software="소프트웨어 (x264)"
@@ -940,8 +953,8 @@
 Basic.Settings.Audio.PeakMeterType="피크 미터 형식"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="샘플 피크"
 Basic.Settings.Audio.PeakMeterType.TruePeak="트루 피크 (CPU 사용률 더 높음)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="경고: 서라운드 음향이 켜져 있습니다."
-Basic.Settings.Audio.MultichannelWarning="방송 중이라면 서비스에서 서라운드 음향에 대한 입력 및 재생을 지원하는지 확인하세요. Facebook 360 라이브는 해당 기능이 완전히 지원되는 곳 중 하나입니다. Facebook Live와 YouTube Live 서비스는 입력은 할 수 있지만 Facebook Live에서는 스테레오로 다운믹싱되고 YouTube Live는 2채널에서만 재생됩니다.\n\nOBS 오디오 필터는 서라운드 음향을 지원하지만 VST 플러그인 지원은 보장하지 않습니다."
+Basic.Settings.Audio.MultichannelWarning.Enabled="경고: 서라운드 음향이 켜져 있습니다."
+Basic.Settings.Audio.MultichannelWarning="방송 중이라면 서비스에서 서라운드 음향에 대한 입력 및 재생을 지원하는지 확인하세요. 예를 들어 Facebook 360 Live는 해당 기능을 완전히 지원하며, YouTube Live는 5.1채널 입력 (및 TV 재생)을 지원합니다.\n\nOBS 오디오 필터는 서라운드 음향을 지원하지만 VST 플러그인 지원은 보장하지 않습니다."
 Basic.Settings.Audio.MultichannelWarning.Title="서라운드 음향을 활성화할까요?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="정말로 서라운드 음향을 사용하겠습니까?"
 Basic.Settings.Audio.Devices="전역 오디오 장치 목록"
@@ -953,7 +966,7 @@
 Basic.Settings.Audio.AuxDevice4="마이크/Aux 오디오 4"
 Basic.Settings.Audio.EnablePushToMute="눌러서 음소거하기"
 Basic.Settings.Audio.PushToMuteDelay="음소거 시작 지연"
-Basic.Settings.Audio.EnablePushToTalk="눌러서 말하기"
+Basic.Settings.Audio.EnablePushToTalk="눌러서 말하기 활성화"
 Basic.Settings.Audio.PushToTalkDelay="말하기 시작 지연"
 Basic.Settings.Audio.UnknownAudioDevice="장치가 연결되지 않았거나 사용할 수 없음"
 Basic.Settings.Audio.Disabled="비활성화"
@@ -988,7 +1001,6 @@
 Basic.Settings.Advanced.FormatWarning="경고: NV12/P010 이외의 색상 형식은 주로 녹화를 위한 것이며, 방송에 적합하지 않습니다. 이대로 방송을 하게 되면 형식 전환을 위해 CPU 사용량이 증가할 수 있습니다."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="경고: 고정밀 형식은 HDR 색상 공간에서 더 일반적으로 사용됩니다."
 Basic.Settings.Advanced.FormatWarning2100="경고: Rec. 2100은 더 정확한 형식을 사용해야 합니다."
-Basic.Settings.Advanced.Audio.BufferingTime="오디오 버퍼링 시간"
 Basic.Settings.Advanced.Video.ColorFormat="색상 형식"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8비트, 4:2:0, 2 평면)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8비트, 4:2:0, 3 평면)"
@@ -1014,6 +1026,7 @@
 Basic.Settings.Advanced.Network="네트워크"
 Basic.Settings.Advanced.Network.Disabled="현재 선택한 스트리밍 프로토콜에서는 네트워크 설정 변경을 지원하지 않습니다."
 Basic.Settings.Advanced.Network.BindToIP="바인드할 IP"
+Basic.Settings.Advanced.Network.IPFamily="IP 체계"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="네트워크 최적화 켜기"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCP 페이싱 켜기"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="RTMP 출력의 전송 속도를 조절하여 지연 시간에 예민한 프로그램에 도움이 될 수 있도록 조율합니다.\n연결 상태가 불안정할 시 프레임이 떨어질 수 있습니다."
@@ -1078,6 +1091,8 @@
 SceneItemShow="'%1' 표시"
 SceneItemHide="'%1' 숨기기"
 OutputWarnings.NoTracksSelected="하나 이상의 트랙을 선택해야 합니다"
+OutputWarnings.NoTracksSelectedOnExit.Title="출력 설정 오류"
+OutputWarnings.NoTracksSelectedOnExit.Text="모든 출력은 최소한 한개 이상의 오디오 트랙이 선택되어 있어야 합니다"
 OutputWarnings.MP4Recording="경고: MP4/MOV로 녹화하는 경우, 녹화가 예기치 못하게 중단되면 (예시: 갑자기 컴퓨터가 꺼지거나 블루 스크린 오류가 발생하는 경우) 파일을 복구할 수 없습니다. 여러 개의 오디오 트랙을 녹화하려면 MKV로 녹화한 뒤 Remux 작업을 통해 MP4/MOV로 변환하세요. (파일 → 녹화본 Remux)"
 OutputWarnings.CannotPause="경고: 녹화 인코더가 \"(스트림 인코더 사용)\"으로 설정되어 있으면 녹화를 일시정지할 수 없습니다."
 OutputWarnings.CodecIncompatible="선택한 오디오 혹은 비디오 인코더가 호환되지 않아 초기화되었습니다. 목록에서 호환되는 인코더를 선택해주십시오."
@@ -1085,7 +1100,7 @@
 CodecCompat.CodecPlaceholder="인코더 선택..."
 CodecCompat.ContainerPlaceholder="포맷 선택..."
 CodecCompat.CodecMissingOnExit.Title="선택된 인코더 없음"
-CodecCompat.CodecMissingOnExit.Text="비디오 혹은 오디오 인코더를 선택하지 않았습니다. 녹화, 스트리밍용 인코더를 모두 선택했는지 확인하세요."
+CodecCompat.CodecMissingOnExit.Text="비디오 혹은 오디오 인코더를 선택하지 않았습니다. 녹화 및 스트리밍용 인코더를 모두 선택했는지 확인하십시오."
 CodecCompat.ContainerMissingOnExit.Title="선택된 형식 없음"
 CodecCompat.ContainerMissingOnExit.Text="녹화 형식을 선택하지 않았습니다. 선택한 스트림 인코더와 호환되는 녹화 형식을 선택하십시오."
 FinalScene.Title="장면 삭제"
@@ -1098,11 +1113,12 @@
 CustomColor="사용자 색상"
 BrowserSource.EnableHardwareAcceleration="브라우저 소스에 하드웨어 가속 활성화"
 About="정보"
-About.Info="OBS Studio는 무료 및 오픈 소스이며 비디오 녹화와 생방송을 할 수 있는 소프트웨어입니다."
+About.Info="OBS Studio는 비디오 녹화 및 실시간 스트리밍을 위한 자유 오픈소스 소프트웨어입니다."
 About.Donate="후원하기"
 About.GetInvolved="참여하기"
 About.Authors="제작자들"
 About.License="라이센스"
+About.Error="오류! 파일을 읽을 수 없습니다.\n\n이동: %1"
 About.Contribute="OBS 프로젝트를 후원하세요"
 AddUrl.Title="URL을 통해 소스 추가"
 AddUrl.Text="URL을 OBS로 가져왔습니다. 이 링크를 소스로 자동으로 추가할 것입니다. 계속할까요?"
@@ -1123,14 +1139,12 @@
 LoadProfileNeedsRestart="OBS를 재시작해야 적용되는 설정이 있습니다:\n%1\n\nOBS를 재시작하여 설정을 적용하시겠습니까?"
 ContextBar.NoSelectedSource="선택된 소스 없음"
 ContextBar.ResetTransform="변환 초기화"
-ContextBar.FitToCanvas="캔버스에 맞추기"
 ContextBar.MediaControls.PlayMedia="미디어 재생"
 ContextBar.MediaControls.PauseMedia="미디어 일시정지"
 ContextBar.MediaControls.StopMedia="미디어 정지"
 ContextBar.MediaControls.RestartMedia="미디어 다시 재생"
 ContextBar.MediaControls.PlaylistNext="재생목록 내 다음 항목"
 ContextBar.MediaControls.PlaylistPrevious="재생목록 내 이전 항목"
-ContextBar.MediaControls.MediaProperties="미디어 속성"
 ContextBar.MediaControls.BlindSeek="미디어 탐색 도구"
 YouTube.Auth.Ok="성공적으로 인증을 완료했습니다.\n이 창을 닫아도 좋습니다."
 YouTube.Auth.NoCode="인증이 완료되지 않았습니다."
@@ -1212,3 +1226,5 @@
 YouTube.Errors.liveChatEnded="실시간 스트리밍이 종료되었습니다."
 YouTube.Errors.messageTextInvalid="메시지 내용이 유효하지 않습니다."
 YouTube.Errors.rateLimitExceeded="메시지를 너무 빨리 보내고 있습니다."
+YouTube.DocksRemoval.Title="레거시 YouTube 브라우저 독 제거"
+YouTube.DocksRemoval.Text="다음 브라우저 독은 지원 중단으로 제거됩니다:\n\n%1\n대신 '독/YouTube 라이브 관제실'을 사용하세요."

obs-studio-29.1.3.tar.xz/UI/data/locale/lt-LT.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/lt-LT.ini Changed

@@ -93,7 +93,6 @@
 LogViewer="Peržiūrėti žurnalą"
 ShowOnStartup="Rodyti paleidžiant"
 OpenFile="Atidaryti failą"
-AddValue="Pridėti %1"
 AddSource="Pridėkite šaltinį"
 RemoveScene="Pašalinti pasirinktą sceną?"
 RemoveSource="Pašalinti pasirinktą šaltinį"
@@ -105,6 +104,8 @@
 SourceFilters="Atidaryti šaltinio filterius"
 MixerToolbarMenu="Garso Maišytojo Meniu"
 SceneFilters="Atidaryti šaltinio filterius"
+List="Sąrašas"
+Grid="Tinklelis"
 PluginsFailedToLoad.Title="Papildinio įkėlimo klaida"
 PluginsFailedToLoad.Text="Nepavyko įkelti šių OBS papildinių:\n\n%1\nAtnaujinkite arba pašalinkite šiuos papildinius."
 AlreadyRunning.Title="OBS jau yra ijungtas"
@@ -160,6 +161,7 @@
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Naudoti dabartinį (%1)"
 Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="Arba 60 arba 30, bet teikite pirmenybę 60 jeigu įmanoma"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="Arba 60 arba 30, bet teikti pirmenybę didesniai rezoliucijai"
+Basic.AutoConfig.VideoPage.CanvasExplanation="Pastaba: drobės (bazinė) skiriamoji geba nebūtinai sutampa su skiriamąja geba, kuria transliuosite arba įrašinėsite. Jūsų faktinė srauto ir (arba) įrašymo skiriamoji geba gali būti mažesnė už drobės skiriamąją gebą, kad būtų sumažintas išteklių naudojimas arba bitų srauto reikalavimai."
 Basic.AutoConfig.StreamPage="Transliacijos informacija"
 Basic.AutoConfig.StreamPage.SubTitle="Įveskite savo transliacijos duomenis"
 Basic.AutoConfig.StreamPage.ConnectAccount="Prijungti paskyrą (rekomenduojama)"
@@ -175,11 +177,18 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Pasirinktinis..."
 Basic.AutoConfig.StreamPage.Server="Serveris"
 Basic.AutoConfig.StreamPage.StreamKey="Transliacijos raktas"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Nuoroda)"
+Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: įveskite šifravimo slaptažodį.\nRTMP: įveskite paslaugos teikiamą raktą.\nSRT: įveskite streamid, jei paslauga jį naudoja."
+Basic.AutoConfig.StreamPage.EncoderKey="Kodavimo raktas"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Prijungta paskyra"
+Basic.AutoConfig.StreamPage.PerformBandwidthTest="Apskaičiuoti bitų perdavimo spartą naudojant pralaidumo testą (gali užtrukti kelias minutes)"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Pirmenybę teikti aparatiniam kodavimui"
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Aparatinis kodavimas pašalina didžiąją dalį procesoriaus sąnaudų, bet gali prireikti didesnės bitų perdavimo spartos tam pačiam kokybės lygiui pasiekti."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Transliacijos įspėjimas"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Atliekant pralaidumo testą į Jūsų kanalą bus transliuojami atsitiktiniai vaizdo duomenys be garso. Jei galite, rekomenduojama laikinai išjungti transliacijos įrašų išsaugojimą ir nustatyti transliaciją į privačią, kol baigsis testas. Tęsti?"
 Basic.AutoConfig.TestPage="Galutinis resultatas"
+Basic.AutoConfig.TestPage.SubTitle.Testing="Dabar programa atlieka testus idealių nustatymų parinkimui"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Testavimas baigtas"
+Basic.AutoConfig.TestPage.TestingBandwidth="Atliekamas pralaidumo testas. Tai gali užtrukti kelias minutes..."
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Prisijungiama prie: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Nepavyko prisijungti prie visų įmanomų serverių, prašome patikrinti savo interneto jungtį ir bandykite iš naujo."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Testuojamas pralaidumas: %1"
@@ -197,6 +206,8 @@
 Basic.Stats.CPUUsage="CPU naudojimas"
 Basic.Stats.HDDSpaceAvailable="Laisva disko vieta"
 Basic.Stats.MemoryUsage="Atminties naudojimas"
+Basic.Stats.AverageTimeToRender="Vidutinis kadro atvaizdavimo laikas"
+Basic.Stats.SkippedFrames="Praleisti kadrai dėl kodavimo vėlavimo"
 Basic.Stats.MissedFrames="Kadrai praleisti dėl perteikimo strigimo."
 Basic.Stats.Output.Stream="Transliacija"
 Basic.Stats.Output.Recording="Įrašymas"
@@ -206,7 +217,12 @@
 Basic.Stats.Status.Reconnecting="Persijungiama"
 Basic.Stats.Status.Inactive="Neaktyvus"
 Basic.Stats.Status.Active="Aktyvus"
+Basic.Stats.DroppedFrames="Atmesti kadrai (tinklas)"
+Basic.Stats.MegabytesSent="Bendras perduotų duomenų kiekis"
 Basic.Stats.Bitrate="Bitų sparta"
+Basic.Stats.DiskFullIn="Disko užpildymas už (apytiksliai)"
+Basic.Stats.ResetStats="Iš naujo nustatyti statistiką"
+ResetUIWarning.Title="Ar tikrai norite iš naujo nustatyti vartotojo sąsają?"
 Updater.Title="Galimas atnaujinimas"
 Updater.UpdateNow="Atnaujinti dabar"
 Updater.RemindMeLater="Priminti vėliau"
@@ -261,7 +277,6 @@
 Output.ConnectFail.Disconnected="Atjungtas nuo serverio."
 Output.StreamEncodeError.Title="Kodavimo klaida"
 Output.StreamEncodeError.Msg="Įvyko koduotojo klaida betransliuojant."
-Output.StreamEncodeError.Msg.LastError="Įvyko koduotuvo klaido betransliuojant:\n\n%1"
 Output.RecordFail.Title="Nepavyko pradėti įrašo"
 Output.RecordFail.Unsupported="Išvesties formatas nepalaikomas arba nepalaiko daugiau vieno garso takelio. Prašome patikrinti nustatymus ir bandyti vėl."
 Output.RecordNoSpace.Title="Nepakanka vietos diske"
@@ -269,7 +284,6 @@
 Output.RecordError.Title="Įrašymo klaida"
 Output.RecordError.Msg="Nenustatyta klaida įrašant."
 Output.RecordError.EncodeErrorMsg="Įvyko koduotojo klaida įrašinėjant."
-Output.RecordError.EncodeErrorMsg.LastError="Įvyko koduotuvo klaida įrašinėjant:\n\n%1"
 Output.BadPath.Title="Blogas failo kelias"
 Output.NoBroadcast.Title="Nekonfigūruotos Jokios Transliacijos"
 Output.BroadcastStartFailed="Nepavyko pradėti transliacijos"
@@ -287,8 +301,6 @@
 Remux.SelectRecording="Pasirinkti OBS įrašą..."
 Remux.ExitUnfinishedTitle="Vyksta permiksavimimas"
 Remux.ExitUnfinished="Permiksavimas nebaigtas. Sustabdžius dabar, paskirites failas gali būti nepanaudojamas.\nAr esate tikras, kad norite sustabdyti permiksavimą?"
-UpdateAvailable="Galimas atnaujinimas"
-UpdateAvailable.Text="Naujausia versija: %1.%2.%3. <a href='%4'>Spauskite čia, kad parsisiųstumėte</a>"
 Basic.DesktopDevice1="Darbastalio garsas"
 Basic.DesktopDevice2="Darbastalio garsas 2"
 Basic.Scene="Scena"
@@ -387,7 +399,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Vidutinis"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Žemiau vidutinio"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Tolygus"
-Basic.Settings.Advanced.Audio.BufferingTime="Garso Sušvelninimo Laikas"
 Basic.Settings.Advanced.Video.ColorFormat="Spalvos formatas"
 Basic.Settings.Advanced.Video.ColorFormat.BGRA="BGRA (8-bitų)"
 Basic.Settings.Advanced.Video.ColorRange.Full="Pilnas"

obs-studio-29.1.3.tar.xz/UI/data/locale/lv-LV.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/lv-LV.ini Changed

@@ -92,7 +92,6 @@
 LogViewer="Žurnālu skatītājs"
 ShowOnStartup="Rādīt palaižot"
 OpenFile="Atvērt failu"
-AddValue="Pielikt %1"
 AddSource="Pievienot Avotu"
 RemoveScene="Dzēst Izvēlēto Ainu"
 RemoveSource="Dzēst izvēlēto(-ās) ainu(-as)"
@@ -104,11 +103,14 @@
 SourceFilters="Atvērt Satura Filtrus"
 MixerToolbarMenu="Audio Miksera Galvenā Izvēlne"
 SceneFilters="Atvērt Ainas Filtrus"
+List="Saraksts"
+Grid="Režģis"
 PluginsFailedToLoad.Title="Spraudņu Ielādes Kļūda"
 PluginsFailedToLoad.Text="Sekojošie OBS spraudņi nevarēja tikt ielādēti:\n\n%1\nLūdzu veiciet atjauninājumu vai dzēsiet šos spraudņus."
 AlreadyRunning.Title="OBS jau darbojas (ir palaists)"
 AlreadyRunning.Text="OBS jau darbojas! Ja nevēlaties vairākas paralēli darbojošās OBS kopijas, lūdzu, aiztaisiet/izslēdziet pašreiz darbojošās. Ja jums iestatīts, ka OBS tiek minimizēts sistēmas teknē, lūdzu, pārbaudiet, vai tas tur joprojām darbojas."
 AlreadyRunning.LaunchAnyway="Palaist vēl vienu"
+AutoSafeMode.Title="Drošais režīms"
 ChromeOS.Title="Neatbalstīta operētājsistēma"
 ChromeOS.Text="Šķiet, ka OBS darbojas ChromeOS konteinerā. Šī platforma netiek atbalstīta."
 Wine.Title="Ir atklāts Wine"
@@ -175,7 +177,6 @@
 Basic.AutoConfig.StreamPage.Server="Serveris"
 Basic.AutoConfig.StreamPage.StreamKey="Straumes atslēga"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: ievadiet šifrēšanas paroli.\nRTMP: ievadiet atslēgu, ko norādījis pakalpojums.\nSRT: ievadiet streamid, ja pakalpojums tādu lieto."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(saite)"
 Basic.AutoConfig.StreamPage.EncoderKey="Enkodera atslēga"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Piesaistītais konts"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Notestēt bitrate (bitu pārraides ātrumu) ar interneta ātruma testu (var aizņemt dažas minūtes)"
@@ -227,13 +228,9 @@
 Updater.UpdateNow="Aktualizēt tagad"
 Updater.RemindMeLater="Atgādināt vēlāk"
 Updater.Skip="Izlaist šo versiju"
-Updater.Running.Title="Programma pašreiz aktīva/darbojas"
-Updater.Running.Text="Izvadi (outputs) pašlaik ir aktīvi. Lūdzu, izslēdziet visus aktīvos izvadus, pirms mēģināt aktualizēt programmu"
 Updater.NoUpdatesAvailable.Title="Aktualizācijas (updates) nav pieejamas"
 Updater.NoUpdatesAvailable.Text="Aktualizācijas (updates) pašreiz nav pieejamas"
 Updater.FailedToLaunch="Neizdevās palaist aktualizatoru"
-Updater.GameCaptureActive.Title="Spēles tveršana ir aktīva"
-Updater.GameCaptureActive.Text="Spēļu tveršanas āķu bibliotēka pašlaik tiek izmantota. Lūdzu, aizveriet visas pašreiz tvertās spēles/programmas (vai restartējiet operētājsistēmu) un mēģiniet vēlreiz."
 QuickTransitions.SwapScenes="Samainiet vietām Priekšskata/Izvada Ainas pēc Pārejas"
 QuickTransitions.SwapScenesTT="Pēc pārejas maina vietām priekšskata un izvadu ainas (ja izvada sākotnējā aina joprojām pastāv).\nTas neatgriezīs visas izmaiņas, kas varētu būt veiktas izvada sākotnējā ainā."
 QuickTransitions.DuplicateScene="Dublicēt/dublēt ainu"
@@ -296,6 +293,7 @@
 Output.StartStreamFailed="Neizdevās uzsākt straumēšanu"
 Output.StartRecordingFailed="Neizdevās uzsākt ierakstīšanu"
 Output.StartReplayFailed="Neizdevās sākt replay bufera ierakstu"
+Output.StartVirtualCamFailed="Neizdevās startēt virtuālo kameru"
 Output.StartFailedGeneric="Neizdevās sākt izvadu. Lūdzu, skatiet žurnālu, lai iegūtu sīkāku informāciju.\n\nPiezīme: Ja izmantojat NVENC vai AMD enkoderus, pārliecinieties, ka ir svaigi video draiveri."
 Output.ReplayBuffer.PauseWarning.Title="Nevar saglabāt replay-us, kamēr uz pauzes"
 Output.ReplayBuffer.PauseWarning.Text="Brīdinājums: Replay-i nevar tikt saglabāti, kad ieraksts ir pauzēts."
@@ -360,8 +358,6 @@
 MacPermissions.Item.Microphone.Details="OBS vajadzīga Jūsu atļauja, lai varētu tvert mikrofonu."
 MacPermissions.Item.Accessibility="Pieejamība"
 MacPermissions.Continue="Turpināt"
-UpdateAvailable="Pieejama jauna aktualizācija"
-UpdateAvailable.Text="Tagad ir pieejama versija%1.%2.%3. <a href='%4'> Lai lejupielādētu, klikšķiniet šeit </a>"
 Basic.DesktopDevice1="Darbvirsmas audio"
 Basic.DesktopDevice2="Darbvirsmas audio 2"
 Basic.AuxDevice1="Mic/Aux (mikrofons/papildu)"
@@ -501,6 +497,10 @@
 Basic.Main.StopReplayBuffer="Beigt 'replay' bufera darbību"
 Basic.Main.StoppingReplayBuffer="Tiek apturēts 'replay' bufferis"
 Basic.Main.StopStreaming="Beigt straumēt"
+Basic.Main.StopVirtualCam="Apturēt virtuālo kameru"
+Basic.Main.Ungroup="Atgrupēt"
+Basic.Main.VirtualCamConfig="Konfigurēt virtuālo kameru"
+Basic.VCam.VirtualCamera="Virtuālā kamera"
 Basic.MainMenu.File="&Fails"
 Basic.MainMenu.File.Export="&Eksports"
 Basic.MainMenu.File.Import="&Imports"
@@ -541,9 +541,7 @@
 Basic.MainMenu.Edit.AdvAudio="&Advancētie audio rekvizīti"
 Basic.MainMenu.View="Skats"
 Basic.MainMenu.View.Toolbars="Rīkjoslas"
-Basic.MainMenu.View.ListboxToolbars="Ainu/avotu sarakstu pogas"
 Basic.MainMenu.View.ContextBar="Avotu rīkjosla"
-Basic.MainMenu.View.SceneTransitions="Ainas pārejas"
 Basic.MainMenu.View.SourceIcons="Avotu &ikonas"
 Basic.MainMenu.View.StatusBar="&Statusa josla"
 Basic.MainMenu.View.Fullscreen.Interface="Pilnekrāna saskarne"
@@ -554,7 +552,6 @@
 Basic.MainMenu.SceneCollection.Import="Importēt ainu kolekciju"
 Basic.MainMenu.SceneCollection.Export="Eksportēt ainu kolekciju"
 Basic.MainMenu.Profile.Exists="Šāds profils jau pastāv"
-Basic.MainMenu.SceneCollection.Exists="Ainu kolekcija jau pastāv"
 Basic.MainMenu.Tools="Rīki"
 Basic.MainMenu.Help="Palīdzība"
 Basic.MainMenu.Help.HelpPortal="Palīdzība &portāla"
@@ -563,8 +560,21 @@
 Basic.MainMenu.Help.Logs="Žurnālfaili (&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="Parādīt žurnālfailus (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Augšuplādēt tekošo žurnālfailu"
+Basic.Settings.ConfirmTitle="Apstiprināt izmaiņas"
+Basic.Settings.Confirm="Jums ir nesaglabātās izmaiņas. Saglabās tos?"
+Basic.Settings.General="Vispārīgi"
+Basic.Settings.General.Theme="Motīvs"
+Basic.Settings.General.Language="Valoda"
+Basic.Settings.General.Updater="Atjauninājumi"
+Basic.Settings.General.UpdateChannel="Atjauninājuma kanāls"
+Basic.Settings.General.UpdateChannelDisabled="(Atslēgts)"
+Basic.Settings.General.UpdateChannelDefault="(Noklusējums)"
 Basic.Settings.General.Projectors="Projektori"
 Basic.Settings.General.HideProjectorCursor="Nerādīt kursoru virs projektoriem"
+Basic.Settings.General.ChannelName.stable="Stabīlie"
+Basic.Settings.Stream.Custom.Username="Lietotājvārds"
+Basic.Settings.Stream.Custom.Password="Parole"
+Basic.Settings.Stream.StreamSettingsWarning="Atvērt iestatījumus"
 Basic.Settings.Stream.Recommended.MaxVideoBitrate="Maksimālais video bitreits: %1 kbps"
 Basic.Settings.Stream.Recommended.MaxAudioBitrate="Maksimālais audio bitreits: %1 kbps"
 Basic.Settings.Stream.Recommended.MaxResolution="Maksimālā izšķirtspēja: %1"
@@ -572,7 +582,6 @@
 Basic.Settings.Output="Izvads"
 Basic.Settings.Output.Format="Ieraksta formāts"
 Basic.Settings.Output.SelectDirectory="Norādiet ierakstu mapi"
-Basic.Settings.Output.SelectFile="Norādiet ieraksta failu"
 Basic.Settings.Output.DynamicBitrate="Dinamiski mainīt bitreitu, lai izvairītos no pārslodzēm"
 Basic.Settings.Output.DynamicBitrate.Beta="Dinamiski maina bitreitu, lai izvairītos no pārslodzēm (beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Tā vietā, lai mazinot sastrēgumus, izmestu kadrus, dinamiski tiek mainīts bitreits.\n\nŅemiet vērā, ka tas var palielināt aizturi skatītājiem, ja pēkšņi rodas ievērojami pārslodzes gadījumi.\nKad bitreits samazinjies, tā atjaunošana var ilgt dažas minūtes.\n\nŠobrīd tiek atbalstīts tikai RTMP."
@@ -597,12 +606,23 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Brīdinājums: Straumēšanas audio bitreits tiks iestatīts uz %1, kas ir pašreizējā straumēšanas pakalpojuma augšējā robeža."
 Basic.Settings.Output.Simple.Warn.CannotPause="Brīdinājums: Ierakstīšanu nevar pauzēt, ja ierakstīšanas kvalitāte ir iestatīta uz “Tāda pati kā straumei”."
 Basic.Settings.Output.Simple.Warn.Encoder="Brīdinājums: Ierakstīšana ar programmatūras enkoderi kvalitātē, kas atšķiras no straumes kvalitātes, prasīs procesora papildu noslodzi, ja straumēsiet un ierakstīsiet vienlaikus."
-Basic.Settings.Output.Simple.Warn.Lossless="Brīdinājums: Bezzuduma kvalitāte rada ārkārtīgi lielus failu izmērus! Bezzuduma kvalitāte ar augstu izšķirtspēju un kadru nomaiņas ātrumu, var prasīt līdz pat 7 gigabaitiem diska vietas minūtē. Bezzudumu kvalitāte nav ieteicama ilgstošiem ierakstiem, ja vien jums nav pieejams ļoti daudz diska vietas."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Tiešām vēlaties izmantot bezzuduma kvalitāti?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Brīdinājums bezzuduma kvalitātes sakarā!"
 Basic.Settings.Output.Simple.Encoder.Software="Programmatūras (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Aparatūra (QSV, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Aparatūra (QSV, AV1)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Aparatūra (AMD, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.HEVC="Aparatūra (AMD, HEVC)"
+Basic.Settings.Output.Simple.Encoder.Hardware.AMD.AV1="Aparatūra (AMD, AV1)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.H264="Aparatūra (NVENC, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Aparatūra (NVENC, AV1)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Aparatūra (NVENC, HEVC)"
+Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Aparatūra (Apple, H.264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Aparatūra (Apple, HEVC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Programmatūras (x264 zema CPU lietojuma iestatījums, paliels faila izmērs)"
+Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Noklusējums)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD celiņš (izmanto celiņu #2)"
+Basic.Settings.Output.Simple.RecAudioTrack="Audio celiņš"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Nesaderīga izšķirtspēja/freimreits (kadru nomaiņas ātrums)"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Šis straumēšanas pakalpojums neatbalsta jūsu pašreizējo izvada izšķirtspēju un/vai freimreitu (kadru nomaiņas ātrumu). Tie tiks mainīti uz tuvāko saderīgo vērtību:\n\n%1\n\nVai vēlaties turpināt?"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Izšķirtspēja: %1"
@@ -619,6 +639,7 @@
 Basic.Settings.Output.Adv.Rescale="Mērogot izvadu"
 Basic.Settings.Output.Adv.AudioTrack="Audio celiņš"
 Basic.Settings.Output.Adv.Streaming="Straumēšana"
+Basic.Settings.Output.Adv.Streaming.Settings="Straumēšanas iestatījumi"
 Basic.Settings.Output.Adv.Audio.Track1="Celiņš #1"
 Basic.Settings.Output.Adv.Audio.Track2="Celiņš #2"
 Basic.Settings.Output.Adv.Audio.Track3="Celiņš #3"
@@ -627,6 +648,7 @@
 Basic.Settings.Output.Adv.Audio.Track6="Celiņš #6"
 Basic.Settings.Output.Adv.TwitchVodTrack="Twitch VOD celiņš"
 Basic.Settings.Output.Adv.Recording="Ieraksts"
+Basic.Settings.Output.Adv.Recording.Settings="Ierakstīšanas iestatījumi"
 Basic.Settings.Output.Adv.Recording.RecType="Ieraksta tips"
 Basic.Settings.Output.Adv.Recording.Type="Tips"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standarta"
@@ -653,12 +675,23 @@
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer-a iestatījumi (ja kādi)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Atslēgas kadru intervāls (kadri)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Rādīt visus kodekus (pat ja tie ir potenciāli nesaderīgi)"
+Basic.Settings.Output.Adv.FFmpeg.Settings="FFmpeg iestatījumi"
+Basic.Settings.Output.EnableSplitFile="Automātiskā faila dalīšana"
+Basic.Settings.Output.SplitFile.TypeTime="Dalīt pēc laika"
+Basic.Settings.Output.SplitFile.TypeSize="Dalīt pēc izmēra"
 Screenshot="Taisīt izvada ekrānuzņēmumu"
 Screenshot.SourceHotkey="Taisīt izvēlētā avota ekrānuzņēmumu"
 Screenshot.StudioProgram="Taisīt ekrānuzņēmumu (programma)"
 Screenshot.Preview="Taisīt ekrānuzņēmumu (priekšskats)"
 Screenshot.Scene="Taisīt ekrānuzņēmumu (aina)"
 Screenshot.Source="Ekrānuzņēmums (avots)"
+FilenameFormatting.TT.CCYY="Gads, četri cipari"
+FilenameFormatting.TT.YY="Gads, pēdējie divi cipari (00-99)"
+FilenameFormatting.TT.MM="Mēnesis kā decimāls skaitlis (01-12)"
+FilenameFormatting.TT.hh="Stunda 24h formātā (00-23)"
+FilenameFormatting.TT.mm="Minūte (00-59)"
+FilenameFormatting.TT.ss="Sekunde (00-59)"
+FilenameFormatting.TT.Percent="% zīme"
 Basic.Settings.Video.Adapter="Video adapteris"
 Basic.Settings.Video.BaseResolution="Bāzes (kanvas) izšķirtspēja"
 Basic.Settings.Video.ScaledResolution="Izvada (mērogota) izšķirtspēja"
@@ -685,8 +718,7 @@
 Basic.Settings.Audio.PeakMeterType="Virsotņu skaitītāja tips"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Vienkāršots - Sample Peak"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Precīzs - True Peak (augstāka CPU noslodze)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="BRĪDINĀJUMS: Telpiskās skaņas (surround sound) audio ir iespējots."
-Basic.Settings.Audio.MultichannelWarning="Straumēšanas gadījumā pārbaudiet, vai straumēšanas pakalpojums atbalsta gan telpiskās skaņas (surround sound) ievadi, gan tās atskaņošanu. Facebook 360 Live ir viens piemērs, kur telpiskā skaņa tiek pilnībā atbalstīta. Lai arī Facebook Live un YouTube Live atbalsta šīs skaņas ievadi, Facebook Live to pārvērš uz stereo, bet YouTube Live atskaņo tikai divus kanālus.\n\nOBS audio filtri ir saderīgi ar telpisko skaņu, lai arī VST spraudņu atbalsts netiek garantēts."
+Basic.Settings.Audio.MultichannelWarning.Enabled="BRĪDINĀJUMS: Telpiskās skaņas (surround sound) audio ir iespējots."
 Basic.Settings.Audio.MultichannelWarning.Title="Vai iespējot telpiskās skaņas (surround sound) audio?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Tiešām vēlaties iespējot telpiskās skaņas (surround sound) audio?"
 Basic.Settings.Audio.Devices="Globālās audio ierīces"
@@ -709,7 +741,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Vidēja"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Zem vidējā"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Zema"
-Basic.Settings.Advanced.Audio.BufferingTime="Audio bufera ilgums"
 Basic.Settings.Advanced.Video.ColorFormat="Krāsu formāts"
 Basic.Settings.Advanced.Video.ColorSpace="Krāsu telpa"
 Basic.Settings.Advanced.Video.ColorRange="Krāsu diapazons"
@@ -799,14 +830,12 @@
 NeedsRestart="OBS Studija ir jāpārlaiž. Vai vēlaties pārlaist tūlīt?"
 ContextBar.NoSelectedSource="Nav neviena avota"
 ContextBar.ResetTransform="Atstatīt transformēšanu"
-ContextBar.FitToCanvas="Pielāgot kanvām"
 ContextBar.MediaControls.PlayMedia="Spēlēt mediju"
 ContextBar.MediaControls.PauseMedia="Pauzēt mediju"
 ContextBar.MediaControls.StopMedia="Apturēt (stopēt) mediju"
 ContextBar.MediaControls.RestartMedia="Pārlaist mediju"
 ContextBar.MediaControls.PlaylistNext="Nākošais spēlējamo sarakstā"
 ContextBar.MediaControls.PlaylistPrevious="Iepriekšējais spēlējamo sarakstā"
-ContextBar.MediaControls.MediaProperties="Medija rekvizīti"
 ContextBar.MediaControls.BlindSeek="Medija pārtīšanas vidžets"
 YouTube.Actions.ScheduleForLater="Ieplānot spēlēt vēlāk"
 YouTube.Actions.Error.Title="Tiešraides izveides kļūme"

obs-studio-29.1.3.tar.xz/UI/data/locale/mn-MN.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/mn-MN.ini Changed

@@ -89,7 +89,6 @@
 LogViewer="Лог Харагч"
 ShowOnStartup="Эхлэх үед харуулах"
 OpenFile="Файлыг нээх"
-AddValue="%1 нэмэх"
 AlreadyRunning.Title="OBS нь аль хэдийнээ ажиллаж байна"
 AlreadyRunning.LaunchAnyway="Юутай ч эхлүүл"
 ChromeOS.Title="Дэмжигдээгүй тавцан"
@@ -134,7 +133,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Өөр..."
 Basic.AutoConfig.StreamPage.Server="Сервер"
 Basic.AutoConfig.StreamPage.StreamKey="Цацалтын түлхүүр үгс"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Линк)"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Холбогдсон бүртгэл"
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Цацалтын анхааруулга"
 Basic.AutoConfig.TestPage="Эцсийн үр дүн"
@@ -162,11 +160,8 @@
 Updater.UpdateNow="Одоо шинэчлэх"
 Updater.RemindMeLater="Дараа нь надад сануул"
 Updater.Skip="Хувилбар алгасах"
-Updater.Running.Title="Програм одоогоор идэвхитэй байна"
 Updater.NoUpdatesAvailable.Title="Бэлэн шинэчлэл алга байна"
 Updater.NoUpdatesAvailable.Text="Одоогоор бэлэн шинэчлэл алга байна"
-Updater.GameCaptureActive.Title="Тоглоом чагнагч идэвхтэй байна"
-Updater.GameCaptureActive.Text="Тоглоом чагнагч дэгээ холбоосны сан одоогоор хэрэглэж байна. Бүх тоглоом/програмыг чагнахаас сэргийлж хаах (эсвэл Windows-ийг дахин ажиллуулаад) ба дахин оролдоно уу."
 QuickTransitions.DuplicateScene="Давхардсан хөшиг"
 QuickTransitions.HotkeyName="Түргэн шилжилт: %1"
 Basic.SceneTransitions="Хөшигний шилжилт"
@@ -213,7 +208,6 @@
 MissingFiles.Replaced="Орлосон"
 MissingFiles.Cleared="Цэвэрлэсэн"
 MissingFiles.Found="Олдсон"
-UpdateAvailable.Text="Хувилбар %1.%2.%3 нь боломжтой байна. <a href='%4'>Энд дарж татаж авна уу</a>"
 Basic.DesktopDevice1="Дэлгэцний дуу"
 Basic.DesktopDevice2="Дэлгэцний дуу 2"
 Basic.AuxDevice1="Мик/Aux"
@@ -296,7 +290,6 @@
 Basic.MainMenu.Edit.Order.MoveToBottom="Хамгийн доош тулгах"
 Basic.MainMenu.Edit.AdvAudio="Нарийвчилсан аудио шинж чанарууд"
 Basic.MainMenu.View="&Харах"
-Basic.MainMenu.View.ListboxToolbars="Хөшиг/Эх жагсаалтын товчлуурууд"
 Basic.MainMenu.View.ContextBar="Эх сурвалжын Самбар"
 Basic.MainMenu.View.SourceIcons="Эх сурвалжын Дүрснүүд"
 Basic.MainMenu.View.StatusBar="Статусын самбар"
@@ -332,7 +325,6 @@
 Basic.Settings.General.SnapDistance="Буландуулах Мэдрэмж"
 Basic.Settings.General.Preview="Урьдчилж харах"
 Basic.Settings.Stream="Цацалт"
-Basic.Settings.Stream.StreamType="Цацалтын төрөл"
 Basic.Settings.Stream.Custom.Username="Хэрэглэгчийн нэр"
 Basic.Settings.Stream.Custom.Password="Нууц үг"
 Basic.Settings.Stream.TTVAddon.None="Байхгүй"
@@ -341,7 +333,6 @@
 Basic.Settings.Output="Гаралт"
 Basic.Settings.Output.Format="Бичлэгийн формат"
 Basic.Settings.Output.SelectDirectory="Бичлэгийн Лавлахыг Сонгох"
-Basic.Settings.Output.SelectFile="Бичлэгийн Файлыг Сонго"
 Basic.Settings.Output.Mode="Гаралтын Горим"
 Basic.Settings.Output.Mode.Simple="Энгийн"
 Basic.Settings.Output.Mode.Adv="Дэвшилттэй"

obs-studio-29.1.3.tar.xz/UI/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ms-MY.ini Changed

@@ -89,7 +89,6 @@
 LogViewer="Pelihat Log"
 ShowOnStartup="Tunjuk pada permulaan"
 OpenFile="Buka fail"
-AddValue="Tambah %1"
 AddSource="Tambah Sumber"
 RemoveScene="Buang Adegan Terpilih"
 RemoveSource="Buang Sumber Terpilih"
@@ -101,11 +100,18 @@
 SourceFilters="Buka Penapis Sumber"
 MixerToolbarMenu="Menu Pengadun Audio"
 SceneFilters="Buka Penapis Adegan"
+List="Senarai"
 PluginsFailedToLoad.Title="Ralat Muat Pemalam"
 PluginsFailedToLoad.Text="Pemalam OBS berikut gagal dimuatkan:\n\n%1\nSila kemas kini atau buang pemalam tersebut."
 AlreadyRunning.Title="OBS sedang dijalankan"
 AlreadyRunning.Text="OBS sedang dijalankan! Melainkan anda mahu membuatnya, sila matikan apa jua kejadian OSB sebelum cuba menjalankan kejadian yang baharu. Jika anda telah menetapkan OBS terus diminimumkan ke dalam talam sistem, sila periksa sama ada ia masih ada di sana."
 AlreadyRunning.LaunchAnyway="Lancar Jua"
+AutoSafeMode.Title="Mod Selamat"
+AutoSafeMode.Text="OBS tidak ditutup dengan betul ketika sesi terakhir anda. \n\nAdakah anda mahu mulakan dalam Mod Selamat (pemalam pihak ketiga, skip, dan WebSockets dimatikan)? "
+AutoSafeMode.LaunchSafe="Jalankan dalam Mod Selamat"
+AutoSafeMode.LaunchNormal="Jalankan seperti Biasa"
+SafeMode.Restart="Adakah anda mahu mulakan OBS dalam Mod Selamat (pemalam pihak ketiga, skrip, dan WebSockets dimatikan)? "
+SafeMode.RestartNormal="Anda pasti mahu mulakan semula OBS dalam Mod Biasa?"
 ChromeOS.Title="Platform Tidak Disokong"
 ChromeOS.Text="OBS nampaknya telah berjalan di dalam satu bekas ChromeOS. Platform ini malangnya tidak disokong."
 Wine.Title="Wine dikesan"
@@ -171,7 +177,7 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Suai..."
 Basic.AutoConfig.StreamPage.Server="Pelayan"
 Basic.AutoConfig.StreamPage.StreamKey="Kunci Strim"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Pautan)"
+Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: masukkan frasa laluan penyulitan.\nRTMP: masukkan kunci yang disediakan oleh perkhidmatan.\nSRT: masukkan streamid jika perkhidmatan telah menggunakannya."
 Basic.AutoConfig.StreamPage.EncoderKey="Kunci Pengekod"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Akaun bersambung"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Anggar kadar bit menerusi ujian lebar jalur (ia mengambil masa beberapa minit)"
@@ -223,8 +229,6 @@
 Updater.UpdateNow="Kemas Kini Sekarang"
 Updater.RemindMeLater="Ingatkan saya Kemudian"
 Updater.Skip="Langkau Versi"
-Updater.Running.Title="Program buat masa ini aktif"
-Updater.Running.Text="Output buat masa ini aktif, sila matikan mana-mana output aktif sebelum cuba mengemas kini"
 Updater.NoUpdatesAvailable.Title="Tiada kemas kini tersedia"
 Updater.NoUpdatesAvailable.Text="Tiada kemas kini tersedia buat masa ini"
 Updater.BranchNotFound.Title="Kemaskini Saluran Telah Dibuang"
@@ -234,8 +238,6 @@
 Updater.RepairConfirm.Title="Sahkan Semakan Integriti"
 Updater.RepairConfirm.Text="Permulaan semakan integriti akan mengimbas pemasangan OBS anda jika berlaku kerosakan dan memuat turun kembali fail-fail yang telah rosak/diubah suai. Ia mengambil masa.\n\nAnda pasti mahu teruskan?"
 Updater.FailedToLaunch="Gagal melancarkan pengemas kini"
-Updater.GameCaptureActive.Title="Tangkap permainan aktif"
-Updater.GameCaptureActive.Text="Pustaka cangkuk tangkap permainan buat masa ini sedang digunakan. Sila tutup mana-mana permainan/program yang sudah ditangkap (atau mula semula Windows) kemudian cuba lagi."
 QuickTransitions.SwapScenes="Silih Adegan Pratonton/Program Selepas Peralihan"
 QuickTransitions.SwapScenesTT="Silih adegan-adegan pratonton dan program selepas peralihan (jika adegan asal program masih wujud).\nTindakan ini tidak akan membuat asal sebarang perubahan yang mungkin telah dibuat kepada adegan asal program."
 QuickTransitions.DuplicateScene="Duplikasi Adegan"
@@ -249,6 +251,8 @@
 Basic.SceneTransitions="Peralihan Adegan"
 Basic.TransitionDuration="Tempoh"
 Basic.TogglePreviewProgramMode="Mod Studio"
+Basic.EnablePreviewProgramMode="Benarkan Mod Studio"
+Basic.DisablePreviewProgramMode="Lumpuhkan Mod Studio"
 Undo.Undo="Buat Asal"
 Undo.Redo="Buat Semula"
 Undo.Add="Tambah '%1'"
@@ -297,6 +301,8 @@
 Undo.GroupItems="Kumpul Item-item menjadi '%1'"
 TransitionNameDlg.Text="Sila masukkan nama peralihan"
 TransitionNameDlg.Title="Nama Peralihan"
+TitleBar.SafeMode="MOD SELAMAT"
+TitleBar.PortableMode="Mod Mudah Alih"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Adegan"
 NameExists.Title="Nama sudah wujud"
@@ -316,9 +322,12 @@
 ConfirmRemove.Title="Sahkan Pembuangan"
 ConfirmRemove.Text="Anda pasti mahu membuang '%1'?"
 ConfirmRemove.TextMultiple="Anda pasti mahu membuang %1 item?"
+ConfirmReset.Title="Tetap Semula Sifat"
+ConfirmReset.Text="Anda pasti mahu menetap semula sifat semasa ke nilai lalainya?"
 Output.StartStreamFailed="Gagal memulakan penstriman"
 Output.StartRecordingFailed="Gagal memulakan rakaman"
 Output.StartReplayFailed="Gagal memulakan penimbal main semula"
+Output.StartVirtualCamFailed="Gagal memulakan kamera maya"
 Output.StartFailedGeneric="Gagal memulakan output. Sila periksa log untuk perincian/\n\nPerhatian: Jika anda menggunakan pengekod NVENC atau AMD, pastikan pemacu video anda adalah terkini."
 Output.ReplayBuffer.PauseWarning.Title="Tidak dapat menyimpan main semula ketika dijeda"
 Output.ReplayBuffer.PauseWarning.Text="Amaran: Main semula tidak dapat disimpan ketika rakaman dijeda."
@@ -331,7 +340,7 @@
 Output.ConnectFail.Disconnected="Terputus dengan pelayan."
 Output.StreamEncodeError.Title="Ralat pengekodan"
 Output.StreamEncodeError.Msg="Satu ralat pengekod telah muncul ketika menstrim."
-Output.StreamEncodeError.Msg.LastError="Satu ralat pengekod telah muncul ketika menstrim:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Satu ralat pengekod telah muncul ketika menstrim: %1"
 Output.RecordFail.Title="Gagal memulakan rakaman"
 Output.RecordFail.Unsupported="Format output sama ada tidak disokong atau tidak menyokong lebih daripada satu trek audio. Sila semak tetapan anda dan cuba lagi."
 Output.RecordNoSpace.Title="Ruang cakera tidak mencukupi"
@@ -339,7 +348,7 @@
 Output.RecordError.Title="Ralat rakaman"
 Output.RecordError.Msg="Satu ralat yang tidak dinyatakan berlaku ketika rakaman."
 Output.RecordError.EncodeErrorMsg="Satu ralat pengekod telah muncul ketika merakam."
-Output.RecordError.EncodeErrorMsg.LastError="Satu ralat pengekod telah muncul ketika merakam:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Satu ralat pengekod telah muncul ketika merekod: %1"
 Output.BadPath.Title="Laluan Fail Teruk"
 Output.BadPath.Text="Laluan Rakaman terkonfigur tidak dapat dibuka. Sila periksa Laluan Rakaman anda di bawah Tetapan → Output → Rakaman."
 Output.NoBroadcast.Title="Tiada Siaran Dikonfigur"
@@ -368,6 +377,8 @@
 Remux.ExitUnfinishedTitle="Remuxing masih berlangsung"
 Remux.ExitUnfinished="Remuxing masih belum selesai, menghentikannya sekarang boleh menyebabkan fail sasaran tidak boleh digunakan.\nAnda pasti mahu menghentikan remuxing?"
 Remux.HelpText="Lepas fail ke dalam tetingkap ini untuk remux, atau pilih satu sel \"Rakaman OBS\" kosong untuk melayari satu fail."
+Remux.NoFilesAddedTitle="Tiada fail remuxing ditambah"
+Remux.NoFilesAdded="Tiada fail ditambah ke remux. Lepaskan satu folder yang mengandungi satu atau lebih fail video."
 MissingFiles="Fail-fail Hilang"
 MissingFiles.MissingFile="Fail Hilang"
 MissingFiles.NewFile="Fail Baharu"
@@ -386,6 +397,7 @@
 MissingFiles.AutoSearchText="OBS telah menemui padanan-padanan tambahan bagi fail-fail hilang dalam direktori tersebut. Anda mahu menambahnya?"
 MissingFiles.NoMissing.Title="Semakan Fail Hilang"
 MissingFiles.NoMissing.Text="Tiada fail yang hilang."
+MacPermissions.MenuAction="Lihat Keizinan Apl..."
 MacPermissions.Title="Lihat Keizinan Apl"
 MacPermissions.Description="OBS Studio memerlukan keizinan anda untuk menyediakan beberapa ciri. Disarankan anda membenarkan beberapa keizinan ini, tetapi ia tidak diperlukan untuk memulakan apl. Anda boleh membenarkannya nanti."
 MacPermissions.Description.OpenDialog="Anda boleh buka-semula dialog ini melalui menu OBS Studio."
@@ -401,8 +413,8 @@
 MacPermissions.Item.Accessibility="Kebolehcapaian"
 MacPermissions.Item.Accessibility.Details="Bagi memastikan pintasan papan kekunci (kekunci panas) berfungsi ketika apl lain difokus, sila benarkan keizinan ini."
 MacPermissions.Continue="Teruskan"
-UpdateAvailable="Kemas Kini Baharu Telah Tersedia"
-UpdateAvailable.Text="Versi %1.%2.%3 kini sudah tersedia. <a href='%4'>Klik di sini untuk muat turun</a>"
+SourceLeak.Title="Ralat Pembersihan Sumber"
+SourceLeak.Text="Terdapat masalah ketika cuba mengubah koleksi adegan dan beberapa sumber tidak dapat dinyahmuatkan. Isu ini biasanya disebabkan oleh pemalam yang tidak dilepaskan dengan betul. Sila pastikan mana-mana pemalam yang digunakan telah dikemas kini.\n\nStudio OBS akan ditutup untuk menghindari apa-apa kemungkinan kerosakan data."
 Basic.DesktopDevice1="Audio Atas Meja"
 Basic.DesktopDevice2="Audio Atas Meja 2"
 Basic.Scene="Adegan"
@@ -459,6 +471,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (auto-pilih: %2)"
 Basic.PropertiesWindow.SelectColor="Pilih warna"
 Basic.PropertiesWindow.SelectFont="Pilih fon"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Pilih satu Fon"
 Basic.PropertiesWindow.ConfirmTitle="Tetapan Berubah"
 Basic.PropertiesWindow.Confirm="Masih terdapat perubahan belum disimpan. Anda pasti mahu menyimpannya?"
 Basic.PropertiesWindow.NoProperties="Tiada sifat tersedia"
@@ -567,9 +580,9 @@
 Basic.VCam.VirtualCamera="Kamera Maya"
 Basic.VCam.OutputType="Jenis Output"
 Basic.VCam.OutputSelection="Pemilihan Output"
-Basic.VCam.Internal="Dalaman"
-Basic.VCam.InternalDefault="Output Program (Lalai)"
-Basic.VCam.InternalPreview="Output Pratonton"
+Basic.VCam.OutputType.Program="Program (Lalai)"
+Basic.VCam.OutputSelection.NoSelection="Tiada pemilihan untuk jenis output ini"
+Basic.VCam.RestartWarning="Kamera maya akan dimulakan semula untuk menerapkan perubahan ini"
 Basic.MainMenu.File="&Fail"
 Basic.MainMenu.File.Export="&Eksport"
 Basic.MainMenu.File.ShowRecordings="Tunjuk &Rakaman"
@@ -609,17 +622,18 @@
 Basic.MainMenu.Edit.AdvAudio="Sifat-sifat Audio L&anjutan"
 Basic.MainMenu.View="&Lihat"
 Basic.MainMenu.View.Toolbars="Palang A&lat"
-Basic.MainMenu.View.ListboxToolbars="Butang Senarai Adegan/Sumber"
+Basic.MainMenu.View.ListboxToolbars="Labuh Palang Alat"
 Basic.MainMenu.View.ContextBar="Palang Alat Sumber"
-Basic.MainMenu.View.SceneTransitions="Peralihan-peralihan A&degan"
 Basic.MainMenu.View.SourceIcons="&Ikon-ikon Sumber"
 Basic.MainMenu.View.StatusBar="Palang &Status"
 Basic.MainMenu.View.Fullscreen.Interface="Antara Muka Skrin Penuh"
 Basic.MainMenu.View.ResetUI="&Tetap Semula UI"
 Basic.MainMenu.View.AlwaysOnTop="&Sentiasa Di Atas"
+Basic.MainMenu.View.SceneListMode="Mod Senarai Adegan"
 Basic.MainMenu.Docks="&Labuh"
 Basic.MainMenu.Docks.ResetDocks="&Tetap Semula Labuhan"
 Basic.MainMenu.Docks.LockDocks="&Kunci Labuhan"
+Basic.MainMenu.Docks.SideDocks="Labuh Tinggi-&Penuh"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Labuh Pelayar Suai..."
 Basic.MainMenu.SceneCollection="Koleksi Ade&gan"
 Basic.MainMenu.Profile="&Profil"
@@ -628,7 +642,6 @@
 Basic.MainMenu.SceneCollection.Import="Import Koleksi Adegan"
 Basic.MainMenu.SceneCollection.Export="Eksport Koleksi Adegan"
 Basic.MainMenu.Profile.Exists="Profil sudah wujud"
-Basic.MainMenu.SceneCollection.Exists="Koleksi adegan sudah wujud"
 Basic.MainMenu.Tools="Ala&tan"
 Basic.MainMenu.Help="&Bantuan"
 Basic.MainMenu.Help.HelpPortal="&Portal Bantuan"
@@ -640,8 +653,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Muat &Naik Fail Log Semasa"
 Basic.MainMenu.Help.Logs.UploadLastLog="Muat-naik &Log File Terdahulu"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Lihat Log Semasa"
+Basic.MainMenu.Help.ReleaseNotes="Key: Basic.MainMenu.Help.ReleaseNotes\nAdded in https://github.com/obsproject/obs-studio/pull/2987"
 Basic.MainMenu.Help.CheckForUpdates="Periksa Kemas Kini"
 Basic.MainMenu.Help.Repair="Semak Integriti Fail"
+Basic.MainMenu.Help.RestartSafeMode="Mula Semula dalam Mod Selamat"
+Basic.MainMenu.Help.RestartNormal="Mula Semula dalam Mod Biasa"
 Basic.MainMenu.Help.CrashLogs="&Laporan Kerosakan"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="&Tunjuk Laporan Kerosakan"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Muat Naik Laporan Kerosakan Te&rakhir"
@@ -711,10 +727,11 @@
 Basic.Settings.General.ChannelName.beta="Cubaan / Release Candidates"
 Basic.Settings.General.ChannelDescription.beta="Berkemungkinan siri pre-lancar tidak stabil"
 Basic.Settings.Stream="Strim"
-Basic.Settings.Stream.StreamType="Jenis Strim"
 Basic.Settings.Stream.Custom.UseAuthentication="Guna pengesahihan"
 Basic.Settings.Stream.Custom.Username="Nama Pengguna"
 Basic.Settings.Stream.Custom.Password="Kata Laluan"
+Basic.Settings.Stream.Custom.Username.ToolTip="RIST: masukkan srp_username.\nRTMP: masukkan nama pengguna.\nSRT: tidak digunakan."
+Basic.Settings.Stream.Custom.Password.ToolTip="RIST: masukkan srp_password.\nRTMP: masukkan kata laluan.\nSRT: masukkan frasa laluan penyulitan."
 Basic.Settings.Stream.BandwidthTestMode="Benarkan Mod Uji Lebar Jalur"
 Basic.Settings.Stream.TTVAddon="Tambahan Sembang Twitch"
 Basic.Settings.Stream.TTVAddon.None="Tiada"
@@ -732,12 +749,14 @@
 Basic.Settings.Stream.Recommended.MaxResolution="Resolusi Maksimum: %1"
 Basic.Settings.Stream.Recommended.MaxFPS="FPS Maksimum: %1"
 Basic.Settings.Output.Format="Format Rakaman"
+Basic.Settings.Output.Format.MKV="Video Matroska (.mkv)"
+Basic.Settings.Output.Format.fMP4="MP4 Terserpih (.mp4)"
+Basic.Settings.Output.Format.fMOV="MOV Terserpih (.mov)"
 Basic.Settings.Output.Format.TT.fmov="MOV yang difragment menulis rakaman dalam ketulan dan tidak memerlukan pengakhiran yang sama seperti fail MOV tradisional.\nIni memastikan fail kekal boleh dimainkan walaupun menulis ke cakera terganggu, contohnya, akibat BSOD atau kehilangan kuasa.\n\nIni mungkin tidak serasi dengan semua pemain dan editor. Gunakan Fail → Remux Recordings untuk menukar fail kepada format yang lebih serasi jika perlu"
 Basic.Settings.Output.Format.TT.fmp4="MP4 yang difragment menulis rakaman dalam ketulan dan tidak memerlukan pengakhiran yang sama seperti fail MOV tradisional.\nIni memastikan fail kekal boleh dimainkan walaupun menulis ke cakera terganggu, contohnya, akibat BSOD atau kehilangan kuasa.\n\nIni mungkin tidak serasi dengan semua pemain dan editor. Gunakan Fail → Remux Recordings untuk menukar fail kepada format yang lebih serasi jika perlu"
 Basic.Settings.Output.Encoder.Video="Pengekod Video"
 Basic.Settings.Output.Encoder.Audio="Pengekod Audio"
 Basic.Settings.Output.SelectDirectory="Pilih Direktori Rakaman"
-Basic.Settings.Output.SelectFile="Pilih Fail Rakaman"
 Basic.Settings.Output.DynamicBitrate="Ubah kadar bit secara dinamik untuk mengendalikan kesesakan"
 Basic.Settings.Output.DynamicBitrate.Beta="Ubah kadar bit secara dinamik untuk mengendalikan kesesakan (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Selain dari melepaskan bingkai untuk mengurangkan kesesakan, terus ubah kadar bit secara dinamik.\n\nPerhatian tindakan ini boleh menyebabkan kelengahan kepada para penonton jika tiba-tiba berlaku kesesakan mendadak.\nApabila kadar bit jatuh, ia mengambil masa beberapa minit untuk pulih.\n\nBuat masa ini hanya RTMP disokong."
@@ -753,6 +772,7 @@
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Tidak dapat menganggar penggunaan ingatan. Sila tetapkan had ingatan maksimum."
 Basic.Settings.Output.ReplayBuffer.Prefix="Awalan Nama Fail Penimbal Main Semula"
 Basic.Settings.Output.ReplayBuffer.Suffix="Akhiran"
+Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Penimbal main balik tidak dapat digunakan ketika jenis rakaman ditetapkan menjadi Output Suai (FFmpeg)."
 Basic.Settings.Output.Simple.SavePath="Laluan Rakaman"
 Basic.Settings.Output.Simple.RecordingQuality="Kualiti Rakaman"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Sama seperti strim"
@@ -764,7 +784,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Amaran: Rakaman tidak dapat dijeda jika kualiti rakaman ditetapkan pada \"Sama dengan strim\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Amaran: Format rakaman yang dipilih pada masa ini tidak serasi dengan pengekod strim yang dipilih."
 Basic.Settings.Output.Simple.Warn.Encoder="Amaran: Rakaman dengan satu pengekod perisian pada kualiti berbeza berbanding strim akan memerlukan lebih penggunaan CPU jika strim dan rakam pada masa yang sama."
-Basic.Settings.Output.Simple.Warn.Lossless="Amaran: Kualiti tak hilang akan menjana saiz fail yang amat besar! Kualiti tak hilang menggunakan sehingga 7 gigabait ruang cakera per minit pada resolusi dan kadar bingkai tinggi. Tak hilang tidak disarankan untuk rakaman panjang melainkan anda memang mempunyai ruang cakea yang sangat besar."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Anda pasti mahu guna kualiti tak hilang?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Amaran kualiti tak hilang!"
 Basic.Settings.Output.Simple.Encoder.Software="Perisian (x264)"
@@ -854,8 +873,34 @@
 Screenshot.Preview="Tangkap Skrin (Pratonton)"
 Screenshot.Scene="Tangkap Skrin (Adegan)"
 Screenshot.Source="Tangkap Skrin (Sumber)"
+FilenameFormatting.TT.CCYY="Tahun, empat digit"
+FilenameFormatting.TT.YY="Tahun, dua digit terakhir (00-99)"
+FilenameFormatting.TT.MM="Bulan sebagai nombor desimal (01-12)"
+FilenameFormatting.TT.DD="Hari dalam bulan, diawali-sifar (01-31)"
+FilenameFormatting.TT.hh="Jam dalam format 24j (00-23)"
+FilenameFormatting.TT.mm="Minit (00-59)"
 FilenameFormatting.TT.ss="Saat (00-59)"
+FilenameFormatting.TT.Percent="Tanda %"
+FilenameFormatting.TT.a="Nama hari bekerja singkatan"
+FilenameFormatting.TT.A="Nama hari bekerja"
+FilenameFormatting.TT.b="Nama bulan ringkasan"
+FilenameFormatting.TT.B="Nama bulan penuh"
+FilenameFormatting.TT.d="Hari dalam bulan, diawali-sifar (01-31)"
+FilenameFormatting.TT.H="Jam dalam format 24j (00-23)"
+FilenameFormatting.TT.I="Jam dalam format 12j (01-12)"
+FilenameFormatting.TT.m="Bulan dalam nombor desimal (01-12)"
+FilenameFormatting.TT.M="Minit (00-59)"
+FilenameFormatting.TT.p="Tanda AM atau PM"
+FilenameFormatting.TT.s="Masa dalam saat semenjak epoch UNIX"
 FilenameFormatting.TT.S="Saat (00-59)"
+FilenameFormatting.TT.y="Tahun, dua digit terakhir (00-99)"
+FilenameFormatting.TT.Y="Tahun"
+FilenameFormatting.TT.z="Ofset ISO 8601 dari UTC dalam zon waktu"
+FilenameFormatting.TT.Z="Nama atau singkatan zon waktu"
+FilenameFormatting.TT.FPS="Bingkai sesaat"
+FilenameFormatting.TT.CRES="Resolusi (kanvas) asas"
+FilenameFormatting.TT.ORES="Resolusi (berskala) output"
+FilenameFormatting.TT.VF="Format video"
 Basic.Settings.Video.Adapter="Penyesuai Video"
 Basic.Settings.Video.BaseResolution="Resolusi (Kanvas) Asas"
 Basic.Settings.Video.ScaledResolution="Resolusi (Berskala) Output"
@@ -883,8 +928,8 @@
 Basic.Settings.Audio.PeakMeterType="Jenis Meter Puncak"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Puncak Sampel"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Puncak Benar (Penggunaan CPU lebih tinggi)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="AMARAN: Audio bunyi keliling dibenarkan."
-Basic.Settings.Audio.MultichannelWarning="Jika menstrim, sila periksa sama ada perkhidmatan penstriman anda menyokong kedua-dua cernaan bunyi keliling dan main balik bunyi keliling. Facebook 360 Live merupakan salah satu contoh bunyi keliling disokong sepenuhnya. Walaupun kedua-dua Facebook Live dan YouTube Live menerima cernaan keliling, Facebook Live mengubahnya ke stereo, dan YouTube Live hanya memainkan dua saluran.\n\nPenapis audio OBS adalah serasi dengan bunyi keliling, walaupun tiada jaminan sokongan pemalam VST."
+Basic.Settings.Audio.MultichannelWarning.Enabled="AMARAN: Audio bunyi keliling dibenarkan."
+Basic.Settings.Audio.MultichannelWarning="Jika menstrim, sila periksa sama ada perkhidmatan penstriman anda menyokong kedua-dua cernaan bunyi keliling dan main balik bunyi keliling. Facebook 360 Live merupakan salah satu contoh bunyi keliling disokong sepenuhnya. YouTube Live menyokong cernaan audio 5.1 (dan main balik pada TV).\n\nPenapis audio OBS adalah serasi dengan bunyi keliling, walaupun tiada jaminan sokongan pemalam VST."
 Basic.Settings.Audio.MultichannelWarning.Title="Benarkan audio bunyi keliling?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Anda pasti mahu membenarkan audio bunyi keliling?"
 Basic.Settings.Audio.Devices="Peranti Audio Sejagat"
@@ -930,7 +975,6 @@
 Basic.Settings.Advanced.FormatWarning="Amaran: Format warna selain daripada NV12/P010 lebih digunakan untuk rakaman, dan tidak disyorkan ketika menstrim. Penstriman mungkin meningkatkan penggunaan CPU kerana penukaran format warna."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Amaran: Format ketepatan-tinggi lebih biasa digunakan dengan ruang warna HDR."
 Basic.Settings.Advanced.FormatWarning2100="Amaran: Rakaman 2100 perlu mengikut format yang lebih tepat."
-Basic.Settings.Advanced.Audio.BufferingTime="Masa Menimbal Audio"
 Basic.Settings.Advanced.Video.ColorFormat="Format Warna"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 satah)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 satah)"
@@ -955,6 +999,7 @@
 Basic.Settings.Advanced.Network="Rangkaian"
 Basic.Settings.Advanced.Network.Disabled="Protokol penstriman terpilih semasa tidak menyokong perubahan tetapan rangkaian."
 Basic.Settings.Advanced.Network.BindToIP="Ikat ke IP"
+Basic.Settings.Advanced.Network.IPFamily="Keluarga IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Benarkan pengoptimuman rangkaian"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Benarkan kecepatan TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Percubaan untuk membuat output RTMP lebih mesra berbanding aplikasi-aplikasi peka kependaman lain dalam rangkaian dengan mengatur kadar penghantaran.\nIa mungkin dapat meningkatkan risiko bingkai terlepas dalam sambungan tidak stabil."
@@ -985,6 +1030,7 @@
 Basic.Settings.Hotkeys.Filter="Penapis"
 Basic.Settings.Hotkeys.FilterByHotkey="Tapis mengikut Kekunci Panas"
 Basic.Settings.Hotkeys.DuplicateWarning="Kekunci panas ini dikongsi lebih daripada satu tindakan, klik untuk tunjukkan konflik"
+Basic.Settings.Hotkeys.PleaseWait="Memuatkan kekunci panas, tunggu sebentar..."
 Basic.Hotkeys.SelectScene="Alih ke adegan"
 Basic.SystemTray.Show="Tunjuk"
 Basic.SystemTray.Hide="Sembunyi"
@@ -1013,6 +1059,8 @@
 SceneItemShow="Tunjuk '%1'"
 SceneItemHide="Sembunyi '%1'"
 OutputWarnings.NoTracksSelected="Anda mesti memilih sekurang-kurangnya satu trek"
+OutputWarnings.NoTracksSelectedOnExit.Title="Ralat Tetapan Output"
+OutputWarnings.NoTracksSelectedOnExit.Text="Semua output mesti sekurang-kurangnya telah memilih satu trek audio."
 OutputWarnings.MP4Recording="Amaran: Rakaman disimpan ke MP4/MOV tidak boleh dipulihkan jika fail gagal dimuktamadkan (iaitu disebabkan oleh BSOD, ketiadaan kuasa, dll). Jika anda mahu rakam trek-trek audio berbilang menggunakan MKV dan remux rakaman ke MP4/MOV setelah ia selesai (Fail → Rakaman Remux)"
 OutputWarnings.CannotPause="Amaran: Rakaman tidak dapat dijeda jika pengekod rakaman ditetapkan pada \"(Guna pengekod strim)\""
 OutputWarnings.CodecIncompatible="Pemilihan pengekod audio atau video telah ditetapkan semula kerana ketidakserasian. Sila pilih pengekod yang serasi daripada senarai."
@@ -1038,6 +1086,7 @@
 About.GetInvolved="Libatkan Diri"
 About.Authors="Para Pengarang"
 About.License="Lesen"
+About.Error="Ralat! Fail gagal dibaca.\n\nPergi ke: %1"
 About.Contribute="Sokong Projek OBS"
 AddUrl.Title="Tambah Sumber melalui URL"
 AddUrl.Text="Anda telah menyeret satu URL ke dalam OBS. Ia akan menambah pautan sebagai sumber secara automatik. Teruskan?"
@@ -1058,14 +1107,12 @@
 LoadProfileNeedsRestart="Profil mengandungi tetapan yang memerlukan memulakan semula OBS:\n%1\n\nAdakah anda mahu memulakan semula OBS agar tetapan ini dapat dilaksanakan?"
 ContextBar.NoSelectedSource="Tiada sumber dipilih"
 ContextBar.ResetTransform="Tetap Semula Jelmaan"
-ContextBar.FitToCanvas="Suai Muat ikut Kanvas"
 ContextBar.MediaControls.PlayMedia="Main Media"
 ContextBar.MediaControls.PauseMedia="Jeda Media"
 ContextBar.MediaControls.StopMedia="Henti Media"
 ContextBar.MediaControls.RestartMedia="Mula Semula Media"
 ContextBar.MediaControls.PlaylistNext="Berikutnya dalam Senarai Main"
 ContextBar.MediaControls.PlaylistPrevious="Terdahulu dalam Senarai Main"
-ContextBar.MediaControls.MediaProperties="Sifat-sifat Media"
 ContextBar.MediaControls.BlindSeek="Widget Jangkau Media"
 YouTube.Auth.Ok="Pengesahihan berjaya diselesaikan.\nAnda boleh tutup halaman ini sekarang."
 YouTube.Auth.NoCode="Proses pengesahihan tidak selesai."
@@ -1147,3 +1194,5 @@
 YouTube.Errors.liveChatEnded="Strim langsung telah tamat."
 YouTube.Errors.messageTextInvalid="Teks mesej tidak sah."
 YouTube.Errors.rateLimitExceeded="Anda telah menghantar mesej terlalu pantas."
+YouTube.DocksRemoval.Title="Kosongkan Dock Pelayar Legasi YouTube"
+YouTube.DocksRemoval.Text="Playar dock ini akan dibuang sebagai tidak digunakan:\n\n%1\nGunakan \"Docks/YouTube Live Control Room\" sebaliknya."

obs-studio-29.1.3.tar.xz/UI/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/nb-NO.ini Changed

@@ -91,15 +91,24 @@
 LogViewer="Logg leser"
 ShowOnStartup="Vis ved oppstart"
 OpenFile="Åpne fil"
-AddValue="Legg til %1"
 AddSource="Legg til kilde"
+RemoveScene="Fjern den valgte scenen"
+RemoveSource="Fjern valgt(e) kilde(r)"
 MoveSceneUp="Flytt scene opp"
 MoveSceneDown="Flytt scene ned"
 MoveSourceUp="Flytt kilde(r) opp"
 MoveSourceDown="Flytt kilde(r) ned"
+SourceProperties="Åpne kildeegenskaper"
+SourceFilters="Åpne kildefiltre"
+MixerToolbarMenu="Lydmikser-meny"
+SceneFilters="Åpne scenefiltre"
+List="Liste"
+Grid="Rutenett"
+PluginsFailedToLoad.Title="Utvidelsesinnlastingsfeil"
 AlreadyRunning.Title="OBS kjører allerede"
 AlreadyRunning.Text="OBS kjører allerede! Hvis dette ikke var bevisst, vennligst lukk alle eksisterende kjørende tilfeller av OBS før du kjører noen nye. Hvis du har satt OBS til å minimere til oppgavelinjen, vennligst sjekk om den fortsatt kjører der."
 AlreadyRunning.LaunchAnyway="Start uansett"
+AutoSafeMode.LaunchNormal="Kjør normalt"
 ChromeOS.Title="Usupportert platform"
 Wine.Title="Wine oppdaget"
 Wine.Text="Å kjøre OBS i Wine er ikke støttet, og mange funksjoner som opptak eller enhetskilder vil ikke fungere eller bare i begrenset kapasitet. Det anbefales å kjøre en opprinnelig versjon av OBS i stedet. for eksempel <a href='https://flathub.org/apps/details/com.obsproject.Studio'>vår Flatpak versjon</a> eller operativsystemets pakker."
@@ -163,7 +172,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Egendefinert …"
 Basic.AutoConfig.StreamPage.Server="Tjener"
 Basic.AutoConfig.StreamPage.StreamKey="Strømmenøkkel"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Lenke)"
 Basic.AutoConfig.StreamPage.EncoderKey="Enkoder nøkkel"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Tilkobla konto"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Beregn bitfrekvensen med en båndbreddetest (Kan ta noen minutter)"
@@ -213,14 +221,12 @@
 Updater.UpdateNow="Oppdater nå"
 Updater.RemindMeLater="Minn meg på det senere"
 Updater.Skip="Hopp over versjonen"
-Updater.Running.Title="Programmet er aktivt"
-Updater.Running.Text="Utganger er aktive, deaktiver alle aktive utganger før du forsøker å oppdatere"
 Updater.NoUpdatesAvailable.Title="Ingen oppdateringer er tilgjengelig"
 Updater.NoUpdatesAvailable.Text="Ingen oppdateringer er tilgjengelig"
+Updater.BranchNotFound.Title="Oppdateringskanalen ble fjernet"
+Updater.RepairButUpdatesAvailable.Title="Integritetssjekken er utilgjengelig"
 Updater.RepairConfirm.Title="Bekreft integritetssjekk"
 Updater.FailedToLaunch="Kunne ikke starte oppdaterer"
-Updater.GameCaptureActive.Title="Spillopptak aktivt"
-Updater.GameCaptureActive.Text="Spillopptakskrokbiblioteket er for øyeblikket i bruk. Vennligst lukk ethvert spill/program som blir tatt opp (eller start Windows på nytt), og prøv igjen."
 QuickTransitions.SwapScenes="Bytt forhåndsvisning/programscener etter overgang"
 QuickTransitions.SwapScenesTT="Bytter forhåndsvisnings- og programscenen etter overgang (hvis programmets opprinnelige scene fortsatt eksisterer).\nDette vil ikke annullere endringer som kan ha blitt gjort på programmets opprinnelige scene."
 QuickTransitions.DuplicateScene="Dupliser scene"
@@ -233,6 +239,8 @@
 Basic.SceneTransitions="Sceneoverganger"
 Basic.TransitionDuration="Varighet"
 Basic.TogglePreviewProgramMode="Studiomodus"
+Basic.EnablePreviewProgramMode="Skru på studiomodus"
+Basic.DisablePreviewProgramMode="Skru av studiomodus"
 Undo.Undo="Angre"
 Undo.Redo="Gjør om"
 Undo.Add="Legg til \"%1\""
@@ -281,6 +289,7 @@
 Undo.GroupItems="Grupper elementer i '%1'"
 TransitionNameDlg.Text="Gi et navn til overgangen"
 TransitionNameDlg.Title="Overgangsnavn"
+TitleBar.PortableMode="Bærbar modus"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scener"
 NameExists.Title="Navnet eksisterer allerede"
@@ -300,9 +309,11 @@
 ConfirmRemove.Title="Bekreft Fjerning"
 ConfirmRemove.Text="Er du sikker på at du vil fjerne '%1'?"
 ConfirmRemove.TextMultiple="Er du sikker du ønsker å fjerne %1 filer?"
+ConfirmReset.Title="Tilbakestill egenskaper"
 Output.StartStreamFailed="Kan ikke starte streaming"
 Output.StartRecordingFailed="Kan ikke starte innspillingen"
 Output.StartReplayFailed="Kunne ikke å starte opp omspillingsbufferen"
+Output.StartVirtualCamFailed="Mislyktes i å starte opp virtuelt kamera"
 Output.StartFailedGeneric="Oppstart av utdata har mislyktes. Vennligst se loggen for detaljer.\n\nBemerk at dersom du bruker NVENC- eller AMD-enkodere, pass på at skjermdriverne er oppdatert."
 Output.ReplayBuffer.PauseWarning.Title="Kan ikke lagre repriser mens innspillingen er på pause"
 Output.ReplayBuffer.PauseWarning.Text="Advarsel: Repriser kan ikke lagres mens innspillingen er satt på pause."
@@ -314,7 +325,6 @@
 Output.ConnectFail.Disconnected="Koblet fra tjeneren."
 Output.StreamEncodeError.Title="Kodingsfeil"
 Output.StreamEncodeError.Msg="En kodingsfeil skjedde under strømmingen."
-Output.StreamEncodeError.Msg.LastError="En kodingsfeil oppstod under strømming:\n\n%1"
 Output.RecordFail.Title="Kunne ikke starte opptak"
 Output.RecordFail.Unsupported="Utgangsformatet støttes enten ikke eller støtter ikke mer enn ett lydspor. Kontroller innstillingene og prøv igjen."
 Output.RecordNoSpace.Title="Ikke nok diskplass"
@@ -367,15 +377,17 @@
 MissingFiles.AutoSearchText="OBS har funnet flere treff for manglende filer i den mappen. Ønsker du å legge de til?"
 MissingFiles.NoMissing.Title="Sjekk for manglende filer"
 MissingFiles.NoMissing.Text="Ingen filer ser ut til å mangle."
+MacPermissions.MenuAction="Gå gjennom apptillatelser …"
 MacPermissions.Title="Gå gjennom apptillatelser"
+MacPermissions.AccessGranted="Tilgang innvilget"
 MacPermissions.RequestAccess="Be om tilgang"
+MacPermissions.OpenPreferences="Åpne %1-innstillinger"
 MacPermissions.Item.ScreenRecording="Skjermopptak"
 MacPermissions.Item.Camera="Kamera"
 MacPermissions.Item.Microphone="Mikrofon"
 MacPermissions.Item.Accessibility="Tilgjengelighet"
 MacPermissions.Continue="Fortsett"
-UpdateAvailable="Ny oppdatering tilgjengelig"
-UpdateAvailable.Text="Versjon %1.%2.%3 er nå tilgjengelig. <a href='%4'>Klikk her for å laste ned</a>"
+SourceLeak.Title="Kildeopprydningsfeil"
 Basic.DesktopDevice1="Skrivebordlyd"
 Basic.DesktopDevice2="Skrivebordlyd 2"
 Basic.AuxDevice1="Mikrofon/Aux"
@@ -393,6 +405,8 @@
 BlendingMethod.Default="Standard"
 BlendingMethod.SrgbOff="SRGB Av"
 BlendingMode="Blendende modus"
+BlendingMode.Additive="Legg til"
+BlendingMode.Subtract="Trekk fra"
 BlendingMode.Screen="Skjerm"
 BlendingMode.Multiply="Multipliser"
 BlendingMode.Lighten="Lysere"
@@ -405,6 +419,7 @@
 VolControl.SliderMuted="Volumskyveknappen for '%1': (dempet)"
 VolControl.Mute="Demp '%1'"
 VolControl.Properties="Egenskaper for '%1'"
+VolControl.UnassignedWarning.Title="Utildelt lydkilde"
 Basic.Main.AddSceneDlg.Title="Ny Scene"
 Basic.Main.AddSceneDlg.Text="Vennligst gi et navn til scenen."
 Basic.Main.AddSceneCollection.Title="Legg til scenesamling"
@@ -429,6 +444,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (selvvalg: %2)"
 Basic.PropertiesWindow.SelectColor="Velg farge"
 Basic.PropertiesWindow.SelectFont="Velg skrifttype"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Velg en skrifttype"
 Basic.PropertiesWindow.ConfirmTitle="Innstillingene er endret"
 Basic.PropertiesWindow.Confirm="Det er ulagrede endringer. Vil du beholde dem?"
 Basic.PropertiesWindow.NoProperties="Ingen egenskaper er tilgjengelige"
@@ -533,11 +549,11 @@
 Basic.Main.Ungroup="Adskill"
 Basic.Main.GridMode="Rutenettmodus"
 Basic.Main.ListMode="Listemodus"
+Basic.Main.VirtualCamConfig="Sett opp virtuelt kamera"
 Basic.VCam.VirtualCamera="Virtuelt kamera"
 Basic.VCam.OutputType="Utdatatype"
 Basic.VCam.OutputSelection="Utdatavalg"
-Basic.VCam.Internal="Intern"
-Basic.VCam.InternalPreview="Forhåndsvis utdata"
+Basic.VCam.OutputType.Program="Program (standard)"
 Basic.MainMenu.File="&Fil"
 Basic.MainMenu.File.Export="&Eksportér"
 Basic.MainMenu.File.Import="&Importér"
@@ -579,12 +595,13 @@
 Basic.MainMenu.Edit.AdvAudio="&Avanserte lydinnstillinger"
 Basic.MainMenu.View="&Vis"
 Basic.MainMenu.View.Toolbars="Verk&tøylinjer"
-Basic.MainMenu.View.ListboxToolbars="Knapper for Scene/Kilder"
 Basic.MainMenu.View.ContextBar="Verktøylinje for kilde"
-Basic.MainMenu.View.SceneTransitions="S&ceneoverganger"
 Basic.MainMenu.View.SourceIcons="Kilde &ikoner"
 Basic.MainMenu.View.StatusBar="&Statuslinje"
 Basic.MainMenu.View.Fullscreen.Interface="Fullskjermsgrensesnitt"
+Basic.MainMenu.View.ResetUI="&Tilbakestill grensesnitt"
+Basic.MainMenu.View.AlwaysOnTop="&Alltid fremst"
+Basic.MainMenu.View.SceneListMode="Scenelistemodus"
 Basic.MainMenu.SceneCollection="&Scenesamling"
 Basic.MainMenu.Profile="&Profil"
 Basic.MainMenu.Profile.Import="Importer profil"
@@ -592,18 +609,21 @@
 Basic.MainMenu.SceneCollection.Import="Importer Scenesamling"
 Basic.MainMenu.SceneCollection.Export="Eksporter scenesamling"
 Basic.MainMenu.Profile.Exists="Profilen eksisterer allerede"
-Basic.MainMenu.SceneCollection.Exists="Scenesamlingen eksisterer allerede"
 Basic.MainMenu.Tools="Verk&tøy"
 Basic.MainMenu.Help="&Hjelp"
 Basic.MainMenu.Help.HelpPortal="&Portal for hjelp"
 Basic.MainMenu.Help.Website="Besøk nettstedet (&W)"
 Basic.MainMenu.Help.Discord="Bli med i &Discord-serveren"
+Basic.MainMenu.Help.WhatsNew="Hva er nytt"
 Basic.MainMenu.Help.Logs="&Loggfiler"
 Basic.MainMenu.Help.Logs.ShowLogs="Vi&s loggfiler"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Last opp nåværende loggfil (&C)"
+Basic.MainMenu.Help.Logs.UploadLastLog="Last opp den &forrige loggfilen"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vis gjeldende logg"
+Basic.MainMenu.Help.ReleaseNotes="Lanseringsnotater"
 Basic.MainMenu.Help.CheckForUpdates="Se etter oppdateringer"
 Basic.MainMenu.Help.Repair="Sjekk filintegritet"
+Basic.MainMenu.Help.RestartNormal="Start på nytt i normal modus"
 Basic.MainMenu.Help.CrashLogs="K&rasjrapporter"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Vi&s krasjrapporter"
 Basic.MainMenu.Help.About="Om (&A)"
@@ -614,6 +634,7 @@
 Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Språk"
 Basic.Settings.General.Updater="Oppdateringer"
+Basic.Settings.General.UpdateChannel="Oppdateringskanal"
 Basic.Settings.General.UpdateChannelDisabled="(Skrudd av)"
 Basic.Settings.General.UpdateChannelDefault="(Standard)"
 Basic.Settings.General.EnableAutoUpdates="Automatisk se etter oppdateringer ved oppstart"
@@ -657,10 +678,13 @@
 Basic.Settings.General.MultiviewLayout.Vertical.Right="Loddrett, høyre (8 scener)"
 Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Horisontalt, Topp (18 scener)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Vannrett, topp (24 scener)"
+Basic.Settings.General.MultiviewLayout.4Scene="Kun scener (4 scener)"
+Basic.Settings.General.MultiviewLayout.9Scene="Kun scener (9 scener)"
+Basic.Settings.General.MultiviewLayout.16Scene="Kun scener (16 scener)"
+Basic.Settings.General.MultiviewLayout.25Scene="Kun scener (25 scener)"
 Basic.Settings.General.ChannelName.stable="Stabil"
 Basic.Settings.General.ChannelDescription.stable="Nyeste stabile versjon"
 Basic.Settings.Stream="Strøm"
-Basic.Settings.Stream.StreamType="Strømmetype"
 Basic.Settings.Stream.Custom.UseAuthentication="Bruk autentisering"
 Basic.Settings.Stream.Custom.Username="Brukernavn"
 Basic.Settings.Stream.Custom.Password="Passord"
@@ -682,8 +706,9 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Maksimum BPS: %1"
 Basic.Settings.Output="Utgang"
 Basic.Settings.Output.Format="Opptaksformat"
+Basic.Settings.Output.Format.fMP4="Fragmentert MP4 (.mp4)"
+Basic.Settings.Output.Format.fMOV="Fragmentert MOV (.mov)"
 Basic.Settings.Output.SelectDirectory="Velg opptaksmappe"
-Basic.Settings.Output.SelectFile="Velg opptaksfil"
 Basic.Settings.Output.DynamicBitrate="Endre bitrate dynamisk for å håndtere overbelastning"
 Basic.Settings.Output.DynamicBitrate.Beta="Endre bitrate dynamisk for å håndtere overbelastning (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="I stedet for å droppe bilderuter for å redusere overbelastning, endres bitrate dynamisk underveis.\n\nMerk at dette kan øke forsinkelsen for seerne hvis det plutselig er en betydelig overbelastning.\nNår bitraten synker, kan gjenopprettingen ta opp mot noen minutter.\n\nFor øyeblikket støttes bare RTMP."
@@ -708,7 +733,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Advarsel: Strømmens bitrate for lyd har blitt satt til '%1'. Dette er over grensen til valgt strømmeplatform."
 Basic.Settings.Output.Simple.Warn.CannotPause="Advarsel: Innspillinger kan ikke pauses hvis opptakskvaliteten er satt til \"Samme som strøm\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Advarsel: Opptak med programvarekoder i en annen kvalitetsinnstilling enn strømmingen vil kreve ekstra prosessorressurser om du strømmer og tar opp på samme tid."
-Basic.Settings.Output.Simple.Warn.Lossless="Advarsel: Tapsfri kvalitet resulterer i enormt store filstørrelser! Denne innstillingen kan bruke oppimot 7 GB diskplass per minutt ved opptak med høy oppløsning og bildefrekvens. Tapsfri kvalitet anbefales ikke for lange opptak med mindre du har store mengder diskplass tilgjengelig."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Er du sikker på at du vil bruke tapsfri kvalitet?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Tapsfri kvalitet advarsel!"
 Basic.Settings.Output.Simple.Encoder.Software="Programvare (x264)"
@@ -723,7 +747,9 @@
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Maskinvare (Apple, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Maskinvare (Apple, HEVC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Programvare (Forhåndsinnstilt til x264 med lav CPU-bruk, øker filstørrelsen)"
+Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (standard)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD spor (Bruker spor 2)"
+Basic.Settings.Output.Simple.RecAudioTrack="Lydspor"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Inkompatibel oppløsning / bildefrekvens"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Strømmeplatformen støtter ikke din valgte utgangsoppløsning og/eller bildefrekvens. De vil bli endret til næreste kompatible verdier: \n\n%1\n\n Ønsker du å fortsette?"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Oppløsning: %1"
@@ -734,6 +760,9 @@
 Basic.Settings.Output.RetryDelay="Gjenforsøksintervall"
 Basic.Settings.Output.MaxRetries="Høyst antall tilkoblingsforsøk"
 Basic.Settings.Output.EncoderPreset="Kodingsinstillinger"
+Basic.Settings.Output.EncoderPreset.ultrafast="%1 (lav CPU-bruk, laveste kvalitet)"
+Basic.Settings.Output.EncoderPreset.veryfast="%1 (standard) (middels CPU-bruk, standard kvalitet)"
+Basic.Settings.Output.EncoderPreset.fast="%1 (høy CPU-bruk, høy kvalitet)"
 Basic.Settings.Output.CustomEncoderSettings="Egendefinerte koderinnstillinger"
 Basic.Settings.Output.CustomMuxerSettings="Egendefinerte mukserinnstillinger"
 Basic.Settings.Output.NoSpaceFileName="Lag filnavn uten mellomrom"
@@ -776,14 +805,38 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Nøkkelbildeintervall (bilder)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Vis alle kodeker (selv om potensielt ikke-kompatibel)"
 Basic.Settings.Output.Adv.FFmpeg.Settings="FFmpeg-innstillinger"
+Basic.Settings.Output.EnableSplitFile="Automatisk fil-oppdeling"
 Basic.Settings.Output.SplitFile.TypeTime="Del opp etter tid"
 Basic.Settings.Output.SplitFile.TypeSize="Del opp etter størrelse"
+Basic.Settings.Output.SplitFile.Time="Oppdelt tid"
 Screenshot="Skjermbilde av forhåndsvisning"
 Screenshot.SourceHotkey="Skjermbilde av valgt kilde"
 Screenshot.StudioProgram="Skjermbilde (program)"
 Screenshot.Preview="Skjermbilde (forhåndsvisning)"
 Screenshot.Scene="Skjermbilde (Scene)"
 Screenshot.Source="Skjermbilde (Kilde)"
+FilenameFormatting.TT.CCYY="Årstall, fire sifre"
+FilenameFormatting.TT.YY="Årstall, de to siste sifrene (00-99)"
+FilenameFormatting.TT.MM="Måned som et 2-sifret tall (01-12)"
+FilenameFormatting.TT.DD="Dagen i måneden, 2-sifret (01-31)"
+FilenameFormatting.TT.hh="Time i 24-timers format (00-23)"
+FilenameFormatting.TT.mm="Minutt (00-59)"
+FilenameFormatting.TT.ss="Sekund (00-59)"
+FilenameFormatting.TT.Percent="Et %-tegn"
+FilenameFormatting.TT.A="Full ukedagsnavn"
+FilenameFormatting.TT.B="Fullt månedsnavn"
+FilenameFormatting.TT.d="Dagen i måneden, 2-sifret (01-31)"
+FilenameFormatting.TT.H="Timer i 24-timers format (00-23)"
+FilenameFormatting.TT.m="Måned som et 2-sifret tall (01-12)"
+FilenameFormatting.TT.M="Minutt (00-59)"
+FilenameFormatting.TT.S="Sekund (00-59)"
+FilenameFormatting.TT.y="Årstall, de to siste sifrene (00-99)"
+FilenameFormatting.TT.Y="År"
+FilenameFormatting.TT.Z="Tidssonenavn eller -forkortelse"
+FilenameFormatting.TT.FPS="Bilder per sekund"
+FilenameFormatting.TT.CRES="Grunnoppløsning (lerret)"
+FilenameFormatting.TT.ORES="Utdataoppløsning (skalert)"
+FilenameFormatting.TT.VF="Videoformat"
 Basic.Settings.Video="Bilde"
 Basic.Settings.Video.Adapter="Bildeadapter"
 Basic.Settings.Video.BaseResolution="Grunnoppløsning (lerret)"
@@ -811,8 +864,7 @@
 Basic.Settings.Audio.PeakMeterType="Toppunktmålertype"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Samplingstoppunkt"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Ekte toppunkt (Høyere CPU-bruk)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Advarsel: Surroundlyd er aktivert."
-Basic.Settings.Audio.MultichannelWarning="Hvis du strømmer, sjekk om den valgte strømmetjenesten støtter både surround-lydinntak og surround-lydavspilling. Facebook 360 Live, Mixer RTMP, og Smashcast er eksempler hvor surroundlyd er fullt støttet. Selv om Facebook Live og YouTube Live begge støtter surround-innføring, nedmikser Facebook Live det ned til Stereo, og YouTube Live spiller bare av to kanaler.\n\nOBS-lydfiltre er kompatible med surroundlyd, selv om VST-tilleggsstøtte ikke er garantert."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Advarsel: Surroundlyd er aktivert."
 Basic.Settings.Audio.MultichannelWarning.Title="Vil du aktivere surround-lyd?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Er du sikker på at du vil aktivere surround-lyd?"
 Basic.Settings.Audio.Devices="Globale lyd enheter"
@@ -830,6 +882,7 @@
 Basic.Settings.Audio.Disabled="Deaktivert"
 Basic.Settings.Accessibility="Tilgjengelighet"
 Basic.Settings.Accessibility.ColorOverrides="Bruk forskjellige farger"
+Basic.Settings.Accessibility.ColorOverrides.Preset="Farge-forhåndsvalg"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Default="Standard"
 Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="Tilpasset"
 Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="Alternativ for fargeblinde"
@@ -839,7 +892,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="Over Normal"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Under normal"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Inaktiv"
-Basic.Settings.Advanced.Audio.BufferingTime="Lydbuffertid"
 Basic.Settings.Advanced.Video.ColorFormat="Fargeformat"
 Basic.Settings.Advanced.Video.ColorSpace="Fargerom"
 Basic.Settings.Advanced.Video.ColorRange="Fargespekter"
@@ -881,6 +933,7 @@
 Basic.Settings.Hotkeys="Hurtigtaster"
 Basic.Settings.Hotkeys.Pair="Tastekombinasjoner delt med '%1' vil veksle"
 Basic.Settings.Hotkeys.Filter="Filtrer"
+Basic.Settings.Hotkeys.FilterByHotkey="Filtrer etter hurtigtast"
 Basic.Hotkeys.SelectScene="Bytt til scene"
 Basic.SystemTray.Show="Vis"
 Basic.SystemTray.Hide="Skjul"
@@ -912,8 +965,12 @@
 SceneItemShow="Vis '%1'"
 SceneItemHide="Gjem '%1'"
 OutputWarnings.NoTracksSelected="Du må velge minst ett spor"
+OutputWarnings.NoTracksSelectedOnExit.Title="Utdatainnstillingsfeil"
 OutputWarnings.MP4Recording="Advarsel: Opptak lagret i MP4/MOV vil bli slettet dersom filen ikke kan fullføres (f.eks. som følge av BSOD, tap av strøm, osv.) Hvis du vil registere flere lydspor, vurder å bruke MKV og remuks inspillingen til MP4/MOV etter at det er ferdig (Fil → Remuks opptak)"
 OutputWarnings.CannotPause="Advarsel: Innspillinger kan ikke pauses hvis opptakskoderen er satt til \"(Bruk strømkoder)\""
+CodecCompat.Incompatible="(Inkompatibel med %1)"
+CodecCompat.ContainerPlaceholder="Velg format …"
+CodecCompat.ContainerMissingOnExit.Title="Ingen format er valgt"
 FinalScene.Title="Slett scene"
 FinalScene.Text="Det må være minst én scene."
 NoSources.Title="Ingen kilder"
@@ -932,6 +989,7 @@
 About.Contribute="Støtt OBS-prosjektet"
 AddUrl.Title="Legg til kilde via URL"
 AddUrl.Text="Du har dratt en URL til OBS. Dette vil automatisk legge til lenken som kilde. Fortsette?"
+ResizeOutputSizeOfSource="Endre utdatastørrelsen (kildestørrelse)"
 ResizeOutputSizeOfSource.Continue="Vil du fortsette?"
 PreviewTransition="Forhåndsvis overgang"
 Importer="Importverktøy for scenesamlinger"
@@ -946,14 +1004,12 @@
 NeedsRestart="OBS Studio må startes på nytt. Vil du starte på nytt nå?"
 ContextBar.NoSelectedSource="Ingen kilde er valgt"
 ContextBar.ResetTransform="Tilbakestill transformering"
-ContextBar.FitToCanvas="Tilpass til lerret"
 ContextBar.MediaControls.PlayMedia="Spill av media"
 ContextBar.MediaControls.PauseMedia="Pause media"
 ContextBar.MediaControls.StopMedia="Stop media"
 ContextBar.MediaControls.RestartMedia="Start media på nytt"
 ContextBar.MediaControls.PlaylistNext="Neste i Spilleliste"
 ContextBar.MediaControls.PlaylistPrevious="Forrige i spilleliste"
-ContextBar.MediaControls.MediaProperties="Media egenskaper"
 ContextBar.MediaControls.BlindSeek="Widget for media søker"
 YouTube.Auth.Ok="Autorisasjon fullført.\nDu kan nå lukke denne siden."
 YouTube.Auth.NoCode="Autoriseringsprosessen ble ikke fullført."
@@ -961,6 +1017,7 @@
 YouTube.Auth.WaitingAuth.Title="YouTube brukerautorisasjon"
 YouTube.Auth.WaitingAuth.Text="Vennligst fullfør autorisasjonen i din eksterne nettleser. Hvis den eksterne nettleseren ikke åpnes, følg denne lenken og fullfør autorisasjonen: %1"
 YouTube.AuthError.Text="Fikk ikke tak i kanalinformasjonen: %1."
+YouTube.Actions.WindowTitle="YouTube-sendingsoppsett - Kanal: %1"
 YouTube.Actions.CreateNewEvent="Opprett ny sending"
 YouTube.Actions.ChooseEvent="Velg eksisterende sending"
 YouTube.Actions.Title="Tittel*"
@@ -992,6 +1049,7 @@
 YouTube.Actions.Choose_Ready="Velg sending"
 YouTube.Actions.Choose_GoLive="Velg sending og begynn å strømme"
 YouTube.Actions.Create_Schedule="Planlegg sending"
+YouTube.Actions.Create_Schedule_Ready="Planlegg og velg sending"
 YouTube.Actions.Dashboard="Åpne YouTube Studio"
 YouTube.Actions.Error.Title="Feil ved opprettelse av strøm"
 YouTube.Actions.Error.Text="YouTube tilgangsfeil '%1'. En detaljert feilbeskrivelse kan finnes på <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
@@ -1001,6 +1059,8 @@
 YouTube.Actions.Error.YouTubeApi="YouTube API feil. Se loggfilen for mer informasjon."
 YouTube.Actions.Error.BroadcastNotFound="Den valgte strømmen finnes ikke."
 YouTube.Actions.Error.FileMissing="Den valgte filen finnes ikke."
+YouTube.Actions.Error.FileOpeningFailed="Mislyktes i å åpne den valgte filen."
+YouTube.Actions.Error.FileTooLarge="Den valgte filen er for stor (grense: 2 MiB)."
 YouTube.Actions.EventsLoading="Laster liste over Eventer..."
 YouTube.Actions.EventCreated.Title="Event opprettet"
 YouTube.Actions.EventCreated.Text="Event ble opprettet."
@@ -1013,8 +1073,11 @@
 YouTube.Actions.AutoStopStreamingWarning="Du vil ikke kunne koblet til på nytt. Strømmen din vil stoppe og ikke lengre være live."
 YouTube.Chat.Input.Placeholder="Skriv inn melding her …"
 YouTube.Chat.Input.Sending="Sender …"
+YouTube.Chat.Error.Title="Feil under sending av melding"
+YouTube.Chat.Error.Text="Meldingen kunne ikke sendes: %1"
 YouTube.Errors.liveStreamingNotEnabled="Live streaming er ikke aktivert på den valgte YouTube kanalen. Se <a href='https://www.youtube.com/features'>youtube.com/features</a> for mer informasjon."
 YouTube.Errors.livePermissionBlocked="Live streaming er ikke tilgjengelig på den valgte YouTube Channel. Vær oppmerksom på at det kan ta opptil 24 timer før direktesendinger blir tilgjengelig etter at du har aktivert det i dine kanalinnstillinger. Se <a href='https://www.youtube.com/features'>youtube.com/features</a> for detaljer."
+YouTube.Errors.liveChatDisabled="Direktechat er skrudd av på denne sendingen."
 YouTube.Errors.liveChatEnded="Direktesendingen har blitt avsluttet."
 YouTube.Errors.messageTextInvalid="Meldingsteksten er ikke gyldig."
 YouTube.Errors.rateLimitExceeded="Du sender meldinger for fort."

obs-studio-29.1.3.tar.xz/UI/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/nl-NL.ini Changed

@@ -12,8 +12,8 @@
 Rename="Hernoemen"
 Interact="Interactie"
 Properties="Eigenschappen"
-MoveUp="Omhoog Schuiven"
-MoveDown="Omlaag Schuiven"
+MoveUp="Omhoog verplaatsen"
+MoveDown="Omlaag verplaatsen"
 Settings="Instellingen"
 Display="Beeldscherm"
 Name="Naam"
@@ -89,7 +89,6 @@
 LogViewer="Log Weergave"
 ShowOnStartup="Tonen tijdens het opstarten"
 OpenFile="Bestand openen"
-AddValue="%1 toevoegen"
 AddSource="Bron toevoegen"
 RemoveScene="Geselecteerde scène verwijderen"
 RemoveSource="Geselecteerde scène(s) verwijderen"
@@ -100,17 +99,25 @@
 SourceProperties="Open bron eigenschappen"
 SourceFilters="Open bron filters"
 MixerToolbarMenu="Audio mixer menu"
+List="Lijst"
+Grid="Raster"
 PluginsFailedToLoad.Title="Plugin laad fout"
 PluginsFailedToLoad.Text="De volgende OBS plugins konden niet laden:\n\n%1\nGelieve deze plugins bij te werken of te verwijderen."
 AlreadyRunning.Title="OBS is al actief"
 AlreadyRunning.Text="OBS is al actief! Tenzij je dit wilde doen, sluit a.u.b. alle reeds draaiende instanties van OBS voor je een nieuwe instantie opstart. Als je OBS hebt ingesteld om naar het systeemvak te minimaliseren, controleer dan of hij daar nog uitgevoerd wordt."
 AlreadyRunning.LaunchAnyway="Toch starten"
+AutoSafeMode.Title="Veilige modus"
+AutoSafeMode.Text="OBS is niet correct afgesloten bij de vorige sessie.\n\nWil je nu starten in veilige modus (plugins van derden, scripting en WebSockets uitgeschakeld)?"
+AutoSafeMode.LaunchSafe="Starten in veilige modus"
+AutoSafeMode.LaunchNormal="Start normaal"
+SafeMode.Restart="Wil je OBS herstarten in veilige modus (plugins van derden, scripting en WebSockets uitgeschakeld)?"
+SafeMode.RestartNormal="Wil je OBS herstarten in normale modus"
 ChromeOS.Title="Niet-ondersteund platform"
 ChromeOS.Text="OBS lijkt te worden uitgevoerd in een ChromeOS container. Dit platform wordt niet ondersteund."
 Wine.Title="Wine gedetecteerd"
 Wine.Text="OBS draaien in Wine wordt niet ondersteund en veel functies zoals opname- of apparaatbronnen zullen niet werken of slechts in beperkte capaciteit. Het wordt aangeraden om een native versie van OBS uit te voeren zoals bijvoorbeeld <a href='https://flathub.org/apps/details/com.obsproject.Studio'>onze Flatpak versie</a> of pakketten van je besturingssysteem."
 DockCloseWarning.Title="Dockbaar venster sluiten"
-DockCloseWarning.Text="Je hebt net een dokbaar venster gesloten. Als je het opnieuw wilt zien, gebruikt dan de Docks menu in de menubalk."
+DockCloseWarning.Text="Je hebt net een dokbaar venster gesloten. Als je het opnieuw wilt zien, gebruik dan het menu Docks in de menubalk."
 ExtraBrowsers="Aangepaste Browser Docks"
 ExtraBrowsers.Info="Voeg docks toe door ze een naam en URL te geven, klik vervolgens op Toepassen of Sluiten om de docks te openen. U kunt op elk moment docks toevoegen of verwijderen."
 ExtraBrowsers.DockName="Dock Naam"
@@ -123,7 +130,7 @@
 Auth.LoadingChannel.Title="Kanaalinformatie laden..."
 Auth.LoadingChannel.Text="Kanaalinformatie voor %1 laden, even geduld a.u.b..."
 Auth.LoadingChannel.Error="Kon geen kanaalinformatie opvragen."
-Auth.ChannelFailure.Title="Fout bij het laden van kanaal"
+Auth.ChannelFailure.Title="Laden van kanaal mislukt"
 Auth.ChannelFailure.Text="Laden van kanaalinformatie mislukt voor %1\n\n%2: %3"
 Auth.StreamInfo="Stream-informatie"
 TwitchAuth.Stats="Twitch statistieken"
@@ -176,7 +183,7 @@
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Geef de voorkeur aan hardware-encoding"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Hardware-encoding elimineert het meeste CPU-gebruik, maar heeft wellicht een hogere bitrate nodig om hetzelfde kwaliteitsniveau te bereiken."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Streamwaarschuwing"
-Basic.AutoConfig.StreamPage.StreamWarning.Text="De bandbreedte-test is bezig met het streamen van willekeurige videogegevens zonder audio naar uw kanaal. Indien mogelijk is het aanbevolen om tijdelijk het opslaan van video's van streams uit te schakelen en de stream privé te maken tot de test is voltooid. Doorgaan?"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="De bandbreedte-test gaat willekeurige videogegevens zonder audio naar uw kanaal streamen. Indien mogelijk is het aanbevolen om tijdelijk het opslaan van video's van streams uit te schakelen en de stream privé te maken tot de test is voltooid. Doorgaan?"
 Basic.AutoConfig.TestPage="Eindresultaat"
 Basic.AutoConfig.TestPage.SubTitle.Testing="Het programma voert nu een reeks testen uit om de meest ideale instellingen in te schatten"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Testen is afgerond"
@@ -212,14 +219,12 @@
 Basic.Stats.DiskFullIn="Schijf vol na (ca.)"
 Basic.Stats.ResetStats="Statistieken resetten"
 ResetUIWarning.Title="Weet u zeker dat u de UI wilt herstellen?"
-ResetUIWarning.Text="Herstellen van de UI zal extra docks verbergen. Als u deze docks toch wilt zien, dan moet u ze in via het beeld menu weer zichtbaar maken.\n\nWeet u zeker dat u de UI wilt herstellen?"
+ResetUIWarning.Text="Herstellen van de UI zal extra docks verbergen. Als u deze docks toch wilt zien, dan moet u ze in via het Docks menu weer zichtbaar maken.\n\nWeet u zeker dat u de UI wilt herstellen?"
 Updater.Title="Update beschikbaar"
 Updater.Text="Er is een update beschikbaar:"
 Updater.UpdateNow="Nu updaten"
 Updater.RemindMeLater="Herinner mij later"
 Updater.Skip="Sla deze versie over"
-Updater.Running.Title="Programma op dit moment actief"
-Updater.Running.Text="Er is momenteel een uitvoer actief, stop alle actieve uitvoer voor je probeert te updaten"
 Updater.NoUpdatesAvailable.Title="Geen updates beschikbaar"
 Updater.NoUpdatesAvailable.Text="Er zijn momenteel geen updates beschikbaar"
 Updater.BranchNotFound.Title="Update kanaal verwijderd"
@@ -227,12 +232,10 @@
 Updater.RepairButUpdatesAvailable.Title="Integriteit controle niet beschikbaar"
 Updater.RepairButUpdatesAvailable.Text="Het controleren van de integriteit van het bestand is alleen mogelijk voor de nieuwste versie die beschikbaar is. Gebruik Help → Controleren op Updates om uw OBS-installatie te controleren en bij te werken."
 Updater.RepairConfirm.Title="Bevestig controleren van Integriteit"
-Updater.RepairConfirm.Text="Bij het starten van de integriteitscontrole worden uw OBS-installatie gescand voor corruptie en opnieuw downloaden van gebroken / gewijzigde bestanden. Dit kan even duren.\n\nWilt u doorgaan?"
+Updater.RepairConfirm.Text="Bij het starten van de integriteitscontrole worden uw OBS-installatie gescand voor corruptie en opnieuw downloaden van beschadigde / gewijzigde bestanden. Dit kan even duren.\n\nWilt u doorgaan?"
 Updater.FailedToLaunch="Starten van updater is mislukt"
-Updater.GameCaptureActive.Title="Game-capture actief"
-Updater.GameCaptureActive.Text="De game-capture-hook-bibliotheek in momenteel in gebruik; sluit alle games/programma's af die opgenomen worden (of herstart Windows) en probeer het nog eens."
 QuickTransitions.SwapScenes="Verwissel Voorbeeld-/Programmascènes na de overgang"
-QuickTransitions.SwapScenesTT="Verwisselt de voorbeeld- en programmascènes na de overgang (als de oorspronkelijke programmascene nog bestaat).\nMerk op dat dit geen veranderingen ongedaan maakt die zijn aangebracht aan de oorspronkelijke programmascène."
+QuickTransitions.SwapScenesTT="Verwisselt de voorbeeld- en programmascènes na de overgang (als de oorspronkelijke programmascene nog bestaat).\nDit zal geen veranderingen ongedaan maken die zijn aangebracht aan de oorspronkelijke programmascène."
 QuickTransitions.DuplicateScene="Scène dupliceren"
 QuickTransitions.DuplicateSceneTT="Bij het bewerken van dezelfde scène, kunt u transformatie/zichtbaarheid van bronnen bewerken zonder de programmauitvoer aan te passen.\nOm eigenschappen van bronnen aan te passen zonder de uitvoer van het programma aan te passen, schakel 'Bronnen dupliceren' in.\nHet veranderen van deze waarde zal de huidige programmacène resetten (als deze nog bestaat)."
 QuickTransitions.EditProperties="Bronnen dupliceren"
@@ -244,6 +247,8 @@
 Basic.SceneTransitions="Scène-overgangen"
 Basic.TransitionDuration="Duur"
 Basic.TogglePreviewProgramMode="Studiomodus"
+Basic.EnablePreviewProgramMode="Studio modus aanzetten"
+Basic.DisablePreviewProgramMode="Studio modus uitzetten"
 Undo.Undo="Ongedaan maken"
 Undo.Redo="Opnieuw uitvoeren"
 Undo.Add="Voeg '%1' toe"
@@ -292,6 +297,8 @@
 Undo.GroupItems="Groepeer items in '%1'"
 TransitionNameDlg.Text="Voer de naam van de transitie in"
 TransitionNameDlg.Title="Naam van de overgang"
+TitleBar.SafeMode="VEILIGE MODUS"
+TitleBar.PortableMode="Draagbaar modus"
 TitleBar.Profile="Profiel"
 TitleBar.Scenes="Scènes"
 NameExists.Title="Naam bestaat al"
@@ -316,6 +323,7 @@
 Output.StartStreamFailed="Het starten van de stream is mislukt"
 Output.StartRecordingFailed="Het starten van de opname is mislukt"
 Output.StartReplayFailed="Het starten van de replay buffer is mislukt"
+Output.StartVirtualCamFailed="Starten virtuele camera mislukt"
 Output.StartFailedGeneric="Het starten van de uitvoer is mislukt. Controleer de logbestanden voor meer informatie.\n\nLet op: Als je gebruik maakt van de NVENC of AMD encoders, controleer of de drivers up to date zijn."
 Output.ReplayBuffer.PauseWarning.Title="Herhalingen kunnen niet worden opgeslagen tijdens het pauzeren"
 Output.ReplayBuffer.PauseWarning.Text="Waarschuwing: herhalingen kunnen niet worden opgeslagen als opnemen gepauzeerd is."
@@ -328,7 +336,7 @@
 Output.ConnectFail.Disconnected="Verbinding met de server is gesloten."
 Output.StreamEncodeError.Title="Coderingsfout"
 Output.StreamEncodeError.Msg="Er is een coderingsfout opgetreden tijdens het streamen."
-Output.StreamEncodeError.Msg.LastError="Er is een coderingsfout opgetreden tijdens het streamen:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Er is een coderingsfout opgetreden tijdens het streamen: %1"
 Output.RecordFail.Title="Kon de opname niet starten"
 Output.RecordFail.Unsupported="Het outputformaat wordt niet ondersteund, of ondersteunt niet meer dan een audiotrack. Controleer je instellingen en probeer het opnieuw."
 Output.RecordNoSpace.Title="Onvoldoende schijfruimte"
@@ -336,7 +344,7 @@
 Output.RecordError.Title="Opnamefout"
 Output.RecordError.Msg="Er is een onbekende fout opgetreden tijdens het opnemen."
 Output.RecordError.EncodeErrorMsg="Er is een coderingsfout opgetreden tijdens het opnemen."
-Output.RecordError.EncodeErrorMsg.LastError="Er is een coderingsfout opgetreden tijdens het opnemen:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Er is een coderingsfout opgetreden tijdens het opnemen: %1"
 Output.BadPath.Title="Ongeldig bestandspad"
 Output.BadPath.Text="Het geconfigureerde opnamepad kon niet worden geopend. Controleer uw opnamepad onder Instellingen → Uitvoer → Opname."
 Output.NoBroadcast.Title="Geen uitzending geconfigureerd"
@@ -366,6 +374,8 @@
 Remux.ExitUnfinishedTitle="Remuxen is bezig"
 Remux.ExitUnfinished="Het remuxen is nog niet afgerond; als je nu stopt kan het doelbestand onbruikbaar worden.\nWeet je zeker dat je wil stoppen met remuxen?"
 Remux.HelpText="Laat bestanden in dit scherm vallen om ze te remuxen, of selecteer een lege 'OBS-opname'-cel om te zoeken naar een bestand."
+Remux.NoFilesAddedTitle="Geen remuxing-bestand toegevoegd"
+Remux.NoFilesAdded="Geen bestand is toegevoegd om te remuxen. Zet een map met een of meerdere video bestanden neer."
 MissingFiles="Ontbrekende bestanden"
 MissingFiles.MissingFile="Ontbrekend bestand"
 MissingFiles.NewFile="Nieuw bestand"
@@ -383,6 +393,7 @@
 MissingFiles.AutoSearchText="OBS heeft extra overeenkomsten gevonden voor ontbrekende bestanden in die directory. Wilt u ze toevoegen?"
 MissingFiles.NoMissing.Title="Ontbrekende bestanden controle"
 MissingFiles.NoMissing.Text="Er lijken geen bestanden te ontbreken."
+MacPermissions.MenuAction="Beoordeel App Permissies..."
 MacPermissions.Title="Beoordeel App Permissies"
 MacPermissions.Description="OBS Studio heeft je toestemming nodig om bepaalde functies te kunnen geven. Het is aanbevolen om deze machtigingen in te schakelen, maar ze zijn niet nodig om de app te gebruiken. Je kan ze later altijd weer inschakelen."
 MacPermissions.Description.OpenDialog="U kunt dit dialoogvenster heropenen via het OBS Studio menu."
@@ -397,8 +408,8 @@
 MacPermissions.Item.Accessibility="Toegankelijkheid"
 MacPermissions.Item.Accessibility.Details="Schakel deze permissie in om sneltoetsen (sneltoetsen) te laten werken terwijl andere apps gefocust zijn."
 MacPermissions.Continue="Doorgaan"
-UpdateAvailable="Nieuwe update beschikbaar"
-UpdateAvailable.Text="Versie %1.%2.%3 is nu beschikbaar; <a href='%4'>klik hier om hem te downloaden</a>"
+SourceLeak.Title="Bron opschoon fout"
+SourceLeak.Text="Er is een probleem opgetreden bij het wisselen van scèneverzamelingen en sommige bronnen konden niet worden verwijderd. Dit probleem wordt meestal veroorzaakt door plug-ins die bronnen niet correct vrijgeven. Zorg ervoor dat alle plug-ins die u gebruikt up-to-date zijn.\n\nOBS Studio wordt nu afgesloten om mogelijke gegevensbeschadiging te voorkomen."
 Basic.DesktopDevice1="Desktop-audio"
 Basic.DesktopDevice2="Desktop-audio 2"
 Basic.Scene="Scène"
@@ -452,6 +463,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (automatisch geselecteerd: %2)"
 Basic.PropertiesWindow.SelectColor="Selecteer kleur"
 Basic.PropertiesWindow.SelectFont="Selecteer een lettertype"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Kies een lettertype"
 Basic.PropertiesWindow.ConfirmTitle="Instellingen aangepast"
 Basic.PropertiesWindow.Confirm="Er zijn niet opgeslagen aanpassingen. Wil je deze bewaren?"
 Basic.PropertiesWindow.NoProperties="Geen eigenschappen beschikbaar"
@@ -527,18 +539,18 @@
 Basic.Main.Source="Bron"
 Basic.Main.Controls="Bedieningselementen"
 Basic.Main.Connecting="Verbinden..."
-Basic.Main.StartRecording="Start het opnemen"
-Basic.Main.StartReplayBuffer="Start de replaybuffer"
+Basic.Main.StartRecording="Opname starten"
+Basic.Main.StartReplayBuffer="Replaybuffer starten"
 Basic.Main.SaveReplay="Replay opslaan"
 Basic.Main.StartStreaming="Streamen starten"
 Basic.Main.StartBroadcast="Ga Live"
-Basic.Main.StartVirtualCam="Start de virtuele camera"
-Basic.Main.StopRecording="Stop met opnemen"
+Basic.Main.StartVirtualCam="Virtuele camera starten"
+Basic.Main.StopRecording="Opname stoppen"
 Basic.Main.PauseRecording="Pauzeer de opname"
 Basic.Main.UnpauseRecording="Vervolg de opname"
 Basic.Main.SplitFile="Opnamebestand splitsen"
 Basic.Main.StoppingRecording="De opname stoppen..."
-Basic.Main.StopReplayBuffer="De replaybuffer stoppen"
+Basic.Main.StopReplayBuffer="Replaybuffer stoppen"
 Basic.Main.StoppingReplayBuffer="De replaybuffer aan het stoppen..."
 Basic.Main.SetupBroadcast="Uitzending beheren"
 Basic.Main.StopStreaming="Streamen stoppen"
@@ -557,9 +569,9 @@
 Basic.VCam.VirtualCamera="Virtuele Camera"
 Basic.VCam.OutputType="Uitvoer Type"
 Basic.VCam.OutputSelection="Uitvoer Selectie"
-Basic.VCam.Internal="Intern"
-Basic.VCam.InternalDefault="Programmauitvoer (standaard)"
-Basic.VCam.InternalPreview="Preview uitvoer"
+Basic.VCam.OutputType.Program="Programma (Standaard)"
+Basic.VCam.OutputSelection.NoSelection="Geen selectie voor dit uitvoertype"
+Basic.VCam.RestartWarning="De virtuele camera wordt herstart om deze wijziging toe te passen"
 Basic.MainMenu.File="Bestand (&F)"
 Basic.MainMenu.File.Export="&Exporteren"
 Basic.MainMenu.File.Import="&Importeren"
@@ -600,15 +612,16 @@
 Basic.MainMenu.Edit.AdvAudio="Ge&avanceerde audio-eigenschappen"
 Basic.MainMenu.View="Beeld (&V)"
 Basic.MainMenu.View.Toolbars="&Taakbalken"
-Basic.MainMenu.View.ListboxToolbars="Scène-/bronlijst-knoppen"
+Basic.MainMenu.View.ListboxToolbars="Dock werkbalken"
 Basic.MainMenu.View.ContextBar="Bron-taakbalk"
-Basic.MainMenu.View.SceneTransitions="S&cène-overgangen"
 Basic.MainMenu.View.SourceIcons="Bron-&iconen"
 Basic.MainMenu.View.StatusBar="&Statusbalk"
 Basic.MainMenu.View.Fullscreen.Interface="Volledig scherminterface"
 Basic.MainMenu.View.AlwaysOnTop="&Altijd op de voorgrond"
+Basic.MainMenu.View.SceneListMode="Scene lijst modus"
 Basic.MainMenu.Docks.ResetDocks="&Dokken opnieuw instellen"
 Basic.MainMenu.Docks.LockDocks="&Docks opslot doen"
+Basic.MainMenu.Docks.SideDocks="Volledige hoogte docks (&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Aangepaste browser-docks..."
 Basic.MainMenu.SceneCollection="&Scèneverzameling"
 Basic.MainMenu.Profile="&Profiel"
@@ -617,7 +630,6 @@
 Basic.MainMenu.SceneCollection.Import="Importeer scèneverzameling"
 Basic.MainMenu.SceneCollection.Export="Exporteer scèneverzameling"
 Basic.MainMenu.Profile.Exists="Het profiel bestaat al"
-Basic.MainMenu.SceneCollection.Exists="De scèneverzameling bestaat al"
 Basic.MainMenu.Help="&Hulp"
 Basic.MainMenu.Help.HelpPortal="Help-portal"
 Basic.MainMenu.Help.Website="Ga naar de &website"
@@ -628,8 +640,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload het huidige logbestand (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Upload &Vorige logbestand"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Bekijk het huidige logbestand (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Versie informatie"
 Basic.MainMenu.Help.CheckForUpdates="Controleer op updates"
 Basic.MainMenu.Help.Repair="Controleer Bestandsintegriteit"
+Basic.MainMenu.Help.RestartSafeMode="Herstarten in veilige modus"
+Basic.MainMenu.Help.RestartNormal="Herstarten in normale modus"
 Basic.MainMenu.Help.CrashLogs="Crash-&rapporten"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Toon cra&shrapporten"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Upload &vorige crashrapport"
@@ -695,7 +710,6 @@
 Basic.Settings.General.ChannelDescription.stable="Laatste stabiele versie"
 Basic.Settings.General.ChannelName.beta="Beta's / Release Kandidaten"
 Basic.Settings.General.ChannelDescription.beta="Mogelijk onstabiele pre-release versies"
-Basic.Settings.Stream.StreamType="Stream-type"
 Basic.Settings.Stream.Custom.UseAuthentication="Gebruik authenticatie"
 Basic.Settings.Stream.Custom.Username="Gebruikersnaam"
 Basic.Settings.Stream.Custom.Password="Wachtwoord"
@@ -724,7 +738,6 @@
 Basic.Settings.Output.Format.TT.fmov="Gefragmenteerde MOV schrijft de opname in delen en vereist niet dezelfde afsluiting als de traditionele MOV bestanden.\nDit zorgt ervoor dat het bestand speelbaar blijft, zelfs als het schrijven naar schijf wordt onderbroken, bijvoorbeeld als gevolg van een BSOD of stroomverlies.\n\nDit is mogelijk niet compatibel met alle spelers en editors. Gebruik Bestand → Remux opnamen om het bestand indien nodig in een meer compatibele indeling om te zetten."
 Basic.Settings.Output.Format.TT.fmp4="Gefragmenteerde MP4 schrijft de opname in delen en vereist niet dezelfde afsluiting als de traditionele MP4 bestanden.\nDit zorgt ervoor dat het bestand speelbaar blijft, zelfs als het schrijven naar schijf wordt onderbroken, bijvoorbeeld als gevolg van een BSOD of stroomverlies.\n\nDit is mogelijk niet compatibel met alle spelers en editors. Gebruik Bestand → Remux opnamen om het bestand indien nodig in een meer compatibele indeling om te zetten."
 Basic.Settings.Output.SelectDirectory="Selecteer Opnamemap"
-Basic.Settings.Output.SelectFile="Selecteer Opnamebestand"
 Basic.Settings.Output.DynamicBitrate="Dynamisch wijzigen van de bitrate om congestie te beheren"
 Basic.Settings.Output.DynamicBitrate.Beta="Dynamisch wijzigen van de bitrate om congestie te beheren (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="In plaats van frames te laten vallen om congestie te verminderen, verandert de bitrate dynamisch à la minute.\n\nMerk op dat dit de vertraging voor kijkers kan verhogen als er significante plotselinge congestie optreedt.\nAls de bitrate daalt, kan het tot een paar minuten duren om het te herstellen.\n\nMomenteel wordt het alleen ondersteund voor RTMP."
@@ -752,7 +765,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Waarschuwing: opnames kunnen niet worden onderbroken als de opnamekwaliteit is ingesteld op 'Hetzelfde als de stream'."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Waarschuwing: De op dit moment geselecteerde opname formaat is niet ondersteund met de geselecteerde stream encoder(s)."
 Basic.Settings.Output.Simple.Warn.Encoder="Waarschuwing: het opnemen met een software-encoder op een andere kwaliteit dan de stream zal extra CPU-gebruik vergen als je zowel streamt als opneemt."
-Basic.Settings.Output.Simple.Warn.Lossless="Waarschuwing: Lossless kwaliteit genereert erg grote bestanden! Lossless kwaliteit kan tot wel 7 GB aan schijfruimte per minuut gebruiken bij hoge resoluties en framerates. Lossless kwaliteit is niet aanbevolen voor lange opnames tenzij er een grote hoeveelheid schijfruimte beschikbaar is."
+Basic.Settings.Output.Simple.Warn.Lossless="Waarschuwing: Lossless kwaliteit genereert erg grote bestanden! Lossless kwaliteit kan tot wel 7 GB aan schijfruimte per minuut gebruiken bij hoge resoluties en framerates. Lossless kwaliteit is niet aanbevolen voor lange opnames tenzij er een grote hoeveelheid schijfruimte beschikbaar is. Replay buffer is niet beschikbaar bij gebruim van lossless kwaliteit. "
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Weet je zeker dat je lossless kwaliteit wilt gebruiken?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless kwaliteit waarschuwing!"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Hardware (Apple, HVEC)"
@@ -878,8 +891,8 @@
 Basic.Settings.Audio.PeakMeterType="Piek Meter Type"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Sample piek"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True piek (hogere CPU-gebruik)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Waarschuwing: Surround sound audio is ingeschakeld."
-Basic.Settings.Audio.MultichannelWarning="Als je streamt, controleer dan of de streamingservice zowel surroundsound-ingest als surroundsound afspelen ondersteunt. Facebook 360 Live is een voorbeeld waar surroundsound volledig ondersteund wordt. Alhoewel Facebook Live en Youtube Live beide surround-ingest ondersteunen, downmixt Facebook Live het naar stereo, terwijl Youtube Live slechts twee kanalen afspeelt.\n\nOBS-audiofilters kunnen overweg met surroundsound, hoewel VST-plugin-support niet gegarandeerd wordt."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Waarschuwing: Surround sound audio is ingeschakeld."
+Basic.Settings.Audio.MultichannelWarning="Als je streamt, controleer dan of je streamingdienst zowel surround sound-opname als surround sound-weergave ondersteunt. Facebook 360 Live ondersteunt bijvoorbeeld volledig surround sound; YouTube Live ondersteunt 5.1 audio-opname (en weergave op tv's).\n\nOBS-audiofilters zijn compatibel met surround sound, hoewel ondersteuning voor VST-plug-ins niet gegarandeerd is."
 Basic.Settings.Audio.MultichannelWarning.Title="Surround sound audio inschakelen?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Weet je zeker dat je surround sound audio wil inschakelen?"
 Basic.Settings.Audio.Devices="Globale Audio-apparaten"
@@ -924,7 +937,6 @@
 Basic.Settings.Advanced.FormatWarning="Waarschuwing: Andere kleurformaten dan NV12/P010 zijn hoofdzakelijk bedoeld voor opnemen en worden niet aanbevolen bij streamen. Streamen kan verhoogd CPU-gebruik veroorzaken als gevolg van kleurformaat-conversie."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Waarschuwing: Hoge precisie formaten worden vaker gebruikt met HDR kleurenruimtes."
 Basic.Settings.Advanced.FormatWarning2100="Waarschuwing: Rec. 2100 moet een formaat gebruiken met meer precisie."
-Basic.Settings.Advanced.Audio.BufferingTime="Audio Buffertijd"
 Basic.Settings.Advanced.Video.ColorFormat="Kleurindeling"
 Basic.Settings.Advanced.Video.ColorSpace="Kleurruimte"
 Basic.Settings.Advanced.Video.ColorRange="Kleurbereik"
@@ -941,6 +953,7 @@
 Basic.Settings.Advanced.Network="Netwerk"
 Basic.Settings.Advanced.Network.Disabled="Het momenteel geselecteerde streaming protocol ondersteunt het veranderen van de netwerkinstellingen niet."
 Basic.Settings.Advanced.Network.BindToIP="Bind aan IP"
+Basic.Settings.Advanced.Network.IPFamily="IP fanilie"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Netwerk optimalisaties inschakelen"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="'TCP pacing' inschakelen"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Probeert RTMP output vriendelijker te maken voor andere latency gevoelige applicaties op het netwerk door de transmissiesnelheid te reguleren.\nHet vergroot de kans verloren frames op onstabiele verbindingen."
@@ -987,6 +1000,8 @@
 SceneItemShow="Toon '%1'"
 SceneItemHide="Verberg '%1'"
 OutputWarnings.NoTracksSelected="Selecteer a.u.b. ten minste een track"
+OutputWarnings.NoTracksSelectedOnExit.Title="Fout uitvoerinstellingen"
+OutputWarnings.NoTracksSelectedOnExit.Text="Alle uitvoeren moeten ten minste één audiotrack hebben geselecteerd."
 OutputWarnings.MP4Recording="Waarschuwing: opnames opgeslagen als MP4/MOV zijn onherstelbaar als het bestand niet correct afgesloten kan worden (bijvoorbeeld door BSOD's, stroomuitval enz.). Als je meersporen-audiotracks wilt opnemen, overweeg dan het gebruik van MKV en remux de opname naar MP4/MOV nadat hij afgerond is (Bestand → Remux opnames)"
 OutputWarnings.CannotPause="Waarschuwing: opnames kunnen niet worden gepauzeerd als de opname-encoder is ingesteld op '(Gebruik de stream-encoder)'"
 OutputWarnings.CodecIncompatible="De audio of video encoder selectie is gereset vanwege incompatibiliteit. Kies een ondersteunde encoder van de lijst."
@@ -1012,6 +1027,7 @@
 About.GetInvolved="Raak betrokken"
 About.Authors="Auteurs"
 About.License="Licentie"
+About.Error="Fout! Bestand kon niet worden gelezen.\n\nGa naar: %1"
 About.Contribute="Steun het OBS project"
 AddUrl.Title="Bron toevoegen via URL"
 AddUrl.Text="U heeft een URL naar OBS gesleept. Dit zal automatisch de link als bron toevoegen. Doorgaan?"
@@ -1032,13 +1048,11 @@
 LoadProfileNeedsRestart="Profiel bevat instellingen waarvoor OBS opnieuw moet worden opgestart.\n%1\n\nWilt u OBS opnieuw opstarten om deze instellingen te laten werken?"
 ContextBar.NoSelectedSource="Geen bron geselecteerd"
 ContextBar.ResetTransform="Transformatie herstellen"
-ContextBar.FitToCanvas="Aanpassen aan Canvas"
 ContextBar.MediaControls.PlayMedia="Media afspelen"
 ContextBar.MediaControls.PauseMedia="Media pauzeren"
 ContextBar.MediaControls.RestartMedia="Media herstarten"
 ContextBar.MediaControls.PlaylistNext="Volgende in de afspeellijst"
 ContextBar.MediaControls.PlaylistPrevious="Vorige in de afspeellijst"
-ContextBar.MediaControls.MediaProperties="Media Eigenschappen"
 ContextBar.MediaControls.BlindSeek="Media Zoek Widget"
 YouTube.Auth.Ok="Autorisatie succesvol afgerond.\nJe kunt nu deze pagina sluiten."
 YouTube.Auth.NoCode="Het autorisatieproces is niet voltooid."
@@ -1116,3 +1130,5 @@
 YouTube.Errors.liveChatEnded="Live stream is beëindigd."
 YouTube.Errors.messageTextInvalid="De berichttekst is niet geldig."
 YouTube.Errors.rateLimitExceeded="Je verstuurt te snel berichten."
+YouTube.DocksRemoval.Title="Wis legacy YouTube browser docks"
+YouTube.DocksRemoval.Text="Deze browser docks worden als verouderd verwijderd:\n\n%1\nGebruik in plaats daarvan \"Docks/YouTube Live Control Room\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/nn-NO.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/nn-NO.ini Changed

@@ -70,7 +70,6 @@
 RefreshBrowser="Oppdater"
 ShowOnStartup="Vis ved igangsetjing"
 OpenFile="Opne fil"
-AddValue="Legg til %1"
 AddSource="Legg til kjelde"
 AlreadyRunning.Title="OBS køyrer allereie"
 BandwidthTest.Region.EU="Europa"
@@ -87,7 +86,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Tilpassa..."
 Basic.AutoConfig.StreamPage.Server="Tener"
 Basic.AutoConfig.StreamPage.StreamKey="Straumelykel"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Lenke)"
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Straumeåtvaring"
 Basic.AutoConfig.TestPage="Endeleg resultat"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Kopler til: %1..."
@@ -100,7 +98,6 @@
 Updater.UpdateNow="Oppdater no"
 Updater.RemindMeLater="Minn meg på det seinare"
 Updater.Skip="Hopp over denne versjonen"
-Updater.Running.Title="Programmet er aktiv for augeblikket"
 Updater.NoUpdatesAvailable.Title="Ingen oppdateringar tilgjengeleg"
 Updater.BranchNotFound.Title="Oppdateringskanal fjerna"
 Basic.SceneTransitions="Sceneovergangar"
@@ -179,7 +176,6 @@
 Basic.MainMenu.Edit.Order.MoveDown="Flytt &ned"
 Basic.MainMenu.View="&Vis"
 Basic.MainMenu.View.Toolbars="Verk&tøyslinjar"
-Basic.MainMenu.View.SceneTransitions="S&ceneovergangar"
 Basic.MainMenu.Profile="&Profil"
 Basic.MainMenu.Profile.Import="Importer profil"
 Basic.MainMenu.Profile.Export="Eksporter profil"

obs-studio-29.1.3.tar.xz/UI/data/locale/oc-FR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/oc-FR.ini Changed

obs-studio-29.1.3.tar.xz/UI/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/pl-PL.ini Changed

@@ -76,6 +76,7 @@
 StudioMode.Preview="Podgląd"
 StudioMode.Program="Na żywo"
 StudioMode.PreviewSceneName="Podgląd: %1"
+StudioMode.ProgramSceneName="Na żywo: %1"
 ShowInMultiview="Pokaż w Multiview"
 VerticalLayout="Układ pionowy"
 Group="Grupa"
@@ -90,7 +91,6 @@
 LogViewer="Podgląd logów"
 ShowOnStartup="Pokaż przy starcie"
 OpenFile="Otwórz plik"
-AddValue="Dodaj %1"
 AddSource="Dodaj źródło"
 RemoveScene="Usuń zaznaczoną scenę"
 RemoveSource="Usuń zaznaczone źródła"
@@ -102,11 +102,19 @@
 SourceFilters="Otwórz filtry źródła"
 MixerToolbarMenu="Menu miksera audio"
 SceneFilters="Otwórz filtry scen"
+List="Lista"
+Grid="Siatka"
 PluginsFailedToLoad.Title="Błąd ładowania wtyczki"
 PluginsFailedToLoad.Text="Poniższe wtyczki OBS nie załadowały się:\n\n%1\n Proszę zaktualizuj lub usuń te wtyczki."
 AlreadyRunning.Title="OBS jest już uruchomiony"
 AlreadyRunning.Text="OBS jest już uruchomiony! Sprawdź wszystkie uruchomione wystąpienia OBS zanim uruchomisz go jeszcze raz. Jeżeli OBS jest zminimalizowany do zasobnika systemowego, sprawdź czy nie jest uruchomiony także w tym miejscu."
 AlreadyRunning.LaunchAnyway="Uruchom mimo to"
+AutoSafeMode.Title="Tryb awaryjny"
+AutoSafeMode.Text="OBS nie został poprawnie zamknięty podczas ostatniej sesji.\n\nCzy chcesz uruchomić OBS w trybie awaryjnym (wyłączone wtyczki, skrypty i websockety)?"
+AutoSafeMode.LaunchSafe="Uruchom w trybie awaryjnym"
+AutoSafeMode.LaunchNormal="Uruchom normalnie"
+SafeMode.Restart="Czy chcesz uruchomić ponownie OBS w trybie awaryjnym (wyłączone wtyczki, skrypty i websockety)?"
+SafeMode.RestartNormal="Czy chcesz uruchomić OBS ponownie w normalnym trybie?"
 ChromeOS.Title="Platforma nieobsługiwana"
 ChromeOS.Text="OBS uruchomiony jest najprawdopodobniej jako kontener w systemie ChromeOS. Platforma ta nie jest oficjalnie obsługiwana."
 Wine.Title="Wykryto Wine"
@@ -174,6 +182,7 @@
 Basic.AutoConfig.StreamPage.StreamKey="Klucz strumienia"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: wprowadź hasło szyfrowania.\nRTMP: wprowadź klucz używany przez usługę.\nSRT: wprowadź streamid, jeśli usługa z takowego korzysta."
 Basic.AutoConfig.StreamPage.EncoderKey="Klucz enkodera"
+Basic.AutoConfig.StreamPage.BearerToken="Bearer"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Połączone konto"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Oszacuj bitrate przy pomocy testu prędkości łącza (może potrwać parę minut)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferuj enkodowanie sprzętowe"
@@ -223,8 +232,6 @@
 Updater.UpdateNow="Uaktualnij teraz"
 Updater.RemindMeLater="Przypomnij mi później"
 Updater.Skip="Pomiń wersję"
-Updater.Running.Title="Aplikacja jest uruchomiona"
-Updater.Running.Text="Wyjścia są aktualnie aktywne, proszę zamknąć wszystkie aktywne wyjścia przed rozpoczęciem procesu aktualizacji"
 Updater.NoUpdatesAvailable.Title="Brak dostępnych aktualizacji"
 Updater.NoUpdatesAvailable.Text="Brak dostępnych aktualizacji"
 Updater.BranchNotFound.Title="Kanał aktualizacji usunięty"
@@ -234,8 +241,6 @@
 Updater.RepairConfirm.Title="Potwierdź sprawdzenie integralności plików"
 Updater.RepairConfirm.Text="Rozpoczęcie sprawdzania integralności plików skanuje instalację OBS w celu wykrycia uszkodzeń i ponownie pobiera poprawne wersje uszkodzonych/zmodyfikowanych plików. To może zająć chwilę.\n\nCzy chcesz kontynuować?"
 Updater.FailedToLaunch="Nie udało się uruchomić aktualizacji"
-Updater.GameCaptureActive.Title="Przechwytywanie gry aktywne"
-Updater.GameCaptureActive.Text="Biblioteka zaczepiająca przechwytywanie gry jest w użyciu. Proszę zamknąć wszelkie przechwytywane gry lub inne programy (ewentualnie zrestartować system) i spróbować ponownie."
 QuickTransitions.SwapScenes="Zamień sceny Podglądu/Na żywo po przejściu"
 QuickTransitions.SwapScenesTT="Zamienia sceny z \"Podglądu\" i \"Na żywo\" po wykonaniu przejścia, pod warunkiem, że oryginalne sceny z sekcji \"Na żywo\" ciągle istnieją.\nNie przywróci to zmian, które zostały dokonane w oryginalnych scenach z \"Na żywo\"."
 QuickTransitions.DuplicateScene="Duplikuj scenę"
@@ -249,6 +254,7 @@
 Basic.SceneTransitions="Efekty przejścia scen"
 Basic.TransitionDuration="Czas trwania"
 Basic.TogglePreviewProgramMode="Tryb studia"
+Basic.EnablePreviewProgramMode="Włącz Tryb Studia"\nBasic.DisablePreviewProgramMode="\nWyłącz Tryb Studia"
 Undo.Undo="Cofnij"
 Undo.Redo="Ponów"
 Undo.Add="Dodaj '%1'"
@@ -297,6 +303,8 @@
 Undo.GroupItems="Zgrupuj w '%1'"
 TransitionNameDlg.Text="Proszę podać nazwę przejścia"
 TransitionNameDlg.Title="Nazwa przejścia"
+TitleBar.SafeMode="TRYB AWARYJNY"
+TitleBar.PortableMode="Tryb przenośny"
 TitleBar.Scenes="Sceny"
 NameExists.Title="Nazwa już istnieje"
 NameExists.Text="Nazwa jest już używana."
@@ -320,6 +328,7 @@
 Output.StartStreamFailed="Nie udało się rozpocząć streamowania"
 Output.StartRecordingFailed="Nie udało się rozpocząć nagrywania"
 Output.StartReplayFailed="Nie udało się rozpocząć nagrywania powtórek"
+Output.StartVirtualCamFailed="Nie udało się uruchomić kamery wirtualnej"
 Output.StartFailedGeneric="Nie udało się uruchomić wyjścia. Sprawdź szczegóły w plikach dziennika.\n\nUwaga: Sprawdź, czy posiadasz aktualne sterowniki karty graficznej, jeżeli używasz enkodera NVENC lub AMD."
 Output.ReplayBuffer.PauseWarning.Title="Nie można zapisać powtórek podczas pauzy nagrywania"
 Output.ReplayBuffer.PauseWarning.Text="Ostrzeżenie: Powtórki nie mogą być zapisane, gdy nagrywanie jest spauzowane."
@@ -332,7 +341,7 @@
 Output.ConnectFail.Disconnected="Utracono połączenie z serwerem."
 Output.StreamEncodeError.Title="Błąd enkodowania"
 Output.StreamEncodeError.Msg="W trakcie transmisji nastąpił błąd enkodowania."
-Output.StreamEncodeError.Msg.LastError="Wystąpił błąd enkodera podczas streamowania:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Wystąpił błąd enkodera podczas streamowania: %1"
 Output.RecordFail.Title="Nie udało się rozpocząć nagrywania"
 Output.RecordFail.Unsupported="Format wyjściowy jest nieobsługiwany lub nie obsługuje więcej niż jednej ścieżki dźwiękowej. Sprawdź ustawienia i spróbuj ponownie."
 Output.RecordNoSpace.Title="Za mało miejsca na dysku"
@@ -340,7 +349,7 @@
 Output.RecordError.Title="Błąd nagrywania"
 Output.RecordError.Msg="Wystąpił nieokreślony błąd podczas nagrywania."
 Output.RecordError.EncodeErrorMsg="W trakcie nagrywania nastąpił błąd enkodowania."
-Output.RecordError.EncodeErrorMsg.LastError="Wystąpił błąd enkodera podczas nagrywania:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Wystąpił błąd enkodera podczas nagrywania: %1"
 Output.BadPath.Title="Nieprawidłowa ścieżka pliku"
 Output.BadPath.Text="Nie można zlokalizować nastawionej ścieżki dla zapisu. Sprawdź jej poprawność w Ustawienia →Wyjście → Nagrywanie."
 Output.NoBroadcast.Title="Nie skonfigurowano transmisji"
@@ -370,6 +379,8 @@
 Remux.ExitUnfinishedTitle="Przepakowywanie w toku"
 Remux.ExitUnfinished="Przepakowywanie nie zostało zakończone. Zatrzymując operację teraz plik wynikowy może być bezużyteczny.\nCzy na pewno chcesz zatrzymać przepakowywanie?"
 Remux.HelpText="Przeciągnij pliki do tego okienka by je przepakować lub kliknij w wolne pole w kolumnie \"Plik nagrania z OBS\", by wybrać plik z dysku."
+Remux.NoFilesAddedTitle="Brak pliku do przepakowania"
+Remux.NoFilesAdded="Nie dodano żadnego pliku do przepakowania. Przeciągnij folder zawierający jeden lub więcej plik wideo."
 MissingFiles="Brakujące pliki"
 MissingFiles.MissingFile="Brakujący plik"
 MissingFiles.NewFile="Nowy plik"
@@ -388,6 +399,7 @@
 MissingFiles.AutoSearchText="OBS znalazł dodatkowe dopasowania brakujących plików w tym katalogu. Czy chcesz je dodać?"
 MissingFiles.NoMissing.Title="Brakujące pliki"
 MissingFiles.NoMissing.Text="Wygląda na to, że nie brakuje żadnych plików."
+MacPermissions.MenuAction="Przejrzyj uprawnienia aplikacji..."
 MacPermissions.Title="Przejrzyj uprawnienia aplikacji"
 MacPermissions.Description="OBS Studio wymaga uprawnień, aby móc dostarczać określone funkcje. Zalecane jest włączenie tych uprawnień, ale nie są one wymagane do korzystania z aplikacji. Zawsze możesz je włączyć później."
 MacPermissions.Description.OpenDialog="Możesz ponownie otworzyć to okno za pomocą menu w OBS Studio."
@@ -403,8 +415,8 @@
 MacPermissions.Item.Accessibility="Ułatwienia dostępu"
 MacPermissions.Item.Accessibility.Details="Uprawnienie pozwala na korzystanie ze skrótów klawiszowych, gdy aktywne są inne aplikacje."
 MacPermissions.Continue="Dalej"
-UpdateAvailable="Aktualizacja dostępna"
-UpdateAvailable.Text="Wersja %1.%2.%3 jest dostępna. <a href='%4'>Kliknij tutaj aby pobrać</a>"
+SourceLeak.Title="Błąd odłączenia źródła"
+SourceLeak.Text="Wystąpił problem w trakcie przełączania kolekcji scen - niektóre ze źródeł nie mogły być usunięte z pamięci. Problem ten najczęściej wynika z wtyczek, które niepoprawnie uwalniają zajęte zasoby. Proszę sprawdzić, czy wtyczki są aktualne.\n\nOBS Studio zostanie zamknięte, aby uniknąć potencjalnej utraty lub uszkodzenia danych."
 Basic.DesktopDevice1="Urządzenie audio"
 Basic.DesktopDevice2="Urządzenie audio 2"
 Basic.AuxDevice1="Mikrofon/Wejście liniowe"
@@ -465,6 +477,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (wybór automatyczny: %2)"
 Basic.PropertiesWindow.SelectColor="Wybierz kolor"
 Basic.PropertiesWindow.SelectFont="Wybierz czcionkę"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Wybierz czcionkę"
 Basic.PropertiesWindow.ConfirmTitle="Ustawienia zmienione"
 Basic.PropertiesWindow.Confirm="Czy chcesz zachować niezapisane zmiany?"
 Basic.PropertiesWindow.NoProperties="Brak właściwości"
@@ -573,9 +586,9 @@
 Basic.VCam.VirtualCamera="Kamera wirtualna"
 Basic.VCam.OutputType="Typ wyjścia"
 Basic.VCam.OutputSelection="Wybór wyjścia"
-Basic.VCam.Internal="Wewnętrzna"
-Basic.VCam.InternalDefault="Wyjście programu (domyślne)"
-Basic.VCam.InternalPreview="Wyjście na podgląd"
+Basic.VCam.OutputType.Program="Wyjście programu (domyślne)"
+Basic.VCam.OutputSelection.NoSelection="Brak wyboru dla wyjścia tego typu"
+Basic.VCam.RestartWarning="Aby wyprowadzić zmiany, wirtualna kamera zostanie uruchomiona ponownie"
 Basic.MainMenu.File="Plik (&F)"
 Basic.MainMenu.File.Export="&Eksport"
 Basic.MainMenu.File.ShowRecordings="Pokaż nag&rania"
@@ -616,17 +629,18 @@
 Basic.MainMenu.Edit.AdvAudio="Z&aawansowane ustawienia dźwięku"
 Basic.MainMenu.View="Widok (&V)"
 Basic.MainMenu.View.Toolbars="Paski narzędzi (&T)"
-Basic.MainMenu.View.ListboxToolbars="Przyciski pod listą scen / źródeł obrazu"
+Basic.MainMenu.View.ListboxToolbars="Paski narzędzi paneli"
 Basic.MainMenu.View.ContextBar="Pasek narzędziowy źródła"
-Basic.MainMenu.View.SceneTransitions="Efekty przejś&cia scen"
 Basic.MainMenu.View.SourceIcons="&Ikony źródłowe"
 Basic.MainMenu.View.StatusBar="Pasek &stanu"
 Basic.MainMenu.View.Fullscreen.Interface="Pełnoekranowy interfejs"
 Basic.MainMenu.View.ResetUI="P&rzywróć domyślny interfejs"
 Basic.MainMenu.View.AlwaysOnTop="Z&awsze na wierzchu"
+Basic.MainMenu.View.SceneListMode="Tryb listy scen"
 Basic.MainMenu.Docks="Panele"
 Basic.MainMenu.Docks.ResetDocks="&Resetuj panele"
 Basic.MainMenu.Docks.LockDocks="Zab&lokuj panele"
+Basic.MainMenu.Docks.SideDocks="Panele boczne (&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Panele przeglądarki..."
 Basic.MainMenu.SceneCollection="Zbiór &scen"
 Basic.MainMenu.Profile="&Profil"
@@ -635,7 +649,6 @@
 Basic.MainMenu.SceneCollection.Import="Importuj kolekcje scen"
 Basic.MainMenu.SceneCollection.Export="Eksportuj kolekcję scen"
 Basic.MainMenu.Profile.Exists="Profil już istnieje"
-Basic.MainMenu.SceneCollection.Exists="Kolekcja sceny już istnieje"
 Basic.MainMenu.Tools="Narzędzia (&T)"
 Basic.MainMenu.Help="Pomoc (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal pomocy"
@@ -647,8 +660,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Wyślij aktualny plik dziennika (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Prześlij &poprzedni plik dziennika"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Podgląd aktywnego pliku dziennika (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Informacje o wersji"
 Basic.MainMenu.Help.CheckForUpdates="Sprawdź dostępność aktualizacji"
 Basic.MainMenu.Help.Repair="Sprawdź integralność plików"
+Basic.MainMenu.Help.RestartSafeMode="Uruchom ponownie w trybie awaryjnym"
+Basic.MainMenu.Help.RestartNormal="Uruchom ponownie w trybie normalnym"
 Basic.MainMenu.Help.CrashLogs="&Raporty o awariach"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Pokaż raporty o awariach (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Prześlij &poprzedni raport o awariach"
@@ -716,7 +732,6 @@
 Basic.Settings.General.ChannelDescription.stable="Najnowsze stabilne wydanie"
 Basic.Settings.General.ChannelName.beta="Beta / RC"
 Basic.Settings.General.ChannelDescription.beta="Potencjalnie niestabilne wersje testowe"
-Basic.Settings.Stream.StreamType="Typ streamu"
 Basic.Settings.Stream.Custom.UseAuthentication="Użyj uwierzytelniania"
 Basic.Settings.Stream.Custom.Username="Nazwa użytkownika"
 Basic.Settings.Stream.Custom.Password="Hasło"
@@ -747,7 +762,6 @@
 Basic.Settings.Output.Encoder.Video="Enkoder obrazu"
 Basic.Settings.Output.Encoder.Audio="Enkoder dźwięku"
 Basic.Settings.Output.SelectDirectory="Wybierz katalog nagrywania"
-Basic.Settings.Output.SelectFile="Wybierz plik nagrania"
 Basic.Settings.Output.DynamicBitrate="Dynamicznie zmień bitrate by zapobiec zapychaniu łącza"
 Basic.Settings.Output.DynamicBitrate.Beta="Dynamicznie zmień bitrate by zapobiec zapychaniu łącza (beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Zamiast odrzucać klatki przy zapchanym łączu dynamicznie zmienia bitrate enkodowania.\n\nW przypadku dużego i nagłego przytkania łącza zwiększa to opóźnienie streamu dla oglądających.\nPo zmniejszeniu bitrate, jego powrót do normalnych wartości może potrwać kilka minut.\n\nMechanizm obsługiwany jest obecnie jedynie przy protokole RTMP."
@@ -775,7 +789,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Ostrzeżenie: Nagrywanie nie może być spauzowane, gdy jakość nagrywania ustawiona jest na \"Taka sama jak stream\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Uwaga: Obecnie wybrany format nagrywania nie jest kompatybilny z wybranym enkoderem streamu."
 Basic.Settings.Output.Simple.Warn.Encoder="Ostrzeżenie: Nagrywanie przy użyciu enkodera programowego z jakością inną niż stream wymagać będzie dodatkowej mocy procesora w przypadku jednoczesnego streamowania i nagrywania."
-Basic.Settings.Output.Simple.Warn.Lossless="Ostrzeżenie: Jakość bezstratna generuje bardzo duże pliki! Przy dużych rozdzielczościach i szybkości klatek rozmiar pliku może sięgać 7GB na minutę nagrania. Jakość ta nie jest zalecana w przypadku długich nagrań, chyba że masz bardzo dużo wolnego miejsca na dysku."
+Basic.Settings.Output.Simple.Warn.Lossless="Ostrzeżenie: Jakość bezstratna generuje bardzo duże pliki! Przy dużych rozdzielczościach i wysokich wartościach FPS rozmiar pliku może sięgać 7GB na minutę nagrania. Jakość bezstratna nie jest polecana w przypadku długich nagrań, chyba że masz bardzo dużo wolnego miejsca na dysku. Bufor powtórek nie jest dostępny przy jakości bezstratnej."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Czy na pewno chcesz użyć bezstratnej jakości?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Ostrzeżenie o bezstratnej jakości!"
 Basic.Settings.Output.Simple.Encoder.Software="Programowy (x264)"
@@ -924,8 +938,8 @@
 Basic.Settings.Audio.PeakMeterType="Typ szczytowego poziomu paska audio"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Poziom szczytowy próbkowany"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Rzeczywisty szczytowy poziom (większe użycie procesora)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Uwaga: Dźwięk przestrzenny jest włączony."
-Basic.Settings.Audio.MultichannelWarning="W przypadku streamowania sprawdź, czy docelowa usługa obsługuje wejście oraz odtwarzanie dźwięku surround. Facebook 360 Live to przykład usługi obsługującej dźwięk surround. O ile Facebook Live i Youtube Live obsługują wejście dźwięku surround, to w przypadku odtwarzania Facebook miksuje kanały do trybu stereo a Youtube Live odtwarza tylko dwa kanały.\n\nFiltry dźwiękowe OBS są w pełni kompatybilne z dźwiękiem surround, natomiast wsparcie pluginów VST nie jest gwarantowane."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Uwaga: Dźwięk przestrzenny jest włączony."
+Basic.Settings.Audio.MultichannelWarning="W przypadku korzystania z transmisji strumieniowej należy sprawdzić, czy usługa ta obsługuje zarówno przesyłanie dźwięku przestrzennego surround, jak i jego odtwarzanie. Na przykład, Facebook 360 Live w pełni obsługuje dźwięk przestrzenny. YouTube Live obsługuje przesyłanie dźwięku 5.1 (i odtwarzanie na telewizorach). \nFiltry audio OBS są kompatybilne z dźwiękiem przestrzennym, choć obsługa wtyczek VST nie jest gwarantowana."
 Basic.Settings.Audio.MultichannelWarning.Title="Włączyć dźwięk przestrzenny?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Czy na pewno chcesz włączyć dźwięk przestrzenny?"
 Basic.Settings.Audio.Devices="Globalne urządzenia audio"
@@ -972,7 +986,6 @@
 Basic.Settings.Advanced.FormatWarning="Ostrzeżenie: Formaty koloru inne niż NV12/P010 przeznaczone są głównie do nagrywania i nie są zalecane podczas przesyłania strumieniowego. Przekształcenie formatu kolorów w locie podczas przesyłania strumieniowego może zwiększyć obciążenie procesora."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Ostrzeżenie: Formaty o wysokiej precyzji są częściej używane z przestrzeniami kolorów HDR."
 Basic.Settings.Advanced.FormatWarning2100="Ostrzeżenie: Rec. 2100 powinno użyć formatu z większą dokładnością."
-Basic.Settings.Advanced.Audio.BufferingTime="Czas buforowania dźwięku"
 Basic.Settings.Advanced.Video.ColorFormat="Format koloru"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bitowy, 4:2:0, 2 płaszczyzny)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bitowy, 4:2:0, 3 płaszczyzny)"
@@ -998,6 +1011,7 @@
 Basic.Settings.Advanced.Network="Sieć"
 Basic.Settings.Advanced.Network.Disabled="Aktualnie wybrany protokół strumieniowania nie obsługuje zmiany ustawień sieci."
 Basic.Settings.Advanced.Network.BindToIP="Przypisane IP"
+Basic.Settings.Advanced.Network.IPFamily="Protokół IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Włącz sieciowe optymalizacje"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Włącz regulację tempa TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Próbuje sprawić, aby ruch RTMP był bardziej przyjazny innym aplikacjom wrażliwym na opóźnienie w sieci poprzez regulację szybkości transmisji.\nMoże to zwiększyć ryzyko pomijania ramek na niestabilnych połączeniach."
@@ -1052,6 +1066,8 @@
 SceneItemShow="Pokaż '%1'"
 SceneItemHide="Ukryj '%1'"
 OutputWarnings.NoTracksSelected="Musisz wybrać przynajmniej jedną ścieżkę"
+OutputWarnings.NoTracksSelectedOnExit.Title="Błąd ustawień wyjścia"
+OutputWarnings.NoTracksSelectedOnExit.Text="Wszystkie wyjścia muszą mieć wybraną przynajmniej jedną ścieżkę dźwiękową."
 OutputWarnings.MP4Recording="Ostrzeżenie: Nagrania zapisanego w formacie MP4/MOV nie będzie można odzyskać, jeśli plik nie zostanie zakończony poprawnie (np. w wyniku BSOD, braku prądu, itp.). Jeśli chcesz nagrać wiele ścieżek audio należy rozważyć użycie formatu MKV i remux nagrania do MP4/MOV po zakończeniu (Plik → Przepakuj nagrania)."
 OutputWarnings.CannotPause="Ostrzeżenie: Nagrywanie nie może być spauzowane, gdy enkoder nagrywania ustawiony jest na \"(użyj enkodera streamu)\""
 OutputWarnings.CodecIncompatible="Wybór enkodera audio lub wideo został zresetowany ze względu na niekompatybilność z formatem nagrywania. Wybierz z listy obsługiwany enkoder."
@@ -1077,6 +1093,7 @@
 About.GetInvolved="Wesprzyj nas"
 About.Authors="Autorzy"
 About.License="Licencja"
+About.Error="Błąd! Nie można odczytać pliku.\n\nIdź do: %1"
 About.Contribute="Wesprzyj projekt"
 AddUrl.Title="Dodaj źródło z adresu URL"
 AddUrl.Text="Przeciągnąłeś adres URL do OBS. To automatycznie doda link jako źródło. Kontynuować?"
@@ -1096,14 +1113,12 @@
 LoadProfileNeedsRestart="Profil zawiera ustawienia, które wymagają ponownego uruchomienia OBS:\n%1\n\nCzy chcesz zrestartować OBS, aby te ustawienia zaczęły obowiązywać?"
 ContextBar.NoSelectedSource="Nie wybrano źródła"
 ContextBar.ResetTransform="Reset przekształceń"
-ContextBar.FitToCanvas="Dopasuj do powierzchni roboczej"
 ContextBar.MediaControls.PlayMedia="Odtwarzaj"
 ContextBar.MediaControls.PauseMedia="Pauza"
 ContextBar.MediaControls.StopMedia="Zatrzymaj"
 ContextBar.MediaControls.RestartMedia="Restartuj"
 ContextBar.MediaControls.PlaylistNext="Następny na liście odtwarzania"
 ContextBar.MediaControls.PlaylistPrevious="Poprzedni na liście odtwarzania"
-ContextBar.MediaControls.MediaProperties="Właściwości pliku"
 ContextBar.MediaControls.BlindSeek="Pasek postępu odtwarzania"
 YouTube.Auth.Ok="Autoryzacja zakończona pomyślnie.\nMożesz teraz zamknąć tę stronę."
 YouTube.Auth.NoCode="Proces autoryzacji nie został zakończony."
@@ -1184,3 +1199,5 @@
 YouTube.Errors.liveChatEnded="Transmisja na żywo zakończyła się."
 YouTube.Errors.messageTextInvalid="Treść wiadomości jest nieprawidłowa."
 YouTube.Errors.rateLimitExceeded="Wysyłasz wiadomości zbyt szybko."
+YouTube.DocksRemoval.Title="Wyczyść przestarzałe panele przeglądarkowe YouTube "
+YouTube.DocksRemoval.Text="Poniższe przestarzałe panele przeglądarkowe zostaną usunięte.\n\n%1\nZamiast tego użyj \"Panele/YouTube Live Control Room\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/pt-BR.ini Changed

@@ -24,11 +24,11 @@
 Stereo="Estéreo"
 DroppedFrames="Quadros perdidos %1 (%2%)"
 StudioProgramProjector="Projetor em tela cheia (programa)"
-PreviewProjector="Projetor em tela cheia (prévia)"
+PreviewProjector="Espelhar pré-visualização em tela cheia"
 SceneProjector="Projetor em tela cheia (cena)"
 SourceProjector="Projetor em tela cheia (fonte)"
 StudioProgramWindow="Projetor em janela (programa)"
-PreviewWindow="Projetor em janela (prévia)"
+PreviewWindow="Espelhar pré-visualização em janela"
 SceneWindow="Projetor em janela (cena)"
 SourceWindow="Projetor em janela (fonte)"
 MultiviewProjector="Visualização múltipla (tela cheia)"
@@ -48,7 +48,7 @@
 HighResourceUsage="Codificação sobrecarregada! Considere reduzir as configurações de vídeo ou usar um padrão de codificação mais rápido."
 Transition="Transição"
 QuickTransitions="Transições rápidas"
-FadeToBlack="Desvanecer para preto"
+FadeToBlack="Desvanecer"
 Left="Esquerda"
 Right="Direita"
 Top="Cima"
@@ -75,7 +75,7 @@
 ShowTransition="Transição ao mostrar"
 HideTransition="Transição ao ocultar"
 None="Nenhuma"
-StudioMode.Preview="Prévia"
+StudioMode.Preview="Pré-visualização"
 StudioMode.Program="Programa"
 StudioMode.PreviewSceneName="Pré-visualização: %1"
 StudioMode.ProgramSceneName="Programa: %1"
@@ -93,7 +93,6 @@
 LogViewer="Registros"
 ShowOnStartup="Mostrar na inicialização"
 OpenFile="Abrir arquivo"
-AddValue="Adicionar %1"
 AddSource="Adicionar fonte"
 RemoveScene="Excluir cena selecionada"
 RemoveSource="Remover fonte(s) selecionada(s)"
@@ -101,19 +100,27 @@
 MoveSceneDown="Mover cena para baixo"
 MoveSourceUp="Mover Fonte(s) para cima"
 MoveSourceDown="Mover Fonte(s) para Baixo"
-SourceProperties="Propriedades do Código Aberto"
-SourceFilters="Filtros de Código Aberto"
+SourceProperties="Abrir propriedades da fonte"
+SourceFilters="Abrir propriedades do filtro"
 MixerToolbarMenu="Menu de Mixagem de Áudio"
-SceneFilters="Abrir Filtros de Cena"
+SceneFilters="Abrir filtros de cena"
+List="Lista"
+Grid="Grade"
 PluginsFailedToLoad.Title="Erro ao carregar o Plugin"
 PluginsFailedToLoad.Text="Os seguintes plugins do OBS falharam ao carregar:\n\n%1\nPor favor, atualize ou remova estes plugins."
 AlreadyRunning.Title="OBS já está em execução"
 AlreadyRunning.Text="OBS já está em execução! A menos que você tenha a intenção de fazer isso, por favor, feche todas as instâncias existentes do OBS antes de tentar executar uma nova. Se você tiver definido para minimizar o OBS na bandeja do sistema, verifique se ainda está lá em execução."
 AlreadyRunning.LaunchAnyway="Executar mesmo assim"
+AutoSafeMode.Title="Modo de segurança"
+AutoSafeMode.Text="O OBS não foi encerrado corretamente na última sessão.\n\nVocê gostaria de iniciar no modo de segurança (plugins de terceiros, scripts e websockets desativados)?"
+AutoSafeMode.LaunchSafe="Executar no modo de segurança"
+AutoSafeMode.LaunchNormal="Executar no modo normal"
+SafeMode.Restart="Deseja reiniciar o OBS no modo de segurança (plugins de terceiros, scripts e websockets desativados)?"
+SafeMode.RestartNormal="Deseja reiniciar o OBS no modo normal?"
 ChromeOS.Title="Plataforma não suportada"
-ChromeOS.Text="O OBS parece estar rodando dentro de um contêiner ChromeOS. Esta plataforma não é suportada."
+ChromeOS.Text="Aparentemente, o OBS está sendo executado em um Chrome OS. Esta plataforma não tem suporte."
 Wine.Title="Wine detectado"
-Wine.Text="Executar OBS no Wine não é suportado, e muitos recursos como fontes de captura ou dispositivo não funcionarão ou terão capacidade limitada. É recomendado executar uma versão nativa do OBS em vez disso, por exemplo <a href='https://flathub.org/apps/details/com.obsproject.Studio'>nossa versão do Flatpak</a> ou operar pacotes do seu sistema operacional."
+Wine.Text="Não há suporte para executar OBS no Wine e muitos recursos como fontes de captura ou dispositivo não funcionarão ou terão capacidade limitada. É recomendado executar uma versão nativa do OBS em vez disso, por exemplo <a href='https://flathub.org/apps/details/com.obsproject.Studio'>nossa versão do Flatpak</a> ou instalando a partir de pacotes do seu sistema operacional."
 DockCloseWarning.Title="Fechar janela de painel"
 DockCloseWarning.Text="Você acabou de fechar um painel que estava em uma janela. Se você gostaria de mostrá-lo novamente, acesse o menu de Painéis na barra de menu."
 ExtraBrowsers="Painéis personalizáveis com URL"
@@ -122,7 +129,7 @@
 Auth.Authing.Title="Autenticando..."
 Auth.Authing.Text="Autenticando com %1, aguarde..."
 Auth.AuthFailure.Title="Falha na autenticação"
-Auth.AuthFailure.Text="Falha ao autenticar com %1:\n\n%2: %3"
+Auth.AuthFailure.Text="Não foi possível autenticar com %1:\n\n%2: %3"
 Auth.InvalidScope.Title="Autenticação necessária"
 Auth.InvalidScope.Text="Os requisitos de autenticação do(a) %1 foram alterados. Alguns recursos podem não estar disponíveis."
 Auth.LoadingChannel.Title="Carregando informações do canal..."
@@ -176,8 +183,8 @@
 Basic.AutoConfig.StreamPage.Server="Servidor"
 Basic.AutoConfig.StreamPage.StreamKey="Chave de transmissão"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: insira a frase de criptografia.\nRTMP: insira a chave fornecida pelo serviço.\nSRT: insira o streamid se o serviço usar um."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(link)"
 Basic.AutoConfig.StreamPage.EncoderKey="Chave do codificador"
+Basic.AutoConfig.StreamPage.BearerToken="Token Bearer"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Conta conectada"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimar taxa de bits com teste de largura de banda (pode levar uns minutos)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferir codificação por hardware"
@@ -188,7 +195,7 @@
 Basic.AutoConfig.TestPage.SubTitle.Testing="O programa está executando um conjunto de testes para estimar as configurações ideais"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Teste completo"
 Basic.AutoConfig.TestPage.TestingBandwidth="Executando teste de largura de banda, isto pode levar alguns minutos..."
-Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Nenhuma saída para o protocolo deste serviço foi encontrada"
+Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Não foi encontrada nenhuma saída para o protocolo deste serviço"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Conectando a: %1..."
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="Não foi possível conectar nenhum servidor, verifique sua conexão com a internet e tente novamente."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Testando largura de banda para: %1"
@@ -228,20 +235,16 @@
 Updater.UpdateNow="Atualizar agora"
 Updater.RemindMeLater="Lembre-me depois"
 Updater.Skip="Ignorar"
-Updater.Running.Title="Programa em execução"
-Updater.Running.Text="Saídas estão atualmente ativas, por favor desligue quaisquer saídas ativas antes de tentar atualizar"
 Updater.NoUpdatesAvailable.Title="Nenhuma atualização disponível"
 Updater.NoUpdatesAvailable.Text="Nenhuma atualização disponível no momento"
-Updater.BranchNotFound.Title="Canal de Atualização Removido"
-Updater.BranchNotFound.Text="Seu canal de atualização selecionado não está mais disponível, o OBS foi redefinido para o padrão."
-Updater.RepairButUpdatesAvailable.Title="Verificação de Integridade Indisponível"
+Updater.BranchNotFound.Title="Canal de atualização removido"
+Updater.BranchNotFound.Text="Seu canal de atualização selecionado não está mais disponível e o OBS foi redefinido para o padrão."
+Updater.RepairButUpdatesAvailable.Title="Verificação de integridade indisponível"
 Updater.RepairButUpdatesAvailable.Text="Verificar a integridade do arquivo só é possível para a versão mais recente disponível. Use Ajuda → Verificar Atualizações para verificar e atualizar sua instalação do OBS."
-Updater.RepairConfirm.Title="Confirmar Verificação da Integridade"
-Updater.RepairConfirm.Text="Iniciar a verificação de integridade realizará um escaneamento em busca de arquivos corrompidos, modificados que possam ter sido que baixados novamente na instalação do OBS. Isto pode levar alguns minutos.\n\nVocê deseja continuar?"
+Updater.RepairConfirm.Title="Confirmar Verificação de Integridade"
+Updater.RepairConfirm.Text="Iniciar a verificação de integridade determinará se a instalação do OBS está corrompida e baixará novamente os arquivos corrompidos/modificados. Isso pode demorar um pouco.\n\nDeseja continuar?"
 Updater.FailedToLaunch="Falha ao iniciar o atualizador"
-Updater.GameCaptureActive.Title="Captura de jogo ativa"
-Updater.GameCaptureActive.Text="A biblioteca de captura do jogo está em uso no momento. Por favor feche qualquer jogo/programa que esteja sendo capturado (ou reinicie o Windows) e tente novamente."
-QuickTransitions.SwapScenes="Alternar Cenário Prévias/Programa Após a Transição"
+QuickTransitions.SwapScenes="Alternar cenas de pré-visualização/programa após uma transição"
 QuickTransitions.SwapScenesTT="Troca as cenas de pré-visualização e programa após a transição (se a cena original do programa ainda existir).\nIsso não desfaz nenhuma alteração que possa ter sido feita na cena original do programa."
 QuickTransitions.DuplicateScene="Duplicar cena"
 QuickTransitions.DuplicateSceneTT="Ao editar a mesma cena, permite editar a transformação/visibilidade das fontes sem modificar a saída do programa.\nPara editar as propriedades das fontes sem modificar a saída do programa, habilite 'Fontes Duplicadas'.\nAlterar este valor irá redefinir a cena atual do programa (se ainda existir)."
@@ -254,6 +257,8 @@
 Basic.SceneTransitions="Transições de cena"
 Basic.TransitionDuration="Duração"
 Basic.TogglePreviewProgramMode="Modo estúdio"
+Basic.EnablePreviewProgramMode="Ativar modo estúdio"
+Basic.DisablePreviewProgramMode="Desativar modo estúdio"
 Undo.Undo="Desfazer"
 Undo.Redo="Refazer"
 Undo.Add="adição de \"%1\""
@@ -302,6 +307,8 @@
 Undo.GroupItems="agrupamento dos itens para \"%1\""
 TransitionNameDlg.Text="Por favor, insira o nome da transição"
 TransitionNameDlg.Title="Nome da transição"
+TitleBar.SafeMode="MODO DE SEGURANÇA"
+TitleBar.PortableMode="Modo Portátil"
 TitleBar.Profile="Perfil"
 TitleBar.Scenes="Cenas"
 NameExists.Title="Nome existente"
@@ -326,6 +333,7 @@
 Output.StartStreamFailed="Falha ao iniciar a transmissão"
 Output.StartRecordingFailed="Falha ao iniciar a gravação"
 Output.StartReplayFailed="Falha ao iniciar o buffer de repetição"
+Output.StartVirtualCamFailed="Falha ao iniciar a câmera virtual"
 Output.StartFailedGeneric="Não foi possível criar o arquivo de saída. Verifique o registro para mais detalhes do erro.\n\nAviso: se estiver utilizando os codificadores NVENC ou AMD, certifique-se de que os seus drivers estão atualizados."
 Output.ReplayBuffer.PauseWarning.Title="Não é possível salvar replays enquanto pausado"
 Output.ReplayBuffer.PauseWarning.Text="Aviso: replays não podem ser salvos enquanto a gravação estiver pausada."
@@ -338,7 +346,7 @@
 Output.ConnectFail.Disconnected="Desconectado do servidor."
 Output.StreamEncodeError.Title="Erro de codificação"
 Output.StreamEncodeError.Msg="Ocorreu um erro de codificação durante a transmissão."
-Output.StreamEncodeError.Msg.LastError="Um erro do codificador ocorreu durante o streaming:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Um erro de codificador ocorreu durante a transmissão: %1"
 Output.RecordFail.Title="Falha ao iniciar a gravação"
 Output.RecordFail.Unsupported="O formato de saída ou não é compatível ou não suporta mais do que uma faixa de áudio. Por favor, verifique suas configurações e tente novamente."
 Output.RecordNoSpace.Title="Espaço em disco insuficiente"
@@ -346,7 +354,7 @@
 Output.RecordError.Title="Erro de gravação"
 Output.RecordError.Msg="Ocorreu um erro não especificado durante a gravação."
 Output.RecordError.EncodeErrorMsg="Ocorreu um erro de codificação durante a gravação."
-Output.RecordError.EncodeErrorMsg.LastError="Ocorreu um erro do codificador durante a gravação:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Um erro de codificador ocorreu durante a gravação: %1"
 Output.BadPath.Title="Caminho de arquivo inválido"
 Output.BadPath.Text="O caminho de gravação configurado não pode ser aberto. Por favor, verifique o caminho de gravação em Configurações → Saída → Gravação."
 Output.NoBroadcast.Title="Nenhuma transmissão configurada"
@@ -376,6 +384,8 @@
 Remux.ExitUnfinishedTitle="Conversão em andamento"
 Remux.ExitUnfinished="Conversão não concluída, parar agora pode tornar o arquivo de destino inutilizável.\nTem certeza que deseja parar a conversão?"
 Remux.HelpText="Arraste arquivos para esta janela para converter ou clique em \"Gravação do OBS\" para localizar um arquivo."
+Remux.NoFilesAddedTitle="Nenhum arquivo de remixagem adicionado"
+Remux.NoFilesAdded="Nenhum arquivo é adicionado ao remixagem. Solte uma pasta contendo um ou mais arquivos de vídeo."
 MissingFiles="Arquivos em falta"
 MissingFiles.MissingFile="Arquivo em falta"
 MissingFiles.NewFile="Novo arquivo"
@@ -394,10 +404,11 @@
 MissingFiles.AutoSearchText="O OBS encontrou outras correspondências para arquivos em falta na pasta. Gostaria de adicioná-las?"
 MissingFiles.NoMissing.Title="Verificação de arquivos em falta"
 MissingFiles.NoMissing.Text="Nenhum arquivo parece estar em falta."
-MacPermissions.Title="Avaliar as Permissões do Aplicativo"
-MacPermissions.Description="O OBS Studio requer sua permissão para poder fornecer certos recursos. É recomendável habilitar estas permissões, mas não é necessário usar o aplicativo. Você pode sempre habilitá-los mais tarde."
-MacPermissions.Description.OpenDialog="Você pode reabrir este caixa de diálogo através do menu do OBS Studio."
-MacPermissions.AccessGranted="Acesso Autorizado"
+MacPermissions.MenuAction="Revisar as permissões do aplicativo..."
+MacPermissions.Title="Revisar Permissões do Aplicativo"
+MacPermissions.Description="O OBS Studio requer sua permissão para poder fornecer certos recursos. É recomendável habilitar estas permissões, mas não é necessário para usar o aplicativo. Você pode sempre habilitá-los mais tarde."
+MacPermissions.Description.OpenDialog="Você pode reabrir este caixa de diálogo através do menu OBS Studio."
+MacPermissions.AccessGranted="Acesso Garantido"
 MacPermissions.RequestAccess="Solicitar acesso"
 MacPermissions.OpenPreferences="Abrir%1 Preferências"
 MacPermissions.Item.ScreenRecording="Captura de Tela"
@@ -409,14 +420,14 @@
 MacPermissions.Item.Accessibility="Acessibilidade"
 MacPermissions.Item.Accessibility.Details="Para atalhos de teclado (teclas de atalho) funcionarem enquanto outros aplicativos estiverem em foco, ative esta permissão."
 MacPermissions.Continue="Continuar"
-UpdateAvailable="Nova atualização disponível"
-UpdateAvailable.Text="A versão %1.%2.%3 já está disponível. <a href='%4'>Clique aqui para fazer download</a>"
+SourceLeak.Title="Erro ao Limpar Fonte"
+SourceLeak.Text="Ocorreu um problema ao alterar as coleções de cenas e algumas fontes não puderam ser descarregadas. Esse problema geralmente é causado por plug-ins que não estão liberando os recursos corretamente. Por favor, certifique-se de que todos os plug-ins que você está usando estão atualizados.\n\nOBS Studio agora será encerrado para evitar qualquer possível corrupção de dados."
 Basic.DesktopDevice1="Áudio do desktop"
 Basic.DesktopDevice2="Áudio do desktop 2"
 Basic.Scene="Cena"
 Basic.DisplayCapture="Captura de tela"
-Basic.Main.PreviewConextMenu.Enable="Ativar prévia"
-Basic.Main.Preview.Disable="Desativar prévia"
+Basic.Main.PreviewConextMenu.Enable="Ativar pré-visualização"
+Basic.Main.Preview.Disable="Desativar pré-visualização"
 ScaleFiltering="Filtragem de escala"
 ScaleFiltering.Point="Ponto"
 ScaleFiltering.Bicubic="Bicúbico"
@@ -424,12 +435,12 @@
 BlendingMethod="Método de Mesclagem"
 BlendingMethod.Default="Padrão"
 BlendingMethod.SrgbOff="SRGB desligado"
-BlendingMode="Modo de Mesclagem"
+BlendingMode="Modo de mesclagem"
 BlendingMode.Additive="Adicionar"
 BlendingMode.Subtract="Subtrair"
 BlendingMode.Screen="Tela"
 BlendingMode.Multiply="Multiplicar"
-BlendingMode.Lighten="Iluminar"
+BlendingMode.Lighten="Clarear"
 BlendingMode.Darken="Escurecer"
 Deinterlacing="Desentrelaçamento"
 Deinterlacing.Discard="Descartar"
@@ -453,7 +464,7 @@
 RenameProfile.Title="Renomear perfil"
 Basic.Main.MixerRename.Title="Renomear fonte de áudio"
 Basic.Main.MixerRename.Text="Por favor, digite o nome da fonte de áudio"
-Basic.Main.PreviewDisabled="A prévia está desativada"
+Basic.Main.PreviewDisabled="A pré-visualização esta desativada"
 Basic.SourceSelect="Criar ou reutilizar fonte"
 Basic.SourceSelect.CreateNew="Criar nova"
 Basic.SourceSelect.AddExisting="Reutilizar existente"
@@ -466,6 +477,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (seleção automática: %2)"
 Basic.PropertiesWindow.SelectColor="Escolher cor"
 Basic.PropertiesWindow.SelectFont="Escolher fonte"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Escolha uma fonte"
 Basic.PropertiesWindow.ConfirmTitle="Configurações alteradas"
 Basic.PropertiesWindow.Confirm="Há alterações não salvas. Deseja salvar agora?"
 Basic.PropertiesWindow.NoProperties="Sem propriedades disponíveis"
@@ -476,9 +488,9 @@
 Basic.PropertiesWindow.AddEditableListFiles="Adicionar arquivos para '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="Adicionar entrada a '%1'"
 Basic.PropertiesWindow.EditEditableListEntry="Editar a entrada de '%1'"
-Basic.PropertiesView.FPS.Simple="Valores de FPS Simples"
+Basic.PropertiesView.FPS.Simple="Valores de FPS simples"
 Basic.PropertiesView.FPS.Rational="Valores de FPS racionais"
-Basic.PropertiesView.FPS.ValidFPSRanges="Intervalos de FPS válidos:"
+Basic.PropertiesView.FPS.ValidFPSRanges="Intervalos válidos de FPS:"
 Basic.PropertiesView.UrlButton.Text="Abrir este link no seu navegador padrão?"
 Basic.PropertiesView.UrlButton.OpenUrl="Abrir URL"
 Basic.InteractionWindow="Interagindo com '%1'"
@@ -559,7 +571,7 @@
 Basic.Main.StoppingReplayBuffer="Interrompendo buffer de repetição..."
 Basic.Main.SetupBroadcast="Gerenciar Transmissão"
 Basic.Main.StopStreaming="Interromper transmissão"
-Basic.Main.StopBroadcast="Encerrar Transmissão"
+Basic.Main.StopBroadcast="Encerrar transmissão"
 Basic.Main.AutoStopEnabled="(Parada Automática)"
 Basic.Main.StoppingStreaming="Interrompendo a transmissão..."
 Basic.Main.ForceStopStreaming="Interromper transmissão (ignorar atraso)"
@@ -575,9 +587,9 @@
 Basic.VCam.VirtualCamera="Câmera Virtual"
 Basic.VCam.OutputType="Tipo de saída"
 Basic.VCam.OutputSelection="Seleção de saída"
-Basic.VCam.Internal="Interno"
-Basic.VCam.InternalDefault="Saída do Programa (Padrão)"
-Basic.VCam.InternalPreview="Pré-visualização de saída"
+Basic.VCam.OutputType.Program="Programa (Padrão)"
+Basic.VCam.OutputSelection.NoSelection="Nenhuma seleção para este tipo de saída"
+Basic.VCam.RestartWarning="A câmera virtual será reiniciada para aplicar esta alteração"
 Basic.MainMenu.File="Arquivo (&F)"
 Basic.MainMenu.File.Export="&Exportar"
 Basic.MainMenu.File.Import="&Importar"
@@ -591,8 +603,8 @@
 Basic.MainMenu.Edit="&Editar"
 Basic.MainMenu.Edit.Undo="Desfazer (&U)"
 Basic.MainMenu.Edit.Redo="&Refazer"
-Basic.MainMenu.Edit.LockPreview="B&loquear prévia"
-Basic.MainMenu.Edit.Scale="Tamanho da prévia (&S)"
+Basic.MainMenu.Edit.LockPreview="B&loquear pré-visualização"
+Basic.MainMenu.Edit.Scale="Tamanho da pré-vi&sualização"
 Basic.MainMenu.Edit.Scale.Window="Dimensionar à janela"
 Basic.MainMenu.Edit.Scale.Canvas="Tela (%1x%2)"
 Basic.MainMenu.Edit.Scale.Output="Saída (%1x%2)"
@@ -619,17 +631,18 @@
 Basic.MainMenu.Edit.AdvAudio="Propriedades de áudio &avançadas"
 Basic.MainMenu.View="&Visualizar"
 Basic.MainMenu.View.Toolbars="Barras de ferramen&tas"
-Basic.MainMenu.View.ListboxToolbars="Botões da lista de cena/origem"
+Basic.MainMenu.View.ListboxToolbars="Barras de ferramentas do Painel"
 Basic.MainMenu.View.ContextBar="Barra de ferramentas da fonte"
-Basic.MainMenu.View.SceneTransitions="Transições de &cena"
 Basic.MainMenu.View.SourceIcons="Ícones em fontes (&I)"
 Basic.MainMenu.View.StatusBar="Barra de &status"
 Basic.MainMenu.View.Fullscreen.Interface="Interface em tela cheia"
 Basic.MainMenu.View.ResetUI="&Redefinir interface"
 Basic.MainMenu.View.AlwaysOnTop="Sempre &ativo"
+Basic.MainMenu.View.SceneListMode="Modo de lista de cenas"
 Basic.MainMenu.Docks="Painéis (&D)"
 Basic.MainMenu.Docks.ResetDocks="&Redefinir painéis"
 Basic.MainMenu.Docks.LockDocks="B&loquear painéis"
+Basic.MainMenu.Docks.SideDocks="&Painel de altura total"
 Basic.MainMenu.Docks.CustomBrowserDocks="Painéis personalizáveis &com URL..."
 Basic.MainMenu.SceneCollection="Coleção de cena&s"
 Basic.MainMenu.Profile="&Perfil"
@@ -638,20 +651,22 @@
 Basic.MainMenu.SceneCollection.Import="Importar coleção de cenas"
 Basic.MainMenu.SceneCollection.Export="Exportar coleção de cenas"
 Basic.MainMenu.Profile.Exists="Esse perfil já existe"
-Basic.MainMenu.SceneCollection.Exists="Essa coleção de cenas já existe"
 Basic.MainMenu.Tools="Ferramentas (&T)"
 Basic.MainMenu.Help="Ajuda (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal de ajuda"
 Basic.MainMenu.Help.Website="Visitar &website"
 Basic.MainMenu.Help.Discord="Entrar no servidor do &Discord"
-Basic.MainMenu.Help.WhatsNew="O que há de novo"
+Basic.MainMenu.Help.WhatsNew="Novidades"
 Basic.MainMenu.Help.Logs="Arquivos de registro (&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="Mo&strar arquivos de registro"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Carregar arquivo de registro atual"
 Basic.MainMenu.Help.Logs.UploadLastLog="Carregar arquivo de registro anterior (&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ver arquivo de registro atual"
+Basic.MainMenu.Help.ReleaseNotes="Notas de Lançamento"
 Basic.MainMenu.Help.CheckForUpdates="Verificar se há atualizações"
 Basic.MainMenu.Help.Repair="Verificar integridade dos arquivos"
+Basic.MainMenu.Help.RestartSafeMode="Reiniciar no modo de segurança"
+Basic.MainMenu.Help.RestartNormal="Reiniciar no modo normal"
 Basic.MainMenu.Help.CrashLogs="&Relatórios de erros"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Mo&strar relatórios de erros"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Carregar relatório de erros anterior (&P)"
@@ -663,7 +678,7 @@
 Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Idioma"
 Basic.Settings.General.Updater="Atualizações"
-Basic.Settings.General.UpdateChannel="Canal de Atualização"
+Basic.Settings.General.UpdateChannel="Canal de atualização"
 Basic.Settings.General.UpdateChannelDisabled="(Desativado)"
 Basic.Settings.General.UpdateChannelDefault="(Padrão)"
 Basic.Settings.General.EnableAutoUpdates="Buscar novas atualizações ao inicializar"
@@ -692,7 +707,7 @@
 Basic.Settings.General.SystemTrayHideMinimize="Sempre minimizar para a bandeja (ignorar barra de tarefas)"
 Basic.Settings.General.SaveProjectors="Salvar projetores ao encerrar"
 Basic.Settings.General.CloseExistingProjectors="Limite de um projetor em tela cheia por tela"
-Basic.Settings.General.Preview="Prévia"
+Basic.Settings.General.Preview="Pré-visualização"
 Basic.Settings.General.OverflowHidden="Ocultar excesso"
 Basic.Settings.General.OverflowAlwaysVisible="Excesso sempre visível"
 Basic.Settings.General.OverflowSelectionHidden="Mostrar excesso mesmo quando a fonte estiver escondida"
@@ -700,7 +715,7 @@
 Basic.Settings.General.AutomaticCollectionSearch="Procurar em locais conhecidos por coleções de cena ao importar"
 Basic.Settings.General.SwitchOnDoubleClick="Usar transição para a cena quando clicar duas vezes"
 Basic.Settings.General.StudioPortraitLayout="Ativar a disposição horizontal/vertical"
-Basic.Settings.General.TogglePreviewProgramLabels="Mostrar rótulos de prévia/programa"
+Basic.Settings.General.TogglePreviewProgramLabels="Mostrar rótulos de pré-visualização/programa"
 Basic.Settings.General.Multiview="Visualização múltipla"
 Basic.Settings.General.Multiview.MouseSwitch="Clique para alternar entre cenas"
 Basic.Settings.General.Multiview.DrawSourceNames="Mostrar nome das cenas"
@@ -718,10 +733,9 @@
 Basic.Settings.General.MultiviewLayout.25Scene="Cenas apenas (25 cenas)"
 Basic.Settings.General.ChannelName.stable="Estável"
 Basic.Settings.General.ChannelDescription.stable="Último lançamento estável"
-Basic.Settings.General.ChannelName.beta="Betas / Candidatos a Lançamento"
-Basic.Settings.General.ChannelDescription.beta="Versões potencialmente instáveis de pré-lançamento"
+Basic.Settings.General.ChannelName.beta="Betas / Candidatas a lançamento"
+Basic.Settings.General.ChannelDescription.beta="Versões prévias potencialmente instáveis"
 Basic.Settings.Stream="Transmissão"
-Basic.Settings.Stream.StreamType="Tipo de transmissão"
 Basic.Settings.Stream.Custom.UseAuthentication="Utilizar autenticação"
 Basic.Settings.Stream.Custom.Username="Nome de usuário"
 Basic.Settings.Stream.Custom.Password="Senha"
@@ -752,7 +766,6 @@
 Basic.Settings.Output.Encoder.Video="Encoder de Vídeo"
 Basic.Settings.Output.Encoder.Audio="Encoder de Áudio"
 Basic.Settings.Output.SelectDirectory="Selecione a pasta de gravação"
-Basic.Settings.Output.SelectFile="Selecione o arquivo de gravação"
 Basic.Settings.Output.DynamicBitrate="Alterar taxa de bits dinamicamente para gerenciar o congestionamento"
 Basic.Settings.Output.DynamicBitrate.Beta="Alterar taxa de bits dinamicamente para gerenciar o congestionamento (beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Altera dinamicamente a taxa de bits em tempo real, em vez de perder frames para reduzir o congestionamento.\n\nNote que isso pode aumentar o atraso para os espectadores se houver um congestionamento repentino significativo.\nQuando a taxa de bits cair, pode levar até alguns minutos para restaurar.\n\nAtualmente suportado apenas para RTMP."
@@ -780,20 +793,20 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Aviso: gravações não podem ser pausadas se a qualidade da gravação estiver definida como \"A mesma da transmissão\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Alerta: A gravação atualmente selecionada é incompatível com o(s) encoder(s) de stream selecionado."
 Basic.Settings.Output.Simple.Warn.Encoder="Aviso: gravar com um codificador de software em uma qualidade diferente da transmissão vai exigir mais da CPU se você transmitir e gravar ao mesmo tempo."
-Basic.Settings.Output.Simple.Warn.Lossless="Aviso: o modo sem perda de qualidade gera arquivos muito grandes, que podem usar mais de 7 gigabytes de espaço em disco por minuto em altas resoluções e taxas de quadros. Modo sem perdas não é recomendado para gravações longas, a menos que se tenha uma grande quantidade de espaço em disco disponível."
+Basic.Settings.Output.Simple.Warn.Lossless="Aviso: O modo sem perda de qualidade gera arquivos extremamente grandes! Este modo pode usar até 7 gigabytes de espaço por minuto em altas resoluções e taxas de quadro. Não é recomendado para gravações longas a não ser que você tenha uma abundante quantidade de espaço no disco disponível. Buffer de repetição fica indisponível enquanto usa sem perda de qualidade."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Deseja mesmo usar a qualidade sem perdas?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Aviso de qualidade muito alta!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (preset x264 de baixa utilização de CPU, aumenta o tamanho do arquivo)"
 Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Padrão)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Faixa de VOD da Twitch (Usa faixa 2)"
-Basic.Settings.Output.Simple.RecAudioTrack="Faixa de Áudio"
+Basic.Settings.Output.Simple.RecAudioTrack="Faixa de áudio"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Resolução ou taxa de quadros incompatíveis"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Este serviço de streaming não suporta sua atual resolução e/ou taxa de quadros de saída. Eles serão alterados para o valor compatível mais próximo:\n\n%1\n\nVocê deseja continuar?"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Resolução: %1"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.FPS="Taxa de quadros: %1"
-Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="Encoder Incompatível"
-Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="O serviço de stream \"%1\" não suporta o encoder \"%2\". O encoder será alterado para \"%3\".\n\nDeseja continuar?"
-Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="O serviço de stream \"%1\" não suporta os encoders \"%2\" e \"%3\". Esses encoders serão alterados para \"%4\" and \"%5\".\n\nVocê quer continuar?"
+Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="Codificador incompatível"
+Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg="O serviço de streaming \"%1\" não suporta o codificador \"%2\". Em vez disso, o codificador será alterado para \"%3\".\n\nDeseja continuar?"
+Basic.Settings.Output.Warn.ServiceCodecCompatibility.Msg2="O serviço de streaming \"%1\" não suporta os codificadores \"%2\" e \"%3\". Em vez disso, os codificadores serão alterados para \"%4\" e \"%5\".\n\nDeseja continuar?"
 Basic.Settings.Output.VideoBitrate="Taxa de bits do vídeo"
 Basic.Settings.Output.AudioBitrate="Taxa de bits do áudio"
 Basic.Settings.Output.Reconnect="Reconectar automaticamente"
@@ -855,11 +868,11 @@
 Basic.Settings.Output.SplitFile.TypeSize="Dividir por tamanho"
 Basic.Settings.Output.SplitFile.TypeManual="Dividir apenas manualmente"
 Basic.Settings.Output.SplitFile.Time="Tempo de divisão"
-Basic.Settings.Output.SplitFile.Size="Tamanho para dividir"
+Basic.Settings.Output.SplitFile.Size="Tamanho de divisão"
 Screenshot="Caminho da captura de tela"
 Screenshot.SourceHotkey="Capturar fonte selecionada"
 Screenshot.StudioProgram="Capturar tela (programa)"
-Screenshot.Preview="Capturar tela (prévia)"
+Screenshot.Preview="Capturar tela (pré-visualização)"
 Screenshot.Scene="Capturar tela (cena)"
 Screenshot.Source="Capturar tela (fonte)"
 FilenameFormatting.TT.CCYY="Ano, quatro dígitos"
@@ -870,10 +883,10 @@
 FilenameFormatting.TT.mm="Minuto (00-59)"
 FilenameFormatting.TT.ss="Segundo (00-59)"
 FilenameFormatting.TT.Percent="Um símbolo de %"
-FilenameFormatting.TT.a="Nome do dia abreviado"
-FilenameFormatting.TT.A="Nome do dia completo"
-FilenameFormatting.TT.b="Nome do mês abreviado"
-FilenameFormatting.TT.B="Nome do mês completo"
+FilenameFormatting.TT.a="Nome abreviado do dia da semana"
+FilenameFormatting.TT.A="Nome completo do dia da semana"
+FilenameFormatting.TT.b="Nome abreviado do mês"
+FilenameFormatting.TT.B="Nome completo do mês"
 FilenameFormatting.TT.d="Dia do mês, precedido por zero (01-31)"
 FilenameFormatting.TT.H="Hora no formato 24h (00-23)"
 FilenameFormatting.TT.I="Hora no formato 12h (01-12)"
@@ -885,9 +898,9 @@
 FilenameFormatting.TT.y="Ano, últimos dois dígitos (00-99)"
 FilenameFormatting.TT.Y="Ano"
 FilenameFormatting.TT.z="Compensação ISO 8601 do fuso horário UTC"
-FilenameFormatting.TT.Z="Nome ou abreviação do Fuso horário"
-FilenameFormatting.TT.FPS="Quadros por segundo"
-FilenameFormatting.TT.CRES="Resolução base (canvas)"
+FilenameFormatting.TT.Z="Nome ou abreviação do fuso horário"
+FilenameFormatting.TT.FPS="Taxa de quadros"
+FilenameFormatting.TT.CRES="Resolução base (tela)"
 FilenameFormatting.TT.ORES="Resolução de saída (escala)"
 FilenameFormatting.TT.VF="Formato de vídeo"
 Basic.Settings.Video="Vídeo"
@@ -919,8 +932,8 @@
 Basic.Settings.Audio.PeakMeterType="Tipo do medidor de pico"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Exemplo de pico"
 Basic.Settings.Audio.PeakMeterType.TruePeak="True Peak (Uso elevado de CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="AVISO: áudio Surround está ativado."
-Basic.Settings.Audio.MultichannelWarning="Antes de transmitir, verifique se o seu serviço de transmissão suporta tanto receber como reproduzir som surround. Facebook 360 Live é um exemplo onde o som surround é totalmente suportado. Embora o Facebook Live e o YouTube Live ambos aceitem receber som surround, o Facebook Live transformará para estéreo e o YouTube Live reproduz apenas dois canais.\n\nOs filtros de áudio do OBS são compatíveis com o som surround, embora o suporte do plugin VST não seja garantido."
+Basic.Settings.Audio.MultichannelWarning.Enabled="AVISO: áudio Surround está ativado."
+Basic.Settings.Audio.MultichannelWarning="Se for transmitir, verifique se o serviço de transmissão suporta ambos receber e reproduzir som surround. Por exemplo, o Facebook 360 Live suporta totalmente som surround; O YouTube Live suporta receber áudio 5.1 (e de reprodução em TVs).\n\n Os filtros de áudio do OBS Studio são compatíveis com som surround, contudo, suporte de plugins VST não é garantido."
 Basic.Settings.Audio.MultichannelWarning.Title="Ativar o som surround?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Deseja mesmo ativar o som surround?"
 Basic.Settings.Audio.Devices="Dispositivos de áudio globais"
@@ -964,9 +977,8 @@
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Abaixo do normal"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Inativa"
 Basic.Settings.Advanced.FormatWarning="Aviso: Os formatos de cores diferentes de NV12/P010 destinam-se principalmente à gravação e não são recomendados durante a transmissão. O streaming pode aumentar o uso da CPU devido à conversão do formato de cor."
-Basic.Settings.Advanced.FormatWarningPreciseSdr="Aviso: Formatos de alta precisão são mais comumente usados com Espaços de Cores HDR."
+Basic.Settings.Advanced.FormatWarningPreciseSdr="Aviso: formatos de alta precisão são mais comumente usados com espaços de cores HDR."
 Basic.Settings.Advanced.FormatWarning2100="Aviso: Rec. 2100 deve usar um formato com mais precisão."
-Basic.Settings.Advanced.Audio.BufferingTime="Tempo de buffer de áudio"
 Basic.Settings.Advanced.Video.ColorFormat="Formato de cor"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 bits, 4:2:0, 2 planos)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 bits, 4:2:0, 3 planos)"
@@ -976,10 +988,10 @@
 Basic.Settings.Advanced.Video.ColorFormat.P216="P216 (16-bit, 4:2:2, 2 planos)"
 Basic.Settings.Advanced.Video.ColorFormat.P416="P416 (16-bit, 4:4:4, 2 planos)"
 Basic.Settings.Advanced.Video.ColorFormat.BGRA="BGRA (8 bits)"
-Basic.Settings.Advanced.Video.ColorSpace="Espaço de cor"
-Basic.Settings.Advanced.Video.ColorRange="Faixa de cores"
+Basic.Settings.Advanced.Video.ColorSpace="Espaço de cores"
+Basic.Settings.Advanced.Video.ColorRange="Intervalo de cores"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Limitado"
-Basic.Settings.Advanced.Video.ColorRange.Full="Completa"
+Basic.Settings.Advanced.Video.ColorRange.Full="Completo"
 Basic.Settings.Advanced.Video.SdrWhiteLevel="Nível de Branco SDR"
 Basic.Settings.Advanced.Video.HdrNominalPeakLevel="Nível do Pico Nominal HDR"
 Basic.Settings.Advanced.Audio.MonitoringDevice="Dispositivo de monitoramento"
@@ -992,6 +1004,7 @@
 Basic.Settings.Advanced.Network="Rede"
 Basic.Settings.Advanced.Network.Disabled="O protocolo de streaming atualmente selecionado não suporta alterações nas configurações de rede."
 Basic.Settings.Advanced.Network.BindToIP="Ligar pelo IP"
+Basic.Settings.Advanced.Network.IPFamily="Família IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Ativar otimizações de rede"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Ativar modo de baixa latência"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Tenta regular a taxa de transmissão para tornar a saída RTMP mais \"amigável\" para outras aplicações sensíveis à latência na rede.\nIsso pode aumentar o risco de perda de quadros em conexões instáveis."
@@ -1052,16 +1065,18 @@
 SceneItemShow="Mostrar '%1'"
 SceneItemHide="Ocultar '%1'"
 OutputWarnings.NoTracksSelected="Você deve selecionar pelo menos uma faixa"
+OutputWarnings.NoTracksSelectedOnExit.Title="Erro nas Configurações de Saída"
+OutputWarnings.NoTracksSelectedOnExit.Text="Todas as saídas devem ter pelo menos uma faixa de áudio selecionada."
 OutputWarnings.MP4Recording="Atenção: as gravações salvas em MP4/MOV não serão recuperáveis se o arquivo não puder ser concluído (por exemplo, como resultado de um BSOD, perdas de energia, etc.). Se você quiser gravar várias faixas de áudio, aconselhamos utilizar o MKV e, uma vez terminado, converter a gravação para MP4/MOV (Arquivo → Converter gravações)"
 OutputWarnings.CannotPause="Aviso: gravações não podem ser pausadas se o codificador de gravação estiver definido para \"(Usar o codificador da transmissão)\""
-OutputWarnings.CodecIncompatible="A seleção de encoder de áudio ou vídeo foi redefinida devido a incompatibilidade. Por favor seleciona um encoder compatível da lista."
+OutputWarnings.CodecIncompatible="A seleção de encoder de áudio ou vídeo foi redefinida devido a incompatibilidades. Por favor, selecione um encoder compatível da lista."
 CodecCompat.Incompatible="(Incompatível com %1)"
-CodecCompat.CodecPlaceholder="Selecionar Encoder..."
-CodecCompat.ContainerPlaceholder="Selecionar Formato..."
-CodecCompat.CodecMissingOnExit.Title="Nenhum codificador encontrado"
-CodecCompat.CodecMissingOnExit.Text="Pelo menos um encoder de vídeo ou áudio não foi definido. Por favor certifique-se de selecionar encoders para gravação e transmissão."
-CodecCompat.ContainerMissingOnExit.Title="Nenhum Formato Selecionado"
-CodecCompat.ContainerMissingOnExit.Text="Nenhum formato de gravação foi selecionado. Por favor selecione um formato de gravação que seja compatível com o encoder de transmissão selecionado."
+CodecCompat.CodecPlaceholder="Selecionar codificador..."
+CodecCompat.ContainerPlaceholder="Selecionar formato..."
+CodecCompat.CodecMissingOnExit.Title="Nenhum codificador selecionado"
+CodecCompat.CodecMissingOnExit.Text="Nenhum codificador de vídeo ou áudio foi definido. Por favor, certifique-se de selecionar codificadores para gravação e transmissão."
+CodecCompat.ContainerMissingOnExit.Title="Nenhum formato selecionado"
+CodecCompat.ContainerMissingOnExit.Text="Nenhum formato de gravação foi selecionado. Por favor, selecione um formato de gravação que seja compatível com o codificador de transmissão selecionado."
 FinalScene.Title="Excluir cena"
 FinalScene.Text="É preciso haver pelo menos uma cena."
 NoSources.Title="Sem fontes"
@@ -1077,6 +1092,7 @@
 About.GetInvolved="Participar"
 About.Authors="Autores"
 About.License="Licenças"
+About.Error="Erro! O arquivo não pôde ser lido.\n\nVá para: %1"
 About.Contribute="Apoie o OBS Project"
 AddUrl.Title="Adicionar fonte via URL"
 AddUrl.Text="Você arrastou uma URL para o OBS. Isso irá adicionar automaticamente o link como fonte. Deseja continuar?"
@@ -1097,14 +1113,12 @@
 LoadProfileNeedsRestart="Perfil contém configurações que requerem reinicialização do OBS:\n%1\n\nVocê deseja reiniciar o OBS para que essas configurações tenham efeito?"
 ContextBar.NoSelectedSource="Nenhuma fonte selecionada"
 ContextBar.ResetTransform="Limpar transformação"
-ContextBar.FitToCanvas="Ajustar à tela"
 ContextBar.MediaControls.PlayMedia="Reproduzir mídia"
 ContextBar.MediaControls.PauseMedia="Pausar mídia"
 ContextBar.MediaControls.StopMedia="Parar mídia"
 ContextBar.MediaControls.RestartMedia="Reiniciar mídia"
 ContextBar.MediaControls.PlaylistNext="Próxima na lista de reprodução"
 ContextBar.MediaControls.PlaylistPrevious="Anterior na lista de reprodução"
-ContextBar.MediaControls.MediaProperties="Propriedades da mídia"
 ContextBar.MediaControls.BlindSeek="Widget de procura de mídia"
 YouTube.Auth.Ok="Autorização concluída com sucesso.\nVocê pode fechar esta página."
 YouTube.Auth.NoCode="O processo de autorização não foi concluído."
@@ -1176,12 +1190,14 @@
 YouTube.Chat.Input.Sending="Enviando..."
 YouTube.Chat.Error.Title="Erro ao enviar mensagem"
 YouTube.Chat.Error.Text="Não foi possível enviar a mensagem: %1"
-YouTube.Errors.liveStreamingNotEnabled="Transmissão ao vivo não está habilitada no canal selecionado do YouTube. Veja <a href='https://www.youtube.com/features'>youtube.com/features</a> para mais informações."
-YouTube.Errors.livePermissionBlocked="Transmissão ao vivo não está disponível no canal do YouTube selecionado. Por favor, note que pode demorar até 24 horas para que a transmissão ao vivo fique disponível depois de habilitá-la nas suas configurações de canal. Consulte <a href='https://www.youtube.com/features'>youtube.com/features</a> para obter detalhes."
-YouTube.Errors.errorExecutingTransition="Transição falhou devido a um erro de backend. Por favor, tente novamente em alguns segundos."
-YouTube.Errors.errorStreamInactive="O YouTube não está recebendo dados para sua transmissão. Por favor, verifique sua configuração e tente novamente."
-YouTube.Errors.invalidTransition="A tentativa de transição era inválida. Isso pode ser devido ao fluxo não ter concluído uma transição anterior. Aguarde alguns segundos e tente novamente."
+YouTube.Errors.liveStreamingNotEnabled="Não é possível transmitir ao vivo no canal do YouTube selecionado, pois a função está desabilitada. Consulte <a href='https://www.youtube.com/features'>youtube.com/features</a> para mais informações."
+YouTube.Errors.livePermissionBlocked="Não é possível transmitir ao vivo no canal do YouTube selecionado. Pode demorar até 24 horas para que a transmissão ao vivo fique disponível depois de habilitada nas configurações do seu canal. Consulte <a href='https://www.youtube.com/features'>youtube.com/features</a> para mais detalhes."
+YouTube.Errors.errorExecutingTransition="A transição falhou devido a um erro de back-end. Por favor, tente novamente em alguns segundos."
+YouTube.Errors.errorStreamInactive="O YouTube não está recebendo dados da sua transmissão. Por favor, verifique suas configurações e tente novamente."
+YouTube.Errors.invalidTransition="A tentativa de transição foi invalidada. Isto pode estar relacionado com uma transição ainda pendente. Aguarde alguns segundos e tente novamente."
 YouTube.Errors.liveChatDisabled="O bate-papo ao vivo está desativado nesta transmissão."
-YouTube.Errors.liveChatEnded="Esta transmissão ao vivo terminou."
+YouTube.Errors.liveChatEnded="A transmissão ao vivo terminou."
 YouTube.Errors.messageTextInvalid="O texto da mensagem não é válido."
 YouTube.Errors.rateLimitExceeded="Você está enviando mensagens muito rapidamente."
+YouTube.DocksRemoval.Title="Limpar Docas YouTube Legadas"
+YouTube.DocksRemoval.Text="Estas docas de Navegador serão removidas por descontinuidade:\n\n%1\nUse \"Docas/YouTube Live Sala de Controle\" ao invés."

obs-studio-29.1.3.tar.xz/UI/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/pt-PT.ini Changed

@@ -32,8 +32,8 @@
 PreviewWindow="Projetor em janela (antevisão)"
 SceneWindow="Projetor em janela (cena)"
 SourceWindow="Projetor em janela (fonte)"
-MultiviewProjector="Multivista (ecrã total)"
-MultiviewWindowed="Multivista (janela)"
+MultiviewProjector="Multivisualização (ecrã total)"
+MultiviewWindowed="Multivisualização (janela)"
 ResizeProjectorWindowToContent="Ajustar janela ao conteúdo"
 Clear="Limpar"
 Revert="Reverter"
@@ -80,7 +80,7 @@
 StudioMode.Program="Programa"
 StudioMode.PreviewSceneName="Pré-visualização:%1"
 StudioMode.ProgramSceneName="Programa: %1"
-ShowInMultiview="Mostrar em multivista"
+ShowInMultiview="Mostrar em multivisualização"
 VerticalLayout="Disposição vertical"
 Group="Grupo"
 DoNotShowAgain="Não voltar a mostrar"
@@ -94,7 +94,6 @@
 LogViewer="Visualizador de diários"
 ShowOnStartup="Mostrar no arranque"
 OpenFile="Abrir ficheiro"
-AddValue="Adicionar %1"
 AddSource="Adicionar fonte"
 RemoveScene="Remover cena selecionada"
 RemoveSource="Remover cena(s) selecionada(s)"
@@ -106,11 +105,19 @@
 SourceFilters="Filtros de Código Aberto"
 MixerToolbarMenu="Menu do misturador de áudio"
 SceneFilters="Abrir filtros de cena"
+List="Lista"
+Grid="Grelha"
 PluginsFailedToLoad.Title="Erro ao carregar o plugin"
 PluginsFailedToLoad.Text="Falha ao carregar os seguintes plugins do OBS:\n\n%1\nPor favor, atualize ou remova estes plugins."
 AlreadyRunning.Title="O OBS já está em execução"
 AlreadyRunning.Text="O OBS já está em execução! Tem de desligar a instância existente do OBS antes de iniciar uma nova. Se o OBS estiver definido para correr na bandeja do sistema, por favor verifique se está aberto lá."
 AlreadyRunning.LaunchAnyway="Iniciar mesmo assim"
+AutoSafeMode.Title="Modo de segurança"
+AutoSafeMode.Text="O OBS não foi encerrado corretamente durante a sua última sessão.\n\nDeseja iniciar em modo de segurança (plugins, scripts e WebSockets de terceiros desativados)?"
+AutoSafeMode.LaunchSafe="Executar em modo de segurança"
+AutoSafeMode.LaunchNormal="Executar em modo normal"
+SafeMode.Restart="Deseja reiniciar o OBS em modo de segurança (plugins, scripts e WebSockets de terceiros desativados)?"
+SafeMode.RestartNormal="Deseja reiniciar o OBS em modo normal?"
 ChromeOS.Title="Plataforma não suportada"
 ChromeOS.Text="O OBS parece estar a ser executado dentro de um contentor ChromeOS. Esta plataforma não é suportada."
 Wine.Title="Wine detetado"
@@ -177,12 +184,12 @@
 Basic.AutoConfig.StreamPage.Server="Servidor"
 Basic.AutoConfig.StreamPage.StreamKey="Chave de transmissão"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: insira a senha de encriptação.\nRTMP: insira a chave fornecida pelo seu serviço.\nSRT: insira o streamid se o serviço usar um."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(ligação)"
 Basic.AutoConfig.StreamPage.EncoderKey="Chave de codificação"
+Basic.AutoConfig.StreamPage.BearerToken="Chave Bearer"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Conta ligada"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimar taxa de bits com teste de largura de banda (pode demorar alguns minutos)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferir codificação de equipamento"
-Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="A codificação de equipamento elimina a maior parte da utilização da CPU mas pode precisar de uma taxa de bits maior para obter o mesmo nível de qualidade."
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="A codificação por equipamento elimina a maior parte da utilização da CPU, mas pode necessitar de uma taxa de bits maior para obter o mesmo nível de qualidade."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Aviso de transmissão"
 Basic.AutoConfig.StreamPage.StreamWarning.Text="O teste de largura de banda vai transmitir dados de vídeo aleatórios sem áudio para o seu canal. É recomendado desligar temporariamente gravações de transmissões e definir a transmissão como privada até o teste estar completo. Continuar?"
 Basic.AutoConfig.TestPage="Resultado final"
@@ -224,14 +231,12 @@
 Basic.Stats.DiskFullIn="Disco cheio em (aprox.)"
 Basic.Stats.ResetStats="Repor estatísticas"
 ResetUIWarning.Title="Tem a certeza de que deseja reiniciar a interface de utilizador?"
-ResetUIWarning.Text="Reiniciar a interface de utilizador vai ocultar as docas adicionais. Terá de as ativar novamente no menu Docas se as quiser tornar visíveis.\n\nTem a certeza que deseja reiniciar o interface?"
+ResetUIWarning.Text="Reiniciar a interface de utilizador vai ocultar as docas adicionais. Terá de as ativar novamente no menu Docas se as quiser tornar visíveis.\n\nTem a certeza que deseja reiniciar a interface?"
 Updater.Title="Nova atualização disponível"
 Updater.Text="Está disponível uma nova atualização:"
 Updater.UpdateNow="Atualizar agora"
 Updater.RemindMeLater="Lembrar-me mais tarde"
 Updater.Skip="Ignorar versão"
-Updater.Running.Title="Programa atualmente ativo"
-Updater.Running.Text="Existem saídas atualmente ativas. Por favor, feche-as antes de tentar atualizar."
 Updater.NoUpdatesAvailable.Title="Nenhuma atualização disponível"
 Updater.NoUpdatesAvailable.Text="Não existem atualizações disponíveis"
 Updater.BranchNotFound.Title="Canal de atualização removido"
@@ -241,8 +246,6 @@
 Updater.RepairConfirm.Title="Confirmar verificação da integridade"
 Updater.RepairConfirm.Text="Ao iniciar a verificação de integridade irá verificar a sua instalação OBS ao nível de corrupção de ficheiros e descarregará novamente ficheiros que sejam identificados como danificados ou alterados. Isto pode demorar algum tempo.\n\nPretende continuar?"
 Updater.FailedToLaunch="Falha ao iniciar as atualizações"
-Updater.GameCaptureActive.Title="Captura de jogo ativa"
-Updater.GameCaptureActive.Text="A biblioteca de captura de jogo está a ser utilizada de momento. Por favor, feche qualquer jogo/programa que esteja a ser capturado (ou reinicie o Windows) e tente novamente."
 QuickTransitions.SwapScenes="Trocar cenas de antevisão/programa após uma transição"
 QuickTransitions.SwapScenesTT="Troca as cenas de antevisão/programa após a transição (se a cena de saída original ainda existir).\nIsto não desfaz qualquer alteração que possa ter havido com a cena original do programa."
 QuickTransitions.DuplicateScene="Duplicar cena"
@@ -256,6 +259,8 @@
 Basic.SceneTransitions="Transições de cena"
 Basic.TransitionDuration="Duração"
 Basic.TogglePreviewProgramMode="Modo de estúdio"
+Basic.EnablePreviewProgramMode="Ativar o modo estúdio"
+Basic.DisablePreviewProgramMode="Desativar o modo estúdio"
 Undo.Undo="Desfazer"
 Undo.Redo="Refazer"
 Undo.Add="Adicionar '%1'"
@@ -304,6 +309,8 @@
 Undo.GroupItems="Agrupar itens em '%1'"
 TransitionNameDlg.Text="Por favor, escreva o nome da transição"
 TransitionNameDlg.Title="Nome da transição"
+TitleBar.SafeMode="Modo seguro"
+TitleBar.PortableMode="Modo portátil"
 TitleBar.Profile="Perfil"
 TitleBar.Scenes="Cenas"
 NameExists.Title="O nome já existe"
@@ -328,6 +335,7 @@
 Output.StartStreamFailed="Falha ao iniciar a transmissão"
 Output.StartRecordingFailed="Falha ao iniciar a gravação"
 Output.StartReplayFailed="Falha ao iniciar a memória de repetição"
+Output.StartVirtualCamFailed="Falha ao iniciar câmera virtual"
 Output.StartFailedGeneric="Falha ao iniciar a saída. Verifique o ficheiro de diário para mais detalhes.\n\nNota: se está a usar codificadores NVENC ou AMD, certifique-se de que os controladores da placa gráfica estão atualizados."
 Output.ReplayBuffer.PauseWarning.Title="Não é possível guardar repetições quando pausado"
 Output.ReplayBuffer.PauseWarning.Text="Aviso: as repetições não podem ser guardadas quando a gravação está em pausa."
@@ -340,7 +348,7 @@
 Output.ConnectFail.Disconnected="Desligado do servidor."
 Output.StreamEncodeError.Title="Erro de codificação"
 Output.StreamEncodeError.Msg="Ocorreu um erro de codificação ao transmitir."
-Output.StreamEncodeError.Msg.LastError="Ocorreu um erro de codificação ao transmitir:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Ocorreu um erro de codificação ao transmitir: %1"
 Output.RecordFail.Title="Falha ao iniciar a gravação"
 Output.RecordFail.Unsupported="O formato de saída ou não é suportado ou não suporta mais do que uma faixa de áudio. Por favor, verifique as suas definições e tente novamente."
 Output.RecordNoSpace.Title="Espaço em disco insuficiente"
@@ -348,13 +356,13 @@
 Output.RecordError.Title="Erro de gravação"
 Output.RecordError.Msg="Ocorreu um erro desconhecido durante a gravação."
 Output.RecordError.EncodeErrorMsg="Ocorreu um erro de codificação ao gravar."
-Output.RecordError.EncodeErrorMsg.LastError="Ocorreu um erro de codificação ao gravar:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Ocorreu um erro de codificação ao gravar: %1"
 Output.BadPath.Title="Caminho de ficheiro inválido"
 Output.BadPath.Text="Não foi possível abrir o caminho de gravação configurado. Por favor, verifique o caminho de gravação em Definições → Saída → Gravação."
-Output.NoBroadcast.Title="Nenhuma transmissão configurada"
-Output.NoBroadcast.Text="Tem de configurar uma transmissão antes de começar a emitir."
-Output.BroadcastStartFailed="Falha ao iniciar a transmissão"
-Output.BroadcastStopFailed="Falha ao parar a transmissão"
+Output.NoBroadcast.Title="Nenhuma emissão configurada"
+Output.NoBroadcast.Text="Tem de configurar uma emissão antes de começar a transmitir."
+Output.BroadcastStartFailed="Falha ao iniciar a emissão"
+Output.BroadcastStopFailed="Falha ao parar a emissão"
 LogReturnDialog="Envio de diário com sucesso"
 LogReturnDialog.Description="O seu ficheiro de diário foi enviado. Agora pode partilhar o URL para fins de depuração ou suporte."
 LogReturnDialog.Description.Crash="O seu relatório de falhas foi enviado. Agora pode partilhar o URL para fins de depuração."
@@ -378,6 +386,8 @@
 Remux.ExitUnfinishedTitle="Conversão em curso"
 Remux.ExitUnfinished="A conversão não está concluída. Ao parar agora pode tornar o ficheiro de destino inutilizável.\nTem a certeza de que pretende parar a conversão?"
 Remux.HelpText="Solte ficheiros nesta janela para os converter, ou selecione uma célula \"Gravação do OBS\" vazia para procurar um ficheiro."
+Remux.NoFilesAddedTitle="Nenhum ficheiro de conversão adicionado"
+Remux.NoFilesAdded="Nenhum ficheiro de conversão adicionado ao conversor. Solte aqui uma pasta contendo um ou mais ficheiros de vídeo."
 MissingFiles="Ficheiros em falta"
 MissingFiles.MissingFile="Ficheiro em falta"
 MissingFiles.NewFile="Novo ficheiro"
@@ -396,6 +406,7 @@
 MissingFiles.AutoSearchText="O OBS encontrou correspondências adicionais para ficheiros em falta na pasta. Deseja adicioná-los?"
 MissingFiles.NoMissing.Title="Procurar ficheiros em falta"
 MissingFiles.NoMissing.Text="Não parece haver ficheiros em falta"
+MacPermissions.MenuAction="Rever permissões da aplicação..."
 MacPermissions.Title="Rever permissões da aplicação"
 MacPermissions.Description="O OBS Studio requer algumas permissões explícitas para poder disponibilizar certas funcionalidades. É recomendável fornecer essas permissões, mas não são necessárias para usar a plicação. Pode sempre dar essas permissões mais tarde."
 MacPermissions.Description.OpenDialog="Pode reabrir esta caixa de diálogo através do menu OBS Studio."
@@ -411,10 +422,10 @@
 MacPermissions.Item.Accessibility="Acessibilidade"
 MacPermissions.Item.Accessibility.Details="Por favor, ative esta permissão para que os atalhos de teclado funcionem enquanto outras aplicações estejam em foco."
 MacPermissions.Continue="Continuar"
-UpdateAvailable="Nova atualização disponível"
-UpdateAvailable.Text="A versão %1.%2.%3 está agora disponível. <a href='%4'>Clique aqui para descarregar</a>"
-Basic.DesktopDevice1="Áudio da área de trabalho"
-Basic.DesktopDevice2="Áudio da área de trabalho 2"
+SourceLeak.Title="Erro de limpeza da fonte"
+SourceLeak.Text="Ocorreu um problema a trocar de coleção de cenas e algumas fontes não foram desativadas. Este problema é normalmente causado por plugins que não libertam recursos corretamente. Por favor, verifique se todos os plugins utilizam a versão mais recente.\n\nOBS Studio irá agora fechar para prevenir qualquer corrupção de dados."
+Basic.DesktopDevice1="Áudio do ambiente de trabalho"
+Basic.DesktopDevice2="Áudio do ambiente de trabalho 2"
 Basic.AuxDevice1="Microfone/Auxiliar"
 Basic.AuxDevice2="Microfone/Auxiliar 2"
 Basic.AuxDevice3="Microfone/Auxiliar 3"
@@ -473,6 +484,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (seleção automática: %2)"
 Basic.PropertiesWindow.SelectColor="Selecionar cor"
 Basic.PropertiesWindow.SelectFont="Selecionar letra"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Escolha um tipo de letra"
 Basic.PropertiesWindow.ConfirmTitle="Definições alteradas"
 Basic.PropertiesWindow.Confirm="Há alterações não gravadas. Deseja gravá-las agora?"
 Basic.PropertiesWindow.NoProperties="Sem propriedades disponíveis"
@@ -536,12 +548,12 @@
 Basic.TransformWindow.Alignment.BottomCenter="Inferior centro"
 Basic.TransformWindow.Alignment.BottomRight="Inferior direito"
 Basic.TransformWindow.BoundsType.None="Sem limites"
-Basic.TransformWindow.BoundsType.MaxOnly="Só tamanho máximo"
+Basic.TransformWindow.BoundsType.MaxOnly="Apenas tamanho máximo"
 Basic.TransformWindow.BoundsType.ScaleInner="Redimensionar ao limite interno"
 Basic.TransformWindow.BoundsType.ScaleOuter="Redimensionar ao limite externo"
-Basic.TransformWindow.BoundsType.ScaleToWidth="Redimensionar à largura do limite"
-Basic.TransformWindow.BoundsType.ScaleToHeight="Redimensionar à altura do limite"
-Basic.TransformWindow.BoundsType.Stretch="Esticar ao limite"
+Basic.TransformWindow.BoundsType.ScaleToWidth="Redimensionar à largura dos limites"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Redimensionar à altura dos limites"
+Basic.TransformWindow.BoundsType.Stretch="Esticar aos limites"
 Basic.TransformWindow.Title="Editar transformação para '%1'"
 Basic.TransformWindow.NoSelectedSource="Nenhuma fonte selecionada"
 Basic.Main.AddSourceHelp.Title="Impossível adicionar fonte"
@@ -564,9 +576,9 @@
 Basic.Main.StoppingRecording="A parar gravação..."
 Basic.Main.StopReplayBuffer="Parar memória de repetição"
 Basic.Main.StoppingReplayBuffer="A parar memória de repetição..."
-Basic.Main.SetupBroadcast="Gerir transmissão"
+Basic.Main.SetupBroadcast="Gerir emissão"
 Basic.Main.StopStreaming="Parar transmissão"
-Basic.Main.StopBroadcast="Terminar transmissão"
+Basic.Main.StopBroadcast="Terminar emissão"
 Basic.Main.AutoStopEnabled="(paragem automática)"
 Basic.Main.StoppingStreaming="A parar transmissão..."
 Basic.Main.ForceStopStreaming="Parar transmissão (ignorar atraso)"
@@ -582,9 +594,9 @@
 Basic.VCam.VirtualCamera="Câmera virtual"
 Basic.VCam.OutputType="Tipo de saída"
 Basic.VCam.OutputSelection="Seleção de saída"
-Basic.VCam.Internal="Interna"
-Basic.VCam.InternalDefault="Saída do programa (predefinição)"
-Basic.VCam.InternalPreview="Saída da pré-visualização"
+Basic.VCam.OutputType.Program="Programa (predefinição)"
+Basic.VCam.OutputSelection.NoSelection="Nenhuma seleção para este tipo de saída"
+Basic.VCam.RestartWarning="A câmera virtual será reiniciada para aplicar esta alteração"
 Basic.MainMenu.File="&Ficheiro"
 Basic.MainMenu.File.Export="&Exportar"
 Basic.MainMenu.File.Import="&Importar"
@@ -626,17 +638,18 @@
 Basic.MainMenu.Edit.AdvAudio="Propriedades &avançadas de áudio"
 Basic.MainMenu.View="&Ver"
 Basic.MainMenu.View.Toolbars="Barras de ferramen&tas"
-Basic.MainMenu.View.ListboxToolbars="Botões da lista de cena/fonte"
+Basic.MainMenu.View.ListboxToolbars="Barras de ferramentas de docas"
 Basic.MainMenu.View.ContextBar="Barra de ferramenta das fontes"
-Basic.MainMenu.View.SceneTransitions="Transições de &cenas"
 Basic.MainMenu.View.SourceIcons="Ícones de &fonte"
 Basic.MainMenu.View.StatusBar="Barra de e&stado"
 Basic.MainMenu.View.Fullscreen.Interface="Interface em ecrã total"
 Basic.MainMenu.View.ResetUI="&Repor interface"
 Basic.MainMenu.View.AlwaysOnTop="&Sempre no topo"
+Basic.MainMenu.View.SceneListMode="Modo de lista de cenas"
 Basic.MainMenu.Docks="&Docas"
 Basic.MainMenu.Docks.ResetDocks="&Repor docas"
 Basic.MainMenu.Docks.LockDocks="&Bloquear docas"
+Basic.MainMenu.Docks.SideDocks="Docas de altura total (&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="Docas de navegador &personalizadas..."
 Basic.MainMenu.SceneCollection="&Coleção de cenas"
 Basic.MainMenu.Profile="&Perfil"
@@ -645,7 +658,6 @@
 Basic.MainMenu.SceneCollection.Import="Importar coleção de cenas"
 Basic.MainMenu.SceneCollection.Export="Exportar coleção de cenas"
 Basic.MainMenu.Profile.Exists="O perfil já existe"
-Basic.MainMenu.SceneCollection.Exists="A coleção de cenas já existe"
 Basic.MainMenu.Tools="Ferramen&tas"
 Basic.MainMenu.Help="A&juda"
 Basic.MainMenu.Help.HelpPortal="&Portal de ajuda"
@@ -657,8 +669,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Enviar fi&cheiro de diário atual"
 Basic.MainMenu.Help.Logs.UploadLastLog="Carregar ficheiro de diário &anterior"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ver diário atual"
+Basic.MainMenu.Help.ReleaseNotes="Notas da versão"
 Basic.MainMenu.Help.CheckForUpdates="Procurar atualizações"
 Basic.MainMenu.Help.Repair="Verificar integridade de ficheiros"
+Basic.MainMenu.Help.RestartSafeMode="Reiniciar no modo de segurança"
+Basic.MainMenu.Help.RestartNormal="Reiniciar no modo normal"
 Basic.MainMenu.Help.CrashLogs="&Relatórios de falhas"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Mo&strar relatórios de falhas"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Carregar relatório de falhas &anterior"
@@ -708,11 +723,11 @@
 Basic.Settings.General.SwitchOnDoubleClick="Transição para cena ao fazer duplo clique"
 Basic.Settings.General.StudioPortraitLayout="Ativar disposição horizontal/vertical"
 Basic.Settings.General.TogglePreviewProgramLabels="Mostrar etiquetas de antevisão/programa"
-Basic.Settings.General.Multiview="Multivista"
+Basic.Settings.General.Multiview="Multivisualização"
 Basic.Settings.General.Multiview.MouseSwitch="Clique para alternar entre cenas"
 Basic.Settings.General.Multiview.DrawSourceNames="Mostrar nome das cenas"
 Basic.Settings.General.Multiview.DrawSafeAreas="Desenhar áreas seguras (EBU R 95)"
-Basic.Settings.General.MultiviewLayout="Disposição multivista"
+Basic.Settings.General.MultiviewLayout="Disposição de multivisualização"
 Basic.Settings.General.MultiviewLayout.Horizontal.Top="Horizontal, topo (8 cenas)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Horizontal, fundo (8 cenas)"
 Basic.Settings.General.MultiviewLayout.Vertical.Left="Vertical, esquerda (8 cenas)"
@@ -728,7 +743,6 @@
 Basic.Settings.General.ChannelName.beta="Betas / Candidatos a lançamento"
 Basic.Settings.General.ChannelDescription.beta="Versões de pré-lançamento potencialmente instáveis"
 Basic.Settings.Stream="Transmissão"
-Basic.Settings.Stream.StreamType="Tipo de transmissão"
 Basic.Settings.Stream.Custom.UseAuthentication="Usar autenticação"
 Basic.Settings.Stream.Custom.Username="Utilizador"
 Basic.Settings.Stream.Custom.Password="Senha"
@@ -740,9 +754,9 @@
 Basic.Settings.Stream.TTVAddon.Both="BetterTTV e FrankerFaceZ"
 Basic.Settings.Stream.MissingSettingAlert="Definições de transmissão em falta"
 Basic.Settings.Stream.StreamSettingsWarning="Abrir definições"
-Basic.Settings.Stream.MissingUrlAndApiKey="O URL e a chave de transmissão estão em falta.\n\nAbra as definições e insira a chave e o URL no separador \"Transmissão\"."
-Basic.Settings.Stream.MissingUrl="O URL da transmissão está em falta.\n\nAbra as definições e insira o URL no separador \"Transmissão\"."
-Basic.Settings.Stream.MissingStreamKey="A chave de transmissão está em falta.\n\nAbra as definições e insira a chave no separador \"Transmissão\"."
+Basic.Settings.Stream.MissingUrlAndApiKey="O URL e a chave de transmissão estão em falta.\n\nAbra as definições e insira a chave e o URL na aba \"Transmissão\"."
+Basic.Settings.Stream.MissingUrl="O URL da transmissão está em falta.\n\nAbra as definições e insira o URL na aba \"Transmissão\"."
+Basic.Settings.Stream.MissingStreamKey="A chave de transmissão está em falta.\n\nAbra as definições e insira a chave na aba \"Transmissão\"."
 Basic.Settings.Stream.IgnoreRecommended="Ignorar recomendações de definições do serviço de transmissão"
 Basic.Settings.Stream.IgnoreRecommended.Warn.Title="Sobrepor definições recomendadas"
 Basic.Settings.Stream.IgnoreRecommended.Warn.Text="Aviso: ignorar as limitações do serviço pode resultar na redução de qualidade da transmissão ou mesmo impedi-la.\n\nContinuar?"
@@ -755,10 +769,11 @@
 Basic.Settings.Output.Format.MKV="Vídeo Matroska (.mkv)"
 Basic.Settings.Output.Format.fMP4="MP4 fragmentado (.mp4)"
 Basic.Settings.Output.Format.fMOV="MOV fragmentado (.mov)"
+Basic.Settings.Output.Format.TT.fmov="MOV fragmentado grava em partes e não requer a mesma finalização que os ficheiros MOV tradicionais.\nIsto garante que o ficheiro poderá ser executado mesmo se a gravação no disco for interrompida, por exemplo, como resultado de um BSOD ou perda de energia.\n\nPode não ser compatível com todas as aplicações de leitura e edição de vídeo. Utilize Ficheiro → Converter Gravações, para converter o ficheiro para um formato compatível, se necessário."
+Basic.Settings.Output.Format.TT.fmp4="MP4 fragmentado grava em partes e não requer a mesma finalização que os ficheiros MP4 tradicionais.\nIsto garante que o ficheiro poderá ser executado mesmo se a gravação no disco for interrompida, por exemplo, como resultado de um BSOD ou perda de energia.\n\nPode não ser compatível com todas as aplicações de leitura e edição de vídeo. Utilize Ficheiro → Converter Gravações, para converter o ficheiro para um formato compatível, se necessário."
 Basic.Settings.Output.Encoder.Video="Codificador de vídeo"
 Basic.Settings.Output.Encoder.Audio="Codificador de áudio"
 Basic.Settings.Output.SelectDirectory="Selecionar pasta de gravação"
-Basic.Settings.Output.SelectFile="Selecionar ficheiro de gravação"
 Basic.Settings.Output.DynamicBitrate="Alterar dinamicamente a taxa de bits para gerir congestionamento"
 Basic.Settings.Output.DynamicBitrate.Beta="Alterar dinamicamente a taxa de bits para gerir congestionamento (beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Em vez de perder fotogramas para reduzir o congestionamento, muda dinamicamente a taxa de bits.\n\nNote que isto pode aumentar o atraso para os espectadores, se houver um congestionamento súbito significativo.\nQuando a taxa de bits cai pode levar alguns minutos a restaurar.\n\nAtualmente só é suportado em RTMP."
@@ -777,21 +792,21 @@
 Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Memória intermédia de repetição não pode ser usada quando o tipo de gravação está definido para saída personalizada (FFmpeg)."
 Basic.Settings.Output.Simple.SavePath="Caminho da gravação"
 Basic.Settings.Output.Simple.RecordingQuality="Qualidade da gravação"
-Basic.Settings.Output.Simple.RecordingQuality.Stream="A mesma da transmissão"
-Basic.Settings.Output.Simple.RecordingQuality.Small="Alta qualidade, tamanho médio"
-Basic.Settings.Output.Simple.RecordingQuality.HQ="Qualidade indistinguível, tamanho grande"
-Basic.Settings.Output.Simple.RecordingQuality.Lossless="Qualidade sem perdas, tamanho enorme"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Igual à da transmissão"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Alta qualidade, tamanho médio de ficheiro"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Qualidade indistinguível, tamanho grande de ficheiro"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Qualidade sem perdas, tamanho enorme de ficheiro"
 Basic.Settings.Output.Simple.Warn.VideoBitrate="Aviso: a taxa de bits do vídeo da transmissão será definida para %1, que é o limite superior do serviço de transmissão atual."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Aviso: a taxa de bits do áudio da transmissão será definida para %1, que é o limite superior para o serviço de transmissão atual."
-Basic.Settings.Output.Simple.Warn.CannotPause="Aviso: as gravações não podem ser pausadas se a qualidade de gravação estiver definida como \"Mesma que a transmissão\"."
+Basic.Settings.Output.Simple.Warn.CannotPause="Aviso: as gravações não podem ser pausadas se a qualidade de gravação estiver definida como \"Igual à da transmissão\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Aviso: o formato de gravação atualmente selecionado é incompatível com o(s) codificador(es) de transmissão selecionado(s)."
-Basic.Settings.Output.Simple.Warn.Encoder="Aviso: gravar com um codificador de software com uma qualidade diferente da transmissão vai exigir mais da CPU, se transmitir e gravar ao mesmo tempo."
-Basic.Settings.Output.Simple.Warn.Lossless="Aviso: a qualidade sem perdas cria ficheiros com tamanhos tremendos; pode usar até 7 gigabytes de espaço em disco por minuto a altas resoluções e taxas de fotogramas. Não é recomendado usar qualidade sem perdas para gravações longas a não ser que tenha MUITO espaço disponível no disco."
+Basic.Settings.Output.Simple.Warn.Encoder="Aviso: gravar com um codificador de software, numa qualidade diferente da transmissão, vai exigir mais da CPU caso esteja a transmitir e gravar ao mesmo tempo."
+Basic.Settings.Output.Simple.Warn.Lossless="Aviso: a qualidade sem perdas cria ficheiros com tamanhos enormes! Tal pode implicar ocupar até 7 gigabytes de espaço em disco por minuto a altas resoluções e taxas de fotogramas. Não é recomendado usar qualidade sem perdas para gravações longas a não ser que tenha muito espaço disponível no disco. A memória de repetição fica indisponível quando se usa qualidade sem"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Tem a certeza de que pretende utilizar a qualidade sem perdas?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Aviso de qualidade sem perdas!"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Hardware (AMD, H.264)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (predefinição x264 de baixo uso do CPU, aumenta o tamanho do ficheiro)"
-Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Padrão)"
+Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Predefinido)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Faixa Twitch VOD (usa a faixa 2)"
 Basic.Settings.Output.Simple.RecAudioTrack="Faixa de áudio"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Resolução/Taxa de fotogramas incompatível"
@@ -808,7 +823,7 @@
 Basic.Settings.Output.Advanced="Ativar configurações personalizadas do codificador (Avançado)"
 Basic.Settings.Output.EncoderPreset="Predefinição do codificador"
 Basic.Settings.Output.EncoderPreset.ultrafast="%1 (baixo uso da CPU, qualidade mais baixa)"
-Basic.Settings.Output.EncoderPreset.veryfast="%1 (padrão) (uso médio da CPU, qualidade padrão)"
+Basic.Settings.Output.EncoderPreset.veryfast="%1 (predefinido) (uso médio da CPU, qualidade padrão)"
 Basic.Settings.Output.EncoderPreset.fast="%1 (uso intensivo da CPU, alta qualidade)"
 Basic.Settings.Output.CustomEncoderSettings="Definições de codificação personalizadas"
 Basic.Settings.Output.CustomMuxerSettings="Definições personalizadas do conversor"
@@ -892,7 +907,7 @@
 FilenameFormatting.TT.Y="Ano"
 FilenameFormatting.TT.z="Desfasamento ISO 8601 do UTC no fuso horário"
 FilenameFormatting.TT.Z="Nome ou abreviatura do fuso horário"
-FilenameFormatting.TT.FPS="Quadros por segundo"
+FilenameFormatting.TT.FPS="Fotogramas por segundo"
 FilenameFormatting.TT.CRES="Resolução base (ecrã)"
 FilenameFormatting.TT.ORES="Resolução de saída (redimensionado)"
 FilenameFormatting.TT.VF="Formato de vídeo"
@@ -910,7 +925,7 @@
 Basic.Settings.Video.Renderer="Processador"
 Basic.Settings.Video.InvalidResolution="Resolução inválida. Tem de ser larguraxaltura (i.e. 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Uma saída de vídeo encontra-se ativa. Por favor, desligue-a para alterar as definições de vídeo."
-Basic.Settings.Video.DownscaleFilter.Bilinear="Bi-linear (mais rápido, mas desfocada se escalar)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bi-linear (o mais rápido, mas desfocada se escalar)"
 Basic.Settings.Video.DownscaleFilter.Bicubic="Bicúbico (nítida ao escalar, 16 amostras)"
 Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (nítida ao escalar, 36 amostras)"
 Basic.Settings.Video.DownscaleFilter.Area="Área (soma ponderada, 4/6/9 amostras)"
@@ -918,20 +933,20 @@
 Basic.Settings.Audio.SampleRate="Taxa de amostragem"
 Basic.Settings.Audio.Channels="Canais"
 Basic.Settings.Audio.Meters="Medidores"
-Basic.Settings.Audio.MeterDecayRate="Taxa de queda"
+Basic.Settings.Audio.MeterDecayRate="Taxa de decaimento"
 Basic.Settings.Audio.MeterDecayRate.Fast="Rápida"
 Basic.Settings.Audio.MeterDecayRate.Medium="Média (tipo I PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="Lenta (tipo II PPM)"
 Basic.Settings.Audio.PeakMeterType="Tipo de medidor de pico"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Pico de amostra"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Pico verdadeiro (mais uso da CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="AVISO: o áudio multicanal está ativo."
-Basic.Settings.Audio.MultichannelWarning="Se for transmitir, verifique se o seu serviço de transmissão suporta tanto a inserção como a reprodução de áudio multicanal. O Facebook 360 Live é um exemplo onde este tipo de áudio é totalmente suportado. Apesar do Facebook Live e o YouTube Live aceitarem a inserção de áudio multicanal, o Facebook Live transforma-o em estéreo e o YouTube Live só reproduz dois canais.\n\nOs filtros de áudio do OBS são compatíveis com áudio multicanal, embora não esteja garantido o suporte a extensões VST."
+Basic.Settings.Audio.MultichannelWarning.Enabled="AVISO: o áudio multicanal está ativo."
+Basic.Settings.Audio.MultichannelWarning="Se estiver a transmitir, verifique se o seu serviço de transmissão suporta tanto ingestão de áudio surround como execução de áudio surround. Por exemplo, o Facebook 360 Live suporta totalmente o áudio surround; YouTube Live suporta ingestão de áudio 5.1 (e execução em TV). \n\nOs filtros de áudio do OBS são compatíveis com áudio surround, embora o suporte do plugin VST não seja garantido."
 Basic.Settings.Audio.MultichannelWarning.Title="Ativar áudio multicanal?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Tem a certeza de que deseja ativar o áudio multicanal?"
 Basic.Settings.Audio.Devices="Dispositivos de áudio globais"
-Basic.Settings.Audio.DesktopDevice="Áudio da área de trabalho"
-Basic.Settings.Audio.DesktopDevice2="Áudio da área de trabalho 2"
+Basic.Settings.Audio.DesktopDevice="Áudio do ambiente de trabalho"
+Basic.Settings.Audio.DesktopDevice2="Áudio do ambiente de trabalho 2"
 Basic.Settings.Audio.AuxDevice="Áudio Mic./Auxiliar"
 Basic.Settings.Audio.AuxDevice2="Áudio Mic./Auxiliar 2"
 Basic.Settings.Audio.AuxDevice3="Áudio Mic./Auxiliar 3"
@@ -972,7 +987,6 @@
 Basic.Settings.Advanced.FormatWarning="Aviso: formatos de cor diferentes de NV12/P010 destinam-se principalmente a gravação e não são recomendados durante a transmissão. A transmissão pode levar a uma maior utilização do processador devido à conversão do formato de cor."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Aviso: Formatos de alta precisão são usados normalmente em espaços de cores HDR."
 Basic.Settings.Advanced.FormatWarning2100="Aviso: Rec. 2100 deve usar um formato com mais exatidão."
-Basic.Settings.Advanced.Audio.BufferingTime="Tempo de memória para áudio"
 Basic.Settings.Advanced.Video.ColorFormat="Formato de cor"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 planos)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 planos)"
@@ -996,7 +1010,8 @@
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Utilização estimada de memória: %1 MB"
 Basic.Settings.Advanced.Network="Rede"
 Basic.Settings.Advanced.Network.Disabled="O protocolo de transmissão atualmente selecionado não suporta a alteração das configurações de rede."
-Basic.Settings.Advanced.Network.BindToIP="Ligar pelo IP"
+Basic.Settings.Advanced.Network.BindToIP="Vincular a IP"
+Basic.Settings.Advanced.Network.IPFamily="Família de IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Ativar otimizações de rede"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Ativar regulação TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Tenta tornar a saída RTMP mais amigável para outras aplicações sensíveis a latência na rede, regulando a taxa de transmissão.\nAumentará o risco de fotogramas perdidos em ligações instáveis."
@@ -1058,6 +1073,8 @@
 SceneItemShow="Mostrar '%1'"
 SceneItemHide="Ocultar '%1'"
 OutputWarnings.NoTracksSelected="Tem de selecionar pelo menos uma faixa"
+OutputWarnings.NoTracksSelectedOnExit.Title="Erro nas configurações de saída"
+OutputWarnings.NoTracksSelectedOnExit.Text="Todas as saídas de áudio devem ter pelo menos uma faixa de som selecionada."
 OutputWarnings.MP4Recording="Aviso: gravações em MP4/MOV serão irrecuperáveis se o ficheiro não puder ser finalizado (e.g., como resultado de BSODs, perdas de energia, etc.). Se quiser gravar várias faixas de áudio, considere usar MKV e converter a gravação para MP4/MOV depois de terminada (Ficheiro → Converter gravações)"
 OutputWarnings.CannotPause="Aviso: as gravações não podem ser paradas se o codificador estiver definido como \"(usar codificador da transmissão)\""
 OutputWarnings.CodecIncompatible="A seleção do codificador de áudio ou vídeo foi redefinida devido a incompatibilidades. Selecione, na lista, um codificador compatível."
@@ -1083,6 +1100,7 @@
 About.GetInvolved="Participe"
 About.Authors="Autores"
 About.License="Licença"
+About.Error="Erro! Não foi possível ler o ficheiro.\n\nIr para: %1"
 About.Contribute="Apoie o projeto OBS"
 AddUrl.Title="Adicionar fonte via URL"
 AddUrl.Text="Arrastou um URL para o OBS. Isto adiciona automaticamente a ligação como uma fonte. Continuar?"
@@ -1103,14 +1121,12 @@
 LoadProfileNeedsRestart="O perfil contém definições que requerem o reinício do OBS:\n%1\n\nDeseja reiniciar o OBS para aplicar estas definições?"
 ContextBar.NoSelectedSource="Nenhuma fonte selecionada"
 ContextBar.ResetTransform="Repor transformação"
-ContextBar.FitToCanvas="Ajustar à tela"
 ContextBar.MediaControls.PlayMedia="Reproduzir conteúdo"
 ContextBar.MediaControls.PauseMedia="Pausar conteúdo"
 ContextBar.MediaControls.StopMedia="Parar conteúdo"
 ContextBar.MediaControls.RestartMedia="Reiniciar conteúdo"
 ContextBar.MediaControls.PlaylistNext="Seguinte na lista de reprodução"
 ContextBar.MediaControls.PlaylistPrevious="Anterior na lista de reprodução"
-ContextBar.MediaControls.MediaProperties="Propriedades do conteúdo"
 ContextBar.MediaControls.BlindSeek="Ferramenta de procura de conteúdo"
 YouTube.Auth.Ok="Autorização concluída com sucesso.\nPode agora fechar esta página."
 YouTube.Auth.NoCode="O processo de autorização não foi concluído."
@@ -1118,11 +1134,11 @@
 YouTube.Auth.WaitingAuth.Title="Autorização de utilizador YouTube"
 YouTube.Auth.WaitingAuth.Text="Por favor, complete a autorização no seu navegador externo. Se o navegador externo não abrir, siga esta ligação e complete a autorização: %1"
 YouTube.AuthError.Text="Falha ao obter informações do canal: %1."
-YouTube.Actions.WindowTitle="Configuração de transmissão do YouTube - Canal: %1"
-YouTube.Actions.CreateNewEvent="Criar nova transmissão"
-YouTube.Actions.ChooseEvent="Selecionar transmissão existente"
+YouTube.Actions.WindowTitle="Configuração de emissão no YouTube - Canal: %1"
+YouTube.Actions.CreateNewEvent="Criar emissão"
+YouTube.Actions.ChooseEvent="Selecionar emissão existente"
 YouTube.Actions.Title="Título*"
-YouTube.Actions.MyBroadcast="Minha transmissão"
+YouTube.Actions.MyBroadcast="Minha emissão"
 YouTube.Actions.Description="Descrição"
 YouTube.Actions.Privacy="Privacidade*"
 YouTube.Actions.Privacy.Private="Privado"
@@ -1142,30 +1158,30 @@
 YouTube.Actions.Latency.UltraLow="Ultra baixa"
 YouTube.Actions.EnableAutoStart="Ativar início automático"
 YouTube.Actions.EnableAutoStop="Ativar paragem automática"
-YouTube.Actions.AutoStartStop.TT="Indica se esta transmissão programada deve começar automaticamente"
+YouTube.Actions.AutoStartStop.TT="Indica se esta emissão programada deve começar automaticamente"
 YouTube.Actions.EnableDVR="Ativar DVR"
 YouTube.Actions.360Video="Vídeo 360"
 YouTube.Actions.ScheduleForLater="Agendar para mais tarde"
 YouTube.Actions.RememberSettings="Recordar estas definições"
-YouTube.Actions.Create_Ready="Criar transmissão"
-YouTube.Actions.Create_GoLive="Criar transmissão e iniciar a emissão"
-YouTube.Actions.Choose_Ready="Selecionar transmissão"
-YouTube.Actions.Choose_GoLive="Selecionar a transmissão e começar a emitir"
-YouTube.Actions.Create_Schedule="Agendar transmissão"
-YouTube.Actions.Create_Schedule_Ready="Agendar e selecionar transmissão"
+YouTube.Actions.Create_Ready="Criar emissão"
+YouTube.Actions.Create_GoLive="Criar emissão e começar a transmitir"
+YouTube.Actions.Choose_Ready="Selecionar emissão"
+YouTube.Actions.Choose_GoLive="Selecionar emissão e começar a transmitir"
+YouTube.Actions.Create_Schedule="Agendar emissão"
+YouTube.Actions.Create_Schedule_Ready="Agendar e selecionar emissão"
 YouTube.Actions.Dashboard="Abrir o YouTube Studio"
-YouTube.Actions.Error.Title="Erro na criação da transmissão ao vivo"
+YouTube.Actions.Error.Title="Erro na criação da emissão ao vivo"
 YouTube.Actions.Error.Text="Erro de acesso ao YouTube '%1'. Pode encontrar uma descrição detalhada do erro em <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.General="Falha ao aceder ao YouTube. Por favor, verifique a ligação à rede ou o acesso ao servidor do YouTube."
-YouTube.Actions.Error.NoBroadcastCreated="Erro de criação de transmissão '%1'. Pode encontrar uma descrição detalhada do erro em <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
+YouTube.Actions.Error.NoBroadcastCreated="Erro de criação de emissão '%1'. Pode encontrar uma descrição detalhada do erro em <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.NoStreamCreated="Nenhuma transmissão criada. Por favor, religue a conta."
 YouTube.Actions.Error.YouTubeApi="Erro da API do YouTube. Por favor, veja o ficheiro de diário para mais informações."
-YouTube.Actions.Error.BroadcastNotFound="A transmissão selecionada não foi encontrada."
+YouTube.Actions.Error.BroadcastNotFound="A emissão selecionada não foi encontrada."
 YouTube.Actions.Error.FileMissing="O ficheiro selecionado não existe."
 YouTube.Actions.Error.FileOpeningFailed="Falha ao abrir o ficheiro selecionado."
 YouTube.Actions.Error.FileTooLarge="Ficheiro selecionado é demasiado grande (limite: 2 MB)."
-YouTube.Actions.Error.BroadcastTransitionFailed="Falha na transição da transmissão: %1 Se este erro persistir <a href='https://studio.youtube.com/video/%2/livestreaming'>abra a transmissão no YouTube Studio</a> e tente manualmente."
-YouTube.Actions.Error.BroadcastTestStarting="Transmissão está a fazer a transição para a etapa de teste, isto pode levar algum tempo. Por favor, tente novamente daqui a 10-30 segundos."
+YouTube.Actions.Error.BroadcastTransitionFailed="Falha na transição da emissão: %1 Se este erro persistir <a href='https://studio.youtube.com/video/%2/livestreaming'>abra a transmissão no YouTube Studio</a> e tente manualmente."
+YouTube.Actions.Error.BroadcastTestStarting="A emissão está a fazer a transição para a etapa de teste, isto pode levar algum tempo. Por favor, tente novamente daqui a 10-30 segundos."
 YouTube.Actions.EventsLoading="A carregar a lista de eventos..."
 YouTube.Actions.EventCreated.Title="Evento criado"
 YouTube.Actions.EventCreated.Text="Evento criado com sucesso."
@@ -1173,7 +1189,7 @@
 YouTube.Actions.Stream.ScheduledFor="Agendado para %1"
 YouTube.Actions.Stream.Resume="Retomar transmissão interrompida"
 YouTube.Actions.Stream.YTStudio="Criado automaticamente pelo YouTube Studio"
-YouTube.Actions.Notify.CreatingBroadcast="A criar uma nova transmissão ao vivo, por favor aguarde..."
+YouTube.Actions.Notify.CreatingBroadcast="A criar emissão ao vivo, por favor aguarde..."
 YouTube.Actions.AutoStartStreamingWarning.Title="Início manual necessário"
 YouTube.Actions.AutoStartStreamingWarning="O início automático está desativado para este evento, clique em \"Emitir em direto\" para iniciar a transmissão."
 YouTube.Actions.AutoStopStreamingWarning="Não poderá voltar a ligar. A sua transmissão parará e deixará de estar em direto."
@@ -1191,3 +1207,5 @@
 YouTube.Errors.liveChatEnded="A transmissão ao vivo terminou."
 YouTube.Errors.messageTextInvalid="O texto da mensagem não é valido."
 YouTube.Errors.rateLimitExceeded="Está a enviar mensagens rápido demais!"
+YouTube.DocksRemoval.Title="Limpar docas de navegador legadas do YouTube"
+YouTube.DocksRemoval.Text="Estas docas de navegador serão removidas por serem obsoletas:\n\n%1\nEm vez disto, use \"Docas/Sala de controle ao vivo do YouTube\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ro-RO.ini Changed

@@ -90,8 +90,7 @@
 LogViewer="Vizualizator de jurnale"
 ShowOnStartup="Afișează la pornire"
 OpenFile="Deschide fișierul"
-AddValue="Adaugă %1"
-AddSource="Adaugă sursa"
+AddSource="Adaugă o sursă"
 RemoveScene="Elimină scena selectată"
 RemoveSource="Elimină sursele selectate"
 MoveSceneUp="Mută scena în sus"
@@ -101,19 +100,27 @@
 SourceProperties="Deschide proprietățile sursei"
 SourceFilters="Deschide filtrele sursei"
 MixerToolbarMenu="Meniu Mixer Audio"
-SceneFilters="Filtre de scenă deschise"
+SceneFilters="Deschide filtrele scenei"
+List="Listă"
+Grid="Grilă"
 PluginsFailedToLoad.Title="Eroare la încărcarea pluginului"
 PluginsFailedToLoad.Text="Următoarele pluginuri OBS nu au putut fi încărcate:\n\n%1\nTe rugăm să actualizezi sau să elimini aceste pluginuri."
 AlreadyRunning.Title="OBS rulează deja"
 AlreadyRunning.Text="OBS rulează deja! Dacă nu intenționezi să faci acest lucru, te rugăm să închizi toate instanțele OBS existente înainte de a încerca să rulezi o nouă instanță. Dacă ai OBS-ul setat să se minimizeze în bara de sistem, te rugam să verifici dacă rulează acolo."
 AlreadyRunning.LaunchAnyway="Lansează oricum"
+AutoSafeMode.Title="Mod sigur"
+AutoSafeMode.Text="OBS nu s-a închis în mod corespunzător în timpul ultimei tale sesiuni.\n\nDorești să pornești în modul sigur (pluginurile terțe, scripturile și WebSocketurile dezactivate)?"
+AutoSafeMode.LaunchSafe="Rulează în modul sigur"
+AutoSafeMode.LaunchNormal="Rulează în modul normal"
+SafeMode.Restart="Dorești să repornești OBS în modul sigur (pluginurile terțe, scripturile și WebSocketurile dezactivate)?"
+SafeMode.RestartNormal="Vrei să repornești OBS în modul normal?"
 ChromeOS.Title="Platformă nesuportată"
 ChromeOS.Text="OBS pare să ruleze în interiorul unui container ChromeOS. Această platformă nu este suportată."
 Wine.Title="Wine detectat"
 Wine.Text="Funcționarea OBS în Wine nu este suportată și multe caracteristici, cum ar fi sursele de captare sau de dispozitiv, nu vor funcționa sau nu vor funcționa decât într-o capacitate limitată. Se recomandă rularea unei versiuni native de OBS în loc, de exemplu <a href='https://flathub.org/apps/details/com.obsproject.Studio'>versiunea noastră Flatpak</a> sau pachetele sistemului dvs. de operare."
 DockCloseWarning.Title="Închiderea ferestrei andocabile"
-DockCloseWarning.Text="Tocmai ai închis o fereastră andocabilă. Dacă dorești să o afișezi din nou, folosește meniul Vizualizare → Andocări din bara de meniu."
-ExtraBrowsers="Andocări personalizate pentru browser"
+DockCloseWarning.Text="Tocmai ai închis o fereastră andocabilă. Dacă dorești să o afișezi din nou, folosește meniul Andocări din bara de meniu."
+ExtraBrowsers="Andocări personalizate de browser"
 ExtraBrowsers.Info="Adaugă andocări dându-le un nume și un URL, apoi dă clic pe Aplică sau Închide pentru a deschide andocările. Poți adăuga sau elimina andocări oricând."
 ExtraBrowsers.DockName="Numele andocării"
 Auth.Authing.Title="Se autentifică..."
@@ -145,8 +152,8 @@
 Basic.AutoConfig.ApplySettings="Aplică setările"
 Basic.AutoConfig.StartPage="Informații de utilizare"
 Basic.AutoConfig.StartPage.SubTitle="Specifică pentru ce vrei să folosești programul"
-Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimizează pentru transmisiune, înregistrarea este pe plan secund"
-Basic.AutoConfig.StartPage.PrioritizeRecording="Optimizează numai pentru înregistrare, nu voi face transmisiuni"
+Basic.AutoConfig.StartPage.PrioritizeStreaming="Optimizează pentru streaming, înregistrarea este pe plan secund"
+Basic.AutoConfig.StartPage.PrioritizeRecording="Optimizează numai pentru înregistrare, nu voi face streaming"
 Basic.AutoConfig.StartPage.PrioritizeVirtualCam="Voi folosi doar camera virtuală"
 Basic.AutoConfig.VideoPage="Setări video"
 Basic.AutoConfig.VideoPage.SubTitle="Specifică setările video pe care dorești să le folosești"
@@ -172,6 +179,7 @@
 Basic.AutoConfig.StreamPage.StreamKey="Cheie de transmisiune"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: introduceți fraza de criptare.\nRTMP: introduceți cheia furnizată de serviciu.\nSRT: introduceți streamid-ul, dacă serviciul utilizează unul."
 Basic.AutoConfig.StreamPage.EncoderKey="Cheie de codificare"
+Basic.AutoConfig.StreamPage.BearerToken="Token Bearer"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Cont conectat"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Estimează rata de biți cu o testare a lățimii de bandă (poate dura câteva minute)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferă codificarea hardware"
@@ -188,7 +196,7 @@
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="Se testează lățimea de bandă pentru: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="Se testează codificatorul de transmisiune, acest lucru poate dura un minut..."
 Basic.AutoConfig.TestPage.TestingRecordingEncoder="Se testează codificatorul de înregistrare, acest lucru poate dura un minut..."
-Basic.AutoConfig.TestPage.TestingRes.Fail="Pornirea codificatorului a eșuat"
+Basic.AutoConfig.TestPage.TestingRes.Fail="Eșec la pornirea codificatorului"
 Basic.AutoConfig.TestPage.TestingRes.Resolution="Se testează %1x%2, %3 FPS..."
 Basic.AutoConfig.TestPage.Result.StreamingEncoder="Codificator de transmisiune"
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Codificator de înregistrare"
@@ -222,8 +230,6 @@
 Updater.UpdateNow="Actualizează acum"
 Updater.RemindMeLater="Reamintește-mi mai târziu"
 Updater.Skip="Omite versiunea"
-Updater.Running.Title="Program activ în prezent"
-Updater.Running.Text="Outputurile sunt în prezent active, te rugăm să închizi orice output activ înainte de a încerca să actualizezi"
 Updater.NoUpdatesAvailable.Title="Nu există actualizări disponibile"
 Updater.NoUpdatesAvailable.Text="În prezent nu sunt disponibile actualizări"
 Updater.BranchNotFound.Title="Canal de actualizare eliminat"
@@ -233,8 +239,6 @@
 Updater.RepairConfirm.Title="Confirmă verificarea integrității"
 Updater.RepairConfirm.Text="Pornirea verificării integrității va scana instalarea OBS pentru a detecta orice corupție și va redescărca fișierele deteriorate/modificate.\n\nDorești să continui?"
 Updater.FailedToLaunch="Lansarea actualizatorului a eșuat"
-Updater.GameCaptureActive.Title="Captură de joc activă"
-Updater.GameCaptureActive.Text="Biblioteca hook de captare a jocului este în prezent folosită. Te rugăm să închizi orice joc/program capturat (sau repornește Windows-ul) și încearcă din nou."
 QuickTransitions.SwapScenes="Schimbați scenele de previzualizare/program după tranziție"
 QuickTransitions.SwapScenesTT="Schimbă scenele de previzualizare și de program după tranziție (dacă scena originală a programului încă există).\nAceasta nu va anula nicio modificare care ar fi putut fi făcută la scena originală a programului."
 QuickTransitions.DuplicateScene="Duplică scena"
@@ -248,6 +252,8 @@
 Basic.SceneTransitions="Tranziții pentru scene"
 Basic.TransitionDuration="Durată"
 Basic.TogglePreviewProgramMode="Mod studio"
+Basic.EnablePreviewProgramMode="Activează modul studio"
+Basic.DisablePreviewProgramMode="Dezactivează modul studio"
 Undo.Undo="Anulează"
 Undo.Redo="Refă"
 Undo.Add="adăugarea '%1'"
@@ -296,19 +302,21 @@
 Undo.GroupItems="gruparea elementelor în '%1'"
 TransitionNameDlg.Text="Te rugăm să introduci numele tranziției"
 TransitionNameDlg.Title="Numele tranziției"
+TitleBar.SafeMode="MOD SIGUR"
+TitleBar.PortableMode="Mod portabil"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scene"
 NameExists.Title="Numele există deja"
 NameExists.Text="Numele este deja în uz."
 NoNameEntered.Title="Te rugăm să introduci un nume valid"
 NoNameEntered.Text="Nu poți folosi nume necompletate."
-ConfirmStart.Title="Începi transmisiunea?"
-ConfirmStart.Text="Sigur vrei să pornești transmisiunea?"
-ConfirmStop.Title="Oprești transmisiunea?"
-ConfirmStop.Text="Sigur vrei să oprești transmisiunea?"
+ConfirmStart.Title="Pornești streamul?"
+ConfirmStart.Text="Sigur vrei să pornești streamul?"
+ConfirmStop.Title="Oprești streamul?"
+ConfirmStop.Text="Sigur vrei să oprești streamul?"
 ConfirmStopRecord.Title="Oprești înregistrarea?"
 ConfirmStopRecord.Text="Sigur vrei să oprești înregistrarea?"
-ConfirmBWTest.Title="Începi testarea pentru lățimea de bandă?"
+ConfirmBWTest.Title="Pornești testarea lățimii de bandă?"
 ConfirmBWTest.Text="Ai configurat OBS în modul de testare a lățimii de bandă. Acest mod permite testarea rețelei fără să transmiți live pe canal. Odată ce ai terminat testarea, va trebui să îl dezactivezi pentru ca spectatorii să îți poată vedea transmisiunea.\n\nVrei să continui?"
 ConfirmExit.Title="Ieși din OBS?"
 ConfirmExit.Text="OBS este în prezent activ. Toate transmisiunile/înregistrările vor fi închise. Sigur vrei să ieși?"
@@ -316,10 +324,11 @@
 ConfirmRemove.Text="Sigur dorești să elimini '%1'?"
 ConfirmRemove.TextMultiple="Sigur vrei să elimini %1 elemente?"
 ConfirmReset.Title="Resetează proprietățile"
-ConfirmReset.Text="Sigur doriți să resetați proprietățile curente la valorile implicite?"
-Output.StartStreamFailed="Pornirea transmisiunii a eșuat"
-Output.StartRecordingFailed="Pornirea înregistrării a eșuat"
-Output.StartReplayFailed="Pornirea bufferului de reluări a eșuat"
+ConfirmReset.Text="Sigur dorești să resetezi proprietățile actuale la valorile implicite?"
+Output.StartStreamFailed="Eșec la pornirea streamingului"
+Output.StartRecordingFailed="Eșec la pornirea înregistrării"
+Output.StartReplayFailed="Eșec la pornirea bufferului de reluări"
+Output.StartVirtualCamFailed="Eșec la pornirea camerei virtuale"
 Output.StartFailedGeneric="Pornirea outputului a eșuat. Te rugăm să verifici jurnalul pentru detalii.\n\nNotă: Dacă folosești codificatoare NVENC sau AMD, asigură-te că driverele video sunt la zi."
 Output.ReplayBuffer.PauseWarning.Title="Nu se pot salva reluările cât timp înregistrarea este pusă pe pauză"
 Output.ReplayBuffer.PauseWarning.Text="Avertisment: Reluările nu pot fi salvate cât timp înregistrarea este pusă pe pauză."
@@ -332,21 +341,20 @@
 Output.ConnectFail.Disconnected="Deconectat de la server."
 Output.StreamEncodeError.Title="Eroare privind codificarea"
 Output.StreamEncodeError.Msg="A apărut o eroare de codificare în timpul transmisiunii."
-Output.StreamEncodeError.Msg.LastError="A apărut o eroare de codificare în timpul transmisiunii:\n\n%1"
-Output.RecordFail.Title="Pornirea înregistrării a eșuat"
+Output.StreamEncodeError.Msg.LastError="Codificatorul a eșuat in timpul stream-ului %1"
+Output.RecordFail.Title="Eșec la pornirea înregistrării"
 Output.RecordFail.Unsupported="Formatul de output este fie nesuportat, fie nu suportă mai mult de o pistă audio. Te rugăm să verifici setările şi să încerci din nou."
 Output.RecordNoSpace.Title="Spațiu insuficient pe disc"
 Output.RecordNoSpace.Msg="Nu există spațiu suficient pe disc pentru a continua înregistrarea."
 Output.RecordError.Title="Eroare privind înregistrarea"
 Output.RecordError.Msg="A apărut o eroare nespecificată în timpul înregistrării."
 Output.RecordError.EncodeErrorMsg="A apărut o eroare de codificare în timpul înregistrării."
-Output.RecordError.EncodeErrorMsg.LastError="A apărut o eroare de codificare în timpul înregistrării:\n\n%1"
 Output.BadPath.Title="Calea fișierului greșită"
 Output.BadPath.Text="Calea configurată de înregistrare nu a putut fi deschisă. Verificați calea de înregistrare din meniul Setări → Ieșire → Înregistrare."
-Output.NoBroadcast.Title="Nicio difuzare configurată"
-Output.NoBroadcast.Text="Trebuie să configurezi o difuzare înainte de a putea începe streamingul."
-Output.BroadcastStartFailed="Pornirea transmisiunii a eșuat"
-Output.BroadcastStopFailed="Oprirea transmisiunii a eșuat"
+Output.NoBroadcast.Title="Nicio transmisiune configurată"
+Output.NoBroadcast.Text="Trebuie să configurezi o transmisiune înainte de a putea porni streamingul."
+Output.BroadcastStartFailed="Eșec la pornirea transmisiunii"
+Output.BroadcastStopFailed="Eșec la oprirea transmisiunii"
 LogReturnDialog="Jurnal încărcat cu succes"
 LogReturnDialog.Description="Fișierul jurnal a fost încărcat. Acum poți distribui adresa URL în scopuri de depanare sau de asistență."
 LogReturnDialog.Description.Crash="Raportul de defecțiune a fost încărcat. Acum poți distribui adresa URL în scopuri de depanare sau de asistență."
@@ -370,6 +378,8 @@
 Remux.ExitUnfinishedTitle="Remuxare în desfășurare"
 Remux.ExitUnfinished="Remuxarea nu este încheiată, oprirea în acest moment poate face fișierul țintă inutilizabil.\nSigur vrei să oprești remuxarea?"
 Remux.HelpText="Plasează fișierele în această fereastră pentru a remuxa ori selectează o celulă „Înregistrare OBS” goală pentru a răsfoi un fișier."
+Remux.NoFilesAddedTitle="Niciun fișier remux adăugat"
+Remux.NoFilesAdded="Niciun fișier adăugat la remux. Lasă un folder ce conține 1 sau mai multe fișiere video."
 MissingFiles="Fișiere lipsă"
 MissingFiles.MissingFile="Fișier lipsă"
 MissingFiles.NewFile="Fișier nou"
@@ -388,7 +398,6 @@
 MissingFiles.AutoSearchText="OBS a găsit potriviri suplimentare pentru fișierele lipsă din acest director. Dorești să le adaugi?"
 MissingFiles.NoMissing.Title="Verificarea fișierelor lipsă"
 MissingFiles.NoMissing.Text="Nu pare să lipsească niciun fișier."
-MacPermissions.Title="Revizuiți permisiunile aplicației"
 MacPermissions.Description="OBS Studio are nevoie de permisiunea dvs. pentru a putea oferi anumite caracteristici. Este recomandat să activați aceste permisiuni, dar nu sunt necesare pentru a utiliza aplicația. Le puteți activa oricând mai târziu."
 MacPermissions.Description.OpenDialog="Puteți redeschide acest dialog prin intermediul meniului OBS Studio."
 MacPermissions.AccessGranted="Acces permis"
@@ -403,8 +412,8 @@
 MacPermissions.Item.Accessibility="Accesibilitate"
 MacPermissions.Item.Accessibility.Details="Pentru ca comenzile rapide de la tastatură (taste rapide) să funcționeze în timp ce alte aplicații sunt concentrate, vă rugăm să activați această permisiune."
 MacPermissions.Continue="Continuă"
-UpdateAvailable="Actualizare nouă disponibilă"
-UpdateAvailable.Text="Versiunea %1.%2.%3 este acum disponibilă. <a href='%4'> Clic aici pentru a descărca</a>"
+SourceLeak.Title="Eroare la curatarea sursei"
+SourceLeak.Text="A existat o problemă la schimbarea colecțiilor de scene și unele surse nu au putut fi descărcate. Această problemă este cauzată de obicei de pluginuri care nu eliberează resursele în mod corespunzător. Vă rugăm să vă asigurați că toate plugin-urile pe care le utilizați sunt actualizate.\n\nOBS Studio va ieși acum pentru a preveni orice potențială corupere a datelor."
 Basic.DesktopDevice1="Audio desktop"
 Basic.DesktopDevice2="Audio desktop 2"
 Basic.AuxDevice1="Microfon/Aux"
@@ -420,10 +429,10 @@
 ScaleFiltering.Bilinear="Bilineară"
 ScaleFiltering.Bicubic="Bicubică"
 ScaleFiltering.Area="Zonă"
-BlendingMethod="Metoda de amestec"
+BlendingMethod="Metodă de amestec"
 BlendingMethod.Default="Implicit"
 BlendingMethod.SrgbOff="SRGB dezactivat"
-BlendingMode="Modul de amestec"
+BlendingMode="Mod de amestec"
 BlendingMode.Additive="Adaugă"
 BlendingMode.Subtract="Sustragere"
 BlendingMode.Screen="Suprapunere"
@@ -485,9 +494,9 @@
 Basic.StatusBar.AttemptingReconnect="Se încearcă reconectarea... (încercarea %1)"
 Basic.StatusBar.ReconnectSuccessful="Reconectare cu succes"
 Basic.StatusBar.Delay="Întârziere (%1 secunde)"
-Basic.StatusBar.DelayStartingIn="Întârziere (începând în %1 sec)"
+Basic.StatusBar.DelayStartingIn="Întârziere (pornește în %1 sec)"
 Basic.StatusBar.DelayStoppingIn="Întârziere (se oprește în %1 sec)"
-Basic.StatusBar.DelayStartingStoppingIn="Întârziere (se oprește în %1 sec, începe în %2 sec)"
+Basic.StatusBar.DelayStartingStoppingIn="Întârziere (se oprește în %1 sec, pornește în %2 sec)"
 Basic.StatusBar.RecordingSavedTo="Înregistrare salvată în '%1'"
 Basic.StatusBar.ReplayBufferSavedTo="Buffer de reluare salvat în '%1'"
 Basic.StatusBar.ScreenshotSavedTo="Captură de ecran salvată în '%1'"
@@ -546,8 +555,8 @@
 Basic.Main.StartRecording="Pornește înregistrarea"
 Basic.Main.StartReplayBuffer="Pornește bufferul de reluări"
 Basic.Main.SaveReplay="Salvează reluarea"
-Basic.Main.StartStreaming="Pornește transmisiunea"
-Basic.Main.StartBroadcast="Treceti pe modul live"
+Basic.Main.StartStreaming="Pornește streamingul"
+Basic.Main.StartBroadcast="Intră live"
 Basic.Main.StartVirtualCam="Pornește camera virtuală"
 Basic.Main.StopRecording="Oprește înregistrarea"
 Basic.Main.PauseRecording="Pune pe pauză înregistrarea"
@@ -556,11 +565,12 @@
 Basic.Main.StoppingRecording="Se oprește înregistrarea..."
 Basic.Main.StopReplayBuffer="Oprește bufferul de reluări"
 Basic.Main.StoppingReplayBuffer="Se oprește bufferul de reluări..."
-Basic.Main.SetupBroadcast="Gestionați difuzarea"
-Basic.Main.StopStreaming="Oprește transmisiunea"
+Basic.Main.SetupBroadcast="Gestionează transmisiunea"
+Basic.Main.StopStreaming="Oprește streamingul"
 Basic.Main.StopBroadcast="Încheie transmisiunea"
-Basic.Main.StoppingStreaming="Se oprește transmisiunea..."
-Basic.Main.ForceStopStreaming="Oprește transmisiunea (renunță la întârziere)"
+Basic.Main.AutoStopEnabled="(Oprire automată)"
+Basic.Main.StoppingStreaming="Se oprește streamul..."
+Basic.Main.ForceStopStreaming="Oprește streamingul (renunță la întârziere)"
 Basic.Main.ShowContextBar="Afișează bara de unelte pentru sursă"
 Basic.Main.HideContextBar="Ascunde bara de unelte pentru sursă"
 Basic.Main.StopVirtualCam="Oprește camera virtuală"
@@ -573,9 +583,6 @@
 Basic.VCam.VirtualCamera="Cameră virtuală"
 Basic.VCam.OutputType="Tipul outputului"
 Basic.VCam.OutputSelection="Selectarea outputului"
-Basic.VCam.Internal="Intern"
-Basic.VCam.InternalDefault="Outputul programului (implicit)"
-Basic.VCam.InternalPreview="Previzualizarea outputului"
 Basic.MainMenu.File="&Fișier"
 Basic.MainMenu.File.Export="&Exportă"
 Basic.MainMenu.File.Import="&Importă"
@@ -616,18 +623,19 @@
 Basic.MainMenu.Edit.AdvAudio="Proprietăți audio &avansate"
 Basic.MainMenu.View="&Vizualizare"
 Basic.MainMenu.View.Toolbars="Bare de unel&te"
-Basic.MainMenu.View.ListboxToolbars="Butoane pentru lista scenelor/surselor"
+Basic.MainMenu.View.ListboxToolbars="Andochează barele de unelte"
 Basic.MainMenu.View.ContextBar="Bară de unelte pentru scenă"
-Basic.MainMenu.View.SceneTransitions="Tranziții pentru s&cene"
 Basic.MainMenu.View.SourceIcons="P&ictograme pentru surse"
 Basic.MainMenu.View.StatusBar="Bară de &stare"
 Basic.MainMenu.View.Fullscreen.Interface="Interfață în ecran complet"
 Basic.MainMenu.View.ResetUI="Resetează interfața"
 Basic.MainMenu.View.AlwaysOnTop="Întotde&auna în față"
-Basic.MainMenu.Docks="&Andocări"
-Basic.MainMenu.Docks.ResetDocks="Resetează andocările"
-Basic.MainMenu.Docks.LockDocks="Blochează andocările"
-Basic.MainMenu.Docks.CustomBrowserDocks="&Andocări personalizate pentru browser..."
+Basic.MainMenu.View.SceneListMode="Modul listei de scene"
+Basic.MainMenu.Docks="An&docări"
+Basic.MainMenu.Docks.ResetDocks="&Resetează andocările"
+Basic.MainMenu.Docks.LockDocks="B&lochează andocările"
+Basic.MainMenu.Docks.SideDocks="Andocări pe toată înălțimea (&F)"
+Basic.MainMenu.Docks.CustomBrowserDocks="Ando&cări personalizate de browser..."
 Basic.MainMenu.SceneCollection="Colecție de &scene"
 Basic.MainMenu.Profile="&Profil"
 Basic.MainMenu.Profile.Import="Importă un profil"
@@ -635,7 +643,6 @@
 Basic.MainMenu.SceneCollection.Import="Importă colecție de scene"
 Basic.MainMenu.SceneCollection.Export="Exportă colecție de scene"
 Basic.MainMenu.Profile.Exists="Profilul există deja"
-Basic.MainMenu.SceneCollection.Exists="Colecția de scene există deja"
 Basic.MainMenu.Tools="Unel&te"
 Basic.MainMenu.Help="Ajutor (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal pentru ajutor"
@@ -647,8 +654,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Încarcă a&ctualul fișier jurnal"
 Basic.MainMenu.Help.Logs.UploadLastLog="Încărcați fișierul jurnal anterior"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vezi fișierul log actual"
+Basic.MainMenu.Help.ReleaseNotes="Note privind versiunea"
 Basic.MainMenu.Help.CheckForUpdates="Caută actualizări"
 Basic.MainMenu.Help.Repair="Verifică integritatea fișierelor"
+Basic.MainMenu.Help.RestartSafeMode="Repornește în modul sigur"
+Basic.MainMenu.Help.RestartNormal="Repornește în modul normal"
 Basic.MainMenu.Help.CrashLogs="&Rapoarte de defecțiuni"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Afișează rapoartele de defecțiuni (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Încărcați raportul de defecțiune anterior"
@@ -668,8 +678,8 @@
 Basic.Settings.General.HideOBSWindowsFromCapture="Ascunde ferestrele OBS din captura de ecran"
 Basic.Settings.General.HideOBSWindowsFromCapture.Tooltip="Această setare va ascunde toate ferestrele OBS Studio, care nu se află pe un proiector, de la capturarea de către OBS și afectează \nalte aplicații, cum ar fi conferințele, partajarea ecranului, asistența la distanță, capturile de ecran și alte programe de captare."
 Basic.Settings.General.HideOBSWindowsFromCapture.Message="Activarea acestei opțiuni ascunde toate ferestrele OBS Studio, care nu se află pe un proiector, de la capturarea de către OBS și afectează alte aplicații, cum ar fi conferințele, partajarea ecranului, asistența la distanță, capturile de ecran și alte programe de captare."
-Basic.Settings.General.WarnBeforeStartingStream="Afișează caseta de dialog pentru confirmare la pornirea transmisiunii"
-Basic.Settings.General.WarnBeforeStoppingStream="Afișează caseta de dialog pentru confirmare la oprirea transmisiunii"
+Basic.Settings.General.WarnBeforeStartingStream="Afișează caseta de dialog pentru confirmare la pornirea streamurilor"
+Basic.Settings.General.WarnBeforeStoppingStream="Afișează caseta de dialog pentru confirmare la oprirea streamurilor"
 Basic.Settings.General.WarnBeforeStoppingRecord="Afișează caseta de dialog pentru confirmare la oprirea înregistrării"
 Basic.Settings.General.Projectors="Proiectoare"
 Basic.Settings.General.HideProjectorCursor="Ascunde cursorul peste proiectoare"
@@ -681,9 +691,9 @@
 Basic.Settings.General.SnapDistance="Sensibilitatea alinierii"
 Basic.Settings.General.SpacingHelpers="Afișează ghidurile de aliniere a pixelilor"
 Basic.Settings.General.RecordWhenStreaming="Înregistrează automat atunci când se face transmisiune"
-Basic.Settings.General.KeepRecordingWhenStreamStops="Continuă înregistrarea când transmisiunea se oprește"
+Basic.Settings.General.KeepRecordingWhenStreamStops="Continuă înregistrarea când streamul se oprește"
 Basic.Settings.General.ReplayBufferWhileStreaming="Pornește automat bufferul de reluări atunci când se face transmisiune"
-Basic.Settings.General.KeepReplayBufferStreamStops="Păstrează activ bufferul de reluări când transmisiunea se oprește"
+Basic.Settings.General.KeepReplayBufferStreamStops="Păstrează activ bufferul de reluări când streamul se oprește"
 Basic.Settings.General.SysTray="Bară de sistem"
 Basic.Settings.General.SysTrayWhenStarted="Minimizează în bara de sistem la pornire"
 Basic.Settings.General.SystemTrayHideMinimize="Întotdeauna minimizează în bara de sistem în loc de bara de activități"
@@ -718,7 +728,6 @@
 Basic.Settings.General.ChannelName.beta="Versiuni beta / release candidate"
 Basic.Settings.General.ChannelDescription.beta="Versiuni de pre-lansare potențial instabile"
 Basic.Settings.Stream="Transmisiune"
-Basic.Settings.Stream.StreamType="Tipul transmisiunii"
 Basic.Settings.Stream.Custom.UseAuthentication="Folosește autentificarea"
 Basic.Settings.Stream.Custom.Username="Nume de utilizator"
 Basic.Settings.Stream.Custom.Password="Parolă"
@@ -748,7 +757,6 @@
 Basic.Settings.Output.Encoder.Video="Codificator video"
 Basic.Settings.Output.Encoder.Audio="Codificator audio"
 Basic.Settings.Output.SelectDirectory="Selectează directorul de înregistrări"
-Basic.Settings.Output.SelectFile="Selectează fișierul înregistrării"
 Basic.Settings.Output.DynamicBitrate="Schimbă dinamic rata de biți pentru a gestiona congestionarea"
 Basic.Settings.Output.DynamicBitrate.Beta="Schimbă dinamic rata de biți pentru a gestiona congestionarea (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="În locul pierderii de cadre pentru a reduce congestionarea, schimbă dinamic rata de biți din mers.\n\nReține că acest lucru poate crește întârzierea față de vizualizatori dacă există o congestionare bruscă\nsemnificativă. Când rata de biți scade, poate dura până la câteva minute pentru a reveni la normal.\n\nÎn prezent opțiunea este suportată doar pentru RTMP."
@@ -764,7 +772,7 @@
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Nu se poate estima utilizarea memoriei. Te rugăm să setezi limita maximă de memorie."
 Basic.Settings.Output.ReplayBuffer.Prefix="Prefixul numelor fișierelor pentru bufferul de reluări"
 Basic.Settings.Output.ReplayBuffer.Suffix="Sufix"
-Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Buffer-ul de reluare nu poate fi utilizat atunci când tipul de înregistrare este setat pe Output Personalizat (FFmpeg)."
+Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Bufferul de reluări nu poate fi folosit atunci când tipul înregistrării este setat pe Output personalizat (FFmpeg)."
 Basic.Settings.Output.Simple.SavePath="Cale de înregistrare"
 Basic.Settings.Output.Simple.RecordingQuality="Calitatea înregistrării"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="La fel cu cea a transmisiunii"
@@ -776,7 +784,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Avertisment: Înregistrările nu pot fi puse pe pauză dacă calitatea înregistrării este setată pe „La fel cu cea a transmisiunii”."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Avertisment: formatul de înregistrare selectat în prezent este incompatibil cu encoderul de streaming selectat."
 Basic.Settings.Output.Simple.Warn.Encoder="Avertisment: Înregistrarea cu un codificator software la o calitate diferită de cea a transmisiunii va necesita o utilizare CPU crescută dacă transmiți şi înregistrezi în același timp."
-Basic.Settings.Output.Simple.Warn.Lossless="Avertisment: Calitatea fără pierderi generează dimensiuni extrem de mari de fișiere! Calitatea fără pierderi poate folosi până la 7GB spațiu de disc per minut la frecvențe de cadre și rezoluții ridicate. Această calitate nu este recomandată pentru înregistrări lungi decât dacă ai o cantitate foarte mare de spațiu disponibil pe disc."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sigur vrei să folosești calitatea fără pierderi?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Avertizare privind calitatea fără pierderi!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (presetare x264 cu utilizare CPU scăzută, crește dimensiunea fișierelor)"
@@ -906,8 +913,7 @@
 Basic.Settings.Audio.PeakMeterType="Tipul măsurătorii vârfului"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Vârf eșantion"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Vârf adevărat (Utilizare CPU mai mare)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="AVERTISMENT: Sunetul audio cu sunet surround este activat."
-Basic.Settings.Audio.MultichannelWarning="Dacă faci transmisiune, verifică dacă serviciul de transmisiune suportă atât ingestia sunetului surround, cât și redarea sunetului surround. Facebook 360 Live este un exemplu în care sunetul surround este suportat pe deplin. Deși Facebook Live și YouTube Live acceptă ambele ingestia surround, Facebook Live sub-mixează în stereo, iar YouTube Live redă doar două canale.\n\nFiltrele audio OBS sunt compatibile cu sunetul surround, deși suportul pentru pluginurile VST nu este garantat."
+Basic.Settings.Audio.MultichannelWarning.Enabled="AVERTISMENT: Sunetul audio cu sunet surround este activat."
 Basic.Settings.Audio.MultichannelWarning.Title="Activezi sistemul audio cu sunet surround?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sigur vrei să activezi sistemul audio cu sunet surround?"
 Basic.Settings.Audio.Devices="Dispozitive audio globale"
@@ -954,7 +960,6 @@
 Basic.Settings.Advanced.FormatWarning="Avertisment: Formatele de culoare, altele decât NV12/P010, sunt destinate în primul rând înregistrării și nu sunt recomandate pentru streaming. Streamingul poate genera o utilizare crescută de CPU din cauza conversiei formatului de culoare."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Avertisment: Formatele de mare precizie sunt utilizate mai frecvent cu spațiile de culoare HDR."
 Basic.Settings.Advanced.FormatWarning2100="Atenție: Rec. 2100 trebuie să folosească un format cu multă precizie."
-Basic.Settings.Advanced.Audio.BufferingTime="Timp pentru bufferingul audio"
 Basic.Settings.Advanced.Video.ColorFormat="Format de culori"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 biți, 4:2:0, 2 planuri)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 biți, 4:2:0, 3 planuri)"
@@ -980,6 +985,7 @@
 Basic.Settings.Advanced.Network="Rețea"
 Basic.Settings.Advanced.Network.Disabled="Protocolul de transmisie în flux selectat în prezent nu acceptă modificarea setărilor de rețea."
 Basic.Settings.Advanced.Network.BindToIP="Leagă de IP"
+Basic.Settings.Advanced.Network.IPFamily="Familie IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Activează optimizările pentru rețea"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Activează pacingul pentru TCP"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Încearcă să facă RTMP mai prietenos cu alte aplicații, sensibile la latență, din rețea prin regularea ratei de transmisie.\nEste posibil să crească riscul de cadre pierdute pe conexiunile instabile."
@@ -1042,7 +1048,7 @@
 SceneItemShow="Afișează „%1”"
 SceneItemHide="Ascunde „%1”"
 OutputWarnings.NoTracksSelected="Trebuie să selectezi cel puțin o pistă"
-OutputWarnings.MP4Recording="Avertisment: Înregistrările salvate în MP4/MOV nu vor putea fi recuperate dacă fişierul nu poate fi finalizat (de ex. ca urmare a BSOD-urilor, întreruperilor de alimentare etc.). Dacă vrei să înregistrezi mai multe piste audio, ia în considerare folosirea MKV şi remuxează înregistrarea în MP4/MOV după terminare (Fișier → Remuxează înregistrări)"
+OutputWarnings.MP4Recording="Avertisment: Înregistrările salvate în MP4/MOV nu vor putea fi recuperate dacă fișierul nu poate fi finalizat (de ex., ca urmare a BSOD-urilor, întreruperilor de alimentare etc.). Dacă vrei să înregistrezi mai multe piste audio, ia în considerare folosirea MKV și remuxează înregistrarea în MP4/MOV după terminare (Fișier → Remuxează înregistrări)"
 OutputWarnings.CannotPause="Avertisment: Înregistrările nu pot fi puse pe pauză dacă codificatorul de înregistrare este setat pe „(Folosește codificatorul de transmisiune)”"
 OutputWarnings.CodecIncompatible="Selecția codificatorului audio sau video a fost resetată din cauza unei incompatibilități. Vă rugăm să selectați un codificator compatibil din listă."
 CodecCompat.Incompatible="(Incompatibil cu %1)"
@@ -1067,6 +1073,7 @@
 About.GetInvolved="Implică-te"
 About.Authors="Autori"
 About.License="Licență"
+About.Error="Eroare! Fisierul nu s-a putut citi. \n\n Mergi la: %1"
 About.Contribute="Sprijină proiectul OBS"
 AddUrl.Title="Adaugă o sursă via URL"
 AddUrl.Text="Ai tras un URL în OBS. Acest lucru va adăuga automat linkul ca sursă. Continui?"
@@ -1087,14 +1094,12 @@
 LoadProfileNeedsRestart="Profilul conține setări care necesită repornirea OBS:\n%1\n\nDoriți să reporniți OBS pentru ca aceste setări să aibă efect?"
 ContextBar.NoSelectedSource="Nicio sursă selectată"
 ContextBar.ResetTransform="Resetează transformarea"
-ContextBar.FitToCanvas="Potrivește la planșă"
 ContextBar.MediaControls.PlayMedia="Redă conținutul media"
 ContextBar.MediaControls.PauseMedia="Pune pe pauză conținutul media"
 ContextBar.MediaControls.StopMedia="Oprește conținutul media"
 ContextBar.MediaControls.RestartMedia="Repornește conținutul media"
 ContextBar.MediaControls.PlaylistNext="Următorul în playlist"
 ContextBar.MediaControls.PlaylistPrevious="Anteriorul în playlist"
-ContextBar.MediaControls.MediaProperties="Proprietăți media"
 ContextBar.MediaControls.BlindSeek="Widget de căutare media"
 YouTube.Auth.Ok="Autorizarea a fost finalizată cu succes.\nAcum poți închide această pagină."
 YouTube.Auth.NoCode="Procesul de autorizare nu a fost finalizat."
@@ -1102,9 +1107,9 @@
 YouTube.Auth.WaitingAuth.Title="Autorizare pentru utilizatorul YouTube"
 YouTube.Auth.WaitingAuth.Text="Te rugăm să completezi autorizarea în browserul extern. Dacă browserul extern nu se deschide, urmează acest link și completează autorizarea: %1"
 YouTube.AuthError.Text="Eșuare obținere informații despre canal: %1"
-YouTube.Actions.WindowTitle="Configurare difuzare YouTube - Canal: %1"
-YouTube.Actions.CreateNewEvent="Creați o difuzare nouă"
-YouTube.Actions.ChooseEvent="Selectați difuzarea existentă"
+YouTube.Actions.WindowTitle="Configurarea transmisiunii YouTube - Canal: %1"
+YouTube.Actions.CreateNewEvent="Creează o nouă transmisiune"
+YouTube.Actions.ChooseEvent="Selectează o transmisiune existentă"
 YouTube.Actions.Title="Titlu*"
 YouTube.Actions.MyBroadcast="Transmisiunea mea"
 YouTube.Actions.Description="Descriere"
@@ -1113,31 +1118,32 @@
 YouTube.Actions.Privacy.Unlisted="Nelistat"
 YouTube.Actions.Category="Categorie"
 YouTube.Actions.Thumbnail="Miniatură"
-YouTube.Actions.Thumbnail.SelectFile="Selectați fișierul..."
+YouTube.Actions.Thumbnail.SelectFile="Selectează un fișier..."
 YouTube.Actions.Thumbnail.NoFileSelected="Niciun fișier selectat"
 YouTube.Actions.Thumbnail.ClearFile="Șterge"
-YouTube.Actions.MadeForKids="Este acest video făcut pentru copii?*"
-YouTube.Actions.MadeForKids.Yes="Da, este făcut pentru copii"
-YouTube.Actions.MadeForKids.No="Nu, nu este făcut pentru copii"
+YouTube.Actions.MadeForKids="Acest videoclip este destinat copiilor?*"
+YouTube.Actions.MadeForKids.Yes="Da, este destinat copiilor."
+YouTube.Actions.MadeForKids.No="Nu, nu este destinat copiilor."
 YouTube.Actions.AdditionalSettings="Setări adiționale"
 YouTube.Actions.Latency="Latență"
+YouTube.Actions.Latency.Normal="Normală"
 YouTube.Actions.Latency.Low="Scăzută"
 YouTube.Actions.Latency.UltraLow="Ultrascăzută"
-YouTube.Actions.EnableAutoStart="Activează Auto-start"
-YouTube.Actions.EnableAutoStop="Activează Auto-stop"
-YouTube.Actions.AutoStartStop.TT="Indică dacă această difuzare programată ar trebui să înceapă automat"
+YouTube.Actions.EnableAutoStart="Activează pornirea automată"
+YouTube.Actions.EnableAutoStop="Activează oprirea automată"
+YouTube.Actions.AutoStartStop.TT="Indică dacă această transmisiune programată ar trebui să pornească automat"
 YouTube.Actions.EnableDVR="Activează DVR"
-YouTube.Actions.360Video="Video 360"
+YouTube.Actions.360Video="Videoclip la 360°"
 YouTube.Actions.ScheduleForLater="Programează pentru mai târziu"
-YouTube.Actions.RememberSettings="Memorează aceste setări"
-YouTube.Actions.Create_Ready="Creați difuzare"
-YouTube.Actions.Create_GoLive="Creați difuzarea și începeți streaming-ul"
-YouTube.Actions.Choose_Ready="Selectează o difuzare"
-YouTube.Actions.Choose_GoLive="Selectează difuzarea și începeți streamingul"
-YouTube.Actions.Create_Schedule="Planifică difuzarea"
-YouTube.Actions.Create_Schedule_Ready="Planifică și selectează difuzarea"
-YouTube.Actions.Dashboard="Deschideți YouTube Studio"
-YouTube.Actions.Error.Title="Eroare creare transmisiune în direct"
+YouTube.Actions.RememberSettings="Ține minte aceste setări"
+YouTube.Actions.Create_Ready="Creează transmisiunea"
+YouTube.Actions.Create_GoLive="Creează transmisiunea și pornește streamingul"
+YouTube.Actions.Choose_Ready="Selectează o transmisiune"
+YouTube.Actions.Choose_GoLive="Selectează transmisiunea și pornește streamingul"
+YouTube.Actions.Create_Schedule="Programează transmisiunea"
+YouTube.Actions.Create_Schedule_Ready="Programează și selectează transmisiunea"
+YouTube.Actions.Dashboard="Deschide YouTube Studio"
+YouTube.Actions.Error.Title="Eroare la crearea transmisiunii live"
 YouTube.Actions.Error.Text="Eroare acces YouTube '%1'. Descrierea detaliată a erorii poate fi găsită la <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.General="Eroare de acces YouTube. Verificați conexiunea la rețea sau accesul la serverul YouTube."
 YouTube.Actions.Error.NoBroadcastCreated="Eroare creare transmisiune \"%1\". Descrierea detaliată a erorii poate fi găsită la <a href='https://developers.google.com/youtube/v3/live/docs/errors'> https://developers.google.com/youtube/v3/live/docs/errors</a>"
@@ -1153,15 +1159,15 @@
 YouTube.Actions.EventCreated.Title="Eveniment creat"
 YouTube.Actions.EventCreated.Text="Eveniment creat cu succes."
 YouTube.Actions.Stream="Transmisiune"
-YouTube.Actions.Stream.ScheduledFor="Planificată pentru %1"
+YouTube.Actions.Stream.ScheduledFor="Programat(ă) pentru %1"
 YouTube.Actions.Stream.Resume="Reluare flux întrerupt"
-YouTube.Actions.Stream.YTStudio="Creat automat de YouTube Studio"
-YouTube.Actions.Notify.CreatingBroadcast="Crearea unei noi transmisiuni în direct, așteptați..."
-YouTube.Actions.AutoStartStreamingWarning.Title="Start manual necesar"
-YouTube.Actions.AutoStartStreamingWarning="Auto-start este dezactivat pentru acest eveniment, apăsați \"Du-te în direct\" pentru a porni transmisiunea."
-YouTube.Actions.AutoStopStreamingWarning="Nu vă veți putea reconecta. Transmisiunea dvs. se va opri și nu veți mai fi în direct."
+YouTube.Actions.Stream.YTStudio="Creat(ă) automat de YouTube Studio"
+YouTube.Actions.Notify.CreatingBroadcast="Se creează o nouă transmisiune live, te rugăm să aștepți..."
+YouTube.Actions.AutoStartStreamingWarning.Title="Pornire manuală necesară"
+YouTube.Actions.AutoStartStreamingWarning="Pornirea automată este dezactivată pentru acest eveniment, dă click pe „Intră live” pentru a porni transmisiunea."
+YouTube.Actions.AutoStopStreamingWarning="Nu te vei putea reconecta. Streamul tău se va opri și nu vei mai fi live."
 YouTube.Chat.Input.Send="Trimite"
-YouTube.Chat.Input.Placeholder="Introduceți mesajul aici..."
+YouTube.Chat.Input.Placeholder="Introdu mesajul aici..."
 YouTube.Chat.Input.Sending="Se trimite..."
 YouTube.Chat.Error.Title="Eroare la trimiterea mesajului"
 YouTube.Chat.Error.Text="Mesajul nu a putut fi trimis: %1"
@@ -1174,3 +1180,5 @@
 YouTube.Errors.liveChatEnded="Transmisiunea în direct s-a încheiat."
 YouTube.Errors.messageTextInvalid="Conținutul mesajului nu este valid."
 YouTube.Errors.rateLimitExceeded="Trimiteți mesaje prea repede."
+YouTube.DocksRemoval.Title="Șterge vechile andocări de browser ale YouTube"
+YouTube.DocksRemoval.Text="Aceste andocări de browser vor fi eliminate ca fiind depreciate:\n\n%1\nFolosește „Andocări/YouTube Live Control Room” în schimb."

obs-studio-29.1.3.tar.xz/UI/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ru-RU.ini Changed

@@ -73,8 +73,8 @@
 RestoreDefaults="По умолчанию"
 HideMixer="Не показывать в микшере"
 TransitionOverride="Указать другой переход"
-ShowTransition="Показать переход"
-HideTransition="Скрыть переход"
+ShowTransition="Переход показа"
+HideTransition="Переход скрытия"
 None="Нет"
 StudioMode.Preview="Предпросмотр"
 StudioMode.Program="Программа"
@@ -90,27 +90,34 @@
 Windowed="Оконный режим"
 RefreshBrowser="Обновить"
 AspectRatio="Соотношение сторон %1:%2"
-LockVolume="Зафиксировать громкость"
+LockVolume="Блокировать громкость"
 LogViewer="Просмотр журнала"
 ShowOnStartup="Показывать при запуске"
 OpenFile="Открыть файл"
-AddValue="Добавить: %1"
 AddSource="Добавить источник"
 RemoveScene="Удалить выбранную сцену"
 RemoveSource="Удалить выбранные источники"
 MoveSceneUp="Перенести сцену вверх"
 MoveSceneDown="Перенести сцену вниз"
-MoveSourceUp="Перенести источник(и) вверх"
-MoveSourceDown="Перенести источник(и) вниз"
+MoveSourceUp="Перенести источники вверх"
+MoveSourceDown="Перенести источники вниз"
 SourceProperties="Открыть свойства источника"
 SourceFilters="Открыть фильтры источника"
 MixerToolbarMenu="Меню микшера звука"
 SceneFilters="Открыть фильтры сцены"
+List="Список"
+Grid="Сетка"
 PluginsFailedToLoad.Title="Ошибка загрузки плагина"
 PluginsFailedToLoad.Text="Следующие плагины OBS не удалось загрузить:\n\n%1\nПожалуйста, обновите или удалите эти плагины."
 AlreadyRunning.Title="OBS уже запущен"
 AlreadyRunning.Text="OBS уже запущен! Пожалуйста, закройте все запущенные окна OBS перед попыткой запустить новые (только если вы не хотели именно этого). Если вы настроили OBS на сворачивание в область уведомлений, пожалуйста, проверьте, возможно он до сих пор запущен."
 AlreadyRunning.LaunchAnyway="Запустить в любом случае"
+AutoSafeMode.Title="Безопасный режим"
+AutoSafeMode.Text="В последний раз OBS был неожиданно закрыт.\n\nХотите ли вы запустить OBS в безопасном режиме (с отключёнными сторонними плагинами, скриптами и веб-сокетами)?"
+AutoSafeMode.LaunchSafe="Запустить в безопасном режиме"
+AutoSafeMode.LaunchNormal="Запустить обыкновенно"
+SafeMode.Restart="Хотите перезапустить OBS в безопасный режим (с отключением сторонних плагинов, скриптов и веб-сокетов)?"
+SafeMode.RestartNormal="Хотите перезапустить OBS в обычный режим?"
 ChromeOS.Title="Неподдерживаемая платформа"
 ChromeOS.Text="Похоже, что OBS работает внутри контейнера ChromeOS. Эта платформа не поддерживается."
 Wine.Title="Обнаружен Wine"
@@ -118,14 +125,14 @@
 DockCloseWarning.Title="Закрытие закрепляемого окна"
 DockCloseWarning.Text="Вы только что закрыли закрепляемое окно. Если вы хотите показать его снова, используйте меню «Док-панели» в строке меню."
 ExtraBrowsers="Пользовательские док-панели браузера"
-ExtraBrowsers.Info="Добавьте док-панели, указав имя или ссылку, затем нажмите Принять или Закрыть, чтобы открыть док-панели. Вы можете добавлять или удалять док-панели когда угодно."
+ExtraBrowsers.Info="Добавьте док-панели, указав имя или ссылку, затем нажмите «Принять» или «Закрыть», чтобы открыть док-панели. Вы можете добавлять или удалять док-панели когда угодно."
 ExtraBrowsers.DockName="Имя док-панели"
 Auth.Authing.Title="Выполняется вход..."
 Auth.Authing.Text="Выполняется вход на %1. Пожалуйста, подождите..."
-Auth.AuthFailure.Title="Ошибка аутентификации"
-Auth.AuthFailure.Text="Ошибка аутентификации с %1:\n\n%2: %3"
-Auth.InvalidScope.Title="Требуется аутентификация"
-Auth.InvalidScope.Text="Требования к аутентификации для %1 изменились. Некоторые функции могут быть недоступны."
+Auth.AuthFailure.Title="Ошибка входа"
+Auth.AuthFailure.Text="Ошибка входа на %1:\n\n%2: %3"
+Auth.InvalidScope.Title="Требуется вход"
+Auth.InvalidScope.Text="Требования к входу для %1 изменились. Некоторые функции могут быть недоступны."
 Auth.LoadingChannel.Title="Загрузка информации о канале..."
 Auth.LoadingChannel.Text="Загрузка информации о канале для %1, пожалуйста подождите..."
 Auth.LoadingChannel.Error="Не удалось получить информацию о канале."
@@ -136,7 +143,7 @@
 TwitchAuth.Stats="Статистика Twitch"
 TwitchAuth.Feed="Лента активности Twitch"
 TwitchAuth.TwoFactorFail.Title="Не удалось запросить ключ трансляции"
-TwitchAuth.TwoFactorFail.Text="Не удалось подключиться к вашей учётной записи Twitch. Убедитесь, что двухфакторная аутентификация включена в <a href='https://www.twitch.tv/settings/security'>Настройках безопасности Twitch</a>; это требуется для начала прямых трансляций."
+TwitchAuth.TwoFactorFail.Text="Не удалось подключиться к вашей учётной записи Twitch. Убедитесь, что двухфакторная аутентификация включена в <a href='https://www.twitch.tv/settings/security'>«Настройках безопасности Twitch»</a>; это требуется для начала прямых трансляций."
 RestreamAuth.Channels="Каналы Restream"
 Copy.Filters="Копировать фильтры"
 Paste.Filters="Вставить фильтры"
@@ -157,36 +164,36 @@
 Basic.AutoConfig.VideoPage="Настройки видео"
 Basic.AutoConfig.VideoPage.SubTitle="Укажите настройки видео, которые вы хотите использовать"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Использовать текущее (%1x%2)"
-Basic.AutoConfig.VideoPage.BaseResolution.Display="Дисплей %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Экран %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Использовать текущее (%1)"
 Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 или 30, но предпочитать 60 по возможности"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 или 30, но предпочитать высокое разрешение"
 Basic.AutoConfig.VideoPage.CanvasExplanation="Примечание: Разрешение холста (базовое), не обязательно должно совпадать с разрешением трансляции или записи. Реальное разрешение вашей трансляции/записи может быть снижено для уменьшения использования ресурсов или битрейта."
 Basic.AutoConfig.StreamPage="Информация о трансляции"
 Basic.AutoConfig.StreamPage.SubTitle="Пожалуйста, введите вашу информацию о трансляции"
-Basic.AutoConfig.StreamPage.ConnectAccount="Подключить аккаунт (рекомендуется)"
-Basic.AutoConfig.StreamPage.DisconnectAccount="Выйти из аккаунта"
-Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Выйти из аккаунта?"
+Basic.AutoConfig.StreamPage.ConnectAccount="Подкл. аккаунт/учётн. запись (рекомендуется)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="Выйти из аккаунта/учётн. записи"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="Выйти из аккаунта/учётной записи?"
 Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="Это изменение вступит в силу немедленно. Уверены, что хотите выйти?"
 Basic.AutoConfig.StreamPage.GetStreamKey="Получить ключ трансляции"
 Basic.AutoConfig.StreamPage.MoreInfo="Подробности"
 Basic.AutoConfig.StreamPage.UseStreamKey="Использовать ключ потока"
 Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Использовать ключ потока (для продвинутых пользователей)"
 Basic.AutoConfig.StreamPage.Service="Сервис"
-Basic.AutoConfig.StreamPage.Service.ShowAll="Показать все..."
+Basic.AutoConfig.StreamPage.Service.ShowAll="Показать всё..."
 Basic.AutoConfig.StreamPage.Service.Custom="Настраиваемый..."
 Basic.AutoConfig.StreamPage.Server="Сервер"
 Basic.AutoConfig.StreamPage.StreamKey="Ключ потока"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: введите пароль шифрования.\nRTMP: введите ключ, предоставленный службой.\nSRT: введите ИД потока, если служба использует его."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Ссылка)"
 Basic.AutoConfig.StreamPage.EncoderKey="Ключ кодировщика"
-Basic.AutoConfig.StreamPage.ConnectedAccount="Подключённый аккаунт"
+Basic.AutoConfig.StreamPage.BearerToken="Пользовательский токен"
+Basic.AutoConfig.StreamPage.ConnectedAccount="Подкл. аккаунт/учётн. запись"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Посчитать битрейт во время теста пропускной способности (может занять несколько минут)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Предпочитать аппаратное кодирование"
-Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Аппаратное кодирование снижает использование ЦП, но может потребовать больший битрейт, для достижения того же уровня качества."
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Аппаратное кодирование снижает использование процессора, но может потребовать больший битрейт, для достижения того же уровня качества."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Предупреждение трансляции"
-Basic.AutoConfig.StreamPage.StreamWarning.Text="Тест пропускной способности трансляции случайных видеоданных без звука на вашем канале. Рекомендуется временно отключить запись трансляции в файл и сделать трансляцию частной, пока тестирование не завершится. Продолжить?"
-Basic.AutoConfig.TestPage="Финальные результаты"
+Basic.AutoConfig.StreamPage.StreamWarning.Text="Проверка пропускной способности трансляции случайных видеоданных без звука на вашем канале. Рекомендуется временно отключить запись трансляции в файл и сделать трансляцию закрытой, пока проверка не завершится. Продолжить?"
+Basic.AutoConfig.TestPage="Конечные результаты"
 Basic.AutoConfig.TestPage.SubTitle.Testing="Сейчас программа выполняет набор тестов для оценки лучших настроек"
 Basic.AutoConfig.TestPage.SubTitle.Complete="Тестирование завершено"
 Basic.AutoConfig.TestPage.TestingBandwidth="Испытание пропускной способности, это может занять несколько минут..."
@@ -202,8 +209,8 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Кодировщик записи"
 Basic.AutoConfig.TestPage.Result.Header="Программа определила, что эти примерные настройки наиболее вам подходят:"
 Basic.AutoConfig.TestPage.Result.Footer="Для использования этих настроек нажмите «Применить настройки». Для повторной настройки с помощью мастера нажмите «Назад». Чтобы задать настройки самостоятельно, нажмите «Отмена» и откройте «Настройки»."
-Basic.AutoConfig.Info="Мастер автоматической настройки определит оптимальные параметры, основываясь на особенностях вашего компьютера и скорости интернета."
-Basic.AutoConfig.RunAnytime="Его можно запустить снова из меню «Сервис."
+Basic.AutoConfig.Info="Мастер автоматической настройки определит оптимальные параметры, основываясь на особенностях вашего компьютера и скорости Интернета."
+Basic.AutoConfig.RunAnytime="Его можно запустить снова из меню «Сервис»."
 Basic.Stats="Статистика"
 Basic.Stats.CPUUsage="Использование ЦП"
 Basic.Stats.HDDSpaceAvailable="Доступно места на диске"
@@ -231,8 +238,6 @@
 Updater.UpdateNow="Обновить сейчас"
 Updater.RemindMeLater="Напомнить позже"
 Updater.Skip="Пропустить версию"
-Updater.Running.Title="Производится выполнение программы"
-Updater.Running.Text="Обнаружена активная операция вывода. Перед обновлением необходимо отключить все активные операции вывода"
 Updater.NoUpdatesAvailable.Title="Нет доступных обновлений"
 Updater.NoUpdatesAvailable.Text="Обновления не обнаружены"
 Updater.BranchNotFound.Title="Канал обновления удалён"
@@ -242,10 +247,8 @@
 Updater.RepairConfirm.Title="Подтвердите проверку целостности"
 Updater.RepairConfirm.Text="Проверка целостности выполнит сканирование вашей установки OBS и перекачает повреждённые/изменённые файлы. Это может занять некоторое время.\n\nХотите продолжить?"
 Updater.FailedToLaunch="Не удалось проверить обновления"
-Updater.GameCaptureActive.Title="Производится захват игры"
-Updater.GameCaptureActive.Text="Библиотека захвата игр загружена. Закройте все захватываемые игры и программы (или перезапустите Windows) и попробуйте ещё раз."
 QuickTransitions.SwapScenes="Менять местами сцены предпросмотра/программы по переходу"
-QuickTransitions.SwapScenesTT="Меняет местами сцены предпросмотра и программы после перехода (если оригинальная сцена программы до сих пор существует).\nЭто не отменяет никаких изменений, которые возможно были сделаны в оригинальной программной сцене."
+QuickTransitions.SwapScenesTT="Меняет местами сцены предпросмотра и программы после перехода (если изначальная сцена программы до сих пор существует).\nЭто не отменяет никаких изменений, которые возможно были сделаны в изначальной программной сцене."
 QuickTransitions.DuplicateScene="Дублировать сцену"
 QuickTransitions.DuplicateSceneTT="При редактировании одной и той же сцены функция позволяет править преобразование/видимость источников без изменения вывода программы.\nДля редактирования свойств источников без изменения вывода программы, включите «Дублировать источники».\nИзменение этого параметра приведёт к сбросу сцены программы (если она ещё существует)."
 QuickTransitions.EditProperties="Дублировать источники"
@@ -257,54 +260,58 @@
 Basic.SceneTransitions="Переходы между сценами"
 Basic.TransitionDuration="Длительность"
 Basic.TogglePreviewProgramMode="Режим студии"
+Basic.EnablePreviewProgramMode="Включить режим студии"
+Basic.DisablePreviewProgramMode="Отключить режим студии"
 Undo.Undo="Отменить"
 Undo.Redo="Повторить"
-Undo.Add="добавление \"%1\""
+Undo.Add="добавление «%1»"
 Undo.Delete="удаление «%1»"
-Undo.Rename="переименование \"%1\""
-Undo.SceneCollection.Switch="переключение на \"%1\""
+Undo.Rename="переименование «%1»"
+Undo.SceneCollection.Switch="переключение на «%1»"
 Undo.Item.Undo="Отменить %1"
 Undo.Item.Redo="Повторить %1"
 Undo.Sources.Multi="Удалить источники %1"
-Undo.Filters="настройку фильтра в \"%1\""
-Undo.Filters.Paste.Single="вставку фильтра \"%1\" в \"%2\""
-Undo.Filters.Paste.Multiple="копирование фильтров из \"%1\" в \"%2\""
-Undo.Transform="Преобразование источника(ов) в \"%1\""
-Undo.Transform.Paste="Вставку настроек преобразования в \"%1\""
-Undo.Transform.Rotate="поворот в \"%1\""
-Undo.Transform.Reset="Сброс настроек преобразования в \"%1\""
-Undo.Transform.HFlip="отзеркаливание по горизонтали в \"%1\""
-Undo.Transform.VFlip="отзеркаливание по вертикали в \"%1\""
-Undo.Transform.FitToScreen="размещение по размеру экрана в \"%1\""
-Undo.Transform.StretchToScreen="растяжение по размеру экрана в \"%1\""
-Undo.Transform.Center="центрирование по экрану в \"%1\""
-Undo.Transform.VCenter="вертикальное центрирование по экрану в \"%1\""
-Undo.Transform.HCenter="горизонтальное центрирование по экрану в \"%1\""
-Undo.Volume.Change="изменение громкости у \"%1\""
-Undo.Volume.Mute="выключение звука \"%1\""
-Undo.Volume.Unmute="включение звука \"%1\""
-Undo.Balance.Change="изменение баланса аудио на \"%1\""
-Undo.SyncOffset.Change="изменение смещения синхронизации звука \"%1\""
+Undo.Filters="настройку фильтра в «%1»"
+Undo.Filters.Paste.Single="вставку фильтра «%1» в «%2»"
+Undo.Filters.Paste.Multiple="копирование фильтров из «%1» в «%2»"
+Undo.Transform="преобразование источников в «%1»"
+Undo.Transform.Paste="вставку настроек преобразования в «%1»"
+Undo.Transform.Rotate="поворот в «%1»"
+Undo.Transform.Reset="сброс настроек преобразования в «%1»"
+Undo.Transform.HFlip="отзеркаливание по горизонтали в «%1»"
+Undo.Transform.VFlip="отзеркаливание по вертикали в «%1»"
+Undo.Transform.FitToScreen="размещение по размеру экрана в «%1»"
+Undo.Transform.StretchToScreen="растяжение по размеру экрана в «%1»"
+Undo.Transform.Center="центрирование по экрану в «%1»"
+Undo.Transform.VCenter="вертикальное центрирование по экрану в «%1»"
+Undo.Transform.HCenter="горизонтальное центрирование по экрану в «%1»"
+Undo.Volume.Change="изменение громкости у «%1»"
+Undo.Volume.Mute="заглушение «%1»"
+Undo.Volume.Unmute="снятие заглушения «%1»"
+Undo.Balance.Change="изменение баланса аудио на «%1»"
+Undo.SyncOffset.Change="изменение смещения синхронизации звука «%1»"
 Undo.MonitoringType.Change="смена прослушивания аудио для «%1»"
-Undo.Mixers.Change="изменение настройки аудио микшера на \"%1\""
-Undo.ForceMono.On="включение принудительного моно \"%1\""
-Undo.ForceMono.Off="выключение принудительного моно \"%1\""
-Undo.Properties="настройки свойств источника \"%1\""
-Undo.Scene.Duplicate="дублирование сцены \"%1\""
-Undo.ShowTransition="показывание перехода на \"%1\""
-Undo.HideTransition="скрытие перехода на \"%1\""
-Undo.ShowSceneItem="показывание \"%1\" в \"%2\""
-Undo.HideSceneItem="скрытие \"%1\" в \"%2\""
-Undo.ReorderSources="пересортировку источников в \"%1\""
+Undo.Mixers.Change="изменение настройки аудио микшера на «%1»"
+Undo.ForceMono.On="включение принудительного моно «%1»"
+Undo.ForceMono.Off="отключение принудительного моно «%1»"
+Undo.Properties="настройки свойств источника «%1»"
+Undo.Scene.Duplicate="дублирование сцены «%1»"
+Undo.ShowTransition="переход показа на «%1»"
+Undo.HideTransition="переход скрытия на «%1»"
+Undo.ShowSceneItem="отображение «%1» в «%2»"
+Undo.HideSceneItem="скрытие «%1» в «%2»"
+Undo.ReorderSources="пересортировку источников в «%1»"
 Undo.MoveUp="перенос «%1» выше в «%2»"
 Undo.MoveDown="перенос «%1» ниже в «%2»"
 Undo.MoveToTop="перенос «%1» в верхнюю часть «%2»"
 Undo.MoveToBottom="перенос «%1» в нижнюю часть «%2»"
-Undo.PasteSource="вставку источника(ов) в \"%1\""
-Undo.PasteSourceRef="вставка ссылки(ок) на источники в \"%1\""
-Undo.GroupItems="сгруппированные элементы в \"%1\""
+Undo.PasteSource="вставку источников в «%1»"
+Undo.PasteSourceRef="вставка ссылки(ок) на источники в «%1»"
+Undo.GroupItems="сгруппированные элементы в «%1»"
 TransitionNameDlg.Text="Пожалуйста, введите имя перехода"
 TransitionNameDlg.Title="Имя перехода"
+TitleBar.SafeMode="БЕЗОПАСНЫЙ РЕЖИМ"
+TitleBar.PortableMode="Переносной режим"
 TitleBar.Profile="Профиль"
 TitleBar.Scenes="Сцены"
 NameExists.Title="Название уже существует"
@@ -318,17 +325,18 @@
 ConfirmStopRecord.Title="Остановить запись?"
 ConfirmStopRecord.Text="Уверены, что хотите остановить запись?"
 ConfirmBWTest.Title="Начать проверку пропускной способности?"
-ConfirmBWTest.Text="Вы настроили OBS в режиме тестирования пропускной способности. Этот режим позволяет тестировать сеть без выхода вашего канала в эфир. После того, как вы закончите тестирование, вам необходимо выключить эту функцию для того чтобы зрители могли видеть вашу трансляцию.\n\nВы хотите продолжить?"
+ConfirmBWTest.Text="Вы настроили OBS в режиме проверки пропускной способности. Этот режим позволяет проверять сеть без выхода вашего канала в эфир. После того, как вы закончите проверку, вам необходимо отключить эту функцию для того чтобы зрители могли видеть вашу трансляцию.\n\nВы хотите продолжить?"
 ConfirmExit.Title="Выйти из OBS?"
-ConfirmExit.Text="OBS сейчас активен. Все потоки/записи будут отключены. Уверены, что хотите выйти?"
+ConfirmExit.Text="OBS сейчас запущен. Все потоки/записи будут отключены. Уверены, что хотите выйти?"
 ConfirmRemove.Title="Подтвердить удаление"
 ConfirmRemove.Text="Уверены, что хотите удалить «%1»?"
-ConfirmRemove.TextMultiple="Уверены, что хотите удалить %1 элементов?"
+ConfirmRemove.TextMultiple="Уверены, что хотите удалить %1 элем.?"
 ConfirmReset.Title="Сбросить свойства"
 ConfirmReset.Text="Вы действительно хотите сбросить текущие свойства по умолчанию?"
 Output.StartStreamFailed="Не удалось запустить трансляцию"
 Output.StartRecordingFailed="Не удалось начать запись"
 Output.StartReplayFailed="Не удалось запустить буфер повтора"
+Output.StartVirtualCamFailed="Не удалось запустить виртуальную камеру"
 Output.StartFailedGeneric="Сбой вывода. Подробности отражены в журнале.\n\nПримечание: Если вы используете кодировщики NVENC или AMD, убедитесь, что у вас установлена последняя версия видеодрайвера."
 Output.ReplayBuffer.PauseWarning.Title="Во время паузы нельзя сохранять повторы"
 Output.ReplayBuffer.PauseWarning.Text="Предупреждение: Повторы не могут быть сохранены во время приостановления записи."
@@ -341,7 +349,7 @@
 Output.ConnectFail.Disconnected="Отключён от сервера."
 Output.StreamEncodeError.Title="Ошибка кодирования"
 Output.StreamEncodeError.Msg="Произошла ошибка кодировщика во время трансляции."
-Output.StreamEncodeError.Msg.LastError="Произошла ошибка кодировщика во время трансляции:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Произошла ошибка кодировщика во время трансляции: %1"
 Output.RecordFail.Title="Не удалось начать запись"
 Output.RecordFail.Unsupported="Выходной формат либо не поддерживается, либо не поддерживает более одной звуковой дорожки. Пожалуйста, проверьте настройки и повторите попытку."
 Output.RecordNoSpace.Title="Недостаточно места на диске"
@@ -349,11 +357,11 @@
 Output.RecordError.Title="Ошибка записи"
 Output.RecordError.Msg="Во время записи произошла неопознанная ошибка."
 Output.RecordError.EncodeErrorMsg="Произошла ошибка кодировщика во время записи."
-Output.RecordError.EncodeErrorMsg.LastError="Произошла ошибка кодировщика во время записи:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Произошла ошибка кодировщика во время записи: %1"
 Output.BadPath.Title="Неправильный путь к файлу"
-Output.BadPath.Text="Настроенный путь для записей нельзя открыть. Пожалуйста, проверьте путь к записям в меню Настройки → Выход → Запись."
+Output.BadPath.Text="Настроенный путь для записей нельзя открыть. Пожалуйста, проверьте путь к записям в меню «Настройки → Выход → Запись»."
 Output.NoBroadcast.Title="Трансляция не настроена"
-Output.NoBroadcast.Text="Вам нужно настроить Трансляцию, прежде чем вы сможете начать Прямой эфир."
+Output.NoBroadcast.Text="Вам нужно настроить трансляцию, прежде чем вы сможете начать её."
 Output.BroadcastStartFailed="Не удалось начать трансляцию"
 Output.BroadcastStopFailed="Не удалось остановить трансляцию"
 LogReturnDialog="Журнал успешно отправлен"
@@ -379,6 +387,8 @@
 Remux.ExitUnfinishedTitle="Выполняется перепаковка"
 Remux.ExitUnfinished="Перепаковка не закончена, остановка процесса сейчас может сделать файл непригодным.\nУверены, что хотите остановить перепаковку?"
 Remux.HelpText="Перетащите файлы в это окно для перепаковки или выберите пустую ячейку «Файл записи OBS» для выбора файла."
+Remux.NoFilesAddedTitle="Не добавлен файл перепаковки"
+Remux.NoFilesAdded="Ни один файл не добавлен для перепаковки. Перетащите папку, содержащую один или несколько видеофайлов."
 MissingFiles="Отсутствующие файлы"
 MissingFiles.MissingFile="Отсутствующий файл"
 MissingFiles.NewFile="Новый файл"
@@ -397,9 +407,10 @@
 MissingFiles.AutoSearchText="OBS нашёл в этой папке дополнительные совпадения для недостающих файлов. Хотите их добавить?"
 MissingFiles.NoMissing.Title="Проверка пропавших файлов"
 MissingFiles.NoMissing.Text="Пропавшие файлы не обнаружены."
+MacPermissions.MenuAction="Просмотр разрешений приложения…"
 MacPermissions.Title="Просмотр разрешений приложения"
 MacPermissions.Description="OBS Studio требует вашего разрешения для предоставления определённых возможностей. Желательно включить эти разрешения, но они не требуются для использования приложения. Вы всегда можете включить их позже."
-MacPermissions.Description.OpenDialog="Этот диалог можно открыть заново из меню OBS Studio."
+MacPermissions.Description.OpenDialog="Это меню можно открыть заново из меню OBS Studio."
 MacPermissions.AccessGranted="Доступ предоставлен"
 MacPermissions.RequestAccess="Запросить доступ"
 MacPermissions.OpenPreferences="Открыть настройки %1"
@@ -412,14 +423,14 @@
 MacPermissions.Item.Accessibility="Спец. возможности"
 MacPermissions.Item.Accessibility.Details="Пожалуйста, включите это разрешение, чтобы сочетания клавиш клавиатуры (горячие клавиши) работали, пока другие приложения в фокусе."
 MacPermissions.Continue="Продолжить"
-UpdateAvailable="Доступно свежее обновление"
-UpdateAvailable.Text="Доступна версия %1.%2.%3. <a href='%4'>Нажмите сюда, чтобы скачать</a>"
-Basic.DesktopDevice1="Звук раб. стола"
-Basic.DesktopDevice2="Звук раб. стола 2"
-Basic.AuxDevice1="Микр./доп."
-Basic.AuxDevice2="Микр./доп. 2"
-Basic.AuxDevice3="Микр./доп. 3"
-Basic.AuxDevice4="Микр./доп. 4"
+SourceLeak.Title="Ошибка очистки источника"
+SourceLeak.Text="При изменении коллекций сцен возникла проблема, и некоторые источники не удалось выгрузить. Эта проблема обычно вызвана плагинами, которые не освобождают ресурсы должным образом. Пожалуйста, убедитесь, что все используемые вами плагины обновлены.\n\nOBS Studio завершает работу, чтобы предотвратить возможное повреждение данных."
+Basic.DesktopDevice1="Рабочий стол"
+Basic.DesktopDevice2="Рабочий стол 2"
+Basic.AuxDevice1="Микр/доп"
+Basic.AuxDevice2="Микр/доп 2"
+Basic.AuxDevice3="Микр/доп 3"
+Basic.AuxDevice4="Микр/доп 4"
 Basic.Scene="Сцена"
 Basic.DisplayCapture="Захват экрана"
 Basic.Main.PreviewConextMenu.Enable="Включить предпросмотр"
@@ -445,12 +456,12 @@
 Deinterlacing.Discard="Отклонить"
 Deinterlacing.TopFieldFirst="Верхнее поле первое"
 Deinterlacing.BottomFieldFirst="Нижнее поле первое"
-VolControl.SliderUnmuted="Регулятор громкости '%1':"
-VolControl.SliderMuted="Регулятор громкости '%1': (сейчас заглушён)"
+VolControl.SliderUnmuted="Регулятор громкости «%1»:"
+VolControl.SliderMuted="Регулятор громкости «%1»: (сейчас заглушён)"
 VolControl.Mute="Заглушить «%1»"
 VolControl.Properties="Свойства «%1»"
 VolControl.UnassignedWarning.Title="Неназначенный источник звука"
-VolControl.UnassignedWarning.Text="«%1» не назначен ни на одну аудиодорожку и не будет слышен в потоках или записях.\n\nЧтобы назначить источник звука на дорожку, откройте «Расширенные свойства аудио» из меню правой кнопки мыши или с помощью кнопки шестерёнки на док-панели инструментов микшера."
+VolControl.UnassignedWarning.Text="«%1» не назначен ни для одной аудиодорожки и не будет слышен в потоках или записях.\n\nЧтобы назначить источник звука для дорожки, откройте «Расширенные свойства звука» из меню правой кнопки мыши или с помощью кнопки шестерёнки на док-панели инструментов микшера."
 Basic.Main.AddSceneDlg.Title="Добавить сцену"
 Basic.Main.AddSceneDlg.Text="Пожалуйста, введите название сцены"
 Basic.Main.DefaultSceneName.Text="Сцена %1"
@@ -469,40 +480,41 @@
 Basic.SourceSelect.AddExisting="Добавить существующий"
 Basic.SourceSelect.AddVisible="Сделать источник видимым"
 Basic.Main.Sources.Visibility="Видимость"
-Basic.Main.Sources.VisibilityDescription="Управление видимостью '%1' на холсте"
+Basic.Main.Sources.VisibilityDescription="Управление видимостью «%1» на холсте"
 Basic.Main.Sources.Lock="Заблокировать"
-Basic.Main.Sources.LockDescription="Блокирует позицию и масштаб '%1' на холсте"
+Basic.Main.Sources.LockDescription="Блокирует позицию и масштаб «%1» на холсте"
 Basic.PropertiesWindow="Свойства «%1»"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (автовыбор: %2)"
 Basic.PropertiesWindow.SelectColor="Выбрать цвет"
 Basic.PropertiesWindow.SelectFont="Выбрать шрифт"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Выбор шрифта"
 Basic.PropertiesWindow.ConfirmTitle="Настройки изменены"
 Basic.PropertiesWindow.Confirm="Имеются несохранённые изменения. Желаете сохранить их?"
 Basic.PropertiesWindow.NoProperties="Нет доступных параметров"
 Basic.PropertiesWindow.AddFiles="Добавить файлы"
 Basic.PropertiesWindow.AddDir="Добавить папку"
 Basic.PropertiesWindow.AddURL="Добавить путь/URL"
-Basic.PropertiesWindow.AddEditableListDir="Добавить папку в '%1'"
-Basic.PropertiesWindow.AddEditableListFiles="Добавить файлы в '%1'"
-Basic.PropertiesWindow.AddEditableListEntry="Добавить запись в '%1'"
-Basic.PropertiesWindow.EditEditableListEntry="Изменить запись из '%1'"
+Basic.PropertiesWindow.AddEditableListDir="Добавить папку в «%1»"
+Basic.PropertiesWindow.AddEditableListFiles="Добавить файлы в «%1»"
+Basic.PropertiesWindow.AddEditableListEntry="Добавить запись в «%1»"
+Basic.PropertiesWindow.EditEditableListEntry="Изменить запись из «%1»"
 Basic.PropertiesView.FPS.Simple="Простые значения частоты кадров"
 Basic.PropertiesView.FPS.Rational="Рациональные значения частоты кадров"
 Basic.PropertiesView.FPS.ValidFPSRanges="Допустимые диапазоны частоты кадров:"
 Basic.PropertiesView.UrlButton.Text="Открыть эту ссылку в браузере по умолчанию?"
-Basic.PropertiesView.UrlButton.Text.Url="URL-адрес: %1"
-Basic.PropertiesView.UrlButton.OpenUrl="Открыть URL-адрес"
-Basic.InteractionWindow="Взаимодействие с '%1'"
-Basic.StatusBar.Reconnecting="Потеряно соединение, переподключение через %2 секунд(ы) (попытка %1)"
+Basic.PropertiesView.UrlButton.Text.Url="Сетевой адрес: %1"
+Basic.PropertiesView.UrlButton.OpenUrl="Открыть сетевой адрес"
+Basic.InteractionWindow="Взаимодействие с «%1»"
+Basic.StatusBar.Reconnecting="Потеряно соединение, переподключение через %2 сек. (попытка %1)"
 Basic.StatusBar.AttemptingReconnect="Попытка подключения... (попытка %1)"
 Basic.StatusBar.ReconnectSuccessful="Переподключение успешно"
 Basic.StatusBar.Delay="Задержка (%1 с)"
 Basic.StatusBar.DelayStartingIn="Задержка (начало через %1 с)"
 Basic.StatusBar.DelayStoppingIn="Задержка (остановка через %1 с)"
 Basic.StatusBar.DelayStartingStoppingIn="Задержка (остановка через %1 с, начало через %2 с)"
-Basic.StatusBar.RecordingSavedTo="Запись сохранена в '%1'"
-Basic.StatusBar.ReplayBufferSavedTo="Буфер повтора записан в '%1'"
-Basic.StatusBar.ScreenshotSavedTo="Снимок экрана сохранён как '%1'"
+Basic.StatusBar.RecordingSavedTo="Запись сохранена в «%1»"
+Basic.StatusBar.ReplayBufferSavedTo="Буфер повтора записан в «%1»"
+Basic.StatusBar.ScreenshotSavedTo="Снимок экрана сохранён как «%1»"
 Basic.StatusBar.AutoRemuxedTo="Запись автоматически перепакована в «%1»"
 Basic.Filters="Фильтры"
 Basic.Filters.AsyncFilters="Фильтры аудио/видео"
@@ -513,8 +525,8 @@
 Basic.Filters.AddFilter.Text="Пожалуйста, укажите название фильтра"
 Basic.TransformWindow="Преобразование элемента сцены"
 Basic.TransformWindow.Position="Позиция"
-Basic.TransformWindow.PositionX="Позиция X"
-Basic.TransformWindow.PositionY="Позиция Y"
+Basic.TransformWindow.PositionX="Позиция по горизонтали (X)"
+Basic.TransformWindow.PositionY="Позиция по вертикали (Y)"
 Basic.TransformWindow.Rotation="Вращение"
 Basic.TransformWindow.Size="Размер"
 Basic.TransformWindow.Width="Ширина"
@@ -546,10 +558,10 @@
 Basic.TransformWindow.BoundsType.ScaleToWidth="Масштабирование до ширины границы"
 Basic.TransformWindow.BoundsType.ScaleToHeight="Масштабирование до высоты границы"
 Basic.TransformWindow.BoundsType.Stretch="Растянуть до границы"
-Basic.TransformWindow.Title="Изменить преобразование для '%1'"
+Basic.TransformWindow.Title="Изменить преобразование для «%1»"
 Basic.TransformWindow.NoSelectedSource="Источник не выбран"
 Basic.Main.AddSourceHelp.Title="невозможно добавить источник"
-Basic.Main.AddSourceHelp.Text="Вы должны создать по крайней мере одну сцену чтобы добавить источник."
+Basic.Main.AddSourceHelp.Text="Вы должны создать по крайней мере одну сцену, чтобы добавить источник."
 Basic.Main.Scenes="Сцены"
 Basic.Main.Sources="Источники"
 Basic.Main.Source="Источник"
@@ -560,7 +572,7 @@
 Basic.Main.SaveReplay="Сохранить повтор"
 Basic.Main.StartStreaming="Начать трансляцию"
 Basic.Main.StartBroadcast="Выйти в эфир"
-Basic.Main.StartVirtualCam="Запуск виртуальной камеры"
+Basic.Main.StartVirtualCam="Запуск вирт. камеры"
 Basic.Main.StopRecording="Остановить запись"
 Basic.Main.PauseRecording="Приостановить запись"
 Basic.Main.UnpauseRecording="Возобновить запись"
@@ -573,10 +585,10 @@
 Basic.Main.StopBroadcast="Завершить трансляцию"
 Basic.Main.AutoStopEnabled="(Автоостановка)"
 Basic.Main.StoppingStreaming="Остановка трансляции..."
-Basic.Main.ForceStopStreaming="Остановить трансляцию (сбросить задержку)"
-Basic.Main.ShowContextBar="Показать панель инструментов источников"
-Basic.Main.HideContextBar="Скрыть панель инструментов источников"
-Basic.Main.StopVirtualCam="Остановить виртуальную камеру"
+Basic.Main.ForceStopStreaming="Остановить трансляцию (сброс задержки)"
+Basic.Main.ShowContextBar="Показать панель источников"
+Basic.Main.HideContextBar="Скрыть панель источников"
+Basic.Main.StopVirtualCam="Остановить вирт. камеру"
 Basic.Main.Group="Группа %1"
 Basic.Main.GroupItems="Группировать выбранные объекты"
 Basic.Main.Ungroup="Разгруппировать"
@@ -586,9 +598,9 @@
 Basic.VCam.VirtualCamera="Виртуальная камера"
 Basic.VCam.OutputType="Тип вывода"
 Basic.VCam.OutputSelection="Выбор средства вывода"
-Basic.VCam.Internal="Внутренний"
-Basic.VCam.InternalDefault="Вывод программы (по умолчанию)"
-Basic.VCam.InternalPreview="Предпросмотр вывода"
+Basic.VCam.OutputType.Program="Программа (по умолчанию)"
+Basic.VCam.OutputSelection.NoSelection="Отсутствует выбор для этого типа вывода"
+Basic.VCam.RestartWarning="Виртуальная камера будет перезапущена для применения этого изменения"
 Basic.MainMenu.File="Файл (&F)"
 Basic.MainMenu.File.Export="Экспорт (&E)"
 Basic.MainMenu.File.Import="Импорт (&I)"
@@ -627,21 +639,22 @@
 Basic.MainMenu.Edit.Order.MoveDown="Перенести ниже (&D)"
 Basic.MainMenu.Edit.Order.MoveToTop="В самый верх (&T)"
 Basic.MainMenu.Edit.Order.MoveToBottom="В самый низ (&B)"
-Basic.MainMenu.Edit.AdvAudio="Расширенные свойства аудио (&A)"
+Basic.MainMenu.Edit.AdvAudio="Расширенные свойства звука (&A)"
 Basic.MainMenu.View="Вид (&V)"
 Basic.MainMenu.View.Toolbars="Панель инструментов (&T)"
-Basic.MainMenu.View.ListboxToolbars="Кнопки списка под доками «Сцены» и «Источники»"
-Basic.MainMenu.View.ContextBar="Панель инструментов источников"
-Basic.MainMenu.View.SceneTransitions="Сцена переходов (&C)"
+Basic.MainMenu.View.ListboxToolbars="Док-панели инструментов"
+Basic.MainMenu.View.ContextBar="Панель источников"
 Basic.MainMenu.View.SourceIcons="Значки источников (&I)"
 Basic.MainMenu.View.StatusBar="Строка состояния (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Полный экран"
 Basic.MainMenu.View.ResetUI="&Сбросить интерфейс"
-Basic.MainMenu.View.AlwaysOnTop="&Поверх других окон"
+Basic.MainMenu.View.AlwaysOnTop="Поверх других окон (&A)"
+Basic.MainMenu.View.SceneListMode="Режим списка сцен"
 Basic.MainMenu.Docks="Док-панели (&D)"
-Basic.MainMenu.Docks.ResetDocks="Сбросить до&к-панели"
-Basic.MainMenu.Docks.LockDocks="&Заблокировать док-панели"
-Basic.MainMenu.Docks.CustomBrowserDocks="&Пользовательские док-панели браузера..."
+Basic.MainMenu.Docks.ResetDocks="Сбросить док-панели (&R)"
+Basic.MainMenu.Docks.LockDocks="Заблокировать док-панели (&L)"
+Basic.MainMenu.Docks.SideDocks="Док-панели на всю высоту (&F)"
+Basic.MainMenu.Docks.CustomBrowserDocks="Пользовательские док-панели браузера... (&C)"
 Basic.MainMenu.SceneCollection="Коллекция сцен (&S)"
 Basic.MainMenu.Profile="Профиль (&P)"
 Basic.MainMenu.Profile.Import="Импортировать профиль"
@@ -649,20 +662,22 @@
 Basic.MainMenu.SceneCollection.Import="Импортировать коллекцию сцен"
 Basic.MainMenu.SceneCollection.Export="Экспортировать коллекцию сцен"
 Basic.MainMenu.Profile.Exists="Профиль уже существует"
-Basic.MainMenu.SceneCollection.Exists="Коллекция сцен уже существует"
 Basic.MainMenu.Tools="Сервис (&T)"
 Basic.MainMenu.Help="Справка (&H)"
 Basic.MainMenu.Help.HelpPortal="Справочный портал (&P)"
-Basic.MainMenu.Help.Website="Посетить веб-сайт (&W)"
-Basic.MainMenu.Help.Discord="Посетить сервер &Discord"
+Basic.MainMenu.Help.Website="Посетить сайт (&W)"
+Basic.MainMenu.Help.Discord="Посетить Discord-сервер (&D)"
 Basic.MainMenu.Help.WhatsNew="Что нового"
 Basic.MainMenu.Help.Logs="Файлы журнала (&L)"
 Basic.MainMenu.Help.Logs.ShowLogs="Показать файлы журнала (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Отправить текущий файл журнала (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Отправить предыдущий файл журнала (&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Открыть текущий журнал (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Информация о обновлении"
 Basic.MainMenu.Help.CheckForUpdates="Проверить обновления"
 Basic.MainMenu.Help.Repair="Проверить целостность файлов"
+Basic.MainMenu.Help.RestartSafeMode="Перезапустить в безопасный режим"
+Basic.MainMenu.Help.RestartNormal="Перезапустить в обычный режим"
 Basic.MainMenu.Help.CrashLogs="Отчёты об ошибках (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Показать отчёты об ошибках (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Отправить предыдущий отчёт об ошибке (&P)"
@@ -729,42 +744,40 @@
 Basic.Settings.General.MultiviewLayout.25Scene="Только сцены (25 сцен)"
 Basic.Settings.General.ChannelName.stable="Стабильный"
 Basic.Settings.General.ChannelDescription.stable="Последний стабильный выпуск"
-Basic.Settings.General.ChannelName.beta="Бета-версии / кандидаты"
+Basic.Settings.General.ChannelName.beta="Бета-версии / предвыпускные"
 Basic.Settings.General.ChannelDescription.beta="Предварительные нестабильные версии"
 Basic.Settings.Stream="Трансляция"
-Basic.Settings.Stream.StreamType="Тип вещания"
-Basic.Settings.Stream.Custom.UseAuthentication="Использовать аутентификацию"
+Basic.Settings.Stream.Custom.UseAuthentication="Использовать вход в аккаунт"
 Basic.Settings.Stream.Custom.Username="Имя пользователя"
 Basic.Settings.Stream.Custom.Password="Пароль"
 Basic.Settings.Stream.Custom.Username.ToolTip="RIST: введите srp_username.\nRTMP: введите имя пользователя.\nSRT: не используется."
 Basic.Settings.Stream.Custom.Password.ToolTip="RIST: введите srp_password.\nRTMP: введите пароль.\nSRT: введите пароль шифрования."
-Basic.Settings.Stream.BandwidthTestMode="Включить режим тестирования пропускной способности"
+Basic.Settings.Stream.BandwidthTestMode="Включить режим проверки пропускной способности"
 Basic.Settings.Stream.TTVAddon="Дополнения чата Twitch"
 Basic.Settings.Stream.TTVAddon.None="Нет"
-Basic.Settings.Stream.TTVAddon.Both="BetterTTV и FrankerFaceZ"
+Basic.Settings.Stream.TTVAddon.Both="BTTV и FFZ"
 Basic.Settings.Stream.MissingSettingAlert="Поток не настроен"
 Basic.Settings.Stream.StreamSettingsWarning="Открыть настройки"
 Basic.Settings.Stream.MissingUrlAndApiKey="URL-адрес и ключ потока отсутствуют.\n\nОткройте настройки, чтобы ввести URL-адрес и ключ потока на вкладке «Трансляция»."
 Basic.Settings.Stream.MissingUrl="Отсутствует URL потока.\n\nОткройте настройки, чтобы ввести URL на вкладке «Трансляция»."
 Basic.Settings.Stream.MissingStreamKey="Ключ потока отсутствует.\n\nОткройте настройки, чтобы ввести ключ потока на вкладке «Трансляция»."
 Basic.Settings.Stream.IgnoreRecommended="Не учитывать рекомендуемые настройки потоковой службы"
-Basic.Settings.Stream.IgnoreRecommended.Warn.Title="Переопределить рекомендуемые настройки"
-Basic.Settings.Stream.IgnoreRecommended.Warn.Text="Использование значений за пределами рекомендуемых может отрицательно повлиять на качество и/или стабильность потока.\n\nПродолжить?"
-Basic.Settings.Stream.Recommended.MaxVideoBitrate="Максимальный битрейт видео: %1 kbps"
-Basic.Settings.Stream.Recommended.MaxAudioBitrate="Максимальный битрейт аудио: %1 kbps"
+Basic.Settings.Stream.IgnoreRecommended.Warn.Title="Обойти рекомендуемые настройки"
+Basic.Settings.Stream.IgnoreRecommended.Warn.Text="Внимание! Использование значений свыше рекомендуемых может отрицательно повлиять на качество или стабильность потока.\n\nПродолжить?"
+Basic.Settings.Stream.Recommended.MaxVideoBitrate="Максимальный битрейт видео: %1 кбит/с"
+Basic.Settings.Stream.Recommended.MaxAudioBitrate="Максимальный битрейт аудио: %1 кбит/с"
 Basic.Settings.Stream.Recommended.MaxResolution="Максимальное разрешение: %1"
 Basic.Settings.Stream.Recommended.MaxFPS="Максимум частоты кадров: %1"
 Basic.Settings.Output="Вывод"
 Basic.Settings.Output.Format="Формат записи"
-Basic.Settings.Output.Format.MKV="Видеоформат Матрёшка (.mkv)"
+Basic.Settings.Output.Format.MKV="Видеоформат «Матрёшка» (.mkv)"
 Basic.Settings.Output.Format.fMP4="Фрагментированный MP4 (.mp4)"
 Basic.Settings.Output.Format.fMOV="Фрагментированный MOV (.mov)"
 Basic.Settings.Output.Format.TT.fmov="Фрагментированные MOV производят запись кусочно и не требуют такой же финализации как традиционные файлы MOV.\nЭто гарантирует, что файл будет проигрываться, даже если запись на диск будет прервана, например, в результате «синего экрана смерти» или потери питания.\n\nМожет быть несовместимо со всеми плеерами и редакторами. При необходимости используйте «Файл→ Перепаковать записи» для преобразования файла в более совместимый формат."
-Basic.Settings.Output.Format.TT.fmp4="Фрагментированные MP4 производят запись кусочно и не требуют такой же финализации как традиционные файлы MP4.\nЭто гарантирует, что файл будет проигрываться, даже если запись на диск будет прервана, например, в результате «синего экрана смерти» или потери питания.\n\nМожет быть несовместимо со всеми плеерами и редакторами. При необходимости используйте «Файл→ Перепаковать записи» для преобразования файла в более совместимый формат."
+Basic.Settings.Output.Format.TT.fmp4="Фрагментированные MP4 производят запись кусочно и не требуют такой же доработки как традиционные файлы MP4.\nЭто гарантирует, что файл будет проигрываться, даже если запись на диск будет прервана, например, в результате «синего экрана смерти» или потери питания.\n\nМожет быть несовместимо со всеми проигрывателями и редакторами. При необходимости используйте «Файл→ Перепаковать записи» для преобразования файла в более совместимый формат."
 Basic.Settings.Output.Encoder.Video="Кодировщик видео"
 Basic.Settings.Output.Encoder.Audio="Кодировщик звука"
 Basic.Settings.Output.SelectDirectory="Выбрать каталог записи"
-Basic.Settings.Output.SelectFile="Выбрать файл записи"
 Basic.Settings.Output.DynamicBitrate="Регулировать битрейт в зависимости от перегруженности сети"
 Basic.Settings.Output.DynamicBitrate.Beta="Регулировать битрейт в зависимости от перегруженности сети (бета)"
 Basic.Settings.Output.DynamicBitrate.TT="Вместо пропуска кадров будет задействовано динамическое изменение битрейта на лету, чтобы уменьшить перегрузку сети.\n\nОбратите внимание, что это может увеличить задержку для зрителей в случае внезапного забивания канала.\nПосле уменьшения битрейта может потребоваться несколько минут для его восстановления.\n\nВ настоящее время поддерживается только для RTMP."
@@ -774,13 +787,13 @@
 Basic.Settings.Output.Mode.FFmpeg="Вывод FFmpeg"
 Basic.Settings.Output.UseReplayBuffer="Включить буфер повтора"
 Basic.Settings.Output.ReplayBuffer.SecondsMax="Максимальная длительность повтора"
-Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимальный объем памяти (МБ)"
-Basic.Settings.Output.ReplayBuffer.Estimate="Расчётное использование памяти: %1 МБ"
-Basic.Settings.Output.ReplayBuffer.EstimateTooLarge="Предупреждение: Предполагаемое использование памяти %1 MiB больше чем рекомендуемый максимум %2 MiB"
-Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Приблизительная оценка расхода памяти невозможна. Пожалуйста, укажите лимит расхода памяти вручную."
+Basic.Settings.Output.ReplayBuffer.MegabytesMax="Максимальный объём памяти (Мб)"
+Basic.Settings.Output.ReplayBuffer.Estimate="Расчётное потребление памяти: %1 МБ"
+Basic.Settings.Output.ReplayBuffer.EstimateTooLarge="Предупреждение: Предполагаемое использование памяти %1 Мб больше чем рекомендуемый максимум - %2 Мб"
+Basic.Settings.Output.ReplayBuffer.EstimateUnknown="Приблизительная оценка расхода памяти невозможна. Пожалуйста, укажите ограничение расхода памяти вручную."
 Basic.Settings.Output.ReplayBuffer.Prefix="Приставка имени файла повтора"
 Basic.Settings.Output.ReplayBuffer.Suffix="Окончание"
-Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Буфер повтора нельзя использовать, если типом записи является Пользовательский вывод (FFmpeg)."
+Basic.Settings.Output.ReplayBuffer.UnavailableCustomFFmpeg="Буфер повтора нельзя использовать, если типом записи является пользовательский вывод (FFmpeg)."
 Basic.Settings.Output.Simple.SavePath="Путь записи"
 Basic.Settings.Output.Simple.RecordingQuality="Качество записи"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="То же, что у трансляции"
@@ -789,10 +802,10 @@
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Без потери качества, чрезвычайно большой размер файла"
 Basic.Settings.Output.Simple.Warn.VideoBitrate="Предупреждение: битрейт потокового видео будет установлен на %1, что является верхним пределом для текущей потоковой службы."
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Предупреждение: битрейт потокового аудио будет установлен на %1, что является верхним пределом для текущей потоковой службы."
-Basic.Settings.Output.Simple.Warn.CannotPause="Предупреждение: Записи не могут быть приостановлены, если кодировщик записи установлен на \"(Использовать кодировщик потока)\"."
-Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Предупреждение: Выбранный в данный момент формат записи несовместим с выбранным потоковым кодеровщиком (кодировщиками)."
-Basic.Settings.Output.Simple.Warn.Encoder="Предупреждение: Запись с программным кодировщиком в качестве, отличным от качества трансляции, потребует дополнительной нагрузки на ЦП, если записывать и транслировать одновременно."
-Basic.Settings.Output.Simple.Warn.Lossless="Предупреждение: Качество без потерь создаёт чрезвычайно большие файлы! Такое качество может использовать свыше 7 гигабайт дискового пространства в минуту при высоком разрешении и частоте кадров. Оно не рекомендуется для долгой записи, если у Вас нет очень много места на диске."
+Basic.Settings.Output.Simple.Warn.CannotPause="Предупреждение: Записи не могут быть приостановлены, если кодировщик записи установлен на «(Использовать кодировщик потока)»."
+Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Предупреждение: Выбранный в данный момент формат записи несовместим с выбранным потоковым кодеровщиком."
+Basic.Settings.Output.Simple.Warn.Encoder="Предупреждение: Запись с программным кодировщиком в качестве, отличным от качества трансляции, потребует дополнительной нагрузки на процессор, если записывать и транслировать одновременно."
+Basic.Settings.Output.Simple.Warn.Lossless="Предупреждение: Качество без потерь создаёт чрезвычайно большие файлы! Такое качество может использовать свыше 7 гигабайт дискового пространства в минуту при высоких разрешении и частоте кадров. Оно не рекомендуется для долгой записи, если у вас нет очень много места на диске."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Уверены, что хотите записывать без потери качества?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Предупреждение о качестве без потерь!"
 Basic.Settings.Output.Simple.Encoder.Software="Программный (x264)"
@@ -811,7 +824,7 @@
 Basic.Settings.Output.Simple.TwitchVodTrack="Дорожка Twitch VOD (использует дорожку 2)"
 Basic.Settings.Output.Simple.RecAudioTrack="Звуковая дорожка"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Несовместимое разрешение или частота кадров"
-Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Эта потоковая служба не поддерживает ваше текущее выходное разрешение и/или частоту кадров. Они будут изменены на наиболее близкое совместимое значение:\n\n%1\n\nВы хотите продолжить?"
+Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="Эта потоковая служба не поддерживает ваше текущее выходное разрешение и/или частоту кадров. Они будут изменены на наиболее близкое совместимое значение:\n\n%1\n\nХотите продолжить?"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="Разрешение: %1"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.FPS="Частота кадров: %1"
 Basic.Settings.Output.Warn.ServiceCodecCompatibility.Title="Несовместимый кодировщик"
@@ -856,7 +869,7 @@
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="В файл"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Общие форматы записи"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Все файлы"
-Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Путь к файлу или URL-адрес"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Путь файла или URL-адрес"
 Basic.Settings.Output.Adv.FFmpeg.Format="Формат контейнера"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Звук"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Видео"
@@ -873,7 +886,7 @@
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Интервал ключевых кадров (кадры)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Показать все кодеки (в т.ч. потенциально несовместимые)"
 Basic.Settings.Output.Adv.FFmpeg.Settings="Настройки FFmpeg"
-Basic.Settings.Output.EnableSplitFile="Автоматическое разбиение файлов"
+Basic.Settings.Output.EnableSplitFile="Авторазбиение на файлы"
 Basic.Settings.Output.SplitFile.TypeTime="Разбивать по времени"
 Basic.Settings.Output.SplitFile.TypeSize="Разбивать по размеру"
 Basic.Settings.Output.SplitFile.TypeManual="Разбивать только вручную"
@@ -926,11 +939,11 @@
 Basic.Settings.Video.Numerator="Числитель"
 Basic.Settings.Video.Denominator="Знаменатель"
 Basic.Settings.Video.Renderer="Отрисовщик"
-Basic.Settings.Video.InvalidResolution="Неверное разрешение. Должно быть ШиринаxВысота (например, 1920x1080)"
-Basic.Settings.Video.CurrentlyActive="Видео выход в данный момент активен. Пожалуйста, отключите все выходы, чтобы изменить настройки видео."
+Basic.Settings.Video.InvalidResolution="Неверное разрешение. Должно быть ширинаxвысота (например, 1920x1080)"
+Basic.Settings.Video.CurrentlyActive="Видео выход запущен. Пожалуйста, отключите все выходы, чтобы изменить настройки видео."
 Basic.Settings.Video.DownscaleFilter.Bilinear="Билинейный (самый быстрый, но размытый при масштабировании)"
 Basic.Settings.Video.DownscaleFilter.Bicubic="Бикубический (чёткое масштабирование, 16 выборок)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Метод Ланцоша (Чёткое масштабирование, 36 выборок)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Метод Ланцоша (чёткое масштабирование, 36 выборок)"
 Basic.Settings.Video.DownscaleFilter.Area="Область (взвешенная сумма, 4/6/9 выборок)"
 Basic.Settings.Audio="Аудио"
 Basic.Settings.Audio.SampleRate="Частота дискретизации"
@@ -943,11 +956,11 @@
 Basic.Settings.Audio.PeakMeterType="Тип измерителя пиков"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Упрощённый"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Точный (повышенное использование ЦП)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ВНИМАНИЕ: Объёмный звук включён."
-Basic.Settings.Audio.MultichannelWarning="При запуске трансляции убедитесь, что ваш сервис потокового вещания поддерживает объёмный звук (как запись, так и воспроизведение). Facebook 360 Live, Mixer RTMP и Smashcast — примеры сервисов, полностью поддерживающих объёмное звучание. Несмотря на то, что Facebook Live и Youtube Live принимают объёмный звук, Facebook Live микширует его в стерео, а Youtube Live воспроизводит только два канала.\n\nЗвуковые фильтры OBS совместимы с объёмным звучанием, хотя поддержка плагинов VST не гарантируется."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ВНИМАНИЕ: Объёмный звук включён."
+Basic.Settings.Audio.MultichannelWarning="При трансляции, удостоверьтесь что ваш стриминговый сервис одновременно поддерживает приём и воспроизведение объёмного звука. Например Facebook 360 Live полностью поддерживает объёмный звук; YouTube Live поддерживает приём звука 5.1 (и его воспроизведение на телевизорах).\n\nOBS аудио фильтры поддерживают объёмный звук, но его поддержка не гарантирована в VST плагинах."
 Basic.Settings.Audio.MultichannelWarning.Title="Включить объёмный звук?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Хотите включить объёмный звук?"
-Basic.Settings.Audio.Devices="Глобальные устройства аудио"
+Basic.Settings.Audio.Devices="Общие устройства аудио"
 Basic.Settings.Audio.DesktopDevice="Звук рабочего стола"
 Basic.Settings.Audio.DesktopDevice2="Звук рабочего стола 2"
 Basic.Settings.Audio.AuxDevice="Микрофон/дополнительный звук"
@@ -991,7 +1004,6 @@
 Basic.Settings.Advanced.FormatWarning="Предупреждение: Цветовые форматы, отличные от NV12/P010, предназначены в первую очередь для записи и не рекомендуются при трансляции. При трансляции может увеличиться загрузка процессора из-за преобразования цветового формата."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Предупреждение: Высокоточные форматы чаще используются с цветовыми пространствами HDR."
 Basic.Settings.Advanced.FormatWarning2100="Предупреждение: Rec. 2100 должен использовать формат с большей точностью."
-Basic.Settings.Advanced.Audio.BufferingTime="Время буферизации аудио"
 Basic.Settings.Advanced.Video.ColorFormat="Цветовой формат"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 бит, 4:2:0, 2 уровня)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 бит, 4:2:0, 3 уровня)"
@@ -1013,13 +1025,14 @@
 Basic.Settings.Advanced.StreamDelay="Задержка потока"
 Basic.Settings.Advanced.StreamDelay.Duration="Длительность"
 Basic.Settings.Advanced.StreamDelay.Preserve="Сохранить точку отсечки (увеличить задержку) при переподключении"
-Basic.Settings.Advanced.StreamDelay.MemoryUsage="Расчётное использование памяти: %1 МБ"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Расчётное потребление памяти: %1 МБ"
 Basic.Settings.Advanced.Network="Сеть"
 Basic.Settings.Advanced.Network.Disabled="Текущий выбранный протокол потокового вещания не поддерживает изменение сетевых настроек."
 Basic.Settings.Advanced.Network.BindToIP="Привязать к IP"
+Basic.Settings.Advanced.Network.IPFamily="Семейство IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Включить сетевую оптимизацию"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Включить прореживание данных (TCP pacing)"
-Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Пытается уменьшить негативный эффект на другие приложения при использовании RTMP-вывода путём регулирования скорости передачи.\nМожет увеличить риск потери кадров при нестабильном соединении."
+Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Пытается уменьшить негативный эффект на другие приложения при использовании вывода RTMP путём регулировки скорости передачи.\nМожет увеличить риск потери кадров при нестабильном соединении."
 Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="Поведение фокуса горячих клавиш"
 Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="Никогда не отключать горячие клавиши"
 Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="Отключать горячие клавиши, когда главное окно в фокусе"
@@ -1030,13 +1043,13 @@
 Basic.AdvAudio.ActiveOnly="Только активные источники"
 Basic.AdvAudio.Name="Название"
 Basic.AdvAudio.Volume="Громкость"
-Basic.AdvAudio.VolumeSource="Громкость звука для '%1'"
+Basic.AdvAudio.VolumeSource="Громкость звука для «%1»"
 Basic.AdvAudio.Mono="Моно"
-Basic.AdvAudio.MonoSource="Смешение в моно для '%1'"
+Basic.AdvAudio.MonoSource="Смешение в моно для «%1»"
 Basic.AdvAudio.Balance="Баланс"
-Basic.AdvAudio.BalanceSource="Баланс для '%1'"
+Basic.AdvAudio.BalanceSource="Баланс для «%1»"
 Basic.AdvAudio.SyncOffset="Смещение синхронизации"
-Basic.AdvAudio.SyncOffsetSource="Синхронизировать смещение для '%1'"
+Basic.AdvAudio.SyncOffsetSource="Синхронизировать смещение для «%1»"
 Basic.AdvAudio.Monitoring="Прослушивание аудио"
 Basic.AdvAudio.Monitoring.None="Отключить прослушивание"
 Basic.AdvAudio.Monitoring.MonitorOnly="Только прослушивание (заглушить вывод)"
@@ -1044,7 +1057,7 @@
 Basic.AdvAudio.MonitoringSource="Прослушивание аудио для «%1»"
 Basic.AdvAudio.AudioTracks="Дорожки"
 Basic.Settings.Hotkeys="Горячие клавиши"
-Basic.Settings.Hotkeys.Pair="Сочетания клавиш вместе с '%1' действуют как переключатели"
+Basic.Settings.Hotkeys.Pair="Сочетания клавиш вместе с «%1» действуют как переключатели"
 Basic.Settings.Hotkeys.Filter="Фильтр"
 Basic.Settings.Hotkeys.FilterByHotkey="Фильтр горячих клавиш"
 Basic.Settings.Hotkeys.DuplicateWarning="Эта горячая клавиша используется одним или несколькими другими действиями, нажмите для отображения конфликтов"
@@ -1059,19 +1072,24 @@
 Hotkeys.End="В конец"
 Hotkeys.PageUp="Предыдущий"
 Hotkeys.PageDown="Следующий"
+Hotkeys.Backspace="←"
+Hotkeys.Tab="↹"
+Hotkeys.Print="Print Screen"
+Hotkeys.Pause="Pause Break"
 Hotkeys.Left="Стрелка влево"
 Hotkeys.Right="Стрелка вправо"
 Hotkeys.Up="Стрелка вверх"
 Hotkeys.Down="Стрелка вниз"
+Hotkeys.Windows="⊞ Win"
 Hotkeys.Menu="Меню"
 Hotkeys.Space="Пробел"
-Hotkeys.NumpadNum="%1 (Цифровая клавиатура)"
-Hotkeys.NumpadMultiply="* (Цифровая клавиатура)"
-Hotkeys.NumpadDivide="/ (Цифровая клавиатура)"
-Hotkeys.NumpadAdd="+ (Цифровая клавиатура)"
-Hotkeys.NumpadSubtract="- (Цифровая клавиатура)"
-Hotkeys.NumpadDecimal=". (Цифровая клавиатура)"
-Hotkeys.MouseButton="Мышь %1"
+Hotkeys.NumpadNum="%1 (циф. кл.)"
+Hotkeys.NumpadMultiply="* (циф. кл.)"
+Hotkeys.NumpadDivide="/ (циф. кл.)"
+Hotkeys.NumpadAdd="+ (циф. кл.)"
+Hotkeys.NumpadSubtract="- (циф. кл.)"
+Hotkeys.NumpadDecimal=". (циф. кл.)"
+Hotkeys.MouseButton="Кнопка мыши %1"
 Mute="Отключить звук"
 Unmute="Включить звук"
 Push-to-mute="Отключать звук по нажатии"
@@ -1079,9 +1097,11 @@
 SceneItemShow="Показать «%1»"
 SceneItemHide="Скрыть «%1»"
 OutputWarnings.NoTracksSelected="Вы должны выбрать хотя бы одну звуковую дорожку"
-OutputWarnings.MP4Recording="Внимание: Записи, сохранённые в MP4/MOV будут нечитаемы, если файл не будет завершён (например, в результате «синего экрана смерти», потери напряжения в сети и т.д.). Если вы хотите записывать несколько аудио дорожек, рассмотрите использование MKV и последующую перепаковку в MP4/MOV по завершении записи (Файл → Перепаковать записи)"
-OutputWarnings.CannotPause="Предупреждение: Записи не могут быть приостановлены, если кодировщик записи установлен на \"(Использовать кодировщик потока)\""
-OutputWarnings.CodecIncompatible="Выборанный кодировщик аудио или видео был сброшен из-за несовместимости. Пожалуйста, выберите совместимый кодировщик из списка."
+OutputWarnings.NoTracksSelectedOnExit.Title="Ошибка настроек вывода"
+OutputWarnings.NoTracksSelectedOnExit.Text="Во всех выводах должна быть выбрана хотя бы одна звуковая дорожка."
+OutputWarnings.MP4Recording="Внимание: Записи, сохранённые в MP4/MOV будут нечитаемы, если файл не будет завершён (например, в результате «синего экрана смерти», или потери питания и т.д.). Если вы хотите записывать несколько аудио дорожек, рассмотрите использование MKV и последующую перепаковку в MP4/MOV по завершении записи (Файл → Перепаковать записи)"
+OutputWarnings.CannotPause="Предупреждение: Записи не могут быть приостановлены, если кодировщик записи установлен на «(Использовать кодировщик потока)»"
+OutputWarnings.CodecIncompatible="Выбранный кодировщик аудио или видео был сброшен из-за несовместимости. Пожалуйста, выберите совместимый кодировщик из списка."
 CodecCompat.Incompatible="(Несовместим с %1)"
 CodecCompat.CodecPlaceholder="Выбрать кодировщик…"
 CodecCompat.ContainerPlaceholder="Выбрать формат…"
@@ -1093,7 +1113,7 @@
 FinalScene.Text="Нельзя удалить последнюю сцену."
 NoSources.Title="Нет источников"
 NoSources.Text="Похоже, вы ещё не добавили ни одного источника. Вы будете выводить только пустой экран. Уверены, что хотите этого?"
-NoSources.Text.AddSource="Вы можете добавить источники, нажав значок «+» под доком Источники в главном окне в любое время."
+NoSources.Text.AddSource="Вы можете добавить источники, нажав значок «+» под доком «Источники» в главном окне в любое время."
 NoSources.Label="У вас нет источников.\nНажмите кнопку + ниже\nили щёлкните правой кнопкой здесь для добавления."
 ChangeBG="Установить цвет"
 CustomColor="Пользовательский цвет"
@@ -1104,6 +1124,7 @@
 About.GetInvolved="Принять участие"
 About.Authors="Авторы"
 About.License="Лицензия"
+About.Error="Ошибка! Файл нельзя прочесть.\n\nПерейти к: %1"
 About.Contribute="Поддержать проект OBS"
 AddUrl.Title="Добавить источник по URL-адресу"
 AddUrl.Text="Вы перетащили URL в OBS. Это автоматически добавит эту ссылку в качестве источника. Продолжить?"
@@ -1119,43 +1140,41 @@
 Importer.Path="Путь коллекции"
 Importer.Program="Обнаруженное приложение"
 Importer.AutomaticCollectionPrompt="Автоматический поиск коллекций сцен"
-Importer.AutomaticCollectionText="OBS может автоматически находить импортируемые коллекции сцен из поддерживаемых сторонних программ. Хотели бы вы, чтобы OBS автоматически находил для вас коллекции?\n\nВы можете изменить это позже в Настройки > Основные > Импортёры."
+Importer.AutomaticCollectionText="OBS может автоматически находить импортируемые коллекции сцен из поддерживаемых сторонних программ. Хотели бы вы, чтобы OBS автоматически находил для вас коллекции?\n\nВы можете изменить это позже в «Настройки > Основные > Импортёры»."
 Restart="Перезапуск"
-NeedsRestart="OBS Studio должен быть перезапущен. Хотите перезапустить сейчас?"
+NeedsRestart="Требуется перезапуск OBS Studio. Хотите перезапустить сейчас?"
 LoadProfileNeedsRestart="Профиль содержит настройки, требующие перезапуска OBS:\n%1\n\nВы хотите перезапустить OBS, чтобы эти настройки вступили в силу?"
 ContextBar.NoSelectedSource="Источник не выбран"
 ContextBar.ResetTransform="Сбросить преобразование"
-ContextBar.FitToCanvas="Подогнать по холсту"
 ContextBar.MediaControls.PlayMedia="Воспроизвести медиа"
 ContextBar.MediaControls.PauseMedia="Приостановить медиа"
 ContextBar.MediaControls.StopMedia="Остановить медиа"
 ContextBar.MediaControls.RestartMedia="Перезапустить медиа"
 ContextBar.MediaControls.PlaylistNext="Следующий в плейлисте"
 ContextBar.MediaControls.PlaylistPrevious="Предыдущий в плейлисте"
-ContextBar.MediaControls.MediaProperties="Свойства медиа"
 ContextBar.MediaControls.BlindSeek="Виджет перемотки медиа"
-YouTube.Auth.Ok="Авторизация успешно завершена.\nТеперь вы можете закрыть эту страницу."
-YouTube.Auth.NoCode="Процесс авторизации не был завершён."
+YouTube.Auth.Ok="Вход успешно завершён.\nТеперь вы можете закрыть эту страницу."
+YouTube.Auth.NoCode="Процесс входа не был завершён."
 YouTube.Auth.NoChannels="Не найдено доступных каналов в выбранном аккаунте"
 YouTube.Auth.WaitingAuth.Title="Авторизация пользователя YouTube"
-YouTube.Auth.WaitingAuth.Text="Пожалуйста, завершите авторизацию во внешнем браузере. Если внешний браузер не открывается, перейдите по этой ссылке и завершите авторизацию: %1"
+YouTube.Auth.WaitingAuth.Text="Пожалуйста, завершите вход во внешнем браузере. Если внешний браузер не открывается, перейдите по этой ссылке и завершите вход: %1"
 YouTube.AuthError.Text="Не удалось получить информацию о канале: %1."
 YouTube.Actions.WindowTitle="Настройка трансляции YouTube - Канал: %1"
-YouTube.Actions.CreateNewEvent="Создать новую Трансляцию"
+YouTube.Actions.CreateNewEvent="Создать новую трансляцию"
 YouTube.Actions.ChooseEvent="Выбрать существующую трансляцию"
 YouTube.Actions.Title="Название*"
 YouTube.Actions.MyBroadcast="Моя трансляция"
 YouTube.Actions.Description="Описание"
 YouTube.Actions.Privacy="Конфиденциальность*"
-YouTube.Actions.Privacy.Private="Приватное"
+YouTube.Actions.Privacy.Private="Закрытое"
 YouTube.Actions.Privacy.Public="Видно всем (публичное)"
 YouTube.Actions.Privacy.Unlisted="Доступ по ссылке (Unlisted)"
 YouTube.Actions.Category="Категория"
-YouTube.Actions.Thumbnail="Заставка"
+YouTube.Actions.Thumbnail="Миниатюра"
 YouTube.Actions.Thumbnail.SelectFile="Выбрать файл..."
 YouTube.Actions.Thumbnail.NoFileSelected="Файл не выбран"
 YouTube.Actions.Thumbnail.ClearFile="Очистить"
-YouTube.Actions.MadeForKids="Пометить трансляцию как сделанную \"для детей\"?"
+YouTube.Actions.MadeForKids="Это видео предназначено для детей?*"
 YouTube.Actions.MadeForKids.Yes="Да, это сделано для детей"
 YouTube.Actions.MadeForKids.No="Нет, это не для детей"
 YouTube.Actions.AdditionalSettings="Дополнительные настройки"
@@ -1167,38 +1186,38 @@
 YouTube.Actions.EnableAutoStop="Включить автоостановку"
 YouTube.Actions.AutoStartStop.TT="Указывает, должна ли эта запланированная трансляция запускаться автоматически"
 YouTube.Actions.EnableDVR="Включить DVR"
-YouTube.Actions.360Video="360 видео"
+YouTube.Actions.360Video="Панорамное видео 360°"
 YouTube.Actions.ScheduleForLater="Запланировать на потом"
 YouTube.Actions.RememberSettings="Запомнить эти настройки"
 YouTube.Actions.Create_Ready="Создать трансляцию"
-YouTube.Actions.Create_GoLive="Создать трансляцию, и начать Прямой эфир"
+YouTube.Actions.Create_GoLive="Создать трансляцию и начать эфир"
 YouTube.Actions.Choose_Ready="Выбрать трансляцию"
-YouTube.Actions.Choose_GoLive="Выбрать трансляцию, и начать Прямой эфир"
+YouTube.Actions.Choose_GoLive="Выбрать трансляцию и начать эфир"
 YouTube.Actions.Create_Schedule="Запланировать трансляцию"
-YouTube.Actions.Create_Schedule_Ready="Запланировать и выбрать трансляцию"
+YouTube.Actions.Create_Schedule_Ready="Назначить и выбрать трансляцию"
 YouTube.Actions.Dashboard="Открыть YouTube Studio"
 YouTube.Actions.Error.Title="Ошибка создания трансляции"
-YouTube.Actions.Error.Text="Ошибка доступа к YouTube '%1'. Подробное описание ошибки можно найти на <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
+YouTube.Actions.Error.Text="Ошибка доступа к YouTube «%1». Подробное описание ошибки можно найти на <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.General="Нет доступа к YouTube. Пожалуйста, проверьте подключение к сети или доступ к серверу YouTube."
-YouTube.Actions.Error.NoBroadcastCreated="Ошибка создания трансляции '%1'. Подробное описание ошибки можно найти на <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
+YouTube.Actions.Error.NoBroadcastCreated="Ошибка создания трансляции «%1». Подробное описание ошибки можно найти на <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.NoStreamCreated="Не удалось создать трансляцию. Пожалуйста, отсоедините и повторно присоедините свой аккаунт."
 YouTube.Actions.Error.YouTubeApi="Ошибка YouTube API. Более подробную информацию см. в файле журнала."
 YouTube.Actions.Error.BroadcastNotFound="Выбранная трансляция не найдена."
 YouTube.Actions.Error.FileMissing="Выбранный файл не существует."
 YouTube.Actions.Error.FileOpeningFailed="Не удалось открыть выбранный файл."
-YouTube.Actions.Error.FileTooLarge="Выбранный файл слишком большой (лимит: 2 МБ)."
-YouTube.Actions.Error.BroadcastTransitionFailed="Переход трансляции не удалось: %1 Если ошибка повторяется <a href='https://studio.youtube.com/video/%2/livestreaming'>откройте трансляцию в YouTube Studio</a> и попробуйте вручную."
-YouTube.Actions.Error.BroadcastTestStarting="Трансляция переходит к тестовому этапу, это может занять некоторое время. Пожалуйста, попробуйте снова через 10-30 секунд."
+YouTube.Actions.Error.FileTooLarge="Выбранный файл слишком большой (лимит: 2 Мб)."
+YouTube.Actions.Error.BroadcastTransitionFailed="Переход трансляции не удался: %1 Если ошибка повторится <a href='https://studio.youtube.com/video/%2/livestreaming'>откройте трансляцию в YouTube Studio</a> и попробуйте вручную."
+YouTube.Actions.Error.BroadcastTestStarting="Трансляция переходит к проверочному этапу, это может занять некоторое время. Пожалуйста, попробуйте снова через 10-30 секунд."
 YouTube.Actions.EventsLoading="Загрузка списка событий..."
 YouTube.Actions.EventCreated.Title="Событие создано"
 YouTube.Actions.EventCreated.Text="Событие успешно создано."
 YouTube.Actions.Stream="Трансляция"
 YouTube.Actions.Stream.ScheduledFor="Запланировано на %1"
 YouTube.Actions.Stream.Resume="Возобновить прерванный поток"
-YouTube.Actions.Stream.YTStudio="Автоматически создано YouTube Studio"
+YouTube.Actions.Stream.YTStudio="Создано автоматически YouTube Studio"
 YouTube.Actions.Notify.CreatingBroadcast="Создаётся новая трансляция. Пожалуйста, подождите..."
 YouTube.Actions.AutoStartStreamingWarning.Title="Требуется запустить вручную"
-YouTube.Actions.AutoStartStreamingWarning="Автозапуск отключён для этого события, нажмите \"Прямой эфир\", чтобы начать трансляцию."
+YouTube.Actions.AutoStartStreamingWarning="Автозапуск отключён для этого события, нажмите «Выйти в эфир», чтобы начать трансляцию."
 YouTube.Actions.AutoStopStreamingWarning="Вы не сможете переподключиться. Ваша прямая трансляция будет прекращена."
 YouTube.Chat.Input.Send="Отправить"
 YouTube.Chat.Input.Placeholder="Введите сообщение здесь..."
@@ -1207,10 +1226,12 @@
 YouTube.Chat.Error.Text="Не удалось отправить сообщение: %1"
 YouTube.Errors.liveStreamingNotEnabled="Прямые эфиры отключены для данного канала YouTube. Смотрите <a href='https://www.youtube.com/features'>youtube.com/features</a> для подробной информации."
 YouTube.Errors.livePermissionBlocked="Прямая трансляция недоступна на выбранном канале YouTube. Пожалуйста, обратите внимание, что может потребоваться до 24 часов для того, чтобы прямые трансляции стали доступны после их включения в настройках канала. Смотрите <a href='https://www.youtube.com/features'>youtube.com/features</a> для подробностей."
-YouTube.Errors.errorExecutingTransition="Не удалось выполнить переход из-за ошибки бэкенда. Пожалуйста, повторите попытку через несколько секунд."
+YouTube.Errors.errorExecutingTransition="Не удалось выполнить переход из-за внутренней ошибки. Пожалуйста, повторите попытку через несколько секунд."
 YouTube.Errors.errorStreamInactive="YouTube не получает данные для вашего потока. Пожалуйста, проверьте настройки и повторите попытку."
 YouTube.Errors.invalidTransition="Попытка перехода была недействительной. Это может произойти из-за потока, не завершившего предыдущий переход. Пожалуйста, подождите несколько секунд и повторите попытку."
-YouTube.Errors.liveChatDisabled="Онлайн-чат отключён в этой трансляции."
+YouTube.Errors.liveChatDisabled="Чат отключён в этой трансляции."
 YouTube.Errors.liveChatEnded="Прямой эфир завершён."
 YouTube.Errors.messageTextInvalid="Недопустимый текст сообщения."
 YouTube.Errors.rateLimitExceeded="Вы отправляете сообщения слишком быстро."
+YouTube.DocksRemoval.Title="Убрать устаревшие доки браузера YouTube"
+YouTube.DocksRemoval.Text="Эти доки браузера будут удалены как устаревшие:\n\n%1\nИспользуйте вместо них «Доки / Комнату управления эфиром YouTube»."

obs-studio-29.1.3.tar.xz/UI/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/si-LK.ini Changed

@@ -43,7 +43,7 @@
 UnhideAll="සියල්ල නොසඟවන්න"
 Untitled="සිරැසිය නැත"
 New="නව"
-Duplicate="අනුපිටපත්"
+Duplicate="අනුපිටපතක්"
 Enable="සබල කරන්න"
 DisableOSXVSync="මැක්ඕඑස් V-Sync අබල කරන්න"
 ResetOSXVSyncOnExit="පිටවීමේදී මැක්ඕඑස් V-Sync යළි සකසන්න"
@@ -62,16 +62,15 @@
 ReplayBuffer="අන්තරාචය යළි වාදනය"
 Import="ආයාත කරන්න"
 Export="නිර්යාත කරන්න"
-Copy="පිටපත්"
+Copy="පිටපතක්"
 Paste="අලවන්න"
 PasteReference="අලවන්න (යොමුව)"
 PasteDuplicate="අලවන්න (අනුපිටපත)"
-RemuxRecordings="මිශ්‍රක පටිගත කිරීම්"
 Next="ඊළඟ"
 Back="ආපසු"
 Defaults="පෙරනිමි"
 RestoreDefaults="පෙරනිමි"
-HideMixer="මිශ්‍රකය සඟවන්න"
+HideMixer="මිශ්‍රකයේ සඟවන්න"
 TransitionOverride="සංක්‍රාන්තිය අභිබවීම"
 ShowTransition="සංක්‍රාන්තිය පෙන්වන්න"
 HideTransition="සංක්‍රාන්තිය සඟවන්න"
@@ -94,7 +93,6 @@
 LogViewer="සටහන් දක්වනය"
 ShowOnStartup="ආරම්භයේදී පෙන්වන්න"
 OpenFile="ගොනුව අරින්න"
-AddValue="%1එක්කරන්න"
 AddSource="මූලාශ්‍රය යොදන්න"
 RemoveScene="තේරූ සිද්ධිය ඉවතලන්න"
 RemoveSource="තේරූ මූලාශ්‍ර(ය) ඉවතලන්න"
@@ -105,12 +103,17 @@
 SourceProperties="විවෘත මූලාශ්‍ර ගුණාංග"
 SourceFilters="විවෘත මූලාශ්‍ර පෙරහන්"
 MixerToolbarMenu="හඬ මිශ්‍රක වට්ටෝරුව"
+SceneFilters="සිද්ධි පෙරහන් අරින්න"
 PluginsFailedToLoad.Title="පේනුව පූරණ දෝෂයකි"
 AlreadyRunning.Title="ඕබීඑස් දැනටමත් ධාවනය වෙමින්"
 AlreadyRunning.Text="ඕබීඑස් දැනටමත් ක්‍රියාත්මකයි! මෙය ඔබගේ අදහසක් නම් මිස, නව එකක් ධාවනයට පෙර අනෙකුත් පවතින ඒවා වසා දමන්න. පද්ධතියේ තැටියට හැකිළීම සඳහා ඕබීඑස් සකසා තිබේ නම්, තවමත් එහි ක්‍රියාත්මක දැයි පරීක්‍ෂා කරන්න."
 AlreadyRunning.LaunchAnyway="දියත් කරන්න"
 ChromeOS.Title="සහාය නොදක්වන වේදිකාවකි"
 Wine.Title="වයින් අනාවරණය විය"
+DockCloseWarning.Title="තටාකගත කවුළුව වැසීම"
+DockCloseWarning.Text="ඔබ තටාකගත කවුළුවක් වසා ඇත. එය නැවත දැකීමට කැමති නම්, වට්ටෝරු තීරුවේ තිබෙන තටාක බොත්තම් භාවිතා කරන්න."
+ExtraBrowsers="අභිරුචි අතිරික්සු තටාක"
+ExtraBrowsers.Info="නමක් සහ ඒ.ස.නි. යෙදීමෙන් තටාක එකතු කරන්න. ඉන්පසුව, තටාක ඇරීමට යොදන්න හෝ වසන්න ඔබන්න. ඔබට ඕනෑම වේලාවක තටාක එකතු කිරීමට හෝ ඉවත් කිරීමට හැකිය."
 ExtraBrowsers.DockName="තටාකයේ නම"
 Auth.Authing.Title="සත්‍යාපනය වෙමින්..."
 Auth.Authing.Text="%1 සමඟ සත්‍යාපනය වෙමින්, රැඳී සිටින්න..."
@@ -130,7 +133,7 @@
 TwitchAuth.TwoFactorFail.Title="ප්‍රචාර යතුර විමසීමට නොහැකි විය"
 TwitchAuth.TwoFactorFail.Text="ඔබගේ ට්විච් ගිණුමට සම්බන්ධ වීමට ඕබීඑස් සඳහා නොහැකි විය. ඔබගේ <a href='https://www.twitch.tv/settings/security'>ට්ව්ච් ආරක්‍ෂණ සැකසුම්</a> තුළ ද්වි-සාධක සත්‍යාපනය පිහිටුවා ඇති බවට වග බලා ගන්න. මෙය ප්‍රචාරය සඳහා අවශ්‍යයි."
 RestreamAuth.Channels="රීස්ට්‍රීම් නාලිකා"
-Copy.Filters="පෙරහන් පිටපත්"
+Copy.Filters="පෙරහන් පිටපතක්"
 Paste.Filters="පෙරහන් අලවන්න"
 BrowserPanelInit.Title="අතිරික්සුව අරඹමින්..."
 BrowserPanelInit.Text="අතිරික්සුව අරඹමින්, රැඳී සිටින්න..."
@@ -145,7 +148,7 @@
 Basic.AutoConfig.StartPage.SubTitle="මෙම වැඩසටහනෙහි භාවිතය දක්වන්න"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="ප්‍රචාරයට ප්‍රශස්තිකරණය, පටිගත කිරීම දෙවනුව"
 Basic.AutoConfig.StartPage.PrioritizeRecording="පටිගත කිරීමට ප්‍රශස්තිකරණය, ප්‍රචාර දෑ නොකරමි"
-Basic.AutoConfig.StartPage.PrioritizeVirtualCam="අතථ්‍ය කැමරාවට පමණක් භාවිතා කරමි"
+Basic.AutoConfig.StartPage.PrioritizeVirtualCam="අතථ්‍ය රූගතයට පමණක් භාවිතා කරමි"
 Basic.AutoConfig.VideoPage="දෘශ්‍යයක සැකසුම්"
 Basic.AutoConfig.VideoPage.SubTitle="ඔබ භාවිතයට කැමති දෘශ්‍ය සැකසුම් දක්වන්න"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="වත්මන් භාවිතය (%1x%2)"
@@ -168,7 +171,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="අභිරුචි..."
 Basic.AutoConfig.StreamPage.Server="සේවාදායකය"
 Basic.AutoConfig.StreamPage.StreamKey="ප්‍රචාර යතුර"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(සබැඳිය)"
 Basic.AutoConfig.StreamPage.EncoderKey="ආකේතක යතුර"
 Basic.AutoConfig.StreamPage.ConnectedAccount="සම්බන්ධිත ගිණුම"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="දෘඩාංග ආකේතනයට ප්‍රියයි"
@@ -197,7 +199,7 @@
 Basic.Stats.MissedFrames="විදහාපෑම පමාව නිසා මඟහැරුණු රාමු"
 Basic.Stats.Output.Stream="ප්‍රචාරය"
 Basic.Stats.Output.Recording="පටිගතය"
-Basic.Stats.Status="තත්වය"
+Basic.Stats.Status="තත්‍වය"
 Basic.Stats.Status.Recording="පටිගත වෙමින්"
 Basic.Stats.Status.Live="සජීව"
 Basic.Stats.Status.Reconnecting="යළි සම්බන්ධ වෙමින්"
@@ -214,23 +216,21 @@
 Updater.UpdateNow="යාවත්කාල කරන්න"
 Updater.RemindMeLater="පසුව මතක් කරන්න"
 Updater.Skip="අනුවාදය මඟහරින්න"
-Updater.Running.Title="දැනට ක්‍රියාත්මක වැඩසටහන්"
-Updater.Running.Text="ප්‍රතිදාන දැනට සක්‍රියයි, යාවත්කාල කිරීමට තැත් කිරීමට පෙර සියළුම සක්‍රිය ප්‍රතිදාන වසන්න"
 Updater.NoUpdatesAvailable.Title="යාවත්කාල නැත"
 Updater.NoUpdatesAvailable.Text="දැනට යාවත්කාල නැත"
 Updater.FailedToLaunch="යාවත්කාලය දියත්කිරීමට අසමත්!"
 QuickTransitions.DuplicateScene="සිද්ධියේ අනුපිටපත"
-QuickTransitions.EditProperties="මූලාශ්‍ර අනුපිටපත්"
+QuickTransitions.EditProperties="මූලාශ්‍ර අනුපිටපතක්"
 QuickTransitions.HotkeyName="ඉක්මන් සංක්‍රාන්තිය: %1"
 Basic.AddTransition="වින්‍යාසගත කළ හැකි සංක්‍රාන්තිය"
 Basic.RemoveTransition="වින්‍යාසගත කළ හැකි සංක්‍රාන්තිය ඉවතලන්න"
 Basic.TransitionProperties="සංක්‍රාන්ති ගුණාංග"
 Basic.SceneTransitions="සිද්ධියේ සංක්‍රාන්ති"
 Basic.TransitionDuration="පරාසය"
-Basic.TogglePreviewProgramMode="මැදිරිය ආකාරය"
+Basic.TogglePreviewProgramMode="මැදිරිය ප්‍රකාරය"
 Undo.Undo="පෙරසේ"
 Undo.Redo="පසුසේ"
-Undo.Add="'%1' එක්කරන්න"
+Undo.Add="'%1' එක් කරන්න"
 Undo.Delete="'%1' මකන්න"
 Undo.Rename="'%1' ලෙස නම් කිරීම"
 Undo.SceneCollection.Switch="'%1' වෙත මාරුවන්න"
@@ -254,7 +254,7 @@
 Undo.Balance.Change="'%1' හි හඬ සංතුලනය වෙනස් කිරීම"
 Undo.MonitoringType.Change="'%1' හි හඬ නිරීක්‍ෂණය වෙනස් කිරීම"
 Undo.Mixers.Change="'%1' හි හඬ මිශ්‍රණය වෙනස් කිරීම"
-Undo.Scene.Duplicate="සිද්ධියේ අනුපිටපත් '%1'"
+Undo.Scene.Duplicate="'%1' සිද්ධියේ අනුපිටපතක්"
 Undo.ShowTransition="'%1' හි සංක්‍රාන්තිය පෙන්වන්න"
 Undo.HideTransition="'%1' හි සංක්‍රාන්තිය සැඟවීම"
 Undo.ShowSceneItem="'%2' හි '%1' පෙන්වීම"
@@ -286,9 +286,11 @@
 ConfirmRemove.Title="ඉවතලීම තහවුරුව"
 ConfirmRemove.Text="'%1' ඉවත් කිරීමට වුවමනා ද?"
 ConfirmRemove.TextMultiple="අංග %1 ක් ඉවත් කිරීමට වුවමනා ද?"
+ConfirmReset.Title="ගුණාංග යළි සකසන්න"
 Output.StartStreamFailed="ප්‍රචාරය ඇරඹීමට අසමත්!"
 Output.StartRecordingFailed="පටිගතය ඇරඹීමට අසමත්!"
 Output.StartReplayFailed="අන්තරාචය යළි ධාවනය ඇරඹීමට අසමත්"
+Output.StartVirtualCamFailed="අතථ්‍ය රූගතය ඇරඹීමට අසමත් විය"
 Output.StartFailedGeneric="ප්‍රතිදානය ඇරඹීමට අසමත් විය. විස්තර සඳහා සටහන බලන්න.\n\nඅමතර: ඔබ NVENC හෝ AMD ආකේතක භාවිතා කරන්නේ නම්, ඔබගේ දෘශ්‍ය ධාවක යාවත්කාලීන දැයි බලන්න."
 Output.ReplayBuffer.PauseWarning.Title="විරාමයකදී යළි ධාවන සුරැකීමට නොහැකිය"
 Output.ReplayBuffer.PauseWarning.Text="අවවාදයයි: පටිගත විරාමයකදී යළි ධාවන සුරැකීමට නොහැකිය."
@@ -300,7 +302,6 @@
 Output.ConnectFail.Disconnected="සේවාදායකයෙන් විසන්ධි විය."
 Output.StreamEncodeError.Title="ආකේතන දෝෂයකි"
 Output.StreamEncodeError.Msg="ප්‍රචාරය අතරතුර ආකේතන දෝෂයක් සිදුවිය."
-Output.StreamEncodeError.Msg.LastError="ප්‍රචාරය අතරතුර ආකේතන දෝෂයක් සිදුවිය:\n\n%1"
 Output.RecordFail.Title="පටිගතය ඇරඹීමට අසමත් විය"
 Output.RecordFail.Unsupported="ප්‍රතිදාන ආකෘතියට සහාය නොදක්වයි හෝ තනි ශ්‍රව්‍ය පථයකට වඩා සහාය නොදක්වයි. ඔබගේ සැකසුම් පරීක්‍ෂා කර නැවත උත්සාහ කරන්න."
 Output.RecordNoSpace.Title="ප්‍රමාණවත් ඉඩක් තැටියේ නැත"
@@ -308,7 +309,6 @@
 Output.RecordError.Title="පටිගත වීමේ දෝෂයකි"
 Output.RecordError.Msg="පටිගත කිරීමේදී අවිනිශ්චිත දෝෂයක් සිදුවිය."
 Output.RecordError.EncodeErrorMsg="පටිගත කිරීමේදී ආකේතන දෝෂයක් සිදුවිය."
-Output.RecordError.EncodeErrorMsg.LastError="පටිගත කිරීමේදී ආකේතන දෝෂයක් සිදුවිය:\n\n%1"
 Output.BadPath.Title="නරක ගොනු මාර්ගයකි"
 Output.BadPath.Text="වින්‍යාසගත පටිගත කිරීමේ මාර්ගය විවෘත කළ නොහැකිය. සැකසුම් → ප්‍රතිදානය → පටිගත යටතේ ඔබගේ පටිගත කිරීමේ මාර්ගය පරීක්‍ෂා කරන්න."
 Output.NoBroadcast.Title="විකාශනයක් වින්‍යාස කර නැත"
@@ -318,19 +318,14 @@
 LogReturnDialog="සටහන උඩුගත කෙරිණි"
 LogReturnDialog.Description="සටහන් ගොනුව උඩුගත කර ඇත. නිදොස්කරණය හෝ සහාය අරමුණු සඳහා දැන් ඒ.ස.නි. බෙදා ගත හැකිය."
 LogReturnDialog.Description.Crash="බිඳවැටීමේ වාර්තාව උඩුගත කර ඇත. නිදොස්කරණ අරමුණු සඳහා දැන් ඒ.ස.නි. බෙදා ගත හැකිය."
-LogReturnDialog.CopyURL="ඒ.ස.නි. පිටපත්"
+LogReturnDialog.CopyURL="ඒ.ස.නි. පිටපතක්"
 LogReturnDialog.AnalyzeURL="විශ්ලේෂණය"
 LogReturnDialog.ErrorUploadingLog="සටහන් ගොනුව උඩුගත වීමේ දෝෂයකි"
 Remux.SourceFile="ඕබීඑස් පටිගතය"
 Remux.TargetFile="ඉලක්කගත ගොනුව"
-Remux.Remux="මිශ්‍රණය"
-Remux.Stop="මිශ්‍රණය නවතන්න"
 Remux.ClearFinished="නිමවූ අංග මකන්න"
 Remux.ClearAll="සියළු අංග මකන්න"
 Remux.OBSRecording="ඕබීඑස් පටිගතය"
-Remux.FinishedTitle="මිශ්‍රණය නිමා විය"
-Remux.Finished="පටිගතය මිශ්‍රණය විය"
-Remux.FinishedError="පටිගතය මිශ්‍ර කෙරිණි, නමුත් ගොනුව අසම්පූර්ණ විය හැකිය"
 Remux.SelectRecording="ඕබීඑස් පටිගත තෝරන්න..."
 Remux.SelectTarget="ඉලක්කගත ගොනුව තෝරන්න..."
 Remux.FileExistsTitle="ඉලක්කගත ගොනු පවතී"
@@ -353,16 +348,17 @@
 MissingFiles.AutoSearchText="නාමාවලියෙහි දක්නට නොලත් ගොනු සඳහා අතිරේක ගැළපීම් හමු වී ඇත. ඔබ ඒවා එකතු කිරීමට කැමතිද?"
 MissingFiles.NoMissing.Title="මඟහැරුණු ගොනු පරීක්‍ෂාව"
 MissingFiles.NoMissing.Text="ගොනු අස්ථානගත වී නැති සෙයකි."
+MacPermissions.MenuAction="යෙදුමේ අවසර සමාලෝචනය..."
 MacPermissions.Title="යෙදුමේ අවසර සමාලෝචනය"
+MacPermissions.AccessGranted="ප්‍රවේශය ප්‍රදානය කර ඇත"
 MacPermissions.RequestAccess="ප්‍රවේශය ඉල්ලන්න"
 MacPermissions.OpenPreferences="%1 අභිප්‍රේත අරින්න"
 MacPermissions.Item.ScreenRecording="තිරය පටිගතය"
 MacPermissions.Item.Camera="රූගතය"
 MacPermissions.Item.Microphone="ශබ්දවාහිනිය"
 MacPermissions.Item.Accessibility="ප්‍රවේශ්‍යතාව"
+MacPermissions.Item.Accessibility.Details="වෙනත් යෙදුම් වලට නාභිගතව තිබෙන අතරතුර යතුරුපුවරු කෙටිමං (උණුයතුරු) වැඩ කිරීමට, කරුණාකර මෙම අවසරය සබල කරන්න."
 MacPermissions.Continue="ඉදිරියට"
-UpdateAvailable="නව යාවත්කාලයක් තිබේ"
-UpdateAvailable.Text="අනුවාදය %1.%2.%3 දැන් තිබේ. <a href='%4'>බාගැනීමට මෙතන ඔබන්න</a>"
 Basic.DesktopDevice1="වැඩතලයේ හඬ"
 Basic.DesktopDevice2="වැඩතලයේ හඬ 2"
 Basic.Scene="සිද්ධිය"
@@ -383,13 +379,14 @@
 Deinterlacing.BottomFieldFirst="පහළ ක්‍ෂේත්‍රය පළමුව"
 VolControl.Mute="'%1' නිහඬව"
 VolControl.Properties="'%1' සඳහා ගුණාංග"
+VolControl.UnassignedWarning.Text="කිසිදු ශ්‍රව්‍ය පථයකට \"%1\" පවරා නැති අතර එය ප්‍රචාර හෝ පටිගත වලදී නොඇසෙනු ඇත. \n\nපථයකට ශ්‍රව්‍ය මූලාශ්‍රයක් පැවරීමට, දකුණ එබීමෙන් ලැබෙන වට්ටෝරුවෙන් හෝ මිශ්‍රක තටාකයේ මෙවලම් තීරුවේ තිබෙන දැති බොත්තම හරහා වැඩිදුර ශ්‍රව්‍ය ගුණාංග විවෘත කරන්න."
 Basic.Main.AddSceneDlg.Title="සිද්ධියක් යොදන්න"
 Basic.Main.AddSceneDlg.Text="සිද්ධියෙහි නම ඇතුල් කරන්න"
 Basic.Main.DefaultSceneName.Text="සිද්ධිය %1"
 Basic.Main.AddSceneCollection.Title="සිද්ධි එකතුව යොදන්න"
 Basic.Main.AddSceneCollection.Text="සිද්ධි එකතුවේ නම ඇතුල් කරන්න"
 Basic.Main.RenameSceneCollection.Title="සිද්ධි එකතුව යළි නම් කිරීම"
-AddProfile.Title="පැතිකඩ එක්කරන්න"
+AddProfile.Title="පැතිකඩක් එක් කරන්න"
 AddProfile.Text="පැතිකඩෙහි නම ඇතුල් කරන්න"
 AddProfile.WizardCheckbox="ස්වයං වින්‍යාසකරනය පෙන්වන්න"
 RenameProfile.Title="පැතිකඩ නම් කරන්න"
@@ -486,7 +483,7 @@
 Basic.Main.SaveReplay="යළි වාදනය සුරකින්න"
 Basic.Main.StartStreaming="ප්‍රචාරය අරඹන්න"
 Basic.Main.StartBroadcast="සජීව යන්න"
-Basic.Main.StartVirtualCam="අතථ්‍ය කැමරාව අරඹන්න"
+Basic.Main.StartVirtualCam="අතථ්‍ය රූගතය අරඹන්න"
 Basic.Main.StopRecording="පටිගත කිරීම නවතන්න"
 Basic.Main.PauseRecording="පටිගතය විරාමය"
 Basic.Main.UnpauseRecording="පටිගත කිරීම නැවතත්"
@@ -501,88 +498,91 @@
 Basic.Main.ForceStopStreaming="ප්‍රචාරය නවතන්න (ප්‍රමාදය ඉවතට)"
 Basic.Main.ShowContextBar="මූලාශ්‍ර මෙවලම් පෙන්වන්න"
 Basic.Main.HideContextBar="මූලාශ්‍ර මෙවලම් සඟවන්න"
-Basic.Main.StopVirtualCam="අතථ්‍ය කැමරාව නවතන්න"
+Basic.Main.StopVirtualCam="අතථ්‍ය රූගතය නවතන්න"
 Basic.Main.Group="සමූහය %1"
 Basic.Main.GroupItems="තේරූ අංග සමූහනය"
 Basic.Main.Ungroup="අසමූහනය"
-Basic.Main.GridMode="කොටු ආකාරය"
-Basic.Main.ListMode="ලේඛන ආකාරය"
+Basic.Main.GridMode="කොටු ප්‍රකාරය"
+Basic.Main.ListMode="ලේඛන ප්‍රකාරය"
+Basic.Main.VirtualCamConfig="අතථය රූගතය සකසන්න"
+Basic.VCam.VirtualCamera="අතථ්‍ය රූගතය"
 Basic.VCam.OutputType="ප්‍රතිදාන වර්ගය"
 Basic.VCam.OutputSelection="ප්‍රතිදාන තේරීම"
-Basic.VCam.Internal="අභ්‍යන්තර"
-Basic.VCam.InternalDefault="වැඩසටහනේ ප්‍රතිදානය (පෙරනිමි)"
-Basic.VCam.InternalPreview="පෙරදසුනේ ප්‍රතිදානය"
-Basic.MainMenu.File="&ගොනුව"
-Basic.MainMenu.File.Export="&නිර්යාතය"
-Basic.MainMenu.File.Import="&ආයාතය"
-Basic.MainMenu.File.ShowRecordings="පටිගත කිරීම් &පෙන්වන්න"
-Basic.MainMenu.File.Remux="මිශ්‍රක පටිගත කිරීම්"
-Basic.MainMenu.File.Settings="&සැකසුම්"
+Basic.VCam.OutputType.Program="වැඩසටහන (පෙරනිමි)"
+Basic.VCam.OutputSelection.NoSelection="මෙම ප්‍රතිදානය සඳහා තේරීමක් නැත"
+Basic.MainMenu.File="ගොනුව (&F)"
+Basic.MainMenu.File.Export="නිර්යාතය (&E)"
+Basic.MainMenu.File.Import="ආයාතය (&I)"
+Basic.MainMenu.File.ShowRecordings="පටිගතයන් පෙන්වන්න (&R)"
+Basic.MainMenu.File.Settings="සැකසුම් (&S)"
 Basic.MainMenu.File.ShowSettingsFolder="සැකසුම් බහාලුම පෙන්වන්න"
 Basic.MainMenu.File.ShowProfileFolder="පැතිකඩ බහාලුම පෙන්වන්න"
 Basic.MainMenu.File.ShowMissingFiles="නැතිවූ ගොනු සොයා බලන්න"
-Basic.MainMenu.File.Exit="පි&ටවන්න"
-Basic.MainMenu.Edit="&සංස්කරණය"
+Basic.MainMenu.File.Exit="පිටවන්න"
+Basic.MainMenu.Edit="සංස්කරණය"
 Basic.MainMenu.Edit.Undo="&පෙරසේ"
 Basic.MainMenu.Edit.Redo="&පසුසේ"
-Basic.MainMenu.Edit.LockPreview="&පෙරදසුන අගුළුලෑම"
-Basic.MainMenu.Edit.Scale="පෙරදසුන පරිමාණනය"
+Basic.MainMenu.Edit.LockPreview="පෙරදසුන අගුළු ලන්න (&L)"
+Basic.MainMenu.Edit.Scale="පෙරදසුන පරිමාණනය (&S)"
 Basic.MainMenu.Edit.Scale.Window="කවුළුවට පරිමාණනය"
 Basic.MainMenu.Edit.Scale.Output="ප්‍රතිදානය (%1x%2)"
-Basic.MainMenu.Edit.Transform="&රූපාන්තරය"
-Basic.MainMenu.Edit.Transform.EditTransform="&රූපාන්තරය සංශෝධනය..."
+Basic.MainMenu.Edit.Transform="රූපාන්තරය (&T)"
+Basic.MainMenu.Edit.Transform.EditTransform="රූපාන්තරය සංශෝධනය"
 Basic.MainMenu.Edit.Transform.CopyTransform="රූපාන්තරයේ පිටපතක්"
 Basic.MainMenu.Edit.Transform.PasteTransform="රූපාන්තරය අලවන්න"
-Basic.MainMenu.Edit.Transform.ResetTransform="&රූපාන්තරය යළි සැකසීම"
+Basic.MainMenu.Edit.Transform.ResetTransform="රූපාන්තරය යළි සකසන්න"
 Basic.MainMenu.Edit.Transform.Rotate90CW="90° ක් කරකවන්න (විරු.)"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="90°ක් කරකවන්න (ඔර.විරු.)"
 Basic.MainMenu.Edit.Transform.Rotate180="180° කරකවන්න"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="තිරස්ව &පෙරළන්න"
-Basic.MainMenu.Edit.Transform.FlipVertical="සිරස්ව &පෙරළන්න"
-Basic.MainMenu.Edit.Transform.FitToScreen="&තිරයට ගළපන්න"
-Basic.MainMenu.Edit.Transform.StretchToScreen="&තිරයට පතුරන්න"
-Basic.MainMenu.Edit.Transform.CenterToScreen="&තිරය මැදට"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="තිරස්ව පෙරළන්න (&H)"
+Basic.MainMenu.Edit.Transform.FlipVertical="සිරස්ව පෙරළන්න (&V)"
+Basic.MainMenu.Edit.Transform.FitToScreen="තිරයට ගළපන්න (&F)"
+Basic.MainMenu.Edit.Transform.StretchToScreen="තිරයට පතුරන්න (&S)"
+Basic.MainMenu.Edit.Transform.CenterToScreen="&තිරය මැදට (&C)"
 Basic.MainMenu.Edit.Transform.VerticalCenter="සිරස්ව මැදට"
 Basic.MainMenu.Edit.Transform.HorizontalCenter="තිරස්ව මැදට"
-Basic.MainMenu.Edit.Order="&අනුපිළිවෙළ"
-Basic.MainMenu.Edit.Order.MoveUp="ඉහළට &ගෙනයාම"
-Basic.MainMenu.Edit.Order.MoveDown="පහළට &ගෙනයාම"
-Basic.MainMenu.Edit.Order.MoveToTop="මුදුනට &ගෙනයාම"
-Basic.MainMenu.Edit.Order.MoveToBottom="පතුළට &ගෙනයාම"
-Basic.MainMenu.Edit.AdvAudio="වැඩිදුර ශ්‍රව්‍ය ගුණාංග"
-Basic.MainMenu.View="&දැක්ම"
-Basic.MainMenu.View.Toolbars="&මෙවලම් තීරු"
-Basic.MainMenu.View.ListboxToolbars="සිද්ධි/මූලාශ්‍ර ලේඛන බොත්තම්"
+Basic.MainMenu.Edit.Order="අනුපිළිවෙළ (&O)"
+Basic.MainMenu.Edit.Order.MoveUp="ඉහළට ගෙනයන්න"
+Basic.MainMenu.Edit.Order.MoveDown="පහළට ගෙනයන්න"
+Basic.MainMenu.Edit.Order.MoveToTop="මුදුනට ගෙනයන්න"
+Basic.MainMenu.Edit.Order.MoveToBottom="පතුළට ගෙනයන්න"
+Basic.MainMenu.Edit.AdvAudio="වැඩිදුර ශ්‍රව්‍ය ගුණාංග (&A)"
+Basic.MainMenu.View="දැක්ම (&V)"
+Basic.MainMenu.View.Toolbars="මෙවලම් තීරු (&T)"
+Basic.MainMenu.View.ListboxToolbars="තටාකයේ මෙවලම් තීරු"
 Basic.MainMenu.View.ContextBar="මූලාශ්‍ර මෙවලම් තීරුව"
-Basic.MainMenu.View.SceneTransitions="සි&ද්ධි සංක්‍රාන්ති"
-Basic.MainMenu.View.SourceIcons="මූලාශ්‍ර නිරූපක"
-Basic.MainMenu.View.StatusBar="&තත්‍ව තීරුව"
+Basic.MainMenu.View.SourceIcons="මූලාශ්‍ර නිරූපක (&I)"
+Basic.MainMenu.View.StatusBar="තත්‍ව තීරුව (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="පූර්ණතිර අතුරුමුහුණත"
-Basic.MainMenu.View.ResetUI="අ.මු.& (UI) යළි සකසන්න"
-Basic.MainMenu.View.AlwaysOnTop="&සැමවිට මුදුනින්"
-Basic.MainMenu.Docks.CustomBrowserDocks="&අභිරුචි අතිරික්සු තැටි..."
-Basic.MainMenu.SceneCollection="&සිද්ධි එකතුව"
-Basic.MainMenu.Profile="&පැතිකඩ"
+Basic.MainMenu.View.ResetUI="අ.මු.(UI) යළි සකසන්න"
+Basic.MainMenu.View.AlwaysOnTop="සැමවිට මුදුනින් (&A)"
+Basic.MainMenu.Docks="තටාක (&D)"
+Basic.MainMenu.Docks.ResetDocks="තටාක යළි සකසන්න (&R)"
+Basic.MainMenu.Docks.LockDocks="තටාක අගුළුලන්න (&L)"
+Basic.MainMenu.Docks.SideDocks="පූර්ණ උසට තටාක (&F)"
+Basic.MainMenu.Docks.CustomBrowserDocks="අභිරුචි අතිරික්සු තැටි..."
+Basic.MainMenu.SceneCollection="සිද්ධි එකතුව (&S)"
+Basic.MainMenu.Profile="පැතිකඩ (&P)"
 Basic.MainMenu.Profile.Import="පැතිකඩ ආයාතය"
 Basic.MainMenu.Profile.Export="පැතිකඩ නිර්යාතය"
 Basic.MainMenu.SceneCollection.Import="සිද්ධි එකතුව ආයාතය"
 Basic.MainMenu.SceneCollection.Export="සිද්ධි එකතුව නිර්යාතය"
 Basic.MainMenu.Profile.Exists="පැතිකඩ දැනටමත් පවතී"
-Basic.MainMenu.SceneCollection.Exists="සිද්ධි එකතුව දැනටමත් පවතී"
-Basic.MainMenu.Tools="&මෙවලම්"
-Basic.MainMenu.Help="&උදව්"
-Basic.MainMenu.Help.HelpPortal="උදව් &ද්වාරය"
-Basic.MainMenu.Help.Website="අඩවියට &පිවිසෙන්න"
-Basic.MainMenu.Help.Discord="&ඩිස්කෝඩ් හි බලන්න"
-Basic.MainMenu.Help.Logs="&සටහන් ගොනු"
-Basic.MainMenu.Help.Logs.ShowLogs="&සටහන් ගොනු පෙන්වන්න"
-Basic.MainMenu.Help.Logs.UploadCurrentLog="&සටහන් ගොනුව උඩුගත කරන්න"
+Basic.MainMenu.Tools="මෙවලම් (&T)"
+Basic.MainMenu.Help="උදව් (&H)"
+Basic.MainMenu.Help.HelpPortal="උදව් ද්වාරය"
+Basic.MainMenu.Help.Website="අඩවියට ගොඩවදින්න"
+Basic.MainMenu.Help.Discord="ඩිස්කෝඩ් හි බලන්න"
+Basic.MainMenu.Help.WhatsNew="අළුත් දෑ"
+Basic.MainMenu.Help.Logs="සටහන් ගොනු (&L)"
+Basic.MainMenu.Help.Logs.ShowLogs="සටහන් ගොනු පෙන්වන්න"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="වත්මන් සටහන් ගොනුව උඩුගත කරන්න"
 Basic.MainMenu.Help.Logs.UploadLastLog="පෙර සටහන් ගොනුව උඩුගත කරන්න"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="&වත්මන් සටහන් බලන්න"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="වත්මන් සටහන බලන්න"
 Basic.MainMenu.Help.CheckForUpdates="යාවත්කාල සඳහා පරීක්‍ෂාව"
-Basic.MainMenu.Help.CrashLogs="බිඳවැටීමේ වාර්තා"
-Basic.MainMenu.Help.CrashLogs.ShowLogs="&බිඳවැටීමේ වාර්තා පෙන්වන්න"
-Basic.MainMenu.Help.About="&පිළිබඳව"
+Basic.MainMenu.Help.CrashLogs="බිඳවැටීමේ වාර්තා (&R)"
+Basic.MainMenu.Help.CrashLogs.ShowLogs="බිඳවැටීමේ වාර්තා පෙන්වන්න"
+Basic.MainMenu.Help.About="පිළිබඳව (&A)"
 Basic.Settings.ProgramRestart="මෙම සැකසුම් යෙදීම සඳහා වැඩසටහන නැවත ආරම්භ කළ යුතුය."
 Basic.Settings.ConfirmTitle="වෙනස්කම් තහවුරුව"
 Basic.Settings.Confirm="නොසුරැකි වෙනස්කම් තිබේ. සුරකින්න ද?"
@@ -634,7 +634,6 @@
 Basic.Settings.General.ChannelName.stable="ස්ථායී"
 Basic.Settings.General.ChannelDescription.stable="නවතම ස්ථායී නිකුතුව"
 Basic.Settings.Stream="ප්‍රචාරය"
-Basic.Settings.Stream.StreamType="ප්‍රචාර වර්ගය"
 Basic.Settings.Stream.Custom.UseAuthentication="සත්‍යාපනය භාවිතය"
 Basic.Settings.Stream.Custom.Username="පරිශීලක නාමය"
 Basic.Settings.Stream.Custom.Password="මුරපදය"
@@ -655,11 +654,13 @@
 Basic.Settings.Stream.Recommended.MaxFPS="උපරිම රාමු/ත.: %1"
 Basic.Settings.Output="ප්‍රතිදානය"
 Basic.Settings.Output.Format="පටිගත ආකෘතිය"
+Basic.Settings.Output.Format.MKV="මාට්‍රෝක්‍ෂා දෘශ්‍යකය (.mkv)"
+Basic.Settings.Output.Encoder.Video="දෘශ්‍ය ආකේතකය"
+Basic.Settings.Output.Encoder.Audio="හඬ ආකේතකය"
 Basic.Settings.Output.SelectDirectory="පටිගත නාමාවලිය තෝරන්න"
-Basic.Settings.Output.SelectFile="පටිගත ගොනුව තෝරන්න"
 Basic.Settings.Output.DynamicBitrate="හිරවීම පාලනයට බිටුඅනු. ගතිකව වෙනස් කරන්න"
 Basic.Settings.Output.DynamicBitrate.Beta="හිරවීම පාලනයට බිටුඅනු. ගතිකව වෙනස් කරන්න (බීටා)"
-Basic.Settings.Output.Mode="ප්‍රතිදාන ආකාරය"
+Basic.Settings.Output.Mode="ප්‍රතිදාන ප්‍රකාරය"
 Basic.Settings.Output.Mode.Simple="සරල"
 Basic.Settings.Output.Mode.Adv="වැඩිදුර"
 Basic.Settings.Output.Mode.FFmpeg="FFmpeg ප්‍රතිදානය"
@@ -689,7 +690,9 @@
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="දෘඩාංගය (ඇපල්, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="දෘඩාංගය (Apple, HEVC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="මෘදුකාංගය (x264 අඩු ම.සැ.ඒ. භාවිතය පෙරසැකසීම, ගොනුවේ තරම විශාලයි)"
+Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (පෙරනිමි)"
 Basic.Settings.Output.Simple.TwitchVodTrack="ට්විච් ඉ.ම.දෘ.(VOD) පථය (පථ 2ක් ඇත)"
+Basic.Settings.Output.Simple.RecAudioTrack="ශ්‍රව්‍ය පථය"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="නොගැළපෙන විභේදනය / රාමුඅනුපා."
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="මෙම ප්‍රචාර සේවාව ඔබගේ වත්මන් ප්‍රතිදාන විභේදනයට හා/හෝ රාමු අනුපාතයට සහාය නොදක්වයි. ඒවා ආසන්නතම ගැළපෙන අගයකට වෙනස් කෙරේ:\n\n%1\n\nඉදිරියට යාමට අවශ්‍යද?"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="විභේදනය: %1"
@@ -702,7 +705,6 @@
 Basic.Settings.Output.MaxRetries="උපරිම යළි උත්සාහ"
 Basic.Settings.Output.EncoderPreset="ආකේතක පෙරසැකසීම"
 Basic.Settings.Output.CustomEncoderSettings="අභිරුචි ආකේතක සැකසුම්"
-Basic.Settings.Output.CustomMuxerSettings="අභිරුචි මිශ්‍රක සැකසුම්"
 Basic.Settings.Output.NoSpaceFileName="හිස්තැන් නැතිව ගොනුවේ නම උත්පාදනය"
 Basic.Settings.Output.Adv.Rescale="ප්‍රතිදාන යළිපරිමාණනය"
 Basic.Settings.Output.Adv.AudioTrack="ශ්‍රව්‍ය පථය"
@@ -731,16 +733,17 @@
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="සුලබ පටිගත කිරීමේ ආකෘති"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="සියළු ගොනු"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="ගොනුවේ පෙත / ඒ.ස.නි."
+Basic.Settings.Output.Adv.FFmpeg.Format="අඩංගුවේ ආකෘතිය"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="ශ්‍රව්‍ය"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="දෘශ්‍ය"
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="පෙරනිමි ආකෘතිය"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="අඩංගුවේ ආකෘතියෙහි විස්තරය"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="පෙරනිමි ආකේතකය"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="ආකේතකය අබලව"
 Basic.Settings.Output.Adv.FFmpeg.VEncoder="දෘශ්‍ය ආකේතකය"
 Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="දෘශ්‍ය ආකේතක සැකසුම් (ඇත්නම්)"
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="හඬ ආකේතකය"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="ශ්‍රව්‍ය ආකේතක සැකසුම් (ඇත්නම්)"
-Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="මිශ්‍රක සැකසුම් (ඇත්නම්)"
 Basic.Settings.Output.Adv.FFmpeg.Settings="FFmpeg සැකසුම්"
 Screenshot="තිරසේයාව ප්‍රතිදානය"
 Screenshot.SourceHotkey="තේරූ මූලාශ්‍රයේ තිරසේයාව"
@@ -748,6 +751,19 @@
 Screenshot.Preview="තිරසේයාව (පෙරදසුන)"
 Screenshot.Scene="තිරසේයාව (සිද්ධිය)"
 Screenshot.Source="තිරසේයාව (මූලාශ්‍රය)"
+FilenameFormatting.TT.hh="පැය 𑇫𑇤 (24) ආකෘතිය (00-23)"
+FilenameFormatting.TT.mm="විනාඩි (00-59)"
+FilenameFormatting.TT.ss="තත්පර (00-59)"
+FilenameFormatting.TT.A="සතියේ පූර්ණ නම"
+FilenameFormatting.TT.B="මාසයේ පූර්ණ නම"
+FilenameFormatting.TT.H="පැය 𑇫𑇤 (24) ආකෘතිය (00-23)"
+FilenameFormatting.TT.I="පැය 𑇪𑇢 (12) ආකෘතිය (00-12)"
+FilenameFormatting.TT.M="විනාඩි (00-59)"
+FilenameFormatting.TT.p="පෙ.ව. හෝ ප.ව. සැකසීම"
+FilenameFormatting.TT.S="තත්පර (00-59)"
+FilenameFormatting.TT.Y="අවුරුද්ද"
+FilenameFormatting.TT.FPS="තත්පරයකට රාමු"
+FilenameFormatting.TT.VF="දෘශ්‍යක ආකෘතිය"
 Basic.Settings.Video="දෘශ්‍ය"
 Basic.Settings.Video.Adapter="දෘශ්‍ය අනුහුරුව"
 Basic.Settings.Video.ScaledResolution="ප්‍රතිදානය (පරිමාණිතයි) විභේදනය"
@@ -767,8 +783,7 @@
 Basic.Settings.Audio.MeterDecayRate.Fast="වේගවත්"
 Basic.Settings.Audio.MeterDecayRate.Medium="මධ්‍යම (වර්ගය | PPM)"
 Basic.Settings.Audio.MeterDecayRate.Slow="සෙමින් (වර්ගය | PPM)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="අවවාදයයි: වටේට ශබ්දයේ හඬ සබලයි."
-Basic.Settings.Audio.MultichannelWarning="ප්‍රචාරයට නම්, ඔබගේ ප්‍රචාර සේවාව වටේට ශබ්දය උකහා ගැනීමට හා වටේට ශබ්දය වාදනයට යන දෙකටම සහය දක්වන්නේ දැයි සොයා බලන්න. ෆේස්බුක් 360 සජීව යනු මෙයට පූර්ණ සහාය සහිත එක් නිදසුනකි. ෆේස්බුක් සජීව හා යූටියුබ් සජීව යන දෙකම වටේට ශබ්දය උකහා ගත්තද, ෆේස්බුක් සජීව විසින් ත්‍රිමාණයට අවමිශ්‍ර කරන අතර යූටියුබ් සජීව නාලිකා දෙකක් පමණක් වාදනය කරයි.\n\nඕබීඑස් හඬ පෙරහන් වටේට ශබ්දය සඳහා ගැළපෙයි, නමුත් VST දිගු සඳහා සහාය නිත්‍ය නැත."
+Basic.Settings.Audio.MultichannelWarning.Enabled="අවවාදයයි: වටේට ශබ්දයේ හඬ සබලයි."
 Basic.Settings.Audio.MultichannelWarning.Title="වටේට ශබ්දයේ හඬ සබල කරන්න ද?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="ඔබට වටේට ශබ්දයේ හඬ සබල කිරීමට වුවමනා ද?"
 Basic.Settings.Audio.Devices="ගෝලීය ශ්‍රව්‍ය උපාංග"
@@ -794,8 +809,8 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="සාමාන්‍ය"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="සාමාන්‍යට අඩු"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="නිද්‍රාශීලී"
-Basic.Settings.Advanced.Audio.BufferingTime="ශ්රව්ය ස්වාරක්ෂක වේලාව"
 Basic.Settings.Advanced.Video.ColorFormat="වර්ණ ආකෘතිය"
+Basic.Settings.Advanced.Video.ColorFormat.BGRA="BGRA (බිටු-8)"
 Basic.Settings.Advanced.Video.ColorSpace="වර්ණ අවකාශය"
 Basic.Settings.Advanced.Video.ColorRange="වර්ණ පරාසය"
 Basic.Settings.Advanced.Video.ColorRange.Partial="සීමාසහිත"
@@ -809,9 +824,10 @@
 Basic.Settings.Advanced.Network="ජාලය"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="ජාලය ප්‍රශස්තිකරණය සබල කරන්න"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="සම්ප්‍රේෂණ වේගය නියාමනය කිරීමෙන් ජාලයේ වෙනත් ගුප්තතාව සංවේදී යෙදුම් සඳහා RTMP ප්‍රතිදාන හිනෛෂී බවට පත් කිරීමට තැත් කරයි.\nමෙය අස්ථිර සම්බන්ධතාවල රාමු පහත වැටීමේ අවදානම වැඩි කළ හැකිය."
-Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="උණුයතුරු අබල නොකරන්න"
-Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="ප්රධාන කවුළුව අවධානය යොමු කර ඇති විට උණුසුම් යතුරු අක්රීය කරන්න"
-Basic.Settings.Advanced.Hotkeys.DisableHotkeysOutOfFocus="ප්රධාන කවුළුව අවධානය යොමු කර ඇති විට උණුසුම් යතුරු අක්රීය කරන්න"
+Basic.Settings.Advanced.Hotkeys.HotkeyFocusBehavior="කෙටිමඟ නාභිගත හැසිරීම"
+Basic.Settings.Advanced.Hotkeys.NeverDisableHotkeys="කෙටිමං අබල නොකරන්න"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysInFocus="ප්‍රධාන කවුළුවට නාභිගත වූ විට කෙටිමං අබල කරන්න"
+Basic.Settings.Advanced.Hotkeys.DisableHotkeysOutOfFocus="ප්‍රධාන කවුළුවට නාභිගත නැති විට කෙටිමං අබල කරන්න"
 Basic.Settings.Advanced.AutoRemux.MP4="(mkv ලෙස පටිගතය)"
 Basic.AdvAudio="වැඩිදුර ශ්‍රව්‍ය ගුණාංග"
 Basic.AdvAudio.ActiveOnly="සක්‍රිය ප්‍රභව පමණි"
@@ -828,10 +844,11 @@
 Basic.AdvAudio.Monitoring.Both="දර්ශකය සහ ප්‍රතිදානය"
 Basic.AdvAudio.MonitoringSource="'%1' සඳහා හඬ නිරීක්‍ෂණය"
 Basic.AdvAudio.AudioTracks="පථ"
-Basic.Settings.Hotkeys="උණු යතුරු"
+Basic.Settings.Hotkeys="කෙටිමං"
 Basic.Settings.Hotkeys.Filter="පෙරහන"
-Basic.Settings.Hotkeys.FilterByHotkey="උණුයතුර අනුව පෙරන්න"
-Basic.Settings.Hotkeys.DuplicateWarning="මෙම උණුසුම් යතුර අන් ක්‍රියාමාර්ග සඳහා ද බෙදාගනු ලැබේ, ඝට්ටනය පෙන්වීමට ඔබන්න"
+Basic.Settings.Hotkeys.FilterByHotkey="කෙටිමඟ අනුව පෙරන්න"
+Basic.Settings.Hotkeys.DuplicateWarning="මෙම කෙටිමඟ අන් ක්‍රියාමාර්ග සඳහා ද බෙදාගනු ලැබේ. ඝට්ටනය පෙන්වීමට ඔබන්න"
+Basic.Settings.Hotkeys.PleaseWait="කෙටිමං පූරණය වෙමින්, රැඳෙන්න..."
 Basic.Hotkeys.SelectScene="සිද්ධියට මාරුවීම"
 Basic.SystemTray.Show="පෙන්වන්න"
 Basic.SystemTray.Hide="සඟවන්න"
@@ -869,6 +886,7 @@
 Hotkeys.AppleKeypadSubtract="- (යතුර)"
 Hotkeys.AppleKeypadDecimal=". (යතුර)"
 Hotkeys.AppleKeypadEqual="= (යතුර)"
+Hotkeys.MouseButton="ඊතලය %1"
 Mute="නිහඬ"
 Unmute="නොනිහඬ"
 Push-to-mute="එබීමෙන්-නිශ්ශබ්ද"
@@ -876,8 +894,13 @@
 SceneItemShow="'%1' පෙන්වන්න"
 SceneItemHide="'%1' සඟවන්න"
 OutputWarnings.NoTracksSelected="ඔබ අවම වශයෙන් එක් පථයක් තේරිය යුතුය"
-OutputWarnings.MP4Recording="අවවාදයයි: ගොනුව නිමා කළ නොහැකි වුවහොත් MP4/MOV වර්ගයේ පටිගත කිරීම් ප්‍රතිස්ථාපනය කළ නොහැකියි (උදා: නිල්තිරය නිසා, විදුලිය බිඳුවැටීම, ආදිය). ඔබට ශ්‍රව්‍ය පථ කිහිපයක් පටිගත කිරීමට අවශ්‍ය නම් උදා. MKV භාවිතා කර පටිගතය අවසන් වූ පසු MP4/MOV වෙත යළි මිශ්‍රණය කරන්න (ගොනුව → යළි මිශ්‍රණ පටිගත)"
+OutputWarnings.NoTracksSelectedOnExit.Title="ප්‍රතිදාන සැකසුම් දෝෂයකි"
 OutputWarnings.CannotPause="අවවාදයයි: පටිගත වීමේ ආකේතකය “(ප්‍රචාර ආකේතකය භාවිතය)” ලෙස සකසා ඇත්නම් පටිගත කිරීමට විරාම තැබීමට නොහැකිය"
+CodecCompat.Incompatible="(%1 සමඟ නොගැළපෙයි)"
+CodecCompat.CodecPlaceholder="ආකේතකය තෝරන්න..."
+CodecCompat.ContainerPlaceholder="ආකෘතිය තෝරන්න..."
+CodecCompat.CodecMissingOnExit.Title="ආකේතකයක් තෝරා නැත"
+CodecCompat.ContainerMissingOnExit.Title="ආකෘතියක් තෝරා නැත"
 FinalScene.Title="සිද්ධිය මකන්න"
 FinalScene.Text="අවම වශයෙන් එක් සිද්ධියක් තිබිය යුතුය."
 NoSources.Title="මූලාශ්‍ර නැත"
@@ -897,6 +920,7 @@
 AddUrl.Title="ඒ.ස.නි. න් මූලාශ්‍රය යොදන්න"
 AddUrl.Text="ඒ.ස.නි. ක් ඕබීඑස් වෙත ඇද දමා ඇත. මෙය ස්වයංක්‍රීයව මූලාශ්‍රයක් ලෙස සබැඳිය යොදනු ඇත. ඉදිරියට?"
 AddUrl.Text.Url="ඒ.ස.නි.: %1"
+ResizeOutputSizeOfSource.Continue="ඉදිරියට යාමට වුවමනාද?"
 PreviewTransition="සංක්‍රාන්තියෙහි පෙරදසුන"
 Importer="සිද්ධි එකතුව ආයාතකය"
 Importer.SelectCollection="සිද්ධි එකතුවක් තෝරන්න"
@@ -908,7 +932,7 @@
 Importer.AutomaticCollectionText="සහාය දක්වන තෙවන පාර්ශවීය වැඩසටහන් වෙතින් ආයාත කළ හැකි සිද්ධි එකතු ස්වයංක්‍රීයව සොයා ගැනීමට හැකිය. ඕබීඑස් විසින් ඔබ සඳහා මෙය සිදු කරනවාට කැමතිද?\n\nපසුව සැකසුම් > පොදු > අයාතක තුළ මෙය වෙනස් කළ හැකිය."
 Restart="නැවත අරඹන්න"
 NeedsRestart="ඕබීඑස් මැදිරිය යළි ඇරඹිය යුතුය. දැන් සිදු කිරීමට අවශ්‍යද?"
-LoadProfileNeedsRestart="පැතිකඩෙහි ඕබීඑස් යළි ඇරඹීමට ඇවැසි සැකසුම් අඩංගුය:\n%1\n\n ඔබට මෙම සැකසුම් යෙදීමට නැවත ඇරඹීමට අවශ්‍යද?"
+LoadProfileNeedsRestart="පැතිකඩෙහි ඕබීඑස් යළි ඇරඹීමට වුවමනා සැකසුම් අඩංගුය:\n%1\n\n ඔබට මෙම සැකසුම් යෙදීම සඳහා නැවත ඇරඹීමට වුවමනා ද?"
 ContextBar.NoSelectedSource="මූලාශ්‍රයක් තෝරා නැත"
 ContextBar.MediaControls.PlayMedia="මාධ්‍ය වාදනය"
 ContextBar.MediaControls.PauseMedia="මාධ්‍ය විරාමය"
@@ -916,7 +940,6 @@
 ContextBar.MediaControls.RestartMedia="මාධ්‍ය යළි අරඹන්න"
 ContextBar.MediaControls.PlaylistNext="ධාවන ලේඛනයේ ඊළඟ"
 ContextBar.MediaControls.PlaylistPrevious="ධාවන ලේඛනයේ පෙර"
-ContextBar.MediaControls.MediaProperties="මාධ්‍ය ගුණාංග"
 YouTube.Auth.Ok="සත්‍යාපනය සාර්ථකව නිමා විය.\nදැන් මෙම පිටුව වසා දැමීමට හැකිය."
 YouTube.Auth.NoCode="සත්‍යාපන ක්‍රියාවලිය සම්පූර්ණ වී නැත."
 YouTube.Auth.NoChannels="තෝරාගත් ගිණුමෙහි කිසිදු නාලිකාවක් නැත"
@@ -941,6 +964,7 @@
 YouTube.Actions.MadeForKids="මෙම දෘශ්‍යකය ළමුන් සඳහා ද?*"
 YouTube.Actions.MadeForKids.Yes="ඔව්, එය ළමුන් සඳහා තනා ඇත"
 YouTube.Actions.MadeForKids.No="නැහැ, එය ළමුන් සඳහා තැනූවක් නොවේ"
+YouTube.Actions.AdditionalSettings="අතිරේක සැකසුම්"
 YouTube.Actions.Latency="ගුප්තතාව"
 YouTube.Actions.Latency.Normal="සාමාන්‍ය"
 YouTube.Actions.Latency.Low="අඩු"
@@ -979,7 +1003,7 @@
 YouTube.Actions.Stream.Resume="බිඳ වැටුණු ප්‍රචාරය නැවතත්"
 YouTube.Actions.Stream.YTStudio="යූටියුබ් ස්ටුඩියෝ වෙතින් ස්වයංක්‍රීයව සෑදිණි"
 YouTube.Actions.Notify.CreatingBroadcast="නව සජීව විකාශනයක් සෑදෙමින්, රැඳී සිටින්න..."
-YouTube.Actions.AutoStartStreamingWarning.Title="අතින් ආරම්භයක් ඇවැසිය"
+YouTube.Actions.AutoStartStreamingWarning.Title="අතින් ආරම්භයක් වුවමනාය"
 YouTube.Actions.AutoStartStreamingWarning="මෙම සිදුවීම සඳහා ස්වයං ආරම්භය අබල කර ඇත, ඔබගේ විකාශනය ඇරඹීමට “සජීව යන්න” ඔබන්න."
 YouTube.Actions.AutoStopStreamingWarning="නැවත සම්බන්ධ වීමට නොහැකි වනු ඇත. ඔබගේ ප්‍රචාරය නතර වන අතර ඔබ තවදුරටත් මාර්ගගත නොවේ."
 YouTube.Chat.Input.Send="යවන්න"
@@ -988,7 +1012,7 @@
 YouTube.Chat.Error.Title="පණිවිඩය යැවීමේදී දෝෂයකි"
 YouTube.Chat.Error.Text="පණිවිඩය යැවීමට නොහැකි විය: %1"
 YouTube.Errors.liveStreamingNotEnabled="තෝරාගත් යූටියුබ් නාලිකාවෙහි සජීව ප්‍රචාර පහසුකම සබල කර නැත. වැඩි විස්තර සඳහා <a href='https://www.youtube.com/features'>youtube.com/features</a> බලන්න."
-YouTube.Errors.livePermissionBlocked="තෝරාගත් යූටියුබ් නාලිකාවට සජීව පුචාර නොතිබේ. ඔබගේ නාලිකාවේ සැකසුම් තුළ එය සබල කිරීමෙන් පසු සජීව ප්‍රචාර පහසුකම ලැබීමට පැය 24 ක් දක්වා ගත වීමට හැකි බව කරුණාවෙන් සලකන්න. විස්තර සඳහා <a href='https://www.youtube.com/features'>youtube.com/features</a> බලන්න."
+YouTube.Errors.livePermissionBlocked="තෝරාගත් යූටියුබ් නාලිකාවට සජීව පුචාර පහසුකම නොතිබේ. ඔබගේ නාලිකාවේ සැකසුම් තුළ එය සබල කිරීමෙන් පසු සජීව ප්‍රචාර පහසුකම ලැබීමට පැය 24 ක් දක්වා ගත වීමට හැකි බව කරුණාවෙන් සලකන්න. විස්තර සඳහා <a href='https://www.youtube.com/features'>youtube.com/features</a> බලන්න."
 YouTube.Errors.errorStreamInactive="යූටියුබ් වෙත ඔබගේ ප්‍රචාරයේ දත්ත නොලැබෙයි. වින්‍යාසය පරීක්‍ෂා කර උත්සාහ කරන්න."
 YouTube.Errors.liveChatDisabled="මෙම ප්‍රචාරයෙහි සජීව සංවාදය අබලයි."
 YouTube.Errors.liveChatEnded="සජීව ප්‍රචාරය නිමා විය."

obs-studio-29.1.3.tar.xz/UI/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/sk-SK.ini Changed

@@ -90,7 +90,6 @@
 LogViewer="Prehliadač logov"
 ShowOnStartup="Ukázať pri spustení"
 OpenFile="Otvoriť súbor"
-AddValue="Pridať %1"
 AddSource="Pridať zdroj"
 RemoveScene="Odstrániť vybranú scénu"
 RemoveSource="Odstrániť vybraný zdroj(e)"
@@ -102,11 +101,19 @@
 SourceFilters="Otvoriť filtre zdroja"
 MixerToolbarMenu="Menu zvukového zmiešavača"
 SceneFilters="Otvoriť filtre scény"
+List="Zoznam"
+Grid="Mriežka"
 PluginsFailedToLoad.Title="Chyba pri načítaní pluginu"
 PluginsFailedToLoad.Text="Nasledujúce OBS pluginy sa nepodarilo načítať:\n\n%1\nProsím aktualizujte alebo odstráňte tieto pluginy."
 AlreadyRunning.Title="OBS je už spustený"
 AlreadyRunning.Text="Aplikácia OBS je už spustená! Prosím vypnite všetky existujúce inštancie OBS pred pokusom o spustenie novej inštancie. Ak máte OBS minimalizovaný do systémovej lišty, prosím skontrolujte, či tam stále beží."
 AlreadyRunning.LaunchAnyway="Napriek tomu spustiť"
+AutoSafeMode.Title="Núdzový režim"
+AutoSafeMode.Text="OBS nebolo naposledy správne vypnuté.\n\nChceli by ste spustiť v núdzovom režime (pluginy tretích strán, skriptovanie, a websockety vypnuté)?"
+AutoSafeMode.LaunchSafe="Spustiť v núdzovom režime"
+AutoSafeMode.LaunchNormal="Spustiť normálne"
+SafeMode.Restart="Chcete reštartovať OBS v núdzovom režime (pluginy tretích strán, skriptovanie, a websockety vypnuté)?"
+SafeMode.RestartNormal="Chcete reštartovať OBS v normálnom režime?"
 ChromeOS.Title="Nepodporovaná platforma"
 ChromeOS.Text="Vyzerá to tak, že OBS beží v ChromeOS kontajneri. Táto platforma nie je podporovaná."
 Wine.Title="Wine zistený"
@@ -172,8 +179,8 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Vlastné..."
 Basic.AutoConfig.StreamPage.StreamKey="Streamovací kľúč"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: zadajte prístupovú frázu šifrovania.\nRTMP: zadajte kľúč poskytnutý danou službou.\nSRT: zadajte streamid ak ho daná služba používa."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Odkaz)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kľúč enkodéra"
+Basic.AutoConfig.StreamPage.BearerToken="Nositeľský token"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Pripojený účet"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Odhadnúť bitrate pomocou testu rýchlosti pripojenia (môže to trvať pár minút)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Preferovať hardvérové enkódovanie"
@@ -223,8 +230,6 @@
 Updater.UpdateNow="Aktualizovať teraz"
 Updater.RemindMeLater="Pripomenúť neskôr"
 Updater.Skip="Preskočiť verziu"
-Updater.Running.Title="Program momentálne aktívny"
-Updater.Running.Text="Niektoré výstupy sú stále aktívne. Zastavte ich pred ďalším pokusom o aktualizáciu"
 Updater.NoUpdatesAvailable.Title="Neboli nájdené žiadne aktualizácie"
 Updater.NoUpdatesAvailable.Text="Nie sú momentálne k dispozícii žiadne aktualizácie"
 Updater.BranchNotFound.Title="Kanál aktualizácií odstránený"
@@ -234,8 +239,6 @@
 Updater.RepairConfirm.Title="Potvrdenie kontroly integrity"
 Updater.RepairConfirm.Text="Spustenie kontroly integrity oskenuje vašu OBS inštaláciu pre poškodenie a znovustiahne poškodené/upravené súbory. Toto môže chvíľu trvať.\n\nPrajete si pokračovať?"
 Updater.FailedToLaunch="Nepodarilo sa spustiť aktualizátor"
-Updater.GameCaptureActive.Title="Zachytenie hry aktívne"
-Updater.GameCaptureActive.Text="Knižnica pre záznam hier je stále aktívna. Ukončite, prosím, všetky snímané hry/programy (alebo reštartujte Windows) a skúste to znovu."
 QuickTransitions.SwapScenes="Vymeniť náhľad/programové scény po prechode"
 QuickTransitions.SwapScenesTT="Vymení náhľad a programové scény po prechode (ak pôvodná programová scéna stále existuje).\nToto nevráti žiadne zmeny vykonané v pôvodnej programovej scéne."
 QuickTransitions.DuplicateScene="Duplikovať scénu"
@@ -249,6 +252,8 @@
 Basic.SceneTransitions="Prechody medzi scénami"
 Basic.TransitionDuration="Trvanie"
 Basic.TogglePreviewProgramMode="Štúdiový režim"
+Basic.EnablePreviewProgramMode="Zapnúť štúdiový režim"
+Basic.DisablePreviewProgramMode="Vypnúť štúdiový režim"
 Undo.Undo="Vrátiť späť"
 Undo.Redo="Zopakovať"
 Undo.Add="Pridanie '%1'"
@@ -297,6 +302,8 @@
 Undo.GroupItems="Zoskupenie položiek do '%1'"
 TransitionNameDlg.Text="Prosím, zadajte názov prechodu"
 TransitionNameDlg.Title="Názov prechodu"
+TitleBar.SafeMode="NÚDZOVÝ REŽIM"
+TitleBar.PortableMode="Prenosný režim"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scéna"
 NameExists.Title="Názov už existuje"
@@ -321,6 +328,7 @@
 Output.StartStreamFailed="Nepodarilo sa spustiť streamovanie"
 Output.StartRecordingFailed="Nepodarilo sa spustiť nahrávanie"
 Output.StartReplayFailed="Nepodarilo sa spustiť záznam do pamäte"
+Output.StartVirtualCamFailed="Nepodarilo sa spustiť virtuálnu kameru"
 Output.StartFailedGeneric="Nastala chyba pri spúšťaní nahrávania. Podrobnosti nájdete v textovom logu.\n\nPoznámka: Ak používate NVENC alebo AMD enkodér, uistite sa, že používate najnovšiu verziu grafického ovládača."
 Output.ReplayBuffer.PauseWarning.Title="Nemožno ukladať záznamy pri zapauzovaní"
 Output.ReplayBuffer.PauseWarning.Text="Upozornenie: Záznamy nemôžu byť ukladané, keď je pozastavené nahrávanie."
@@ -333,7 +341,7 @@
 Output.ConnectFail.Disconnected="Odpojený od servera."
 Output.StreamEncodeError.Title="Chyba kódovania"
 Output.StreamEncodeError.Msg="Nastala chyba pri kódovaní počas vysielania."
-Output.StreamEncodeError.Msg.LastError="Nastala chyba enkodéra počas streamovania:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Nastala chyba enkodéra počas streamovania: %1"
 Output.RecordFail.Title="Nepodarilo sa spustiť nahrávanie"
 Output.RecordFail.Unsupported="Výstupný formát nie je podporovaný alebo nepodporuje viac ako jednu zvukovú stopu. Skontrolujte nastavenia a skúste to znovu."
 Output.RecordNoSpace.Title="Nedostatok miesta na disku"
@@ -341,7 +349,7 @@
 Output.RecordError.Title="Chyba nahrávania"
 Output.RecordError.Msg="Pri nahrávaní došlo k nešpecifikovanej chybe."
 Output.RecordError.EncodeErrorMsg="Nastala chyba pri kódovaní počas nahrávania."
-Output.RecordError.EncodeErrorMsg.LastError="Nastala chyba enkodéra počas nahrávania:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Nastala chyba enkodéra počas nahrávania: %1"
 Output.BadPath.Title="Nesprávna cesta k súboru"
 Output.BadPath.Text="Nakonfigurovanú cestu pre nahrávanie nebolo možné otvoriť. Prosím skontrolujte svoju cestu pre nahrávanie pod Nastavenia → Výstup → Nahrávanie."
 Output.NoBroadcast.Title="Nie je nastavené žiadne vysielanie"
@@ -371,6 +379,8 @@
 Remux.ExitUnfinishedTitle="Prebieha prevod"
 Remux.ExitUnfinished="Prevod nie je dokončený. Zastavenie môže spôsobiť poškodenie výstupného súboru.\nNaozaj chcete prevod prerušiť?"
 Remux.HelpText="Presuňte súbory do tohto okna k prevodu alebo vyberte prázdne pole \"OBS nahrávka\" pre výber súboru."
+Remux.NoFilesAddedTitle="Žiaden pridaný súbor na prevod"
+Remux.NoFilesAdded="Nebol pridaný žiaden súbor na prevod. Vyberte priečinok obsahujúci jeden alebo viac video súborov."
 MissingFiles="Chýbajúce súbory"
 MissingFiles.MissingFile="Chýbajúci súbor"
 MissingFiles.NewFile="Nový súbor"
@@ -389,6 +399,7 @@
 MissingFiles.AutoSearchText="OBS našlo viacero zhôd pre chýbajúce súbory v tejto zložke. Chceli by ste ich pridať?"
 MissingFiles.NoMissing.Title="Kontrola chýbajúcich súborov"
 MissingFiles.NoMissing.Text="Vyzerá to tak, že žiadne súbory nechýbajú."
+MacPermissions.MenuAction="Kontrola povolení aplikácie..."
 MacPermissions.Title="Kontrola povolení aplikácie"
 MacPermissions.Description="OBS Štúdio vyžaduje vaše povolenie aby bolo schopné poskytnúť určité funkcie. Odporúča sa povoliť tieto povolenia, ale pre používanie tejto aplikácie nie sú vyžadované. Vždy ich môžete povoliť neskôr."
 MacPermissions.Description.OpenDialog="Môžete otvoriť toto okno neskôr cez menu OBS Štúdia."
@@ -404,8 +415,8 @@
 MacPermissions.Item.Accessibility="Zjednodušenie ovládania"
 MacPermissions.Item.Accessibility.Details="Pre fungovanie týchto klávesových skratiek, keď sú iné aplikácie v popredí, prosím povoľte toto povolenie."
 MacPermissions.Continue="Pokračovať"
-UpdateAvailable="Je dostupná aktualizácia"
-UpdateAvailable.Text="Verzia %1.%2.%3 je dostupná. <a href='%4'>Kliknite sem na jej stiahnutie</a>"
+SourceLeak.Title="Chyba pri čistení zdroja"
+SourceLeak.Text="Nastala chyba počas zmeny scénových kolekcií a niektoré zdroje nemohli byť uvoľnené. Tento problém je zvyčajne spôsobený pluginmi, ktoré neuvoľňujú prostriedky poriadne. Prosím uistite sa, že akékoľvek pluginy, ktoré používate, sú aktuálne.\n\nOBS Štúdio sa teraz ukončí, aby sa zabránilo akémukoľvek potenciálnemu poškodeniu údajov."
 Basic.DesktopDevice1="Zvuk plochy"
 Basic.DesktopDevice2="Zvuk plochy 2"
 Basic.AuxDevice1="Mikrofón/Aux"
@@ -467,6 +478,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (Automatický výber: %2)"
 Basic.PropertiesWindow.SelectColor="Vybrať farbu"
 Basic.PropertiesWindow.SelectFont="Vybrať písmo"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Vyberte písmo"
 Basic.PropertiesWindow.ConfirmTitle="Nastavenia zmenené"
 Basic.PropertiesWindow.Confirm="Existujú neuložené zmeny. Chcete ich ponechať?"
 Basic.PropertiesWindow.NoProperties="Žiadne dostupné vlastnosti"
@@ -493,7 +505,7 @@
 Basic.StatusBar.RecordingSavedTo="Nahrávka uložená do '%1'"
 Basic.StatusBar.ReplayBufferSavedTo="Záznam do pamäte uložený do '%1'"
 Basic.StatusBar.ScreenshotSavedTo="Snímka obrazovky uložená do '%1'"
-Basic.StatusBar.AutoRemuxedTo="Nahrávka auto remuxnutá do '%1'"
+Basic.StatusBar.AutoRemuxedTo="Nahrávka automaticky prevedená do '%1'"
 Basic.Filters="Filtre"
 Basic.Filters.AsyncFilters="Zvukové/obrazové filtre"
 Basic.Filters.AudioFilters="Zvukové filtre"
@@ -576,9 +588,9 @@
 Basic.VCam.VirtualCamera="Virtuálna kamera"
 Basic.VCam.OutputType="Type výstupu"
 Basic.VCam.OutputSelection="Výber výstupu"
-Basic.VCam.Internal="Interný"
-Basic.VCam.InternalDefault="Výstup programu (Predvolené)"
-Basic.VCam.InternalPreview="Výstup náhľadu"
+Basic.VCam.OutputType.Program="Výstup programu (Predvolené)"
+Basic.VCam.OutputSelection.NoSelection="Žiaden výber pre tento typ výstupu"
+Basic.VCam.RestartWarning="Virtuálna kamera bude reštartovaná pre použitie zmien"
 Basic.MainMenu.File="Súbor (&F)"
 Basic.MainMenu.File.Export="&Exportovať"
 Basic.MainMenu.File.Import="&Importovať"
@@ -620,17 +632,18 @@
 Basic.MainMenu.Edit.AdvAudio="Rozšírené vl&astnosti zvuku"
 Basic.MainMenu.View="Zobraziť (&V)"
 Basic.MainMenu.View.Toolbars="Panely s nás&trojmi"
-Basic.MainMenu.View.ListboxToolbars="Tlačidlá zoznamu scén/zdrojov"
+Basic.MainMenu.View.ListboxToolbars="Dokovať panel nástrojov"
 Basic.MainMenu.View.ContextBar="Panel nástrojov zdroja"
-Basic.MainMenu.View.SceneTransitions="Pre&chody scén"
 Basic.MainMenu.View.SourceIcons="Zdroj a ikony"
 Basic.MainMenu.View.StatusBar="&Stavový riadok"
 Basic.MainMenu.View.Fullscreen.Interface="Na celú obrazovku"
 Basic.MainMenu.View.ResetUI="&Resetovať používateľské rozhranie"
 Basic.MainMenu.View.AlwaysOnTop="Vždy n&avrchu"
+Basic.MainMenu.View.SceneListMode="Režim zoznamu scén"
 Basic.MainMenu.Docks="&Doky"
 Basic.MainMenu.Docks.ResetDocks="&Resetovať doky"
 Basic.MainMenu.Docks.LockDocks="&Zamknúť doky"
+Basic.MainMenu.Docks.SideDocks="Celovýškové doky (&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Vlastné doky prehliadača..."
 Basic.MainMenu.SceneCollection="&Sada scén"
 Basic.MainMenu.Profile="&Profil"
@@ -639,7 +652,6 @@
 Basic.MainMenu.SceneCollection.Import="Importovať sadu scén"
 Basic.MainMenu.SceneCollection.Export="Exportovať sadu scén"
 Basic.MainMenu.Profile.Exists="Tento profil už existuje"
-Basic.MainMenu.SceneCollection.Exists="Táto sada scén už existuje"
 Basic.MainMenu.Tools="Nás&troje"
 Basic.MainMenu.Help="Pomoc (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portál pomoci"
@@ -651,8 +663,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Nahrať súčasný log súbor (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Nahrať &predchádzajúci log súbor"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Zobraziť aktuálny log (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Poznámky k vydaniu"
 Basic.MainMenu.Help.CheckForUpdates="Skontrolovať aktualizácie"
 Basic.MainMenu.Help.Repair="Kontrola súborovej integrity"
+Basic.MainMenu.Help.RestartSafeMode="Reštartovať v núdzovom režime"
+Basic.MainMenu.Help.RestartNormal="Reštartovať v normálnom režime"
 Basic.MainMenu.Help.CrashLogs="Správy o zlyhaní (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Zobraziť &správy o zlyhaniach"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Nahrať &predchádzajúcu správu o zlyhaní"
@@ -720,7 +735,6 @@
 Basic.Settings.General.ChannelDescription.stable="Najnovšia stabilná verzia"
 Basic.Settings.General.ChannelName.beta="Beta verzie / Výdajní kandidáti"
 Basic.Settings.General.ChannelDescription.beta="Potenciálne nestabilné pred-výdajné verzie"
-Basic.Settings.Stream.StreamType="Typ streamu"
 Basic.Settings.Stream.Custom.UseAuthentication="Použiť overenie"
 Basic.Settings.Stream.Custom.Username="Užívateľské meno"
 Basic.Settings.Stream.Custom.Password="Heslo"
@@ -751,7 +765,6 @@
 Basic.Settings.Output.Encoder.Video="Video enkodér"
 Basic.Settings.Output.Encoder.Audio="Audio enkodér"
 Basic.Settings.Output.SelectDirectory="Vybrať adresár pre nahrávky"
-Basic.Settings.Output.SelectFile="Vybrať súbor nahrávky"
 Basic.Settings.Output.DynamicBitrate="Dynamicky meniť bitrate v závislosti na zahltení siete"
 Basic.Settings.Output.DynamicBitrate.Beta="Dynamicky meniť bitrate v závislosti na zahltení siete (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Dynamicky mení bitrate počas behu, namiesto odhadzovania snímkov pre redukciu zahltenia siete.\n\nToto ale môže mať za následok zvýšenie odozvy pre divákov, keď dôjde k náhlemu zahlteniu siete.\nKeď sa bitrate zníži, môže pár minúť trvať než sa obnoví na pôvodnú hodnotu.\n\nMomentálne podporované iba pre RTMP."
@@ -779,7 +792,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Upozornenie: Nahrávanie nemôže byť pozastavené, ak je kvalita nahrávania nastavená na \"Rovnaké ako pre vysielanie\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Varovanie: Aktuálne vybraný nahrávací formát je nekompatibilný s vybraným streamovacím enkodérom(mi)."
 Basic.Settings.Output.Simple.Warn.Encoder="Upozornenie: Nahrávanie softvérovým kodérom s rozdielnou kvalitou než vysielanie spôsobí zvýšenú záťaž CPU pri nahrávaní a vysielaní zároveň."
-Basic.Settings.Output.Simple.Warn.Lossless="Varovanie: Bezstratová kvalita generuje ohromne veľké súbory! Bezstratová kvalita môže použiť až 7 gigabajtov za minútu na disku pri vysokých rozlíšeniach a snímkoch za sekundu. Bezstratová kvalita nie je odporúčaná pre dlhé nahrávky pokiaľ nemáte veľmi veľa priestoru na disku."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Ste si istí, že chcete použiť bezstratovú kvalitu?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Varovanie bezstratovej kvality!"
 Basic.Settings.Output.Simple.Encoder.Software="Softvérový (x264)"
@@ -854,7 +866,7 @@
 Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Nastavenie kodéra obrazu (ak existuje)"
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Enkodér zvuku"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Nastavenie kodéra zvuku (ak existuje)"
-Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Nastavenie zmiešavača (ak existuje)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Nastavenia muxéra (ak nejaké sú)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval kľúčových snímkov (snímky)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Zobraziť všetky kodeky (aj potenciálne nekompatibilné)"
 Basic.Settings.Output.Adv.FFmpeg.Settings="FFmpeg nastavenia"
@@ -926,7 +938,7 @@
 Basic.Settings.Audio.PeakMeterType="Typ merača vrcholov"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Vzorkový vrchol"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Pravý vrchol (Vyššie využitie CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="VAROVANIE: Priestorový zvuk je zapnutý."
+Basic.Settings.Audio.MultichannelWarning.Enabled="VAROVANIE: Priestorový zvuk je zapnutý."
 Basic.Settings.Audio.MultichannelWarning="Ak vysielate, uistite sa že vaša vysielacia služba podporuje prijímanie a aj prehrávanie priestorového zvuku. Facebook 360 Live je príklad služby, ktorá priestorový zvuk plne podporuje. I keď Facebook Live a YouTube Live podporujú prijímanie priestorového zvuku, Facebook Live ho prevádza do stereo zvuku a YouTub Live prehráva iba 2 kanály.\n\nOBS zvukové filtre sú kompatibilné s priestorovým zvukom, no podpora u VST pluginu nie je garantovaná."
 Basic.Settings.Audio.MultichannelWarning.Title="Povoliť priestorový zvuk?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Naozaj si želáte povoliť priestorový zvuk?"
@@ -974,7 +986,6 @@
 Basic.Settings.Advanced.FormatWarning="Upozornenie: Formáty farieb iné ako NV12/P010 sú primárne určené na nahrávanie a nie sú odporúčane pre streamovanie. Streamovanie môže spôsobiť zvýšené využitie CPU kvôli prevodu medzi farebnými formátmi."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Varovanie: Formáty s vysokou presnosťou sú zvyčajne používané s HDR farebnými priestormi."
 Basic.Settings.Advanced.FormatWarning2100="Varovanie: Rec. 2100 by malo používať formát s väčšou presnosťou."
-Basic.Settings.Advanced.Audio.BufferingTime="Čas medzipamäte zvuku"
 Basic.Settings.Advanced.Video.ColorFormat="Formát farieb"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bitový, 4:2:0, 2 roviny)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bitový, 4:2:0, 3 roviny)"
@@ -1000,6 +1011,7 @@
 Basic.Settings.Advanced.Network="Sieť"
 Basic.Settings.Advanced.Network.Disabled="Momentálne zvolený streamovací protokol nepodporuje zmenu sieťových nastavení."
 Basic.Settings.Advanced.Network.BindToIP="Zviazať s IP adresou"
+Basic.Settings.Advanced.Network.IPFamily="IP Rodina"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Zapnúť sieťové optimalizácie"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Zapnúť TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Pokúsi sa prispôsobiť RTMP výstup tak, aby bol priateľskejší k ďalším aplikáciám, ktoré sú citlivé na odozvu a to reguláciou rýchlosti odosielania.\nMôže zvýšiť počet zahodených snímkov na nestabilných pripojeniach."
@@ -1060,6 +1072,8 @@
 SceneItemShow="Zobraz '%1'"
 SceneItemHide="Skry '%1'"
 OutputWarnings.NoTracksSelected="Musíte vybrať aspoň jednu zvukovú stopu"
+OutputWarnings.NoTracksSelectedOnExit.Title="Chyba nastavení výstupu"
+OutputWarnings.NoTracksSelectedOnExit.Text="Všetky výstupy musia mať aspoň jednu zvukovú stopu vybranú."
 OutputWarnings.MP4Recording="Upozornenie: Nahrávky uložené v MP4/MOV nebude možné obnoviť, ak súbor nebude korektne ukončený (napr. po BSOD, výpadku napájania atp.). Ak chcete nahrávať viacero zvukových stôp, skúste použiť MKV a po dokončení súbor previesť do MP4/MOV (Súbor -> Previesť nahrávky)"
 OutputWarnings.CannotPause="Upozornenie: Nahrávanie nemôže byť pozastavené, ak je kvalita nahrávania nastavená na \"Rovnaké ako pre vysielanie\""
 OutputWarnings.CodecIncompatible="Vybratý zvukový alebo obrazový enkodér bol obnovený kvôli nekompatibilite. Prosím vyberte kompatibilný enkodér zo zoznamu."
@@ -1080,11 +1094,12 @@
 CustomColor="Vlastná farba"
 BrowserSource.EnableHardwareAcceleration="Zapnúť hardvérovú akceleráciu pre zdroje prehliadača"
 About="O programe"
-About.Info="OBS Studio je softvér pre nahrávanie videa a živé vysielanie. Má otvorený zdroj a je zdarma."
+About.Info="OBS Štúdio je softvér pre nahrávanie videa a živé vysielanie. Má otvorený zdroj a je zdarma."
 About.Donate="Prispieť"
 About.GetInvolved="Zapojiť sa"
 About.Authors="Autori"
 About.License="Licencia"
+About.Error="Chyba! Súbor nemohol byť prečítaný.\n\nChoďte na: %1"
 About.Contribute="Podporte projekt OBS"
 AddUrl.Title="Pridať Zdroj cez URL"
 AddUrl.Text="Pretiahli ste nejaký URL do OBS. Toto automaticky pridá daný link ako zdroj. Pokračovať?"
@@ -1101,18 +1116,16 @@
 Importer.AutomaticCollectionPrompt="Automatické vyhľadávanie zbierok scén"
 Importer.AutomaticCollectionText="OBS dokáže automaticky nájsť importovateľné kolekcie scén z podporovaných programov tretích strán. Chcete, aby spoločnosť OBS automaticky vyhľadávala zbierky?\n\nMôžete to zmeniť neskôr v časti Nastavenia > Všeobecné > Dovozcovia."
 Restart="Reštartovať"
-NeedsRestart="Aplikáciu OBS Studio je potrebné reštartovať. Chcete teraz reštartovať?"
+NeedsRestart="Aplikáciu OBS Štúdio je potrebné reštartovať. Chcete reštartovať teraz?"
 LoadProfileNeedsRestart="Profil obsahuje nastavenia, ktoré vyžadujú reštart OBS:\n%1\n\nChcete reštartovať OBS pre použitie týchto nastavení?"
 ContextBar.NoSelectedSource="Žiaden vybratý zdroj"
 ContextBar.ResetTransform="Resetovať transformáciu"
-ContextBar.FitToCanvas="Vtesnať do plátna"
 ContextBar.MediaControls.PlayMedia="Prehrať médiá"
 ContextBar.MediaControls.PauseMedia="Pozastaviť médiá"
 ContextBar.MediaControls.StopMedia="Zastaviť médiá"
 ContextBar.MediaControls.RestartMedia="Reštartovať médiá"
 ContextBar.MediaControls.PlaylistNext="Ďalšia v zozname skladieb"
 ContextBar.MediaControls.PlaylistPrevious="Predchádzajúca v zozname skladieb"
-ContextBar.MediaControls.MediaProperties="Vlastnosti médií"
 ContextBar.MediaControls.BlindSeek="Widget posuvníka médií"
 YouTube.Auth.Ok="Autorizácia dokončená úspešne.\nTeraz môžete zavrieť túto stránku."
 YouTube.Auth.NoCode="Autorizačný proces nebol dokončený."
@@ -1192,3 +1205,5 @@
 YouTube.Errors.liveChatEnded="Live stream sa skončil."
 YouTube.Errors.messageTextInvalid="Text správy je neplatný."
 YouTube.Errors.rateLimitExceeded="Posielate správy príliš rýchlo!"
+YouTube.DocksRemoval.Title="Odstrániť pôvodné doky YouTube prehliadača"
+YouTube.DocksRemoval.Text="Tieto doky prehliadača budú odstránené ako zastaralé:\n\n%1\nPoužite \"Doky/YouTube Live Control Room\" namiesto toho."

obs-studio-29.1.3.tar.xz/UI/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/sl-SI.ini Changed

@@ -91,7 +91,6 @@
 LogViewer="Pregledovalnik dnevnika"
 ShowOnStartup="Pokaži ob zagonu"
 OpenFile="Odpri datoteko"
-AddValue="Dodaj %1"
 AddSource="Dodaj vir"
 RemoveScene="Odstrani izbrani prizor"
 RemoveSource="Odstrani izbrani vir"
@@ -103,11 +102,19 @@
 SourceFilters="Odpri filtre vira"
 MixerToolbarMenu="Meni mešalnika zvoka"
 SceneFilters="Odpti filtre prizora"
+List="Seznam"
+Grid="Mreža"
 PluginsFailedToLoad.Title="Napaka pri nalaganju vstavka"
 PluginsFailedToLoad.Text="Naslednji vstavki OBS se niso uspešno naložili.\n\n%1\nTe vstavke posodobite ali odstranite."
 AlreadyRunning.Title="OBS se že izvaja"
 AlreadyRunning.Text="OBS se že izvaja! Če tega niste že storili, zaprite vse obstoječe primerke OBS, preden poskusite zagnati nov primerek. Če imate OBS nastavljen, da se zmanjša v sistemsko vrstico, preverite, ali se tam še vedno izvaja."
 AlreadyRunning.LaunchAnyway="Vseeno zaženi"
+AutoSafeMode.Title="Varni način"
+AutoSafeMode.Text="OBS se ni pravilno zaprl ob vaši zadnji seji.\n\nAli ga želite zagnati v varnem načinu (onemogočeni vstavki, skripti in spletne vtičnice tretjih strani)?"
+AutoSafeMode.LaunchSafe="Zaženi v varnem načinu"
+AutoSafeMode.LaunchNormal="Zaženi navadno"
+SafeMode.Restart="Ali želite ponovno zagnati OBS v varnem načinu (z onemogočenimi vstavki, skriptami in spletnimi vtičnicami tretjih strani)?"
+SafeMode.RestartNormal="Ali želite ponovno zagnati OBS v navadnem načinu?"
 ChromeOS.Title="Nepodprta platforma"
 ChromeOS.Text="Kaže, da se OBS izvaja znotraj vsebnika ChromeOS. Ta platforma ni podprta."
 Wine.Title="Wine zaznan"
@@ -175,8 +182,8 @@
 Basic.AutoConfig.StreamPage.Server="Strežnik"
 Basic.AutoConfig.StreamPage.StreamKey="Ključ pretoka"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: vnesite šifrirno geslo.\nRTMP: vnesite ključ, ki ga zagotovi storitev.\nSRT: vnesite id toka streamid, če ga storitev uporablja."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(povezava)"
 Basic.AutoConfig.StreamPage.EncoderKey="Ključ kodirnika"
+Basic.AutoConfig.StreamPage.BearerToken="Žeton prenašalca"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Povezan račun"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Oceni bitno hitrost s preizkusom pasovne širine (lahko traja nekaj minut)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Daj prednost strojnemu kodiranju"
@@ -228,8 +235,6 @@
 Updater.UpdateNow="Posodobi zdaj"
 Updater.RemindMeLater="Opomni me kasneje"
 Updater.Skip="Preskoči različico"
-Updater.Running.Title="Program je trenutno aktiven"
-Updater.Running.Text="Izhodi so trenutno v uporabi. Prosimo ugasnite izhode pred posodabljanjem"
 Updater.NoUpdatesAvailable.Title="Na voljo ni nobenih posodobitev"
 Updater.NoUpdatesAvailable.Text="Na voljo ni novih posodobitev"
 Updater.BranchNotFound.Title="Kanal za posodobitev je odstranjen"
@@ -239,8 +244,6 @@
 Updater.RepairConfirm.Title="Potrdite preverjanje celovitosti"
 Updater.RepairConfirm.Text="Zagon preverjanja celovitosti preišče vašo namestitev OBS glede okvarjenosti in ponovno prenese okvarjene/spremenjene datoteke. To lahko traja.\n\nAli želite nadaljevati?"
 Updater.FailedToLaunch="Zagon programa za posodabljanje je spodletel"
-Updater.GameCaptureActive.Title="Zajemanje igre se izvaja"
-Updater.GameCaptureActive.Text="Knjižnica za zajem igre se trenutno uporablja. Prosimo, zaprite vse igre/programe, ki se zajemajo (ali ponovno zaženite Windows) in poskusite ponovno."
 QuickTransitions.SwapScenes="Po prehodu zamenjaj predogledne/programske prizore"
 QuickTransitions.SwapScenesTT="Po prehodu zamenja predogledne in programske prizore (če izvirni prizor programa še obstaja).\nTo ne bo razveljavilo sprememb, ki so bile narejene na izvirnem prizoru programa."
 QuickTransitions.DuplicateScene="Podvoji prizor"
@@ -254,6 +257,8 @@
 Basic.SceneTransitions="Prehodi prizorov"
 Basic.TransitionDuration="Trajanje"
 Basic.TogglePreviewProgramMode="Studijski način"
+Basic.EnablePreviewProgramMode="Omogoči studijski način"
+Basic.DisablePreviewProgramMode="Onemogoči studijski način"
 Undo.Undo="Razveljavi"
 Undo.Redo="Obnovi"
 Undo.Add="Dodaj '%1'"
@@ -302,6 +307,8 @@
 Undo.GroupItems="Združi predmete v '%1'"
 TransitionNameDlg.Text="Vnesite ime prehoda"
 TransitionNameDlg.Title="Ime prehoda"
+TitleBar.SafeMode="VARNI NAČIN"
+TitleBar.PortableMode="Prenosni način"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Prizori"
 NameExists.Title="Ime že obstaja"
@@ -326,6 +333,7 @@
 Output.StartStreamFailed="Neuspešen pričetek pretakanja"
 Output.StartRecordingFailed="Zagon snemanja je spodletel"
 Output.StartReplayFailed="Zagon medpomnilnika za ponovitev je spodletel"
+Output.StartVirtualCamFailed="Zagon navidezne kamere je spodletel"
 Output.StartFailedGeneric="Zagon izhoda je spodletel. Za podrobnosti preverite dnevnik.\n\nOpomba: če uporabljate kodirnik NVENC ali AMD, se prepričajte, da so vaši grafični gonilniki posodobljeni."
 Output.ReplayBuffer.PauseWarning.Title="Ponovnih predvajanj ni mogoče shraniti med premorom"
 Output.ReplayBuffer.PauseWarning.Text="Opozorilo: ponovnih predvajanj ni mogoče shraniti, ko je snemanje v premoru."
@@ -338,7 +346,7 @@
 Output.ConnectFail.Disconnected="Povezava s strežnikom je prekinjena."
 Output.StreamEncodeError.Title="Napaka pri kodiranju"
 Output.StreamEncodeError.Msg="Med pretakanjem se je pojavila napaka kodirnika."
-Output.StreamEncodeError.Msg.LastError="Med pretakanjem se je pojavila napaka kodirnika.\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Med pretakanjem se je pojavila napaka kodirnika: %1"
 Output.RecordFail.Title="Zagon snemanja je spodletel"
 Output.RecordFail.Unsupported="Izhodni format ni podprt ali pa ne podpira več kot ene zvočne steze. Preverite nastavitve in poizkusite znova."
 Output.RecordNoSpace.Title="Premalo prostora na disku"
@@ -346,7 +354,7 @@
 Output.RecordError.Title="Napaka pri snemanju"
 Output.RecordError.Msg="Med snemanjem se je pojavila nedoločena napaka."
 Output.RecordError.EncodeErrorMsg="Med snemanjem se je pojavila napaka kodirnika."
-Output.RecordError.EncodeErrorMsg.LastError="Med snemanjem se je pojavila napaka kodirnika.\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Med snemanjem se je pojavila napaka kodirnika: %1"
 Output.BadPath.Title="Nepravilna pot do datoteke"
 Output.BadPath.Text="Nastavljene poti za snemanje ni bilo mogoče odpreti. Preverite Pot snemanja v Nastavitve → Izhod → Snemanje."
 Output.NoBroadcast.Title="Ni nastavljenega oddajanja"
@@ -376,6 +384,8 @@
 Remux.ExitUnfinishedTitle="Prepakiranje se izvaja"
 Remux.ExitUnfinished="Prepakiranje ni dokončano. Če ga sedaj zaustavite, bo lahko ciljna datoteka neuporabna.\n Res želite zaustaviti prepakiranje?"
 Remux.HelpText="Za prepakiranje v to okno potegnite datoteke ali izberite prazno celico \"Posnetek OBS\", za iskanje datoteke."
+Remux.NoFilesAddedTitle="Datoteka za prepakiranje ni bila dodana"
+Remux.NoFilesAdded="Dodana ni bila nobena datoteka za prepakiranje. Spustite mapo, ki vsebuje eno ali več videodatotek."
 MissingFiles="Manjkajoče datoteke"
 MissingFiles.MissingFile="Manjkajoča datoteka"
 MissingFiles.NewFile="Nova datoteka"
@@ -394,6 +404,7 @@
 MissingFiles.AutoSearchText="OBS je našel dodatne ustrezne datoteke za manjkajoče v tej mapi. Bi jih radi dodali?"
 MissingFiles.NoMissing.Title="Preverjanje manjkajočih datotek"
 MissingFiles.NoMissing.Text="Ni manjkajočih datotek"
+MacPermissions.MenuAction="Preglej dovoljenja programa ..."
 MacPermissions.Title="Preglej dovoljenja programa"
 MacPermissions.Description="OBS Studio potrebuje vaše dovoljenje, da lahko zagotavlja nekatere funkcije. Priporočamo, da podate ta dovoljenja, niso pa potrebna za zagon programa. Vedno jih lahko omogočite tudi kasneje."
 MacPermissions.Description.OpenDialog="To pogovorno okno lahko ponovno odprete prek menija OBS Studio."
@@ -409,8 +420,8 @@
 MacPermissions.Item.Accessibility="Dostopnost"
 MacPermissions.Item.Accessibility.Details="Da bi tipke za bližnjice delovale, medtem ko je pozornost na drugih programih, potrdite to dovoljenje."
 MacPermissions.Continue="Nadaljuj"
-UpdateAvailable="Nova posodobitev je na voljo"
-UpdateAvailable.Text="Različica %1.%2.%3 je sedaj na voljo. <a href='%4'>Kliknite tukaj za prenos</a>"
+SourceLeak.Title="Napaka pri čiščenju virov"
+SourceLeak.Text="Pri spreminjanju scenskih zbirk je prišlo do težav in nekaterih virov ni bilo mogoče sprostiti. Razlog je ponavadi v vtičnikih, ki virov ne sprostijo pravilno. Poskrbite, da so vtičniki ažurirani.\n\nOBS Studi se bo sedaj zaprl, da prepreči morebitno okvaro podatkov."
 Basic.DesktopDevice1="Namizni zvok"
 Basic.DesktopDevice2="Namizni zvok 2"
 Basic.AuxDevice1="Mikrofon/Pomožni vhod"
@@ -472,6 +483,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (samodejno izberi: %2)"
 Basic.PropertiesWindow.SelectColor="Izberi barvo"
 Basic.PropertiesWindow.SelectFont="Izberi pisavo"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Izberite pisavo"
 Basic.PropertiesWindow.ConfirmTitle="Nastavitve so se spremenile"
 Basic.PropertiesWindow.Confirm="Obstajajo neshranjene spremembe. Ali jih želite obdržati?"
 Basic.PropertiesWindow.NoProperties="Lastnosti niso na voljo"
@@ -498,7 +510,7 @@
 Basic.StatusBar.RecordingSavedTo="Posnetek je shranjen v '%1'"
 Basic.StatusBar.ReplayBufferSavedTo="Medpomnilnik za ponovitev shranjen v '%1'"
 Basic.StatusBar.ScreenshotSavedTo="Posnetek zaslona je shranjen v '%1'"
-Basic.StatusBar.AutoRemuxedTo="Posnetek je bil samodejno remuksiran v '%1'"
+Basic.StatusBar.AutoRemuxedTo="Posnetek je bil samodejno prepakiran v »%1«"
 Basic.Filters="Filtri"
 Basic.Filters.AsyncFilters="Zvočni/slikovni filtri"
 Basic.Filters.AudioFilters="Zvočni filtri"
@@ -581,9 +593,9 @@
 Basic.VCam.VirtualCamera="Virtualna kamera"
 Basic.VCam.OutputType="Vrsta izhoda"
 Basic.VCam.OutputSelection="Izbor izhoda"
-Basic.VCam.Internal="Notranji"
-Basic.VCam.InternalDefault="Programski izhod (privzeto)"
-Basic.VCam.InternalPreview="Predogledni izhod"
+Basic.VCam.OutputType.Program="Program (privzeto)"
+Basic.VCam.OutputSelection.NoSelection="Ni izbora za to vrsto izhoda"
+Basic.VCam.RestartWarning="Virtualna kamera bo ponovno zagnana, da se ta sprememba uveljavi"
 Basic.MainMenu.File="Datoteka (&F)"
 Basic.MainMenu.File.Export="Izvozi (&E)"
 Basic.MainMenu.File.Import="Uvoz&i"
@@ -625,17 +637,18 @@
 Basic.MainMenu.Edit.AdvAudio="N&apredne lastnosti zvoka"
 Basic.MainMenu.View="Pogled (&V)"
 Basic.MainMenu.View.Toolbars="Orodne vrs&tice"
-Basic.MainMenu.View.ListboxToolbars="Gumbi za seznam prizorov/virov"
+Basic.MainMenu.View.ListboxToolbars="Zasidraj orodne vrstice"
 Basic.MainMenu.View.ContextBar="Orodna vrstica vira"
-Basic.MainMenu.View.SceneTransitions="P&rehodi prizorov"
 Basic.MainMenu.View.SourceIcons="&Ikone virov"
 Basic.MainMenu.View.StatusBar="Vr&stica stanja"
 Basic.MainMenu.View.Fullscreen.Interface="Celozaslonski vmesnik"
 Basic.MainMenu.View.ResetUI="&Ponastavi uporabniški vmesnik"
 Basic.MainMenu.View.AlwaysOnTop="Vedno n&a vrhu"
+Basic.MainMenu.View.SceneListMode="Način seznama prizorov"
 Basic.MainMenu.Docks="&Sidrišča"
 Basic.MainMenu.Docks.ResetDocks="&Ponastavi sidrišča"
 Basic.MainMenu.Docks.LockDocks="&Zakleni sidrišča"
+Basic.MainMenu.Docks.SideDocks="&Sidrišča polne višine"
 Basic.MainMenu.Docks.CustomBrowserDocks="Sidrišča &brskalnika po meri ..."
 Basic.MainMenu.SceneCollection="Zbirka prizorov (&S)"
 Basic.MainMenu.Profile="&Profil"
@@ -644,7 +657,6 @@
 Basic.MainMenu.SceneCollection.Import="Uvozi zbirko prizorov"
 Basic.MainMenu.SceneCollection.Export="Izvozi zbirko prizorov"
 Basic.MainMenu.Profile.Exists="Profil že obstaja"
-Basic.MainMenu.SceneCollection.Exists="Zbirka prizorov že obstaja"
 Basic.MainMenu.Tools="Orodja (&T)"
 Basic.MainMenu.Help="Pomoč (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal za pomoč"
@@ -656,8 +668,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Naloži trenutno dnevniško datoteko (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Naloži &prejšnjo datoteko dnevnika"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Pokaži trenutni dne&vnik"
+Basic.MainMenu.Help.ReleaseNotes="Opombe ob izdaji"
 Basic.MainMenu.Help.CheckForUpdates="Preveri za posodobitve"
 Basic.MainMenu.Help.Repair="Preveri celovitost datoteke"
+Basic.MainMenu.Help.RestartSafeMode="Ponovno zaženi v varnem načinu"
+Basic.MainMenu.Help.RestartNormal="Ponovno zaženi v navadnem načinu"
 Basic.MainMenu.Help.CrashLogs="Po&ročila o zrušitvi"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Prikaži poročila o zrušitvi (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Naloži &prejšnje poročilo o sesutju"
@@ -727,7 +742,6 @@
 Basic.Settings.General.ChannelName.beta="Beta / kandidat za izdajo"
 Basic.Settings.General.ChannelDescription.beta="Morebiti nestabilna različica pred izdajo"
 Basic.Settings.Stream="Pretok"
-Basic.Settings.Stream.StreamType="Vrsta pretoka"
 Basic.Settings.Stream.Custom.UseAuthentication="Uporabi overitev"
 Basic.Settings.Stream.Custom.Username="Uporabniško ime"
 Basic.Settings.Stream.Custom.Password="Geslo"
@@ -759,7 +773,6 @@
 Basic.Settings.Output.Encoder.Video="Slikovni kodirnik"
 Basic.Settings.Output.Encoder.Audio="Zvočni kodirnik"
 Basic.Settings.Output.SelectDirectory="Izberite mapo za posnetke"
-Basic.Settings.Output.SelectFile="Izberite datoteko posnetka"
 Basic.Settings.Output.DynamicBitrate="Dinamično spreminjaj bitno hitrost za odpravo zastojev"
 Basic.Settings.Output.DynamicBitrate.Beta="Dinamično spreminjaj bitno hitrost za odpravo zastojev (beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Namesto izpuščanja sličic za odpravo zastojev sproti dinamično spreminja bitno hitrost.\n\nUpoštevajte, da to lahko poveča zakasnitve pri gledalcih, če pride do nenadnega znatnega zastoja.\nKo se bitna hitrost zniža, lahko obnovitev traja nekaj minut.\n\nTrenutno podprto samo za RMTP."
@@ -787,7 +800,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Opozorilo: posnetkov ni mogoče začasno ustaviti, če je kakovost posnetka nastavljena na \"Enaka kot pri pretakanju\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Opozorilo: trenutno izbran zapis posnetkov ni združljiv z izbranimi kodirniki pretoka."
 Basic.Settings.Output.Simple.Warn.Encoder="Opozorilo: snemanje s programskim kodirnikom z drugačno kakovostjo, kot jo ima pretok zahteva dodatno obremenitev procesorja, kadar hkrati pretakate in snemate."
-Basic.Settings.Output.Simple.Warn.Lossless="Opozorilo: brezizgubna kakovost ustvari izjemno velike velikosti datotek! Brezizgubna kakovost lahko porabi več kot 7 GB prostora na disku na minuto pri visokih ločljivostih in hitrostih sličic. Brezizgubna kakovost ni priporočljiva za dolge posnetke, razen če imate na voljo veliko prostora na disku."
+Basic.Settings.Output.Simple.Warn.Lossless="Opozorilo: Kakovost brez izgub ustvari izjemno velike datoteke! Kakovost brez izgub lahko zasede več kot 7 GB prostora na disku na minuto pri visokih ločljivostih in hitrostih. Kakovost brez izgub ni priporočljiva za dolge posnetke, razen če imate na voljo veliko prostora na disku. Medpomnilnik za ponovno predvajanje ni na voljo, če uporabljate kakovost brez izgub."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Ali res želite uporabiti brezizgubno kakovost?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Opozorilo o brezizgubni kakovosti!"
 Basic.Settings.Output.Simple.Encoder.Software="Programski (x264)"
@@ -936,8 +949,8 @@
 Basic.Settings.Audio.PeakMeterType="Vrsta merilca najvišjih točk"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Primer najvišje točke"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Resnična najvišja točka (večja poraba CPE-ja)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="OPOZORILO: prostorski zvok je omogočen."
-Basic.Settings.Audio.MultichannelWarning="Med pretakanjem preveri, ali pretočna storitev podpira tako snemanje, kot tudi predvajanje prostorskega zvoka. Facebook 360 Live, je primer, kjer je prostorski zvok v celoti podprt. Čeprav Facebook Live in YouTube Live podpirata snemanje prostorskega zvoka, ga Facebook Live zmiksa kot stereo, YouTube Live pa predvaja samo dva kanala.\n\nZvočni filtri OBS so združljivi s prostorskim zvokom, čeprav podpora vtičnikom VST ni zajamčena."
+Basic.Settings.Audio.MultichannelWarning.Enabled="OPOZORILO: prostorski zvok je omogočen."
+Basic.Settings.Audio.MultichannelWarning="Med pretakanjem preveri, ali pretočna storitev podpira tako snemanje kot tudi predvajanje prostorskega zvoka. Facebook 360 Live npr. v celoti podpira prostorski zvok; You Tube Live podpira vnos zvoka 5.1 (in predvajanje na TV zaslonih).\n\nZvočni filtri OBS so združljivi s prostorskim zvokom, čeprav podpora vtičnikom VST ni zajamčena."
 Basic.Settings.Audio.MultichannelWarning.Title="Omogoči prostorski zvok?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Ali res želite omogočiti prostorski zvok?"
 Basic.Settings.Audio.Devices="Globalne avdio naprave"
@@ -984,7 +997,6 @@
 Basic.Settings.Advanced.FormatWarning="Opozorilo: barvni formati, ki niso NV12/P010, so v glavnem namenjeni snemanju in niso priporočljivi za pretakanje. Pretakanje lahko poveča obremenitev procesorja zaradi pretvarjanja barvne oblike."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Opozorilo: visoko natančni formati so običajno uporabljeni v barvnih prostorih HDR"
 Basic.Settings.Advanced.FormatWarning2100="Opozorilo: Rec. 2100 naj uporablja format z višjo natančnostjo."
-Basic.Settings.Advanced.Audio.BufferingTime="Čas medpomnenja zvoka"
 Basic.Settings.Advanced.Video.ColorFormat="Barvni format"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bitno, 4:2:0, 2 ravnini)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bitno, 4:2:0, 3 ravnine)"
@@ -1010,6 +1022,7 @@
 Basic.Settings.Advanced.Network="Omrežje"
 Basic.Settings.Advanced.Network.Disabled="Trenutno izbrani protokol pretakanja ne podpira spremembe omrežnih nastavitev."
 Basic.Settings.Advanced.Network.BindToIP="Veži na IP"
+Basic.Settings.Advanced.Network.IPFamily="Družina IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Vklopi omrežne optimatizacije"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Vklopi TCP spodujanje"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Poskus, da izhod RTMP postane prijaznejši za druge programe, ki so občutljivi na latenco, tako da uravnava stopnjo prenosa.\nLahko poveča možnost za izpuščanje slik na nezanesljivih povezavah."
@@ -1082,6 +1095,8 @@
 SceneItemShow="Prikaži '%1'"
 SceneItemHide="Skrij '%1'"
 OutputWarnings.NoTracksSelected="Izbrati morate vsaj eno stezo"
+OutputWarnings.NoTracksSelectedOnExit.Title="Napaka nastavitev izhoda"
+OutputWarnings.NoTracksSelectedOnExit.Text="Vsi izhodi morajo imeti izbrano vsaj eno zvočno stezo."
 OutputWarnings.MP4Recording="Opozorilo: posnetkov, shranjenih v MP4/MOV, ne bo mogoče obnoviti, če datoteka ni dokončana (npr. kot posledica \"modrega zaslona smrti\", izgube napajanja itd.). Če želite posneti več zvočnih stez, lahko uporabite MKV-ja in ga na koncu prepakirate v MP4/MOV (Datoteka → Prepakiraj posnetke)"
 OutputWarnings.CannotPause="Opozorilo: posnetkov ni mogoče začasno ustaviti, če je snemalni kodirnik nastavljen na \"(uporabi pretočni kodirnik)\""
 OutputWarnings.CodecIncompatible="Izbor kodirnika zvoka ali slike je ponastavljen zaradi nezdružljivosti. S seznama izberite združljiv kodirnik."
@@ -1107,6 +1122,7 @@
 About.GetInvolved="Pridruži se"
 About.Authors="Avtorji"
 About.License="Licenca"
+About.Error="Napaka! Datoteke ni moč prebrati.\n\nGlejte: %1"
 About.Contribute="Podprite projekt OBS"
 AddUrl.Title="Dodaj vir preko URL naslova"
 AddUrl.Text="V OBS ste potegnili URL naslov. To ga bo samodejno dodalo kot vire. Nadaljujem?"
@@ -1127,14 +1143,12 @@
 LoadProfileNeedsRestart="Profil vsebuje nastavitve, ki zahtevajo ponovni zagon OBS:\n%1\n\nAli želite ponovno zagnati OBS, da bodo te nastavitve delovale?"
 ContextBar.NoSelectedSource="Ni izbranih virov"
 ContextBar.ResetTransform="Ponastavi položaj, velikost in rotacijo elementa."
-ContextBar.FitToCanvas="Prilagodi na sliko"
 ContextBar.MediaControls.PlayMedia="Predvajaj"
 ContextBar.MediaControls.PauseMedia="Pavziraj"
 ContextBar.MediaControls.StopMedia="Zaustavi"
 ContextBar.MediaControls.RestartMedia="Ponovno žaženi"
 ContextBar.MediaControls.PlaylistNext="Naprej na seznamu predvajanja"
 ContextBar.MediaControls.PlaylistPrevious="Prejšnje na seznamu predvajanja"
-ContextBar.MediaControls.MediaProperties="Lastnosti medijev"
 ContextBar.MediaControls.BlindSeek="Pripomoček za iskanje medijev"
 YouTube.Auth.Ok="Uspešna overitev.\nZdaj lahko zaprete to stran"
 YouTube.Auth.NoCode="Postopek overitve je bil zaključen."
@@ -1215,3 +1229,5 @@
 YouTube.Errors.liveChatEnded="Tok v živo je končan."
 YouTube.Errors.messageTextInvalid="Besedilo sporočila ni veljavno."
 YouTube.Errors.rateLimitExceeded="Sporočila pošiljate prehitro!"
+YouTube.DocksRemoval.Title="Počisti opuščene zložene zavihke brskalnika YouTube"
+YouTube.DocksRemoval.Text="Ti zloženi zavihki brskalnika bodo odstranjeni kot opuščeni:\n\n%1\nNamesto tega uporabite »Zavihki/režija YouTube«."

obs-studio-29.1.3.tar.xz/UI/data/locale/sq-AL.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/sq-AL.ini Changed

@@ -75,6 +75,7 @@
 HideTransition="Fshih Pëerkthimet"
 None="Asnje"
 StudioMode.Preview="Inspektim"
+StudioMode.PreviewSceneName="Parapamje: %1"
 ShowInMultiview="Shfaqe në Shumë Pamje"
 VerticalLayout="Plani vertikal"
 Group="Grup"
@@ -89,7 +90,6 @@
 LogViewer="Kycje shikuesi"
 ShowOnStartup="Shfaqe në fillim"
 OpenFile="Hap skedën"
-AddValue="Shto %1"
 AlreadyRunning.Title="OBS tashmë po funksion"
 AlreadyRunning.Text="OBS tashmë po kandidon! Nëse nuk keni ndërmend ta bëni këtë, mbyllni çdo rast ekzistues të OBS para se të provoni të shkoni në një instancë të re. Nëse keni OBS vendosur për të minimizuar në tabaka e sistemit, ju lutemi kontrolloni për të parë nëse vazhdon të ekzekutohet atje."
 AlreadyRunning.LaunchAnyway="Filloje ne nje menyre"
@@ -145,7 +145,6 @@
 Basic.AutoConfig.StreamPage.Service="Sherbim"
 Basic.AutoConfig.StreamPage.Service.ShowAll="Trego të gjitha..."
 Basic.AutoConfig.StreamPage.StreamKey="Celesi i transmetimit"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(linku)"
 Basic.AutoConfig.StreamPage.EncoderKey="Çelësi i Koduesit"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Llogari e lidhur"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Vlerso bitratin e testit te bandwithit (mund te vonohet disa minuta)"
@@ -168,6 +167,9 @@
 Basic.AutoConfig.TestPage.Result.RecordingEncoder="Koduesi i inçizimit"
 Basic.Stats.CPUUsage="Përdorimi i CPU"
 Basic.Stats.HDDSpaceAvailable="Hapësira e disponueshme e diskut"
+TitleBar.PortableMode="Færanlegt-mode "
 MissingFiles.HelpText="Disa skedarë mungojnë që herën e fundit që ju perdorët OBS"
 MissingFiles.Replaced="Zëvëndesuar"
+SourceLeak.Title="Hreinsun á Grunnvillu"
+SourceLeak.Text="Vandamál kom upp þegar skipt var um senusafn og ekki var hægt að afhlaða sumum heimildum. Þetta vandamál stafar venjulega af viðbótum sem gefa ekki út auðlindir á réttan hátt. Gakktu úr skugga um að allar viðbætur sem þú notar séu uppfærðar.\n\nOBS Studio mun nú hætta til að koma í veg fyrir hugsanlega gagnaspillingu."
 Basic.Main.Source="Burimi"

obs-studio-29.1.3.tar.xz/UI/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/sr-CS.ini Changed

@@ -85,7 +85,6 @@
 LogViewer="Pregled logova"
 ShowOnStartup="Prikaži prilikom pokretanja"
 OpenFile="Otvori fajl"
-AddValue="Dodaj %1"
 AlreadyRunning.Title="OBS je već porkenut"
 AlreadyRunning.Text="OBS je već pokrenut! Osim ako zaista želite da uradite ovo, molimo Vas da prekinete sve procese vezane za OBS pre nego što pokrenete nov zadatak. U slučaju da OBS radi u pozadini, molimo Vas da proverite system tray (ikonice dole desno, pored sata)."
 AlreadyRunning.LaunchAnyway="Pokreni bez obzira na sve"
@@ -182,13 +181,9 @@
 Updater.UpdateNow="Ažuriraj odmah"
 Updater.RemindMeLater="Podseti me kasnije"
 Updater.Skip="Preskoči ovu verziju"
-Updater.Running.Title="Program je trenutno aktivan"
-Updater.Running.Text="Neki procesi su već započeti i ažuriranje software-a nije moguće u datim uslovima. Molimo Vas da zatvorite sve započete procese pre nego što se odlučite da ažurirate software"
 Updater.NoUpdatesAvailable.Title="Nema novih unapređenja"
 Updater.NoUpdatesAvailable.Text="Trenutno nema novih unapređenja"
 Updater.FailedToLaunch="Pokretanje ažuriranja software-a nije uspelo"
-Updater.GameCaptureActive.Title="Snimanje prikaza ekrana igrice je aktivirano"
-Updater.GameCaptureActive.Text="Trenutno je u upotrebi biblioteka za snimanje igre. Molimo da zatvorite sve igre/programe koji su snimljeni (ili restartujte Windows) i pokušate ponovo."
 QuickTransitions.DuplicateScene="Dupliraj scenu"
 QuickTransitions.EditProperties="Dupliraj izvore"
 QuickTransitions.HotkeyName="Brzi prelaz: %1"
@@ -281,8 +276,6 @@
 MissingFiles.Missing="Nedostaje"
 MissingFiles.Replaced="Zamjenjeno"
 MissingFiles.Found="Pronađeno"
-UpdateAvailable="Dostupna je novija verzija programa"
-UpdateAvailable.Text="Verzija %1.%2.%3 je dostupna. <a href='%4'>Kliknite ovde da preuzmete</a>"
 Basic.DesktopDevice1="Zvuk sa računara"
 Basic.DesktopDevice2="Zvuk sa računara 2"
 Basic.AuxDevice1="Mirkofon/Ulaz"
@@ -446,7 +439,6 @@
 Basic.MainMenu.Edit.AdvAudio="N&apredna podešavanja zvuka"
 Basic.MainMenu.View="Pregled (&V)"
 Basic.MainMenu.View.Toolbars="Linije ala&tki"
-Basic.MainMenu.View.SceneTransitions="S&censki prelazi"
 Basic.MainMenu.View.StatusBar="&Statusna linija"
 Basic.MainMenu.View.Fullscreen.Interface="Interfejs na celom ekranu"
 Basic.MainMenu.SceneCollection="Kolekcija &scena"
@@ -456,7 +448,6 @@
 Basic.MainMenu.SceneCollection.Import="Uvezi kolekciju scena"
 Basic.MainMenu.SceneCollection.Export="Izvezi kolekciju scena"
 Basic.MainMenu.Profile.Exists="Ovaj profil već postoji"
-Basic.MainMenu.SceneCollection.Exists="Ova kolekcija scena već postoji"
 Basic.MainMenu.Tools="Ala&ti"
 Basic.MainMenu.Help="Pomoć (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal za pomoć"
@@ -514,7 +505,6 @@
 Basic.Settings.General.MultiviewLayout.Vertical.Right="Vertikalno, desno (8 scena)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Horizontalno, gore (24 scene)"
 Basic.Settings.Stream="Strim"
-Basic.Settings.Stream.StreamType="Vrsta strima"
 Basic.Settings.Stream.Custom.UseAuthentication="Koristi autentifikaciju"
 Basic.Settings.Stream.Custom.Username="Korisničko ime"
 Basic.Settings.Stream.Custom.Password="Šifra"
@@ -535,7 +525,6 @@
 Basic.Settings.Output="Izlaz"
 Basic.Settings.Output.Format="Format snimanja"
 Basic.Settings.Output.SelectDirectory="Odaberi direktorijum za snimanje"
-Basic.Settings.Output.SelectFile="Odaberi datoteku za snimanje"
 Basic.Settings.Output.DynamicBitrate="Dinamički promjenite protok da izbjegnete zagušenje"
 Basic.Settings.Output.DynamicBitrate.Beta="Dinamički promjenite protok da izbjegnete zagušenje (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Umesto da ispuštate okvire radi smanjenja zagušenja, dinamički mjenjajte brzinu protoka u letu.\n\nNapomena da to može povećati kašnjenje gledalaca ako dođe do značajnih iznenadnih zagušenja.\nKada brzina protoka padne, može potrajati nekoliko minuta da se obnovi.\n\nTrenutno podržano samo za RTMP."
@@ -559,7 +548,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Upozorenje: Protok zvuka za strimovanje će biti podešen na %1, što je gornja granica koju trenutni striming servis podržava."
 Basic.Settings.Output.Simple.Warn.CannotPause="Upozorenje: Snimanja se neće moću pauzirati ukoliko je kvalitet snimanja podešen na 'Isti kao strim'."
 Basic.Settings.Output.Simple.Warn.Encoder="Upozorenje: Snimanje sa softverskim enkoderom drugačijeg kvaliteta u odnosu na strim će zahtevati dodatnu procesorsku snagu ako strimujete i snimate u isto vreme."
-Basic.Settings.Output.Simple.Warn.Lossless="Upozorenje: Kvalitet bez gubitka stvara izričito velike datoteke! Kvalitet bez gubitka može koristiti više od 7 gigabajta prostora na disku po minutu pri visokim rezolucijama i framerate-om. Kvalitet bez gubitka nije preporučen za duže snimanje osim ako imate veliku količinu slobodnog prostora na disku."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Da li ste sigurni da želite koristiti kvalitet bez gubitka?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Upozorenje o kvalitetu bez gubitka!"
 Basic.Settings.Output.Simple.Encoder.Software="Softverski (x264)"
@@ -636,7 +624,7 @@
 Basic.Settings.Audio.PeakMeterType="Tip merača vrha"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Vrh uzorka"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Pravi vrh (Veća upotreba procesora)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="UPOZORENJE: Zvuk okruženja je uključen."
+Basic.Settings.Audio.MultichannelWarning.Enabled="UPOZORENJE: Zvuk okruženja je uključen."
 Basic.Settings.Audio.MultichannelWarning.Title="Da li želite da uključite zvuk okruženja?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Da li ste sigurni da želite da uključite zvuk okruženja?"
 Basic.Settings.Audio.DesktopDevice="Zvuk sa računara"
@@ -658,7 +646,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Normalni"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Niži od normalnog"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Besposleni"
-Basic.Settings.Advanced.Audio.BufferingTime="Vreme baferovanja zvuka"
 Basic.Settings.Advanced.Video.ColorFormat="Format boja"
 Basic.Settings.Advanced.Video.ColorSpace="Raspon boja"
 Basic.Settings.Advanced.Video.ColorRange.Full="Potpuno"

obs-studio-29.1.3.tar.xz/UI/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/sr-SP.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="Прегледник дневника"
 ShowOnStartup="Прикажи при покретању"
 OpenFile="Отвори датотеку"
-AddValue="Додај %1"
 AddSource="Додај извор"
 RemoveScene="Уклони одабрану сцену"
 RemoveSource="Уклони одабран(е) избор(е)"
@@ -179,7 +178,6 @@
 Basic.AutoConfig.StreamPage.Server="Сервер"
 Basic.AutoConfig.StreamPage.StreamKey="Шифра за стримовање"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: унесите лозинку енкрипције.\nRTMP: унесите кључ који пружа сервис.\nSRT: унесите streamid ако га сервис користи."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Линк)"
 Basic.AutoConfig.StreamPage.EncoderKey="Кључ енкодера"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Повезани налог"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Процени брзину протока тестом пропусног опсега (може потрајати неколико минута)"
@@ -231,8 +229,6 @@
 Updater.UpdateNow="Aжурирај одмах"
 Updater.RemindMeLater="Подсети ме касније"
 Updater.Skip="Прескочи верзију"
-Updater.Running.Title="Програм је тренутно активан"
-Updater.Running.Text="Неки процеси су већ започети и ажурирање софтвера није могуће у датим условима. Молимо Вас да затворите све започете процесе пре него што се одлучите да ажурирате софтвер"
 Updater.NoUpdatesAvailable.Title="Ажурирања нису доступна"
 Updater.NoUpdatesAvailable.Text="Нема нових унапређења"
 Updater.BranchNotFound.Title="Канал ажурирања уклоњен"
@@ -242,8 +238,6 @@
 Updater.RepairConfirm.Title="Потврди проверу интегритета"
 Updater.RepairConfirm.Text="Покретање провере интегритета ће скенирати Вашу OBS инсталацију, испитати има ли у њој корумпираних фајлова и по потреби преузети исправне фајлове. Ово може потрајати тренутак. \n\nДа ли желите да наставите?"
 Updater.FailedToLaunch="Покретање ажурирања софтвера није успело"
-Updater.GameCaptureActive.Title="Снимање приказа екрана игрице је активирано"
-Updater.GameCaptureActive.Text="Тренутно је у употреби библиотека за снимање игре. Молимо да затворите све игре/програме који су снимљени (или да рестартујете Windows) и покушате поново."
 QuickTransitions.SwapScenes="Замени сцене Преглед/Програм након прелаза"
 QuickTransitions.SwapScenesTT="Замена сцена „преглед” и „програм” након прелаза (уколико оригинална сцена програма и даље постоји).\nОво неће опозвати ниједну промену учињену над оригиналном сценом програма."
 QuickTransitions.DuplicateScene="Дуплирај сцену"
@@ -338,7 +332,6 @@
 Output.ConnectFail.Disconnected="Прекинута веза са сервером."
 Output.StreamEncodeError.Title="Грешка приликом кодирања"
 Output.StreamEncodeError.Msg="Искрсла је грешка са кодером током стримовања."
-Output.StreamEncodeError.Msg.LastError="Искрсла је грешка са кодером током стримовања:\n\n%1"
 Output.RecordFail.Title="Неуспешно започињање снимања"
 Output.RecordFail.Unsupported="Излазни формат или није подржан или не подржава више од једне звучне траке. Молим проверите подешавања и покушајте поново."
 Output.RecordNoSpace.Title="Недовољно простора на диску"
@@ -346,7 +339,6 @@
 Output.RecordError.Title="Грешка при снимању"
 Output.RecordError.Msg="Неодређена грешка се догодила при снимању."
 Output.RecordError.EncodeErrorMsg="Искрсла је грешка са кодером током снимања."
-Output.RecordError.EncodeErrorMsg.LastError="Искрсла је грешка са кодером током снимања:\n\n%1"
 Output.BadPath.Title="Неисправна путања датотеке"
 Output.BadPath.Text="Конфигурисана путања за снимање није могла да се отвори. Молимо Вас проверите своју путању за снимање одласком на Подешавања →Излаз→Снимање."
 Output.NoBroadcast.Title="Ниједан пренос није конфигурисан"
@@ -394,7 +386,6 @@
 MissingFiles.AutoSearchText="OBS је пронашао накнадна поклапања са несталим фајловима у том фолдеру. Желите ли да их додате?"
 MissingFiles.NoMissing.Title="Провера несталих фајлова"
 MissingFiles.NoMissing.Text="Ниједан фајл наизглед не недостаје."
-MacPermissions.Title="Прегледај дозволе апликацији"
 MacPermissions.Description="OBS захтева Вашу дозволу да би могао да Вам пружи одређене услуге. Препоручује се да одобрите ове дозволе, али оне нису неопходне за коришћење апликације. Увек можете да их одобрите касније."
 MacPermissions.Description.OpenDialog="Можете поново отворити овај прозор из менија OBS студија."
 MacPermissions.AccessGranted="Приступ одобрен"
@@ -409,8 +400,6 @@
 MacPermissions.Item.Accessibility="Приступачност"
 MacPermissions.Item.Accessibility.Details="Молимо одобрите ову дозволу да би пречице на тастатури (hotkeys) радиле док су друге апликације у фокусу."
 MacPermissions.Continue="Даље"
-UpdateAvailable="Доступна је новија верзија програма"
-UpdateAvailable.Text="Верзија %1.%2.%3 је доступна. <a href='%4'>Кликните овде да преузмете</a>"
 Basic.DesktopDevice1="Звук са рачунара"
 Basic.DesktopDevice2="Звук са рачунара 2"
 Basic.AuxDevice1="Микрофон/Улаз"
@@ -575,8 +564,6 @@
 Basic.VCam.VirtualCamera="Виртуелна камера"
 Basic.VCam.OutputType="Тип излаза"
 Basic.VCam.OutputSelection="Одабир излаза"
-Basic.VCam.InternalDefault="Излаз програма (подразумевано)"
-Basic.VCam.InternalPreview="Излаз прегледа"
 Basic.MainMenu.File="Датотека"
 Basic.MainMenu.File.Export="Извези (Е) (&E)"
 Basic.MainMenu.File.Import="Увоз (&I)"
@@ -618,9 +605,7 @@
 Basic.MainMenu.Edit.AdvAudio="Напредна подешавања звука (&A)"
 Basic.MainMenu.View="Преглед"
 Basic.MainMenu.View.Toolbars="Линије алатки (&T)"
-Basic.MainMenu.View.ListboxToolbars="Дугмад листâ сцена/извора"
 Basic.MainMenu.View.ContextBar="Изворска трака са алаткама"
-Basic.MainMenu.View.SceneTransitions="Сценски прелази (&C)"
 Basic.MainMenu.View.SourceIcons="Иконице извора"
 Basic.MainMenu.View.StatusBar="Статусна линија (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Интерфејс на целом екрану"
@@ -637,7 +622,6 @@
 Basic.MainMenu.SceneCollection.Import="Увези колекцију сцена"
 Basic.MainMenu.SceneCollection.Export="Извези колекцију сцена"
 Basic.MainMenu.Profile.Exists="Овај профил већ постоји"
-Basic.MainMenu.SceneCollection.Exists="Ова колекција сцена већ постоји"
 Basic.MainMenu.Tools="Алати"
 Basic.MainMenu.Help="Помоћ"
 Basic.MainMenu.Help.HelpPortal="Портал за помоћ (&P)"
@@ -718,7 +702,6 @@
 Basic.Settings.General.ChannelName.beta="Бета верзије и кандидати за издање"
 Basic.Settings.General.ChannelDescription.beta="Потенцијално нестабилне предразвојне верзије"
 Basic.Settings.Stream="Стрим"
-Basic.Settings.Stream.StreamType="Врста стрима"
 Basic.Settings.Stream.Custom.UseAuthentication="Користи аутентификацију"
 Basic.Settings.Stream.Custom.Username="Корисничко име"
 Basic.Settings.Stream.Custom.Password="Шифра"
@@ -743,7 +726,6 @@
 Basic.Settings.Output="Излаз"
 Basic.Settings.Output.Format="Формат снимања"
 Basic.Settings.Output.SelectDirectory="Одабери директоријум за снимање"
-Basic.Settings.Output.SelectFile="Одабери датотеку за снимање"
 Basic.Settings.Output.DynamicBitrate="Динамички мењај битрејт у циљу избегавања загушења"
 Basic.Settings.Output.DynamicBitrate.Beta="Динамички мењај битрејт у циљу избегавања загушења (Бета верзија)"
 Basic.Settings.Output.DynamicBitrate.TT="Уместо смањења слика у секунди ради смањења загушења, динамички ће се мењати битрејт у ходу.\n\nИмајте на уму да ово може повећати временски застој гледаоцима у случају наглог и великог загушења.\nКада битрејт опадне, можда ће му бити потребно пар минута да се врати на старо.\n\nТренутно подржано само за пренос преко RTMP протокола."
@@ -770,7 +752,6 @@
 Basic.Settings.Output.Simple.Warn.AudioBitrate="Упозорење: Битрејт звука стрима ће бити постављен на %1, што је горња граница за тренутно одабрани стриминг сервис."
 Basic.Settings.Output.Simple.Warn.CannotPause="Упозорење: Снимање се не може паузирати ако је квалитет снимка подешен на „Исти као стрим”."
 Basic.Settings.Output.Simple.Warn.Encoder="Упозорење: Снимање са софтверским енкодером другачијег квалитета у односу на стрим ће захтевати додатну процесорску снагу ако стримујете и снимате у исто време."
-Basic.Settings.Output.Simple.Warn.Lossless="Упозорење: Квалитет без губитка ствара изричито велике датотеке! Квалитет без губитка може користити више од 7 гигабајта простора на диску по минуту при високим резолуцијама и framerate-ом. Квалитет без губитка није препоручен за дуже снимање осим ако имате велику количину слободног простора на диску."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Да ли сте сигурни да желите користити квалитет без губитка?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Упозорење о квалитету без губитка!"
 Basic.Settings.Output.Simple.Encoder.Software="Софтверски (x264)"
@@ -848,8 +829,7 @@
 Basic.Settings.Audio.PeakMeterType="Тип мерача врха"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Врх узорка"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Прави врх (већа употреба процесора)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="УПОЗОРЕЊЕ: Звук окружења је укључен."
-Basic.Settings.Audio.MultichannelWarning="Ако је стрим у току, проверите да ли ваша стриминг услуга подржава интеграцију и плејбек звука окружења. Facebook 360 Live, Mixer RTMP, Smashcast су примери где је звук окружења у потпуности подржан. Иако и Facebook Live i YouTube Live подржавају интеграцију окружења, Facebook Live миксује као стерео, а YouTube Live репродукује само два канала. \n\nOBS звучни филтери су компатибилни са звуком окружења, мада подршка за VST прикључке није загарантована."
+Basic.Settings.Audio.MultichannelWarning.Enabled="УПОЗОРЕЊЕ: Звук окружења је укључен."
 Basic.Settings.Audio.MultichannelWarning.Title="Да ли желите да укључите звук окружења?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Да ли сте сигурни да желите да укључите звук окружења?"
 Basic.Settings.Audio.Devices="Глобални аудио уређаји"
@@ -892,7 +872,6 @@
 Basic.Settings.Advanced.FormatWarning="Упозорење: Формати боја, са изузетком NV12/P010 су првенствено предвиђени за снимање, и нису препоручљиви приликом стримовања. Стримовање може проузроковати повећану употребу процесорских ресурса због конверзије формата боја."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Упозорење: Високопрецизни формати се чешће користе са HDR просторима боја."
 Basic.Settings.Advanced.FormatWarning2100="Упозорење: Rec. 2100 би требало да користи формат са већом прецизношћу."
-Basic.Settings.Advanced.Audio.BufferingTime="Време баферовања звука"
 Basic.Settings.Advanced.Video.ColorFormat="Формат боја"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (осмобитни, 4:2:0, 2 равни)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (осмобитни, 4:2:0, 3 равни)"
@@ -1009,14 +988,12 @@
 LoadProfileNeedsRestart="Профил садржи подешавања која захтевају рестартовање OBS-a:\n%1\n\nЖелите ли да рестартујете OBS да би ова подешавања ступиле на снагу?"
 ContextBar.NoSelectedSource="Није изабран извор"
 ContextBar.ResetTransform="Ресетуј трансформацију"
-ContextBar.FitToCanvas="Уклопи у платно"
 ContextBar.MediaControls.PlayMedia="Пусти медију"
 ContextBar.MediaControls.PauseMedia="Паузирај медије"
 ContextBar.MediaControls.StopMedia="Заустави медије"
 ContextBar.MediaControls.RestartMedia="Почни мултимедију поново"
 ContextBar.MediaControls.PlaylistNext="Следеће на плејлисти"
 ContextBar.MediaControls.PlaylistPrevious="Претходно на плејлисти"
-ContextBar.MediaControls.MediaProperties="Својства мултимедије"
 ContextBar.MediaControls.BlindSeek="Виџет за тражење мултимедије"
 YouTube.Auth.Ok="Ауторизација је успешно обављена.\nСада можете да затворите ову страницу."
 YouTube.Auth.NoCode="Процес ауторизације није обављен."

obs-studio-29.1.3.tar.xz/UI/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/sv-SE.ini Changed

@@ -26,7 +26,7 @@
 PreviewProjector="Fullskärmsprojektor (Förhandsvisning)"
 SceneProjector="Fullskärmsprojektor (Scen)"
 SourceProjector="Fullskärmsprojektor (Källa)"
-StudioProgramWindow="Fönsterprojektor (program)"
+StudioProgramWindow="Fönsterprojektor (Program)"
 PreviewWindow="Fönsterprojektor (Förhandsgranskning)"
 SceneWindow="Fönsterprojektor (Scen)"
 SourceWindow="Fönsterprojektor (Källa)"
@@ -90,7 +90,6 @@
 LogViewer="Loggvisare"
 ShowOnStartup="Visa vid uppstart"
 OpenFile="Öppna fil"
-AddValue="Lägg till %1"
 AddSource="Lägg till källa"
 RemoveScene="Ta bort markerade scener"
 RemoveSource="Ta bort markerad(e) källa(-or)"
@@ -102,11 +101,19 @@
 SourceFilters="Öppna källfilter"
 MixerToolbarMenu="Ljudmixermeny"
 SceneFilters="Öppna scenfilter"
+List="Lista"
+Grid="Rutnät"
 PluginsFailedToLoad.Title="Fel vid inläsning av insticksmodul"
 PluginsFailedToLoad.Text="Följande OBS-insticksmoduler kunde inte läsas in:\n\n%1\nVar god uppdatera eller ta bort dessa insticksmoduler."
 AlreadyRunning.Title="OBS körs redan"
 AlreadyRunning.Text="OBS körs redan! Såvida du gjorde detta med flit, stäng ned alla befintliga instanser av OBS innan du försöker köra en ny instans. Om du har minimerat OBS till systemfältet, kontroller om det fortfarande körs där."
 AlreadyRunning.LaunchAnyway="Kör ändå"
+AutoSafeMode.Title="Felsäkert läge"
+AutoSafeMode.Text="OBS avslutades inte ordentligt under din senaste session.\n\nVill du starta i säkert läge (insticksprogram från tredje part, skript och WebSockets inaktiveras)?"
+AutoSafeMode.LaunchSafe="Starta i felsäkert läge"
+AutoSafeMode.LaunchNormal="Starta normalt"
+SafeMode.Restart="Vill du starta om OBS i säkert läge (insticksprogram från tredje part, skript och WebSockets inaktiveras)?"
+SafeMode.RestartNormal="Vill du starta om OBS i normalt läge?"
 ChromeOS.Title="Plattformen stöds inte"
 ChromeOS.Text="OBS verkar köras inuti en ChromeOS-behållare. Denna plattform stöds inte."
 Wine.Title="Wine upptäcktes"
@@ -172,8 +179,8 @@
 Basic.AutoConfig.StreamPage.Service.Custom="Anpassad..."
 Basic.AutoConfig.StreamPage.StreamKey="Strömnyckel"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: ange den krypterade lösenfrasen.\nRTMP: ange nyckeln som tillhandahålls av tjänsten.\nSRT: ange strömmens id om tjänsten använder en."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Länk)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kodarnyckel"
+Basic.AutoConfig.StreamPage.BearerToken="Ägartoken"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Anslutet konto"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Uppskatta bithastighetens med ett bandbreddstest (kan ta några minuter)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Föredra hårdvarukodning"
@@ -224,8 +231,6 @@
 Updater.UpdateNow="Uppdatera nu"
 Updater.RemindMeLater="Påminn mig senare"
 Updater.Skip="Hoppa över version"
-Updater.Running.Title="Programmet körs för tillfället"
-Updater.Running.Text="Utmatningar pågår för tillfället, stäng ned alla aktiva utmatningar innan du uppdaterar"
 Updater.NoUpdatesAvailable.Title="Inga tillgängliga uppdateringar"
 Updater.NoUpdatesAvailable.Text="Inga uppdateringar är tillgängliga för närvarande"
 Updater.BranchNotFound.Title="Uppdateringskanalen är borttagen"
@@ -235,8 +240,6 @@
 Updater.RepairConfirm.Title="Bekräfta Integritetskontroll"
 Updater.RepairConfirm.Text="Integritetskontrollen kommer skanna din OBS installation för korruption och ladda ner trasiga/modifierade filer på nytt. Detta kan ta ett tag.\n\nVill du fortsätta?"
 Updater.FailedToLaunch="Misslyckades att starta uppdateringen"
-Updater.GameCaptureActive.Title="Spelkälla aktiv"
-Updater.GameCaptureActive.Text="Hook-biblioteket för spelkällor används för tillfället. Stäng alla spel/program som spelas in (eller starta om Windows) och försök igen."
 QuickTransitions.SwapScenes="Växla mellan förhandsvisning/programscener efter övergång"
 QuickTransitions.SwapScenesTT="Växlar mellan förhandsvisningen och programscener efter övergångar (om progrmamets originalscen fortfarande finns).\nDetta kommer inte några några ändringar som har gjorts i programmets orignalscen."
 QuickTransitions.DuplicateScene="Duplicera scen"
@@ -250,6 +253,8 @@
 Basic.SceneTransitions="Scenövergångar"
 Basic.TransitionDuration="Varaktighet"
 Basic.TogglePreviewProgramMode="Studioläge"
+Basic.EnablePreviewProgramMode="Aktivera studioläge"
+Basic.DisablePreviewProgramMode="Inaktivera studioläge"
 Undo.Undo="Ångra"
 Undo.Redo="Gör om"
 Undo.Add="Lägg till \"%1\""
@@ -298,6 +303,8 @@
 Undo.GroupItems="Gruppera objekt till \"%1\""
 TransitionNameDlg.Text="Var god ange övergångens namn"
 TransitionNameDlg.Title="Övergångsnamn"
+TitleBar.SafeMode="SÄKERT LÄGE"
+TitleBar.PortableMode="Portabelt läge"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scener"
 NameExists.Title="Namnet används redan"
@@ -322,6 +329,7 @@
 Output.StartStreamFailed="Misslyckades att starta strömning"
 Output.StartRecordingFailed="Misslyckades att starta inspelning"
 Output.StartReplayFailed="Misslyckades att starta reprisbuffert"
+Output.StartVirtualCamFailed="Misslyckades att starta virtuell kamera"
 Output.StartFailedGeneric="Misslyckades att starta utmatningen. Kolla loggen för detaljer.\n\nOBS: Om du använder kodarna NVENC eller AMD, se till att dina grafikdrivrutiner är uppdaterade."
 Output.ReplayBuffer.PauseWarning.Title="Kan inte spara repriser under pausning"
 Output.ReplayBuffer.PauseWarning.Text="Varning: Repriser kan inte sparas när inspelningen är pausad."
@@ -334,7 +342,7 @@
 Output.ConnectFail.Disconnected="Nedkopplad från servern."
 Output.StreamEncodeError.Title="Kodningsfel"
 Output.StreamEncodeError.Msg="Ett kodarfel uppstod under strömmande."
-Output.StreamEncodeError.Msg.LastError="Ett kodarfel uppstod under strömning:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Ett kodarfel uppstod under strömning: %1"
 Output.RecordFail.Title="Misslyckades att starta inspelning"
 Output.RecordFail.Unsupported="Antingen stöds inte utdataformatet eller så har det inte stöd för mer än ett ljudspår. Kontrollera dina inställningar och försök igen."
 Output.RecordNoSpace.Title="Otillräckligt diskutrymme"
@@ -342,7 +350,7 @@
 Output.RecordError.Title="Inspelningsfel"
 Output.RecordError.Msg="Ett okänt fel uppstod vid inspelning."
 Output.RecordError.EncodeErrorMsg="Ett kodarfel uppstod under inspelning."
-Output.RecordError.EncodeErrorMsg.LastError="Ett kodarfel uppstod under inspelning:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Ett kodarfel uppstod under inspelning: %1"
 Output.BadPath.Title="Ogiltig sökväg"
 Output.BadPath.Text="Den konfigurerade inspelningssökvägen kunde inte öppnas. Kontrollera din inspelningssökväg under Inställningar → Utmatning → Inspelning."
 Output.NoBroadcast.Title="Ingen sändning har konfigurerats"
@@ -371,6 +379,8 @@
 Remux.ExitUnfinishedTitle="Remuxing pågår"
 Remux.ExitUnfinished="Remuxing är inte klar, stoppas det nu kan göra målfilen oanvändbar.\nÄr du säker på att du vill stoppa remuxing?"
 Remux.HelpText="Släpp filer att göra en remux på i detta fönster eller välj en tom tabellcell under \"OBS-inspelning\" för att bläddra efter en fil."
+Remux.NoFilesAddedTitle="Inga remuxingsfiler lades till"
+Remux.NoFilesAdded="Inga filer att remuxa lades till. Släpp en mapp som innehåller en eller flera videofiler."
 MissingFiles="Filer saknas"
 MissingFiles.MissingFile="Fil saknas"
 MissingFiles.NewFile="Ny fil"
@@ -389,6 +399,7 @@
 MissingFiles.AutoSearchText="OBS har hittat ytterligare matchningar för saknade filer i denna katalog. Vill du lägga till dem?"
 MissingFiles.NoMissing.Title="Kontroll av saknade filer"
 MissingFiles.NoMissing.Text="Inga filer verkar saknas."
+MacPermissions.MenuAction="Granska appbehörigheter..."
 MacPermissions.Title="Granska appbehörigheter"
 MacPermissions.Description="OBS Studio kräver behörighet från dig för att kunna tillhandahålla vissa funktioner. Det rekommenderas att du aktiverar dessa behörigheter, men de krävs inte för att använda appen. Du kan alltid aktivera dem senare."
 MacPermissions.Description.OpenDialog="Du kan öppna denna dialogruta igen via OBS Studio-menyn."
@@ -404,8 +415,8 @@
 MacPermissions.Item.Accessibility="Tillgänglighet"
 MacPermissions.Item.Accessibility.Details="För att kortkommandon ska fungera medan andra appar har fokus, var god aktivera denna behörighet."
 MacPermissions.Continue="Fortsätt"
-UpdateAvailable="Ny uppdatering tillgänglig"
-UpdateAvailable.Text="Version %1.%2.%3 finns nu tillgänglig. <a href='%4'>Klicka här för att ladda ner</a>"
+SourceLeak.Title="Fel vid städning av källor"
+SourceLeak.Text="Ett problem uppstod när scensamlingar skulle ändras och några källor kunde inte avlastas. Detta problem orsakas vanligtvis av insticksmoduler som inte frigör resurser ordentligt. Se till att alla insticksmoduler du använder är uppdaterade.\n\nOBS Studio kommer nu avslutas för att förhindra data från att potentiellt skadas."
 Basic.DesktopDevice1="Skrivbordsljud"
 Basic.DesktopDevice2="Skrivbordsljud 2"
 Basic.Scene="Scen"
@@ -463,6 +474,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (välj automatiskt: %2)"
 Basic.PropertiesWindow.SelectColor="Välj färg"
 Basic.PropertiesWindow.SelectFont="Välj typsnitt"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Välj ett typsnitt"
 Basic.PropertiesWindow.ConfirmTitle="Inställningarna har ändrats"
 Basic.PropertiesWindow.Confirm="Det finns osparade ändringar. Vill du behålla dem?"
 Basic.PropertiesWindow.NoProperties="Inga inställningar tillgängliga"
@@ -571,9 +583,9 @@
 Basic.VCam.VirtualCamera="Virtuell kamera"
 Basic.VCam.OutputType="Utmatningstyp"
 Basic.VCam.OutputSelection="Utmatningsmarkering"
-Basic.VCam.Internal="Intern"
-Basic.VCam.InternalDefault="Programutdata (standard)"
-Basic.VCam.InternalPreview="Förhandsvisningsutmatning"
+Basic.VCam.OutputType.Program="Program (Standard)"
+Basic.VCam.OutputSelection.NoSelection="Inget val för den här typen av utmatning"
+Basic.VCam.RestartWarning="Den virtuella kameran kommer att startas om för att verkställa den här ändringen"
 Basic.MainMenu.File="Arkiv (&F)"
 Basic.MainMenu.File.Export="&Exportera"
 Basic.MainMenu.File.Import="&Importera"
@@ -615,17 +627,18 @@
 Basic.MainMenu.Edit.AdvAudio="&Avancerade ljudinställningar"
 Basic.MainMenu.View="&Visa"
 Basic.MainMenu.View.Toolbars="Verk&tygsfält"
-Basic.MainMenu.View.ListboxToolbars="Knappar för scen/källista"
+Basic.MainMenu.View.ListboxToolbars="Verktygsfält för dockning"
 Basic.MainMenu.View.ContextBar="Verktygsfält för källor"
-Basic.MainMenu.View.SceneTransitions="S&cenövergångar"
 Basic.MainMenu.View.SourceIcons="Käll&ikoner"
 Basic.MainMenu.View.StatusBar="&Statusfält"
 Basic.MainMenu.View.Fullscreen.Interface="Helskärmsgränssnitt"
 Basic.MainMenu.View.ResetUI="&Återställ gränssnitt"
 Basic.MainMenu.View.AlwaysOnTop="&Alltid överst"
+Basic.MainMenu.View.SceneListMode="Läge för scenlista"
 Basic.MainMenu.Docks="&Flytande fönster"
 Basic.MainMenu.Docks.ResetDocks="&Återställ flytande fönster"
 Basic.MainMenu.Docks.LockDocks="&Lås flytande fönster"
+Basic.MainMenu.Docks.SideDocks="&Flytande fönster med full höjd"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Anpassade webbläsarfönster..."
 Basic.MainMenu.SceneCollection="&Scensamling"
 Basic.MainMenu.Profile="&Profil"
@@ -634,7 +647,6 @@
 Basic.MainMenu.SceneCollection.Import="Importera scensamling"
 Basic.MainMenu.SceneCollection.Export="Exportera scensamling"
 Basic.MainMenu.Profile.Exists="Profilen finns redan"
-Basic.MainMenu.SceneCollection.Exists="Scensamlingen finns redan"
 Basic.MainMenu.Tools="Verk&tyg"
 Basic.MainMenu.Help="&Hjälp"
 Basic.MainMenu.Help.HelpPortal="Hjäl&pportal"
@@ -646,8 +658,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Ladda upp aktuell loggfil (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Ladda upp &föregående loggfil"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Visa aktuell logg"
+Basic.MainMenu.Help.ReleaseNotes="Versionsfakta"
 Basic.MainMenu.Help.CheckForUpdates="Sök efter uppdateringar"
 Basic.MainMenu.Help.Repair="Kontrollera Filintegritet"
+Basic.MainMenu.Help.RestartSafeMode="Starta om i felsäkert läge"
+Basic.MainMenu.Help.RestartNormal="Starta om i normalt läge"
 Basic.MainMenu.Help.CrashLogs="K&raschrapporter"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Vi&sa kraschrapporter"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Ladda upp &föregående kraschrapport"
@@ -717,7 +732,6 @@
 Basic.Settings.General.ChannelName.beta="Beta/frisläppningskandidater"
 Basic.Settings.General.ChannelDescription.beta="Potentiellt instabila förhandsversioner"
 Basic.Settings.Stream="Ström"
-Basic.Settings.Stream.StreamType="Strömtyp"
 Basic.Settings.Stream.Custom.UseAuthentication="Använd autentisering"
 Basic.Settings.Stream.Custom.Username="Användarnamn"
 Basic.Settings.Stream.Custom.Password="Lösenord"
@@ -749,7 +763,6 @@
 Basic.Settings.Output.Encoder.Video="Videokodare"
 Basic.Settings.Output.Encoder.Audio="Ljudkodare"
 Basic.Settings.Output.SelectDirectory="Välj inspelningsplats"
-Basic.Settings.Output.SelectFile="Välj inspelningsfil"
 Basic.Settings.Output.DynamicBitrate="Ändra bithastigheten dynamiskt för att hantera överbelastning"
 Basic.Settings.Output.DynamicBitrate.Beta="Ändra bithastigheten dynamiskt för att hantera överbelastning (beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Istället för att kasta bildrutor för att reducera överbelastning kommer bithastigheten ändras dynamiskt.\n\nObservera att detta kan öka fördröjningen för tittare om en avsevärd belastning uppstår.\nNär bithastigheten sjunker kan det ta ett par minuter att återställas.\n\nStöds för närvarande endast för RTMP."
@@ -776,7 +789,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Varning: Inspelningar kan inte pausas om inspelningskvaliteten är \"Samma som ström\"."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Varning: Det valda inspelningsformatet är inkompatibel med de valda streamenkod(are)."
 Basic.Settings.Output.Simple.Warn.Encoder="Varning: Inspelning med en mjukvaru-kodare i annan kvalitet än streamen kräver mer CPU-använding om du streamar och spelar in samtidigt."
-Basic.Settings.Output.Simple.Warn.Lossless="Varning: Förlustfri kvalitet generar oerhört stora filstorlekar! Förlustfri kvalitet kan använda upp till 7 gigabyte hårddiskutrymme per minut vid höga upplösningar och bildfrekvenser. Detta rekommenderas inte för långa inspelningar såvida du har riktigt mycket hårddiskutrymme tillgängligt."
+Basic.Settings.Output.Simple.Warn.Lossless="Varning: Förlustfri kvalitet generar oerhört stora filstorlekar! Förlustfri kvalitet kan använda upp till 7 gigabyte hårddiskutrymme per minut vid höga upplösningar och bildfrekvenser. Detta rekommenderas inte för långa inspelningar såvida du har riktigt mycket hårddiskutrymme tillgängligt. Reprisbufferten är inte tillgänglig när förlustsfri kvalitet används."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Är du säker på att du vill använda förlustfri kvalitet?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Varning om förlustfri kvalitet!"
 Basic.Settings.Output.Simple.Encoder.Software="Mjukvara (x264)"
@@ -923,8 +936,8 @@
 Basic.Settings.Audio.PeakMeterType="Typ av maxpunktsmätare"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Samplingsmaxpunkt"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Sann maxpunkt (högre CPU-användning)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="VARNING: Surroundljud är aktiverat."
-Basic.Settings.Audio.MultichannelWarning="Om du strömmar, se till att kolla om din strömtjänst stöder både inmatning och uppspelning av surroundljud. Facebook 360 Live är ett exempel på en tjänst som har fullt stöd. Fastän Facebook Live och YouTube Live stöder inmatning för surroundljud mixar Facebook Live ned till stereo och YouTube Live spelar upp i bara två kanaler.\n\nLjudfiltren i OBS är kompatibla med surroundljud, fast stöd för VST-insticksmodulen garanteras inte."
+Basic.Settings.Audio.MultichannelWarning.Enabled="VARNING: Surroundljud är aktiverat."
+Basic.Settings.Audio.MultichannelWarning="Om du strömmar, se till att kolla om din strömtjänst stöder både inmatning och uppspelning av surroundljud. Till exempel har Facebook 360 Live fullt stöd för surround och YouTube Live har stöd för 5.1-ljud (samt uppspelning på TV).\n\nLjudfiltren i OBS är kompatibla med surroundljud, fast stöd för VST-insticksmodulen garanteras inte."
 Basic.Settings.Audio.MultichannelWarning.Title="Aktivera surroundljud?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Är du säker på att du vill aktivera surroundljud?"
 Basic.Settings.Audio.Devices="Globala ljudenheter"
@@ -970,7 +983,6 @@
 Basic.Settings.Advanced.FormatWarning="Varning: Andra färgformat än NV12/P010 är avsedda för inspelning och rekommenderas inte för att strömma. Högre processoranvändning kan uppstå vid strömning p.g.a. konvertering av färgformat."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Varning: Format med hög precision används oftare med HDR-färgrymder."
 Basic.Settings.Advanced.FormatWarning2100="Varning: Rec. 2100 bör använda ett format med större precision."
-Basic.Settings.Advanced.Audio.BufferingTime="Ljudbuffringstid"
 Basic.Settings.Advanced.Video.ColorFormat="Färgformat"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bitar, 4:2:0, 2 plan)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bitar, 4:2:0, 3 plan)"
@@ -996,6 +1008,7 @@
 Basic.Settings.Advanced.Network="Nätverk"
 Basic.Settings.Advanced.Network.Disabled="Det nu valda strömningsprotokollet stöder inte att ändra nätverksinställningar."
 Basic.Settings.Advanced.Network.BindToIP="Bind till IP"
+Basic.Settings.Advanced.Network.IPFamily="IP-familj"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Aktivera nätverksoptimeringar"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Använd TCP-hastighet"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Försöker göra RTMP-utmatning vänligare mot andra latenskänsliga applikationer i nätverket genom att reglera överföringshastigheten.\nDet kan öka risken för tappade ramar på instabila anslutningar."
@@ -1059,6 +1072,8 @@
 SceneItemShow="Visa \"%1\""
 SceneItemHide="Dölj \"%1\""
 OutputWarnings.NoTracksSelected="Du måste välja minst ett spår"
+OutputWarnings.NoTracksSelectedOnExit.Title="Fel i utmatningsinställningarna"
+OutputWarnings.NoTracksSelectedOnExit.Text="Alla utmatningar måste ha minst ett valt ljudspår."
 OutputWarnings.MP4Recording="Varning: Inspelningar som sparas i MP4/MOV kommer inte kunna återhämtas om filen inte slutförs (t.ex. p.g.a. blåskärmar, strömavbrott, etc.). Om du vill spela in flera ljudspår, överväg att använda MKV och remuxa inspelningen till MP4/MOV när den är färdig (Arkiv → Remuxa inspelningar)"
 OutputWarnings.CannotPause="Varning: Inspelningar kan inte pausas om inspelningskodaren är \"(Använd strömkodare)\""
 OutputWarnings.CodecIncompatible="Vald ljud- eller videoenkodare var återställd då den var inkompatibel. Vänligen välj en kompatibel enkodare från listan."
@@ -1084,6 +1099,7 @@
 About.GetInvolved="Engagera dig"
 About.Authors="Upphovsmän"
 About.License="Licens"
+About.Error="Fel! Filen kunde inte läsas in.\n\nGå till: %1"
 About.Contribute="Stöd OBS-projektet"
 AddUrl.Title="Lägg till källa via webbadress"
 AddUrl.Text="Du har dragit en URL till OBS. Detta kommer automatiskt att lägga till länken som källa. Fortsätt?"
@@ -1105,14 +1121,12 @@
 LoadProfileNeedsRestart="Profilen innehåller inställningar som kräver att OBS startas om:\n%1\n\nVill du starta om OBS för att dessa inställningar ska träda i kraft?"
 ContextBar.NoSelectedSource="Inga valda källor"
 ContextBar.ResetTransform="Återställ omvandling"
-ContextBar.FitToCanvas="Anpassa till kanvas"
 ContextBar.MediaControls.PlayMedia="Spela upp media"
 ContextBar.MediaControls.PauseMedia="Pausa media"
 ContextBar.MediaControls.StopMedia="Stoppa media"
 ContextBar.MediaControls.RestartMedia="Starta om media"
 ContextBar.MediaControls.PlaylistNext="Nästa i spellistan"
 ContextBar.MediaControls.PlaylistPrevious="Föregående i spellistan"
-ContextBar.MediaControls.MediaProperties="Mediaegenskaper"
 ContextBar.MediaControls.BlindSeek="Widget för mediasökning"
 YouTube.Auth.Ok="Auktoriseringen slutförd.\nDu kan nu stänga denna sida."
 YouTube.Auth.NoCode="Auktoriseringsprocessen slutfördes inte."
@@ -1193,3 +1207,5 @@
 YouTube.Errors.liveChatEnded="Direktsändning har slutat."
 YouTube.Errors.messageTextInvalid="Meddelandetexten är ogiltig."
 YouTube.Errors.rateLimitExceeded="Du skickar meddelanden för snabbt."
+YouTube.DocksRemoval.Title="Rensa bakåtkompatibelt flytande webbläsarfönster för YouTube"
+YouTube.DocksRemoval.Text="Dessa flytande webbläsarfönster kommer att tas bort p.g.a. utfasning:\n\n%1\nAnvänd \"Flytande fönster/Kontrollrummet på YouTube\" istället."

obs-studio-29.1.3.tar.xz/UI/data/locale/szl-PL.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/szl-PL.ini Changed

@@ -87,7 +87,6 @@
 LogViewer="Podglōnd logōw"
 ShowOnStartup="Pokoż na sztarcie"
 OpenFile="Ôtwōrz zbiōr"
-AddValue="Przidej %1"
 AlreadyRunning.Title="OBS już je sztartniynty"
 AlreadyRunning.Text="OBS już je sztartniynty! Dej pozōr na wszyjske sztartniynte wystōmpiynia OBS nim sztartniesz go zaś. Jeźli OBS je zminimalizowany do zasobnika systymowego, ôbejzdrzij eli niyma ôn sztartniynty tyż sam."
 AlreadyRunning.LaunchAnyway="Sztartnij krōm tego"
@@ -189,13 +188,9 @@
 Updater.UpdateNow="Aktualizuj teroz"
 Updater.RemindMeLater="Spōmnij mi niyskorzij"
 Updater.Skip="Pōmiń ta wersyjo"
-Updater.Running.Title="Aplikacyjo je sztartniynto"
-Updater.Running.Text="Wyjścia sōm aktualnie aktywne, zawrzij wszyjske aktywne wyjścia przed napoczyńciym procesu aktualizacyje"
 Updater.NoUpdatesAvailable.Title="Brak dostympnych aktualizacyji"
 Updater.NoUpdatesAvailable.Text="Brak dostympnych aktualizacyji"
 Updater.FailedToLaunch="Feler przi sztartowaniu aktualizacyje"
-Updater.GameCaptureActive.Title="Przechytywanie szpilu je aktywne"
-Updater.GameCaptureActive.Text="Bibliotyka zaczepiajōnco przechytywanie szpilu je używano. Zawrzij wszyjske przechytywane szpile abo inksze programy (ewyntualnie zresztartuj systym) i sprōbuj zaś."
 QuickTransitions.DuplicateScene="Tupluj bina"
 QuickTransitions.EditProperties="Tupluj zdrzōdła"
 QuickTransitions.HotkeyName="Gibke przejście: %1"
@@ -313,8 +308,6 @@
 MissingFiles.Found="Znodniynty"
 MissingFiles.AutoSearch="Znodniynte inksze napasowanie zbiorōw"
 MissingFiles.AutoSearchText="OBS znod inksze napasowania zbiorōw, kerych brak w tym katalogu. Chcesz jy przidać?"
-UpdateAvailable="Nowo aktualizacyjo je dostympno"
-UpdateAvailable.Text="Wersyjo %1.%2.%3 je dostympno. <a href='%4'>Kliknij tukej coby pobrać</a>"
 Basic.DesktopDevice1="Maszina audio"
 Basic.DesktopDevice2="Maszina audio 2"
 Basic.AuxDevice1="Mikrofōn/Wchōd linijowy"
@@ -481,9 +474,7 @@
 Basic.MainMenu.Edit.AdvAudio="&Zaawansowane ôpcyje klangu"
 Basic.MainMenu.View="&Widok"
 Basic.MainMenu.View.Toolbars="Paski noczyń (&T)"
-Basic.MainMenu.View.ListboxToolbars="Knefle pod wykazym bin / zdrzōdeł ôbrazu"
 Basic.MainMenu.View.ContextBar="Pasek noczyniowy zdrzōdła"
-Basic.MainMenu.View.SceneTransitions="Efekty przejś&cio bin"
 Basic.MainMenu.View.SourceIcons="&Ikōny zdrzōdłowe"
 Basic.MainMenu.View.StatusBar="Pasek &statusu"
 Basic.MainMenu.View.Fullscreen.Interface="Połnoekranowy interfejs"
@@ -494,7 +485,6 @@
 Basic.MainMenu.SceneCollection.Import="Importuj kolekcyje biny"
 Basic.MainMenu.SceneCollection.Export="Eksportuj kolekcyjo bin"
 Basic.MainMenu.Profile.Exists="Profil już istniyje"
-Basic.MainMenu.SceneCollection.Exists="Kolekcyjo biny już istniyje"
 Basic.MainMenu.Tools="Noczynia (&T)"
 Basic.MainMenu.Help="Pōmoc (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal pōmocy"
@@ -539,7 +529,6 @@
 Basic.Settings.General.MultiviewLayout.Vertical.Right="Piōnowo, Prawo (8 bin)"
 Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Poziōmo, Wiyrch (18 bin)"
 Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Poziōmo, Wiyrch (24 biny)"
-Basic.Settings.Stream.StreamType="Zorta streamu"
 Basic.Settings.Stream.Custom.UseAuthentication="Użyj uwierzitelnianio"
 Basic.Settings.Stream.Custom.Username="Miano używocza"
 Basic.Settings.Stream.Custom.Password="Hasło"
@@ -555,7 +544,6 @@
 Basic.Settings.Stream.Recommended.MaxFPS="Maksymalno wielość FPS: %1"
 Basic.Settings.Output="Wyjście"
 Basic.Settings.Output.Format="Format nagrowanio"
-Basic.Settings.Output.SelectFile="Ôbier zbiōr nagranio"
 Basic.Settings.Output.Mode="Tryb wyjścio"
 Basic.Settings.Output.Mode.Simple="Ajnfachowe"
 Basic.Settings.Output.Mode.Adv="Zaawansowane"
@@ -647,7 +635,7 @@
 Basic.Settings.Audio.MeterDecayRate.Slow="Poleku (PPM zorty II)"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Poziōm szpicowy prōbkowany"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Prawo szpica (wiynksze użycie CPU)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Pozōr: Przestrzynny klang je włōnczōny."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Pozōr: Przestrzynny klang je włōnczōny."
 Basic.Settings.Audio.MultichannelWarning.Title="Włōnczyć przestrzynny klang?"
 Basic.Settings.Audio.DesktopDevice="Maszina audio"
 Basic.Settings.Audio.DesktopDevice2="Maszina audio 2"
@@ -667,7 +655,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Normalny"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Pōniżyj normalnego"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Bezczynny"
-Basic.Settings.Advanced.Audio.BufferingTime="Czas buforowanio klangu"
 Basic.Settings.Advanced.Video.ColorFormat="Format farby"
 Basic.Settings.Advanced.Video.ColorSpace="Przestrzyństwo farb"
 Basic.Settings.Advanced.Video.ColorRange="Zakrys farb"
@@ -743,14 +730,12 @@
 NeedsRestart="Trza zaś sztartnōńć OBS Studio. Chcesz teroz resztartować?"
 ContextBar.NoSelectedSource="Brak zdrzōdła"
 ContextBar.ResetTransform="Reset przekształcyń"
-ContextBar.FitToCanvas="Napasuj do cwelichu"
 ContextBar.MediaControls.PlayMedia="Ôdtworzej"
 ContextBar.MediaControls.PauseMedia="Pauza"
 ContextBar.MediaControls.StopMedia="Zasztopej"
 ContextBar.MediaControls.RestartMedia="Resztart"
 ContextBar.MediaControls.PlaylistNext="Niyskorniyjszy na playliście"
 ContextBar.MediaControls.PlaylistPrevious="Piyrwyjszy na playliście"
-ContextBar.MediaControls.MediaProperties="Włosności zbioru"
 ContextBar.MediaControls.BlindSeek="Pasek postympu ôdtwŏrzanio"
 YouTube.Auth.WaitingAuth.Title="Autoryzacyjo używocza YouTube"
 YouTube.Actions.Title="Tytuł*"

obs-studio-29.1.3.tar.xz/UI/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ta-IN.ini Changed

@@ -75,9 +75,12 @@
 HideMixer="ஒலி கலவையில் மறைத்தல்"
 TransitionOverride="மாற்றம் புறக்கணிப்பு"
 ShowTransition="காட்சி மாற்றம்"
+HideTransition="மாற்றத்தை மறை"
 None="எதுவுமில்லை"
 StudioMode.Preview="முன்னோட்டம்"
 StudioMode.Program="நிகழ்ச்சி"
+StudioMode.PreviewSceneName="முன்னோட்டம்:%1"
+StudioMode.ProgramSceneName="நிரல்:%1"
 ShowInMultiview="பல்பார்வை காண்பி"
 VerticalLayout="செங்குத்து வடிவமைப்பு"
 Group="குழு"
@@ -92,10 +95,25 @@
 LogViewer="பதிவு பார்வையாளர்"
 ShowOnStartup="துவக்கத்தில் காட்டு"
 OpenFile="கோப்பைத் திற"
-AddValue="சேர்க்கவும் %1"
+AddSource="மூலத்தைச் சேர்க்கவும்"
+RemoveScene="தேர்ந்தெடுக்கப்பட்ட காட்சியை அகற்று"
+RemoveSource="தேர்ந்தெடுக்கப்பட்ட மூலத்தை அகற்று"
+MoveSceneUp="காட்சியை மேலே நகர்த்தவும்"
+MoveSceneDown="காட்சியை கீழே நகர்த்தவும்"
+MoveSourceUp="மூலத்தை(களை) மேலே நகர்த்தவும்"
+MoveSourceDown="மூலத்தை(களை) கீழே நகர்த்தவும்"
+SourceProperties="திறந்த மூல பண்புகள்"
+SourceFilters="திறந்த மூல வடிப்பான்கள்"
+MixerToolbarMenu="ஆடியோ கலவை மெனு"
+SceneFilters="காட்சி வடிப்பான்களைத் திறக்கவும்"
+List="பட்டியல்"
+Grid="கட்டம்"
+PluginsFailedToLoad.Title="செருகுநிரல் ஏற்றுவதில் பிழை"
+PluginsFailedToLoad.Text="பின்வரும் OBS செருகுநிரல்களை ஏற்ற முடியவில்லை:\n\n%1\nஇந்த செருகுநிரல்களைப் புதுப்பிக்கவும் அல்லது அகற்றவும்."
 AlreadyRunning.Title="OBS ஏற்கனவே இயங்கிக்கொண்டிருக்கிறது"
 AlreadyRunning.Text="OBS ஏற்கனவே இயங்குகிறது! இதை தொடர நீங்கள் விரும்பவில்லை எனில், புதிய நிகழ்வை இயக்க முயற்சிக்கும் முன் OBS இன் எந்தவொரு நிகழ்வுகளையும் மூடவும். நீங்கள் கணினி தட்டில் OBS ஐ குறைத்து அமைத்திருந்தால், அது இன்னமும் இயங்கிக்கொண்டிருக்கிறதா என்பதைப் பார்க்கவும்."
 AlreadyRunning.LaunchAnyway="எப்படியும் தொடங்கு"
+AutoSafeMode.Title="பாதுகாப்பான முறையில்"
 ChromeOS.Title="ஆதரவளிக்காத இயங்குத்தளம்"
 Wine.Title="Wine கண்டறியப்பட்டது"
 DockCloseWarning.Title="நகரக்கூடிய சாளரத்தை மூடு"
@@ -151,7 +169,6 @@
 Basic.AutoConfig.StreamPage.Service.Custom="தனிபயன்..."
 Basic.AutoConfig.StreamPage.Server="சேவையகம்"
 Basic.AutoConfig.StreamPage.StreamKey="அலை குறியீடு"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(இணைப்பு)"
 Basic.AutoConfig.StreamPage.ConnectedAccount="இணைந்த கணக்கு"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="அலைவரிசை சோதனை மூலம் bitrate மதிப்பீடு (சில நிமிடங்கள் ஆகலாம்)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="விரும்பிய வன்பொருள் குறியீடு"
@@ -198,12 +215,9 @@
 Updater.UpdateNow="இப்போதே மேம்படுத்தவும்"
 Updater.RemindMeLater="பிறகு நினைவூட்டு"
 Updater.Skip="பதிப்பு தவிர்க்க"
-Updater.Running.Title="நடப்பில் உள்ள நிகழ்ச்சி"
-Updater.Running.Text="வெளியீடுகள் தற்போது செயலில் உள்ளன, தயவுசெய்து மேம்படுத்துவதற்கு முயற்சிக்கும் முன் செயலில் உள்ள வெளியீட்டை மூடவும்"
 Updater.NoUpdatesAvailable.Title="மேம்படுத்தல்கள் கிடைக்கவில்லை"
 Updater.NoUpdatesAvailable.Text="மேம்படுத்தல்கள் ஏதும் நடப்பில் இல்லை"
 Updater.FailedToLaunch="மேம்படுத்தல் தோல்வியுற்றது"
-Updater.GameCaptureActive.Title="விளையாட்டு பிடிப்பு செயலில்"
 QuickTransitions.DuplicateScene="நகல் காட்சி"
 QuickTransitions.EditProperties="நகல் மூலங்கள்"
 QuickTransitions.HotkeyName="விரைவான மாற்றம்: %1"
@@ -294,8 +308,6 @@
 MissingFiles.State="நிலை"
 MissingFiles.Replaced="மாற்றப்பட்டது"
 MissingFiles.Cleared="சுத்தம் செய்யப்பட்டது"
-UpdateAvailable="புதிய மேம்படுத்தல்கள் கிடைக்கிறது"
-UpdateAvailable.Text="பதிப்பு %1.%2.%3 தற்போது கிடைக்கிறது. <a href='%4'>பதிவிறக்கம் செய்ய இங்கே சொடுக்கிடுக</a>"
 Basic.DesktopDevice1="திரைப்பலக ஒலி"
 Basic.DesktopDevice2="திரைப்பலக ஒலி 2"
 Basic.AuxDevice1="ஒலிவாங்கி/ஒலி முனையம்"
@@ -465,7 +477,6 @@
 Basic.MainMenu.Edit.AdvAudio="மேம்பட்ட ஒலி குணங்கள் (&A)"
 Basic.MainMenu.View="பார்வை (&V)"
 Basic.MainMenu.View.Toolbars="கருவிப்பட்டிகள் (&T)"
-Basic.MainMenu.View.SceneTransitions="காட்சி மாற்றங்கள் (&C)"
 Basic.MainMenu.View.StatusBar="நிலை பட்டை (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="முழுத்திரை இடைமுகம்"
 Basic.MainMenu.SceneCollection="காட்சி தொகுப்பு (&S)"
@@ -475,7 +486,6 @@
 Basic.MainMenu.SceneCollection.Import="காட்சி தொகுப்பு இறக்குமதி"
 Basic.MainMenu.SceneCollection.Export="காட்சி தொகுப்பு ஏற்றுமதி"
 Basic.MainMenu.Profile.Exists="இந்த விவரம் ஏற்கனவே உள்ளது"
-Basic.MainMenu.SceneCollection.Exists="காட்சி தொகுப்பு ஏற்கனவே உள்ளது"
 Basic.MainMenu.Tools="கருவிகள் (&T)"
 Basic.MainMenu.Help="உதவி (&H)"
 Basic.MainMenu.Help.HelpPortal="உதவி இணையதளம் (&P)"
@@ -507,7 +517,6 @@
 Basic.Settings.General.MultiviewLayout.Vertical.Left="செங்குத்து, இடது (8 காட்சிகள்)"
 Basic.Settings.General.MultiviewLayout.Vertical.Right="செங்குத்து, வலது (8 காட்சிகள்)"
 Basic.Settings.Stream="நேரலை"
-Basic.Settings.Stream.StreamType="நேரலை வகை"
 Basic.Settings.Stream.Custom.UseAuthentication="அங்கீகாரத்தைப் பயன்படுத்துக"
 Basic.Settings.Stream.Custom.Username="பயனர் பெயர்"
 Basic.Settings.Stream.Custom.Password="கடவுச்சொல்"
@@ -517,7 +526,6 @@
 Basic.Settings.Output="வெளியீடு"
 Basic.Settings.Output.Format="பதிவு வடிவமைப்பு"
 Basic.Settings.Output.SelectDirectory="பதிவு கோப்பகத்தைத் தேர்ந்தெடுக்கவும்"
-Basic.Settings.Output.SelectFile="பதிவு கோப்பு தேர்ந்தெடு"
 Basic.Settings.Output.Mode.Simple="எளிய"
 Basic.Settings.Output.Mode.Adv="மேம்பட்டது"
 Basic.Settings.Output.Mode.FFmpeg="FFmpeg வெளியீட்டு வகை"

obs-studio-29.1.3.tar.xz/UI/data/locale/te-IN.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/te-IN.ini Changed

obs-studio-29.1.3.tar.xz/UI/data/locale/th-TH.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/th-TH.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="ตัวแสดง log"
 ShowOnStartup="แสดงเมื่อเริ่มต้นแอป"
 OpenFile="เปิดไฟล์"
-AddValue="เพิ่ม %1"
 AddSource="เพิ่มแหล่งที่มา"
 RemoveScene="ลบฉากที่เลือก"
 RemoveSource="ลบแหล่งที่มาที่เลือก"
@@ -107,20 +106,28 @@
 SourceFilters="เปิดฟิลเตอร์แหล่งที่มา"
 MixerToolbarMenu="เมนูตัวแต่งเสียง"
 SceneFilters="เปิดฟิลเตอร์ฉาก"
+List="รายการ"
+Grid="ตาราง"
 PluginsFailedToLoad.Title="ข้อผิดพลาดในการโหลดปลั๊กอิน"
 PluginsFailedToLoad.Text="ไม่สามารถโหลดปลั๊กอิน OBS ต่อไปนี้:\n\n%1\nโปรดอัพเดตหรือลบปลั๊กอินเหล่านี้"
 AlreadyRunning.Title="OBS กำลังทำงานอยู่"
 AlreadyRunning.Text="โปรแกรม OBS กำลังทำงานอยู่ หากคุณไม่ต้องการดำเนินการดังกล่าวโปรดปิดโปรแกรม OBS ที่มีอยู่ ก่อนที่จะพยายามเรียกใช้อินสแตนซ์ใหม่ หากคุณตั้งค่าโปรแกรม OBS ให้ย่อเล็กสุด ให้ดูที่แถบบาร์ของระบบว่าโปรแกรมยังคงเปิดยังใช้งานอยู่หรือไม่"
 AlreadyRunning.LaunchAnyway="ยืนยันการเปิด"
+AutoSafeMode.Title="โหมดปลอดภัย"
+AutoSafeMode.Text="OBS ไม่ได้ปิดอย่างถูกต้องในเซสชันที่แล้วของคุณ\n\nคุณต้องการเริ่มในโหมดปลอดภัย (ปิดใช้งานปลั๊กอินจากบุคคลที่สาม สคริปต์ และ WebSocket) หรือไม่?"
+AutoSafeMode.LaunchSafe="เรียกใช้ในโหมดปลอดภัย"
+AutoSafeMode.LaunchNormal="เรียกใช้ตามปกติ"
+SafeMode.Restart="คุณต้องการเริ่ม OBS ใหม่ในโหมดปลอดภัย (ปิดใช้งานปลั๊กอิน สคริปต์ และ WebSockets) หรือไม่?"
+SafeMode.RestartNormal="คุณต้องการเริ่ม OBS ใหม่ในโหมดปกติหรือไม่?"
 ChromeOS.Title="แพลตฟอร์มที่ไม่รองรับ"
 ChromeOS.Text="ดูเหมือนว่า OBS จะทำงานภายในคอนเทนเนอร์ ChromeOS ไม่รองรับแพลตฟอร์มนี้"
 Wine.Title="Wine ถูกตรวจพบ"
 Wine.Text="OBS ไม่รองรับการทำงานบน Wine และฟีเจอร์หลาย ๆ อย่างเช่นการจับภาพหน้าจอหรือการนำแหล่งสัญญาณเข้าอาจไม่สามารถใช้งานได้ หรือได้แต่ไม่สมบูรณ์ ขอแนะนำให้ใช้ OBS เวอร์ชันที่ตรงกับระบบของคุณ เช่น<a href='https://flathub.org/apps/details/com.obsproject.Studio'>เวอร์ชัน Flatpak</a>หรือเวอร์ชันของระบบปฏิบัติการของคุณ"
-DockCloseWarning.Title="ปิดหน้าต่างเครื่องมือ"
-DockCloseWarning.Text="คุณเพิ่งจะปิดหน้าต่างเครื่องมือ ถ้าคุณต้องการให้มันแสดงอีกครั้ง ให้ไปที่แถบเมนูแล้วเลือกเมนู แถบรายการโปรด"
-ExtraBrowsers="ถาดงานแบบตั้งค่าเอง"
-ExtraBrowsers.Info="เพิ่ม แถบงานโดยตั้งชื่อ และ เพิ่ม URL จากนั้นคลิก นำไปใช้ หรือ ปิด เพื่อทำการเปิดแถบงาน คุณสามารถเพิ่มหรือลบ แถบงานได้ตลอดเวลา"
-ExtraBrowsers.DockName="ขนาดแถบรายการโปรด"
+DockCloseWarning.Title="การปิดหน้าต่างถาดงาน"
+DockCloseWarning.Text="คุณเพิ่งจะปิดหน้าต่างถาดงานไป ถ้าคุณต้องการให้แสดงอีกครั้ง ให้ใช้เมนู ถาดงาน บนแถบเมนู"
+ExtraBrowsers="ถาดงานเบราว์เซอร์แบบปรับแต่งเอง"
+ExtraBrowsers.Info="เพิ่มถาดงานโดยตั้งชื่อ และ เพิ่ม URL จากนั้นคลิก นำไปใช้ หรือ ปิด เพื่อทำการเปิดถาดงาน คุณสามารถเพิ่มหรือลบถาดงานได้ตลอดเวลา"
+ExtraBrowsers.DockName="ชื่อถาดงาน"
 Auth.Authing.Title="กำลังตรวจสอบสิทธิ์..."
 Auth.Authing.Text="กำลังตรวจสอบสิทธิ์กับ %1 โปรดรอสักครู่..."
 Auth.AuthFailure.Title="การตรวจสอบสิทธิ์ล้มเหลว"
@@ -178,8 +185,9 @@
 Basic.AutoConfig.StreamPage.Service.Custom="กำหนดเอง..."
 Basic.AutoConfig.StreamPage.Server="เซิร์ฟเวอร์"
 Basic.AutoConfig.StreamPage.StreamKey="รหัสสตรีม"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(เชื่อมโยง)"
+Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: ป้อนรหัสผ่านการเข้ารหัส\nRTMP: ป้อนคีย์ที่บริการที่ให้มา\nSRT: ป้อนสตรีมมิดหากบริการใช้"
 Basic.AutoConfig.StreamPage.EncoderKey="เข้ารหัสคีย์"
+Basic.AutoConfig.StreamPage.BearerToken="โทเค็น Bearer"
 Basic.AutoConfig.StreamPage.ConnectedAccount="บัญชีเชื่อมต่อแล้ว"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="ทดสอบการประเมินค่าบิตเรตกับแบนด์วิดท์ (อาจใช้เวลาสักพัก)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="กำหนดการเข้ารหัสด้วยฮาร์ดแวร์"
@@ -190,6 +198,7 @@
 Basic.AutoConfig.TestPage.SubTitle.Testing="ขณะนี้โปรแกรมกำลังดำเนินการทดสอบชุดหนึ่งเพื่อประเมินการตั้งค่าที่เหมาะสมที่สุด"
 Basic.AutoConfig.TestPage.SubTitle.Complete="การทดสอบเสร็จสมบูรณ์"
 Basic.AutoConfig.TestPage.TestingBandwidth="กำลังดำเนินการทดสอบแบนด์วิดท์ อาจใช้เวลาสักครู่..."
+Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="ไม่พบผลลัพธ์สำหรับโปรโตคอลของบริการนี้"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="กำลังเชื่อมต่อไปยัง: %1"
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="ไม่สามารถเชื่อมต่อกับเซิร์ฟได้, โปรดตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณแล้วลองอีกครั้ง."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="ทดสอบแบนด์วิดท์สำหรับ: %1"
@@ -223,14 +232,12 @@
 Basic.Stats.DiskFullIn="พื้นที่จัดเก็บเต็ม"
 Basic.Stats.ResetStats="รีเซ็ตสถิติ"
 ResetUIWarning.Title="คุณแน่ใจหรือไม่ว่าต้องการคืนค่า UI?"
-ResetUIWarning.Text="การรีเซ็ต UI จะซ่อนท่าเรือเพิ่มเติม คุณจะต้องยกเลิกการซ่อน Docks เหล่านี้จากเมนู Docks หากต้องการให้มองเห็นได้\n\nคุณแน่ใจหรือไม่ว่าต้องการรีเซ็ต UI"
+ResetUIWarning.Text="การรีเซ็ต UI จะซ่อนถาดงานเพิ่มเติม คุณจะต้องยกเลิกการซ่อนถาดงานเหล่านี้จากเมนูถาดงานหากต้องการให้มองเห็นได้\n\nคุณแน่ใจหรือไม่ว่าต้องการรีเซ็ต UI?"
 Updater.Title="มีการอัปเดตใหม่"
 Updater.Text="มีการอัปเดตใหม่:"
 Updater.UpdateNow="อัปเดตเดี๋ยวนี้"
 Updater.RemindMeLater="เตือนฉันในภายหลัง"
 Updater.Skip="ข้ามรุ่น"
-Updater.Running.Title="โปรแกรมกำลังทำงานอยู่"
-Updater.Running.Text="เอาต์พุตกำลังทำงานอยู่ โปรดปิดเอาต์พุตที่ใช้งานอยู่ก่อนที่จะพยายามอัปเดต"
 Updater.NoUpdatesAvailable.Title="ไม่มีอัพเดทที่พร้อมใช้"
 Updater.NoUpdatesAvailable.Text="ขณะนี้ยังไม่มีอัพเดทที่พร้อมใช้"
 Updater.BranchNotFound.Title="ลบช่องทางการอัพเดตแล้ว"
@@ -240,8 +247,6 @@
 Updater.RepairConfirm.Title="ยืนยันการตรวจสอบ Integrity"
 Updater.RepairConfirm.Text="การเริ่มต้นการตรวจสอบ integrity จะสแกนการติดตั้ง OBS ของคุณเพื่อหาความเสียหาย และดาวน์โหลดไฟล์ที่เสียหาย/แก้ไขใหม่ อาจใช้เวลาสักครู่\n\nคุณต้องการดำเนินการต่อหรือไม่"
 Updater.FailedToLaunch="ไม่สามารถเปิดตัวอัปเดตได้"
-Updater.GameCaptureActive.Title="การจับภาพเกมทำงานอยู่"
-Updater.GameCaptureActive.Text="ไลบรารีจุดแทรกโค้ดของการจับภาพเกมทำงานอยู่ในขณะนี้ โปรดปิดเกมหรือโปรแกรมทั้งหมดที่จับภาพอยู่ (หรือรีสตาร์ท Windows) แล้วลองอีกครั้ง"
 QuickTransitions.SwapScenes="สลับฉากตัวอย่างและฉากของโปรแกรมหลังจากเปลี่ยน"
 QuickTransitions.SwapScenesTT="สลับฉากตัวอย่างและฉากของโปรแกรมหลังจากเปลี่ยนแล้ว (หากฉากดั้งเดิมของโปรแกรมยังคงอยู่)\nการดำเนินการนี้จะไม่ยกเลิกการเปลี่ยนแปลงใดๆ ที่อาจเกิดขึ้นกับฉากดั้งเดิมของโปรแกรม"
 QuickTransitions.DuplicateScene="ฉากซ้ำกัน"
@@ -255,6 +260,8 @@
 Basic.SceneTransitions="รูปแบบการสลับฉาก"
 Basic.TransitionDuration="ระยะเวลา"
 Basic.TogglePreviewProgramMode="โหมดสตูดิโอ"
+Basic.EnablePreviewProgramMode="เปิดใช้งานโหมดสตูดิโอ"
+Basic.DisablePreviewProgramMode="ปิดใช้งานโหมดสตูดิโอ"
 Undo.Undo="เลิกทำ"
 Undo.Redo="ทำซ้ำ"
 Undo.Add="เพิ่ม '%1'"
@@ -283,7 +290,7 @@
 Undo.Volume.Unmute="เปิดเสียง %1"
 Undo.Balance.Change="การเปลี่ยนความสมดุลของเสียงใน '%1'"
 Undo.SyncOffset.Change="การเปลี่ยน Sync Offset เสียงใน '%1'"
-Undo.MonitoringType.Change="เปลี่ยนการตรวจสอบเสียงใน '%1'"
+Undo.MonitoringType.Change="เปลี่ยนการมอนิเตอร์เสียงใน '%1'"
 Undo.Mixers.Change="เปลี่ยนมิกเซอร์เสียงใน '%1'"
 Undo.ForceMono.On="เปิดใช้งานเสียงโมโนใน '%1'"
 Undo.ForceMono.Off="ปิดใช้งานเสียงโมโนใน '%1'"
@@ -303,6 +310,8 @@
 Undo.GroupItems="รวมรายการเป็นกลุ่ม %1"
 TransitionNameDlg.Text="โปรดกำหนดชื่อสำหรับรูปแบบการสลับฉาก"
 TransitionNameDlg.Title="ชื่อรูปแบบการสลับฉาก"
+TitleBar.SafeMode="โหมดปลอดภัย"
+TitleBar.PortableMode="โหมดพกพา"
 TitleBar.Profile="โปรไฟล์"
 TitleBar.Scenes="ฉาก"
 NameExists.Title="มีผู้ใช้นี้ในระบบแล้ว"
@@ -322,9 +331,12 @@
 ConfirmRemove.Title="ยืนยันการลบ"
 ConfirmRemove.Text="คุณแน่ใจหรือไม่ว่าต้องการลบ '%1'?"
 ConfirmRemove.TextMultiple="คุณแน่ใจแล้วหรือที่จะลบ '%1'?"
+ConfirmReset.Title="รีเซ็ตคุณสมบัติ"
+ConfirmReset.Text="คุณแน่ใจหรือไม่ว่าต้องการรีเซ็ตคุณสมบัติปัจจุบันเป็นค่าเริ่มต้น?"
 Output.StartStreamFailed="ไม่สามารถเริ่มสตรีมได้"
 Output.StartRecordingFailed="ไม่สามารถเริ่มบันทึกได้"
 Output.StartReplayFailed="ไม่สามารถเล่นบัฟเฟอร์ซ้ำได้"
+Output.StartVirtualCamFailed="เริ่มกล้องเสมือนไม่สำเร็จ"
 Output.StartFailedGeneric="การส่งออกเอาต์พุตล้มเหลว โปรดตรวจสอบบันทึกเพื่อดูรายละเอียด\n\nหมายเหตุ: หากคุณกำลังใช้ตัวเข้ารหัส NVENC หรือ AMD ตรวจสอบให้แน่ใจว่าไดรเวอร์วิดีโอของคุณเป็นเวอร์ชันล่าสุด"
 Output.ReplayBuffer.PauseWarning.Title="ไม่สามารถบันทึกไฟล์ที่เล่นซ้ำขณะหยุดชั่วคราวได้"
 Output.ReplayBuffer.PauseWarning.Text="คำเตือน: ไม่สามารถบันทึกไฟล์ที่เล่นซ้ำขณะหยุดการบันทึกชั่วคราวได้"
@@ -332,11 +344,12 @@
 Output.ConnectFail.BadPath="URL ของเส้นทางหรือการเชื่อมต่อไม่ถูกต้อง โปรดตรวจสอบการตั้งค่าของคุณให้ถูกต้อง"
 Output.ConnectFail.ConnectFailed="ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"
 Output.ConnectFail.InvalidStream="ไม่สามารถเข้าถึงช่องหรือรหัสสตรีมที่ระบุได้ โปรดตรวจสอบรหัสสตรีมของคุณใหม่อีกครั้ง ถ้าถูกต้องแล้ว แสดงว่าอาจมีปัญหาในการเชื่อมต่อกับเซิร์ฟเวอร์"
+Output.ConnectFail.HdrDisabled="ขณะนี้เอาต์พุต HDR ถูกปิดใช้งานสำหรับเอาต์พุตนี้"
 Output.ConnectFail.Error="มีข้อผิดพลาดไม่คาดคิดเกิดขึ้นเมื่อพยายามเชื่อมต่อกับเซิร์ฟเวอร์ โปรดดูข้อมูลเพิ่มเติมในไฟล์ log"
 Output.ConnectFail.Disconnected="ถูกตัดออกจากเซิร์ฟเวอร์"
 Output.StreamEncodeError.Title="ข้อผิดพลาดในการเข้ารหัส"
 Output.StreamEncodeError.Msg="ตัวเข้ารหัสเกิดข้อผิดพลาดขณะสตรีม"
-Output.StreamEncodeError.Msg.LastError="ตัวเข้ารหัสเกิดข้อผิดพลาดขณะสตรีม:\n\n%1"
+Output.StreamEncodeError.Msg.LastError=""
 Output.RecordFail.Title="การเริ่มบันทึกล้มเหลว"
 Output.RecordFail.Unsupported="ไม่รองรับรูปแบบเอาต์พุตนี้ หรือไม่รองรับแทร็คเสียงมากกว่าหนึ่งแทร็ค โปรดตรวจสอบการตั้งค่าแล้วลองอีกครั้ง"
 Output.RecordNoSpace.Title="พื้นที่เก็บข้อมูลไม่เพียงพอ"
@@ -344,7 +357,6 @@
 Output.RecordError.Title="การบันทึกผิดพลาด"
 Output.RecordError.Msg="มีข้อผิดพลาดที่ระบุไม่ได้เกิดขึ้นขณะบันทึก"
 Output.RecordError.EncodeErrorMsg="มีข้อผิดพลาดเกี่ยวกับตัวเข้ารหัสเกิดขึ้นขณะบันทึก"
-Output.RecordError.EncodeErrorMsg.LastError="มีข้อผิดพลาดเกี่ยวกับตัวเข้ารหัสเกิดขึ้นขณะบันทึก:\n\n%1"
 Output.BadPath.Title="เส้นทางของไฟล์ไม่ถูกต้อง"
 Output.BadPath.Text="ไม่สามารถเปิดเส้นทางการบันทึกที่กำหนดค่าไว้ได้ โปรดตรวจสอบเส้นทางการบันทึกของคุณใน การตั้งค่า → เอาต์พุต → การบันทึก"
 Output.NoBroadcast.Title="ไม่ได้กำหนดค่าการถ่ายทอด"
@@ -374,6 +386,8 @@
 Remux.ExitUnfinishedTitle="กำลังทำการรีมักซ์"
 Remux.ExitUnfinished="การรีมักซ์ยังไม่เสร็จ การหยุดตอนนี้อาจทำให้ไฟล์เสียหาย\nคุณแน่ใจหรือไม่ว่าต้องการหยุด"
 Remux.HelpText="ลากไฟล์มาไว้ในหน้าต่างนี้เพื่อทำการรีมักซ์ หรือเลือกเซลล์ \"การบันทึก OBS\" เปล่าเพื่อเปิดหาไฟล์"
+Remux.NoFilesAddedTitle="ไม่มีการเพิ่มไฟล์ remuxing"
+Remux.NoFilesAdded="ไม่มีการเพิ่มไฟล์ลงไปใน remux วางโฟลเดอร์ที่มีไฟล์วิดีโอตั้งแต่หนึ่งไฟล์ขึ้นไป"
 MissingFiles="ไฟล์ที่หายไปทั้งหมด"
 MissingFiles.MissingFile="ไฟล์ที่หายไป"
 MissingFiles.NewFile="ไฟล์ใหม่"
@@ -392,7 +406,8 @@
 MissingFiles.AutoSearchText="OBS พบไฟล์ที่ตรงกันเพิ่มเติมสำหรับไฟล์ที่ขาดหายไปในไดเร็กทอรีนั้น คุณต้องการเพิ่มหรือไม่"
 MissingFiles.NoMissing.Title="ตรวจสอบไฟล์ที่หายไป"
 MissingFiles.NoMissing.Text="ไม่มีไฟล์ใดที่ดูเหมือนจะหายไป"
-MacPermissions.Title="ตรวจสอบสิทธิ์ของแอป"
+MacPermissions.MenuAction="ตรวจสอบสิทธิ์ของแอพ..."
+MacPermissions.Title="ตรวจสอบการอนุญาตแอพ"
 MacPermissions.Description="OBS Studio ต้องได้รับอนุญาตจากคุณจึงจะสามารถให้บริการคุณลักษณะบางอย่างได้ ขอแนะนำให้เปิดใช้งานการอนุญาตเหล่านี้ แต่ไม่จำเป็นต้องใช้แอพ คุณสามารถเปิดใช้งานได้ในภายหลัง"
 MacPermissions.Description.OpenDialog="คุณสามารถเปิดกล่องโต้ตอบนี้อีกครั้งผ่านเมนู OBS Studio"
 MacPermissions.AccessGranted="ได้รับสิทธิ์การเข้าถึง"
@@ -407,8 +422,8 @@
 MacPermissions.Item.Accessibility="การช่วยการเข้าถึง"
 MacPermissions.Item.Accessibility.Details="เพื่อให้แป้นพิมพ์ลัด (ปุ่มลัด) ทำงานขณะที่แอปอื่นโฟกัสอยู่ โปรดเปิดใช้การอนุญาตนี้"
 MacPermissions.Continue="ดำเนินการต่อ"
-UpdateAvailable="มีอัปเดตใหม่พร้อมใช้งาน"
-UpdateAvailable.Text="เวอร์ชั่น %1.%2.%3 พร้อมใช้งานแล้ว <a href='%4'>คลิกที่นี่เพื่อดาวน์โหลด</a>"
+SourceLeak.Title="ข้อผิดพลาดในการล้างข้อมูลแหล่งที่มา"
+SourceLeak.Text="เกิดปัญหา!ขณะเปลี่ยนคอลเลคชันฉากและบางแหล่งไม่สามารถยกเลิกการโหลดได้ ปัญหา!นี้มักเกิดจากปลั๊กอินที่ไม่ได้ปล่อยทรัพยากรอย่างเหมาะสม โปรดตรวจสอบให้แน่ใจว่าปลั๊กอินที่คุณใช้เป็นเวอร์ชันล่าสุด\n\nOBS Studio จะออกเพื่อป้องกันข้อมูลที่อาจเสียหายได้!"
 Basic.Scene="ฉาก"
 Basic.DisplayCapture="จับภาพหน้าจอ"
 Basic.Main.PreviewConextMenu.Enable="เปิดใช้งานตัวอย่าง"
@@ -435,6 +450,7 @@
 VolControl.SliderMuted="แถบเลื่อนระดับเสียงสำหรับ '%1': (ขณะนี้ปิดเสียงอยู่)"
 VolControl.Mute="ปิดเสียง %1"
 VolControl.Properties="คุณสมบัติของ '%1'"
+VolControl.UnassignedWarning.Title="แหล่งเสียงที่ไม่ได้กำหนด"
 Basic.Main.AddSceneDlg.Title="เพิ่มฉาก"
 Basic.Main.AddSceneDlg.Text="โปรดกำหนดชื่อฉาก"
 Basic.Main.DefaultSceneName.Text="ฉาก %1"
@@ -460,6 +476,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (เลือกอัตโนมัติ: %2)"
 Basic.PropertiesWindow.SelectColor="เลือกสี"
 Basic.PropertiesWindow.SelectFont="เลือกแบบอักษร"
+Basic.PropertiesWindow.SelectFont.WindowTitle="เลือกแบบอักษร"
 Basic.PropertiesWindow.ConfirmTitle="การตั้งค่ามีการเปลี่ยนแปลง"
 Basic.PropertiesWindow.Confirm="มีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก, คุณต้องการบันทึกตอนนี้เลยไหม?"
 Basic.PropertiesWindow.NoProperties="ไม่มีคุณสมบัติ"
@@ -567,9 +584,9 @@
 Basic.VCam.VirtualCamera="กล้องเสมือนจริง"
 Basic.VCam.OutputType="โหมดเอาต์พุต"
 Basic.VCam.OutputSelection="เลือกเอาต์พุต"
-Basic.VCam.Internal="ภายใน"
-Basic.VCam.InternalDefault="เอาต์พุตของโปรแกรม (ค่าเริ่มต้น)"
-Basic.VCam.InternalPreview="เอาต์พุตแสดงตัวอย่าง"
+Basic.VCam.OutputType.Program="โปรแกรม(ค่าเริ่มต้น)"
+Basic.VCam.OutputSelection.NoSelection="เอ้าต์พุตนี้ยังไม่ได้เลือก"
+Basic.VCam.RestartWarning="กล้องเสมือนจริงจะถูกรีสตาร์ทเพื่อให้เข้ากับการตั้งค่านี้"
 Basic.MainMenu.File="ไฟล์ (&F)"
 Basic.MainMenu.File.Export="ส่งออก (&E)"
 Basic.MainMenu.File.Import="นําเข้า (&I)"
@@ -611,16 +628,18 @@
 Basic.MainMenu.Edit.AdvAudio="&คุณสมบัติเสียงขั้นสูง"
 Basic.MainMenu.View="&มุมมอง"
 Basic.MainMenu.View.Toolbars="แถบเครื่องมือ"
-Basic.MainMenu.View.ListboxToolbars="ปุ่มรายชื่อฉาก/แหล่งที่มา"
+Basic.MainMenu.View.ListboxToolbars="แถบเครื่องมือถาดงาน"
 Basic.MainMenu.View.ContextBar="แถบเครื่องมือแหล่งที่มา"
-Basic.MainMenu.View.SceneTransitions="รูปแบบการสลับฉาก"
 Basic.MainMenu.View.SourceIcons="ไอคอนแหล่ง(&I)"
 Basic.MainMenu.View.StatusBar="แถบสถานะ"
 Basic.MainMenu.View.Fullscreen.Interface="อินเตอร์เฟซแบบเต็มจอ"
 Basic.MainMenu.View.ResetUI="&รีเซ็ต UI"
 Basic.MainMenu.View.AlwaysOnTop="&อยู่ด้านบนเสมอ"
-Basic.MainMenu.Docks="&แถบรายการโปรด"
-Basic.MainMenu.Docks.CustomBrowserDocks="&ถาดงานแบบตั้งค่าเอง..."
+Basic.MainMenu.View.SceneListMode="โหมดซีนแบบรายการ"
+Basic.MainMenu.Docks="&ถาดงาน"
+Basic.MainMenu.Docks.ResetDocks="&รีเซ็ตถาดงาน"
+Basic.MainMenu.Docks.LockDocks="&ล็อกถาดงาน"
+Basic.MainMenu.Docks.CustomBrowserDocks="&ถาดงานเบราว์เซอร์แบบปรับแต่งเอง..."
 Basic.MainMenu.SceneCollection="&เพิ่มคอลเลกชัน"
 Basic.MainMenu.Profile="&โปรไฟล์"
 Basic.MainMenu.Profile.Import="นำเข้าโปรไฟล์"
@@ -628,7 +647,6 @@
 Basic.MainMenu.SceneCollection.Import="เพิ่มคอลเลกชัน"
 Basic.MainMenu.SceneCollection.Export="เปลี่ยนชื่อคอลเลกชันฉาก"
 Basic.MainMenu.Profile.Exists="มีโปรไฟล์อยู่แล้ว"
-Basic.MainMenu.SceneCollection.Exists="คุณสมบัติร่วมนี้ ถูกสร้างขึ้นแล้ว"
 Basic.MainMenu.Tools="&เครื่องมือ"
 Basic.MainMenu.Help="&ช่วยเหลือ"
 Basic.MainMenu.Help.HelpPortal="Help"
@@ -639,7 +657,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="อัปโหลดไฟล์ Log &ปัจจุบัน"
 Basic.MainMenu.Help.Logs.UploadLastLog="อัปโหลดไฟล์ Log &ก่อนหน้า"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&ดู Log ปัจจุบัน"
+Basic.MainMenu.Help.ReleaseNotes="บันทึกประจำรุ่น"
 Basic.MainMenu.Help.CheckForUpdates="ตรวจสอบการอัพเดต"
+Basic.MainMenu.Help.Repair="ตรวจสอบความสมบูรณ์ของไฟล์"
+Basic.MainMenu.Help.RestartSafeMode="เริ่มใหม่ในโหมดปลอดภัย"
+Basic.MainMenu.Help.RestartNormal="เริ่มใหม่ในโหมดปกติ"
 Basic.MainMenu.Help.CrashLogs="รายงานความผิดพลาด"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="&แสดงรายงานความผิดพลาด"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="อัปโหลดรายงานความผิดพลาด&ก่อนหน้า"
@@ -670,6 +692,7 @@
 Basic.Settings.General.CenterSnapping="สแนปแหล่งเข้ากับศูนย์กลางตามแนวนอนและแนวตั้ง"
 Basic.Settings.General.SourceSnapping="สแนปแหล่งเข้ากับแหล่งอื่นๆ"
 Basic.Settings.General.SnapDistance="ความไวของการสแนป"
+Basic.Settings.General.SpacingHelpers="แสดงเส้นนำแนวการจัดเรียงพิกเซล"
 Basic.Settings.General.RecordWhenStreaming="บันทึกภาพอัตโนมัติขณะสตรีม"
 Basic.Settings.General.KeepRecordingWhenStreamStops="บันทึกภาพต่อไปหลังหยุดสตรีมแล้ว"
 Basic.Settings.General.ReplayBufferWhileStreaming="เริ่มบัฟเฟอร์เล่นซ้ำอัตโนมัติขณะสตรีม"
@@ -704,11 +727,14 @@
 Basic.Settings.General.MultiviewLayout.16Scene="เฉพาะฉากเท่านั้น (16 ฉาก)"
 Basic.Settings.General.MultiviewLayout.25Scene="เฉพาะฉากเท่านั้น (25 ฉาก)"
 Basic.Settings.General.ChannelName.stable="เสถียร"
+Basic.Settings.General.ChannelDescription.stable="รุ่นเสถียรล่าสุด"
+Basic.Settings.General.ChannelName.beta="รุ่นเบต้า / Release Candidate"
+Basic.Settings.General.ChannelDescription.beta="รุ่นก่อนปล่อยที่อาจไม่เสถียร"
 Basic.Settings.Stream="สตรีม"
-Basic.Settings.Stream.StreamType="รูปแบบการสตรีม"
 Basic.Settings.Stream.Custom.UseAuthentication="ใช้การตรวจสอบสิทธิ์"
 Basic.Settings.Stream.Custom.Username="ชื่อผู้ใช้"
 Basic.Settings.Stream.Custom.Password="รหัสผ่าน"
+Basic.Settings.Stream.Custom.Username.ToolTip="RIST: ป้อน srp_username\nRTMP: ป้อนชื่อผู้ใช้\nSRT: ไม่ได้ใช้"
 Basic.Settings.Stream.BandwidthTestMode="เปิดใช้งานโหมดทดสอบแบนด์วิดท์"
 Basic.Settings.Stream.TTVAddon="ส่วนเสริมแชท Twitch"
 Basic.Settings.Stream.TTVAddon.None="ไม่ใช้"
@@ -730,7 +756,6 @@
 Basic.Settings.Output.Encoder.Video="ตัวเข้ารหัสวิดีโอ"
 Basic.Settings.Output.Encoder.Audio="ตัวเข้ารหัสเสียง"
 Basic.Settings.Output.SelectDirectory="เลือกตำแหน่งไดเรกทอรี"
-Basic.Settings.Output.SelectFile="เลือกไฟล์บันทึก"
 Basic.Settings.Output.DynamicBitrate="ปรับเปลี่ยนอัตราบิตตามความหนาแน่นของการส่งข้อมูล"
 Basic.Settings.Output.DynamicBitrate.Beta="ปรับเปลี่ยนอัตราบิตตามความหนาแน่นของการส่งข้อมูล (ทดลอง)"
 Basic.Settings.Output.DynamicBitrate.TT="ปรับเปลี่ยนอัตราบิตตามความหนาแน่นของการส่งข้อมูลแทนที่จะใช้วิธีดรอปเฟรม\n\nอาจทำให้ผู้ชมรับภาพได้ล่าช้าหากเกิดความหนาแน่นสูงทันทีทันใด\nและจะต้องใช้เวลาในการกู้คืนสักครู่เมื่อค่าอัตราบิตลดลง\n\nรองรับเฉพาะ RTMP เท่านั้น"
@@ -742,12 +767,14 @@
 Basic.Settings.Output.ReplayBuffer.SecondsMax="เวลาเล่นซ้ำสูงสุด"
 Basic.Settings.Output.ReplayBuffer.MegabytesMax="หน่วยความจำสูงสุด (เมกะไบต์)"
 Basic.Settings.Output.ReplayBuffer.Estimate="การใช้หน่วยความจำโดยประมาณ: %1 MB"
+Basic.Settings.Output.ReplayBuffer.EstimateTooLarge="คำเตือน: การใช้หน่วยความจำโดยประมาณที่ %1 MiB มากกว่าขีดสูงสุดที่แนะนำซึ่งอยู่ที่ %2 MiB"
 Basic.Settings.Output.ReplayBuffer.EstimateUnknown="ไม่สามารถคำนวณการใช้หน่วยความจำโดยประมาณได้ โปรดกำหนดขีดจำกัดหน่วยความจำสูงสุด"
 Basic.Settings.Output.ReplayBuffer.Prefix="ส่วนขึ้นต้นชื่อไฟล์สำหรับบัฟเฟอร์เล่นซ้ำ"
 Basic.Settings.Output.ReplayBuffer.Suffix="ส่วนต่อท้าย"
 Basic.Settings.Output.Simple.SavePath="ประเภทการบันทึก"
 Basic.Settings.Output.Simple.RecordingQuality="คุณภาพการบันทึก"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="เหมือนกับสตรีม"
+Basic.Settings.Output.Simple.RecordingQuality.Small="คุณภาพสูง ขนาดไฟล์ปานกลาง"
 Basic.Settings.Output.Simple.Encoder.Software="ซอฟต์แวร์ (x264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="ฮาร์ดแวร์ (QSV, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="ฮาร์ดแวร์ (QSV)"
@@ -780,16 +807,21 @@
 Basic.Settings.Output.Adv.Rescale="รีสเกลเอาต์พุต"
 Basic.Settings.Output.Adv.AudioTrack="แทร็คเสียง"
 Basic.Settings.Output.Adv.Streaming="การสตรีม"
+Basic.Settings.Output.Adv.Streaming.Settings="ตั้งค่าการสตรีม"
 Basic.Settings.Output.Adv.Audio.Track1="แทร็ค 1"
 Basic.Settings.Output.Adv.Audio.Track2="แทร็ค 2"
 Basic.Settings.Output.Adv.Audio.Track3="แทร็ค 3"
 Basic.Settings.Output.Adv.Audio.Track4="แทร็ค 4"
 Basic.Settings.Output.Adv.Audio.Track5="แทร็ค 5"
 Basic.Settings.Output.Adv.Audio.Track6="แทร็ค 6"
+Basic.Settings.Output.Adv.TwitchVodTrack="แทร็ค VOD ของ Twitch"
+Basic.Settings.Output.Adv.Encoder="ตั้งค่าตัวเข้ารหัส"
 Basic.Settings.Output.Adv.Recording="การบันทึก"
+Basic.Settings.Output.Adv.Recording.Settings="ตั้งค่าการบันทึก"
 Basic.Settings.Output.Adv.Recording.RecType="ประเภทการบันทึก"
 Basic.Settings.Output.Adv.Recording.Type="รูปแบบ"
 Basic.Settings.Output.Adv.Recording.Type.Standard="ทั่วไป"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="เอาต์พุตกำหนดเอง (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(ใช้ตัวถอดรหัสสตรีม)"
 Basic.Settings.Output.Adv.Recording.Filename="รูปแบบชื่อไฟล์"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="เขียนทับถ้าไฟล์มีอยู่"
@@ -812,17 +844,96 @@
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="ตัวเข้ารหัสเสียง"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="การตั้งค่าตัวเข้ารหัสเสียง (ถ้ามี)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="การตั้งค่า Muxer (ถ้ามี)"
+Basic.Settings.Output.Adv.FFmpeg.GOPSize="ช่วงคีย์เฟรม (เฟรม)"
+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="แสดงตัวลงรหัสทั้งหมด (แม้อาจจะเข้ากันไม่ได้ก็ตาม)"
+Basic.Settings.Output.Adv.FFmpeg.Settings="ตั้งค่า FFmpeg"
+Basic.Settings.Output.EnableSplitFile="การแบ่งไฟล์อัตโนมัติ"
+Basic.Settings.Output.SplitFile.TypeTime="แบ่งตามเวลา"
+Basic.Settings.Output.SplitFile.TypeSize="แบ่งตามขนาด"
+Basic.Settings.Output.SplitFile.TypeManual="แบ่งด้วยตนเองเท่านั้น"
+Basic.Settings.Output.SplitFile.Time="เวลาที่แบ่ง"
+Basic.Settings.Output.SplitFile.Size="ขนาดที่แบ่ง"
+Screenshot="ถ่ายภาพหน้าจอของเอาต์พุต"
+Screenshot.SourceHotkey="ถ่ายภาพหน้าจอของแหล่งที่เลือก"
+Screenshot.StudioProgram="ภาพหน้าจอ (โปรแกรม)"
+Screenshot.Preview="ภาพหน้าจอ (ตัวอย่าง)"
+Screenshot.Scene="ภาพหน้าจอ (ฉาก)"
+Screenshot.Source="ภาพหน้าจอ (แหล่ง)"
+FilenameFormatting.TT.CCYY="ปี, สี่หลัก"
+FilenameFormatting.TT.YY="ปี, สองหลักสุดท้าย (00-99)"
+FilenameFormatting.TT.MM="เดือนในรูปแบบเลขฐานสิบ (01-12)"
+FilenameFormatting.TT.DD="วันของเดือน, เติมเลขศูนย์ (01-31)"
+FilenameFormatting.TT.hh="ชั่วโมงในรูปแบบ 24 ชม. (00-23)"
+FilenameFormatting.TT.mm="นาที (00-59)"
+FilenameFormatting.TT.ss="วินาที (00-59)"
+FilenameFormatting.TT.Percent="เครื่องหมาย %"
+FilenameFormatting.TT.a="ชื่อวันในสัปดาห์แบบย่อ"
+FilenameFormatting.TT.A="ชื่อวันในสัปดาห์แบบเต็ม"
+FilenameFormatting.TT.b="ชื่อเดือนแบบย่อ"
+FilenameFormatting.TT.B="ชื่อเดือนแบบเต็ม"
+FilenameFormatting.TT.d="วันของเดือน, เติมเลขศูนย์ (01-31)"
+FilenameFormatting.TT.H="ชั่วโมงในรูปแบบ 24 ชม. (00-23)"
+FilenameFormatting.TT.I="ชั่วโมงในรูปแบบ 12 ชม. (01-12)"
+FilenameFormatting.TT.m="เดือนในรูปแบบเลขฐานสิบ (01-12)"
+FilenameFormatting.TT.M="นาที (00-59)"
+FilenameFormatting.TT.p="คำเรียก AM หรือ PM"
+FilenameFormatting.TT.s="เวลาในหน่วยวินาทีตั้งแต่ UNIX epoch"
+FilenameFormatting.TT.S="วินาที (00-59)"
+FilenameFormatting.TT.y="ปี, สองหลักสุดท้าย (00-99)"
+FilenameFormatting.TT.Y="ปี"
+FilenameFormatting.TT.z="ค่าออฟเซต ISO 8601 จาก UTC ในเขตเวลา"
+FilenameFormatting.TT.Z="ชื่อเต็มหรือชื่อย่อเขตเวลา"
+FilenameFormatting.TT.FPS="จำนวนเฟรมต่อวินาที"
+FilenameFormatting.TT.CRES="ความละเอียดของพื้นที่หลัก (แคนวาส)"
+FilenameFormatting.TT.ORES="ความละเอียดของเอาต์พุต (ปรับสัดส่วน)"
+FilenameFormatting.TT.VF="รูปแบบวิดีโอ"
 Basic.Settings.Video="วีดีโอ"
+Basic.Settings.Video.BaseResolution="ความละเอียดของพื้นที่หลัก (แคนวาส)"
+Basic.Settings.Video.ScaledResolution="ความละเอียดของเอาต์พุต (ปรับสัดส่วน)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (เร็วที่สุด แต่จะเบลอถ้าปรับสัดส่วน)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (ปรับสัดส่วนแบบคมชัด, 16 ตัวอย่าง)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (ปรับสัดส่วนแบบคมชัด, 36 ตัวอย่าง)"
+Basic.Settings.Video.DownscaleFilter.Area="Area (ค่าผลรวมถ่วงน้ำหนัก, 4/6/9 ตัวอย่าง)"
 Basic.Settings.Audio="เสียง"
+Basic.Settings.Audio.SampleRate="อัตราการสุ่มตัวอย่าง"
 Basic.Settings.Audio.Channels="ช่อง"
+Basic.Settings.Audio.Meters="มิเตอร์"
+Basic.Settings.Audio.MeterDecayRate="อัตราการลดระดับ"
 Basic.Settings.Audio.MeterDecayRate.Fast="เร็ว"
+Basic.Settings.Audio.MeterDecayRate.Medium="ปานกลาง (Type I PPM)"
+Basic.Settings.Audio.MeterDecayRate.Slow="ช้า (Type II PPM)"
+Basic.Settings.Audio.PeakMeterType="ชนืดพีคมิเตอร์"
+Basic.Settings.Audio.PeakMeterType.SamplePeak="ค่าพีคตัวอย่าง"
+Basic.Settings.Audio.PeakMeterType.TruePeak="ค่าพีคจริง (ใช้ CPU มากขึ้น)"
+Basic.Settings.Audio.MultichannelWarning.Enabled="คำเตือน: ระบบเสียงรอบทิศทางเปิดใช้งานอยู่"
+Basic.Settings.Audio.MultichannelWarning.Title="เปิดใช้งานระบบเสียงรอบทิศทางหรือไม่?"
+Basic.Settings.Audio.Devices="อุปกรณ์เสียงส่วนกลาง"
+Basic.Settings.Audio.DesktopDevice="เสียงเดสก์ท็อป"
+Basic.Settings.Audio.DesktopDevice2="เสียงเดสก์ท็อป 2"
+Basic.Settings.Audio.AuxDevice="เสียงไมค์/ช่องเสริม"
+Basic.Settings.Audio.AuxDevice2="เสียงไมค์/ช่องเสริม 2"
+Basic.Settings.Audio.AuxDevice3="เสียงไมค์/ช่องเสริม 3"
+Basic.Settings.Audio.AuxDevice4="เสียงไมค์/ช่องเสริม 4"
+Basic.Settings.Audio.EnablePushToMute="เปิดใช้งานการกดเพื่อปิดเสียง"
+Basic.Settings.Audio.PushToMuteDelay="เวลาหน่วงการกดเพื่อปิดเสียง"
+Basic.Settings.Audio.EnablePushToTalk="เปิดใช้งานการกดเพื่อพูดคุย"
+Basic.Settings.Audio.PushToTalkDelay="เวลาหน่วงการกดเพื่อพูดคุย"
 Basic.Settings.Audio.UnknownAudioDevice="อุปกรณ์ไม่ได้เชื่อมต่อหรือไม่พร้อมใช้งาน"
 Basic.Settings.Audio.Disabled="ปิดการใช้งาน"
+Basic.Settings.Accessibility="การช่วยการเข้าถึง"
+Basic.Settings.Accessibility.ColorOverrides="ใช้สีแตกต่างกัน"
+Basic.Settings.Accessibility.ColorOverrides.Preset="พรีเซ็ตสี"
+Basic.Settings.Accessibility.ColorOverrides.Preset.Default="เริ่มต้น"
+Basic.Settings.Accessibility.ColorOverrides.Preset.Custom="กำหนดเอง"
+Basic.Settings.Accessibility.ColorOverrides.Preset.ColorBlind1="แบบทดแทนสำหรับตาบอดสี"
 Basic.Settings.Advanced="ขั้นสูง"
+Basic.Settings.Advanced.General.ConfirmOnExit="แสดงคำเตือนเอาต์พุตที่ใช้งานเมื่อออก"
+Basic.Settings.Advanced.General.ProcessPriority="ลำดับความสำคัญของโปรเซส"
 Basic.Settings.Advanced.General.ProcessPriority.High="สูง"
 Basic.Settings.Advanced.General.ProcessPriority.AboveNormal="สูงกว่าปกติ"
 Basic.Settings.Advanced.General.ProcessPriority.Normal="ปกติ"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="ต่ำกว่าปกติ"
+Basic.Settings.Advanced.General.ProcessPriority.Idle="ไม่ทำงาน"
 Basic.Settings.Advanced.Video.ColorFormat="รูปแบบสี"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="ค่าเริ่มต้น"
 Basic.Settings.Advanced.StreamDelay="ดีเลย์สตรีม"
@@ -834,6 +945,15 @@
 Basic.AdvAudio="คุณสมบัติเสียงขั้นสูง"
 Basic.AdvAudio.Name="ชื่อ"
 Basic.AdvAudio.Volume="ระดับเสียง"
+Basic.AdvAudio.Balance="บาลานซ์"
+Basic.AdvAudio.BalanceSource="บาลานซ์สำหรับ '%1'"
+Basic.AdvAudio.SyncOffset="ออฟเซตการซิงค์"
+Basic.AdvAudio.SyncOffsetSource="ออฟเซตการซิงค์สำหรับ '%1'"
+Basic.AdvAudio.Monitoring="การมอนิเตอร์เสียง"
+Basic.AdvAudio.Monitoring.None="ปิดมอนิเตอร์"
+Basic.AdvAudio.Monitoring.MonitorOnly="มอนิเตอร์อย่างเดียว (ปิดเสียงเอาต์พุต)"
+Basic.AdvAudio.Monitoring.Both="มอนิเตอร์และเอาต์พุต"
+Basic.AdvAudio.MonitoringSource="การมอนิเตอร์เสียงสำหรับ '%1'"
 Basic.AdvAudio.AudioTracks="แทร็ค"
 Basic.Settings.Hotkeys="ปุ่มลัด"
 Basic.Settings.Hotkeys.Filter="ฟิลเตอร์"

obs-studio-29.1.3.tar.xz/UI/data/locale/tl-PH.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/tl-PH.ini Changed

@@ -90,7 +90,6 @@
 LogViewer="Tagatingin ng mgs Nakatala"
 ShowOnStartup="Ipakita sa pagbukas"
 OpenFile="Buksan ang talaksan"
-AddValue="Magdagdag %1"
 AlreadyRunning.Title="Ang OBS ay pinapagana na"
 AlreadyRunning.Text="Ang OBS ay pinapagana na! Kung hindi mo ito sinasadya, mangyari lamang patayin ang mga umiiral na OBS bago subukang magpatakbo ng bago. Kung ikaw ay may OBS na kailangan ibaba sa batya ng sistema, mangyari lamang tingnan kung ito ay tumatakbo pa doon."
 AlreadyRunning.LaunchAnyway="Ilunsad pa rin"
@@ -171,13 +170,9 @@
 Updater.UpdateNow="Iupdate na Ngayon"
 Updater.RemindMeLater="Paalalahanan ako Maya-maya"
 Updater.Skip="Laktawan ang Bersyon"
-Updater.Running.Title="Ang programa ay kasalukuyang aktibo"
-Updater.Running.Text="Ang mga output ay kasalukuyang aktibo, mangyari lamang i-shut down ang anumang mga output na aktibo bago subukang mag-update"
 Updater.NoUpdatesAvailable.Title="Walang mga update na magagamit"
 Updater.NoUpdatesAvailable.Text="Walang mga update ang kasalukuyang magagamit"
 Updater.FailedToLaunch="Bigong malunsad ang updater"
-Updater.GameCaptureActive.Title="Ang Game capture ay aktibo"
-Updater.GameCaptureActive.Text="Ang hook library ng game capture ay kasalukuyang ginagamit. Mangyari lamang isara ang anumang mga laro/programang nahuli (o i-start muli ang Windows) at subukan muli."
 QuickTransitions.DuplicateScene="Gayahin ang Eksena"
 QuickTransitions.EditProperties="Gayahin ang mga Source"
 QuickTransitions.HotkeyName="Mabilis na Transisyon: %1"
@@ -235,8 +230,6 @@
 MissingFiles.Missing="Nawawala"
 MissingFiles.Found="Nahanap"
 MissingFiles.AutoSearch="May nahanap na mga magkatulad na file"
-UpdateAvailable="May Bagong Update na Magagamit"
-UpdateAvailable.Text="Ang bersyon %1.%2.%3 ay maaari nang gamiting ngayon. <a href='%4'>Pindutin ito upang ma-download</a>"
 Basic.Scene="Eksena"
 Basic.DisplayCapture="Ipakita ang Kuha"
 Basic.Main.PreviewConextMenu.Enable="Paganahin ang Preview"
@@ -377,7 +370,6 @@
 Basic.MainMenu.Edit.Order.MoveToBottom="Ilipat sa Pinaka &baba"
 Basic.MainMenu.Edit.AdvAudio="&Advanced na mga Katangian ng Audio"
 Basic.MainMenu.View.Toolbars="Mga &Toolbar"
-Basic.MainMenu.View.SceneTransitions="Mga Transisyon ng S&cene"
 Basic.MainMenu.View.Fullscreen.Interface="Interface gamit ang buong screen"
 Basic.MainMenu.SceneCollection="Koleky&syon ng mga Scene"
 Basic.MainMenu.Profile.Import="I-import ang Profile"
@@ -385,7 +377,6 @@
 Basic.MainMenu.SceneCollection.Import="I-import ang Koleksyon ng mga Eksena"
 Basic.MainMenu.SceneCollection.Export="I-export ang Koleksyon ng mga Eksena"
 Basic.MainMenu.Profile.Exists="May ganito ng Profile"
-Basic.MainMenu.SceneCollection.Exists="Mayroon ng ganitong koleksyon ng mga eksena"
 Basic.MainMenu.Tools="Mga Kasangkapan (&T)"
 Basic.MainMenu.Help="Tulong (&H)"
 Basic.MainMenu.Help.HelpPortal="&Portal Para sa Tulong"
@@ -423,10 +414,8 @@
 Basic.Settings.General.SwitchOnDoubleClick="Lumipat sa eksena kapag dalawang beses pinindot"
 Basic.Settings.General.StudioPortraitLayout="Paganahin ang portrait/patayong layout"
 Basic.Settings.Stream="Mag-stream"
-Basic.Settings.Stream.StreamType="Uri ng Pag-stream"
 Basic.Settings.Output.Format="Format ng Recording"
 Basic.Settings.Output.SelectDirectory="Pumili ng Recording Directory"
-Basic.Settings.Output.SelectFile="Pumili ng Recording File"
 Basic.Settings.Output.Mode="Paraan ng Output"
 Basic.Settings.Output.Mode.Simple="Payak"
 Basic.Settings.Output.Mode.Adv="Mas Mahusay"
@@ -443,7 +432,6 @@
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Hindi Matukoy na Kalidad, Malaking File"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Walang nabago sa Kalidad, Lubhang napakalaking File"
 Basic.Settings.Output.Simple.Warn.Encoder="Babal: Ang pag-rekord gamit ang isang software encoder na iba ang kalidad sa pag-stream ay mangangailangan ng dagdag na pag-gamit sa CPU kung ikaw ay mag-stream at mag-rekord nang sabay."
-Basic.Settings.Output.Simple.Warn.Lossless="Babala: Ang kalidad na lossless ay nagbibigay ng lubhang malalaking file. Ang kalidad na lossless ay maaaring gumamit ng 7 gigabytes ng espasyo ng disk kada minuto o higit pa sa matataas na mga resolusyon o mga framerate. Ang lossless ay hindi minumungkahi para sa mga mahahabang recording maliban na lamang kung mayroon kang napakalaking espasyo sa disk na magagamit."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sigurado ka bang gusto mong gamitin ang lossless na kalidad?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless na kalidad babala!"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 mababa ang nakatakdang paggamit ng CPU, dagdagan ang laki ng file)"
@@ -501,7 +489,7 @@
 Basic.Settings.Audio.Channels="Mga Channel"
 Basic.Settings.Audio.MeterDecayRate.Fast="Mabilis"
 Basic.Settings.Audio.MeterDecayRate.Slow="Mabagal (Type II PPM)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="BABALA: Naka-enable ang surround sound audio."
+Basic.Settings.Audio.MultichannelWarning.Enabled="BABALA: Naka-enable ang surround sound audio."
 Basic.Settings.Audio.MultichannelWarning.Title="Mapapagana ba ang tunog ng palibot ng audio?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Sigurado ka ba na gusto mong paganahin ang tunog ng palibot ng audio?"
 Basic.Settings.Audio.EnablePushToMute="Paganahin Itulak-para-ma-i-mute"
@@ -516,7 +504,6 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Karaniwan"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Sa ibaba ng karaniwan"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Walang ginagawa"
-Basic.Settings.Advanced.Audio.BufferingTime="Bilis ng Pag-buffer ng Audio"
 Basic.Settings.Advanced.Video.ColorFormat="Fomat ng Kulay"
 Basic.Settings.Advanced.Video.ColorRange="Saklaw ng Kulay"
 Basic.Settings.Advanced.Video.ColorRange.Full="Buo"

obs-studio-29.1.3.tar.xz/UI/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/tr-TR.ini Changed

@@ -92,7 +92,6 @@
 LogViewer="Günlük Görüntüleyici"
 ShowOnStartup="Başlangıçta göster"
 OpenFile="Dosya aç"
-AddValue="%1 Ekle"
 AddSource="Kaynak ekle"
 RemoveScene="Seçili Sahneyi Kaldır"
 RemoveSource="Seçili Kaynakları Kaldır"
@@ -104,11 +103,19 @@
 SourceFilters="Kaynak filtrelerini aç"
 MixerToolbarMenu="Ses Karıştırıcısı Menüsü"
 SceneFilters="Sahne Filtrelerini Aç"
-PluginsFailedToLoad.Title="Plugin yükleme hatası"
-PluginsFailedToLoad.Text="\n\n%1\n Pluginleri yüklenemedi. Lütfen bu pluginleri güncelleyin veya silin."
+List="Liste"
+Grid="Izgara"
+PluginsFailedToLoad.Title="Eklenti Yükleme Hatası"
+PluginsFailedToLoad.Text="Aşağıdaki OBS eklentileri yüklenemedi:\n\n%1\nLütfen bu eklentileri güncelleyin veya silin."
 AlreadyRunning.Title="OBS zaten çalışıyor"
 AlreadyRunning.Text="OBS zaten çalışıyor! Bunu yapmak istemediyseniz, lütfen yeni bir örneği çalıştırmayı denemeden önce varolan tüm OBS örneklerini kapatın. OBS'yi sistem tablasına küçülmesi için ayarladıysanız, lütfen hala çalışıp çalışmadığını görmek için orayı kontrol edin."
 AlreadyRunning.LaunchAnyway="Yine de Başlat"
+AutoSafeMode.Title="Güvenli Mod"
+AutoSafeMode.Text="Son oturumunuzda OBS kendini düzgün kapatamadı.\n\nOBS'i güvenli modda başlatmak ister misin? (3. parti eklentiler, betikler ve WebSocketler kapalı şekilde)"
+AutoSafeMode.LaunchSafe="Güvenli Mod'da başlat"
+AutoSafeMode.LaunchNormal="Normal Çalıştır"
+SafeMode.Restart="OBS'i Güvenli Mod'da yeniden başlatmak ister misin? (3. parti eklentiler, betikler ve WebSocketler kapalı şekilde)"
+SafeMode.RestartNormal="OBS'i Normal Mod'da yeniden başlatmak ister misin?"
 ChromeOS.Title="Desteklenmeyen Platform"
 ChromeOS.Text="OBS bir ChromeOS kapsayıcısının içinde çalışıyor gibi görünüyor. Bu platform desteklenmiyor."
 Wine.Title="Wine algılandı"
@@ -176,7 +183,6 @@
 Basic.AutoConfig.StreamPage.Server="Sunucu"
 Basic.AutoConfig.StreamPage.StreamKey="Yayın Anahtarı"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: şifreleme parolasını girin.\nRTMP: hizmet tarafından sağlanan anahtarı girin.\nSRT: hizmette mevcut ise akış kimliğini girin."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Bağlantı)"
 Basic.AutoConfig.StreamPage.EncoderKey="Kodlayıcı Anahtarı"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Bağlı hesap"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Bant genişliği testi ile bit hızını tahmin et (birkaç dakika alabilir)"
@@ -186,7 +192,7 @@
 Basic.AutoConfig.StreamPage.StreamWarning.Text="Bant genişliği testi kanalınızda ses olmayan rastgele video verisi yayını yapmak üzere. Yapabiliyorsanız, test bitene kadar geçici bir süre yayın kaydını kapatmanız ve yayını gizli olarak ayarlamanız önerilir. Devam edilsin mi?"
 Basic.AutoConfig.TestPage="Sonuçlar"
 Basic.AutoConfig.TestPage.SubTitle.Testing="Program en uygun ayarları tahmin etmek için şimdi bir dizi test yürütüyor"
-Basic.AutoConfig.TestPage.SubTitle.Complete="Test etme tamamlandı"
+Basic.AutoConfig.TestPage.SubTitle.Complete="Test tamamlandı"
 Basic.AutoConfig.TestPage.TestingBandwidth="Bant genişliği testi yapılıyor, bu birkaç dakika alabilir..."
 Basic.AutoConfig.TestPage.TestingBandwidth.NoOutput="Bu protokol servisi için hiç output bulunamadı"
 Basic.AutoConfig.TestPage.TestingBandwidth.Connecting="Bağlanılıyor: %1..."
@@ -229,8 +235,6 @@
 Updater.UpdateNow="Şimdi Güncelle"
 Updater.RemindMeLater="Daha Sonra Hatırlat"
 Updater.Skip="Sürümü Atla"
-Updater.Running.Title="Program şu anda etkin"
-Updater.Running.Text="Çıkışlar hala etkin, lütfen güncellemeye çalışmadan önce aktif çıkışları kapatın"
 Updater.NoUpdatesAvailable.Title="Güncelleme mevcut değil"
 Updater.NoUpdatesAvailable.Text="Şu anda mevcut hiçbir güncelleme yok"
 Updater.BranchNotFound.Title="Güncelleme Kanalı Kaldırıldı"
@@ -240,8 +244,6 @@
 Updater.RepairConfirm.Title="Bozukluk Kontrolünü Onayla"
 Updater.RepairConfirm.Text="Bozukluk kontrolünü başlatmak, OBS kurulumunuzu bozulmaya karşı tarayacak ve bozuk/değiştirilmiş dosyaları yeniden indirecektir. Bu biraz zaman alabilir.\n\nDevam etmek istiyor musunuz?"
 Updater.FailedToLaunch="Güncelleyici başlatılamadı"
-Updater.GameCaptureActive.Title="Oyun yakalama etkin"
-Updater.GameCaptureActive.Text="Oyun yakalama kanca kütüphanesi hala kullanımda. Lütfen yakalanmakta olan oyunları/programları kapatın (veya Windows'u yeniden başlatın) ve yeniden deneyin."
 QuickTransitions.SwapScenes="Geçişten Sonra Önizleme/Çıkış Sahnelerini Değiştir"
 QuickTransitions.SwapScenesTT="Geçişten sonra çıkış ve ön izleme sahnelerinin yerini değiştirir (çıkışın orijinal sahnesi hala mevcutsa).\n Bu, çıkışın orijinal sahnesine yapılan değişiklikleri geri almayacaktır."
 QuickTransitions.DuplicateScene="Sahneyi Çoğalt"
@@ -255,6 +257,8 @@
 Basic.SceneTransitions="Sahne Geçişleri"
 Basic.TransitionDuration="Süre"
 Basic.TogglePreviewProgramMode="Stüdyo Modu"
+Basic.EnablePreviewProgramMode="Stüdyo Modunu Etkinleştir"
+Basic.DisablePreviewProgramMode="Stüdyo Modunu Devre Dışı Bırak"
 Undo.Undo="Geri Al"
 Undo.Redo="Yinele"
 Undo.Add="`%1` Ekle"
@@ -303,6 +307,8 @@
 Undo.GroupItems="Nesneleri '%1' içine grupla"
 TransitionNameDlg.Text="Lütfen geçiş adını girin"
 TransitionNameDlg.Title="Geçiş Adı"
+TitleBar.SafeMode="GÜVENLİ MOD"
+TitleBar.PortableMode="Taşınabilir Mod"
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Sahneler"
 NameExists.Title="İsim zaten mevcut"
@@ -313,7 +319,7 @@
 ConfirmStart.Text="Yayını gerçekten başlatmak istiyor musunuz?"
 ConfirmStop.Title="Yayın Durdurulsun Mu?"
 ConfirmStop.Text="Yayını gerçekten durdurmak istiyor musunuz?"
-ConfirmStopRecord.Title="Kaydı Durdur?"
+ConfirmStopRecord.Title="Kayıt Durdurulsun Mu?"
 ConfirmStopRecord.Text="Kaydı durdurmak istediğinizden emin misiniz?"
 ConfirmBWTest.Title="Bant genişliği testini başlat?"
 ConfirmBWTest.Text="OBS'i bant genişliği test modunda yapılandırdınız. Bu mod, kanalınız yayına girmeden ağ testi yapmanıza olanak sağlar. Test tamamlandıktan sonra, izleyicilerin yayını görebilmesi için bu modu devre dışı bırakmanız gerekecektir.\n\nDevam etmek istiyor musunuz?"
@@ -327,6 +333,7 @@
 Output.StartStreamFailed="Yayın başlatılamadı"
 Output.StartRecordingFailed="Kayıt başlatılamadı"
 Output.StartReplayFailed="Tekrar oynatma arabelleği başlatılamadı"
+Output.StartVirtualCamFailed="Sanal kamera başlatılamadı"
 Output.StartFailedGeneric="Çıkışı başlatma başarısız oldu. Detaylar için lütfen günlüğe bakın: \n\nNVENC veya AMD kodlayıcılarını kullanıyorsanız, video sürücülerinin güncel olduğundan emin olun."
 Output.ReplayBuffer.PauseWarning.Title="Durdurulduğunda tekrarlar kaydedilemez"
 Output.ReplayBuffer.PauseWarning.Text="Dikkat: Kayıt durdurulmuşken tekrarlar kaydedilemez."
@@ -339,7 +346,7 @@
 Output.ConnectFail.Disconnected="Sunucu bağlantısı kesildi."
 Output.StreamEncodeError.Title="Kodlama hatası"
 Output.StreamEncodeError.Msg="Yayın sırasında bir kodlayıcı hatası oluştu."
-Output.StreamEncodeError.Msg.LastError="Yayın sırasında bir kodlayıcı hatası oluştu:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Akış sırasında bir kodlayıcı hatası oluştu: %1"
 Output.RecordFail.Title="Kayıt başlatılamadı"
 Output.RecordFail.Unsupported="Çıkış biçimi ya desteklenmiyor ya da birden fazla sesi desteklemiyor. Lütfen ayarlarınızı kontrol edip tekrar deneyin."
 Output.RecordNoSpace.Title="Yetersiz disk alanı"
@@ -347,7 +354,7 @@
 Output.RecordError.Title="Kayıt Hatası"
 Output.RecordError.Msg="Kayıt anında bir hata oluştu."
 Output.RecordError.EncodeErrorMsg="Kayıt sırasında bir kodlayıcı hatası oluştu."
-Output.RecordError.EncodeErrorMsg.LastError="Kayıt sırasında bir kodlayıcı hatası oluştu:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Kayıt sırasında bir kodlayıcı hatası oluştu: %1"
 Output.BadPath.Title="Dosya Yolu Geçersiz"
 Output.BadPath.Text="Yapılandırılmış Kayıt Yolu açılamadı. Lütfen Ayarlar → Çıktı → Kayıt içerisinden Kayıt Yolu'nu denetleyin."
 Output.NoBroadcast.Title="Hiçbir yayın ayarlanmadı"
@@ -376,6 +383,8 @@
 Remux.ExitUnfinishedTitle="Remux devam ediyor"
 Remux.ExitUnfinished="Dönüştürme tamamlanmadı, şu anda durdurmak hedef dosyayı kullanılamaz kılabilir.\nDönüştürmeyi durdurmak istediğinizden emin misiniz?"
 Remux.HelpText="Remux etmek için dosyaları bu pencereye sürükleyip bırakın veya bir dosyaya göz atmak için boş bir \"OBS Kaydı\" hücresini seçin."
+Remux.NoFilesAddedTitle="Remuxing dosyası eklenmedi"
+Remux.NoFilesAdded="Remux'a dosya eklenmez. Bir veya daha fazla video dosyası içeren bir klasör bırakın."
 MissingFiles="Eksik Dosyalar"
 MissingFiles.MissingFile="Eksik Dosya"
 MissingFiles.NewFile="Yeni Dosya"
@@ -394,7 +403,8 @@
 MissingFiles.AutoSearchText="OBS, bu dizinde kayıp dosyalar için ek eşleşmeler buldu. Onları eklemek ister misin?"
 MissingFiles.NoMissing.Title="Kayıp Dosya Kontrolü"
 MissingFiles.NoMissing.Text="Herhangi bir kayıp dosya görünmüyor."
-MacPermissions.Title="Uygulama İzinlerini Gözden Geçir"
+MacPermissions.MenuAction="Uygulama İzinlerini İnceleyin..."
+MacPermissions.Title="Uygulama İzinlerini İnceleyin"
 MacPermissions.Description="OBS Studio, belirli özellikleri sağlayabilmek için izninizi gerektirir. Bu izinleri etkinleştirmeniz önerilir ancak uygulamayı kullanmak için gerekli değildir. Bunları daha sonra istediğiniz zaman etkinleştirebilirsiniz."
 MacPermissions.Description.OpenDialog="OBS Studio menüsü aracılığıyla bu kutucuğu tekrar açabilirsiniz."
 MacPermissions.AccessGranted="Erişim İzni Verildi"
@@ -409,8 +419,8 @@
 MacPermissions.Item.Accessibility="Erişebilirlik"
 MacPermissions.Item.Accessibility.Details="Diğer uygulamalar odaklanmışken klavye kısayollarının (kısayol tuşları) çalışması için lütfen bu izni etkinleştirin."
 MacPermissions.Continue="Devam Et"
-UpdateAvailable="Yeni Güncelleştirme Mevcut"
-UpdateAvailable.Text="%1.%2.%3 sürümü şimdi kullanılabilir. <a href='%4'>İndirmek için tıklayın</a>"
+SourceLeak.Title="Kaynak Temizleme Hatası"
+SourceLeak.Text="Sahne koleksiyonlarını değiştirirken bir sorun oluştu ve bazı kaynakların yüklemesi kaldırılamadı. Bu hata genel olarak eklentilerin düzgün kaynaklar sağlayamamasından dolayı yaşanır. Lütfen eklentilerinizin güncel olduğuna emin olun.\n\nOBS Studio herhangi bir veri kaybı olmaması için kendini kapayacak."
 Basic.DesktopDevice1="Masaüstü Ses"
 Basic.DesktopDevice2="Masaüstü Ses 2"
 Basic.Scene="Sahne"
@@ -464,6 +474,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1(oto.seçim: %2)"
 Basic.PropertiesWindow.SelectColor="Renk seçin"
 Basic.PropertiesWindow.SelectFont="Yazı tipi seç"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Bir Yazı Tipi Seçin"
 Basic.PropertiesWindow.ConfirmTitle="Ayarlar Değiştirildi"
 Basic.PropertiesWindow.Confirm="Kaydedilmeyen değişikler var. Yaptığınız değişikleri kaydetmek istiyor musunuz?"
 Basic.PropertiesWindow.NoProperties="Hiçbir özellik mevcut değil"
@@ -574,10 +585,10 @@
 Basic.VCam.VirtualCamera="Sanal Kamera"
 Basic.VCam.OutputType="Çıktı Türü"
 Basic.VCam.OutputSelection="Çıkış Seçimi"
-Basic.VCam.Internal="Dahili"
-Basic.VCam.InternalDefault="Uygulama Çıktısı (Varsayılan)"
-Basic.VCam.InternalPreview="Çıktıyı Önizle"
-Basic.MainMenu.File="Dosya (&F)"
+Basic.VCam.OutputType.Program="Uygulama (Varsayılan)"
+Basic.VCam.OutputSelection.NoSelection="Bu çıkış türü için seçim mevcut değil"
+Basic.VCam.RestartWarning="Sanal kamera değişiklikleri uygulamak için yeniden başlatılacak"
+Basic.MainMenu.File="&Dosya"
 Basic.MainMenu.File.Export="Dışa Aktar (&E)"
 Basic.MainMenu.File.Import="İçe Aktar (&I)"
 Basic.MainMenu.File.ShowRecordings="Kayıtla&rı Göster"
@@ -618,17 +629,18 @@
 Basic.MainMenu.Edit.AdvAudio="Gelişmiş Ses Özellikleri (&A)"
 Basic.MainMenu.View="Görünüm (&V)"
 Basic.MainMenu.View.Toolbars="Araç Çubukları (&T)"
-Basic.MainMenu.View.ListboxToolbars="Sahne/Kaynak Liste Düğmeleri"
+Basic.MainMenu.View.ListboxToolbars="Yuva Araç Çubukları"
 Basic.MainMenu.View.ContextBar="Kaynak Menüsü"
-Basic.MainMenu.View.SceneTransitions="Sahne Geçişleri (&C)"
 Basic.MainMenu.View.SourceIcons="Kaynak S&imgeleri"
 Basic.MainMenu.View.StatusBar="Durum Çubuğu (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Tam Ekran Arayüz"
 Basic.MainMenu.View.ResetUI="&Arayüzü Sıfırla"
 Basic.MainMenu.View.AlwaysOnTop="&Her Zaman Üstte"
+Basic.MainMenu.View.SceneListMode="Sahne Listesi Modu"
 Basic.MainMenu.Docks="&Paneller"
 Basic.MainMenu.Docks.ResetDocks="&Yuvaları Sıfırla"
 Basic.MainMenu.Docks.LockDocks="&Yuvaları Kilitle"
+Basic.MainMenu.Docks.SideDocks="&Tam Yükseklikli Yuvalar"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Özel Tarayıcı Yuvaları..."
 Basic.MainMenu.SceneCollection="&Sahne Koleksiyonu"
 Basic.MainMenu.Profile="&Profil"
@@ -637,7 +649,6 @@
 Basic.MainMenu.SceneCollection.Import="Sahne Koleksiyonunu İçe Aktar"
 Basic.MainMenu.SceneCollection.Export="Sahne Koleksiyonunu Dışa Aktar"
 Basic.MainMenu.Profile.Exists="Profil zaten var"
-Basic.MainMenu.SceneCollection.Exists="Sahne koleksiyonu zaten var"
 Basic.MainMenu.Tools="Araçlar (&T)"
 Basic.MainMenu.Help="Yardım (&H)"
 Basic.MainMenu.Help.HelpPortal="Yardım &Portalı"
@@ -649,8 +660,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Mev&cut Günlük Dosyasını Karşıya Yükle"
 Basic.MainMenu.Help.Logs.UploadLastLog="&Son Kayıt Dosyasını Yükle"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Şimdiki Günlüğü Göster (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Sürüm Notları"
 Basic.MainMenu.Help.CheckForUpdates="Güncellemeleri Denetle"
 Basic.MainMenu.Help.Repair="Dosya Bütünlüğünü Denetle"
+Basic.MainMenu.Help.RestartSafeMode="Güvenli Mod'da yeniden başlat"
+Basic.MainMenu.Help.RestartNormal="Normal Mod'da yeniden başlat"
 Basic.MainMenu.Help.CrashLogs="Çökme &Raporları"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Çökme Raporlarını Gö&ster"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="&Son Çökme Raporunu Yükle"
@@ -720,7 +734,6 @@
 Basic.Settings.General.ChannelName.beta="Betalar / Sürüm Adayı"
 Basic.Settings.General.ChannelDescription.beta="Potansiyel olarak stabil olmayan yayım-öncesi versiyonlar"
 Basic.Settings.Stream="Yayın"
-Basic.Settings.Stream.StreamType="Yayın Türü"
 Basic.Settings.Stream.Custom.UseAuthentication="Kimlik doğrulaması kullan"
 Basic.Settings.Stream.Custom.Username="Kullanıcı adı"
 Basic.Settings.Stream.Custom.Password="Şifre"
@@ -751,7 +764,6 @@
 Basic.Settings.Output.Encoder.Video="Video kodlayıcı"
 Basic.Settings.Output.Encoder.Audio="Ses Kodlayıcı"
 Basic.Settings.Output.SelectDirectory="Kayıt Dizinini Seçin"
-Basic.Settings.Output.SelectFile="Kayıt Dosyasını Seçin"
 Basic.Settings.Output.DynamicBitrate="Akışı yönetmek için bit hızını değişkenli bir biçimde değiştir"
 Basic.Settings.Output.DynamicBitrate.Beta="Akışı yönetmek için bit hızını değişkenli bir biçimde değiştir (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Akışı azaltmak için kare hızını düşürmek yerine, bit hızını değişkenli bir biçimde değiştirir.\n\nBunun, eğer ani bir akış olursa izleyiciler için gecikme yaratabileceğini unutmayın.\nEğer bit hızı düşerse, yenilenmesi bir kaç dakika alabilir.\n\nŞu anlık sadece RTMP için destekli."
@@ -779,7 +791,6 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Dikkat: Kayıt kalitesi \"Yayın ile aynı\"ya ayarlanmışken kayıtlar durdurulamaz."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Uyarı: Seçili olan kayıt biçimi seçili olan yayın kodlayıcı(ları) ile uyumsuz."
 Basic.Settings.Output.Simple.Warn.Encoder="Uyarı: Bir yazılım kodlayıcı ile yayın kalitesinden farklı kayıt yapmak eğer aynı anda hem kayıt hem de yayın yapıyorsanız ilave CPU kullanımı gerektirecektir."
-Basic.Settings.Output.Simple.Warn.Lossless="Uyarı: Kayıpsız kalite muazzam büyük dosya boyutları oluşturur! Kayıpsız kalite, yüksek çözünürlüklerde ve kare hızlarında, dakikada 7 gigabyte'a kadar disk alanı kullanabilir. Kayıpsız, kullanılabilir disk alanınız çok büyük değilse, uzun kayıtlar için tavsiye edilmez."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Kayıpsız kalitede kullanmak istediğinizden emin misiniz?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Kayıpsız kalite uyarısı!"
 Basic.Settings.Output.Simple.Encoder.Software="Yazılım (x264)"
@@ -926,8 +937,8 @@
 Basic.Settings.Audio.PeakMeterType="Tepe Ölçer Türü"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Örnek Tepe"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Gerçek Tepe (Daha yüksek CPU kullanımı)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="Uyarı: Surround ses etkin."
-Basic.Settings.Audio.MultichannelWarning="Yayın yapılıyorsa, yayın hizmetinizin hem surround ses alınımını hem de surround ses geri oynatımını desteklediğinden emin olun. Facebook 360 Live surround sesin tam olarak desteklendiği bir örnektir. Facebook Live'ın ve YouTube Live'ın her ikisi de surround alınımını desteklese de, Facebook Live stereo'ya indirger, ve YouTube Live sadece iki kanal oynatır.\n\nOBS ses filtreleri surround sesle uyumludur, ancak VST eklenti desteği kesin değildir."
+Basic.Settings.Audio.MultichannelWarning.Enabled="Uyarı: Surround ses etkin."
+Basic.Settings.Audio.MultichannelWarning="Yayın yapıyorsanız yayın hizmetinizin hem çevresel ses alımını hem de çevresel ses oynatmayı destekleyip desteklemediğini kontrol edin. Örneğin, Facebook 360 Live, çevresel sesi tam olarak destekler; YouTube Live, 5.1 ses alımını (ve TV'lerde oynatmayı) destekler.\n\nOBS ses filtreleri çevresel sesle uyumludur ancak VST eklenti desteğini garanti etmez."
 Basic.Settings.Audio.MultichannelWarning.Title="Surround ses etkinleştirilsin mi?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Surround sesi etkinleştirmek istediğinize emin misiniz?"
 Basic.Settings.Audio.Devices="Global Ses Cihazları"
@@ -973,7 +984,6 @@
 Basic.Settings.Advanced.FormatWarning="Uyarı: NV12/P010 dışındaki renk biçimleri esas olarak kayıt için tasarlanmıştır ve yayın anında kullanılması önerilmez. Yayın nedeni ile renk biçimini dönüştürme çok fazla İŞLEMCİ kullanımına sebep olabilir."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Uyarı: Yüksek hassasiyetli formatlar, HDR renk uzaylarında daha yaygın olarak kullanılır."
 Basic.Settings.Advanced.FormatWarning2100="Uyarı: Rec. 2100 daha hassas bir biçim kullanmalıdır."
-Basic.Settings.Advanced.Audio.BufferingTime="Ses Arabelleğe Alma Süresi"
 Basic.Settings.Advanced.Video.ColorFormat="Renk Biçimi"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-Bit, 4:2:0, 2 düzlemsel)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 düzlemsel)"
@@ -998,6 +1008,7 @@
 Basic.Settings.Advanced.Network="Ağ"
 Basic.Settings.Advanced.Network.Disabled="Şu anki seçili yayın protokolü ağ ayarlarını değiştirmeyi desteklemiyor."
 Basic.Settings.Advanced.Network.BindToIP="IP Bağla"
+Basic.Settings.Advanced.Network.IPFamily="IP Ailesi"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Ağ optimizasyonlarını etkinleştir"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="TCP pacing'i etkinleştir"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="İletim hızını düzenleyerek RTMP çıkışını ağdaki diğer gecikmeye duyarlı uygulamalara daha dostça yapmaya çalışır.\nKararsız bağlantılarda çerçeve bırakma riskini artırabilir."
@@ -1065,6 +1076,8 @@
 SceneItemShow="'%1' Göster"
 SceneItemHide="'%1' Gizle"
 OutputWarnings.NoTracksSelected="En az bir ses parçası seçmelisiniz"
+OutputWarnings.NoTracksSelectedOnExit.Title="Çıkış Ayarları Hatası"
+OutputWarnings.NoTracksSelectedOnExit.Text="Tüm çıkışlarda en az bir ses parçası seçilmiş olmalıdır."
 OutputWarnings.MP4Recording="Uyarı: MP4/MOV için kaydedilen kayıtları dosya (örneğin BSODs sonucu olarak, güç kayıp, vb.) kesinleşmiş değil varsa geri almanız mümkün olmayacaktır. Kaydetmek istediğiniz birden çok ses parçaları bu bittikten sonra MKV ve MP4/MOV için kayıt remux kullanmayı göz önünde bulundurun (dosya → Remux kayıtları)"
 OutputWarnings.CannotPause="Dikkat: Kayıt kodlayıcısı \"(Yayın kodlayıcısını kullan)\"a ayarlanmışken kayıtlar durdurulamaz"
 OutputWarnings.CodecIncompatible="Ses veya video kodlayıcı seçimi uyumsuzluk yüzünden sıfırlandı. Lütfen listeden uyumlu bir kodlayıcı seçin."
@@ -1090,6 +1103,7 @@
 About.GetInvolved="Katkıda Bulun"
 About.Authors="Yazarlar"
 About.License="Lisans"
+About.Error="Hata! Dosya okunamadı.\n\nGit: %1"
 About.Contribute="OBS Projesini Destekleyin"
 AddUrl.Title="Bağlantı Adresi ile Kaynak Ekle"
 AddUrl.Text="Bir bağlantı adresini OBS'e sürüklediniz. Bu, bağlantı otomatik olarak kaynak olarak eklenecek. Devam edilsin mi?"
@@ -1111,14 +1125,12 @@
 LoadProfileNeedsRestart="Profil, OBS'nin yeniden başlatılmasını gerektiren ayarlar içeriyor:\n%1\n\nBu değişikliklerin etkili olması için OBS'yi yeniden başlatmak istiyor musunuz?"
 ContextBar.NoSelectedSource="Kaynak seçilmemiş"
 ContextBar.ResetTransform="Dönüşmeyi sıfırla"
-ContextBar.FitToCanvas="Tuval için uygun"
 ContextBar.MediaControls.PlayMedia="Medyayı oynat"
 ContextBar.MediaControls.PauseMedia="Medyayı Duraklat"
 ContextBar.MediaControls.StopMedia="Medyayı durdur"
 ContextBar.MediaControls.RestartMedia="Medyayı yeniden başlat"
 ContextBar.MediaControls.PlaylistNext="Diğer oynatma listesi"
 ContextBar.MediaControls.PlaylistPrevious="Önceki oynatma listesi"
-ContextBar.MediaControls.MediaProperties="Medya ayarları"
 ContextBar.MediaControls.BlindSeek="Medya Arama Widget'ı"
 YouTube.Auth.Ok="Yetkilendirme başarıyla tamamlandı.\nArtık bu sayfayı kapatabilirsiniz."
 YouTube.Auth.NoCode="Yetkilendirme işlemi tamamlanmadı."
@@ -1198,3 +1210,5 @@
 YouTube.Errors.liveChatEnded="Canlı yayın sona erdi."
 YouTube.Errors.messageTextInvalid="Mesaj metni geçerli değil."
 YouTube.Errors.rateLimitExceeded="Mesajları fazla hızlı gönderiyorsun."
+YouTube.DocksRemoval.Title="Eski Youtube Tarayıcı Yuvalarını Temizle"
+YouTube.DocksRemoval.Text="Bu tarayıcı yuvaları kullanım dışı bırakıldığından dolayı kaldırılıcaktır:\n\n%1\nBunun yerine \"Yuvalar/Youtube Canlı Kontrol Odası\" kullanınız."

obs-studio-29.1.3.tar.xz/UI/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/uk-UA.ini Changed

@@ -25,14 +25,14 @@
 Mono="Моно"
 Stereo="Стерео"
 DroppedFrames="Пропущено кадрів: %1 (%2%)"
-StudioProgramProjector="Повноекранний проектор (програма)"
+StudioProgramProjector="Повноекранний проєктор (програма)"
 PreviewProjector="Повноекранний проєктор (попередній перегляд)"
 SceneProjector="Повноекранний проєктор (сцена)"
 SourceProjector="Повноекранний проєктор (джерело)"
-StudioProgramWindow="Віконний проектор (програма)"
-PreviewWindow="Віконний проектор (попередній перегляд)"
-SceneWindow="Віконний проектор (сцена)"
-SourceWindow="Віконний проектор (джерело)"
+StudioProgramWindow="Віконний проєктор (програма)"
+PreviewWindow="Віконний проєктор (попередній перегляд)"
+SceneWindow="Віконний проєктор (сцена)"
+SourceWindow="Віконний проєктор (джерело)"
 MultiviewProjector="Багатоекранний перегляд (на весь екран)"
 MultiviewWindowed="Багатоекранний перегляд (в окремому вікні)"
 ResizeProjectorWindowToContent="Підігнати вікно до вмісту"
@@ -74,8 +74,8 @@
 RestoreDefaults="Типові"
 HideMixer="Приховати у мікшері"
 TransitionOverride="Перевизначення монтажного переходу"
-ShowTransition="Показати перехід"
-HideTransition="Сховати перехід"
+ShowTransition="Перехід при показі джерела"
+HideTransition="Перехід при приховуванні джерела"
 None="Немає"
 StudioMode.Preview="Попередній перегляд"
 StudioMode.Program="Програма"
@@ -95,7 +95,6 @@
 LogViewer="Перегляд журналу"
 ShowOnStartup="Показувати під час запуску"
 OpenFile="Відкрити файл"
-AddValue="Додати %1"
 AddSource="Додати джерело"
 RemoveScene="Вилучити вибрану сцену"
 RemoveSource="Вилучити вибрані джерела"
@@ -107,11 +106,19 @@
 SourceFilters="Відкрити фільтри джерела"
 MixerToolbarMenu="Меню аудіомікшера"
 SceneFilters="Відкрити фільтри сцени"
+List="Список"
+Grid="Сітка"
 PluginsFailedToLoad.Title="Помилка завантаження плагіна"
 PluginsFailedToLoad.Text="Не вдалося завантажити такі плагіни OBS:\n\n%1\nОновіть або вилучіть ці плагіни."
 AlreadyRunning.Title="OBS уже запущено"
 AlreadyRunning.Text="OBS вже запущено! Якщо ви дійсно намагаєтесь це зробити – перед тим як запустити нову копію, спершу закрийте всі відкриті екземпляри OBS. Якщо OBS налаштовано згортатися в трей, перевірте чи він там і досі працює."
 AlreadyRunning.LaunchAnyway="Все одно запустити"
+AutoSafeMode.Title="Безпечний режим"
+AutoSafeMode.Text="Під час попереднього сеансу роботу OBS не завершено належним чином.\n\nБажаєте запустити програму в безпечному режимі (вимкнувши сторонні плагіни, скрипти та вебсокети)?"
+AutoSafeMode.LaunchSafe="Запустити в безпечному режимі"
+AutoSafeMode.LaunchNormal="Запустити у звичайному режимі"
+SafeMode.Restart="Ви хочете перезапустити OBS у безпечному режимі (вимкнувши сторонні плагіни, скрипти та вебсокети)?"
+SafeMode.RestartNormal="Ви хочете перезапустити OBS у звичайному режимі?"
 ChromeOS.Title="Непідтримувана платформа"
 ChromeOS.Text="Схоже, OBS запущено всередині контейнера ChromeOS. Ця платформа не підтримується."
 Wine.Title="Виявлено Wine"
@@ -158,7 +165,7 @@
 Basic.AutoConfig.VideoPage="Налаштування відео"
 Basic.AutoConfig.VideoPage.SubTitle="Вкажіть необхідні налаштування відео"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Поточна (%1x%2)"
-Basic.AutoConfig.VideoPage.BaseResolution.Display="Дисплей %1 (%2x%3)"
+Basic.AutoConfig.VideoPage.BaseResolution.Display="Екран %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="Поточна (%1)"
 Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 або 30, але краще 60, коли це можливо"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 або 30, але краще висока роздільна здатність"
@@ -179,8 +186,8 @@
 Basic.AutoConfig.StreamPage.Server="Сервер"
 Basic.AutoConfig.StreamPage.StreamKey="Ключ трансляції"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: введіть пароль для шифрування.\nRTMP: введіть ключ, наданий службою.\nSRT: введіть ідентифікатор трансляції, якщо служба його використовує."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Посилання)"
 Basic.AutoConfig.StreamPage.EncoderKey="Ключ кодувальника"
+Basic.AutoConfig.StreamPage.BearerToken="Токен автентифікації"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Підключений обліковий запис"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Оцінити бітрейт за допомогою тесту пропускної здатності (може зайняти кілька хвилин)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Віддавати перевагу апаратному кодуванню"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="Оновити зараз"
 Updater.RemindMeLater="Нагадати пізніше"
 Updater.Skip="Пропустити цю версію"
-Updater.Running.Title="Програма зараз активна"
-Updater.Running.Text="Знайдено активну операцію виводу, будь ласка, завершіть роботу будь-якої операції виводу перед спробою оновлення"
 Updater.NoUpdatesAvailable.Title="Оновлення відсутні"
 Updater.NoUpdatesAvailable.Text="Наразі немає доступних оновлень"
 Updater.BranchNotFound.Title="Канал оновлення вилучено"
@@ -243,8 +248,6 @@
 Updater.RepairConfirm.Title="Підтвердити перевірку цілісності"
 Updater.RepairConfirm.Text="Запуск перевірки цілісності скануватиме встановлений OBS на наявність пошкоджень і повторно завантажить пошкоджені/модифіковані файли. Це може тривати деякий час.\n\nБажаєте продовжити?"
 Updater.FailedToLaunch="Не вдалося перевірити оновлення"
-Updater.GameCaptureActive.Title="Відбувається захоплення гри"
-Updater.GameCaptureActive.Text="Бібліотека для захоплення ігор зараз використовується. Будь ласка, закрийте усі ігри/програми для яких використовується захоплення (або перезавантажте Windows), та спробуйте знову."
 QuickTransitions.SwapScenes="Поміняти місцями попередній перегляд/програмні сцени після переходу"
 QuickTransitions.SwapScenesTT="Поміняє сцени попереднього перегляду та програми після переходу (якщо вихідна сцена програми все ще існує).\nЦе не скасує жодних змін, які могли бути внесені до початкової сцени програми."
 QuickTransitions.DuplicateScene="Дублювати сцену"
@@ -258,6 +261,8 @@
 Basic.SceneTransitions="Монтажні переходи між сценами"
 Basic.TransitionDuration="Тривалість"
 Basic.TogglePreviewProgramMode="Режим студії"
+Basic.EnablePreviewProgramMode="Увімкнути режим студії"
+Basic.DisablePreviewProgramMode="Вимкнути режим студії"
 Undo.Undo="Скасувати"
 Undo.Redo="Повернути"
 Undo.Add="Додати '%1'"
@@ -306,6 +311,8 @@
 Undo.GroupItems="Групувати елементи в '%1'"
 TransitionNameDlg.Text="Введіть назву монтажного переходу"
 TransitionNameDlg.Title="Назва монтажного переходу"
+TitleBar.SafeMode="БЕЗПЕЧНИЙ РЕЖИМ"
+TitleBar.PortableMode="Портативний режим"
 TitleBar.Profile="Профіль"
 TitleBar.Scenes="Сцени"
 NameExists.Title="Назва вже існує"
@@ -330,6 +337,7 @@
 Output.StartStreamFailed="Не вдалося розпочати трансляцію"
 Output.StartRecordingFailed="Не вдалося розпочати записування"
 Output.StartReplayFailed="Не вдалося запустити буфер повторів"
+Output.StartVirtualCamFailed="Не вдалося запустити віртуальну камеру"
 Output.StartFailedGeneric="Помилка виводу. Додаткова інформація знаходиться у файлі журналу.\n\nПримітка: якщо ви використовуєте кодувальники NVENC або AMD, переконайтесь, що маєте відеодрайвер найновішої версії."
 Output.ReplayBuffer.PauseWarning.Title="Неможливо зберегти повтори під час паузи"
 Output.ReplayBuffer.PauseWarning.Text="Попередження: неможливо зберегти повтори, якщо записування призупинено."
@@ -342,7 +350,7 @@
 Output.ConnectFail.Disconnected="Відключено від сервера."
 Output.StreamEncodeError.Title="Помилка кодування"
 Output.StreamEncodeError.Msg="Під час трансляції відбулася помилка кодувальника."
-Output.StreamEncodeError.Msg.LastError="Під час трансляції сталася помилка кодувальника:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Під час трансляції сталася помилка кодувальника: %1"
 Output.RecordFail.Title="Не вдалося розпочати записування"
 Output.RecordFail.Unsupported="Формат виводу або не підтримується, або не підтримує більше однієї звукової доріжки. Будь ласка, перевірте налаштування та повторіть спробу."
 Output.RecordNoSpace.Title="Недостатньо місця на диску"
@@ -350,7 +358,7 @@
 Output.RecordError.Title="Помилка записування"
 Output.RecordError.Msg="Під час записування сталася невідома помилка."
 Output.RecordError.EncodeErrorMsg="Під час запису відбулася помилка кодувальника."
-Output.RecordError.EncodeErrorMsg.LastError="Під час запису сталася помилка кодувальника:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Під час запису сталася помилка кодувальника: %1"
 Output.BadPath.Title="Неправильний шлях до файлу"
 Output.BadPath.Text="Не вдалося відкрити налаштований шлях до запису. Перевірте правильність шляху до запису в Налаштування → Вивід → Записування."
 Output.NoBroadcast.Title="Трансляції не налаштовано"
@@ -380,6 +388,8 @@
 Remux.ExitUnfinishedTitle="Ремультиплексування триває"
 Remux.ExitUnfinished="Ремультиплексування не завершено, якщо зупинити зараз, то кінцевий файл може бути пошкодженим.\nВи впевнені, що хочете зупинити ремультиплексування?"
 Remux.HelpText="Перетягніть файли до цього вікна, щоб ремультиплексувати їх, або виберіть пусту клітинку «Запис OBS», щоб обрати файл."
+Remux.NoFilesAddedTitle="Файл ремуксингу не додано"
+Remux.NoFilesAdded="До ремуксу не додано жодного файлу. Перетягніть теку з одним або кількома відеофайлами."
 MissingFiles="Відсутні файли"
 MissingFiles.MissingFile="Відсутній файл"
 MissingFiles.NewFile="Новий файл"
@@ -398,7 +408,8 @@
 MissingFiles.AutoSearchText="OBS знайшов додаткові збіги для файлів, відсутніх у цій теці. Бажаєте додати їх?"
 MissingFiles.NoMissing.Title="Перевірка відсутності файлів"
 MissingFiles.NoMissing.Text="Відсутності файлів не виявлено."
-MacPermissions.Title="Перегляд дозволів застосунку"
+MacPermissions.MenuAction="Переглянути дозволи застосунку..."
+MacPermissions.Title="Переглянути дозволи застосунку"
 MacPermissions.Description="OBS Studio потребує вашого дозволу для роботи певних функцій. Радимо увімкнути ці дозволи, але вони не обов'язкові для роботи застосунку. Ви завжди можете увімкнути їх пізніше."
 MacPermissions.Description.OpenDialog="Це діалогове вікно можна повторно відкрити через меню OBS Studio."
 MacPermissions.AccessGranted="Доступ дозволено"
@@ -413,8 +424,8 @@
 MacPermissions.Item.Accessibility="Доступність"
 MacPermissions.Item.Accessibility.Details="Надайте цей дозвіл для роботи комбінацій клавіш, коли фокус перебуває на інших застосунках."
 MacPermissions.Continue="Продовжити"
-UpdateAvailable="Доступне оновлення"
-UpdateAvailable.Text="Доступна версія %1.%2.%3. <a href='%4'>Клацніть тут, щоб завантажити</a>"
+SourceLeak.Title="Помилка очищення джерела"
+SourceLeak.Text="Під час зміни колекцій сцен виникла проблема, і деякі джерела не вдалося вивантажити. Цю проблему зазвичай спричиняють плагіни, які не вивільняють ресурси належним чином. Будь ласка, переконайтеся, що всі плагіни, які ви використовуєте, оновлені.\n\nOBS Studio буде завершено, щоб запобігти можливому пошкодженню даних."
 Basic.DesktopDevice1="Пристрій відтворення"
 Basic.DesktopDevice2="Пристрій відтворення 2"
 Basic.AuxDevice1="Мікрофон/Aux"
@@ -476,6 +487,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (автовибір: %2)"
 Basic.PropertiesWindow.SelectColor="Вибрати колір"
 Basic.PropertiesWindow.SelectFont="Вибрати шрифт"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Вибрати шрифт"
 Basic.PropertiesWindow.ConfirmTitle="Налаштування змінено"
 Basic.PropertiesWindow.Confirm="Деякі зміни не збережено. Хочете їх зберегти?"
 Basic.PropertiesWindow.NoProperties="Немає доступних властивостей"
@@ -585,9 +597,9 @@
 Basic.VCam.VirtualCamera="Віртуальна камера"
 Basic.VCam.OutputType="Тип виводу"
 Basic.VCam.OutputSelection="Вибір виводу"
-Basic.VCam.Internal="Внутрішній"
-Basic.VCam.InternalDefault="Вивід програми (типово)"
-Basic.VCam.InternalPreview="Попередній перегляд виводу"
+Basic.VCam.OutputType.Program="Програмний (типово)"
+Basic.VCam.OutputSelection.NoSelection="Не вибрано цей типу виводу"
+Basic.VCam.RestartWarning="Щоб застосувати ці зміни віртуальну камеру буде перезапущено"
 Basic.MainMenu.File="Файл (&F)"
 Basic.MainMenu.File.Export="&Експортувати"
 Basic.MainMenu.File.Import="Імпортувати (&I)"
@@ -629,17 +641,18 @@
 Basic.MainMenu.Edit.AdvAudio="Розширені властивості аудіо (&A)"
 Basic.MainMenu.View="Вигляд (&V)"
 Basic.MainMenu.View.Toolbars="Панелі інструментів (&T)"
-Basic.MainMenu.View.ListboxToolbars="Кнопки списку сцени/джерела"
+Basic.MainMenu.View.ListboxToolbars="Док-панелі інструментів"
 Basic.MainMenu.View.ContextBar="Панель джерела"
-Basic.MainMenu.View.SceneTransitions="Переходи між сценами (&C)"
 Basic.MainMenu.View.SourceIcons="&Піктограми джерел"
 Basic.MainMenu.View.StatusBar="Рядок стану (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Повноекранний режим"
 Basic.MainMenu.View.ResetUI="&Скинути інтерфейс"
 Basic.MainMenu.View.AlwaysOnTop="&Завжди зверху"
+Basic.MainMenu.View.SceneListMode="Режим списку сцен"
 Basic.MainMenu.Docks="&Панелі інтерфейсу"
 Basic.MainMenu.Docks.ResetDocks="&Скинути панелі інтерфейсу"
 Basic.MainMenu.Docks.LockDocks="&Заблокувати панелі інтерфейсу"
+Basic.MainMenu.Docks.SideDocks="Док-панелі &повної висоти"
 Basic.MainMenu.Docks.CustomBrowserDocks="&Користувацькі панелі браузера..."
 Basic.MainMenu.SceneCollection="Колекція сцен (&S)"
 Basic.MainMenu.Profile="&Профіль"
@@ -648,7 +661,6 @@
 Basic.MainMenu.SceneCollection.Import="Імпорт колекції сцен"
 Basic.MainMenu.SceneCollection.Export="Експорт колекції сцен"
 Basic.MainMenu.Profile.Exists="Профіль вже існує"
-Basic.MainMenu.SceneCollection.Exists="Колекція сцен вже існує"
 Basic.MainMenu.Tools="Інструменти (&T)"
 Basic.MainMenu.Help="Довідка (&H)"
 Basic.MainMenu.Help.HelpPortal="Довідковий портал (&P)"
@@ -660,8 +672,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Передати поточний файл журналу (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Вивантажити &попередній файл журналу"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Переглянути поточний журнал (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Примітки до випуску"
 Basic.MainMenu.Help.CheckForUpdates="Перевірити наявність оновлень"
 Basic.MainMenu.Help.Repair="Перевірити цілісність файлу"
+Basic.MainMenu.Help.RestartSafeMode="Перезапустити в безпечному режимі"
+Basic.MainMenu.Help.RestartNormal="Перезапустити у звичайному режимі"
 Basic.MainMenu.Help.CrashLogs="Звіти про збої (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Показати звіти про збої (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Вивантажити &попередній звіт про збій"
@@ -700,7 +715,7 @@
 Basic.Settings.General.SysTray="Системний трей"
 Basic.Settings.General.SysTrayWhenStarted="Згорнути в системний трей при запуску"
 Basic.Settings.General.SystemTrayHideMinimize="Завжди згортати в трей замість панелі завдань"
-Basic.Settings.General.SaveProjectors="Зберігати проектори при виході"
+Basic.Settings.General.SaveProjectors="Зберігати проєктори при виході"
 Basic.Settings.General.CloseExistingProjectors="Обмежити одним повноекранним проєктором на екран"
 Basic.Settings.General.Preview="Попередній перегляд"
 Basic.Settings.General.OverflowHidden="Приховувати вихід за межі"
@@ -731,7 +746,6 @@
 Basic.Settings.General.ChannelName.beta="Бета / кандидати на випуск"
 Basic.Settings.General.ChannelDescription.beta="Потенційно нестабільні передрелізні версії"
 Basic.Settings.Stream="Трансляція"
-Basic.Settings.Stream.StreamType="Тип трансляції"
 Basic.Settings.Stream.Custom.UseAuthentication="Використовувати автентифікацію"
 Basic.Settings.Stream.Custom.Username="Ім’я користувача"
 Basic.Settings.Stream.Custom.Password="Пароль"
@@ -763,7 +777,6 @@
 Basic.Settings.Output.Encoder.Video="Кодувальник відео"
 Basic.Settings.Output.Encoder.Audio="Кодувальник аудіо"
 Basic.Settings.Output.SelectDirectory="Виберіть каталог записів"
-Basic.Settings.Output.SelectFile="Виберіть файл запису"
 Basic.Settings.Output.DynamicBitrate="Динамічно змінювати бітрейт підлаштовуючись під мережу"
 Basic.Settings.Output.DynamicBitrate.Beta="Динамічно змінювати бітрейт підлаштовуючись під мережу (бета)"
 Basic.Settings.Output.DynamicBitrate.TT="Замість пропуску кадрів динамічно змінює бітрейт на ходу, підлаштовуючись під мережу.\n\nЗауважте, що це може збільшити затримку для глядачів, якщо є значні раптові помилки мережі.\nВідновлення бітрейту до початкового значення після падіння, може зайняти до кількох хвилин.\n\nНаразі підтримується лише для протоколу RTMP."
@@ -791,7 +804,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="Попередження: записи не можна призупиняти, якщо для якості запису встановлено значення «Така ж як у трансляції»."
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Попередження: поточний вибраний формат запису несумісний із вибраним кодувальником(ами) потокового відео."
 Basic.Settings.Output.Simple.Warn.Encoder="Попередження: запис програмним кодувальником з якістю, відмінною від якості трансляції, спричиняє додаткове навантаження на центральний процесор при одночасному використанні трансляції та запису."
-Basic.Settings.Output.Simple.Warn.Lossless="Попередження: якість без втрат генерує надзвичайно великі розміри файлів! Може використовуватись понад 7 гігабайтів дискового простору за хвилину при високих роздільній здатності та частоті кадрів. Якість без втрат не рекомендується для тривалого запису, хіба що у вас є дуже великий обсяг вільного дискового простору."
+Basic.Settings.Output.Simple.Warn.Lossless="Увага: Якість без втрат генерує надзвичайно великі розміри файлів! Якість без втрат може використовувати до 7 гігабайтів дискового простору на хвилину при високій роздільності та частоті кадрів. Не рекомендується використовувати якість без втрат для довгих записів, якщо у вас немає дуже великого обсягу дискового простору. Буфер повторного відтворення недоступний при використанні якості без втрат."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Справді використовувати настройку «Без втрат якості»?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Попередження щодо якості без втрат!"
 Basic.Settings.Output.Simple.Encoder.Software="Програмний (x264)"
@@ -941,8 +954,8 @@
 Basic.Settings.Audio.PeakMeterType="Тип вимірювача піків"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Вибірковий піковий"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Точний піковий (більше використання ресурсів ЦП)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="ПОПЕРЕДЖЕННЯ: увімкнено об'ємний звук."
-Basic.Settings.Audio.MultichannelWarning="Роблячи потокові трансляції, перевірте, чи підтримує ваш потоковий сервіс передавання та відтворення об'ємного звуку. Facebook 360 Live – один із прикладів, де об'ємний звук повністю підтримується. Хоча Facebook Live і YouTube Live приймають об'ємне передавання, Facebook Live знижує до стерео, а YouTube Live відтворює тільки два канали.\n\nФільтри аудіо OBS сумісні з об'ємним звуком, хоча підтримка плагіну VST не гарантується."
+Basic.Settings.Audio.MultichannelWarning.Enabled="ПОПЕРЕДЖЕННЯ: увімкнено об'ємний звук."
+Basic.Settings.Audio.MultichannelWarning="У процесі трансляції перевірте, чи підтримує ваш потоковий сервіс як приймання об'ємного звуку, так і відтворення об'ємного звуку. Наприклад, Facebook 360 L Live повністю підтримує об'ємний звук; YouTube Live підтримує прийом звуку у форматі 5.1 (і відтворення на телевізорах).\n\nАудіофільтри OBS сумісні з об'ємним звуком, хоча підтримка плагінів VST не гарантується."
 Basic.Settings.Audio.MultichannelWarning.Title="Увімкнути об'ємний звук?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Справді увімкнути об'ємний звук?"
 Basic.Settings.Audio.Devices="Загальні пристрої звуку"
@@ -989,7 +1002,6 @@
 Basic.Settings.Advanced.FormatWarning="Попередження: формати кольору, відмінні від NV12/P010, в першу чергу призначені для запису, і не рекомендуються для трансляцій. Трансляція може збільшити навантаження на ЦП через перетворення формату кольору."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Попередження: високоточні формати зазвичай використовують лише з колірними просторами HDR."
 Basic.Settings.Advanced.FormatWarning2100="Попередження: Rec. 2100 має використовувати формат з більшою точністю."
-Basic.Settings.Advanced.Audio.BufferingTime="Час буферизації аудіо"
 Basic.Settings.Advanced.Video.ColorFormat="Формат кольору"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 біт, 4:2:0, 2 плани)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 біт, 4:2:0, 3 плани)"
@@ -1015,6 +1027,7 @@
 Basic.Settings.Advanced.Network="Мережа"
 Basic.Settings.Advanced.Network.Disabled="Вибраний протокол трансляції не підтримує змінення параметрів мережі."
 Basic.Settings.Advanced.Network.BindToIP="Прив'язати до IP"
+Basic.Settings.Advanced.Network.IPFamily="IP Родина"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Увімкнути оптимізації мережі"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Увімкнути TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Намагається регулюванням швидкості передачі зменшити вплив RTMP виводу на інші, чутливі до затримки застосунку в мережі.\nЦе може збільшити шанс втрати кадрів на нестабільних з'єднаннях."
@@ -1065,6 +1078,8 @@
 SceneItemShow="Показати '%1'"
 SceneItemHide="Приховати '%1'"
 OutputWarnings.NoTracksSelected="Ви повинні вибрати хоча б одну доріжку"
+OutputWarnings.NoTracksSelectedOnExit.Title="Помилка налаштувань виводу"
+OutputWarnings.NoTracksSelectedOnExit.Text="Всі виходи повинні мати принаймні одну вибрану звукову доріжку."
 OutputWarnings.MP4Recording="Попередження: записи, збережені у форматі MP4/MOV, які не вдасться завершити (наприклад, внаслідок BSOD, втрат електроенергії тощо), не підлягають відновленню. Якщо ви хочете записати кілька аудіозаписів, подумайте про використання MKV та зробіть ремультиплексування запису в MP4/MOV після завершення запису (Файл → Ремультиплексувати записи)"
 OutputWarnings.CannotPause="Попередження: неможливо призупинити записування, якщо вибрано «(Використовувати кодувальник трансляції)»"
 OutputWarnings.CodecIncompatible="Вибір аудіо- чи відеокодувальників скинуто через несумісність. Будь ласка, виберіть зі списку сумісний кодувальник."
@@ -1090,7 +1105,8 @@
 About.GetInvolved="Взяти участь"
 About.Authors="Автори"
 About.License="Ліцензія"
-About.Contribute="Підтримати проект OBS"
+About.Error="Помилка! Неможливо прочитати файл.\n\nПерейти до: %1"
+About.Contribute="Підтримати проєкт OBS"
 AddUrl.Title="Додати джерело через URL-адресу"
 AddUrl.Text="Ви перетягнули URL-адресу в OBS. Це автоматично додасть посилання як джерело. Продовжити?"
 ResizeOutputSizeOfSource="Масштабувати вивід (розмір джерела)"
@@ -1102,7 +1118,7 @@
 Importer.Collection="Колекція сцен"
 Importer.HelpText="Додайте файли до цього вікна для імпорту колекції сцен з OBS чи інших підтримуваних програм."
 Importer.Path="Шлях до колекції"
-Importer.Program="Виявлена програма"
+Importer.Program="Виявлений застосунок"
 Importer.AutomaticCollectionPrompt="Автоматичний пошук колекцій сцен"
 Importer.AutomaticCollectionText="OBS може автоматично знаходити колекції сцен для імпорту з підтримуваних сторонніх програм. Бажаєте, щоб OBS автоматично знаходив для вас такі колекції?\n\nВи можете змінити це пізніше у Налаштування > Загальні > Імпортери."
 Restart="Перезапуск"
@@ -1110,14 +1126,12 @@
 LoadProfileNeedsRestart="Профіль містить налаштування, які вимагають перезапуску OBS:\n%1\n\nПерезапустити OBS, щоб активувати ці налаштування?"
 ContextBar.NoSelectedSource="Джерело не вибрано"
 ContextBar.ResetTransform="Скинути перетворення"
-ContextBar.FitToCanvas="Припасувати до полотна"
 ContextBar.MediaControls.PlayMedia="Відтворити"
 ContextBar.MediaControls.PauseMedia="Пауза"
 ContextBar.MediaControls.StopMedia="Зупинити"
 ContextBar.MediaControls.RestartMedia="Перезапустити"
 ContextBar.MediaControls.PlaylistNext="Наступний у списку відтворення"
 ContextBar.MediaControls.PlaylistPrevious="Попередній у списку відтворення"
-ContextBar.MediaControls.MediaProperties="Властивості медіафайлу"
 ContextBar.MediaControls.BlindSeek="Віджет пошуку медіафайлів"
 YouTube.Auth.Ok="Авторизацію виконано успішно.\nМожете закрити цю сторінку."
 YouTube.Auth.NoCode="Процес авторизації не виконано."
@@ -1199,3 +1213,5 @@
 YouTube.Errors.liveChatEnded="Пряму трансляцію завершено."
 YouTube.Errors.messageTextInvalid="Неприпустимий текст повідомлення."
 YouTube.Errors.rateLimitExceeded="Ви надсилаєте повідомлення занадто часто."
+YouTube.DocksRemoval.Title="Очистити застарілі панелі браузера YouTube"
+YouTube.DocksRemoval.Text="Ці панелі браузера буде вилучено як застарілі:\n\n%1\nВикористовуйте замість них \"Docks/YouTube Live Control Room\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/ur-PK.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/ur-PK.ini Changed

obs-studio-29.1.3.tar.xz/UI/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/vi-VN.ini Changed

@@ -1,10 +1,9 @@
 Language="Tiếng Việt"
-OK="Đồng ý"
 Apply="Áp dụng"
 Cancel="Hùy"
 Close="Đóng"
 Save="Lưu"
-Discard="Bỏ"
+Discard="Không lưu"
 Disable="Tắt"
 Yes="Có"
 No="Không"
@@ -20,68 +19,68 @@
 Display="Hiển thị"
 Name="Tên"
 Exit="Thoát"
-Mixer="Bộ trộn âm thanh"
+Mixer="Bộ lọc âm thanh"
 Browse="Chọn đường dẫn"
 Mono="Âm thanh đơn"
 Stereo="Âm thanh nổi"
 DroppedFrames="Khung bị rớt %1 (%2%)"
-StudioProgramProjector="Khung chiếu toàn màn hình (Đầu ra cuối)"
+StudioProgramProjector="Khung chiếu toàn màn hình (đầu cuối)"
 PreviewProjector="Khung chiếu toàn màn hình (Xem trước)"
-SceneProjector="Khung chiếu toàn màn hình (Cảnh)"
+SceneProjector="Khung chiếu toàn màn hình (thuộc phân cảnh)"
 SourceProjector="Khung chiếu toàn màn hình (Nguồn)"
-StudioProgramWindow="Khung chiếu dạng cửa sổ (Đầu ra cuối)"
-PreviewWindow="Khung chiếu dạng cửa sổ (Xem trước)"
-SceneWindow="Khung chiếu dạng cửa sổ (Cảnh)"
-SourceWindow="Khung chiếu dạng cửa sổ (Nguồn)"
-MultiviewProjector="Nhiều góc nhìn (Toàn màn hình)"
-MultiviewWindowed="Nhiều góc nhìn (Dạng cửa sổ)"
-ResizeProjectorWindowToContent="Chỉnh cửa sổ vừa với nội dung"
+StudioProgramWindow="Khung chiếu dạng cửa sổ (đầu cuối)"
+PreviewWindow="Khung chiếu dạng cửa sổ (xem trước)"
+SceneWindow="Khung chiếu dạng cửa sổ (thuộc phân cảnh)"
+SourceWindow="Khung chiếu dạng cửa sổ (nguồn)"
+MultiviewProjector="Đa góc nhìn (toàn màn hình)"
+MultiviewWindowed="Đa góc nhìn (dạng cửa sổ)"
+ResizeProjectorWindowToContent="Căn chỉnh cửa sổ với nội dung"
 Clear="Xóa"
 Revert="Phục hồi"
 Show="Hiện"
 Hide="Ẩn"
-UnhideAll="Bỏ ẩn tất cả"
+UnhideAll="Hiện tất cả"
 Untitled="Không tên"
 New="Mới"
 Duplicate="Tạo bản sao"
 Enable="Bật"
 DisableOSXVSync="Tắt macOS V-Sync"
-ResetOSXVSyncOnExit="Đặt lại macOS V-Sync khi Thoát"
-HighResourceUsage="Bộ mã hóa bị quá tải! Hãy xem xét giảm chất lượng video hoặc sử dụng bộ mã hóa nhanh hơn."
+ResetOSXVSyncOnExit="Tái khởi động macOS V-Sync khi tắt"
+HighResourceUsage="Bộ biên mã đang bị quá tải. Bạn nên căn chỉnh chất lượng video hay sử dụng một bộ chuyển mã nhanh hơn."
 Transition="Chuyển cảnh"
-QuickTransitions="Chuyển cảnh nhanh"
+QuickTransitions="Bộ cảnh chuyển"
 FadeToBlack="Đen dần"
 Left="Trái"
 Right="Phải"
 Top="Trên"
 Bottom="Dưới"
-Reset="Cài lại"
+Reset="Tải lại"
 Hours="Giờ"
 Minutes="Phút"
 Seconds="Giây"
-Deprecated="Loại bỏ"
-ReplayBuffer="Lưu trữ đệm"
+Deprecated="Bất cập"
+ReplayBuffer="Lưu bộ nhớ đệm"
 Import="Nhập"
 Export="Xuất"
 Copy="Sao chép"
 Paste="Dán"
-PasteReference="Dán (Mẫu)"
-PasteDuplicate="Dán (Bản sao)"
+PasteReference="Dán (tham chiếu)"
+PasteDuplicate="Dán (bản sao)"
 RemuxRecordings="Ghép lại các bản ghi"
 Next="Tiếp tục"
 Back="Quay lại"
 Defaults="Mặc định"
 RestoreDefaults="Mặc định"
-HideMixer="Ẩn trong Bộ trộn"
-TransitionOverride="Ghi đè chuyển cảnh"
-ShowTransition="Hiện các chuyển tiếp"
-HideTransition="Giấu Chuyển Cảnh"
+HideMixer="Ẩn trong bộ lọc"
+TransitionOverride="Ghi đè cảnh chuyển"
+ShowTransition="Cảnh chuyển đang hiện"
+HideTransition="Cảnh chuyển đang ẩn"
 None="Không"
 StudioMode.Preview="Xem trước"
 StudioMode.Program="Chương trình"
 StudioMode.PreviewSceneName="Xem trước: %1"
 StudioMode.ProgramSceneName="Chương trình: %1"
-ShowInMultiview="Xem trong Nhiều góc nhìn"
+ShowInMultiview="Hiển thị đa góc nhìn"
 VerticalLayout="Bố cục dọc"
 Group="Tạo nhóm"
 DoNotShowAgain="Không hiện thị lại"
@@ -92,55 +91,62 @@
 RefreshBrowser="Làm mới"
 AspectRatio="Tỉ lệ khung hình %1:%2"
 LockVolume="Khoá âm lượng"
-LogViewer="Xem log"
+LogViewer="Xem trữ liệu"
 ShowOnStartup="Hiện thị khi khởi động"
 OpenFile="Mở tệp"
-AddValue="Thêm %1"
 AddSource="Thêm nguồn"
 RemoveScene="Xóa phân cảnh đã chọn"
 RemoveSource="Xóa nguồn đã chọn"
-MoveSceneUp="Chuyển cảnh lên trên"
-MoveSceneDown="Chuyển cảnh xuống dưới"
+MoveSceneUp="Chuyển phân cảnh lên trên"
+MoveSceneDown="Chuyển phân cảnh xuống dưới"
 MoveSourceUp="Chuyển nguồn lên trên"
 MoveSourceDown="Chuyển nguồn xuống dưới"
 SourceProperties="Mở cài đặt nguồn"
 SourceFilters="Mở cài đặt hiệu ứng nguồn"
 MixerToolbarMenu="Bảng chọn bộ trộn âm thanh"
-SceneFilters="Bộ lọc Màn cảnh mở"
-PluginsFailedToLoad.Title="Plugin load thất bại"
-PluginsFailedToLoad.Text="Những plugin sau đây của OBS đã bị lỗi:\n\n%1\nVui lòng cập nhật hoặc xóa nó đi"
+SceneFilters="Mở bộ lọc phân cảnh"
+List="Danh sách"
+Grid="Lưới"
+PluginsFailedToLoad.Title="Lỗi khởi động tiện ích"
+PluginsFailedToLoad.Text="Những tiện ích sau đây đang bị lỗi:\n\n%1\nVui lòng cập nhật hoặc xóa nó đi"
 AlreadyRunning.Title="OBS hiện đang chạy"
-AlreadyRunning.Text="OBS hiện đang chạy! Trừ khi bạn muốn tiếp tục, xin vui lòng tắt mọi cửa sổ hiện tại của OBS trước khi cố gắng khởi chạy một cửa sổ mới. Nếu bạn để OBS ở trạng thái thu nhỏ trên thanh tác vụ, xin vui lòng kiểm tra xem ứng dụng có đang chạy hay không."
+AlreadyRunning.Text="OBS hiện đang chạy. Trừ phi bạn muốn tiếp tục, xin vui lòng tắt các phiên OBS khác trước khi khởi chạy một cửa sổ mới. Nếu OBS đang chạy trong trạng thái thu nhỏ trên thanh tác vụ, hãy kiểm tra lại rồi hẵng khởi chạy."
 AlreadyRunning.LaunchAnyway="Tiếp tục khởi động"
+AutoSafeMode.Title="Chế độ an toàn"
+AutoSafeMode.Text="OBS không tắt đúng cách trong phiên cuối cùng của bạn.\n\nBạn có muốn bắt đầu ở Chế độ an toàn (đã tắt plugin, tập lệnh và WebSockets của bên thứ ba) không?"
+AutoSafeMode.LaunchSafe="Chạy trong chế độ an toàn"
+AutoSafeMode.LaunchNormal="Chạy bình thường"
+SafeMode.Restart="Bạn có muốn khởi động lại OBS ở Chế độ an toàn (đã tắt plugin, tập lệnh và WebSockets của bên thứ ba) không?"
+SafeMode.RestartNormal="Bạn có muốn khởi động lại OBS trong chế độ bình thường không?"
 ChromeOS.Title="Nền tảng không được hỗ trợ"
-ChromeOS.Text="Có vẻ như OBS đang chạy trong ChromeOS. Nền tảng này không được hỗ trợ."
+ChromeOS.Text="Có vẻ như OBS đang được chạy trong ChromeOS. Nền tảng này không được hỗ trợ."
 Wine.Title="Đã phát hiện Wine"
-Wine.Text="OBS không được hỗ trợ trên Wine, và nhiều tính chẳng hạn như nguồn thiết bị hoặc nguồn từ màn hình sẽ không hoạt động hoặc chỉ trong khả năng hạn chế. Tốt nhất là sử dụng một phiên bản khác của OBS, ví dụ như <a href='https://flathub.org/apps/details/com.obsproject.Studio'>phiên bản Flatpak</a> hoặc gói cài đặt của hệ điều hành của bạn."
-DockCloseWarning.Title="Đóng cửa sổ cố định được"
-DockCloseWarning.Text="Bạn vừa đóng một cửa sổ có thể cố định giá đỡ được. Nếu bạn muốn hiện lại nó lần nữa, hãy sử dụng bảng chọn Giá đỡ trên thanh bảng chọn."
-ExtraBrowsers="Giá đỡ trình duyệt tùy chỉnh"
-ExtraBrowsers.Info="Thêm giá đỡ bằng cách đặt tên và URL, rồi chọn Áp dụng hoặc Đóng để mở giá đỡ. Bạn có thể thêm hoặc xóa giá đỡ bất kỳ lúc nào."
-ExtraBrowsers.DockName="Tên giá đỡ"
-Auth.Authing.Title="Đang xác thực..."
-Auth.Authing.Text="Đang xác thực với %1, vui lòng chờ..."
-Auth.AuthFailure.Title="Xác thực không thành công"
-Auth.AuthFailure.Text="Không xác thực được với %1:\n\n%2: %3"
-Auth.InvalidScope.Title="Bắt buộc phải xác thực"
-Auth.InvalidScope.Text="Yêu cầu xác thực cho %1 đã thay đổi. Một số tính năng có thể sẽ không còn."
+Wine.Text="OBS không được hỗ trợ trên Wine vì nhiều tính năng chẳng hạn như ghi hình sẽ không hoạt động hoặc chỉ hoạt động trong tầm hạn chế. Bạn nên sử dụng một phiên bản khác của OBS, ví dụ như <a href='https://flathub.org/apps/details/com.obsproject.Studio'>phiên bản Flatpak</a> hoặc gói cài đặt thuộc hệ điều hành của bạn."
+DockCloseWarning.Title="Cửa sổ cố định đã đóng"
+DockCloseWarning.Text="Bạn vừa đóng một cửa sổ cố định. Nếu bạn muốn tái hiển thị cửa sổ, hãy sử dụng tuỳ chọn Cố định trên thanh bảng chọn."
+ExtraBrowsers="Tuỳ chỉnh định cố trình duyệt"
+ExtraBrowsers.Info="Thêm định cố bằng việc đặt tên và URL, rồi chọn Áp dụng hoặc Đóng để áp dụng định cố. Bạn có thể thêm hoặc xóa định cố bất kỳ lúc nào."
+ExtraBrowsers.DockName="Tên định cố"
+Auth.Authing.Title="Đang xác minh..."
+Auth.Authing.Text="Đang xác minh tài khoản %1, vui lòng chờ..."
+Auth.AuthFailure.Title="Xác minh không thành công"
+Auth.AuthFailure.Text="Không xác thực được tài khoản %1:\n\n%2: %3"
+Auth.InvalidScope.Title="Bắt buộc đăng nhập để xác minh"
+Auth.InvalidScope.Text="Yêu cầu xác thực tài khoản %1 đã thay đổi. Một số tính năng có thể bị vô hiệu hoá."
 Auth.LoadingChannel.Title="Đang tải thông tin kênh..."
-Auth.LoadingChannel.Text="Đang tải thông tin về kênh cho %1, chờ lát..."
-Auth.LoadingChannel.Error="Không thể lấy được thông tin về kênh."
-Auth.ChannelFailure.Title="Bị lỗi khi nạp kênh"
+Auth.LoadingChannel.Text="Đang tải thông tin về kênh %1, xin vui lòng chờ..."
+Auth.LoadingChannel.Error="Không tải được thông tin về kênh."
+Auth.ChannelFailure.Title="Thông tin kênh bị lỗi hạ tải"
 Auth.ChannelFailure.Text="Không tải được thông tin kênh cho %1\n\n%2: %3"
-Auth.Chat="Tán gẫu"
+Auth.Chat="Trò chuyện"
 Auth.StreamInfo="Thông tin luồng phát"
-TwitchAuth.Stats="Thống kê Twitch"
-TwitchAuth.Feed="Bảng tin Twitch"
+TwitchAuth.Stats="Thống kê kênh Twitch"
+TwitchAuth.Feed="Bảng tin kênh Twitch"
 TwitchAuth.TwoFactorFail.Title="Không thể truy vấn khóa luồng"
-TwitchAuth.TwoFactorFail.Text="OBS không thể kết nối với tài khoản Twitch của bạn. Hãy chắc rằng xác minh 2 lớp đã được bật ở phần<a href='https://www.twitch.tv/settings/security'>cài đặt bảo mật Twitch</a> vì điều này là cần để phát trực tuyến."
-RestreamAuth.Channels="Kênh Restream"
-Copy.Filters="Sao chép các bộ lọc"
-Paste.Filters="Dán các bộ lọc"
+TwitchAuth.TwoFactorFail.Text="OBS không thể kết nối với tài khoản Twitch của bạn. Hãy chắc rằng xác minh 2 lớp đã được bật ở phần <a href='https://www.twitch.tv/settings/security'>cài đặt bảo mật Twitch</a> để phát trực tiếp."
+RestreamAuth.Channels="Kênh phát lại"
+Copy.Filters="Sao chép bộ lọc"
+Paste.Filters="Dán bộ lọc"
 BrowserPanelInit.Title="Đang khởi chạy trình duyệt..."
 BrowserPanelInit.Text="Đang khởi chạy trình duyệt, xin vui lòng chờ..."
 BandwidthTest.Region="Khu vực"
@@ -150,7 +156,7 @@
 BandwidthTest.Region.Other="Khác"
 Basic.AutoConfig="Trình cấu hình tự động"
 Basic.AutoConfig.ApplySettings="Áp dụng các thiết đặt"
-Basic.AutoConfig.StartPage="Thông tin sử dụng"
+Basic.AutoConfig.StartPage="Mục đích sử dụng"
 Basic.AutoConfig.StartPage.SubTitle="Xác định bạn muốn sử dụng chương trình cho mục đích gì"
 Basic.AutoConfig.StartPage.PrioritizeStreaming="Tối ưu hóa cho việc phát trực tuyến, quay phim là phụ"
 Basic.AutoConfig.StartPage.PrioritizeRecording="Tối ưu hóa chỉ cho quay hình, tôi sẽ không phát luồng"
@@ -159,8 +165,8 @@
 Basic.AutoConfig.VideoPage.SubTitle="Chỉ rõ các thiết đặt video mà bạn muốn sử dụng"
 Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="Sử dụng hiện tại (%1x%2)"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="Màn hình %1 (%2x%3)"
-Basic.AutoConfig.VideoPage.FPS.UseCurrent="Sử dụng hiện tại (%1)"
-Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 hoặc 30, nhưng ưu tiên chọn 60 khi có thể"
+Basic.AutoConfig.VideoPage.FPS.UseCurrent="Hiện tại (%1)"
+Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 hoặc 30, nhưng ưu tiên 60 khi có thể"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 hoặc 30, nhưng ưu tiên độ phân giải cao"
 Basic.AutoConfig.VideoPage.CanvasExplanation="Lưu ý: Độ phân giải bức vẽ (cơ sở) không nhất thiết phải bằng với độ phân giải bạn sẽ truyền phát hay ghi hình. Độ phân giải phát luồng/ghi hình thực tế có thể bị giảm tỉ lệ từ độ phân giải của bức vẽ để giảm sử dụng tài nguyên hoặc yêu cầu về tốc độ bit."
 Basic.AutoConfig.StreamPage="Thông tin luồng"
@@ -174,17 +180,17 @@
 Basic.AutoConfig.StreamPage.UseStreamKey="Dùng khóa luồng phát"
 Basic.AutoConfig.StreamPage.UseStreamKeyAdvanced="Dùng khoá luồng (nâng cao)"
 Basic.AutoConfig.StreamPage.Service="Dịch vụ"
-Basic.AutoConfig.StreamPage.Service.ShowAll="Hiện tất cả..."
+Basic.AutoConfig.StreamPage.Service.ShowAll="Thêm..."
 Basic.AutoConfig.StreamPage.Service.Custom="Tự chọn..."
 Basic.AutoConfig.StreamPage.Server="Máy chủ"
 Basic.AutoConfig.StreamPage.StreamKey="Khóa luồng"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: nhập mật khẩu mã hóa. \nRTMP: nhập khóa được cung cấp bởi dịch vụ. \nSRT: nhập streamid nếu dịch vụ sử dụng."
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(Liên kết)"
 Basic.AutoConfig.StreamPage.EncoderKey="Khoá của bộ biên mã"
+Basic.AutoConfig.StreamPage.BearerToken="Mã Bearer"
 Basic.AutoConfig.StreamPage.ConnectedAccount="Tài khoản được kết nối"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="Ước tính tốc đọ bit với bài kiểm tra băng thông (có thể mất vài phút)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="Ưu tiên mã hóa bằng phần cứng"
-Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Mã hóa bằng phần cứng giúp loại bỏ hầu hết sử dụng CPU nhưng có thể yêu cầu thêm tốc độ bit để có được chất lượng tương đương."
+Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="Mã hóa bằng phần cứng giúp loại bỏ hầu hết lượng tải CPU, đồng thời có thể yêu cầu thêm tốc độ bit để đạt được chất lượng tương đối."
 Basic.AutoConfig.StreamPage.StreamWarning.Title="Cảnh báo luồng"
 Basic.AutoConfig.StreamPage.StreamWarning.Text="Bài kiểm tra băng thông sẽ phát luồng dữ liêu video ngẫu nhiên mà không có âm thanh đến kênh của bạn. Nếu được, hãy tạm thời tắt các video luồng đang lưu và đặt luồng thành riêng tư cho đến khi kiểm tra xong. Tiếp tục?"
 Basic.AutoConfig.TestPage="Kết quả cuối cùng"
@@ -206,11 +212,11 @@
 Basic.AutoConfig.Info="Thuật sĩ tự cấu hình sẽ xác định các thiết đặt tốt nhất dựa trên đặc tả máy tính và tốc độ internet của bạn."
 Basic.AutoConfig.RunAnytime="Có thể chạy bất kì lúc nào bằng cách vào bảng chọn Công cụ."
 Basic.Stats="Thống kê"
-Basic.Stats.CPUUsage="Sử dụng CPU"
+Basic.Stats.CPUUsage="Lượng tải CPU"
 Basic.Stats.HDDSpaceAvailable="Không gian đĩa còn trống"
-Basic.Stats.MemoryUsage="Bộ nhớ đã sử dụng"
-Basic.Stats.AverageTimeToRender="Thời gian trung bình để kết xuất khung hình"
-Basic.Stats.SkippedFrames="Khung hình bị bỏ qua do mã hóa bị lag"
+Basic.Stats.MemoryUsage="Lượng tải bộ nhớ"
+Basic.Stats.AverageTimeToRender="Thời gian trung bình để xuất hình"
+Basic.Stats.SkippedFrames="Lượng khung hình đã bỏ qua do lỗi biên mã"
 Basic.Stats.MissedFrames="Khung hình bị mất do đơ kết xuất"
 Basic.Stats.Output.Stream="Phát luồng"
 Basic.Stats.Output.Recording="Quay video"
@@ -228,14 +234,12 @@
 ResetUIWarning.Title="Có chắc là bạn muốn thiết lập lại giao diện người dùng không?"
 ResetUIWarning.Text="Việc đặt lại giao diện người dùng (UI) sẽ ẩn các thanh bạn bổ sung. Bạn sẽ phải cài đặt lại từ bảng chọn Hiển thị nếu muốn dùng chúng.\n\nCó chắc là bạn muốn đặt lại giao diện người dùng không?"
 Updater.Title="Có bản cập nhật mới"
-Updater.Text="Có sẵn một bản cập nhật mới:"
-Updater.UpdateNow="Cập nhật ngay"
+Updater.Text=" "
+Updater.UpdateNow="Cập nhật"
 Updater.RemindMeLater="Hỏi lại sau"
 Updater.Skip="Bỏ qua phiên bản"
-Updater.Running.Title="Chương trình đang kích hoạt"
-Updater.Running.Text="Đầu ra đang được kích hoạt, vui lòng tắt bất kỳ đầu ra nào đang hoạt động trước khi bấm Cập nhật"
 Updater.NoUpdatesAvailable.Title="Không có cập nhật mới"
-Updater.NoUpdatesAvailable.Text="Không có bản cập nhật mới"
+Updater.NoUpdatesAvailable.Text="Hiện không bản cập nhật nào"
 Updater.BranchNotFound.Title="Kênh cập nhật đã bị xóa"
 Updater.BranchNotFound.Text="Kênh cập nhật bạn đã chọn không còn khả dụng, OBS đã được đặt lại về mặc định."
 Updater.RepairButUpdatesAvailable.Title="Không kiểm tra được tính toàn vẹn tệp"
@@ -243,21 +247,21 @@
 Updater.RepairConfirm.Title="Xác nhận kiểm tra tính toàn vẹn"
 Updater.RepairConfirm.Text="Trình kiểm tra tính toàn vẹn sẽ quét cài đặt OBS của bạn để tìm lỗi và tải lại các tệp bị hỏng/sửa đổi. Quá trình này có thể mất vài phút.\n\nCó chắc là bạn muốn kiểm tra không?"
 Updater.FailedToLaunch="Thất bại khi mở trình cập nhật"
-Updater.GameCaptureActive.Title="Trình quay cửa sổ đang hoạt động"
-Updater.GameCaptureActive.Text="Thư viện móc quay trò chơi hiện đang hoạt động. Xin vui lòng đóng tất cả các trò chơi/chương trình hiện đang quay (hoặc khởi động lại Windows) và thử lại."
-QuickTransitions.SwapScenes="Hoán đổi cảnh xem trước và đầu ra sau khi chuyển cảnh"
-QuickTransitions.SwapScenesTT="Hoán đổi cảnh xem trước và cảnh đầu ra sau khi chuyển cảnh (nếu đầu ra gốc tồn tại).\nMọi thay đổi với đầu ra gốc sẽ không hoàn tác."
-QuickTransitions.DuplicateScene="Tạo bản sao cảnh"
-QuickTransitions.DuplicateSceneTT="Khi chỉnh sửa trong cùng một cảnh, nó sẽ cho phép biến đổi bản sửa/hiển thị bản gốc mà không làm thay đổi bản xuất ra.\nĐể chỉnh sửa cấu hình bản gốc mà không thay đổi bản xuất ra, chọn 'Tạo bản sao cảnh'.\nThay đổi lựa chọn sẽ đặt lại bản xuất ra hiện tại (nếu nó tồn tại)."
+QuickTransitions.SwapScenes="Hoán đổi cảnh xem trước và cảnh đầu ra"
+QuickTransitions.SwapScenesTT="Hoán đổi cảnh xem trước và cảnh đầu ra sau chuyển cảnh (nếu đầu ra gốc tồn tại).\nMọi thay đổi với đầu ra gốc sẽ không hoàn tác."
+QuickTransitions.DuplicateScene="Sao lưu phân cảnh"
+QuickTransitions.DuplicateSceneTT="Khi chỉnh sửa trong cùng một phân cảnh, nó sẽ cho phép biến đổi bản sửa/hiển thị bản gốc mà không làm thay đổi xuất cảnh.\nĐể chỉnh sửa cấu hình bản gốc trong khi xuất cảnh không bị thay đổi, chọn 'Tạo bản sao cảnh'.\nThay đổi lựa chọn sẽ đặt lại bản xuất ra hiện tại (nếu tồn tại)."
 QuickTransitions.EditProperties="Tạo bản sao nguồn"
 QuickTransitions.EditPropertiesTT="Khi chỉnh sửa trong cùng một cảnh, cho phép chỉnh sửa cấu hình bản gốc mà không ảnh hưởng đến bản xuất ra.\nChức năng chỉ được sử dụng khi chọn 'Tạo bản sao cảnh'.\nMột vài bản gốc (như ảnh chụp hoặc phương tiện gốc) không hỗ trợ chức năng này và không thể chỉnh sửa riêng.\nThay đổi lựa chọn này sẽ cài đặt lại bản xuất ra hiện tại (nếu nó tồn tại).\n\nChú ý: Hệ thống hoặc tài nguyên vi-đê-ô sẽ được sử dụng nhiều hơn nếu bật chức năng sao lưu bản gốc này."
-QuickTransitions.HotkeyName="C. cảnh nhanh: %1"
-Basic.AddTransition="Thêm cấu hình chuyển cảnh"
-Basic.RemoveTransition="Xóa cấu hình chuyển cảnh"
+QuickTransitions.HotkeyName="Chuyển cảnh: %1"
+Basic.AddTransition="Thêm cấu hình cảnh chuyển"
+Basic.RemoveTransition="Xóa cấu hình cảnh chuyển"
 Basic.TransitionProperties="Thuộc tính chuyển tiếp"
 Basic.SceneTransitions="Chuyển cảnh"
 Basic.TransitionDuration="Thời gian"
 Basic.TogglePreviewProgramMode="Chế độ Studio"
+Basic.EnablePreviewProgramMode="Bật Chế độ Studio"
+Basic.DisablePreviewProgramMode="Tắt Chế độ Studio"
 Undo.Undo="Hoàn tác"
 Undo.Redo="Làm lại"
 Undo.Add="Thêm '%1'"
@@ -304,10 +308,12 @@
 Undo.PasteSource="Dán nguồn vào '%1'"
 Undo.PasteSourceRef="Dán tham chiếu nguồn trong '%1'"
 Undo.GroupItems="Nhóm các mục vào '%1'"
-TransitionNameDlg.Text="Vui lòng nhập tên của cảnh"
-TransitionNameDlg.Title="Tên chuyển cảnh"
+TransitionNameDlg.Text="Vui lòng nhập tên cảnh chuyển"
+TransitionNameDlg.Title="Tên cảnh chuyển"
+TitleBar.SafeMode="CHẾ ĐỘ AN TOÀN"
+TitleBar.PortableMode="Chế độ di động"
 TitleBar.Profile="Cấu hình"
-TitleBar.Scenes="Cảnh"
+TitleBar.Scenes="Phân cảnh"
 NameExists.Title="Tên đã tồn tại"
 NameExists.Text="Tên hiện đang sử dụng."
 NoNameEntered.Title="Vui lòng nhập tên hợp lệ"
@@ -330,19 +336,20 @@
 Output.StartStreamFailed="Không thể phát luồng"
 Output.StartRecordingFailed="Không thể bắt đầu quay video"
 Output.StartReplayFailed="Không thể khởi động replay buffer"
+Output.StartVirtualCamFailed="Không khởi động được máy ảnh ảo"
 Output.StartFailedGeneric="Không thể ghi đầu ra. Vui lòng kiểm tra các tệp nhật kí để biết thêm chi tiết.\n\nGhi chú: nếu bạn đang sử dụng bộ biên mã NVENC hoặc AMD, bạn phải cập nhật GPU lên phiên bản mới nhất."
 Output.ReplayBuffer.PauseWarning.Title="Không thể lưu bản phát lại trong khi tạm dừng"
-Output.ReplayBuffer.PauseWarning.Text="Cảnh báo: Bản phát lại không thể được lưu trong khi tạm dừng ghi hình."
+Output.ReplayBuffer.PauseWarning.Text="Cảnh báo: Bản phát lại sẽ không được lưu trong khi tạm dừng ghi hình."
 Output.ConnectFail.Title="Không thể kết nối"
 Output.ConnectFail.BadPath="URL không hợp lệ của đường dẫn hoặc kết nối. Xin vui lòng kiểm tra cài đặt của bạn để xác nhận rằng họ là hợp lệ."
-Output.ConnectFail.ConnectFailed="Không thể kết nối tới hệ phục vụ"
+Output.ConnectFail.ConnectFailed="Không thể kết nối tới máy chủ"
 Output.ConnectFail.InvalidStream="Không thể truy cập kênh chỉ định hoặc khóa luồng phát. Vui lòng kiểm tra khóa luồng của bạn. Nếu bạn không nhập sai khóa, có thể luồng kết nối máy chủ có vấn đề."
 Output.ConnectFail.HdrDisabled="Đầu ra HDR hiện bị tắt cho đầu ra này."
 Output.ConnectFail.Error="1 lỗi bất ngờ xảy ra khi thử kết nối tới máy chủ. Thông tin thêm nằm trong log file."
 Output.ConnectFail.Disconnected="Ngắt kết nối từ máy chủ."
 Output.StreamEncodeError.Title="Lỗi biên mã"
 Output.StreamEncodeError.Msg="Xảy ra lỗi biên mã trong khi phát luồng."
-Output.StreamEncodeError.Msg.LastError="Một lỗi biên mã đã xảy ra trong quá trình phát luồng:\n\n%1"
+Output.StreamEncodeError.Msg.LastError="Một lỗi biên mã đã xảy ra trong quá trình phát luồng: %1"
 Output.RecordFail.Title="Không thể bắt đầu ghi hình"
 Output.RecordFail.Unsupported="Định dạng đầu ra là một trong hai dạng không được hỗ trợ hoặc không hỗ trợ nhiều hơn một rãnh âm. Xin vui lòng kiểm tra thiết đặt của bạn và thử lại."
 Output.RecordNoSpace.Title="Không gian đĩa không đủ"
@@ -350,7 +357,7 @@
 Output.RecordError.Title="Lỗi ghi hình"
 Output.RecordError.Msg="Một lỗi không xác định xảy ra trong khi ghi hình."
 Output.RecordError.EncodeErrorMsg="Xảy ra lỗi biên mã trong khi ghi hình."
-Output.RecordError.EncodeErrorMsg.LastError="Một lỗi biên mã đã xảy ra trong quá trình ghi hình:\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="Một lỗi biên mã đã xảy ra trong quá trình ghi hình: %1"
 Output.BadPath.Title="Đường dẫn tệp xấu"
 Output.BadPath.Text="Không thể mở Đường dẫn ghi hình đã cài đặt. Hãy kiểm tra lại Đường dẫn ghi hình của bạn trong Cài đặt→ Đầu ra→ Ghi hình"
 Output.NoBroadcast.Title="Không có phát sóng nào được cấu hình"
@@ -379,6 +386,8 @@
 Remux.ExitUnfinishedTitle="Đang trong quá trình ghép lại"
 Remux.ExitUnfinished="Việc ghép lại không được hoàn tất, dừng bây giờ có thể kết xuất tệp đích không sử dụng được.\nBạn có chắc bạn muốn dừng ghép lại không?"
 Remux.HelpText="Thả tệp vào cửa sổ này để ghép lại, hoặc chọn một ô \"Bản ghi OBS\" rỗng để duyệt tìm một tệp."
+Remux.NoFilesAddedTitle="Không có tệp remux nào được thêm vào"
+Remux.NoFilesAdded="Không có tệp nào được thêm vào remux. Thả một thư mục chứa một hoặc nhiều tệp video."
 MissingFiles="Các tập tin bị thiếu"
 MissingFiles.MissingFile="Tập tin bị thiếu"
 MissingFiles.NewFile="Tập tin mới"
@@ -397,7 +406,8 @@
 MissingFiles.AutoSearchText="OBS đã tìm thấy một tệp thay thế cho tệp bị thiếu trong cùng đường dẫn. Bạn có muốn thêm chúng vào ?"
 MissingFiles.NoMissing.Title="Kiểm tra tệp bị thiếu"
 MissingFiles.NoMissing.Text="Không có tệp nào bị thiếu cả."
-MacPermissions.Title="Xem các quyền của ứng dụng"
+MacPermissions.MenuAction="Xem lại các quyền của ứng dụng..."
+MacPermissions.Title="Xem lại các quyền của ứng dụng"
 MacPermissions.Description="OBS Studio cần sự đồng ý của bạn để sử dụng được một số chức năng. Và được khuyến cáo là nên mở những chức năng này dù nó không cần thiết để sử dụng cái app này. Bạn có thể mở nó lúc sau cũng được."
 MacPermissions.Description.OpenDialog="Bạn có thể mở lại hộp thoại này từ bảng chọn của OBS Studio"
 MacPermissions.AccessGranted="Cấp quyền truy cập"
@@ -410,12 +420,12 @@
 MacPermissions.Item.Accessibility="Hỗ trợ tiếp cận"
 MacPermissions.Item.Accessibility.Details="Để sử dụng cái phím tắt trên bàn phím khi làm việc trong các ứng dụng khác thì hãy bật cái quyền này lên."
 MacPermissions.Continue="Tiếp tục"
-UpdateAvailable="Bản cập nhật mới"
-UpdateAvailable.Text="Phiên bản %1.%2.%3 có sẵn. <a href='%4'> Click vào đây để tải về</a>"
+SourceLeak.Title="Lỗi dọn dẹp nguồn"
+SourceLeak.Text="Đã xảy ra sự cố khi thay đổi scene và không thể tải một số nguồn. Sự cố này thường do plugin không giải phóng tài nguyên đúng cách. Vui lòng đảm bảo rằng mọi phần bổ trợ bạn đang sử dụng đều được cập nhật.\n\nOBS Studio hiện sẽ thoát để ngăn chặn bất kỳ hỏng hóc dữ liệu tiềm ẩn nào."
 Basic.DesktopDevice1="Âm thanh máy tính để bàn"
 Basic.DesktopDevice2="Máy tính để bàn âm thanh 2"
 Basic.Scene="Màn hình"
-Basic.DisplayCapture="Ghi lại màn hình"
+Basic.DisplayCapture="Ghi màn hình"
 Basic.Main.PreviewConextMenu.Enable="Bật xem trước"
 Basic.Main.Preview.Disable="Tắt xem trước"
 ScaleFiltering.Area="Khu vực"
@@ -438,12 +448,12 @@
 VolControl.Properties="Thuộc tính '%1'"
 VolControl.UnassignedWarning.Title="Nguồn âm thanh chưa được chỉ định"
 VolControl.UnassignedWarning.Text="\"%1\" không được gán cho bất kỳ rãnh âm thanh nào và sẽ không nghe thấy được trong luồng hoặc bản ghi âm.\n\nĐể gán nguồn âm thanh cho rãnh, hãy mở Thuộc tính âm thanh nâng cao thông qua menu nhấp chuột phải hoặc nút răng cưa trong thanh công cụ đế trộn."
-Basic.Main.AddSceneDlg.Title="Thêm cảnh"
-Basic.Main.AddSceneDlg.Text="Vui lòng nhập tên của cảnh"
-Basic.Main.DefaultSceneName.Text="Cảnh %1"
-Basic.Main.AddSceneCollection.Title="Thêm cảnh bộ sưu tập"
-Basic.Main.AddSceneCollection.Text="Vui lòng nhập tên của bộ sưu tập cảnh"
-Basic.Main.RenameSceneCollection.Title="Đổi tên cảnh bộ sưu tập"
+Basic.Main.AddSceneDlg.Title="Thêm phân cảnh"
+Basic.Main.AddSceneDlg.Text="Vui lòng nhập tên phân cảnh"
+Basic.Main.DefaultSceneName.Text="Phân cảnh %1"
+Basic.Main.AddSceneCollection.Title="Cài bộ phân cảnh"
+Basic.Main.AddSceneCollection.Text="Vui lòng nhập tên của bộ phân cảnh"
+Basic.Main.RenameSceneCollection.Title="Đổi tên bộ phân cảnh"
 AddProfile.Title="Thêm cấu hình"
 AddProfile.Text="Vui lòng nhập tên cấu hình"
 AddProfile.WizardCheckbox="Hiện thuật sĩ tự cấu hình"
@@ -462,6 +472,7 @@
 Basic.PropertiesWindow="Thuộc tính '%1'"
 Basic.PropertiesWindow.SelectColor="Chọn Màu"
 Basic.PropertiesWindow.SelectFont="Chọn font"
+Basic.PropertiesWindow.SelectFont.WindowTitle="Chọn một phông chữ"
 Basic.PropertiesWindow.ConfirmTitle="Thay đổi thiết đặt"
 Basic.PropertiesWindow.Confirm="Có được lưu thay đổi. Bạn có muốn giữ họ?"
 Basic.PropertiesWindow.NoProperties="Không có tài sản có sẵn"
@@ -496,7 +507,7 @@
 Basic.Filters.Title="Bộ lọc cho '%1'"
 Basic.Filters.AddFilter.Title="Tên bộ lọc"
 Basic.Filters.AddFilter.Text="Hãy chỉ ra tên bộ lọc"
-Basic.TransformWindow="Cảnh mục biến đổi"
+Basic.TransformWindow="Biểu thị phân tử"
 Basic.TransformWindow.Position="Vị trí"
 Basic.TransformWindow.PositionX="Vị trí X"
 Basic.TransformWindow.PositionY="Vị trí Y"
@@ -534,8 +545,8 @@
 Basic.TransformWindow.Title="Sửa phép biến hình cho '%1'"
 Basic.TransformWindow.NoSelectedSource="Không có nguồn nào được chọn"
 Basic.Main.AddSourceHelp.Title="Không thể thêm nguồn"
-Basic.Main.AddSourceHelp.Text="Bạn cần phải có ít nhất 1 cảnh để thêm một nguồn."
-Basic.Main.Scenes="Cảnh"
+Basic.Main.AddSourceHelp.Text="Bạn cần phải có ít nhất 1 phân cảnh để thêm nguồn."
+Basic.Main.Scenes="Phân cảnh"
 Basic.Main.Sources="Nguồn"
 Basic.Main.Source="Nguồn"
 Basic.Main.Controls="Điều khiển"
@@ -571,9 +582,9 @@
 Basic.VCam.VirtualCamera="Máy quay ảo"
 Basic.VCam.OutputType="Kiểu đầu ra"
 Basic.VCam.OutputSelection="Chọn đầu ra"
-Basic.VCam.Internal="Nội bộ"
-Basic.VCam.InternalDefault="Đầu ra của chương trình"
-Basic.VCam.InternalPreview="Xem trước đầu ra"
+Basic.VCam.OutputType.Program="Chương trình (Mặc định)"
+Basic.VCam.OutputSelection.NoSelection="Không có lựa chọn cho loại đầu ra này"
+Basic.VCam.RestartWarning="Máy ảnh ảo sẽ được khởi động lại để áp dụng thay đổi này"
 Basic.MainMenu.File="Tập tin (&F)"
 Basic.MainMenu.File.Export="Xuất (&E)"
 Basic.MainMenu.File.Import="Nhập (&I)"
@@ -615,17 +626,18 @@
 Basic.MainMenu.Edit.AdvAudio="Các thuộc tính âm th&anh nâng cao"
 Basic.MainMenu.View="Hiển thị (&V)"
 Basic.MainMenu.View.Toolbars="&Thanh công cụ"
-Basic.MainMenu.View.ListboxToolbars="Danh sách nút Cảnh/Nguồn"
+Basic.MainMenu.View.ListboxToolbars="Thanh công cụ Dock"
 Basic.MainMenu.View.ContextBar="Thanh công cụ Nguồn"
-Basic.MainMenu.View.SceneTransitions="Chuyển cảnh"
 Basic.MainMenu.View.SourceIcons="B&iểu tượng nguồn"
 Basic.MainMenu.View.StatusBar="Thanh trạng thái (&S)"
 Basic.MainMenu.View.Fullscreen.Interface="Giao diện toàn màn hình"
 Basic.MainMenu.View.ResetUI="&Đặt lại giao diện"
 Basic.MainMenu.View.AlwaysOnTop="&Luôn hiện trên cùng"
+Basic.MainMenu.View.SceneListMode="Biểu thị liệt kê phân cảnh"
 Basic.MainMenu.Docks="Giá đỡ (&D)"
 Basic.MainMenu.Docks.ResetDocks="Đặt lại các giá đỡ (&R)"
 Basic.MainMenu.Docks.LockDocks="Khoá các giá đỡ (&L)"
+Basic.MainMenu.Docks.SideDocks="&Dock có chiều cao đầy đủ"
 Basic.MainMenu.Docks.CustomBrowserDocks="Giá đỡ trình duyệt tùy chỉnh... (&C)"
 Basic.MainMenu.SceneCollection="Bộ &sưu tập cảnh"
 Basic.MainMenu.Profile="Cấu hình (&P)"
@@ -634,7 +646,6 @@
 Basic.MainMenu.SceneCollection.Import="Nhập bộ sưu tập cảnh"
 Basic.MainMenu.SceneCollection.Export="Xuất bộ sưu tập cảnh"
 Basic.MainMenu.Profile.Exists="Cấu hình này đã tồn tại"
-Basic.MainMenu.SceneCollection.Exists="Bộ sưu tập cảnh đã tồn tại"
 Basic.MainMenu.Tools="Công cụ (&T)"
 Basic.MainMenu.Help="Trợ giúp (&H)"
 Basic.MainMenu.Help.HelpPortal="Cổng thông tin trợ giúp (&P)"
@@ -646,8 +657,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Tải lên tệp sổ ghi hiện tại (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Tải lên tệp nhật ký trước đó"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="Xem sổ ghi hiện tại (&V)"
+Basic.MainMenu.Help.ReleaseNotes="Ghi chú"
 Basic.MainMenu.Help.CheckForUpdates="Kiểm tra cập nhật mới"
 Basic.MainMenu.Help.Repair="Kiểm tra tính toàn vẹn tệp"
+Basic.MainMenu.Help.RestartSafeMode="Khởi động lại ở Chế độ An toàn"
+Basic.MainMenu.Help.RestartNormal="Khởi động lại ở Chế độ Bình thường"
 Basic.MainMenu.Help.CrashLogs="Báo cáo sự cố (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="Hiện báo cáo hỏng chương trình (&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="Tải lên báo cáo lỗi trước đó"
@@ -693,31 +707,30 @@
 Basic.Settings.General.OverflowAlwaysVisible="Luôn hiện thị tràn khung hình"
 Basic.Settings.General.OverflowSelectionHidden="Hiển thị tràn khung hình khi không thấy nguồn"
 Basic.Settings.General.Importers="Bộ nhập"
-Basic.Settings.General.AutomaticCollectionSearch="Tìm kiếm các bộ sưu tập cảnh ở các địa điểm đã biết khi nhập"
+Basic.Settings.General.AutomaticCollectionSearch="Tìm kiếm các bộ sưu tập cảnh tại các địa chỉ được nhập"
 Basic.Settings.General.SwitchOnDoubleClick="Nháy đúp chuột để chuyển cảnh"
 Basic.Settings.General.StudioPortraitLayout="Bật bố cục theo chiều dọc"
 Basic.Settings.General.TogglePreviewProgramLabels="Hiện nhãn của xem trước/chương trình"
 Basic.Settings.General.Multiview="Nhiều góc nhìn"
 Basic.Settings.General.Multiview.MouseSwitch="Nháy chuột để chuyển cảnh"
-Basic.Settings.General.Multiview.DrawSourceNames="Hiện tên cảnh"
+Basic.Settings.General.Multiview.DrawSourceNames="Hiển thị tên phân cảnh"
 Basic.Settings.General.Multiview.DrawSafeAreas="Vẽ khu vực an toàn (EBU R 95)"
 Basic.Settings.General.MultiviewLayout="Bố cục nhiều góc nhìn"
-Basic.Settings.General.MultiviewLayout.Horizontal.Top="Chiều ngang, trên (8 cảnh)"
-Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Chiều ngang, dưới (8 cảnh)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Top="Chiều ngang, trên cùng (8 phân cảnh)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Bottom="Chiều ngang, dưới cùng (8 phân cảnh)"
 Basic.Settings.General.MultiviewLayout.Vertical.Left="Chiều dọc, trái (8 cảnh)"
 Basic.Settings.General.MultiviewLayout.Vertical.Right="Chiều dọc, phải (8 cảnh)"
-Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Chiều ngang, trên (18 cảnh)"
-Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Chiều ngang, trên (24 cảnh)"
-Basic.Settings.General.MultiviewLayout.4Scene="Chỉ hiển thị cảnh (4 cảnh)"
-Basic.Settings.General.MultiviewLayout.9Scene="Chỉ hiển thị cảnh (9 cảnh)"
-Basic.Settings.General.MultiviewLayout.16Scene="Chỉ hiển thị cảnh (16 cảnh)"
-Basic.Settings.General.MultiviewLayout.25Scene="Chỉ hiển thị cảnh (25 cảnh)"
+Basic.Settings.General.MultiviewLayout.Horizontal.18Scene.Top="Chiều ngang, trên cùng (18 phân cảnh)"
+Basic.Settings.General.MultiviewLayout.Horizontal.Extended.Top="Chiều ngang, trên cùng (24 phân cảnh)"
+Basic.Settings.General.MultiviewLayout.4Scene="Chỉ phân cảnh (4 phân cảnh)"
+Basic.Settings.General.MultiviewLayout.9Scene="Chỉ phân cảnh (9 phân cảnh)"
+Basic.Settings.General.MultiviewLayout.16Scene="Chỉ phân cảnh (16 phân cảnh)"
+Basic.Settings.General.MultiviewLayout.25Scene="Chỉ phân cảnh (25 phân cảnh)"
 Basic.Settings.General.ChannelName.stable="Ổn định"
 Basic.Settings.General.ChannelDescription.stable="Phiên bản ổn định mới nhất"
 Basic.Settings.General.ChannelName.beta="Bản beta / Bản phát hành ứng cử"
 Basic.Settings.General.ChannelDescription.beta="Phiên bản tiền phát hành có thể không ổn định"
 Basic.Settings.Stream="Luồng"
-Basic.Settings.Stream.StreamType="Kiểu luồng"
 Basic.Settings.Stream.Custom.UseAuthentication="Sử dụng xác thực"
 Basic.Settings.Stream.Custom.Username="Tên đăng nhập"
 Basic.Settings.Stream.Custom.Password="Mật khẩu"
@@ -734,7 +747,7 @@
 Basic.Settings.Stream.MissingStreamKey="Khoá luồng đang bị thiếu.\n\nMở thiết đặt để nhập khoả luồng trong thẻ 'Luồng'."
 Basic.Settings.Stream.IgnoreRecommended="Bỏ qua các đề xuất cài đặt dịch vụ phát trực tuyến"
 Basic.Settings.Stream.IgnoreRecommended.Warn.Title="Ghi đè cài đặt được đề xuất"
-Basic.Settings.Stream.IgnoreRecommended.Warn.Text="Cảnh báo: Việc bỏ qua các giới hạn của dịch vụ có thể dẫn đến chất lượng luồng bị giảm sút hoặc ngăn bạn phát trực tuyến.\n\nTiếp tục?"
+Basic.Settings.Stream.IgnoreRecommended.Warn.Text="Cảnh báo: Việc bỏ qua các giới hạn của dịch vụ có thể dẫn đến chất lượng luồng bị giảm sút hoặc ngăn bạn phát trực tuyến.\n\nCó chắc là bạn muốn tiếp tục không?"
 Basic.Settings.Stream.Recommended.MaxVideoBitrate="Tốc độ bit tối đa của video: %1 kbps"
 Basic.Settings.Stream.Recommended.MaxAudioBitrate="Tốc độ bit âm thanh tối đa: %1 kbps"
 Basic.Settings.Stream.Recommended.MaxResolution="Độ phân giải tối đa: %1"
@@ -748,7 +761,6 @@
 Basic.Settings.Output.Encoder.Video="Bộ mã hóa video"
 Basic.Settings.Output.Encoder.Audio="Bộ mã hóa âm thanh"
 Basic.Settings.Output.SelectDirectory="Chọn thư mục ghi hình"
-Basic.Settings.Output.SelectFile="Chọn tập tin ghi hình"
 Basic.Settings.Output.DynamicBitrate="Điều chỉnh tốc độ bit linh hoạt để quản lý tắc nghẽn mạng"
 Basic.Settings.Output.DynamicBitrate.Beta="Điều chỉnh tốc độ bit linh hoạt để quản lý tắc nghẽn mạng (Bản Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="Thay vì hạ khung hình để giảm tắc nghẽn mạng, có thể ngay lập tức điều chỉnh tốc độ bit linh hoạt.\n\nChú ý điều này có thể dẫn đến tăng độ trễ với người xem nếu xuất hiện một lượng tắc nghẽn lớn.\nNếu sụt tốc độ bit có thể mất một vài phút để khôi phục.\n\nHiện tại chỉ hỗ trợ RTMP."
@@ -768,17 +780,17 @@
 Basic.Settings.Output.Simple.SavePath="Đường dẫn ghi hình"
 Basic.Settings.Output.Simple.RecordingQuality="Chất lượng ghi hình"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Giống như luồng"
-Basic.Settings.Output.Simple.RecordingQuality.Small="Chất lượng cao, Kích thước tệp trung bình"
-Basic.Settings.Output.Simple.RecordingQuality.HQ="Chất lượng không phân biệt được, kích thước tệp lớn"
-Basic.Settings.Output.Simple.RecordingQuality.Lossless="Chất lượng không hao tổn, kích thước tệp lớn khủng khiếp"
-Basic.Settings.Output.Simple.Warn.VideoBitrate="Cảnh báo: Tốc độ bit video phát luồng sẽ được đặt thành %1, đây là giới hạn trên cho dịch vụ phát luồng hiện tại."
-Basic.Settings.Output.Simple.Warn.AudioBitrate="Cảnh báo: Tốc độ bit âm thanh phát luồng sẽ được đặt thành %1, đây là giới hạn trên cho dịch vụ phát luồng hiện tại."
+Basic.Settings.Output.Simple.RecordingQuality.Small="Chất lượng cao, kích thước tệp trung bình"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Chất lượng gốc, kích thước tệp lớn"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Chất lượng bất tổn, kích thước tệp không lồ"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Cảnh báo: Tốc độ bit luồng phát hình sẽ được đặt thành %1 vì đây là giới hạn tối đa của dịch vụ phát trực tiếp hiện tại."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Cảnh báo: Tốc độ bit luồng phát âm thanh sẽ được đặt thành %1 vì đây là giới hạn tối đa của dịch vụ phát trực tiếp hiện tại."
 Basic.Settings.Output.Simple.Warn.CannotPause="Cảnh báo: Việc ghi hình không thể được dừng lại nếu chất lượng ghi hình được đặt là \"Giống như luồng\"."
-Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Cảnh báo: Định dạng ghi hiện được chọn không tương thích với (các) bộ mã hóa stream đã chọn."
+Basic.Settings.Output.Simple.Warn.IncompatibleContainer="Cảnh báo: Định dạng ghi hiện được chọn không tương thích với (các) bộ biên mã đã chọn."
 Basic.Settings.Output.Simple.Warn.Encoder="Chú ý: Ghi hình với một bộ biên mã phần mềm ở một chất lượng khác so với luồng sẽ yêu cầu sử dụng thêm CPU nếu bạn phát luồng và ghi hình cùng một lúc."
-Basic.Settings.Output.Simple.Warn.Lossless="Cảnh báo: Chất lượng không tổn hao tạo ra kích thước tập tin rất lớn! Chất lượng không tổn hao có thể sử dụng trên 7 GB không gian đĩa cho một phút ở độ phân giải và tốc độ khung hình cao. Không tổn hao không nên được dùng cho bản ghi hình dài trừ khi bạn có rất nhiều không gian đĩa sẵn dùng."
+Basic.Settings.Output.Simple.Warn.Lossless="Cảnh báo: Chất lượng bất tổn đã tạo ra kích thước tập tin lớn hơn dự định. Chất lượng bất tổn có thể sử dụng trên 7 GB không gian đĩa trong một phút ở độ phân giải/ tốc độ khung hình cao. Bất tổn không nên được dùng cho bản ghi hình dài ngoại trừ trường hợp bạn có nhiều không gian ổ sẵn dùng. Bộ đệm phát lại không khả dụng khi sử dụng chất lượng lossless."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Có chắc là bạn muốn sử dụng chất lượng cao không?"
-Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless chất lượng cảnh báo!"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Cảnh báo chất lượng bất tổn"
 Basic.Settings.Output.Simple.Encoder.Software="Phần mềm (x 264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Phần cứng (QSV, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Phần cứng (QSV, AV1)"
@@ -790,7 +802,7 @@
 Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Phần cứng (NVENC, HEVC)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Phần cứng (Apple, H.264)"
 Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Phần cứng (Apple, HEVC)"
-Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Phần mềm (x264 sử dụng CPU thấp, tăng kích thước tệp)"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Phần mềm (x264 với lượng sử dụng CPU thấp, làm tăng kích thước tệp)"
 Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (mặc định)"
 Basic.Settings.Output.Simple.TwitchVodTrack="Rãnh âm Twitch VOD (Sử dụng rãnh âm 2)"
 Basic.Settings.Output.Simple.RecAudioTrack="Rãnh âm thanh"
@@ -810,7 +822,7 @@
 Basic.Settings.Output.EncoderPreset.ultrafast="%1 (mức sử dụng CPU thấp, được chất lượng kém)"
 Basic.Settings.Output.EncoderPreset.veryfast="%1 (mức sử dụng CPU trung bình, được chất lượng đạt chuẩn)"
 Basic.Settings.Output.EncoderPreset.fast="%1 (mức sử dụng CPU cao, chất lượng cao)"
-Basic.Settings.Output.CustomEncoderSettings="Thiết đặt tùy chỉnh biên mã"
+Basic.Settings.Output.CustomEncoderSettings="Tùy chỉnh bộ biên mã"
 Basic.Settings.Output.CustomMuxerSettings="Thiết đặt tùy chỉnh Muxer"
 Basic.Settings.Output.NoSpaceFileName="Tạo ra tên tập tin mà không cần Space"
 Basic.Settings.Output.Adv.Rescale="Rescale đầu ra"
@@ -851,21 +863,21 @@
 Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Thiết đặt bộ biên mã video (nếu có)"
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Bộ biên mã âm thanh"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Thiết đặt bộ biên mã âm thanh (nếu có)"
-Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Thiết đặt muxer (nếu có)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Thiết đặt bộ ghép (nếu có)"
 Basic.Settings.Output.Adv.FFmpeg.GOPSize="Thời gian đặt Keyframe (giây)"
 Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Hiển thị tất cả các bộ biên giải mã (ngay cả khi không tương thích)"
 Basic.Settings.Output.Adv.FFmpeg.Settings="Cài Đặt FFmpeg"
 Basic.Settings.Output.EnableSplitFile="Tự động phân tách tệp đầu ra"
 Basic.Settings.Output.SplitFile.TypeTime="Phân tách theo giờ"
-Basic.Settings.Output.SplitFile.TypeSize="Phân tách theo kích cỡ"
+Basic.Settings.Output.SplitFile.TypeSize="Phân chia theo kích cỡ"
 Basic.Settings.Output.SplitFile.TypeManual="Chỉ tách thủ công"
 Basic.Settings.Output.SplitFile.Time="Phân chia giờ"
-Basic.Settings.Output.SplitFile.Size="Phân chia kích cỡ"
+Basic.Settings.Output.SplitFile.Size="Phân tách từ kích cỡ"
 Screenshot="Đầu ra chụp màn hình"
 Screenshot.SourceHotkey="Chụp màn hình Nguồn được chọn"
 Screenshot.StudioProgram="Chụp màn hình (Chương trình)"
 Screenshot.Preview="Chụp màn hình (Xem trước)"
-Screenshot.Scene="Chụp màn hình (Cảnh)"
+Screenshot.Scene="Chụp màn hình (phân cảnh)"
 Screenshot.Source="Chụp màn hình (Nguồn)"
 FilenameFormatting.TT.CCYY="Năm, bốn chữ số"
 FilenameFormatting.TT.YY="Năm, hai số cuối (00-99)"
@@ -922,8 +934,8 @@
 Basic.Settings.Audio.PeakMeterType="Loại công cụ đo cực đại"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="Âm thu cực đại"
 Basic.Settings.Audio.PeakMeterType.TruePeak="Âm thực cực đại (Sử dụng nhiều CPU hơn)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="LƯU Ý: Âm thanh vòm đã được kích hoạt."
-Basic.Settings.Audio.MultichannelWarning="Khi truyền phát, hãy kiểm tra xem dịch vụ truyền phát của bạn có hỗ trợ cả âm thanh vòm tích hợp và phát lại. Facebook 360 Live là một ví dụ hỗ trợ hoàn toàn âm thanh vòm. Tuy Facebook Live và Youtube Live đều cho phép âm thanh vòm tích hợp, Facebook Live dùng bộ trộn downmix để phát âm thanh, còn Youtube Live lại xuất ra hai kênh.\n\nHệ thống lọc âm của OBS tương thích với âm thanh vòm tuy plugin bổ trợ chưa chắc được hỗ trợ."
+Basic.Settings.Audio.MultichannelWarning.Enabled="LƯU Ý: Âm thanh vòm đã được kích hoạt."
+Basic.Settings.Audio.MultichannelWarning="Nếu phát trực tuyến, hãy kiểm tra xem dịch vụ phát trực tuyến của bạn có hỗ trợ cả nhập âm thanh vòm và phát lại âm thanh vòm hay không. Chẳng hạn, Facebook 360 Live hỗ trợ đầy đủ âm thanh vòm; Trực tiếp trên YouTube hỗ trợ nhập âm thanh 5.1 (và phát lại trên TV).\n\nBộ lọc âm thanh của OBS tương thích với âm thanh vòm, mặc dù hỗ trợ plugin VST không được đảm bảo."
 Basic.Settings.Audio.MultichannelWarning.Title="Kích hoạt âm thanh vòm?"
 Basic.Settings.Audio.MultichannelWarning.Confirm="Có chắc là muốn kích hoạt âm thanh vòm không?"
 Basic.Settings.Audio.Devices="Thiết bị âm thanh chung"
@@ -933,14 +945,14 @@
 Basic.Settings.Audio.AuxDevice2="Âm thanh mic/phụ 2"
 Basic.Settings.Audio.AuxDevice3="Âm thanh mic/phụ 3"
 Basic.Settings.Audio.AuxDevice4="Âm thanh mic/phụ 4"
-Basic.Settings.Audio.EnablePushToMute="Bật bấm để tắt tiếng"
-Basic.Settings.Audio.PushToMuteDelay="Bấm để tắt tiếng trễ"
-Basic.Settings.Audio.EnablePushToTalk="Bật bắm để nói"
-Basic.Settings.Audio.PushToTalkDelay="Bấm để nói trễ"
+Basic.Settings.Audio.EnablePushToMute="Bật bấm-để-tắt-tiếng"
+Basic.Settings.Audio.PushToMuteDelay="Độ trễ của bấm-để-tắt-tiếng"
+Basic.Settings.Audio.EnablePushToTalk="Bật bấm-để-nói"
+Basic.Settings.Audio.PushToTalkDelay="Độ trễ của bấm-để-nói"
 Basic.Settings.Audio.UnknownAudioDevice="Thiết bị không được kết nối hoặc không sẵn dùng"
 Basic.Settings.Audio.Disabled="Đã vô hiệu"
 Basic.Settings.Audio.LowLatencyBufferingMode="Chế độ đệm âm thanh có độ trễ thấp (Đối với đầu ra Decklink/NDI)"
-Basic.Settings.Audio.LowLatencyBufferingWarning.Enabled="CẢNH BÁO: OBS đã bật bộ đệm âm thanh có độ trễ thấp."
+Basic.Settings.Audio.LowLatencyBufferingWarning.Enabled="CẢNH BÁO: OBS đã bật bộ đệm âm thanh với độ trễ thấp."
 Basic.Settings.Audio.LowLatencyBufferingWarning="Chế độ đệm âm thanh có độ trễ thấp có thể khiến âm thanh bị trục trặc hoặc ngừng phát một số nguồn."
 Basic.Settings.Audio.LowLatencyBufferingWarning.Title="Bật chế độ đệm âm thanh có độ trễ thấp"
 Basic.Settings.Audio.LowLatencyBufferingWarning.Confirm="Có chắc là bạn muốn bật chế độ đệm âm thanh có độ trễ thấp?"
@@ -967,10 +979,9 @@
 Basic.Settings.Advanced.General.ProcessPriority.Normal="Thường"
 Basic.Settings.Advanced.General.ProcessPriority.BelowNormal="Dưới trung bình"
 Basic.Settings.Advanced.General.ProcessPriority.Idle="Rảnh"
-Basic.Settings.Advanced.FormatWarning="Cảnh báo: Các định dạng màu khác với NV12/P010 chủ yếu dành để ghi và không được khuyến nghị sử dụng trong quá trình phát trực tuyến, vì điều này có thể làm tăng mức sử dụng CPU do chuyển đổi định dạng màu."
+Basic.Settings.Advanced.FormatWarning="Cảnh báo: Các định dạng màu ngoài NV12/P010 chủ yếu dành để ghi hình và không được khuyến nghị sử dụng trong quá trình phát trực tuyến, vì điều này có thể làm tăng mức sử dụng CPU do chuyển đổi định dạng màu."
 Basic.Settings.Advanced.FormatWarningPreciseSdr="Cảnh báo: Định dạng cao chính xác thường được sử dụng với không gian màu HDR."
-Basic.Settings.Advanced.FormatWarning2100="Cảnh báo: Rec. 2100 nên sử dụng định dạng có độ chính xác cao hơn."
-Basic.Settings.Advanced.Audio.BufferingTime="Âm thanh thời gian đệm"
+Basic.Settings.Advanced.FormatWarning2100="Cảnh báo: BT.2020 nên sử dụng định dạng có độ chính xác cao hơn."
 Basic.Settings.Advanced.Video.ColorFormat="Định dạng màu sắc"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8-bit, 4:2:0, 2 mặt)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8-bit, 4:2:0, 3 mặt)"
@@ -988,13 +999,14 @@
 Basic.Settings.Advanced.Audio.MonitoringDevice="Thiết bị theo dõi"
 Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Mặc định"
 Basic.Settings.Advanced.Audio.DisableAudioDucking="Tắt chỉnh âm của Windows"
-Basic.Settings.Advanced.StreamDelay="Stream trễ"
+Basic.Settings.Advanced.StreamDelay="Độ trễ luồng phát"
 Basic.Settings.Advanced.StreamDelay.Duration="Độ dài"
-Basic.Settings.Advanced.StreamDelay.Preserve="Giữ điểm cắt (tăng chậm trễ) khi kết nối lại"
+Basic.Settings.Advanced.StreamDelay.Preserve="Giữ điểm cắt (làm tăng độ trễ) khi tái kết nối"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Ước tính bộ nhớ sử dụng: %1 MB"
 Basic.Settings.Advanced.Network="Mạng"
 Basic.Settings.Advanced.Network.Disabled="Giao thức phát trực tuyến hiện tại không hỗ trợ các thay đổi về cài đặt mạng."
 Basic.Settings.Advanced.Network.BindToIP="Liên kết với IP"
+Basic.Settings.Advanced.Network.IPFamily="Dòng IP"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="Bật tối ưu hóa mạng"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="Bật TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="Cố gắng để đầu ra của RTMP thân thiện hơn với các ứng dụng có độ trễ nhạy khác bằng cách điều tuyến tốc độ băng thông.\nĐiều này có thể gia tăng nguy cơ sụt khung hình trên đường truyền không ổn định."
@@ -1027,7 +1039,7 @@
 Basic.Settings.Hotkeys.FilterByHotkey="Lọc theo phím nóng"
 Basic.Settings.Hotkeys.DuplicateWarning="Phím này được dùng chung với một hoặc nhiều tác vụ khác, nháy chuột để hiện các tác vụ trùng hợp"
 Basic.Settings.Hotkeys.PleaseWait="Đang tải phím nóng, vui lòng đợi..."
-Basic.Hotkeys.SelectScene="Chuyển cảnh"
+Basic.Hotkeys.SelectScene="Chuyển sang phân cảnh"
 Basic.SystemTray.Show="Hiện"
 Basic.SystemTray.Hide="Ẩn"
 Basic.SystemTray.Message.Reconnecting="Đã ngắt kết nối. Đang kết nối lại..."
@@ -1068,6 +1080,8 @@
 SceneItemShow="Hiển thị '%1'"
 SceneItemHide="Ẩn '%1'"
 OutputWarnings.NoTracksSelected="Bạn phải chọn ít nhất một rãnh âm"
+OutputWarnings.NoTracksSelectedOnExit.Title="Lỗi cài đặt đầu ra"
+OutputWarnings.NoTracksSelectedOnExit.Text="Tất cả đầu ra phải có ít nhất một track âm thanh được chọn."
 OutputWarnings.MP4Recording="Chú ý: các bản ghi hình được lưu ở dạng MP4/MOV sẽ không thể phục hồi nếu các tập tin không thể hoàn thiện (ví dụ: như bị màn hình xanh, mất điện, v.v.). Nếu bạn muốn ghi nhiều rãnh âm thanh thì nên xem xét sử dụng MKV và ghép lại bản ghi sang MP4/MOV sau khi hoàn thành (Tập tin → Ghép lại bản ghi)"
 OutputWarnings.CannotPause="Chú ý: Ghi hình không thể được dừng lại nếu bộ biên mã ghi hình được đặt là \"(Sử dụng bộ biên mã luồng)\""
 OutputWarnings.CodecIncompatible="Lựa chọn bộ mã hóa âm thanh hoặc video đã được đặt lại do không tương thích. Vui lòng chọn một bộ mã hóa tương thích từ danh sách."
@@ -1078,8 +1092,8 @@
 CodecCompat.CodecMissingOnExit.Text="Ít nhất một video encoder hoặc âm thanh chưa được đặt. Vui lòng đảm bảo chọn encoder cho cả ghi và phát trực tuyến."
 CodecCompat.ContainerMissingOnExit.Title="Không có định dạng được chọn"
 CodecCompat.ContainerMissingOnExit.Text="Không có định dạng ghi nào được chọn. Vui lòng chọn định dạng ghi tương thích với stream encoder đã chọn."
-FinalScene.Title="Xóa cảnh"
-FinalScene.Text="Cần có ít nhất một cảnh."
+FinalScene.Title="Xóa phân cảnh"
+FinalScene.Text="Cần có ít nhất một phân cảnh."
 NoSources.Title="Không có nguồn"
 NoSources.Text="Có vẻ như bạn chưa thêm nguồn ghi hình nào rồi, đầu ra giờ chỉ là màn hình đen. Có chắc là bạn muốn tiếp tục không?"
 NoSources.Text.AddSource="Bạn có thể thêm nguồn bằng cách nhấn vào biểu tượng + dưới ô Nguồn trong của sổ chính bất cứ lúc nào."
@@ -1093,34 +1107,33 @@
 About.GetInvolved="Tham gia"
 About.Authors="Các tác giả"
 About.License="Giấy phép"
+About.Error="Lỗi! Không thể đọc tệp.\n\nĐi tới: %1"
 About.Contribute="Hỗ trợ dự án OBS"
 AddUrl.Title="Thêm nguồn bằng URL"
 AddUrl.Text="Bạn đã thả một URL vào OBS. Điều này sẽ tự động thêm liên kết như là một nguồn. Tiếp tục chứ?"
 ResizeOutputSizeOfSource="Thay đổi kích thước đầu ra (kích thước nguồn)"
 ResizeOutputSizeOfSource.Text="Độ phân giải cơ sở và độ phân giải đầu ra sẽ được thay dổi kích thước tùy theo kích thước của nguồn hiện tại."
 ResizeOutputSizeOfSource.Continue="Có chắc là bạn muốn tiếp tục không?"
-PreviewTransition="Xem trước chuyển cảnh"
+PreviewTransition="Xem trước cảnh chuyển"
 Importer="Bộ nhập bộ sưu tập cảnh"
 Importer.SelectCollection="Chọn một bộ sưu tập cảnh"
-Importer.Collection="Bộ &sưu tập cảnh"
+Importer.Collection="Bộ sưu tập cảnh"
 Importer.HelpText="Thêm tệp vào cửa sổ này để nhập bộ sưu tập từ OBS hoặc các chương trình được hỗ trợ khác."
 Importer.Path="Đường dẫn cho bộ sưu tập"
 Importer.Program="Ứng dụng đã phát hiện"
-Importer.AutomaticCollectionPrompt="Tự động tìm kiếm các bộ sưu tập cảnh"
-Importer.AutomaticCollectionText="OBS có thể tự động tìm các bộ sưu tập cảnh có thể nhập được từ các chương trình bên thứ ba được hỗ trợ. Bạn có muốn OBS tự động tìm các bộ sưu tập cho bạn không?\n\nBạn có thể chỉnh lại sau này ở mục Thiết đặt > Chung > Bộ nhập."
+Importer.AutomaticCollectionPrompt="Tự động tìm kiếm bộ sưu tập cảnh"
+Importer.AutomaticCollectionText="OBS có thể tự động tìm bộ sưu tập cảnh từ các chương trình bên thứ ba đã được hỗ trợ. Bạn có muốn OBS tự động tìm các bộ sưu tập cho bạn không?\n\nBạn có thể chỉnh lại sau trong mục Thiết đặt > Chung > Bộ nhập."
 Restart="Khởi động lại"
 NeedsRestart="OBS Studio cần phải được khởi động lại. Bạn có muốn khởi động lại luôn không?"
 LoadProfileNeedsRestart="Cấu hình có các cài đặt yêu cầu khởi động lại OBS:\n%1\n\nBạn có muốn khởi động lại OBS để các cài đặt này có hiệu lực không?"
 ContextBar.NoSelectedSource="Chưa chọn nguồn nào"
 ContextBar.ResetTransform="Đặt lại chuyển đổi"
-ContextBar.FitToCanvas="Vừa khung hình"
 ContextBar.MediaControls.PlayMedia="Chơi phương tiện"
 ContextBar.MediaControls.PauseMedia="Tạm dừng phương tiện"
 ContextBar.MediaControls.StopMedia="Dừng phương tiện"
 ContextBar.MediaControls.RestartMedia="Khởi động lại phương tiện"
 ContextBar.MediaControls.PlaylistNext="Tiếp trong danh sách"
 ContextBar.MediaControls.PlaylistPrevious="Trước trong danh sách"
-ContextBar.MediaControls.MediaProperties="Cấu hình phương tiện"
 ContextBar.MediaControls.BlindSeek="Công cụ tìm phương tiện"
 YouTube.Auth.Ok="Đã uỷ quyền thành công.\nBạn có thể đóng trang này lại rồi."
 YouTube.Auth.NoCode="Quá trình uỷ quyền đã không được hoàn tất."
@@ -1156,16 +1169,16 @@
 YouTube.Actions.AutoStartStop.TT="Chỉ rõ nếu muốn lịch phát sóng tự động bắt đầu"
 YouTube.Actions.EnableDVR="Bật DVR"
 YouTube.Actions.360Video="video 360"
-YouTube.Actions.ScheduleForLater="Lên lịch cho sau này"
+YouTube.Actions.ScheduleForLater="Thiết đặt \"ghi hình sau\""
 YouTube.Actions.RememberSettings="Ghi nhớ các thiết đặt này"
 YouTube.Actions.Create_Ready="Tạo phát sóng"
 YouTube.Actions.Create_GoLive="Tạo phát sóng và bắt đầu phát luồng"
-YouTube.Actions.Choose_Ready="Chọn phát sóng"
-YouTube.Actions.Choose_GoLive="Chọn phát sóng và bắt đầu phát luồng"
+YouTube.Actions.Choose_Ready="Chọn kênh phát sóng"
+YouTube.Actions.Choose_GoLive="Chọn kênh phát sóng và bắt đầu phát trực tiếp"
 YouTube.Actions.Create_Schedule="Lên lịch phát sóng"
 YouTube.Actions.Create_Schedule_Ready="Lên lịch và chọn phát sóng"
 YouTube.Actions.Dashboard="Mở YouTube Studio"
-YouTube.Actions.Error.Title="Lỗi tạo phát sóng trực tiếp"
+YouTube.Actions.Error.Title="Lỗi tạo kênh phát trực tiếp"
 YouTube.Actions.Error.Text="Lỗi truy cập YouTube '%1'. Một lời mô tả lỗi chi tiết hơn có thể được tìm thấy tại <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.General="Lỗi truy cập YouTube. Hãy kiểm tra kết nối mạng của bạn hoặc truy cập máy chủ YouTube của bạn."
 YouTube.Actions.Error.NoBroadcastCreated="Lỗi tạo lập phát sóng '%1'. Một lời mô tả lỗi chi tiết hơn có thể được tìm thấy tại <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
@@ -1178,27 +1191,29 @@
 YouTube.Actions.Error.BroadcastTransitionFailed="Chuyển tiếp ghi hình thất bại: %1 Nếu lỗi này tiếp tục <a href='https://studio.youtube.com/video/%2/livestreaming'> mở ghi hình trong YouTube Studio</a> và thử lại"
 YouTube.Actions.Error.BroadcastTestStarting="Ghi hình đang chuyển sang giai đoạn kiểm tra. Xin thử lại trong 10-30 giây"
 YouTube.Actions.EventsLoading="Đang tải danh sách sự kiện..."
-YouTube.Actions.EventCreated.Title="Sự kiện được tạo"
+YouTube.Actions.EventCreated.Title="Sự kiện đã được tạo"
 YouTube.Actions.EventCreated.Text="Sự kiện đã được tạo thành công."
-YouTube.Actions.Stream="Luồng"
+YouTube.Actions.Stream="Luồng phát"
 YouTube.Actions.Stream.ScheduledFor="Đã được lên lịch vào %1"
-YouTube.Actions.Stream.Resume="Tiếp tục luồng bị gián đoạn"
-YouTube.Actions.Stream.YTStudio="Do YouTube Studio tự động tạo ra"
-YouTube.Actions.Notify.CreatingBroadcast="Đang tạo một Phát sóng trực tiếp, xin chờ..."
-YouTube.Actions.AutoStartStreamingWarning.Title="Khởi động thủ công là bắt buộc"
-YouTube.Actions.AutoStartStreamingWarning="Tự bắt đầu đã bị vô hiệu hoá cho sự kiện này, nháy vào \"Bắt đầu\" để bắt đầu phát sóng."
+YouTube.Actions.Stream.Resume="Tiếp tục luồng phát đang bị gián đoạn"
+YouTube.Actions.Stream.YTStudio="Do YouTube Studio tự động tạo"
+YouTube.Actions.Notify.CreatingBroadcast="Đang tạo kênh phát sóng trực tiếp, vui lòng chờ..."
+YouTube.Actions.AutoStartStreamingWarning.Title="Bắt buộc khởi động thủ công"
+YouTube.Actions.AutoStartStreamingWarning="Tự bắt đầu đã bị vô hiệu hoá cho sự kiện này, vui lòng nhấn vào \"Bắt đầu\" để bắt đầu phát sóng."
 YouTube.Actions.AutoStopStreamingWarning="Bạn sẽ không thể kết nối lại. Luồng của bạn sẽ dừng lại và bạn sẽ không còn trực tiếp nữa."
 YouTube.Chat.Input.Send="Gửi"
 YouTube.Chat.Input.Placeholder="Nhập tin nhắn tại đây..."
 YouTube.Chat.Input.Sending="Đang gửi..."
-YouTube.Chat.Error.Title="Không thể gửi tin nhắn (do lỗi gây ra)"
-YouTube.Chat.Error.Text="Tin nhắn không thể gửi được: %1"
-YouTube.Errors.liveStreamingNotEnabled="Phát (luồng) trực tiếp chưa được kích hoạt trên kênh YouTube được chọn. Xem <a href='https://www.youtube.com/features'>youtube.com/features</a> để biết thêm thông tin."
-YouTube.Errors.livePermissionBlocked="Phát (luồng) trực tiếp hiện không có sẵn trên kênh YouTube được chọn. Xin lưu ý rằng có thể cần đến 24 tiếng đồng hồ để có thể phát trực tiếp sau khi kích hoạt nó trong phần thiết đặt kênh của bạn. Xem <a href='https://www.youtube.com/features'>youtube.com/features</a> để biết thêm chi tiết."
-YouTube.Errors.errorExecutingTransition="Chuyển tiếp thất bại do lỗi backend. Xin thử lại trong vài giây"
-YouTube.Errors.errorStreamInactive="YouTube đang không nhận dữ liệu từ luồng của bạn. Xin hãy kiểm tra cấu hình của bạn và thử lại."
-YouTube.Errors.invalidTransition="Chuyển tiếp vừa rồi không hợp lệ. Việc này có thể do stream chưa xong ở lần chuyển tiếp trước. Xin chờ vài giây và thử lại"
+YouTube.Chat.Error.Title="Lỗi gửi tin nhắn"
+YouTube.Chat.Error.Text="Tin nhắn không gửi được: %1"
+YouTube.Errors.liveStreamingNotEnabled="Phát trực tiếp chưa được kích hoạt trên kênh YouTube được chọn. Xem <a href='https://www.youtube.com/features'>youtube.com/features</a> để biết thêm thông tin."
+YouTube.Errors.livePermissionBlocked="Phát trực tiếp hiện không có sẵn trên kênh YouTube được chọn. Xin lưu ý rằng có thể cần đến 24 tiếng đồng hồ để có thể phát trực tiếp sau khi kích hoạt nó trong phần thiết đặt kênh của bạn. Xem <a href='https://www.youtube.com/features'>youtube.com/features</a> để biết thêm chi tiết."
+YouTube.Errors.errorExecutingTransition="Chuyển cảnh thất bại do lỗi máy chủ. Xin thử lại trong vài giây"
+YouTube.Errors.errorStreamInactive="YouTube hiện không nhận dữ liệu từ luồng của bạn. Xin vui lòng kiểm tra cấu hình và thử lại."
+YouTube.Errors.invalidTransition="Chuyển cảnh vừa rồi không hợp lệ. Việc này có thể do luồng chưa hoàn phát chuyển cảnh trước đó. Xin chờ vài giây và thử lại."
 YouTube.Errors.liveChatDisabled="Trò chuyện trực tiếp đã bị tắt"
 YouTube.Errors.liveChatEnded="Buổi phát trực tiếp đã kết thúc"
 YouTube.Errors.messageTextInvalid="Tin nhắn không hợp lệ"
 YouTube.Errors.rateLimitExceeded="Bạn gửi tin nhắn quá nhanh!"
+YouTube.DocksRemoval.Title="Xóa định cố trình duyệt YouTube cũ"
+YouTube.DocksRemoval.Text="Định cố trình duyệt này sẽ bị xóa vì hiện đã bất cập:\n\n%1\nThay vào đó, hãy sử dụng \"định cố/ điều khiển luồng phát YouTube\"."

obs-studio-29.1.3.tar.xz/UI/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/zh-CN.ini Changed

@@ -48,9 +48,9 @@
 DisableOSXVSync="禁用 macOS V-Sync"
 ResetOSXVSyncOnExit="退出时重置 macOS V-Sync"
 HighResourceUsage="编码过载！请考虑降低视频质量设置或使用更快的编码预设。"
-Transition="过渡动画"
-QuickTransitions="快速过渡动画"
-FadeToBlack="淡出为黑色"
+Transition="转场动画"
+QuickTransitions="快速转场动画"
+FadeToBlack="淡出到黑色"
 Left="左"
 Right="右"
 Top="上"
@@ -73,9 +73,9 @@
 Defaults="默认"
 RestoreDefaults="默认值"
 HideMixer="在混音器中隐藏"
-TransitionOverride="覆盖默认转场特效"
-ShowTransition="显示转场特效"
-HideTransition="隐藏转场特效"
+TransitionOverride="覆盖转场动画"
+ShowTransition="显示转场动画"
+HideTransition="隐藏转场动画"
 None="无"
 StudioMode.Preview="预览"
 StudioMode.Program="输出"
@@ -95,7 +95,6 @@
 LogViewer="日志查看器"
 ShowOnStartup="启动时显示"
 OpenFile="打开文件"
-AddValue="添加 %1"
 AddSource="添加源"
 RemoveScene="删除所选场景"
 RemoveSource="删除所选来源"
@@ -107,26 +106,34 @@
 SourceFilters="打开源滤镜"
 MixerToolbarMenu="混音器菜单"
 SceneFilters="打开场景滤镜"
+List="列表"
+Grid="网格"
 PluginsFailedToLoad.Title="插件载入出错"
 PluginsFailedToLoad.Text="以下 OBS 插件加载失败：\n\n%1\n请更新或移除这些插件。"
 AlreadyRunning.Title="OBS 已在运行"
 AlreadyRunning.Text="OBS 已经在运行中！若你真的想要这样做，请在启动新的 OBS 前关闭其他正在在运行中的 OBS。如果你把 OBS 设置成最小化到系统托盘，请检查它是否仍在运行。"
 AlreadyRunning.LaunchAnyway="仍然启动"
+AutoSafeMode.Title="安全模式"
+AutoSafeMode.Text="OBS 在您的上次会话期间未正常退出。\n\n您要以安全模式启动（禁用第三方插件、脚本和 WebSocket）吗？"
+AutoSafeMode.LaunchSafe="以安全模式运行"
+AutoSafeMode.LaunchNormal="正常运行"
+SafeMode.Restart="您要以安全模式重启 OBS（禁用第三方插件、脚本和 WebSocket）吗？"
+SafeMode.RestartNormal="您要以正常模式重启 OBS 吗？"
 ChromeOS.Title="不支持的平台"
 ChromeOS.Text="OBS 似乎在 ChromeOS 容器内运行。此平台不受支持."
 Wine.Title="检测到 Wine"
 Wine.Text="不支持在 Wine 上运行OBS，许多功能如采集或设备源将无法使用或受到限制。 建议运行原生版本的 OBS 例如 <a href='https://flathub.org/apps/details/com.obsproject.Studio'>我们的 Flatpak 版本</a> 或者您的操作系统自带的软件源里的包。"
-DockCloseWarning.Title="关闭可停靠窗口"
-DockCloseWarning.Text="您刚刚关闭了一个可停靠窗口。如果您想再次显示它，请使用菜单栏上的停靠窗口菜单。"
+DockCloseWarning.Title="关闭停靠窗口"
+DockCloseWarning.Text="您刚刚关闭了一个停靠窗口。如果您想再次显示它，请使用菜单栏上的停靠窗口菜单。"
 ExtraBrowsers="自定义浏览器停靠窗口"
-ExtraBrowsers.Info="通过指定名称和 URL 来添加停靠窗口，然后选择“应用”或“关闭”来打开这些停靠窗口。你可以在任何时刻添加或删除这些停靠窗口。"
+ExtraBrowsers.Info="通过指定名称和网址来添加停靠窗口，然后选择“应用”或“关闭”来打开这些停靠窗口。你可以在任何时刻添加或删除这些停靠窗口。"
 ExtraBrowsers.DockName="停靠窗口名称"
-Auth.Authing.Title="正在验证…"
-Auth.Authing.Text="正在与 %1 进行身份验证，请稍候…"
-Auth.AuthFailure.Title="身份验证失败"
-Auth.AuthFailure.Text="无法与 %1 进行身份验证：\n\n%2: %3"
-Auth.InvalidScope.Title="需要身份验证"
-Auth.InvalidScope.Text="%1 的身份验证要求已更改。某些功能可能不可用。"
+Auth.Authing.Title="正在认证…"
+Auth.Authing.Text="正在与 %1 进行身份认证，请稍候…"
+Auth.AuthFailure.Title="身份认证失败"
+Auth.AuthFailure.Text="无法与 %1 进行身份认证：\n\n%2: %3"
+Auth.InvalidScope.Title="需要身份认证"
+Auth.InvalidScope.Text="%1 的身份认证要求已更改。某些功能可能不可用。"
 Auth.LoadingChannel.Title="正在加载频道信息…"
 Auth.LoadingChannel.Text="正在加载 %1 的频道信息，请稍候…"
 Auth.LoadingChannel.Error="无法获取频道信息。"
@@ -135,15 +142,15 @@
 Auth.Chat="聊天"
 Auth.StreamInfo="直播信息"
 TwitchAuth.Stats="Twitch 统计"
-TwitchAuth.Feed="Twitch 活动订阅源"
+TwitchAuth.Feed="Twitch 活动源"
 TwitchAuth.TwoFactorFail.Title="无法查询推流码"
-TwitchAuth.TwoFactorFail.Text="OBS 无法连接到您的 Twitch 账户。请确保在 <a href='https://www.twitch.tv/settings/security'>Twitch 安全性设置</a>中开启了双重身份验证，只有开启后才能开始推流。"
+TwitchAuth.TwoFactorFail.Text="OBS 无法连接到您的 Twitch 账户。请确保在 <a href='https://www.twitch.tv/settings/security'>Twitch 安全性设置</a>中开启了双重身份认证，只有开启后才能开始推流。"
 RestreamAuth.Channels="Restream 频道"
 Copy.Filters="复制滤镜"
 Paste.Filters="粘贴滤镜"
 BrowserPanelInit.Title="正在初始化浏览器…"
 BrowserPanelInit.Text="正在初始化浏览器，请稍候…"
-BandwidthTest.Region="区域"
+BandwidthTest.Region="地区"
 BandwidthTest.Region.US="美国"
 BandwidthTest.Region.EU="欧洲"
 BandwidthTest.Region.Asia="亚洲"
@@ -152,23 +159,23 @@
 Basic.AutoConfig.ApplySettings="应用设置"
 Basic.AutoConfig.StartPage="使用场景"
 Basic.AutoConfig.StartPage.SubTitle="选择你的使用目的"
-Basic.AutoConfig.StartPage.PrioritizeStreaming="优先优化串流，其次为录像"
-Basic.AutoConfig.StartPage.PrioritizeRecording="仅优化录像，将不会进行串流"
+Basic.AutoConfig.StartPage.PrioritizeStreaming="优先优化直播，其次为录制"
+Basic.AutoConfig.StartPage.PrioritizeRecording="仅优化录制，将不会进行直播"
 Basic.AutoConfig.StartPage.PrioritizeVirtualCam="只使用虚拟摄像头"
 Basic.AutoConfig.VideoPage="视频设置"
 Basic.AutoConfig.VideoPage.SubTitle="指定您想要使用的视频设置"
-Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="使用当前的（%1x%2）"
+Basic.AutoConfig.VideoPage.BaseResolution.UseCurrent="使用当前值（%1x%2）"
 Basic.AutoConfig.VideoPage.BaseResolution.Display="显示器 %1 (%2x%3)"
 Basic.AutoConfig.VideoPage.FPS.UseCurrent="使用当前值 (%1)"
 Basic.AutoConfig.VideoPage.FPS.PreferHighFPS="60 或 30 均可，优先选择 60"
 Basic.AutoConfig.VideoPage.FPS.PreferHighRes="60 或 30 均可，优先高分辨率"
-Basic.AutoConfig.VideoPage.CanvasExplanation="注意：画布（基础）分辨率并不一定要与推流或录像的分辨率相同。实际推流或录像的分辨率可从画布分辨率缩小，以降低对资源的使用或对码率的需求。"
+Basic.AutoConfig.VideoPage.CanvasExplanation="注意：画布（基础）分辨率并不一定要与直播或录制的分辨率相同。实际直播或录制的分辨率可从画布分辨率缩小，以降低对资源的使用或对码率的需求。"
 Basic.AutoConfig.StreamPage="直播信息"
-Basic.AutoConfig.StreamPage.SubTitle="请输入你的串流信息"
-Basic.AutoConfig.StreamPage.ConnectAccount="连接帐户 (推荐)"
-Basic.AutoConfig.StreamPage.DisconnectAccount="解除帐户连接"
-Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="解除帐户连接？"
-Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="此更改将立即应用。您确定要解除帐户连接吗？"
+Basic.AutoConfig.StreamPage.SubTitle="请输入你的直播信息"
+Basic.AutoConfig.StreamPage.ConnectAccount="连接账户 (推荐)"
+Basic.AutoConfig.StreamPage.DisconnectAccount="解除账户连接"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Title="解除账户连接？"
+Basic.AutoConfig.StreamPage.DisconnectAccount.Confirm.Text="此更改将立即应用。您确定要解除账户连接吗？"
 Basic.AutoConfig.StreamPage.GetStreamKey="获取推流码"
 Basic.AutoConfig.StreamPage.MoreInfo="更多信息"
 Basic.AutoConfig.StreamPage.UseStreamKey="使用推流码"
@@ -179,9 +186,9 @@
 Basic.AutoConfig.StreamPage.Server="服务器"
 Basic.AutoConfig.StreamPage.StreamKey="推流码"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST: 输入加密密钥\nRTMP: 输入平台提供的密钥\nSRT: 输入 streamid，若平台未使用请忽略"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="(链接)"
 Basic.AutoConfig.StreamPage.EncoderKey="推流码"
-Basic.AutoConfig.StreamPage.ConnectedAccount="已连接的帐户"
+Basic.AutoConfig.StreamPage.BearerToken="Bearer 令牌"
+Basic.AutoConfig.StreamPage.ConnectedAccount="已连接的账户"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="通过带宽测试估计码率(可能需要几分钟)"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="优先选择硬件编码"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding.ToolTip="硬件编码可大量降低 CPU 的使用率，但要获得与软件编码相同的质量，可能需要更多的码率。"
@@ -196,11 +203,11 @@
 Basic.AutoConfig.TestPage.TestingBandwidth.ConnectFailed="无法连接任何服务器, 请检查你的网络连接并重试."
 Basic.AutoConfig.TestPage.TestingBandwidth.Server="测试带宽: %1"
 Basic.AutoConfig.TestPage.TestingStreamEncoder="测试串流编码器中，这可能需要一分钟的时间..."
-Basic.AutoConfig.TestPage.TestingRecordingEncoder="测试录像编码器中，这可能需要一分钟的时间..."
+Basic.AutoConfig.TestPage.TestingRecordingEncoder="测试录制编码器中，这可能需要一分钟的时间..."
 Basic.AutoConfig.TestPage.TestingRes.Fail="未能启动编码器"
 Basic.AutoConfig.TestPage.TestingRes.Resolution="正在测试 %1x%2 %3 FPS..."
 Basic.AutoConfig.TestPage.Result.StreamingEncoder="直播编码器"
-Basic.AutoConfig.TestPage.Result.RecordingEncoder="录像编码器"
+Basic.AutoConfig.TestPage.Result.RecordingEncoder="录制编码器"
 Basic.AutoConfig.TestPage.Result.Header="程序已确定这些估计设置是最适合你:"
 Basic.AutoConfig.TestPage.Result.Footer="要使用这些设置，单击“应用设置”。要重新配置向导并再试一次，单击“后退”。要自己手动配置设置，单击“取消”，然后打开设置。"
 Basic.AutoConfig.Info="自动配置向导将根据您的计算机配置和互联网速度来决定最佳设置。"
@@ -213,9 +220,9 @@
 Basic.Stats.SkippedFrames="由于编码延迟跳过的帧"
 Basic.Stats.MissedFrames="由于渲染延迟错过的帧"
 Basic.Stats.Output.Stream="直播"
-Basic.Stats.Output.Recording="录像"
+Basic.Stats.Output.Recording="录制"
 Basic.Stats.Status="状态"
-Basic.Stats.Status.Recording="录像中"
+Basic.Stats.Status.Recording="录制中"
 Basic.Stats.Status.Live="直播中"
 Basic.Stats.Status.Reconnecting="重新连接中"
 Basic.Stats.Status.Inactive="未激活"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="现在更新"
 Updater.RemindMeLater="稍后再提醒我"
 Updater.Skip="跳过版本"
-Updater.Running.Title="程序当前处于活跃状态"
-Updater.Running.Text="输出当前处于活动状态, 请关闭任何活动的输出, 然后尝试更新"
 Updater.NoUpdatesAvailable.Title="无可用更新"
 Updater.NoUpdatesAvailable.Text="当前没有可用更新"
 Updater.BranchNotFound.Title="更新通道已删除"
@@ -243,21 +248,21 @@
 Updater.RepairConfirm.Title="确认完整性检查"
 Updater.RepairConfirm.Text="完整性检查将扫描您的 OBS，找出损坏、更改的文件并重新下载。此操作可能需要一定时间。\n\n您是否希望继续？"
 Updater.FailedToLaunch="启动更新程序失败"
-Updater.GameCaptureActive.Title="游戏采集运行中"
-Updater.GameCaptureActive.Text="游戏采集钩子库正在使用中。请关闭所有正在采集的游戏和程序（或重新启动 Windows）然后重试。"
-QuickTransitions.SwapScenes="在过渡动画之后切换预览/输出场景"
-QuickTransitions.SwapScenesTT="在过渡动画后，将预览的场景换至输出，将输出的场景（如果未被删除）换回至预览。\n该功能无法用于撤销对原输出场景的更改。"
+QuickTransitions.SwapScenes="在转场动画之后切换预览/输出场景"
+QuickTransitions.SwapScenesTT="在转场动画后，将预览的场景换至输出，将输出的场景（如果未被删除）换回至预览。\n该功能无法用于撤销对原输出场景的更改。"
 QuickTransitions.DuplicateScene="复制场景"
 QuickTransitions.DuplicateSceneTT="编辑与当前输出同一场景时，可以修改源的变换和可见性而不影响输出。\n若要修改源的属性而不影响程序输出，应当使用“复制源”功能。\n切换此开关会重置当前的输出场景（如果场景未被删除）。"
 QuickTransitions.EditProperties="复制源"
 QuickTransitions.EditPropertiesTT="编辑与当前输出同一场景时，可以修改源的属性而不影响输出。\n只有开启了“复制场景”之后才能开启此功能。\n某些源（如采集或媒体源）并不支持此功能，且不能单独修改。\n切换此开关会重置当前的输出场景（如果场景未被删除）。\n\n警告：因为需要复制源，可能会占用额外的系统或视频资源。"
-QuickTransitions.HotkeyName="快速转场：%1"
-Basic.AddTransition="添加可配置的转场特效"
-Basic.RemoveTransition="删除可配置的转场特效"
-Basic.TransitionProperties="转场特效属性"
-Basic.SceneTransitions="转场特效"
+QuickTransitions.HotkeyName="快速转场动画：%1"
+Basic.AddTransition="添加可配置的转场动画"
+Basic.RemoveTransition="删除可配置的转场动画"
+Basic.TransitionProperties="转场动画属性"
+Basic.SceneTransitions="转场动画"
 Basic.TransitionDuration="时长"
 Basic.TogglePreviewProgramMode="工作室模式"
+Basic.EnablePreviewProgramMode="开启工作室模式"
+Basic.DisablePreviewProgramMode="关闭工作室模式"
 Undo.Undo="撤销"
 Undo.Redo="重做"
 Undo.Add="添加 '%1'"
@@ -292,8 +297,8 @@
 Undo.ForceMono.Off="'%1' 上禁用强制单声道"
 Undo.Properties="修改 \"%1\" 设置"
 Undo.Scene.Duplicate="复制场景 '%1'"
-Undo.ShowTransition="显示'%1'上的转场"
-Undo.HideTransition="隐藏'%1'上的转场"
+Undo.ShowTransition="显示'%1'上的转场动画"
+Undo.HideTransition="隐藏'%1'上的转场动画"
 Undo.ShowSceneItem="在 '%1' 中显示 '%2'"
 Undo.HideSceneItem="在 '%1' 中隐藏 '%2'"
 Undo.ReorderSources="在 '%1' 中重新排序来源"
@@ -304,45 +309,48 @@
 Undo.PasteSource="在 '%1' 中粘贴源"
 Undo.PasteSourceRef="在 '%1' 中粘贴源引用"
 Undo.GroupItems="分组项目至 '%1'"
-TransitionNameDlg.Text="请输入转场特效的名称"
-TransitionNameDlg.Title="转场特效名称"
+TransitionNameDlg.Text="请输入转场动画的名称"
+TransitionNameDlg.Title="转场动画名称"
+TitleBar.SafeMode="安全模式"
+TitleBar.PortableMode="便携模式"
 TitleBar.Profile="配置文件"
 TitleBar.Scenes="场景"
 NameExists.Title="名称已存在"
 NameExists.Text="该名称已被使用。"
 NoNameEntered.Title="请输入一个有效的名称"
 NoNameEntered.Text="您不能使用空白名称。"
-ConfirmStart.Title="开始串流？"
-ConfirmStart.Text="你确定你想要启动串流？"
-ConfirmStop.Title="停止串流？"
-ConfirmStop.Text="你确定你想要停止串流？"
+ConfirmStart.Title="开始直播？"
+ConfirmStart.Text="你确定你想要开启直播？"
+ConfirmStop.Title="停止直播？"
+ConfirmStop.Text="你确定你想要停止直播？"
 ConfirmStopRecord.Title="停止录制？"
 ConfirmStopRecord.Text="你确定要停止录制吗？"
 ConfirmBWTest.Title="开始带宽测试？"
-ConfirmBWTest.Text="您已经在带宽测试模式下配置了 OBS。此模式允许在不开启频道的情况下进行网络测试。完成测试后，您需要禁用它，以便观众能够看到您的流。\n\n是否继续？"
+ConfirmBWTest.Text="您已经在带宽测试模式下配置了 OBS。此模式允许在不开启频道的情况下进行网络测试。完成测试后，您需要禁用它，以便观众能够看到您的直播。\n\n是否继续？"
 ConfirmExit.Title="退出OBS?"
-ConfirmExit.Text="OBS 正在运行。将停止所有的推流和录像。确定要退出吗？"
+ConfirmExit.Text="OBS 正在运行。将停止所有的直播和录制。确定要退出吗？"
 ConfirmRemove.Title="确认删除"
 ConfirmRemove.Text="您确定要移除“%1”吗？"
 ConfirmRemove.TextMultiple="您确定要删除 %1 项目吗？"
 ConfirmReset.Title="重置设置"
 ConfirmReset.Text="确定要恢复默认设置吗？"
-Output.StartStreamFailed="启动串流失败"
+Output.StartStreamFailed="开启直播失败"
 Output.StartRecordingFailed="启动录像失败"
 Output.StartReplayFailed="启动回放缓存失败"
+Output.StartVirtualCamFailed="启动虚拟摄像头失败"
 Output.StartFailedGeneric="启动输出失败. 请检查日志来了解细节.\n\n注意: 如果你使用的是 NVENC 或 AMD 编码器, 请确保您的视频驱动程序是最新的."
 Output.ReplayBuffer.PauseWarning.Title="暂停时无法保存回放"
 Output.ReplayBuffer.PauseWarning.Text="警告：在录制暂停时无法保存回放。"
 Output.ConnectFail.Title="连接失败"
-Output.ConnectFail.BadPath="无效的路径或URL。请检查您的设置以确认它们是有效的。"
+Output.ConnectFail.BadPath="无效的路径或网址。请检查您的设置以确认它们是有效的。"
 Output.ConnectFail.ConnectFailed="无法连接到服务器"
 Output.ConnectFail.InvalidStream="无法访问指定的频道或推流码，请仔细检查你的推流码。如果推流码是正确的，那么有可能是与服务器的连接出现问题。"
 Output.ConnectFail.HdrDisabled="当前输出已禁用HDR。"
 Output.ConnectFail.Error="试图连接到服务器时出现意外的错误。详细信息记录在日志文件中。"
-Output.ConnectFail.Disconnected="已从服务器断开。"
+Output.ConnectFail.Disconnected="已与服务器断开连接。"
 Output.StreamEncodeError.Title="编码错误"
-Output.StreamEncodeError.Msg="推流时发生了编码器错误。"
-Output.StreamEncodeError.Msg.LastError="串流时发生编码器错误：\n\n%1"
+Output.StreamEncodeError.Msg="直播时发生了编码器错误。"
+Output.StreamEncodeError.Msg.LastError="直播时发生编码器错误： %1"
 Output.RecordFail.Title="未能开始录制"
 Output.RecordFail.Unsupported="输出格式不支持或者不支持超过一个音轨. 请检查你的设置, 然后重试"
 Output.RecordNoSpace.Title="磁盘空间不足"
@@ -350,16 +358,16 @@
 Output.RecordError.Title="录像错误"
 Output.RecordError.Msg="录像时发生了预料外的错误。"
 Output.RecordError.EncodeErrorMsg="录制时发生了编码器错误。"
-Output.RecordError.EncodeErrorMsg.LastError="录制时发生编码器错误：\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="录制时发生编码器错误： %1"
 Output.BadPath.Title="文件路径错误"
 Output.BadPath.Text="无法打开已配置的录制路径。请在“设置 -> 输出-> 录制”下检查您的录制路径。"
 Output.NoBroadcast.Title="直播未设置"
-Output.NoBroadcast.Text="您需要先设置直播才能开始推流。"
+Output.NoBroadcast.Text="您需要先设置广播才能开始直播。"
 Output.BroadcastStartFailed="无法开始直播"
 Output.BroadcastStopFailed="无法停止直播"
 LogReturnDialog="日志上传成功"
-LogReturnDialog.Description="您的日志文件已上传。您现在可以分享URL用来调试。"
-LogReturnDialog.Description.Crash="您的崩溃报告已上传。您现在可以分享URL用来调试。"
+LogReturnDialog.Description="您的日志文件已上传。您现在可以分享网址用来调试。"
+LogReturnDialog.Description.Crash="您的崩溃报告已上传。您现在可以分享网址用来调试。"
 LogReturnDialog.CopyURL="复制链接"
 LogReturnDialog.AnalyzeURL="分析"
 LogReturnDialog.ErrorUploadingLog="日志上传失败"
@@ -380,6 +388,8 @@
 Remux.ExitUnfinishedTitle="转封装在进行中"
 Remux.ExitUnfinished="转封装尚未完成，现在停止可能会使目标文件无法使用。\n你确定要停止封装转换吗？"
 Remux.HelpText="拖动文件到此窗口以转换封装格式，或选择空“OBS 录像”单元以浏览文件。"
+Remux.NoFilesAddedTitle="没有添加转换封装的文件。"
+Remux.NoFilesAdded="没有文件被添加到转换封装中。请拖放一个包含一个或多个视频文件的文件夹。"
 MissingFiles="缺少文件"
 MissingFiles.MissingFile="缺少文件"
 MissingFiles.NewFile="新文件"
@@ -398,7 +408,8 @@
 MissingFiles.AutoSearchText="OBS 在文件夹中找到了其他匹配的缺失文件。您想要添加它们吗？"
 MissingFiles.NoMissing.Title="缺失文件检查"
 MissingFiles.NoMissing.Text="看起来没有缺少文件。"
-MacPermissions.Title="查看应用权限"
+MacPermissions.MenuAction="检查应用权限..."
+MacPermissions.Title="检查应用权限"
 MacPermissions.Description="OBS Studio 需要您的授权，才能提供某些功能。建议您开启这些权限，但不开启不会影响正常使用。您可以随时再开启这些权限。"
 MacPermissions.Description.OpenDialog="您可以通过 OBS Studio 菜单重新打开此对话框。"
 MacPermissions.AccessGranted="已允许访问"
@@ -413,8 +424,8 @@
 MacPermissions.Item.Accessibility="无障碍环境"
 MacPermissions.Item.Accessibility.Details="如果想要在其他应用中使用键盘快捷键，请开启此权限。"
 MacPermissions.Continue="继续"
-UpdateAvailable="有可用的更新"
-UpdateAvailable.Text="新的版本 %1.%2.%3 已可用。<a href='%4'> 点击这里下载</a>"
+SourceLeak.Title="源清理错误"
+SourceLeak.Text="在更改场景集合时出现问题，部分源无法卸载。这个问题通常是由于插件没有正确释放资源导致的。请确保您所使用的所有插件都已更新到最新版本。\n\nOBS Studio将会退出以防任何潜在的数据损坏。"
 Basic.DesktopDevice1="桌面音频"
 Basic.DesktopDevice2="桌面音频 2"
 Basic.AuxDevice1="麦克风/Aux"
@@ -425,11 +436,11 @@
 Basic.DisplayCapture="屏幕采集"
 Basic.Main.PreviewConextMenu.Enable="开启预览"
 Basic.Main.Preview.Disable="关闭预览"
-ScaleFiltering="尺度滤波"
-ScaleFiltering.Point="点"
-ScaleFiltering.Bilinear="双线性算法"
-ScaleFiltering.Bicubic="双立方算法"
-ScaleFiltering.Lanczos="兰索斯算法"
+ScaleFiltering="缩放算法"
+ScaleFiltering.Point="最近邻插值"
+ScaleFiltering.Bilinear="双线性插值"
+ScaleFiltering.Bicubic="双三次插值"
+ScaleFiltering.Lanczos="Lanczos插值"
 ScaleFiltering.Area="区域"
 BlendingMethod="混合方式"
 BlendingMethod.Default="默认"
@@ -476,12 +487,13 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (自动选择: %2)"
 Basic.PropertiesWindow.SelectColor="选择颜色"
 Basic.PropertiesWindow.SelectFont="选择字体"
+Basic.PropertiesWindow.SelectFont.WindowTitle="选择字体"
 Basic.PropertiesWindow.ConfirmTitle="设置已修改"
 Basic.PropertiesWindow.Confirm="修改尚未保存。要保存吗？"
 Basic.PropertiesWindow.NoProperties="没有设置选项"
 Basic.PropertiesWindow.AddFiles="添加文件"
 Basic.PropertiesWindow.AddDir="添加目录"
-Basic.PropertiesWindow.AddURL="添加路径 /URL"
+Basic.PropertiesWindow.AddURL="添加路径 /网址"
 Basic.PropertiesWindow.AddEditableListDir="将目录添加到 '%1'"
 Basic.PropertiesWindow.AddEditableListFiles="将文件添加到 '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="将条目添加到 '%1'"
@@ -586,9 +598,9 @@
 Basic.VCam.VirtualCamera="虚拟摄像头"
 Basic.VCam.OutputType="输出类型"
 Basic.VCam.OutputSelection="输出选择"
-Basic.VCam.Internal="内部"
-Basic.VCam.InternalDefault="程序输出（默认）"
-Basic.VCam.InternalPreview="预览输出"
+Basic.VCam.OutputType.Program="程序（默认）"
+Basic.VCam.OutputSelection.NoSelection="尚未选择此输出类型"
+Basic.VCam.RestartWarning="虚拟摄像头将重启以应用此变更"
 Basic.MainMenu.File="文件(&F)"
 Basic.MainMenu.File.Export="导出(&E)"
 Basic.MainMenu.File.Import="导入(&I)"
@@ -630,17 +642,18 @@
 Basic.MainMenu.Edit.AdvAudio="高级音频设置(&A)"
 Basic.MainMenu.View="视图(&V)"
 Basic.MainMenu.View.Toolbars="工具栏(&T)"
-Basic.MainMenu.View.ListboxToolbars="场景/源列表按钮"
+Basic.MainMenu.View.ListboxToolbars="Dock 工具栏"
 Basic.MainMenu.View.ContextBar="源工具栏"
-Basic.MainMenu.View.SceneTransitions="转场特效(&C)"
 Basic.MainMenu.View.SourceIcons="源图标(&I)"
 Basic.MainMenu.View.StatusBar="状态栏(&S)"
 Basic.MainMenu.View.Fullscreen.Interface="全屏界面"
 Basic.MainMenu.View.ResetUI="重置界面(&R)"
 Basic.MainMenu.View.AlwaysOnTop="窗口置顶 (&A)"
+Basic.MainMenu.View.SceneListMode="场景列表模式"
 Basic.MainMenu.Docks="停靠窗口(&D)"
-Basic.MainMenu.Docks.ResetDocks="重置停靠栏(&R)"
-Basic.MainMenu.Docks.LockDocks="锁定停靠栏(&L)"
+Basic.MainMenu.Docks.ResetDocks="重置停靠窗口(&R)"
+Basic.MainMenu.Docks.LockDocks="锁定停靠窗口(&L)"
+Basic.MainMenu.Docks.SideDocks="全高 Dock 栏(&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="自定义浏览器停靠窗口...(&C)"
 Basic.MainMenu.SceneCollection="场景集合(&S)"
 Basic.MainMenu.Profile="配置文件(&P)"
@@ -649,7 +662,6 @@
 Basic.MainMenu.SceneCollection.Import="导入场景集合"
 Basic.MainMenu.SceneCollection.Export="导出场景集合"
 Basic.MainMenu.Profile.Exists="配置文件已存在。"
-Basic.MainMenu.SceneCollection.Exists="场景集合已存在"
 Basic.MainMenu.Tools="工具(&T)"
 Basic.MainMenu.Help="帮助(&H)"
 Basic.MainMenu.Help.HelpPortal="帮助门户(&P)"
@@ -661,8 +673,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="上传当前日志文件(&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="上传之前的日志文件(&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="查看当前日志(&V)"
+Basic.MainMenu.Help.ReleaseNotes="发行说明"
 Basic.MainMenu.Help.CheckForUpdates="检查更新(&C)"
 Basic.MainMenu.Help.Repair="检查文件完整性"
+Basic.MainMenu.Help.RestartSafeMode="以安全模式重启"
+Basic.MainMenu.Help.RestartNormal="以正常模式重启"
 Basic.MainMenu.Help.CrashLogs="错误报告(&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="查看错误报告(&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="上传之前的崩溃报告"
@@ -709,7 +724,7 @@
 Basic.Settings.General.OverflowSelectionHidden="即使源不可见，也会显示溢出"
 Basic.Settings.General.Importers="导入器"
 Basic.Settings.General.AutomaticCollectionSearch="导入时在已知的场景集合位置搜索"
-Basic.Settings.General.SwitchOnDoubleClick="双击时切换到场景"
+Basic.Settings.General.SwitchOnDoubleClick="双击时转场到场景"
 Basic.Settings.General.StudioPortraitLayout="开启纵向布局"
 Basic.Settings.General.TogglePreviewProgramLabels="显示 预览/输出 标签"
 Basic.Settings.General.Multiview="多视图"
@@ -732,8 +747,7 @@
 Basic.Settings.General.ChannelName.beta="测试版 / RC 版"
 Basic.Settings.General.ChannelDescription.beta="可能不稳定的先行版本"
 Basic.Settings.Stream="直播"
-Basic.Settings.Stream.StreamType="直播类型"
-Basic.Settings.Stream.Custom.UseAuthentication="使用身份验证"
+Basic.Settings.Stream.Custom.UseAuthentication="使用身份认证"
 Basic.Settings.Stream.Custom.Username="用户名"
 Basic.Settings.Stream.Custom.Password="密码"
 Basic.Settings.Stream.Custom.Username.ToolTip="RIST: 输入 srp_username 值\nRTMP: 输入用户名\nSRT: 请忽略"
@@ -764,7 +778,6 @@
 Basic.Settings.Output.Encoder.Video="视频编码器"
 Basic.Settings.Output.Encoder.Audio="音频编码器"
 Basic.Settings.Output.SelectDirectory="选择录像目录"
-Basic.Settings.Output.SelectFile="选择录像文件"
 Basic.Settings.Output.DynamicBitrate="动态调整码率以应对网络拥堵"
 Basic.Settings.Output.DynamicBitrate.Beta="动态调整码率以应对网络拥堵（Beta）"
 Basic.Settings.Output.DynamicBitrate.TT="在网络拥堵时快速动态调整码率，而不是丢弃帧来减缓拥堵。\n\n注意：开启后，若有严重的突发网络拥堵，到观众的延迟可能会增加。\n码率降低之后，可能需要几分钟时间才能恢复。\n\n当前只支持 RTMP 流。"
@@ -792,7 +805,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="警告：当录像质量设为“与串流画质相同”时，无法暂停录制。"
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="警告：当前选择的录制格式与选择的流编码器不兼容。"
 Basic.Settings.Output.Simple.Warn.Encoder="警告: 同时传输流和录像, 并使用软件编码器编码与流不同的质量, 将会需要额外的CPU使用."
-Basic.Settings.Output.Simple.Warn.Lossless="警告：无损质量产生的文件大小非常大！无损质量在高分辨率和帧速率的情况下每分钟可使用超过 7GB 的磁盘空间。无损不适合长时间录像，除非你有很多可用的磁盘空间。"
+Basic.Settings.Output.Simple.Warn.Lossless="警告：无损质量会生成非常大的文件！在高分辨率和帧速率下每分钟可使用多达7GB的磁盘空间。除非您有大量可用磁盘空间，否则不建议长时间使用无损录制。使用无损质量时回放缓存不可用。"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="你确定你想要使用无损质量?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="无损质量警告!"
 Basic.Settings.Output.Simple.Encoder.Software="软件 (x264)"
@@ -809,7 +822,7 @@
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="软件 (x264, 降低 CPU 占用, 文件会更大)"
 Basic.Settings.Output.Simple.Codec.AAC.Default="AAC（默认）"
 Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD 轨道 (使用轨道 2)"
-Basic.Settings.Output.Simple.RecAudioTrack="音频轨道"
+Basic.Settings.Output.Simple.RecAudioTrack="音轨"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="分辨率/帧率不兼容"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="此串流服务不支持您当前的输出分辨率和/或帧率。 它们将被更改为最接近的兼容值：\n\n%1\n\n你想要继续吗？"
 Basic.Settings.Output.Warn.EnforceResolutionFPS.Resolution="分辨率: %1"
@@ -834,12 +847,12 @@
 Basic.Settings.Output.Adv.AudioTrack="音轨"
 Basic.Settings.Output.Adv.Streaming="直播"
 Basic.Settings.Output.Adv.Streaming.Settings="直播设置"
-Basic.Settings.Output.Adv.Audio.Track1="轨道 1"
-Basic.Settings.Output.Adv.Audio.Track2="轨道 2"
-Basic.Settings.Output.Adv.Audio.Track3="轨道 3"
-Basic.Settings.Output.Adv.Audio.Track4="轨道 4"
-Basic.Settings.Output.Adv.Audio.Track5="轨道 5"
-Basic.Settings.Output.Adv.Audio.Track6="轨道 6"
+Basic.Settings.Output.Adv.Audio.Track1="音轨 1"
+Basic.Settings.Output.Adv.Audio.Track2="音轨 2"
+Basic.Settings.Output.Adv.Audio.Track3="音轨 3"
+Basic.Settings.Output.Adv.Audio.Track4="音轨 4"
+Basic.Settings.Output.Adv.Audio.Track5="音轨 5"
+Basic.Settings.Output.Adv.Audio.Track6="音轨 6"
 Basic.Settings.Output.Adv.TwitchVodTrack="Twitch VOD 音轨"
 Basic.Settings.Output.Adv.Encoder="编码器设置"
 Basic.Settings.Output.Adv.Recording="录像"
@@ -852,17 +865,17 @@
 Basic.Settings.Output.Adv.Recording.Filename="文件名格式"
 Basic.Settings.Output.Adv.Recording.OverwriteIfExists="如果文件存在则覆盖"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg 输出类型"
-Basic.Settings.Output.Adv.FFmpeg.Type.URL="输出到 URL"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="输出到网址"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="输出到文件"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="常见的录像格式"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="所有文件"
-Basic.Settings.Output.Adv.FFmpeg.SavePathURL="文件路径或 URL"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="文件路径或网址"
 Basic.Settings.Output.Adv.FFmpeg.Format="容器格式"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="音频"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="视频"
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="默认格式"
 Basic.Settings.Output.Adv.FFmpeg.FormatDesc="容器格式说明"
-Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="通过文件路径或 URL 推断音频/视频格式"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="通过文件路径或网站推断音频/视频格式"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="默认编码器"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="禁用编码器"
 Basic.Settings.Output.Adv.FFmpeg.VEncoder="视频编码器"
@@ -917,7 +930,7 @@
 Basic.Settings.Video.Adapter="视频适配器"
 Basic.Settings.Video.BaseResolution="基础（画布）分辨率"
 Basic.Settings.Video.ScaledResolution="输出 (缩放) 分辨率"
-Basic.Settings.Video.DownscaleFilter="缩小方法"
+Basic.Settings.Video.DownscaleFilter="缩小算法"
 Basic.Settings.Video.DownscaleFilter.Unavailable="分辨率相符，不需要缩小"
 Basic.Settings.Video.FPS="帧率"
 Basic.Settings.Video.FPSCommon="常用帧率"
@@ -928,9 +941,9 @@
 Basic.Settings.Video.Renderer="渲染器"
 Basic.Settings.Video.InvalidResolution="无效的分辨率值。必须是 宽x高（如 1920x1080）"
 Basic.Settings.Video.CurrentlyActive="视频输出处于活动状态。请关闭任何输出以更改视频设置。"
-Basic.Settings.Video.DownscaleFilter.Bilinear="双直线法(最快, 但如果缩放会模糊)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="双立方(锐化缩放, 16 个样本)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos(锐化缩放, 36 个样本)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="双线性插值(最快, 但会变模糊)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="双三次插值(锐化缩放, 16 个样本)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos插值(锐化缩放, 36 个样本)"
 Basic.Settings.Video.DownscaleFilter.Area="区域(加权和, 4/6/9个样本)"
 Basic.Settings.Audio="音频"
 Basic.Settings.Audio.SampleRate="采样率"
@@ -943,8 +956,8 @@
 Basic.Settings.Audio.PeakMeterType="峰值计类型"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="采样峰值"
 Basic.Settings.Audio.PeakMeterType.TruePeak="真峰值 (更高的的 CPU 使用率)"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="警告: 已开启环绕声音频。"
-Basic.Settings.Audio.MultichannelWarning="如果是串流，请检查您的流媒体服务是否支持环绕立体声的接收和播放。 Facebook 360 Live 是完全支持环绕立体声的一个例子。 虽然Facebook Live 和 YouTube Live都能接收环绕立体声，但是FacebookLive会缩混成双声道，而YouTube Live 仅播放两个声道。\n\nOBS 音频滤镜兼容环绕立体声，不过无法确保VST插件的支持。"
+Basic.Settings.Audio.MultichannelWarning.Enabled="警告: 已开启环绕声音频。"
+Basic.Settings.Audio.MultichannelWarning="如果要串流，请检查您的流媒体服务是否支持环绕立体声的接收和回放。例如，Facebook 360 Live 完整支持环绕立体声；YouTube Live 支持 5.1 环绕立体声的接收（并在电视上回放）。\n\nOBS 的音频滤镜兼容环绕立体声，但无法保证 VST 插件是否支持。"
 Basic.Settings.Audio.MultichannelWarning.Title="是否开启环绕立体声？"
 Basic.Settings.Audio.MultichannelWarning.Confirm="确实要开启环绕立体声吗？"
 Basic.Settings.Audio.Devices="全局音频设备"
@@ -956,7 +969,7 @@
 Basic.Settings.Audio.AuxDevice4="麦克风/辅助音频 4"
 Basic.Settings.Audio.EnablePushToMute="开启按住静音"
 Basic.Settings.Audio.PushToMuteDelay="按住静音延迟"
-Basic.Settings.Audio.EnablePushToTalk="启动按住讲话"
+Basic.Settings.Audio.EnablePushToTalk="开启按住讲话"
 Basic.Settings.Audio.PushToTalkDelay="按住讲话延时"
 Basic.Settings.Audio.UnknownAudioDevice="设备未连接或不可用"
 Basic.Settings.Audio.Disabled="已禁用"
@@ -991,7 +1004,6 @@
 Basic.Settings.Advanced.FormatWarning="警告：NV12/P010 之外的颜色格式主要用于录像，并不推荐在串流时使用。因为串流时需要进行颜色格式转换，可能会增加 CPU 使用率。"
 Basic.Settings.Advanced.FormatWarningPreciseSdr="警告：高精度格式一般用于配合 HDR 色彩空间。"
 Basic.Settings.Advanced.FormatWarning2100="警告：Rec. 2100 要求精度更高的格式。"
-Basic.Settings.Advanced.Audio.BufferingTime="音频缓冲时间"
 Basic.Settings.Advanced.Video.ColorFormat="色彩格式"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12 (8 位, 4:2:0, 2 个平面)"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420 (8 位, 4:2:0, 3 个平面)"
@@ -1017,6 +1029,7 @@
 Basic.Settings.Advanced.Network="网络"
 Basic.Settings.Advanced.Network.Disabled="当前选择的流媒体协议不支持更改网络设置。"
 Basic.Settings.Advanced.Network.BindToIP="绑定到 IP"
+Basic.Settings.Advanced.Network.IPFamily="IP 族"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="开启网络优化"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="开启 TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="尝试通过调节传输速率，使 RTMP 流的输出对其他的网络延迟敏感应用更友好。\n在不稳定的网络连接下，可能会增加掉帧的风险。"
@@ -1042,7 +1055,7 @@
 Basic.AdvAudio.Monitoring.MonitorOnly="仅监听(输出静音)"
 Basic.AdvAudio.Monitoring.Both="监听并输出"
 Basic.AdvAudio.MonitoringSource="'%1' 的音频监测"
-Basic.AdvAudio.AudioTracks="轨道"
+Basic.AdvAudio.AudioTracks="音轨"
 Basic.Settings.Hotkeys="快捷键"
 Basic.Settings.Hotkeys.Pair="当按键组合与“%1”相同时，作为切换开关使用"
 Basic.Settings.Hotkeys.Filter="筛选"
@@ -1079,8 +1092,10 @@
 SceneItemShow="显示“%1”"
 SceneItemHide="隐藏“%1”"
 OutputWarnings.NoTracksSelected="您必须选择至少一个轨道"
+OutputWarnings.NoTracksSelectedOnExit.Title="输出设置错误"
+OutputWarnings.NoTracksSelectedOnExit.Text="所有输出都必须至少选择一条音轨"
 OutputWarnings.MP4Recording="警告：如果文件无法完成（例如，由于蓝屏BSOD，掉电等），保存到 MP4/MOV 的记录将无法恢复。如果要录制多个音轨，请考虑使用 MKV 录制，并在完成后将录像重新封装为 MP4/MOV（文件→录像转封装）"
-OutputWarnings.CannotPause="警告：当录像编码器设为“（使用推流编码器）”时，无法暂停录制。"
+OutputWarnings.CannotPause="警告：当录制编码器设为“（使用直播编码器）”时，无法暂停录制。"
 OutputWarnings.CodecIncompatible="所选择的音频或视频编码器不兼容，设置项已还原。请从列表中选择兼容的编码器"
 CodecCompat.Incompatible="(和%1不兼容)"
 CodecCompat.CodecPlaceholder="选择编码器..."
@@ -1099,18 +1114,20 @@
 CustomColor="自定义颜色"
 BrowserSource.EnableHardwareAcceleration="开启浏览器源硬件加速"
 About="关于"
-About.Info="OBS Studio是一款免费、开源的视频录制与直播软件。"
-About.Donate="做出贡献"
+About.Info="OBS Studio 是一款自由及开源的视频录制与直播软件。"
+About.Donate="捐款支持"
 About.GetInvolved="参与贡献"
 About.Authors="作者"
 About.License="许可"
+About.Error="发生错误！无法读取文件。\n\n转到：%1"
 About.Contribute="支持 OBS 项目"
-AddUrl.Title="通过 URL 添加源"
-AddUrl.Text="您已将 URL 拖拽到OBS。这会自动将链接添加为一个源。是否继续？"
-ResizeOutputSizeOfSource="调整输出大小（源大小）"
+AddUrl.Title="通过网址添加源"
+AddUrl.Text="您已将网址拖拽到OBS。这会自动将链接添加为一个源。是否继续？"
+AddUrl.Text.Url="网址: %1"
+ResizeOutputSizeOfSource="使用此源的尺寸作为输出分辨率"
 ResizeOutputSizeOfSource.Text="基准与输出分辨率将调整为当前源大小。"
 ResizeOutputSizeOfSource.Continue="您是否想要继续？"
-PreviewTransition="预览转场"
+PreviewTransition="预览转场动画"
 Importer="场景集合导入器"
 Importer.SelectCollection="选择一个场景集合"
 Importer.Collection="场景集合"
@@ -1124,20 +1141,18 @@
 LoadProfileNeedsRestart="配置文件包含需要重启OBS的设置:\n%1\n\n您想要重启OBS使这些设置生效吗？"
 ContextBar.NoSelectedSource="未选择源"
 ContextBar.ResetTransform="重置变换"
-ContextBar.FitToCanvas="适合画布"
 ContextBar.MediaControls.PlayMedia="播放媒体"
 ContextBar.MediaControls.PauseMedia="暂停媒体"
 ContextBar.MediaControls.StopMedia="停止媒体"
 ContextBar.MediaControls.RestartMedia="重新播放媒体"
 ContextBar.MediaControls.PlaylistNext="播放列表中的下一项"
 ContextBar.MediaControls.PlaylistPrevious="播放列表中的上一项"
-ContextBar.MediaControls.MediaProperties="媒体设置"
 ContextBar.MediaControls.BlindSeek="媒体跳转小工具"
-YouTube.Auth.Ok="认证成功。\n您现在可以关闭此页面。"
-YouTube.Auth.NoCode="认证过程尚未完成。"
-YouTube.Auth.NoChannels="所选帐户上没有可用的频道"
-YouTube.Auth.WaitingAuth.Title="YouTube用户认证授权"
-YouTube.Auth.WaitingAuth.Text="请在您的外部浏览器中完成授权。 如果外部浏览器打不开，请前往此链接完成授权： %1"
+YouTube.Auth.Ok="身份认证成功。\n您现在可以关闭此页面。"
+YouTube.Auth.NoCode="身份认证过程尚未完成。"
+YouTube.Auth.NoChannels="所选账户上没有可用的频道"
+YouTube.Auth.WaitingAuth.Title="YouTube用户身份认证"
+YouTube.Auth.WaitingAuth.Text="请在您的外部浏览器中完成身份认证。 如果外部浏览器打不开，请前往此链接完成身份认证： %1"
 YouTube.AuthError.Text="获取频道信息失败： %1"
 YouTube.Actions.WindowTitle="YouTube 直播设置 - 频道： %1"
 YouTube.Actions.CreateNewEvent="建立新直播"
@@ -1180,7 +1195,7 @@
 YouTube.Actions.Error.Text="访问 YouTube 时出现错误 '%1'. 详细错误描述请在<a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>上查询"
 YouTube.Actions.Error.General="YouTube 访问错误。请检查您的网络连接或 YouTube 服务器能否访问。"
 YouTube.Actions.Error.NoBroadcastCreated="创建直播时发生错误 '%1'. 详细错误描述请在<a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>上查询"
-YouTube.Actions.Error.NoStreamCreated="流未创建。请重新链接您的帐户。"
+YouTube.Actions.Error.NoStreamCreated="流未创建。请重新链接您的账户。"
 YouTube.Actions.Error.YouTubeApi="YouTube API 错误。请查看日志文件以获取更多信息。"
 YouTube.Actions.Error.BroadcastNotFound="未找到所选择的广播。"
 YouTube.Actions.Error.FileMissing="选定的文件不存在。"
@@ -1213,3 +1228,5 @@
 YouTube.Errors.liveChatEnded="直播已结束。"
 YouTube.Errors.messageTextInvalid="消息文本无效。"
 YouTube.Errors.rateLimitExceeded="您发送消息的频率太快。"
+YouTube.DocksRemoval.Title="清除旧版 YouTube 浏览器停靠栏"
+YouTube.DocksRemoval.Text="这些浏览器停靠栏因弃用而将被移除：\n\n%1\n请改用“停靠栏/YouTube 直播控制室”。"

obs-studio-29.1.3.tar.xz/UI/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/UI/data/locale/zh-TW.ini Changed

@@ -95,7 +95,6 @@
 LogViewer="記錄檢視器"
 ShowOnStartup="啟動時顯示"
 OpenFile="開啟檔案"
-AddValue="加入 %1"
 AddSource="加入來源"
 RemoveScene="移除選取場景"
 RemoveSource="移除選取來源"
@@ -107,11 +106,19 @@
 SourceFilters="開啟來源濾鏡"
 MixerToolbarMenu="音效混音器選單"
 SceneFilters="開啟場景濾鏡"
+List="清單"
+Grid="網格"
 PluginsFailedToLoad.Title="載入外掛程式時發生錯誤"
 PluginsFailedToLoad.Text="無法載入下述 OBS 外掛程式：\n\n%1\n請更新或移除這些外掛程式。"
 AlreadyRunning.Title="OBS 已經執行"
 AlreadyRunning.Text="OBS 已經啟動！除非您就想這麼做，否則請在執行新實體前，先關閉現存的 OBS 實體。如果你已將 OBS 設定成最小化至系統工具列，那請檢查 OBS 是否還在工具列執行著。"
 AlreadyRunning.LaunchAnyway="仍然啟動"
+AutoSafeMode.Title="安全模式"
+AutoSafeMode.Text="OBS 在上個工作階段沒有正常關閉。\n\n您是否想要在安全模式（也就是停用第三方外掛程式、指令稿和 WebSocket）啟動？"
+AutoSafeMode.LaunchSafe="以安全模式運行"
+AutoSafeMode.LaunchNormal="正常執行"
+SafeMode.Restart="您是否想將 OBS 重新啟動至安全模式（也就是停用第三方外掛程式、指令稿和 WebSocket）？"
+SafeMode.RestartNormal="你要以一般模式重新啟動 OBS 嗎？"
 ChromeOS.Title="不支援的平台"
 ChromeOS.Text="OBS 似乎是在 ChromeOS 容器內執行。此平台不受支援。"
 Wine.Title="偵測到 Wine"
@@ -179,8 +186,8 @@
 Basic.AutoConfig.StreamPage.Server="伺服器"
 Basic.AutoConfig.StreamPage.StreamKey="串流金鑰"
 Basic.AutoConfig.StreamPage.StreamKey.ToolTip="RIST：輸入加密密語。\nRTMP：輸入服務提供的金鑰。\nSRT：如果服務有設定 streamid 則輸入之。"
-Basic.AutoConfig.StreamPage.StreamKey.LinkToSite="（連結）"
 Basic.AutoConfig.StreamPage.EncoderKey="編碼器金鑰"
+Basic.AutoConfig.StreamPage.BearerToken="Bearer 憑證"
 Basic.AutoConfig.StreamPage.ConnectedAccount="連結的帳號"
 Basic.AutoConfig.StreamPage.PerformBandwidthTest="藉由頻寬測試估計位元速率（可能需要幾分鐘）"
 Basic.AutoConfig.StreamPage.PreferHardwareEncoding="優先使用硬體編碼"
@@ -232,8 +239,6 @@
 Updater.UpdateNow="立即更新"
 Updater.RemindMeLater="稍後提醒我"
 Updater.Skip="略過此版本"
-Updater.Running.Title="節目正在展示"
-Updater.Running.Text="輸出處於活動狀態，請關閉活動中的輸出，然後再嘗試更新"
 Updater.NoUpdatesAvailable.Title="沒有更新"
 Updater.NoUpdatesAvailable.Text="目前沒有更新"
 Updater.BranchNotFound.Title="更新頻道已被裁撤"
@@ -243,8 +248,6 @@
 Updater.RepairConfirm.Title="確認完整性檢查"
 Updater.RepairConfirm.Text="執行完整性檢查，會掃描您 OBS 安裝的損壞部分，並重新下載損壞或被篡改的檔案。這可能會花上一段時間。\n\n是否繼續？"
 Updater.FailedToLaunch="無法啟動更新程式"
-Updater.GameCaptureActive.Title="遊戲擷取使用中"
-Updater.GameCaptureActive.Text="遊戲擷取掛鉤函式庫正在使用中。 請關閉所有正在擷取的遊戲或程式 （或重新啟動 Windows），然後重試。"
 QuickTransitions.SwapScenes="轉場後交換預覽/節目場景"
 QuickTransitions.SwapScenesTT="轉場後交換預覽和節目場景（如果節目的原始場景仍然存在）。\n這並不會復原任何對節目原始場景所作的改動。"
 QuickTransitions.DuplicateScene="複製場景"
@@ -258,6 +261,8 @@
 Basic.SceneTransitions="轉場特效"
 Basic.TransitionDuration="時長"
 Basic.TogglePreviewProgramMode="工作室模式"
+Basic.EnablePreviewProgramMode="啟用工作室模式"
+Basic.DisablePreviewProgramMode="停用工作室模式"
 Undo.Undo="復原"
 Undo.Redo="取消復原"
 Undo.Add="新增 '%1'"
@@ -306,6 +311,8 @@
 Undo.GroupItems="將項目組成「%1」群組"
 TransitionNameDlg.Text="請輸入轉場特效名稱"
 TransitionNameDlg.Title="轉場特效名稱"
+TitleBar.SafeMode="安全模式"
+TitleBar.PortableMode="免安裝模式"
 TitleBar.Profile="設定檔"
 TitleBar.Scenes="場景"
 NameExists.Title="名稱已經存在"
@@ -330,6 +337,7 @@
 Output.StartStreamFailed="無法開始串流"
 Output.StartRecordingFailed="無法開始錄影"
 Output.StartReplayFailed="無法啟動重播緩衝區"
+Output.StartVirtualCamFailed="啟動虛擬相機失敗"
 Output.StartFailedGeneric="啟動輸出失敗。 詳情請看紀錄檔。\n\n注意︰ 如果你使用 NVENC 或 AMD 編碼器，請確保您的視訊驅動程式是最新。"
 Output.ReplayBuffer.PauseWarning.Title="暫停時，無法儲存檔案。"
 Output.ReplayBuffer.PauseWarning.Text="警告：錄影暫停時，將無法儲存重播。"
@@ -342,7 +350,7 @@
 Output.ConnectFail.Disconnected="與伺服器連線中斷。"
 Output.StreamEncodeError.Title="編碼錯誤"
 Output.StreamEncodeError.Msg="串流時編碼器發生錯誤。"
-Output.StreamEncodeError.Msg.LastError="串流時編碼器發生錯誤：\n\n%1"
+Output.StreamEncodeError.Msg.LastError="串流時編碼器發生錯誤： %1"
 Output.RecordFail.Title="無法開始錄影"
 Output.RecordFail.Unsupported="輸出格式不被支援或不支援超過一個音軌。請確認你的設定後再試一次。"
 Output.RecordNoSpace.Title="硬碟空間不足"
@@ -350,7 +358,7 @@
 Output.RecordError.Title="錄製錯誤"
 Output.RecordError.Msg="在錄製時發生了預料外的錯誤。"
 Output.RecordError.EncodeErrorMsg="錄影時編碼器發生錯誤。"
-Output.RecordError.EncodeErrorMsg.LastError="錄影時編碼器發生錯誤：\n\n%1"
+Output.RecordError.EncodeErrorMsg.LastError="錄影時編碼器發生錯誤： %1"
 Output.BadPath.Title="無效的路徑"
 Output.BadPath.Text="無法開啟設定的錄影路徑。請檢查 設定 > 輸出 > 錄影 底下的錄影路徑。"
 Output.NoBroadcast.Title="未設定直播"
@@ -380,6 +388,8 @@
 Remux.ExitUnfinishedTitle="正在重新封裝"
 Remux.ExitUnfinished="尚未完成重新封裝，現在停止可能導致目標檔案損毀。\n你確定要停止重新封裝嗎？"
 Remux.HelpText="將檔案拖曳到此視窗中進行 Remux，或是選擇一個空白的「OBS 錄製」元件來瀏覽檔案。"
+Remux.NoFilesAddedTitle="未加入要重新封裝的檔案"
+Remux.NoFilesAdded="未加入要重新封裝的檔案。請拖曳內含一或多個影片檔案的資料夾至此。"
 MissingFiles="檔案遺失"
 MissingFiles.MissingFile="檔案遺失"
 MissingFiles.NewFile="新檔案"
@@ -398,7 +408,8 @@
 MissingFiles.AutoSearchText="OBS 在資料夾中發現到其他符合的遺失檔案。是否加入？"
 MissingFiles.NoMissing.Title="遺失檔案檢查"
 MissingFiles.NoMissing.Text="似乎沒遺失檔案。"
-MacPermissions.Title="檢閱 App 權限"
+MacPermissions.MenuAction="檢視應用程式權限…"
+MacPermissions.Title="檢視應用程式權限"
 MacPermissions.Description="OBS Studio 需要您的權限，才能提供某些功能。建議啟用這些權限，但論使用 App 是非必須的。您可以稍後再啟用。"
 MacPermissions.Description.OpenDialog="您可以透過 OBS Studio 的選單，重新打開這個對話框。"
 MacPermissions.AccessGranted="已授予權限"
@@ -413,8 +424,8 @@
 MacPermissions.Item.Accessibility="輔助使用"
 MacPermissions.Item.Accessibility.Details="若想在其他 app 置於前景時使用鍵盤快速鍵，請啟用本權限。"
 MacPermissions.Continue="繼續"
-UpdateAvailable="現有新版本更新"
-UpdateAvailable.Text="版本 %1.%2.%3 已釋出。 <a href='%4'>請點此下載</a>"
+SourceLeak.Title="清理來源時發生錯誤"
+SourceLeak.Text="更改場景集時發生錯誤，且無法卸載部分來源。這通常是因為外掛程式沒有正確釋放資源。請檢查您使用的所有外掛程式是否已經是最新版本。\n\nOBS Studio 將立即結束，以免造成資料損毀。"
 Basic.DesktopDevice1="輸出音效 1"
 Basic.DesktopDevice2="輸出音效 2"
 Basic.AuxDevice1="麥克風/輸入音效 1"
@@ -476,6 +487,7 @@
 Basic.PropertiesWindow.AutoSelectFormat="%1 (自動選擇: %2)"
 Basic.PropertiesWindow.SelectColor="選取顏色"
 Basic.PropertiesWindow.SelectFont="選擇字型"
+Basic.PropertiesWindow.SelectFont.WindowTitle="選擇字型"
 Basic.PropertiesWindow.ConfirmTitle="設定值已變更"
 Basic.PropertiesWindow.Confirm="有尚未儲存的變更。要保存他們嗎？"
 Basic.PropertiesWindow.NoProperties="無可用的屬性"
@@ -586,9 +598,9 @@
 Basic.VCam.VirtualCamera="虛擬相機"
 Basic.VCam.OutputType="輸出類型"
 Basic.VCam.OutputSelection="輸出選擇區域"
-Basic.VCam.Internal="內部"
-Basic.VCam.InternalDefault="節目輸出（預設值）"
-Basic.VCam.InternalPreview="預覽輸出"
+Basic.VCam.OutputType.Program="節目（預設值）"
+Basic.VCam.OutputSelection.NoSelection="尚未選擇此輸出類型的項目"
+Basic.VCam.RestartWarning="為套用此更動，虛擬相機將會重啟"
 Basic.MainMenu.File="檔案 (&F)"
 Basic.MainMenu.File.Export="匯出 (&E)"
 Basic.MainMenu.File.Import="匯入 (&I)"
@@ -630,17 +642,18 @@
 Basic.MainMenu.Edit.AdvAudio="進階音訊屬性(&A)"
 Basic.MainMenu.View="檢視(&V)"
 Basic.MainMenu.View.Toolbars="工具列(&T)"
-Basic.MainMenu.View.ListboxToolbars="場景/來源清單按鈕"
+Basic.MainMenu.View.ListboxToolbars="停駐視窗工具列"
 Basic.MainMenu.View.ContextBar="來源工具列"
-Basic.MainMenu.View.SceneTransitions="轉場特效(&c)"
 Basic.MainMenu.View.SourceIcons="來源圖示(&I)"
 Basic.MainMenu.View.StatusBar="狀態列(&S)"
 Basic.MainMenu.View.Fullscreen.Interface="全螢幕介面"
 Basic.MainMenu.View.ResetUI="重設使用者介面(&R)"
 Basic.MainMenu.View.AlwaysOnTop="總是在最上層(&A)"
+Basic.MainMenu.View.SceneListMode="場景清單模式"
 Basic.MainMenu.Docks="停駐視窗(&D)"
 Basic.MainMenu.Docks.ResetDocks="重設停駐視窗(&R)"
 Basic.MainMenu.Docks.LockDocks="鎖定停駐視窗(&L)"
+Basic.MainMenu.Docks.SideDocks="全高度停駐視窗(&F)"
 Basic.MainMenu.Docks.CustomBrowserDocks="自訂瀏覽器停駐視窗(&C)⋯"
 Basic.MainMenu.SceneCollection="場景群組 (&S)"
 Basic.MainMenu.Profile="設定檔 (&P)"
@@ -649,7 +662,6 @@
 Basic.MainMenu.SceneCollection.Import="匯入場景群組"
 Basic.MainMenu.SceneCollection.Export="匯出場景群組"
 Basic.MainMenu.Profile.Exists="已有該設定檔"
-Basic.MainMenu.SceneCollection.Exists="已有該場景群組"
 Basic.MainMenu.Tools="工具(&T)"
 Basic.MainMenu.Help="說明 (&H)"
 Basic.MainMenu.Help.HelpPortal="說明中心(&P)"
@@ -661,8 +673,11 @@
 Basic.MainMenu.Help.Logs.UploadCurrentLog="上傳目前 Log 檔 (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="上傳前一個記錄檔(&P)"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="顯示目前紀錄檔 (&V)"
+Basic.MainMenu.Help.ReleaseNotes="版本資訊"
 Basic.MainMenu.Help.CheckForUpdates="檢查更新"
 Basic.MainMenu.Help.Repair="檢查檔案完整性"
+Basic.MainMenu.Help.RestartSafeMode="以安全模式重新啟動"
+Basic.MainMenu.Help.RestartNormal="以一般模式重新啟動"
 Basic.MainMenu.Help.CrashLogs="錯誤報告 (&R)"
 Basic.MainMenu.Help.CrashLogs.ShowLogs="顯示當機回報(&S)"
 Basic.MainMenu.Help.CrashLogs.UploadLastLog="上傳前一個當機報告(&P)"
@@ -732,7 +747,6 @@
 Basic.Settings.General.ChannelName.beta="測試版／候選發行版"
 Basic.Settings.General.ChannelDescription.beta="可能不穩定的預先發佈版本"
 Basic.Settings.Stream="串流"
-Basic.Settings.Stream.StreamType="串流類型"
 Basic.Settings.Stream.Custom.UseAuthentication="使用身份驗證"
 Basic.Settings.Stream.Custom.Username="使用者名稱"
 Basic.Settings.Stream.Custom.Password="密碼"
@@ -764,7 +778,6 @@
 Basic.Settings.Output.Encoder.Video="影像編碼器"
 Basic.Settings.Output.Encoder.Audio="音效編碼器"
 Basic.Settings.Output.SelectDirectory="選擇錄影資料夾"
-Basic.Settings.Output.SelectFile="選擇錄影檔案"
 Basic.Settings.Output.DynamicBitrate="動態調整位元速率以管理堵塞問題"
 Basic.Settings.Output.DynamicBitrate.Beta="動態調整位元速率以管理堵塞問題 (Beta)"
 Basic.Settings.Output.DynamicBitrate.TT="快速動態變更位元速率而非丟棄影格來緩解堵塞問題。\n\n註：這可能會在突發嚴重堵塞時增加觀看者的延遲。\n位元速率降低後，可能會需要幾分鐘才會恢復。\n\n目前僅支援 RTMP。"
@@ -792,7 +805,7 @@
 Basic.Settings.Output.Simple.Warn.CannotPause="警告：如果錄影編碼器畫質設為「（和串流編碼器相同）」，錄影時將無法暫停。"
 Basic.Settings.Output.Simple.Warn.IncompatibleContainer="警告：目前選擇的錄影格式與選擇的串流編碼器不相容。"
 Basic.Settings.Output.Simple.Warn.Encoder="警告：如果錄影與串流同時運作，並使用與串流不同的編碼品質設定將會增加額外的CPU使用量"
-Basic.Settings.Output.Simple.Warn.Lossless="警告：無損畫質將會產生非常大的檔案！無損畫質在高解析度或高影格率時，可能會每分鐘使用高達 7GB（gigabytes）的容量。除非您擁有非常大量的硬碟空間，否則不建議使用無損畫質錄製長時間的影片。"
+Basic.Settings.Output.Simple.Warn.Lossless="警告：無損品質的錄影會產生極大的檔案！在高解析度和高影格率下，無損品質每分鐘可能消耗超過 7GB 的磁碟空間。除非你有大量的磁碟空間，否則不建議在長時間錄影時使用無損品質。使用無損品質時，無法使用重播緩衝功能。"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="你確定你想要使用無損畫質?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="無損畫質警告！"
 Basic.Settings.Output.Simple.Encoder.Software="軟體編碼（ x264 ）"
@@ -943,8 +956,8 @@
 Basic.Settings.Audio.PeakMeterType="峰值表類型"
 Basic.Settings.Audio.PeakMeterType.SamplePeak="範例峰值"
 Basic.Settings.Audio.PeakMeterType.TruePeak="真實峰值（較高的 CPU 用量）"
-Basic.Settings.Audio.MultiChannelWarning.Enabled="警告: 已啟用環繞聲音訊。"
-Basic.Settings.Audio.MultichannelWarning="如果使用直播，請確認您的直播服務支援立體聲的接收和撥放。Facebook 360 Live 就是一個完全完整支援立體聲的例子。雖然 Facebook Live 和 YouTube Live 都支援立體聲的接收，但 Facebook Live 會把音訊降為雙聲道，而 YouTube Live 只會播放兩個聲道。\n\nOBS 音訊濾鏡支援立體聲，但是無法保證 VST 外掛程式的支援。"
+Basic.Settings.Audio.MultichannelWarning.Enabled="警告: 已啟用環繞聲音訊。"
+Basic.Settings.Audio.MultichannelWarning="直播時請確認您使用的直播服務支援立體聲的接收和播放。例如 Facebook 360 Live 完全支援立體聲；YouTube Live 支援 5.1 音源輸入（並於電視播放）。\n\nOBS 音訊過濾器支援立體聲，但不保證 VST 外掛程式有支援。"
 Basic.Settings.Audio.MultichannelWarning.Title="是否啟用環繞聲音訊？"
 Basic.Settings.Audio.MultichannelWarning.Confirm="確實要啟用環繞聲音訊嗎？"
 Basic.Settings.Audio.Devices="全域音訊裝置"
@@ -991,7 +1004,6 @@
 Basic.Settings.Advanced.FormatWarning="警告：NV12/P010 之外的色彩格式主要用於錄影，不建議在串流時使用。在串流使用，可能會因為色彩格式轉換，而導致 CPU 用量增加。"
 Basic.Settings.Advanced.FormatWarningPreciseSdr="警告：高精度格式更常和 HDR 色彩空間一起使用。"
 Basic.Settings.Advanced.FormatWarning2100="警告：Rec. 2100 應使用精度更高的格式。"
-Basic.Settings.Advanced.Audio.BufferingTime="音訊緩衝時間"
 Basic.Settings.Advanced.Video.ColorFormat="色彩格式"
 Basic.Settings.Advanced.Video.ColorFormat.NV12="NV12（8 位，4:2:0，2 色盤）"
 Basic.Settings.Advanced.Video.ColorFormat.I420="I420（8 位，4:2:0，3 色盤）"
@@ -1017,6 +1029,7 @@
 Basic.Settings.Advanced.Network="網路"
 Basic.Settings.Advanced.Network.Disabled="目前選取的串流協定，不支援更改網路設定。"
 Basic.Settings.Advanced.Network.BindToIP="綁定到 IP"
+Basic.Settings.Advanced.Network.IPFamily="IP 家族"
 Basic.Settings.Advanced.Network.EnableNewSocketLoop="啟用網路最佳化"
 Basic.Settings.Advanced.Network.EnableLowLatencyMode="啟用 TCP pacing"
 Basic.Settings.Advanced.Network.TCPPacing.Tooltip="嘗試藉由限制傳輸速度，來減少 RTMP 輸出對網路上其他要求延遲之應用程式的影響。\n這可能會增加在不穩定連線中被捨棄影格的風險。"
@@ -1095,6 +1108,8 @@
 SceneItemShow="顯示 「%1」"
 SceneItemHide="隱藏 「%1」"
 OutputWarnings.NoTracksSelected="您必須至少選擇一個軌道"
+OutputWarnings.NoTracksSelectedOnExit.Title="輸出設定有誤"
+OutputWarnings.NoTracksSelectedOnExit.Text="所有輸出應當選取至少一個音軌。"
 OutputWarnings.MP4Recording="警告︰ 如果檔案沒有完整儲存(例如由於 BSOD，斷電等中斷)，儲存成 MP4/MOV 的檔案將無法復原 。如果想要記錄多個音軌，請考慮儲存成 MKV ，並在完成後重新封裝成 MP4/MOV (檔案 -> 重新封裝)"
 OutputWarnings.CannotPause="警告：如果錄影編碼器設為「（使用串流編碼器）」，錄影時將無法暫停。"
 OutputWarnings.CodecIncompatible="您選擇的音訊或影片編碼器因不相容而重設。請從清單中選擇相容的編碼器。"
@@ -1120,6 +1135,7 @@
 About.GetInvolved="參與貢獻"
 About.Authors="作者群"
 About.License="授權"
+About.Error="錯誤！無法讀取檔案。\n\n前往：%1"
 About.Contribute="支持OBS專案"
 AddUrl.Title="使用網址加入來源"
 AddUrl.Text="您拖曳了網址到 OBS。這會自動將連結加為來源。繼續？"
@@ -1141,14 +1157,12 @@
 LoadProfileNeedsRestart="設定檔內有需要重新啟動 OBS 的設定：\n%1\n\n是否要重新啟動 OBS，讓這些設定生效？"
 ContextBar.NoSelectedSource="未選擇來源"
 ContextBar.ResetTransform="重設變型設定"
-ContextBar.FitToCanvas="縮放至畫布大小"
 ContextBar.MediaControls.PlayMedia="播放媒體"
 ContextBar.MediaControls.PauseMedia="暫停媒體"
 ContextBar.MediaControls.StopMedia="停止媒體"
 ContextBar.MediaControls.RestartMedia="重新播放媒體"
 ContextBar.MediaControls.PlaylistNext="播放清單中下一個"
 ContextBar.MediaControls.PlaylistPrevious="播放清單中上一個"
-ContextBar.MediaControls.MediaProperties="媒體屬性"
 ContextBar.MediaControls.BlindSeek="媒體跳轉元件"
 YouTube.Auth.Ok="授權成功。\n您現可關閉本頁面。"
 YouTube.Auth.NoCode="授權程序未完成。"
@@ -1230,3 +1244,5 @@
 YouTube.Errors.liveChatEnded="直播已結束。"
 YouTube.Errors.messageTextInvalid="訊息文字無效。"
 YouTube.Errors.rateLimitExceeded="傳送訊息的速度太快。"
+YouTube.DocksRemoval.Title="清除舊版 YouTube 瀏覽器停駐視窗"
+YouTube.DocksRemoval.Text="這些瀏覽器停駐視窗將被刪除，因為它們已被標記為過時：\n\n%1\n請改用「停駐視窗/YouTube 直播控制室」。"

obs-studio-29.1.3.tar.xz/UI/data/themes/Acri.qss -> obs-studio-30.0.2.tar.xz/UI/data/themes/Acri.qss Changed

obs-studio-29.1.3.tar.xz/UI/data/themes/Dark.qss -> obs-studio-30.0.2.tar.xz/UI/data/themes/Dark.qss Changed

obs-studio-30.0.2.tar.xz/UI/data/themes/Dark/network-disconnected.svg Added

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-2388.3 -3285.1)">
+ <path d="m2401.3 3286.1c-0.5547 0-1 0.4453-1 1v7.2695c0.1485 0.09 0.2891 0.1914 0.4141 0.3164l0.414 0.4141h0.3438l0.4141-0.4141c0.375-0.375 0.8828-0.5859 1.414-0.5859v-7c0-0.5547-0.4453-1-1-1zm-4 3c-0.5547 0-1 0.4453-1 1v9c0 0.5547 0.4453 1 1 1h0.01c0-0.5156 0.1914-1.0273 0.5781-1.4141l0.4141-0.414v-0.3438l-0.4141-0.414c-0.7734-0.7735-0.7734-2.0547 0-2.8282 0.375-0.375 0.8829-0.5859 1.4141-0.5859v-4c0-0.5547-0.4453-1-1-1zm-4 3c-0.5547 0-1 0.4453-1 1v6c0 0.5547 0.4453 1 1 1h1c0.5547 0 1-0.4453 1-1v-6c0-0.5547-0.4453-1-1-1zm-4 3c-0.5547 0-1 0.4453-1 1v3c0 0.5547 0.4453 1 1 1h1c0.5547 0 1-0.4453 1-1v-3c0-0.5547-0.4453-1-1-1z" fill="#fff" fill-opacity=".2"/>
+ <path d="m2399.3 3295.1c-0.2656 0-0.5195 0.1055-0.707 0.293-0.3906 0.3906-0.3906 1.0234 0 1.414l1.293 1.293-1.293 1.293c-0.3906 0.3906-0.3906 1.0234 0 1.414 0.3906 0.3907 1.0234 0.3907 1.414 0l1.293-1.2929 1.293 1.2929c0.3906 0.3907 1.0234 0.3907 1.414 0 0.3907-0.3906 0.3907-1.0234 0-1.414l-1.2929-1.293 1.2929-1.293c0.3907-0.3906 0.3907-1.0234 0-1.414-0.1875-0.1875-0.4414-0.293-0.707-0.293s-0.5195 0.1055-0.707 0.293l-1.293 1.2929-1.293-1.2929c-0.1875-0.1875-0.4414-0.293-0.707-0.293z" fill="#b8131a"/>
+ </g>
+</svg>

obs-studio-30.0.2.tar.xz/UI/data/themes/Dark/network-inactive.svg Added

obs-studio-30.0.2.tar.xz/UI/data/themes/Dark/recording-inactive.svg Added

obs-studio-30.0.2.tar.xz/UI/data/themes/Dark/recording-pause-inactive.svg Added

obs-studio-30.0.2.tar.xz/UI/data/themes/Dark/streaming-inactive.svg Added

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(1.8565 0 0 1.8565 .152 -547.29)">
+ <circle cx="1.0583" cy="295.94" r=".37705" fill="#fff" fill-opacity=".4" style="paint-order:normal"/>
+ <g fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round">
+ <path d="m0.6324 296.42a0.62244 0.62244 0 0 1-0.22234-0.47682 0.62244 0.62244 0 0 1 0.22234-0.47682" stroke-opacity=".22" stroke-width=".18852" style="paint-order:normal"/>
+ <path d="m1.4833 296.42a0.62244 0.62244 0 0 0 0.22234-0.47682 0.62244 0.62244 0 0 0-0.22234-0.47682" stroke-opacity=".22" stroke-width=".18852" style="paint-order:normal"/>
+ <path d="m0.39544 296.7a0.98443 0.98443 0 0 1-0.35165-0.75411 0.98443 0.98443 0 0 1 0.35165-0.75413" stroke-opacity=".08" stroke-width=".25133" style="paint-order:normal"/>
+ <path d="m1.7211 296.7a0.98443 0.98443 0 0 0 0.35165-0.75411 0.98443 0.98443 0 0 0-0.35165-0.75413" stroke-opacity=".08" stroke-width=".25133" style="paint-order:normal"/>
+ </g>
+ </g>
+</svg>

obs-studio-29.1.3.tar.xz/UI/data/themes/Grey.qss -> obs-studio-30.0.2.tar.xz/UI/data/themes/Grey.qss Changed

obs-studio-29.1.3.tar.xz/UI/data/themes/Light.qss -> obs-studio-30.0.2.tar.xz/UI/data/themes/Light.qss Changed

obs-studio-29.1.3.tar.xz/UI/data/themes/Rachni.qss -> obs-studio-30.0.2.tar.xz/UI/data/themes/Rachni.qss Changed

obs-studio-29.1.3.tar.xz/UI/data/themes/System.qss -> obs-studio-30.0.2.tar.xz/UI/data/themes/System.qss Changed

obs-studio-29.1.3.tar.xz/UI/data/themes/Yami.qss -> obs-studio-30.0.2.tar.xz/UI/data/themes/Yami.qss Changed

obs-studio-29.1.3.tar.xz/UI/display-helpers.hpp -> obs-studio-30.0.2.tar.xz/UI/display-helpers.hpp Changed

obs-studio-29.1.3.tar.xz/UI/double-slider.cpp -> obs-studio-30.0.2.tar.xz/UI/double-slider.cpp Changed

obs-studio-29.1.3.tar.xz/UI/double-slider.hpp -> obs-studio-30.0.2.tar.xz/UI/double-slider.hpp Changed

obs-studio-30.0.2.tar.xz/UI/ffmpeg-utils.cpp Added

@@ -0,0 +1,226 @@
+/******************************************************************************
+ Copyright (C) 2023 by Dennis Sädtler <dennis@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#include "ffmpeg-utils.hpp"
+
+#include <unordered_map>
+#include <unordered_set>
+
+extern "C" {
+#include <libavformat/avformat.h>
+}
+
+using namespace std;
+
+vector<FFmpegCodec> GetFormatCodecs(const FFmpegFormat &format,
+				 bool ignore_compatibility)
+{
+	vector<FFmpegCodec> codecs;
+	const AVCodec *codec;
+	void *i = 0;
+
+	while ((codec = av_codec_iterate(&i)) != nullptr) {
+		// Not an encoding codec
+		if (!av_codec_is_encoder(codec))
+			continue;
+		// Skip if not supported and compatibility check not disabled
+		if (!ignore_compatibility &&
+		 !av_codec_get_tag(format.codec_tags, codec->id)) {
+			continue;
+		}
+
+		codecs.emplace_back(codec);
+	}
+
+	return codecs;
+}
+
+static bool is_output_device(const AVClass *avclass)
+{
+	if (!avclass)
+		return false;
+
+	switch (avclass->category) {
+	case AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT:
+	case AV_CLASS_CATEGORY_DEVICE_AUDIO_OUTPUT:
+	case AV_CLASS_CATEGORY_DEVICE_OUTPUT:
+		return true;
+	default:
+		return false;
+	}
+}
+
+vector<FFmpegFormat> GetSupportedFormats()
+{
+	vector<FFmpegFormat> formats;
+	const AVOutputFormat *output_format;
+
+	void *i = 0;
+	while ((output_format = av_muxer_iterate(&i)) != nullptr) {
+		if (is_output_device(output_format->priv_class))
+			continue;
+
+		formats.emplace_back(output_format);
+	}
+
+	return formats;
+}
+
+FFmpegCodec FFmpegFormat::GetDefaultEncoder(FFmpegCodecType codec_type) const
+{
+	const AVCodecID codec_id = codec_type == VIDEO ? video_codec
+						 : audio_codec;
+	if (codec_type == UNKNOWN || codec_id == AV_CODEC_ID_NONE)
+		return {};
+
+	if (auto codec = avcodec_find_encoder(codec_id))
+		return {codec};
+
+	/* Fall back to using the format name as the encoder,
+	 * this works for some formats such as FLV. */
+	return FFmpegCodec{name, codec_id, codec_type};
+}
+
+bool FFCodecAndFormatCompatible(const char *codec, const char *format)
+{
+	if (!codec || !format)
+		return false;
+
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)
+	AVOutputFormat *output_format;
+#else
+	const AVOutputFormat *output_format;
+#endif
+	output_format = av_guess_format(format, nullptr, nullptr);
+	if (!output_format)
+		return false;
+
+	const AVCodecDescriptor *codec_desc =
+		avcodec_descriptor_get_by_name(codec);
+	if (!codec_desc)
+		return false;
+
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(60, 0, 100)
+	return avformat_query_codec(output_format, codec_desc->id,
+				 FF_COMPLIANCE_EXPERIMENTAL) == 1;
+#else
+	return avformat_query_codec(output_format, codec_desc->id,
+				 FF_COMPLIANCE_NORMAL) == 1;
+#endif
+}
+
+static const unordered_set<string> builtin_codecs = {
+	"h264", "hevc", "av1", "prores", "aac", "opus",
+	"alac", "flac", "pcm_s16le", "pcm_s24le", "pcm_f32le",
+};
+
+bool IsBuiltinCodec(const char *codec)
+{
+	return builtin_codecs.count(codec) > 0;
+}
+
+static const unordered_map<string, unordered_set<string>> codec_compat = {
+	// Technically our muxer supports HEVC and AV1 as well, but nothing else does
+	{"flv",
+	 {
+		 "h264",
+		 "aac",
+	 }},
+	{"mpegts",
+	 {
+		 "h264",
+		 "hevc",
+		 "aac",
+		 "opus",
+	 }},
+	{"hls",
+	 // Also using MPEG-TS in our case, but no Opus support
+	 {
+		 "h264",
+		 "hevc",
+		 "aac",
+	 }},
+	{"mp4",
+	 {
+		 "h264",
+		 "hevc",
+		 "av1",
+		 "aac",
+		 "opus",
+		 "alac",
+		 "flac",
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(60, 5, 100)
+		 // PCM in MP4 is only supported in FFmpeg > 6.0
+		 "pcm_s16le",
+		 "pcm_s24le",
+		 "pcm_f32le",
+#endif
+	 }},
+	{"fragmented_mp4",
+	 {
+		 "h264",
+		 "hevc",
+		 "av1",
+		 "aac",
+		 "opus",
+		 "alac",
+		 "flac",
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(60, 5, 100)
+		 "pcm_s16le",
+		 "pcm_s24le",
+		 "pcm_f32le",
+#endif
+	 }},
+	{"mov",
+	 {
+		 "h264",
+		 "hevc",
+		 "prores",
+		 "aac",
+		 "alac",
+		 "pcm_s16le",
+		 "pcm_s24le",
+		 "pcm_f32le",
+	 }},
+	{"fragmented_mov",
+	 {
+		 "h264",
+		 "hevc",
+		 "prores",
+		 "aac",
+		 "alac",
+		 "pcm_s16le",
+		 "pcm_s24le",
+		 "pcm_f32le",
+	 }},
+	// MKV supports everything
+	{"mkv", {}},
+};
+
+bool ContainerSupportsCodec(const string &container, const string &codec)
+{
+	auto iter = codec_compat.find(container);
+	if (iter == codec_compat.end())
+		return false;
+
+	auto codecs = iter->second;
+	// Assume everything is supported
+	if (codecs.empty())
+		return true;
+
+	return codecs.count(codec) > 0;
+}

obs-studio-30.0.2.tar.xz/UI/ffmpeg-utils.hpp Added

@@ -0,0 +1,151 @@
+/******************************************************************************
+ Copyright (C) 2023 by Dennis Sädtler <dennis@obsproject.com>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#pragma once
+
+#include <qmetatype.h>
+#include <string>
+#include <vector>
+
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavdevice/avdevice.h>
+}
+
+enum FFmpegCodecType { AUDIO, VIDEO, UNKNOWN };
+
+/* This needs to handle a few special cases due to how the format is used in the UI:
+ * - strequal(nullptr, "") must be true
+ * - strequal("", nullptr) must be true
+ * - strequal(nullptr, nullptr) must be true
+ */
+static bool strequal(const char *a, const char *b)
+{
+	if (!a && !b)
+		return true;
+	if (!a && *b == 0)
+		return true;
+	if (!b && *a == 0)
+		return true;
+	if (!a || !b)
+		return false;
+
+	return strcmp(a, b) == 0;
+}
+
+struct FFmpegCodec;
+
+struct FFmpegFormat {
+	const char *name;
+	const char *long_name;
+	const char *mime_type;
+	const char *extensions;
+	AVCodecID audio_codec;
+	AVCodecID video_codec;
+	const AVCodecTag *const *codec_tags;
+
+	FFmpegFormat() = default;
+
+	FFmpegFormat(const char *name, const char *mime_type)
+		: name(name),
+		 long_name(nullptr),
+		 mime_type(mime_type),
+		 extensions(nullptr),
+		 audio_codec(AV_CODEC_ID_NONE),
+		 video_codec(AV_CODEC_ID_NONE),
+		 codec_tags(nullptr)
+	{
+	}
+
+	FFmpegFormat(const AVOutputFormat *av_format)
+		: name(av_format->name),
+		 long_name(av_format->long_name),
+		 mime_type(av_format->mime_type),
+		 extensions(av_format->extensions),
+		 audio_codec(av_format->audio_codec),
+		 video_codec(av_format->video_codec),
+		 codec_tags(av_format->codec_tag)
+	{
+	}
+
+	FFmpegCodec GetDefaultEncoder(FFmpegCodecType codec_type) const;
+
+	bool HasAudio() const { return audio_codec != AV_CODEC_ID_NONE; }
+	bool HasVideo() const { return video_codec != AV_CODEC_ID_NONE; }
+
+	bool operator==(const FFmpegFormat &format) const
+	{
+		if (!strequal(name, format.name))
+			return false;
+
+		return strequal(mime_type, format.mime_type);
+	}
+};
+Q_DECLARE_METATYPE(FFmpegFormat)
+
+struct FFmpegCodec {
+	const char *name;
+	const char *long_name;
+	int id;
+
+	FFmpegCodecType type;
+
+	FFmpegCodec() = default;
+
+	FFmpegCodec(const char *name, int id, FFmpegCodecType type = UNKNOWN)
+		: name(name),
+		 long_name(nullptr),
+		 id(id),
+		 type(type)
+	{
+	}
+
+	FFmpegCodec(const AVCodec *codec)
+		: name(codec->name),
+		 long_name(codec->long_name),
+		 id(codec->id)
+	{
+		switch (codec->type) {
+		case AVMEDIA_TYPE_AUDIO:
+			type = AUDIO;
+			break;
+		case AVMEDIA_TYPE_VIDEO:
+			type = VIDEO;
+			break;
+		default:
+			type = UNKNOWN;
+		}
+	}
+
+	bool operator==(const FFmpegCodec &codec) const
+	{
+		if (id != codec.id)
+			return false;
+
+		return strequal(name, codec.name);
+	}
+};
+Q_DECLARE_METATYPE(FFmpegCodec)
+
+std::vector<FFmpegFormat> GetSupportedFormats();
+std::vector<FFmpegCodec> GetFormatCodecs(const FFmpegFormat &format,
+					 bool ignore_compatibility);
+
+bool FFCodecAndFormatCompatible(const char *codec, const char *format);
+bool IsBuiltinCodec(const char *codec);
+bool ContainerSupportsCodec(const std::string &container,
+			 const std::string &codec);

obs-studio-29.1.3.tar.xz/UI/focus-list.cpp -> obs-studio-30.0.2.tar.xz/UI/focus-list.cpp Changed

obs-studio-29.1.3.tar.xz/UI/focus-list.hpp -> obs-studio-30.0.2.tar.xz/UI/focus-list.hpp Changed

obs-studio-29.1.3.tar.xz/UI/forms/OBSBasic.ui -> obs-studio-30.0.2.tar.xz/UI/forms/OBSBasic.ui Changed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <author>Jim</author>
+ <author>Lain</author>
 <class>OBSBasic</class>
 <widget class="QMainWindow" name="OBSBasic">
 <property name="geometry">
@@ -532,9 +532,12 @@
 <addaction name="separator"/>
 <addaction name="actionRepair"/>
 <addaction name="actionCheckForUpdates"/>
+ <addaction name="actionRestartSafe"/>
+ <addaction name="actionShowMacPermissions"/>
+ <addaction name="separator"/>
 <addaction name="actionShowWhatsNew"/>
+ <addaction name="actionReleaseNotes"/>
 <addaction name="actionShowAbout"/>
- <addaction name="actionShowMacPermissions"/>
 <addaction name="separator"/>
 </widget>
 <widget class="QMenu" name="menuBasic_MainMenu_Edit">
@@ -667,6 +670,13 @@
 <property name="title">
 <string>Basic.MainMenu.View</string>
 </property>
+ <widget class="QMenu" name="sceneListModeMenu">
+ <property name="title">
+ <string>Basic.MainMenu.View.SceneListMode</string>
+ </property>
+ <addaction name="actionSceneListMode"/>
+ <addaction name="actionSceneGridMode"/>
+ </widget>
 <action name="resetUI">
 <property name="text">
 <string>Basic.MainMenu.View.ResetUI</string>
@@ -683,6 +693,7 @@
 <addaction name="resetUI"/>
 <addaction name="actionFullscreenInterface"/>
 <addaction name="separator"/>
+ <addaction name="sceneListModeMenu"/>
 <addaction name="toggleListboxToolbars"/>
 <addaction name="toggleContextBar"/>
 <addaction name="toggleSourceIcons"/>
@@ -712,6 +723,7 @@
 <string>Basic.MainMenu.Docks</string>
 </property>
 <addaction name="lockDocks"/>
+ <addaction name="sideDocks"/>
 <addaction name="resetDocks"/>
 <addaction name="separator"/>
 </widget>
@@ -1337,7 +1349,7 @@
 </property>
 <property name="icon">
 <iconset>
- <normaloff>:/res/images/add.png</normaloff>:/res/images/add.png</iconset>
+ <normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
 </property>
 <property name="flat">
 <bool>false</bool>
@@ -1369,7 +1381,7 @@
 </property>
 <property name="icon">
 <iconset>
- <normaloff>:/res/images/list_remove.png</normaloff>:/res/images/list_remove.png</iconset>
+ <normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
 </property>
 <property name="flat">
 <bool>false</bool>
@@ -1987,7 +1999,7 @@
 </action>
 <action name="actionShowMacPermissions">
 <property name="text">
- <string>MacPermissions.Title</string>
+ <string>MacPermissions.MenuAction</string>
 </property>
 </action>
 <action name="actionRepair">
@@ -1995,6 +2007,19 @@
 <string>Basic.MainMenu.Help.Repair</string>
 </property>
 </action>
+ <action name="actionRestartSafe">
+ <property name="text">
+ <string>Basic.MainMenu.Help.RestartSafeMode</string>
+ </property>
+ </action>
+ <action name="actionReleaseNotes">
+ <property name="visible">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Basic.MainMenu.Help.ReleaseNotes</string>
+ </property>
+ </action>
 <action name="actionInteract">
 <property name="text">
 <string>Interact</string>
@@ -2188,6 +2213,17 @@
 <string>Basic.MainMenu.Docks.LockDocks</string>
 </property>
 </action>
+ <action name="sideDocks">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Basic.MainMenu.Docks.SideDocks</string>
+ </property>
+ </action>
 <action name="actionHelpPortal">
 <property name="text">
 <string>Basic.MainMenu.Help.HelpPortal</string>
@@ -2306,6 +2342,22 @@
 <string>filtersIcon</string>
 </property>
 </action>
+ <action name="actionSceneGridMode">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Grid</string>
+ </property>
+ </action>
+ <action name="actionSceneListMode">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>List</string>
+ </property>
+ </action>
 </widget>
 <customwidgets>
 <customwidget>

obs-studio-29.1.3.tar.xz/UI/forms/OBSBasicFilters.ui -> obs-studio-30.0.2.tar.xz/UI/forms/OBSBasicFilters.ui Changed

@@ -72,6 +72,15 @@
 <property name="spacing">
 <number>1</number>
 </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="dragDropMode">
+ <enum>QAbstractItemView::InternalMove</enum>
+ </property>
+ <property name="defaultDropAction">
+ <enum>Qt::TargetMoveAction</enum>
+ </property>
 </widget>
 </item>
 <item>
@@ -285,6 +294,15 @@
 <property name="spacing">
 <number>1</number>
 </property>
+ <property name="dragEnabled">
+ <bool>true</bool>
+ </property>
+ <property name="dragDropMode">
+ <enum>QAbstractItemView::InternalMove</enum>
+ </property>
+ <property name="defaultDropAction">
+ <enum>Qt::TargetMoveAction</enum>
+ </property>
 </widget>
 </item>
 <item>

obs-studio-29.1.3.tar.xz/UI/forms/OBSBasicSettings.ui -> obs-studio-30.0.2.tar.xz/UI/forms/OBSBasicSettings.ui Changed

@@ -2048,6 +2048,9 @@
 </layout>
 </widget>
 <widget class="QWidget" name="simpleFlvTracks">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
 <layout class="QHBoxLayout" name="horizontalLayoutSimpleFLVTracks">
 <property name="leftMargin">
 <number>0</number>
@@ -2253,22 +2256,6 @@
 </widget>
 </item>
 <item>
- <layout class="QVBoxLayout" name="simpleOutInfoLayout">
- <property name="leftMargin">
- <number>10</number>
- </property>
- <property name="topMargin">
- <number>10</number>
- </property>
- <property name="rightMargin">
- <number>10</number>
- </property>
- <property name="bottomMargin">
- <number>10</number>
- </property>
- </layout>
- </item>
- <item>
 <widget class="QFrame" name="simpleOutputContainer">
 <property name="minimumSize">
 <size>
@@ -2309,6 +2296,22 @@
 </widget>
 </widget>
 </item>
+ <item>
+ <layout class="QVBoxLayout" name="simpleOutInfoLayout">
+ <property name="leftMargin">
+ <number>10</number>
+ </property>
+ <property name="topMargin">
+ <number>10</number>
+ </property>
+ <property name="rightMargin">
+ <number>10</number>
+ </property>
+ <property name="bottomMargin">
+ <number>10</number>
+ </property>
+ </layout>
+ </item>
 </layout>
 </widget>
 <widget class="QWidget" name="advOutputsPage">
@@ -7560,6 +7563,19 @@
 </widget>
 </item>
 <item row="1" column="0">
+ <widget class="QLabel" name="ipFamilyLabel">
+ <property name="text">
+ <string>Basic.Settings.Advanced.Network.IPFamily</string>
+ </property>
+ <property name="buddy">
+ <cstring>ipFamily</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="ipFamily"/>
+ </item>
+ <item row="2" column="0">
 <widget class="QLabel" name="bindToIPLabel">
 <property name="text">
 <string>Basic.Settings.Advanced.Network.BindToIP</string>
@@ -7569,17 +7585,17 @@
 </property>
 </widget>
 </item>
- <item row="1" column="1">
+ <item row="2" column="1">
 <widget class="QComboBox" name="bindToIP"/>
 </item>
- <item row="3" column="1">
+ <item row="4" column="1">
 <widget class="QCheckBox" name="enableNewSocketLoop">
 <property name="text">
 <string>Basic.Settings.Advanced.Network.EnableNewSocketLoop</string>
 </property>
 </widget>
 </item>
- <item row="4" column="1">
+ <item row="5" column="1">
 <widget class="QCheckBox" name="enableLowLatencyMode">
 <property name="enabled">
 <bool>false</bool>
@@ -7589,7 +7605,7 @@
 </property>
 </widget>
 </item>
- <item row="3" column="0">
+ <item row="4" column="0">
 <spacer name="horizontalSpacer_7">
 <property name="orientation">
 <enum>Qt::Horizontal</enum>
@@ -7602,7 +7618,7 @@
 </property>
 </spacer>
 </item>
- <item row="2" column="1">
+ <item row="3" column="1">
 <widget class="QCheckBox" name="dynBitrate">
 <property name="toolTip">
 <string>Basic.Settings.Output.DynamicBitrate.TT</string>

obs-studio-29.1.3.tar.xz/UI/forms/OBSBasicVCamConfig.ui -> obs-studio-30.0.2.tar.xz/UI/forms/OBSBasicVCamConfig.ui Changed

@@ -22,23 +22,7 @@
 </widget>
 </item>
 <item>
- <widget class="QComboBox" name="outputType">
- <item>
- <property name="text">
- <string>Basic.VCam.Internal</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Basic.Scene</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Basic.Main.Source</string>
- </property>
- </item>
- </widget>
+ <widget class="QComboBox" name="outputType"/>
 </item>
 <item>
 <widget class="QLabel" name="outputSelectionLabel">
@@ -51,6 +35,16 @@
 <widget class="QComboBox" name="outputSelection"/>
 </item>
 <item>
+ <widget class="QLabel" name="warningLabel">
+ <property name="text">
+ <string>Basic.VCam.RestartWarning</string>
+ </property>
+ <property name="visible">
+	<bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
 <spacer name="verticalSpacer">
 <property name="orientation">
 <enum>Qt::Vertical</enum>

obs-studio-30.0.2.tar.xz/UI/forms/StatusBarWidget.ui Added

@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>StatusBarWidget</class>
+ <widget class="QWidget" name="StatusBarWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>714</width>
+ <height>34</height>
+ </rect>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>34</height>
+ </size>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QFrame" name="messageFrame">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border: none;</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="message">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Message</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="delayFrame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="delayInfo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>DelayInfo</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="issuesFrame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="droppedFrames">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>DroppedFrames</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="networkFrame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="statusIcon">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="obs.qrc">:/res/images/network-inactive.svg</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="kbps">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>0 kbps</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="streamFrame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="streamIcon">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="obs.qrc">:/res/images/streaming-inactive.svg</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="streamTime">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>00:00:00</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="recordFrame">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="recordIcon">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="obs.qrc">:/res/images/recording-inactive.svg</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="recordTime">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>00:00:00</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="cpuFrame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="cpuUsage">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>CPU: 0.0%</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="fpsFrame">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="fpsCurrent">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>0.00 / 0.00 FPS</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="obs.qrc"/>
+ </resources>
+ <connections/>
+</ui>

obs-studio-29.1.3.tar.xz/UI/forms/images/active.png -> obs-studio-30.0.2.tar.xz/UI/forms/images/active.png Changed

obs-studio-30.0.2.tar.xz/UI/forms/images/network-bad.svg Added

obs-studio-30.0.2.tar.xz/UI/forms/images/network-disconnected.svg Added

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-2388.3 -3285.1)">
+ <path d="m2401.3 3286.1c-0.5547 0-1 0.4453-1 1v7.2695c0.1485 0.09 0.2891 0.1914 0.4141 0.3164l0.414 0.4141h0.3438l0.4141-0.4141c0.375-0.375 0.8828-0.5859 1.414-0.5859v-7c0-0.5547-0.4453-1-1-1zm-4 3c-0.5547 0-1 0.4453-1 1v9c0 0.5547 0.4453 1 1 1h0.01c0-0.5156 0.1914-1.0273 0.5781-1.4141l0.4141-0.414v-0.3438l-0.4141-0.414c-0.7734-0.7735-0.7734-2.0547 0-2.8282 0.375-0.375 0.8829-0.5859 1.4141-0.5859v-4c0-0.5547-0.4453-1-1-1zm-4 3c-0.5547 0-1 0.4453-1 1v6c0 0.5547 0.4453 1 1 1h1c0.5547 0 1-0.4453 1-1v-6c0-0.5547-0.4453-1-1-1zm-4 3c-0.5547 0-1 0.4453-1 1v3c0 0.5547 0.4453 1 1 1h1c0.5547 0 1-0.4453 1-1v-3c0-0.5547-0.4453-1-1-1z" fill-opacity=".1"/>
+ <path d="m2399.3 3295.1c-0.2656 0-0.5195 0.1055-0.707 0.293-0.3906 0.3906-0.3906 1.0234 0 1.414l1.293 1.293-1.293 1.293c-0.3906 0.3906-0.3906 1.0234 0 1.414 0.3906 0.3907 1.0234 0.3907 1.414 0l1.293-1.2929 1.293 1.2929c0.3906 0.3907 1.0234 0.3907 1.414 0 0.3907-0.3906 0.3907-1.0234 0-1.414l-1.2929-1.293 1.2929-1.293c0.3907-0.3906 0.3907-1.0234 0-1.414-0.1875-0.1875-0.4414-0.293-0.707-0.293s-0.5195 0.1055-0.707 0.293l-1.293 1.2929-1.293-1.2929c-0.1875-0.1875-0.4414-0.293-0.707-0.293z" fill="#b8131a"/>
+ </g>
+</svg>

obs-studio-30.0.2.tar.xz/UI/forms/images/network-excellent.svg Added

obs-studio-30.0.2.tar.xz/UI/forms/images/network-good.svg Added

obs-studio-30.0.2.tar.xz/UI/forms/images/network-inactive.svg Added

obs-studio-30.0.2.tar.xz/UI/forms/images/network-mediocre.svg Added

obs-studio-29.1.3.tar.xz/UI/forms/images/paused.png -> obs-studio-30.0.2.tar.xz/UI/forms/images/paused.png Changed

obs-studio-29.1.3.tar.xz/UI/forms/images/recording-active.svg -> obs-studio-30.0.2.tar.xz/UI/forms/images/recording-active.svg Changed

@@ -1,37 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- id="svg8"
- version="1.1"
- viewBox="0 0 2.1166666 2.1166667"
- height="8"
- width="8">
- <defs
- id="defs2" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- transform="translate(0,-294.88332)"
- id="layer1">
- <circle
- r="0.52916664"
- cy="295.94165"
- cx="1.0583333"
- id="path4544"
- style="fill:#c01c28;fill-opacity:1;stroke:none;stroke-width:0.06614584;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15 8c0 3.8672-3.1328 7-7 7s-7-3.1328-7-7 3.1328-7 7-7 7 3.1328 7 7z" fill="#c31212"/>
 </svg>

obs-studio-29.1.3.tar.xz/UI/forms/images/recording-inactive.svg -> obs-studio-30.0.2.tar.xz/UI/forms/images/recording-inactive.svg Changed

@@ -1,14 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1"
-	 id="svg8" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 8 8"
-	 style="enable-background:new 0 0 8 8;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#9a9996;}
-</style>
-<g>
-	<path class="st0" d="M5.8,1.5L5,2.3C4.7,2.1,4.4,2,4,2C2.9,2,2,2.9,2,4c0,0.4,0.1,0.7,0.3,1L1.5,5.8l0.4,0.4l4.2-4.2L5.8,1.5z"/>
-	<path class="st0" d="M3,5.7C3.3,5.9,3.6,6,4,6c1.1,0,2-0.9,2-2c0-0.4-0.1-0.7-0.3-1L3,5.7z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m15 8c0 3.8672-3.1328 7-7 7s-7-3.1328-7-7 3.1328-7 7-7 7 3.1328 7 7z" fill-opacity=".1"/>
 </svg>

obs-studio-29.1.3.tar.xz/UI/forms/images/recording-pause-inactive.svg -> obs-studio-30.0.2.tar.xz/UI/forms/images/recording-pause-inactive.svg Changed

@@ -1,45 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- id="svg8"
- version="1.1"
- viewBox="0 0 5.2916665 5.2916668"
- height="20"
- width="20">
- <defs
- id="defs2" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- transform="translate(0,-291.70832)"
- id="layer1">
- <rect
- y="293.03125"
- x="1.3229166"
- height="2.6458333"
- width="1.0583333"
- id="rect822"
- style="fill:#9a9996;fill-opacity:1;stroke:none;stroke-width:0.5020116;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- <rect
- y="293.03125"
- x="2.9104166"
- height="2.6458333"
- width="1.0583333"
- id="rect822-1"
- style="fill:#9a9996;fill-opacity:1;stroke:none;stroke-width:0.5020116;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g fill-opacity=".1">
+ <path d="m3 1h3c0.55078 0 1 0.44922 1 1v12c0 0.55078-0.44922 1-1 1h-3c-0.55078 0-1-0.44922-1-1v-12c0-0.55078 0.44922-1 1-1z"/>
+ <path d="m10 1h3c0.55078 0 1 0.44922 1 1v12c0 0.55078-0.44922 1-1 1h-3c-0.55078 0-1-0.44922-1-1v-12c0-0.55078 0.44922-1 1-1z"/>
+ </g>
 </svg>

obs-studio-29.1.3.tar.xz/UI/forms/images/recording-pause.svg -> obs-studio-30.0.2.tar.xz/UI/forms/images/recording-pause.svg Changed

@@ -1,45 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- id="svg8"
- version="1.1"
- viewBox="0 0 5.2916665 5.2916668"
- height="20"
- width="20">
- <defs
- id="defs2" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- transform="translate(0,-291.70832)"
- id="layer1">
- <rect
- y="293.03125"
- x="1.3229166"
- height="2.6458333"
- width="1.0583333"
- id="rect822"
- style="fill:#f5c211;fill-opacity:1;stroke:none;stroke-width:0.5020116;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- <rect
- y="293.03125"
- x="2.9104166"
- height="2.6458333"
- width="1.0583333"
- id="rect822-1"
- style="fill:#f5c211;fill-opacity:1;stroke:none;stroke-width:0.5020116;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#e5a50a">
+ <path d="m3 1h3c0.55078 0 1 0.44922 1 1v12c0 0.55078-0.44922 1-1 1h-3c-0.55078 0-1-0.44922-1-1v-12c0-0.55078 0.44922-1 1-1z"/>
+ <path d="m10 1h3c0.55078 0 1 0.44922 1 1v12c0 0.55078-0.44922 1-1 1h-3c-0.55078 0-1-0.44922-1-1v-12c0-0.55078 0.44922-1 1-1z"/>
+ </g>
 </svg>

obs-studio-29.1.3.tar.xz/UI/forms/images/streaming-active.svg -> obs-studio-30.0.2.tar.xz/UI/forms/images/streaming-active.svg Changed

@@ -1,55 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- id="svg8"
- version="1.1"
- viewBox="0 0 2.1166666 2.1166667"
- height="8"
- width="8">
- <defs
- id="defs2" />
- <metadata
- id="metadata5">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- transform="translate(0,-294.88332)"
- id="layer1">
- <circle
- r="0.39687499"
- cy="295.94165"
- cx="1.0582843"
- id="path4544-3"
- style="fill:#1c71d8;fill-opacity:1;stroke:none;stroke-width:0.13229169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- <path
- d="M 0.41577997,296.5497 A 0.79374999,0.79374999 0 0 1 0.13224262,295.94165 0.79374999,0.79374999 0 0 1 0.41577996,295.3336"
- id="path4546-7"
- style="fill:none;fill-opacity:1;stroke:#1c71d8;stroke-width:0.15875001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- <path
- transform="scale(-1,1)"
- d="m -1.7008867,296.5497 a 0.79374999,0.79374999 0 0 1 -0.2835374,-0.60805 0.79374999,0.79374999 0 0 1 0.2835374,-0.60805"
- id="path4546-1-3"
- style="fill:none;fill-opacity:1;stroke:#1c71d8;stroke-width:0.15875001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- <path
- d="M 0.63239977,296.41847 A 0.62244385,0.62244385 0 0 1 0.4100551,295.94165 0.62244385,0.62244385 0 0 1 0.63239977,295.46483"
- id="path4546-5-7"
- style="fill:none;fill-opacity:1;stroke:#1c71d8;stroke-width:0.15875001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
- <path
- transform="scale(-1,1)"
- d="m -1.484193,296.41847 a 0.62244391,0.62244391 0 0 1 -0.2223447,-0.47682 0.62244391,0.62244391 0 0 1 0.2223447,-0.47682"
- id="path4546-5-4-2"
- style="fill:none;fill-opacity:1;stroke:#1c71d8;stroke-width:0.15875001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(1.8565 0 0 1.8565 .152 -547.29)">
+ <circle cx="1.0583" cy="295.94" r=".37705" fill="#2f95ff" style="paint-order:normal"/>
+ <g fill="none" stroke="#2f95ff" stroke-linecap="round" stroke-linejoin="round">
+ <path d="m0.6324 296.42a0.62244 0.62244 0 0 1-0.22234-0.47682 0.62244 0.62244 0 0 1 0.22234-0.47682" stroke-opacity=".67" stroke-width=".18852" style="paint-order:normal"/>
+ <path d="m1.4833 296.42a0.62244 0.62244 0 0 0 0.22234-0.47682 0.62244 0.62244 0 0 0-0.22234-0.47682" stroke-opacity=".67" stroke-width=".18852" style="paint-order:normal"/>
+ <path d="m0.39544 296.7a0.98443 0.98443 0 0 1-0.35165-0.75411 0.98443 0.98443 0 0 1 0.35165-0.75413" stroke-opacity=".33" stroke-width=".25133" style="paint-order:normal"/>
+ <path d="m1.7211 296.7a0.98443 0.98443 0 0 0 0.35165-0.75411 0.98443 0.98443 0 0 0-0.35165-0.75413" stroke-opacity=".33" stroke-width=".25133" style="paint-order:normal"/>
 </g>
+ </g>
 </svg>

obs-studio-29.1.3.tar.xz/UI/forms/images/streaming-inactive.svg -> obs-studio-30.0.2.tar.xz/UI/forms/images/streaming-inactive.svg Changed

@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<svg version="1.1"
-	 id="svg8" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 8 8"
-	 style="enable-background:new 0 0 8 8;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#9a9996;}
-</style>
-<g>
-	<path class="st0" d="M6.5,0.8L4.6,2.6C4.4,2.6,4.2,2.5,4,2.5C3.2,2.5,2.5,3.2,2.5,4c0,0.2,0.1,0.4,0.1,0.6L2.2,5.1
-		C2,4.8,1.8,4.4,1.8,4c0-0.6,0.3-1.2,0.7-1.6c0.1-0.1,0.1-0.3,0-0.4C2.5,1.9,2.3,1.9,2.2,2C1.6,2.5,1.2,3.2,1.2,4
-		c0,0.6,0.2,1.1,0.5,1.5L1.5,5.8C1.1,5.3,0.8,4.7,0.8,4c0-0.8,0.4-1.6,1-2.1c0.1-0.1,0.1-0.3,0-0.4c-0.1-0.1-0.3-0.1-0.4,0
-		C0.6,2.1,0.2,3,0.2,4c0,0.8,0.3,1.6,0.9,2.2L0.8,6.5l0.4,0.4l5.7-5.7L6.5,0.8z"/>
-	<path class="st0" d="M5.4,3.4l-2,2C3.6,5.4,3.8,5.5,4,5.5c0.8,0,1.5-0.7,1.5-1.5C5.5,3.8,5.4,3.6,5.4,3.4z"/>
-	<path class="st0" d="M6.2,2.5L5.8,2.9C6,3.2,6.2,3.6,6.2,4c0,0.6-0.3,1.2-0.7,1.6C5.3,5.7,5.3,5.9,5.4,6c0.1,0.1,0.1,0.1,0.2,0.1
-		c0.1,0,0.1,0,0.2-0.1c0.6-0.5,0.9-1.2,0.9-2C6.8,3.4,6.6,2.9,6.2,2.5z"/>
-	<path class="st0" d="M6.9,1.8L6.5,2.2C6.9,2.7,7.2,3.3,7.2,4c0,0.8-0.4,1.6-1,2.1c-0.1,0.1-0.1,0.3,0,0.4c0.1,0.1,0.1,0.1,0.2,0.1
-		c0.1,0,0.1,0,0.2-0.1C7.4,5.9,7.8,5,7.8,4C7.8,3.2,7.5,2.4,6.9,1.8z"/>
-</g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g transform="matrix(1.8565 0 0 1.8565 .152 -547.29)">
+ <circle cx="1.0583" cy="295.94" r=".37705" fill-opacity=".18" style="paint-order:normal"/>
+ <g fill="none" stroke-linecap="round" stroke-linejoin="round">
+ <path d="m0.6324 296.42a0.62244 0.62244 0 0 1-0.22234-0.47682 0.62244 0.62244 0 0 1 0.22234-0.47682" stroke="#000" stroke-opacity=".12" stroke-width=".18852" style="paint-order:normal"/>
+ <path d="m1.4833 296.42a0.62244 0.62244 0 0 0 0.22234-0.47682 0.62244 0.62244 0 0 0-0.22234-0.47682" stroke="#000" stroke-opacity=".12" stroke-width=".18852" style="paint-order:normal"/>
+ <path d="m0.39544 296.7a0.98443 0.98443 0 0 1-0.35165-0.75411 0.98443 0.98443 0 0 1 0.35165-0.75413" stroke="#060606" stroke-opacity=".07" stroke-width=".25133" style="paint-order:normal"/>
+ <path d="m1.7211 296.7a0.98443 0.98443 0 0 0 0.35165-0.75411 0.98443 0.98443 0 0 0-0.35165-0.75413" stroke="#060606" stroke-opacity=".07" stroke-width=".25133" style="paint-order:normal"/>
+ </g>
+ </g>
 </svg>

obs-studio-29.1.3.tar.xz/UI/forms/obs.qrc -> obs-studio-30.0.2.tar.xz/UI/forms/obs.qrc Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/AJAOutputUI.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/AJAOutputUI.cpp Changed

@@ -73,8 +73,8 @@
 	ui->propertiesLayout->addWidget(propertiesView);
 	obs_data_release(settings);
 
-	connect(propertiesView, SIGNAL(Changed()), this,
-		SLOT(PropertiesChanged()));
+	connect(propertiesView, &OBSPropertiesView::Changed, this,
+		&AJAOutputUI::PropertiesChanged);
 }
 
 void AJAOutputUI::SaveSettings(const char *filename, obs_data_t *settings)
@@ -130,8 +130,8 @@
 	ui->previewPropertiesLayout->addWidget(previewPropertiesView);
 	obs_data_release(settings);
 
-	connect(previewPropertiesView, SIGNAL(Changed()), this,
-		SLOT(PreviewPropertiesChanged()));
+	connect(previewPropertiesView, &OBSPropertiesView::Changed, this,
+		&AJAOutputUI::PreviewPropertiesChanged);
 }
 
 void AJAOutputUI::on_outputButton_clicked()
@@ -269,6 +269,6 @@
 
 	ui->miscPropertiesLayout->addWidget(miscPropertiesView);
 	obs_data_release(settings);
-	connect(miscPropertiesView, SIGNAL(Changed()), this,
-		SLOT(MiscPropertiesChanged()));
+	connect(miscPropertiesView, &OBSPropertiesView::Changed, this,
+		&AJAOutputUI::MiscPropertiesChanged);
 }

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/CMakeLists.txt Changed

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.22...3.25)
 
 legacy_check()
 
@@ -68,12 +68,15 @@
 APPEND
 PROPERTY AUTORCC_OPTIONS --format-version 1)
 elseif(OS_MACOS)
- find_library(IOKIT_FRAMEWORK Iokit)
- find_library(COREFOUNDATION_LIBRARY CoreFoundation)
- find_library(APPKIT_FRAMEWORK AppKit)
-
- target_link_libraries(aja-output-ui PRIVATE ${IOKIT} ${COREFOUNDATION} ${APPKIT})
- target_compile_options(aja-output-ui PRIVATE -Wno-error=deprecated-declarations)
+ # cmake-format: off
+ target_link_libraries(
+ aja-output-ui
+ PRIVATE "$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreFoundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,IOKit.framework>")
+ # cmake-format: on
+ target_compile_options(aja-output-ui PRIVATE -Wno-error=deprecated-declarations
+ -Wno-quoted-include-in-framework-header)
 elseif(OS_LINUX OR OS_FREEBSD)
 find_package(X11 REQUIRED)
 target_link_libraries(aja-output-ui PRIVATE X11::X11 Qt::GuiPrivate)

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/aja-ui-main.cpp Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake Changed

obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/en-GB.ini Added

obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/hr-HR.ini Added

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/aja-output-ui/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-captions/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/decklink-captions/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-captions/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/decklink-captions/cmake/legacy.cmake Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-captions/decklink-captions.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/decklink-captions/decklink-captions.cpp Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/decklink-output-ui/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-output-ui/DecklinkOutputUI.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/decklink-output-ui/DecklinkOutputUI.cpp Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/decklink-output-ui/decklink-ui-main.cpp Changed

@@ -39,6 +39,7 @@
 };
 
 static struct decklink_ui_output context = {0};
+static struct decklink_ui_output context_preview = {0};
 
 OBSData load_settings()
 {
@@ -61,11 +62,11 @@
 
 void output_stop()
 {
+	obs_remove_main_rendered_callback(decklink_ui_render, &context);
+
 	obs_output_stop(context.output);
 	obs_output_release(context.output);
 
-	obs_remove_main_rendered_callback(decklink_ui_render, &context);
-
 	obs_enter_graphics();
 	for (gs_stagesurf_t *&surf : context.stagesurfaces) {
 		gs_stagesurface_destroy(surf);
@@ -116,9 +117,6 @@
 
 			context.stage_index = 0;
 
-			const video_output_info *mainVOI =
-				video_output_get_info(obs_get_video());
-
 			video_output_info vi = {0};
 			vi.format = VIDEO_FORMAT_BGRA;
 			vi.width = width;
@@ -126,7 +124,7 @@
 			vi.fps_den = context.ovi.fps_den;
 			vi.fps_num = context.ovi.fps_num;
 			vi.cache_size = 16;
-			vi.colorspace = mainVOI->colorspace;
+			vi.colorspace = VIDEO_CS_DEFAULT;
 			vi.range = VIDEO_RANGE_FULL;
 			vi.name = "decklink_output";
 
@@ -192,27 +190,28 @@
 
 void preview_output_stop()
 {
-	obs_output_stop(context.output);
-	obs_output_release(context.output);
+	obs_remove_main_rendered_callback(decklink_ui_render, &context_preview);
+	obs_frontend_remove_event_callback(on_preview_scene_changed,
+					   &context_preview);
 
-	obs_remove_main_rendered_callback(decklink_ui_render, &context);
-	obs_frontend_remove_event_callback(on_preview_scene_changed, &context);
+	obs_output_stop(context_preview.output);
+	obs_output_release(context_preview.output);
 
-	obs_source_release(context.current_source);
+	obs_source_release(context_preview.current_source);
 
 	obs_enter_graphics();
-	for (gs_stagesurf_t *&surf : context.stagesurfaces) {
+	for (gs_stagesurf_t *&surf : context_preview.stagesurfaces) {
 		gs_stagesurface_destroy(surf);
 		surf = nullptr;
 	}
-	gs_texrender_destroy(context.texrender);
-	context.texrender = nullptr;
-	gs_texrender_destroy(context.texrender_premultiplied);
-	context.texrender_premultiplied = nullptr;
+	gs_texrender_destroy(context_preview.texrender);
+	context_preview.texrender = nullptr;
+	gs_texrender_destroy(context_preview.texrender_premultiplied);
+	context_preview.texrender_premultiplied = nullptr;
 	obs_leave_graphics();
 
-	video_output_close(context.video_queue);
-	obs_remove_tick_callback(decklink_ui_tick, &context);
+	video_output_close(context_preview.video_queue);
+	obs_remove_tick_callback(decklink_ui_tick, &context_preview);
 
 	preview_output_running = false;
 
@@ -230,61 +229,60 @@
 		const struct video_scale_info *const conversion =
 			obs_output_get_video_conversion(output);
 		if (conversion != nullptr) {
-			context.output = output;
-			obs_add_tick_callback(decklink_ui_tick, &context);
+			context_preview.output = output;
+			obs_add_tick_callback(decklink_ui_tick,
+					      &context_preview);
 
-			obs_get_video_info(&context.ovi);
+			obs_get_video_info(&context_preview.ovi);
 
 			const uint32_t width = conversion->width;
 			const uint32_t height = conversion->height;
 
 			obs_enter_graphics();
-			context.texrender_premultiplied =
+			context_preview.texrender_premultiplied =
 				gs_texrender_create(GS_BGRA, GS_ZS_NONE);
-			context.texrender =
+			context_preview.texrender =
 				gs_texrender_create(GS_BGRA, GS_ZS_NONE);
-			for (gs_stagesurf_t *&surf : context.stagesurfaces)
+			for (gs_stagesurf_t *&surf :
+			     context_preview.stagesurfaces)
 				surf = gs_stagesurface_create(width, height,
 							      GS_BGRA);
 			obs_leave_graphics();
 
-			for (bool &written : context.surf_written)
+			for (bool &written : context_preview.surf_written)
 				written = false;
 
-			context.stage_index = 0;
-
-			const video_output_info *mainVOI =
-				video_output_get_info(obs_get_video());
+			context_preview.stage_index = 0;
 
 			video_output_info vi = {0};
 			vi.format = VIDEO_FORMAT_BGRA;
 			vi.width = width;
 			vi.height = height;
-			vi.fps_den = context.ovi.fps_den;
-			vi.fps_num = context.ovi.fps_num;
+			vi.fps_den = context_preview.ovi.fps_den;
+			vi.fps_num = context_preview.ovi.fps_num;
 			vi.cache_size = 16;
-			vi.colorspace = mainVOI->colorspace;
+			vi.colorspace = VIDEO_CS_DEFAULT;
 			vi.range = VIDEO_RANGE_FULL;
 			vi.name = "decklink_preview_output";
 
-			video_output_open(&context.video_queue, &vi);
+			video_output_open(&context_preview.video_queue, &vi);
 
 			obs_frontend_add_event_callback(
-				on_preview_scene_changed, &context);
+				on_preview_scene_changed, &context_preview);
 			if (obs_frontend_preview_program_mode_active()) {
-				context.current_source =
+				context_preview.current_source =
 					obs_frontend_get_current_preview_scene();
 			} else {
-				context.current_source =
+				context_preview.current_source =
 					obs_frontend_get_current_scene();
 			}
 			obs_add_main_rendered_callback(decklink_ui_render,
-						       &context);
+						       &context_preview);
 
-			obs_output_set_media(context.output,
-					     context.video_queue,
+			obs_output_set_media(context_preview.output,
+					     context_preview.video_queue,
 					     obs_get_audio());
-			bool started = obs_output_start(context.output);
+			bool started = obs_output_start(context_preview.output);
 
 			preview_output_running = started;
 			if (!shutting_down)
@@ -338,14 +336,20 @@
 	uint32_t height = 0;
 	gs_texture_t *tex = nullptr;
 
-	if (main_output_running) {
+	if (ctx == &context) {
+		if (!main_output_running)
+			return;
+
 		tex = obs_get_main_texture();
 		if (!tex)
 			return;
 
 		width = gs_texture_get_width(tex);
 		height = gs_texture_get_height(tex);
-	} else if (preview_output_running) {
+	} else if (ctx == &context_preview) {
+		if (!preview_output_running)
+			return;
+
 		if (!ctx->current_source)
 			return;
 
@@ -378,7 +382,7 @@
 	}
 
 	const struct video_scale_info *const conversion =
-		obs_output_get_video_conversion(context.output);
+		obs_output_get_video_conversion(ctx->output);
 	const uint32_t scaled_width = conversion->width;
 	const uint32_t scaled_height = conversion->height;
 
@@ -386,13 +390,24 @@
 		return;
 
 	const bool previous = gs_framebuffer_srgb_enabled();
-	gs_enable_framebuffer_srgb(true);
+	const bool source_hdr = (ctx->ovi.colorspace == VIDEO_CS_2100_PQ) ||
+				(ctx->ovi.colorspace == VIDEO_CS_2100_HLG);
+	const bool target_hdr = source_hdr &&
+				(conversion->colorspace == VIDEO_CS_2100_PQ);
+	gs_enable_framebuffer_srgb(!target_hdr);
 	gs_enable_blending(false);
 
 	gs_effect_t *const effect = obs_get_base_effect(OBS_EFFECT_DEFAULT);
 	gs_effect_set_texture_srgb(gs_effect_get_param_by_name(effect, "image"),
 				   tex);
-	while (gs_effect_loop(effect, "DrawAlphaDivide")) {
+	const char *const tech_name =
+		target_hdr ? "DrawAlphaDivideR10L"
+			   : (source_hdr ? "DrawAlphaDivideTonemap"
+					 : "DrawAlphaDivide");
+	while (gs_effect_loop(effect, tech_name)) {
+		gs_effect_set_float(gs_effect_get_param_by_name(effect,
+								"multiplier"),
+				    obs_get_video_sdr_white_level() / 10000.f);
 		gs_draw_sprite(tex, 0, 0, 0);
 	}
 
@@ -449,7 +464,9 @@
 	doUI = new DecklinkOutputUI(window);
 	obs_frontend_pop_ui_translation();
 
-	auto cb = () { doUI->ShowHideDialog(); };
+	auto cb = () {
+		doUI->ShowHideDialog();
+	};
 
 	action->connect(action, &QAction::triggered, cb);
 }

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-osx.mm -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher-osx.mm Changed

@@ -6,40 +6,40 @@
 
 void GetWindowList(vector<string> &windows)
 {
-	windows.resize(0);
-
-	@autoreleasepool {
-		NSWorkspace *ws = NSWorkspace sharedWorkspace;
-		NSArray *array = ws runningApplications;
-		for (NSRunningApplication *app in array) {
-			NSString *name = app.localizedName;
-			if (!name)
-				continue;
-
-			const char *str = name.UTF8String;
-			if (str && *str)
-				windows.emplace_back(str);
-		}
-	}
+ windows.resize(0);
+
+ @autoreleasepool {
+ NSWorkspace *ws = NSWorkspace sharedWorkspace;
+ NSArray *array = ws runningApplications;
+ for (NSRunningApplication *app in array) {
+ NSString *name = app.localizedName;
+ if (!name)
+ continue;
+
+ const char *str = name.UTF8String;
+ if (str && *str)
+ windows.emplace_back(str);
+ }
+ }
 }
 
 void GetCurrentWindowTitle(string &title)
 {
-	title.resize(0);
-
-	@autoreleasepool {
-		NSWorkspace *ws = NSWorkspace sharedWorkspace;
-		NSRunningApplication *app = ws frontmostApplication;
-		if (app) {
-			NSString *name = app.localizedName;
-			if (!name)
-				return;
-
-			const char *str = name.UTF8String;
-			if (str && *str)
-				title = str;
-		}
-	}
+ title.resize(0);
+
+ @autoreleasepool {
+ NSWorkspace *ws = NSWorkspace sharedWorkspace;
+ NSRunningApplication *app = ws frontmostApplication;
+ if (app) {
+ NSString *name = app.localizedName;
+ if (!name)
+ return;
+
+ const char *str = name.UTF8String;
+ if (str && *str)
+ title = str;
+ }
+ }
 }
 
 void CleanupSceneSwitcher() {}

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.cpp Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.hpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/auto-scene-switcher.hpp Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/captions.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/captions.cpp Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake Changed

obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/af-ZA.ini Added

@@ -0,0 +1,37 @@
+SceneSwitcher="Outomatiese toneelwisselaar"
+SceneSwitcher.ActiveOrNotActive="Toneelwisselaar is:"
+InvalidRegex.Title="Ongeldige reguliere uitdrukking"
+InvalidRegex.Text="Die ingevoerde reguliere uitdrukking is ongeldig."
+Active="Aktief"
+Inactive="Onaktief"
+Start="Begin"
+Captions="Ondertiteling (eksperimenteel)"
+Captions.AudioSource="Oudiobron"
+Captions.CurrentSystemLanguage="Huidige stelseltaal (%1)"
+Captions.Provider="Voorsiener"
+Captions.Error.GenericFail="Kon nie ondertiteling begin nie"
+OutputTimer.Stream="Stop stroom na:"
+OutputTimer.Record="Stop opname na:"
+OutputTimer.Stream.StoppingIn="Stroom stop oor:"
+OutputTimer.Record.StoppingIn="Opname stop oor:"
+Scripts="Skripte"
+LoadedScripts="Gelaaide skripte"
+AddScripts="Voeg skripte toe"
+RemoveScripts="Verwyder skripte"
+ReloadScripts="Herlaai skripte"
+EditScript="Wysig skrip"
+Reload="Gerlaai"
+OpenFileLocation="Open lêerligging"
+PythonSettings="Python-instellings"
+PythonSettings.PythonInstallPath32bit="Python Installasiepad (32 bis)"
+PythonSettings.PythonInstallPath64bit="Python Installasiepad (64 bis)"
+PythonSettings.BrowsePythonPath="Blaai na Python pad"
+PythonSettings.PythonVersion="Gelaaide Python-weergawe: %1"
+PythonSettings.PythonNotLoaded="Python nie tans gelaai nie"
+PythonSettings.AlreadyLoaded.Title="Python is reeds gelaai"
+PythonSettings.AlreadyLoaded.Message="’n Kopie van Python %1 is reeds gelaai. Om die nuutgekose Python-weergawe te laai moet u OBS herbegin."
+ScriptLogWindow="Skriplogboek"
+Description="Beskrywing"
+ScriptDescriptionLink.Text="Open hierdie skakel in u verstekwebblaaier?"
+FileFilter.ScriptFiles="Skriplêers"
+FileFilter.AllFiles="Alle lêers"

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/an-ES.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/an-ES.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/be-BY.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/be-BY.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/el-GR.ini Changed

obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/en-GB.ini Added

obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/mn-MN.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/mn-MN.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-BR.ini Changed

@@ -34,10 +34,10 @@
 PythonSettings.PythonInstallPath32bit="Caminho de instalação do Python (32 bits)"
 PythonSettings.PythonInstallPath64bit="Caminho de instalação do Python (64 bits)"
 PythonSettings.BrowsePythonPath="Procurar caminho do Python"
-PythonSettings.PythonVersion="Versão Python Carregada: %1"
-PythonSettings.PythonNotLoaded="O Python não está carregado atualmente"
+PythonSettings.PythonVersion="Versão carregada do Python: %1"
+PythonSettings.PythonNotLoaded="O Python não está carregado"
 PythonSettings.AlreadyLoaded.Title="O Python já foi carregado"
-PythonSettings.AlreadyLoaded.Message="Uma cópia do Python %1 já foi carregada. Para carregar a versão recém-selecionada do Python, por favor reinicie o OBS."
+PythonSettings.AlreadyLoaded.Message="Uma cópia do Python %1 já foi carregada. Para carregar a versão recém-selecionada do Python, reinicie o OBS."
 ScriptLogWindow="Log dos scripts"
 Description="Descrição"
 ScriptDescriptionLink.Text="Abrir este link no seu navegador padrão?"

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/si-LK.ini Changed

@@ -1,5 +1,9 @@
+SceneSwitcher="ස්වයංක්‍රිය සිද්ධි මාරුව"
+SceneSwitcher.OnNoMatch="කිසිදු කවුළුවක් නොගැළපෙන විට:"
 SceneSwitcher.OnNoMatch.DontSwitch="මාරුවන්න එපා"
 SceneSwitcher.OnNoMatch.SwitchTo="වෙත මාරුවන්න:"
+SceneSwitcher.CheckInterval="සක්‍රිය කවුළුවේ සිරැසිය යළි පරීක්‍ෂාව:"
+SceneSwitcher.ActiveOrNotActive="සිද්ධි මාරුව:"
 Active="ක්‍රියාත්මකයි"
 Inactive="ක්‍රියාත්මක නැත"
 Start="අරඹන්න"
@@ -7,6 +11,9 @@
 Captions.AudioSource="ශ්‍රව්‍ය මූලාශ්‍රය"
 Captions.CurrentSystemLanguage="වත්මන් පද්ධතියේ භාෂාව (%1)"
 Captions.Provider="සැපයුම්කරු"
+OutputTimer="ප්‍රතිදාන මුහුර්තකය"
+OutputTimer.Stream.StoppingIn="ප්‍රචාරය නැවතෙන්නේ:"
+OutputTimer.Record.StoppingIn="පටිගතය නැවතෙන්නේ:"
 Scripts="අත්පත්"
 LoadedScripts="පූරණය වූ අත්පත්"
 AddScripts="අත්පත් යොදන්න"
@@ -19,6 +26,9 @@
 PythonSettings.PythonInstallPath32bit="පයිතන් ස්ථාපන මාර්ගය (බිටු 32)"
 PythonSettings.PythonInstallPath64bit="පයිතන් ස්ථාපන මාර්ගය (බිටු 64)"
 PythonSettings.BrowsePythonPath="පයිතන් මාර්ගය පිරික්සන්න"
+PythonSettings.PythonVersion="පූරණය වූ පයිතන් අනුවාදය: %1"
+PythonSettings.PythonNotLoaded="දැනට පයිතන් පූරණය වී නැත"
+PythonSettings.AlreadyLoaded.Title="පයිතන් පූරණය වී ඇත"
 ScriptLogWindow="අත්පත සටහන"
 Description="සවිස්තරය"
 ScriptDescriptionLink.Text.Url="ඒ.ස.නි.: %1"

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/locale/zh-CN.ini Changed

@@ -1,9 +1,9 @@
-SceneSwitcher="自动场景切换器"
-SceneSwitcher.OnNoMatch="当没有窗口匹配的时候:"
+SceneSwitcher="场景自动切换器"
+SceneSwitcher.OnNoMatch="当没有匹配的窗口的时候:"
 SceneSwitcher.OnNoMatch.DontSwitch="不切换"
-SceneSwitcher.OnNoMatch.SwitchTo="切换到:"
-SceneSwitcher.CheckInterval="检查活动窗口的标题,每:"
-SceneSwitcher.ActiveOrNotActive="场景切换器是:"
+SceneSwitcher.OnNoMatch.SwitchTo="切换到："
+SceneSwitcher.CheckInterval="每隔一段时间检查活动窗口标题："
+SceneSwitcher.ActiveOrNotActive="场景切换器："
 InvalidRegex.Title="无效的正则表达式"
 InvalidRegex.Text="您输入的正则表达式是无效的。"
 Active="已激活"
@@ -13,16 +13,16 @@
 Captions="字幕 (实验)"
 Captions.AudioSource="音频源"
 Captions.CurrentSystemLanguage="当前系统语言 (%1)"
-Captions.Provider="提供程序"
+Captions.Provider="字幕提供程序"
 Captions.Error.GenericFail="字幕启动失败"
 OutputTimer="输出计时器"
 OutputTimer.Stream="此时间后停止推流："
 OutputTimer.Record="此时间后停止录制："
-OutputTimer.Stream.StoppingIn="串流停止倒计时:"
-OutputTimer.Record.StoppingIn="录制停止倒计时:"
+OutputTimer.Stream.StoppingIn="串流停止倒计时："
+OutputTimer.Record.StoppingIn="录制停止倒计时："
 OutputTimer.Stream.EnableEverytime="每次开启流计时器"
 OutputTimer.Record.EnableEverytime="每次开启录制计时器"
-OutputTimer.Record.PauseTimer="暂停录制时暂停计时器"
+OutputTimer.Record.PauseTimer="在录制暂停时暂停计时器"
 Scripts="脚本"
 LoadedScripts="已载入脚本"
 AddScripts="添加脚本"
@@ -42,6 +42,7 @@
 ScriptLogWindow="脚本日志"
 Description="说明"
 ScriptDescriptionLink.Text="使用默认网络浏览器打开此链接？"
+ScriptDescriptionLink.Text.Url="网址: %1"
 ScriptDescriptionLink.OpenURL="打开URL"
 FileFilter.ScriptFiles="脚本文件"
 FileFilter.AllFiles="所有文件"

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/scripts/countdown.lua -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/scripts/countdown.lua Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/scripts/instant-replay.lua -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/scripts/instant-replay.lua Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/data/scripts/url-text.py -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/data/scripts/url-text.py Changed

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/output-timer.cpp Changed

@@ -13,18 +13,19 @@
 OutputTimer *ot;
 
 OutputTimer::OutputTimer(QWidget *parent)
-	: QDialog(parent), ui(new Ui_OutputTimer)
+	: QDialog(parent),
+	  ui(new Ui_OutputTimer)
 {
 	ui->setupUi(this);
 
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-	QObject::connect(ui->outputTimerStream, SIGNAL(clicked()), this,
-			 SLOT(StreamingTimerButton()));
-	QObject::connect(ui->outputTimerRecord, SIGNAL(clicked()), this,
-			 SLOT(RecordingTimerButton()));
+	QObject::connect(ui->outputTimerStream, &QPushButton::clicked, this,
+			 &OutputTimer::StreamingTimerButton);
+	QObject::connect(ui->outputTimerRecord, &QPushButton::clicked, this,
+			 &OutputTimer::RecordingTimerButton);
 	QObject::connect(ui->buttonBox->button(QDialogButtonBox::Close),
-			 SIGNAL(clicked()), this, SLOT(hide()));
+			 &QPushButton::clicked, this, &OutputTimer::hide);
 
 	streamingTimer = new QTimer(this);
 	streamingTimerDisplay = new QTimer(this);
@@ -85,11 +86,11 @@
 	streamingTimer->setInterval(total);
 	streamingTimer->setSingleShot(true);
 
-	QObject::connect(streamingTimer, SIGNAL(timeout()),
-			 SLOT(EventStopStreaming()));
+	QObject::connect(streamingTimer, &QTimer::timeout, this,
+			 &OutputTimer::EventStopStreaming);
 
-	QObject::connect(streamingTimerDisplay, SIGNAL(timeout()), this,
-			 SLOT(UpdateStreamTimerDisplay()));
+	QObject::connect(streamingTimerDisplay, &QTimer::timeout, this,
+			 &OutputTimer::UpdateStreamTimerDisplay);
 
 	streamingTimer->start();
 	streamingTimerDisplay->start(1000);
@@ -119,11 +120,11 @@
 	recordingTimer->setInterval(total);
 	recordingTimer->setSingleShot(true);
 
-	QObject::connect(recordingTimer, SIGNAL(timeout()),
-			 SLOT(EventStopRecording()));
+	QObject::connect(recordingTimer, &QTimer::timeout, this,
+			 &OutputTimer::EventStopRecording);
 
-	QObject::connect(recordingTimerDisplay, SIGNAL(timeout()), this,
-			 SLOT(UpdateRecordTimerDisplay()));
+	QObject::connect(recordingTimerDisplay, &QTimer::timeout, this,
+			 &OutputTimer::UpdateRecordTimerDisplay);
 
 	recordingTimer->start();
 	recordingTimerDisplay->start(1000);
@@ -228,10 +229,10 @@
 {
 	if (!isVisible()) {
 		setVisible(true);
-		QTimer::singleShot(250, this, SLOT(show()));
+		QTimer::singleShot(250, this, &OutputTimer::show);
 	} else {
 		setVisible(false);
-		QTimer::singleShot(250, this, SLOT(hide()));
+		QTimer::singleShot(250, this, &OutputTimer::hide);
 	}
 }
 
@@ -339,7 +340,9 @@
 
 	ot = new OutputTimer(window);
 
-	auto cb = () { ot->ShowHideDialog(); };
+	auto cb = () {
+		ot->ShowHideDialog();
+	};
 
 	obs_frontend_pop_ui_translation();

obs-studio-29.1.3.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp -> obs-studio-30.0.2.tar.xz/UI/frontend-plugins/frontend-tools/scripts.cpp Changed

@@ -420,17 +420,17 @@
 
 	obs_frontend_push_ui_translation(obs_module_get_string);
 
-	popup.addAction(tr("Add"), this, SLOT(on_addScripts_clicked()));
+	popup.addAction(tr("Add"), this, &ScriptsTool::on_addScripts_clicked);
 
 	if (item) {
 		popup.addSeparator();
 		popup.addAction(obs_module_text("Reload"), this,
-				SLOT(on_reloadScripts_clicked()));
+				&ScriptsTool::on_reloadScripts_clicked);
 		popup.addAction(obs_module_text("OpenFileLocation"), this,
-				SLOT(OpenScriptParentDirectory()));
+				&ScriptsTool::OpenScriptParentDirectory);
 		popup.addSeparator();
 		popup.addAction(tr("Remove"), this,
-				SLOT(on_removeScripts_clicked()));
+				&ScriptsTool::on_removeScripts_clicked);
 	}
 	obs_frontend_pop_ui_translation();
 
@@ -529,10 +529,14 @@
 
 	OBSDataAutoRelease settings = obs_script_get_settings(script);
 
-	propertiesView = new OBSPropertiesView(
+	OBSPropertiesView *view = new OBSPropertiesView(
 		settings.Get(), script,
 		(PropertiesReloadCallback)obs_script_get_properties, nullptr,
 		(PropertiesVisualUpdateCb)obs_script_update);
+	view->SetDeferrable(false);
+
+	propertiesView = view;
+
 	ui->propertiesLayout->addWidget(propertiesView);
 	ui->description->setText(obs_script_get_description(script));
 }

obs-studio-29.1.3.tar.xz/UI/hotkey-edit.cpp -> obs-studio-30.0.2.tar.xz/UI/hotkey-edit.cpp Changed

obs-studio-29.1.3.tar.xz/UI/hotkey-edit.hpp -> obs-studio-30.0.2.tar.xz/UI/hotkey-edit.hpp Changed

@@ -49,11 +49,7 @@
 	QPointer<OBSHotkeyLabel> pairPartner;
 	QPointer<OBSHotkeyWidget> widget;
 	void highlightPair(bool highlight);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	void enterEvent(QEnterEvent *event) override;
-#else
-	void enterEvent(QEvent *event) override;
-#endif
 	void leaveEvent(QEvent *event) override;
 	void setToolTip(const QString &toolTip);
 };
@@ -64,7 +60,9 @@
 public:
 	OBSHotkeyEdit(QWidget *parent, obs_key_combination_t original,
 		 OBSBasicSettings *settings)
-		: QLineEdit(parent), original(original), settings(settings)
+		: QLineEdit(parent),
+		 original(original),
+		 settings(settings)
 	{
 #ifdef __APPLE__
 		// disable the input cursor on OSX, focus should be clear
@@ -77,7 +75,9 @@
 		ResetKey();
 	}
 	OBSHotkeyEdit(QWidget *parent = nullptr)
-		: QLineEdit(parent), original({}), settings(nullptr)
+		: QLineEdit(parent),
+		 original({}),
+		 settings(nullptr)
 	{
 #ifdef __APPLE__
 		// disable the input cursor on OSX, focus should be clear
@@ -172,11 +172,7 @@
 	void Save();
 	void Save(std::vector<obs_key_combination_t> &combinations);
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	void enterEvent(QEnterEvent *event) override;
-#else
-	void enterEvent(QEvent *event) override;
-#endif
 	void leaveEvent(QEvent *event) override;
 
 private:

obs-studio-29.1.3.tar.xz/UI/importers/sl.cpp -> obs-studio-30.0.2.tar.xz/UI/importers/sl.cpp Changed

obs-studio-29.1.3.tar.xz/UI/item-widget-helpers.cpp -> obs-studio-30.0.2.tar.xz/UI/item-widget-helpers.cpp Changed

obs-studio-29.1.3.tar.xz/UI/item-widget-helpers.hpp -> obs-studio-30.0.2.tar.xz/UI/item-widget-helpers.hpp Changed

obs-studio-29.1.3.tar.xz/UI/lineedit-autoresize.cpp -> obs-studio-30.0.2.tar.xz/UI/lineedit-autoresize.cpp Changed

obs-studio-29.1.3.tar.xz/UI/log-viewer.cpp -> obs-studio-30.0.2.tar.xz/UI/log-viewer.cpp Changed

obs-studio-29.1.3.tar.xz/UI/media-controls.cpp -> obs-studio-30.0.2.tar.xz/UI/media-controls.cpp Changed

@@ -44,7 +44,8 @@
 }
 
 MediaControls::MediaControls(QWidget *parent)
-	: QWidget(parent), ui(new Ui::MediaControls)
+	: QWidget(parent),
+	  ui(new Ui::MediaControls)
 {
 	ui->setupUi(this);
 	ui->playPauseButton->setProperty("themeID", "playIcon");
@@ -53,17 +54,18 @@
 	ui->stopButton->setProperty("themeID", "stopIcon");
 	setFocusPolicy(Qt::StrongFocus);
 
-	connect(&mediaTimer, SIGNAL(timeout()), this,
-		SLOT(SetSliderPosition()));
-	connect(&seekTimer, SIGNAL(timeout()), this, SLOT(SeekTimerCallback()));
-	connect(ui->slider, SIGNAL(sliderPressed()), this,
-		SLOT(MediaSliderClicked()));
-	connect(ui->slider, SIGNAL(mediaSliderHovered(int)), this,
-		SLOT(MediaSliderHovered(int)));
-	connect(ui->slider, SIGNAL(sliderReleased()), this,
-		SLOT(MediaSliderReleased()));
-	connect(ui->slider, SIGNAL(sliderMoved(int)), this,
-		SLOT(MediaSliderMoved(int)));
+	connect(&mediaTimer, &QTimer::timeout, this,
+		&MediaControls::SetSliderPosition);
+	connect(&seekTimer, &QTimer::timeout, this,
+		&MediaControls::SeekTimerCallback);
+	connect(ui->slider, &MediaSlider::sliderPressed, this,
+		&MediaControls::MediaSliderClicked);
+	connect(ui->slider, &MediaSlider::mediaSliderHovered, this,
+		&MediaControls::MediaSliderHovered);
+	connect(ui->slider, &MediaSlider::sliderReleased, this,
+		&MediaControls::MediaSliderReleased);
+	connect(ui->slider, &MediaSlider::sliderMoved, this,
+		&MediaControls::MediaSliderMoved);
 
 	countDownTimer = config_get_bool(App()->GlobalConfig(), "BasicWindow",
 					 "MediaControlsCountdownTimer");
@@ -71,27 +73,28 @@
 	QAction *restartAction = new QAction(this);
 	restartAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
 	restartAction->setShortcut({Qt::Key_R});
-	connect(restartAction, SIGNAL(triggered()), this, SLOT(RestartMedia()));
+	connect(restartAction, &QAction::triggered, this,
+		&MediaControls::RestartMedia);
 	addAction(restartAction);
 
 	QAction *sliderFoward = new QAction(this);
 	sliderFoward->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-	connect(sliderFoward, SIGNAL(triggered()), this,
-		SLOT(MoveSliderFoward()));
+	connect(sliderFoward, &QAction::triggered, this,
+		&MediaControls::MoveSliderFoward);
 	sliderFoward->setShortcut({Qt::Key_Right});
 	addAction(sliderFoward);
 
 	QAction *sliderBack = new QAction(this);
 	sliderBack->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-	connect(sliderBack, SIGNAL(triggered()), this,
-		SLOT(MoveSliderBackwards()));
+	connect(sliderBack, &QAction::triggered, this,
+		&MediaControls::MoveSliderBackwards);
 	sliderBack->setShortcut({Qt::Key_Left});
 	addAction(sliderBack);
 
 	QAction *playPause = new QAction(this);
 	playPause->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-	connect(playPause, SIGNAL(triggered()), this,
-		SLOT(on_playPauseButton_clicked()));
+	connect(playPause, &QAction::triggered, this,
+		&MediaControls::on_playPauseButton_clicked);
 	playPause->setShortcut({Qt::Key_Space});
 	addAction(playPause);
 }

obs-studio-29.1.3.tar.xz/UI/multiview.cpp -> obs-studio-30.0.2.tar.xz/UI/multiview.cpp Changed

obs-studio-29.1.3.tar.xz/UI/obs-app.cpp -> obs-studio-30.0.2.tar.xz/UI/obs-app.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@
 #endif
 
 #if defined(_WIN32) || defined(ENABLE_SPARKLE_UPDATER)
-#include <json11.hpp>
+#include "update/models/branches.hpp"
 #endif
 
 #if !defined(_WIN32) && !defined(__APPLE__)
@@ -87,6 +87,10 @@
 
 bool portable_mode = false;
 bool steam = false;
+bool safe_mode = false;
+bool disable_3p_plugins = false;
+bool unclean_shutdown = false;
+bool disable_shutdown_check = false;
 static bool multi = false;
 static bool log_verbose = false;
 static bool unfiltered_log = false;
@@ -98,9 +102,6 @@
 bool opt_minimize_tray = false;
 bool opt_allow_opengl = false;
 bool opt_always_on_top = false;
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-bool opt_disable_high_dpi_scaling = false;
-#endif
 bool opt_disable_updater = false;
 bool opt_disable_missing_files_check = false;
 string opt_starting_collection;
@@ -108,6 +109,8 @@
 string opt_starting_scene;
 
 bool restart = false;
+bool restart_safe = false;
+QStringList arguments;
 
 QPointer<OBSLogViewer> obsLogViewer;
 
@@ -1287,28 +1290,31 @@
 void ParseBranchesJson(const std::string &jsonString, vector<UpdateBranch> &out,
 		 std::string &error)
 {
-	json11::Json root;
-	root = json11::Json::parse(jsonString, error);
-	if (!error.empty() || !root.is_array())
+	JsonBranches branches;
+
+	try {
+		nlohmann::json json = nlohmann::json::parse(jsonString);
+		branches = json.get<JsonBranches>();
+	} catch (nlohmann::json::exception &e) {
+		error = e.what();
 		return;
+	}
 
-	for (const json11::Json &item : root.array_items()) {
+	for (const JsonBranch &json_branch : branches) {
 #ifdef _WIN32
-		if (!item"windows".bool_value())
+		if (!json_branch.windows)
 			continue;
 #elif defined(__APPLE__)
-		if (!item"macos".bool_value())
+		if (!json_branch.macos)
 			continue;
 #endif
 
 		UpdateBranch branch = {
-			QString::fromStdString(item"name".string_value()),
-			QString::fromStdString(
-				item"display_name".string_value()),
-			QString::fromStdString(
-				item"description".string_value()),
-			item"enabled".bool_value(),
-			item"visible".bool_value(),
+			QString::fromStdString(json_branch.name),
+			QString::fromStdString(json_branch.display_name),
+			QString::fromStdString(json_branch.description),
+			json_branch.enabled,
+			json_branch.visible,
 		};
 		out.push_back(branch);
 	}
@@ -1393,7 +1399,8 @@
 }
 
 OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)
-	: QApplication(argc, argv), profilerNameStore(store)
+	: QApplication(argc, argv),
+	 profilerNameStore(store)
 {
 	/* fix float handling */
 #if defined(Q_OS_UNIX)
@@ -1405,8 +1412,11 @@
 	/* Handle SIGINT properly */
 	socketpair(AF_UNIX, SOCK_STREAM, 0, sigintFd);
 	snInt = new QSocketNotifier(sigintFd1, QSocketNotifier::Read, this);
-	connect(snInt, SIGNAL(activated(QSocketDescriptor)), this,
-		SLOT(ProcessSigInt()));
+	connect(snInt, &QSocketNotifier::activated, this,
+		&OBSApp::ProcessSigInt);
+#else
+	connect(qApp, &QGuiApplication::commitDataRequest, this,
+		&OBSApp::commitData);
 #endif
 
 	sleepInhibitor = os_inhibit_sleep_create("OBS Video/audio");
@@ -1659,10 +1669,6 @@
 {
 	ProfileScope("OBSApp::OBSInit");
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	setAttribute(Qt::AA_UseHighDpiPixmaps);
-#endif
-
 	qRegisterMetaType<VoidFunc>("VoidFunc");
 
 #if !defined(_WIN32) && !defined(__APPLE__)
@@ -1721,12 +1727,18 @@
 	 QT_VERSION_STR);
 	blog(LOG_INFO, "Portable mode: %s", portable_mode ? "true" : "false");
 
+	if (safe_mode) {
+		blog(LOG_WARNING, "Safe Mode enabled.");
+	} else if (disable_3p_plugins) {
+		blog(LOG_WARNING, "Third-party plugins disabled.");
+	}
+
 	setQuitOnLastWindowClosed(false);
 
 	mainWindow = new OBSBasic();
 
 	mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);
-	connect(mainWindow, SIGNAL(destroyed()), this, SLOT(quit()));
+	connect(mainWindow, &OBSBasic::destroyed, this, &OBSApp::quit);
 
 	mainWindow->OBSInit();
 
@@ -1743,7 +1755,7 @@
 	stringstream ver;
 
 #ifdef HAVE_OBSCONFIG_H
-	ver << OBS_VERSION;
+	ver << obs_get_version_string();
 #else
 	ver << LIBOBS_API_MAJOR_VER << "." << LIBOBS_API_MINOR_VER << "."
 	 << LIBOBS_API_PATCH_VER;
@@ -2319,13 +2331,7 @@
 
 	ScopeProfiler prof{run_program_init};
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) && \
-	(QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
-	QGuiApplication::setAttribute(opt_disable_high_dpi_scaling
-					 ? Qt::AA_DisableHighDpiScaling
-					 : Qt::AA_EnableHighDpiScaling);
-#endif
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) && defined(_WIN32)
+#ifdef _WIN32
 	QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
 		Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 #endif
@@ -2350,14 +2356,12 @@
 
 	setenv("QT_STYLE_OVERRIDE", "Fusion", false);
 
-#if OBS_QT_VERSION == 6
 	/* NOTE: Users blindly set this, but this theme is incompatble with Qt6 and
 	 * crashes loading saved geometry. Just turn off this theme and let users complain OBS
 	 * looks ugly instead of crashing. */
 	const char *platform_theme = getenv("QT_QPA_PLATFORMTHEME");
 	if (platform_theme && strcmp(platform_theme, "qt5ct") == 0)
 		unsetenv("QT_QPA_PLATFORMTHEME");
-#endif
 
 #if defined(ENABLE_WAYLAND) && defined(USE_XDG)
 	/* NOTE: Qt doesn't use the Wayland platform on GNOME, so we have to
@@ -2443,6 +2447,10 @@
 			blog(LOG_WARNING, "================================");
 			blog(LOG_WARNING, "User is now running multiple "
 					 "instances of OBS!");
+			/* Clear unclean_shutdown flag as multiple instances
+			 * running from the same config will lead to a
+			 * false-positive detection.*/
+			unclean_shutdown = false;
 		}
 
 		/* --------------------------------------- */
@@ -2467,6 +2475,60 @@
 		if (!created_log)
 			create_log_file(logFile);
 
+		if (unclean_shutdown) {
+			blog(LOG_WARNING,
+			 "Safe Mode Unclean shutdown detected!");
+		}
+
+		if (unclean_shutdown && !safe_mode) {
+			QMessageBox mb(QMessageBox::Warning,
+				 QTStr("AutoSafeMode.Title"),
+				 QTStr("AutoSafeMode.Text"));
+			QPushButton *launchSafeButton =
+				mb.addButton(QTStr("AutoSafeMode.LaunchSafe"),
+					 QMessageBox::AcceptRole);
+			QPushButton *launchNormalButton =
+				mb.addButton(QTStr("AutoSafeMode.LaunchNormal"),
+					 QMessageBox::RejectRole);
+			mb.setDefaultButton(launchNormalButton);
+			mb.exec();
+
+			safe_mode = mb.clickedButton() == launchSafeButton;
+			if (safe_mode) {
+				blog(LOG_INFO,
+				 "Safe Mode User has launched in Safe Mode.");
+			} else {
+				blog(LOG_WARNING,
+				 "Safe Mode User elected to launch normally.");
+			}
+		}
+
+		qInstallMessageHandler((QtMsgType type,
+					 const QMessageLogContext &,
+					 const QString &message) {
+			switch (type) {
+#ifdef _DEBUG
+			case QtDebugMsg:
+				blog(LOG_DEBUG, "%s", QT_TO_UTF8(message));
+				break;
+			case QtInfoMsg:
+				blog(LOG_INFO, "%s", QT_TO_UTF8(message));
+				break;
+#else
+			case QtDebugMsg:
+			case QtInfoMsg:
+				break;
+#endif
+			case QtWarningMsg:
+				blog(LOG_WARNING, "%s", QT_TO_UTF8(message));
+				break;
+			case QtCriticalMsg:
+			case QtFatalMsg:
+				blog(LOG_ERROR, "%s", QT_TO_UTF8(message));
+				break;
+			}
+		});
+
 #ifdef __APPLE__
 		MacPermissionStatus audio_permission =
 			CheckPermission(kAudioDeviceAccess);
@@ -2528,9 +2590,15 @@
 		OBSErrorBox(nullptr, "%s", error);
 	}
 
-	if (restart)
-		QProcess::startDetached(qApp->arguments()0,
-					qApp->arguments());
+	if (restart || restart_safe) {
+		arguments = qApp->arguments();
+
+		if (restart_safe) {
+			arguments.append("--safe-mode");
+		} else {
+			arguments.removeAll("--safe-mode");
+		}
+	}
 
 	return ret;
 }
@@ -2813,39 +2881,6 @@
 	 (short_form && strcmp(arg, short_form) == 0);
 }
 
-#if !defined(_WIN32) && !defined(__APPLE__)
-#define IS_UNIX 1
-#endif
-
-/* if using XDG and was previously using an older build of OBS, move config
- * files to XDG directory */
-#if defined(USE_XDG) && defined(IS_UNIX)
-static void move_to_xdg(void)
-{
-	char old_path512;
-	char new_path512;
-	char *home = getenv("HOME");
-	if (!home)
-		return;
-
-	if (snprintf(old_path, sizeof(old_path), "%s/.obs-studio", home) <= 0)
-		return;
-
-	/* make base xdg path if it doesn't already exist */
-	if (GetConfigPath(new_path, sizeof(new_path), "") <= 0)
-		return;
-	if (os_mkdirs(new_path) == MKDIR_ERROR)
-		return;
-
-	if (GetConfigPath(new_path, sizeof(new_path), "obs-studio") <= 0)
-		return;
-
-	if (os_file_exists(old_path) && !os_file_exists(new_path)) {
-		rename(old_path, new_path);
-	}
-}
-#endif
-
 static bool update_ffmpeg_output(ConfigFile &config)
 {
 	if (config_has_user_value(config, "AdvOut", "FFOutputToFile"))
@@ -2933,51 +2968,6 @@
 	return false;
 }
 
-static void convert_x264_settings(obs_data_t *data)
-{
-	bool use_bufsize = obs_data_get_bool(data, "use_bufsize");
-
-	if (use_bufsize) {
-		int buffer_size = (int)obs_data_get_int(data, "buffer_size");
-		if (buffer_size == 0)
-			obs_data_set_string(data, "rate_control", "CRF");
-	}
-}
-
-static void convert_14_2_encoder_setting(const char *encoder, const char *file)
-{
-	OBSDataAutoRelease data =
-		obs_data_create_from_json_file_safe(file, "bak");
-	obs_data_item_t *cbr_item = obs_data_item_byname(data, "cbr");
-	obs_data_item_t *rc_item = obs_data_item_byname(data, "rate_control");
-	bool modified = false;
-	bool cbr = true;
-
-	if (cbr_item) {
-		cbr = obs_data_item_get_bool(cbr_item);
-		obs_data_item_unset_user_value(cbr_item);
-
-		obs_data_set_string(data, "rate_control", cbr ? "CBR" : "VBR");
-
-		modified = true;
-	}
-
-	if (!rc_item && astrcmpi(encoder, "obs_x264") == 0) {
-		if (!cbr_item)
-			obs_data_set_string(data, "rate_control", "CBR");
-		else if (!cbr)
-			convert_x264_settings(data);
-
-		modified = true;
-	}
-
-	if (modified)
-		obs_data_save_json_safe(data, file, "tmp", "bak");
-
-	obs_data_item_release(&rc_item);
-	obs_data_item_release(&cbr_item);
-}
-
 static void convert_nvenc_h264_presets(obs_data_t *data)
 {
 	const char *preset = obs_data_get_string(data, "preset");
@@ -3215,6 +3205,32 @@
 	os_closedir(dir);
 }
 
+static void check_safe_mode_sentinel(void)
+{
+#ifndef NDEBUG
+	/* Safe Mode detection is disabled in Debug builds to keep developers
+	 * somewhat sane. */
+	return;
+#else
+	if (disable_shutdown_check)
+		return;
+
+	BPtr sentinelPath = GetConfigPathPtr("obs-studio/safe_mode");
+	if (os_file_exists(sentinelPath)) {
+		unclean_shutdown = true;
+		return;
+	}
+
+	os_quick_write_utf8_file(sentinelPath, nullptr, 0, false);
+#endif
+}
+
+static void delete_safe_mode_sentinel(void)
+{
+	BPtr sentinelPath = GetConfigPathPtr("obs-studio/safe_mode");
+	os_unlink(sentinelPath);
+}
+
 #ifndef _WIN32
 void OBSApp::SigIntSignalHandler(int s)
 {
@@ -3243,6 +3259,16 @@
 #endif
 }
 
+#ifdef _WIN32
+void OBSApp::commitData(QSessionManager &manager)
+{
+	if (auto main = App()->GetMainWindow()) {
+		QMetaObject::invokeMethod(main, "close", Qt::QueuedConnection);
+		manager.cancel();
+	}
+}
+#endif
+
 int main(int argc, char *argv)
 {
 #ifndef _WIN32
@@ -3288,15 +3314,12 @@
 
 	base_get_log_handler(&def_log_handler, nullptr);
 
-#if defined(USE_XDG) && defined(IS_UNIX)
-	move_to_xdg();
-#endif
-
 	obs_set_cmdline_args(argc, argv);
 
 	for (int i = 1; i < argc; i++) {
 		if (arg_is(argvi, "--multi", "-m")) {
 			multi = true;
+			disable_shutdown_check = true;
 
 #if ALLOW_PORTABLE_MODE
 		} else if (arg_is(argvi, "--portable", "-p")) {
@@ -3306,6 +3329,17 @@
 		} else if (arg_is(argvi, "--verbose", nullptr)) {
 			log_verbose = true;
 
+		} else if (arg_is(argvi, "--safe-mode", nullptr)) {
+			safe_mode = true;
+
+		} else if (arg_is(argvi, "--only-bundled-plugins", nullptr)) {
+			disable_3p_plugins = true;
+
+		} else if (arg_is(argvi, "--disable-shutdown-check",
+				 nullptr)) {
+			/* This exists mostly to bypass the dialog during development. */
+			disable_shutdown_check = true;
+
 		} else if (arg_is(argvi, "--always-on-top", nullptr)) {
 			opt_always_on_top = true;
 
@@ -3355,11 +3389,6 @@
 		} else if (arg_is(argvi, "--steam", nullptr)) {
 			steam = true;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-		} else if (arg_is(argvi, "--disable-high-dpi-scaling",
-				 nullptr)) {
-			opt_disable_high_dpi_scaling = true;
-#endif
 		} else if (arg_is(argvi, "--help", "-h")) {
 			std::string help =
 				"--help, -h: Get list of available commands.\n\n"
@@ -3377,15 +3406,14 @@
 				"--portable, -p: Use portable mode.\n"
 #endif
 				"--multi, -m: Don't warn when launching multiple instances.\n\n"
+				"--safe-mode: Run in Safe Mode (disables third-party plugins, scripting, and WebSockets).\n"
+				"--only-bundled-plugins: Only load included (first-party) plugins\n"
+				"--disable-shutdown-check: Disable unclean shutdown detection.\n"
 				"--verbose: Make log more verbose.\n"
 				"--always-on-top: Start in 'always on top' mode.\n\n"
 				"--unfiltered_log: Make log unfiltered.\n\n"
 				"--disable-updater: Disable built-in updater (Windows/Mac only)\n\n"
-				"--disable-missing-files-check: Disable the missing files dialog which can appear on startup.\n\n"
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-				"--disable-high-dpi-scaling: Disable automatic high-DPI scaling\n\n"
-#endif
-				;
+				"--disable-missing-files-check: Disable the missing files dialog which can appear on startup.\n\n";
 
 #ifdef _WIN32
 			MessageBoxA(NULL, help.c_str(), "Help",
@@ -3427,6 +3455,7 @@
 	}
 #endif
 
+	check_safe_mode_sentinel();
 	upgrade_settings();
 
 	fstream logFile;
@@ -3446,7 +3475,14 @@
 	log_blocked_dlls();
 #endif
 
+	delete_safe_mode_sentinel();
 	blog(LOG_INFO, "Number of memory leaks: %ld", bnum_allocs());
 	base_set_log_handler(nullptr, nullptr);
+
+	if (restart || restart_safe) {
+		auto executable = arguments.takeFirst();
+		QProcess::startDetached(executable, arguments);
+	}
+
 	return ret;
 }

obs-studio-29.1.3.tar.xz/UI/obs-app.hpp -> obs-studio-30.0.2.tar.xz/UI/obs-app.hpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 #include <QPointer>
 #ifndef _WIN32
 #include <QSocketNotifier>
+#else
+#include <QSessionManager>
 #endif
 #include <obs.hpp>
 #include <util/lexer.h>
@@ -132,6 +134,9 @@
 #ifndef _WIN32
 	static int sigintFd2;
 	QSocketNotifier *snInt = nullptr;
+#else
+private slots:
+	void commitData(QSessionManager &manager);
 #endif
 
 public:
@@ -250,7 +255,10 @@
 {
 	return App()->GetString(lookup);
 }
-#define QTStr(lookupVal) QString::fromUtf8(Str(lookupVal))
+inline QString QTStr(const char *lookupVal)
+{
+	return QString::fromUtf8(Str(lookupVal));
+}
 
 bool GetFileSafeName(const char *name, std::string &file);
 bool GetClosestUnusedFileName(std::string &path, const char *extension);
@@ -267,6 +275,8 @@
 
 extern bool portable_mode;
 extern bool steam;
+extern bool safe_mode;
+extern bool disable_3p_plugins;
 
 extern bool opt_start_streaming;
 extern bool opt_start_recording;
@@ -276,11 +286,9 @@
 extern bool opt_studio_mode;
 extern bool opt_allow_opengl;
 extern bool opt_always_on_top;
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-extern bool opt_disable_high_dpi_scaling;
-#endif
 extern std::string opt_starting_scene;
 extern bool restart;
+extern bool restart_safe;
 
 #ifdef _WIN32
 extern "C" void install_dll_blocklist_hook(void);

obs-studio-29.1.3.tar.xz/UI/obs-frontend-api/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/UI/obs-frontend-api/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp -> obs-studio-30.0.2.tar.xz/UI/obs-frontend-api/obs-frontend-api.cpp Changed

obs-studio-29.1.3.tar.xz/UI/obs-frontend-api/obs-frontend-api.h -> obs-studio-30.0.2.tar.xz/UI/obs-frontend-api/obs-frontend-api.h Changed

obs-studio-29.1.3.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp -> obs-studio-30.0.2.tar.xz/UI/obs-frontend-api/obs-frontend-internal.hpp Changed

obs-studio-29.1.3.tar.xz/UI/obs.rc.in -> obs-studio-30.0.2.tar.xz/UI/obs.rc.in Changed

obs-studio-29.1.3.tar.xz/UI/platform-osx.mm -> obs-studio-30.0.2.tar.xz/UI/platform-osx.mm Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,359 +34,292 @@
 
 bool isInBundle()
 {
-	NSRunningApplication *app = NSRunningApplication currentApplication;
-	return app bundleIdentifier != nil;
+ NSRunningApplication *app = NSRunningApplication currentApplication;
+ return app bundleIdentifier != nil;
 }
 
 bool GetDataFilePath(const char *data, string &output)
 {
-	NSRunningApplication *app = NSRunningApplication currentApplication;
-	NSURL *bundleURL = app bundleURL;
-	NSString *path = NSString
-		stringWithFormat:@"Contents/Resources/%@",
-				 NSString stringWithUTF8String:data;
-	NSURL *dataURL = bundleURL URLByAppendingPathComponent:path;
-	output = dataURL path UTF8String;
-
-	return !access(output.c_str(), R_OK);
+ NSURL *bundleUrl = NSBundle mainBundle bundleURL;
+ NSString *path = bundleUrl path stringByAppendingFormat:@"/%@/%s", @"Contents/Resources", data;
+ output = path.UTF8String;
+
+ return !access(output.c_str(), R_OK);
 }
 
 void CheckIfAlreadyRunning(bool &already_running)
 {
-	try {
-		NSBundle *bundle = NSBundle mainBundle;
-		if (!bundle)
-			throw "Could not find main bundle";
-
-		NSString *bundleID = bundle bundleIdentifier;
-		if (!bundleID)
-			throw "Could not find bundle identifier";
+ NSString *bundleId = NSBundle mainBundle bundleIdentifier;
 
-		int app_count =
-			NSRunningApplication
-				runningApplicationsWithBundleIdentifier:bundleID
-				.count;
+ NSUInteger appCount = NSRunningApplication runningApplicationsWithBundleIdentifier:bundleId count;
 
-		already_running = app_count > 1;
-
-	} catch (const char *error) {
-		blog(LOG_ERROR, "CheckIfAlreadyRunning: %s", error);
-	}
+ already_running = appCount > 1;
 }
 
 string GetDefaultVideoSavePath()
 {
-	NSFileManager *fm = NSFileManager defaultManager;
-	NSURL *url = fm URLForDirectory:NSMoviesDirectory
-				inDomain:NSUserDomainMask
-		 appropriateForURL:nil
-				 create:true
-				 error:nil;
+ NSFileManager *fm = NSFileManager defaultManager;
+ NSURL *url = fm URLForDirectory:NSMoviesDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:true
+ error:nil;
 
-	if (!url)
-		return getenv("HOME");
+ if (!url)
+ return getenv("HOME");
 
-	return url.path.fileSystemRepresentation;
+ return url.path.fileSystemRepresentation;
 }
 
 vector<string> GetPreferredLocales()
 {
-	NSArray *preferred = NSLocale preferredLanguages;
+ NSArray *preferred = NSLocale preferredLanguages;
 
-	auto locales = GetLocaleNames();
-	auto lang_to_locale = &locales(string lang) -> string {
-		string lang_match = "";
+ auto locales = GetLocaleNames();
+ auto lang_to_locale = &locales(string lang) -> string {
+ string lang_match = "";
 
-		for (const auto &locale : locales) {
-			if (locale.first == lang.substr(0, locale.first.size()))
-				return locale.first;
+ for (const auto &locale : locales) {
+ if (locale.first == lang.substr(0, locale.first.size()))
+ return locale.first;
 
-			if (!lang_match.size() &&
-			 locale.first.substr(0, 2) == lang.substr(0, 2))
-				lang_match = locale.first;
-		}
+ if (!lang_match.size() && locale.first.substr(0, 2) == lang.substr(0, 2))
+ lang_match = locale.first;
+ }
 
-		return lang_match;
-	};
+ return lang_match;
+ };
 
-	vector<string> result;
-	result.reserve(preferred.count);
+ vector<string> result;
+ result.reserve(preferred.count);
 
-	for (NSString *lang in preferred) {
-		string locale = lang_to_locale(lang.UTF8String);
-		if (!locale.size())
-			continue;
+ for (NSString *lang in preferred) {
+ string locale = lang_to_locale(lang.UTF8String);
+ if (!locale.size())
+ continue;
 
-		if (find(begin(result), end(result), locale) != end(result))
-			continue;
+ if (find(begin(result), end(result), locale) != end(result))
+ continue;
 
-		result.emplace_back(locale);
-	}
+ result.emplace_back(locale);
+ }
 
-	return result;
+ return result;
 }
 
 bool IsAlwaysOnTop(QWidget *window)
 {
-	return (window->windowFlags() & Qt::WindowStaysOnTopHint) != 0;
+ return (window->windowFlags() & Qt::WindowStaysOnTopHint) != 0;
 }
 
 void disableColorSpaceConversion(QWidget *window)
 {
-	NSView *view =
-		(__bridge NSView *)reinterpret_cast<void *>(window->winId());
-	view.window.colorSpace = NSColorSpace.sRGBColorSpace;
+ NSView *view = (__bridge NSView *) reinterpret_cast<void *>(window->winId());
+ view.window.colorSpace = NSColorSpace.sRGBColorSpace;
 }
 
 void SetAlwaysOnTop(QWidget *window, bool enable)
 {
-	Qt::WindowFlags flags = window->windowFlags();
-
-	if (enable) {
-		/* Force the level of the window high so it sits on top of
-		 * full-screen applications like Keynote */
-		NSView *nsv = (__bridge NSView *)reinterpret_cast<void *>(
-			window->winId());
-		NSWindow *nsw = nsv.window;
-		nsw setLevel:1024;
-
-		flags |= Qt::WindowStaysOnTopHint;
-	} else {
-		flags &= ~Qt::WindowStaysOnTopHint;
-	}
-
-	window->setWindowFlags(flags);
-	window->show();
+ Qt::WindowFlags flags = window->windowFlags();
+
+ if (enable) {
+ NSView *view = (__bridge NSView *) reinterpret_cast<void *>(window->winId());
+
+ view window setLevel:NSScreenSaverWindowLevel;
+
+ flags |= Qt::WindowStaysOnTopHint;
+ } else {
+ flags &= ~Qt::WindowStaysOnTopHint;
+ }
+
+ window->setWindowFlags(flags);
+ window->show();
 }
 
 bool SetDisplayAffinitySupported(void)
 {
-	// Not implemented yet
-	return false;
+ // Not implemented yet
+ return false;
 }
 
 typedef void (*set_int_t)(int);
 
 void EnableOSXVSync(bool enable)
 {
-	static bool initialized = false;
-	static bool valid = false;
-	static set_int_t set_debug_options = nullptr;
-	static set_int_t deferred_updates = nullptr;
-
-	if (!initialized) {
-		void *quartzCore = dlopen("/System/Library/Frameworks/"
-					 "QuartzCore.framework/QuartzCore",
-					 RTLD_LAZY);
-		if (quartzCore) {
-			set_debug_options = (set_int_t)dlsym(
-				quartzCore, "CGSSetDebugOptions");
-			deferred_updates = (set_int_t)dlsym(
-				quartzCore, "CGSDeferredUpdates");
-
-			valid = set_debug_options && deferred_updates;
-		}
-
-		initialized = true;
-	}
-
-	if (valid) {
-		set_debug_options(enable ? 0 : 0x08000000);
-		deferred_updates(enable ? 1 : 0);
-	}
+ static bool initialized = false;
+ static bool valid = false;
+ static set_int_t set_debug_options = nullptr;
+ static set_int_t deferred_updates = nullptr;
+
+ if (!initialized) {
+ void *quartzCore = dlopen("/System/Library/Frameworks/"
+ "QuartzCore.framework/QuartzCore",
+ RTLD_LAZY);
+ if (quartzCore) {
+ set_debug_options = (set_int_t) dlsym(quartzCore, "CGSSetDebugOptions");
+ deferred_updates = (set_int_t) dlsym(quartzCore, "CGSDeferredUpdates");
+
+ valid = set_debug_options && deferred_updates;
+ }
+
+ initialized = true;
+ }
+
+ if (valid) {
+ set_debug_options(enable ? 0 : 0x08000000);
+ deferred_updates(enable ? 1 : 0);
+ }
 }
 
 void EnableOSXDockIcon(bool enable)
 {
-	if (enable)
-		NSApp setActivationPolicy:NSApplicationActivationPolicyRegular;
-	else
-		NSApp setActivationPolicy:
-				NSApplicationActivationPolicyProhibited;
+ if (enable)
+ NSApp setActivationPolicy:NSApplicationActivationPolicyRegular;
+ else
+ NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited;
 }
 
 @interface DockView : NSView {
-@private
-	QIcon _icon;
+ @private
+ QIcon _icon;
 }
 @end
 
 @implementation DockView
+
 - (id)initWithIcon:(QIcon)icon
 {
-	self = super init;
-	_icon = icon;
-	return self;
+ self = super init;
+ _icon = icon;
+ return self;
 }
+
 - (void)drawRect:(NSRect)dirtyRect
 {
-	CGSize size = dirtyRect.size;
-
-	/* Draw regular app icon */
-	NSImage *appIcon = NSWorkspace sharedWorkspace
-		iconForFile:NSBundle mainBundle bundlePath;
-	appIcon drawInRect:CGRectMake(0, 0, size.width, size.height);
-
-	/* Draw small icon on top */
-	float iconSize = 0.45;
-	CGImageRef image =
-		_icon.pixmap(size.width, size.height).toImage().toCGImage();
-	CGContextRef context = NSGraphicsContext currentContext CGContext;
-	CGContextDrawImage(context,
-			 CGRectMake(size.width * (1 - iconSize), 0,
-				 size.width * iconSize,
-				 size.height * iconSize),
-			 image);
-	CGImageRelease(image);
+ CGSize size = dirtyRect.size;
+
+ /* Draw regular app icon */
+ NSImage *appIcon = NSWorkspace sharedWorkspace iconForFile:NSBundle mainBundle bundlePath;
+ appIcon drawInRect:CGRectMake(0, 0, size.width, size.height);
+
+ /* Draw small icon on top */
+ float iconSize = 0.45;
+ CGImageRef image = _icon.pixmap(size.width, size.height).toImage().toCGImage();
+ CGContextRef context = NSGraphicsContext currentContext CGContext;
+ CGContextDrawImage(
+ context, CGRectMake(size.width * (1 - iconSize), 0, size.width * iconSize, size.height * iconSize), image);
+ CGImageRelease(image);
 }
+
 @end
 
-MacPermissionStatus CheckPermissionWithPrompt(MacPermissionType type,
-					 bool prompt_for_permission)
+MacPermissionStatus CheckPermissionWithPrompt(MacPermissionType type, bool prompt_for_permission)
 {
-	__block MacPermissionStatus permissionResponse =
-		kPermissionNotDetermined;
-
-	switch (type) {
-	case kAudioDeviceAccess: {
-		AVAuthorizationStatus audioStatus = AVCaptureDevice
-			authorizationStatusForMediaType:AVMediaTypeAudio;
-
-		if (audioStatus == AVAuthorizationStatusNotDetermined &&
-		 prompt_for_permission) {
-			os_event_t *block_finished;
-			os_event_init(&block_finished, OS_EVENT_TYPE_MANUAL);
-			AVCaptureDevice
-				requestAccessForMediaType:AVMediaTypeAudio
-					completionHandler:^(
-						BOOL granted
-						__attribute((unused))) {
-						os_event_signal(block_finished);
-					};
-			os_event_wait(block_finished);
-			os_event_destroy(block_finished);
-			audioStatus = AVCaptureDevice
-				authorizationStatusForMediaType:AVMediaTypeAudio;
-		}
-
-		permissionResponse = (MacPermissionStatus)audioStatus;
-
-		blog(LOG_INFO, "macOS Permission for audio device access %s.",
-		 permissionResponse == kPermissionAuthorized ? "granted"
-								 : "denied");
-
-		break;
-	}
-	case kVideoDeviceAccess: {
-		AVAuthorizationStatus videoStatus = AVCaptureDevice
-			authorizationStatusForMediaType:AVMediaTypeVideo;
-
-		if (videoStatus == AVAuthorizationStatusNotDetermined &&
-		 prompt_for_permission) {
-			os_event_t *block_finished;
-			os_event_init(&block_finished, OS_EVENT_TYPE_MANUAL);
-			AVCaptureDevice
-				requestAccessForMediaType:AVMediaTypeVideo
-					completionHandler:^(
-						BOOL granted
-						__attribute((unused))) {
-						os_event_signal(block_finished);
-					};
-
-			os_event_wait(block_finished);
-			os_event_destroy(block_finished);
-			videoStatus = AVCaptureDevice
-				authorizationStatusForMediaType:AVMediaTypeVideo;
-		}
-
-		permissionResponse = (MacPermissionStatus)videoStatus;
-
-		blog(LOG_INFO, "macOS Permission for video device access %s.",
-		 permissionResponse == kPermissionAuthorized ? "granted"
-								 : "denied");
-
-		break;
-	}
-	case kScreenCapture: {
-		permissionResponse = (CGPreflightScreenCaptureAccess()
-					 ? kPermissionAuthorized
-					 : kPermissionDenied);
-
-		if (permissionResponse != kPermissionAuthorized &&
-		 prompt_for_permission) {
-			permissionResponse = (CGRequestScreenCaptureAccess()
-						 ? kPermissionAuthorized
-						 : kPermissionDenied);
-		}
-
-		blog(LOG_INFO, "macOS Permission for screen capture %s.",
-		 permissionResponse == kPermissionAuthorized ? "granted"
-								 : "denied");
-
-		break;
-	}
-	case kAccessibility: {
-		permissionResponse = (AXIsProcessTrusted()
-					 ? kPermissionAuthorized
-					 : kPermissionDenied);
-
-		if (permissionResponse != kPermissionAuthorized &&
-		 prompt_for_permission) {
-			NSDictionary *options = @{
-				(__bridge id)kAXTrustedCheckOptionPrompt: @YES
-			};
-			permissionResponse = (AXIsProcessTrustedWithOptions(
-						 (CFDictionaryRef)options)
-						 ? kPermissionAuthorized
-						 : kPermissionDenied);
-		}
-
-		blog(LOG_INFO, "macOS Permission for accessibility %s.",
-		 permissionResponse == kPermissionAuthorized ? "granted"
-								 : "denied");
-		break;
-	}
-	}
-
-	return permissionResponse;
+ __block MacPermissionStatus permissionResponse = kPermissionNotDetermined;
+
+ switch (type) {
+ case kAudioDeviceAccess: {
+ AVAuthorizationStatus audioStatus = AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio;
+
+ if (audioStatus == AVAuthorizationStatusNotDetermined && prompt_for_permission) {
+ os_event_t *block_finished;
+ os_event_init(&block_finished, OS_EVENT_TYPE_MANUAL);
+ AVCaptureDevice requestAccessForMediaType:AVMediaTypeAudio
+ completionHandler:^(BOOL granted __attribute((unused))) {
+ os_event_signal(block_finished);
+ };
+ os_event_wait(block_finished);
+ os_event_destroy(block_finished);
+ audioStatus = AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio;
+ }
+
+ permissionResponse = (MacPermissionStatus) audioStatus;
+
+ blog(LOG_INFO, "macOS Permission for audio device access %s.",
+ permissionResponse == kPermissionAuthorized ? "granted" : "denied");
+
+ break;
+ }
+ case kVideoDeviceAccess: {
+ AVAuthorizationStatus videoStatus = AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo;
+
+ if (videoStatus == AVAuthorizationStatusNotDetermined && prompt_for_permission) {
+ os_event_t *block_finished;
+ os_event_init(&block_finished, OS_EVENT_TYPE_MANUAL);
+ AVCaptureDevice requestAccessForMediaType:AVMediaTypeVideo
+ completionHandler:^(BOOL granted __attribute((unused))) {
+ os_event_signal(block_finished);
+ };
+
+ os_event_wait(block_finished);
+ os_event_destroy(block_finished);
+ videoStatus = AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo;
+ }
+
+ permissionResponse = (MacPermissionStatus) videoStatus;
+
+ blog(LOG_INFO, "macOS Permission for video device access %s.",
+ permissionResponse == kPermissionAuthorized ? "granted" : "denied");
+
+ break;
+ }
+ case kScreenCapture: {
+ permissionResponse = (CGPreflightScreenCaptureAccess() ? kPermissionAuthorized : kPermissionDenied);
+
+ if (permissionResponse != kPermissionAuthorized && prompt_for_permission) {
+ permissionResponse = (CGRequestScreenCaptureAccess() ? kPermissionAuthorized : kPermissionDenied);
+ }
+
+ blog(LOG_INFO, "macOS Permission for screen capture %s.",
+ permissionResponse == kPermissionAuthorized ? "granted" : "denied");
+
+ break;
+ }
+ case kAccessibility: {
+ permissionResponse = (AXIsProcessTrusted() ? kPermissionAuthorized : kPermissionDenied);
+
+ if (permissionResponse != kPermissionAuthorized && prompt_for_permission) {
+ NSDictionary *options = @{(__bridge id) kAXTrustedCheckOptionPrompt: @YES};
+ permissionResponse = (AXIsProcessTrustedWithOptions((CFDictionaryRef) options) ? kPermissionAuthorized
+ : kPermissionDenied);
+ }
+
+ blog(LOG_INFO, "macOS Permission for accessibility %s.",
+ permissionResponse == kPermissionAuthorized ? "granted" : "denied");
+ break;
+ }
+ }
+
+ return permissionResponse;
 }
 
 void OpenMacOSPrivacyPreferences(const char *tab)
 {
-	NSURL *url = NSURL
-		URLWithString:
-			NSString
-				stringWithFormat:
-					@"x-apple.systempreferences:com.apple.preference.security?Privacy_%s",
-					tab;
-	NSWorkspace sharedWorkspace openURL:url;
+ NSURL *url = NSURL
+ URLWithString:NSString
+ stringWithFormat:@"x-apple.systempreferences:com.apple.preference.security?Privacy_%s", tab;
+ NSWorkspace sharedWorkspace openURL:url;
 }
 
 void SetMacOSDarkMode(bool dark)
 {
-	if (dark) {
-		NSApp.appearance =
-			NSAppearance appearanceNamed:NSAppearanceNameDarkAqua;
-	} else {
-		NSApp.appearance =
-			NSAppearance appearanceNamed:NSAppearanceNameAqua;
-	}
+ if (dark) {
+ NSApp.appearance = NSAppearance appearanceNamed:NSAppearanceNameDarkAqua;
+ } else {
+ NSApp.appearance = NSAppearance appearanceNamed:NSAppearanceNameAqua;
+ }
 }
 
 void TaskbarOverlayInit() {}
+
 void TaskbarOverlaySetStatus(TaskbarOverlayStatus status)
 {
-	QIcon icon;
-	if (status == TaskbarOverlayStatusActive)
-		icon = QIcon::fromTheme("obs-active",
-					QIcon(":/res/images/active_mac.png"));
-	else if (status == TaskbarOverlayStatusPaused)
-		icon = QIcon::fromTheme("obs-paused",
-					QIcon(":/res/images/paused_mac.png"));
-
-	NSDockTile *tile = NSApp dockTile;
-	tile setContentView:DockView alloc initWithIcon:icon;
-	tile display;
+ QIcon icon;
+ if (status == TaskbarOverlayStatusActive)
+ icon = QIcon::fromTheme("obs-active", QIcon(":/res/images/active_mac.png"));
+ else if (status == TaskbarOverlayStatusPaused)
+ icon = QIcon::fromTheme("obs-paused", QIcon(":/res/images/paused_mac.png"));
+
+ NSDockTile *tile = NSApp dockTile;
+ tile setContentView:DockView alloc initWithIcon:icon;
+ tile display;
 }
 
 /*
@@ -405,24 +338,26 @@
 @end
 
 @implementation OBSApplication
+
 - (void)sendEvent:(NSEvent *)event
 {
-	_handlingSendEvent = YES;
-	super sendEvent:event;
-	_handlingSendEvent = NO;
+ _handlingSendEvent = YES;
+ super sendEvent:event;
+ _handlingSendEvent = NO;
 }
+
 @end
 
 void InstallNSThreadLocks()
 {
-	NSThread new start;
+ NSThread new start;
 
-	if (NSThread isMultiThreaded != 1) {
-		abort();
-	}
+ if (NSThread isMultiThreaded != 1) {
+ abort();
+ }
 }
 
 void InstallNSApplicationSubclass()
 {
-	OBSApplication sharedApplication;
+ OBSApplication sharedApplication;
 }

obs-studio-29.1.3.tar.xz/UI/platform-windows.cpp -> obs-studio-30.0.2.tar.xz/UI/platform-windows.cpp Changed

obs-studio-29.1.3.tar.xz/UI/platform-x11.cpp -> obs-studio-30.0.2.tar.xz/UI/platform-x11.cpp Changed

obs-studio-29.1.3.tar.xz/UI/platform.hpp -> obs-studio-30.0.2.tar.xz/UI/platform.hpp Changed

obs-studio-29.1.3.tar.xz/UI/properties-view.cpp -> obs-studio-30.0.2.tar.xz/UI/properties-view.cpp Changed

@@ -11,6 +11,8 @@
 #include <QComboBox>
 #include <QListWidget>
 #include <QPushButton>
+#include <QRadioButton>
+#include <QButtonGroup>
 #include <QStandardItem>
 #include <QFileDialog>
 #include <QColorDialog>
@@ -81,40 +83,26 @@
 	media_frames_per_second fps;
 };
 
-}
+} // namespace
 
 Q_DECLARE_METATYPE(frame_rate_tag);
 Q_DECLARE_METATYPE(media_frames_per_second);
 
 void OBSPropertiesView::ReloadProperties()
 {
-	deferUpdate = false;
 	if (weakObj || rawObj) {
 		OBSObject strongObj = GetObject();
 		void *obj = strongObj ? strongObj.Get() : rawObj;
-		if (obj) {
+		if (obj)
 			properties.reset(reloadCallback(obj));
-
-			if (obs_obj_get_type(obj) == OBS_OBJ_TYPE_SOURCE) {
-				enum obs_source_type type = obs_source_get_type(
-					(obs_source_t *)obj);
-				if (type == OBS_SOURCE_TYPE_INPUT ||
-				 type == OBS_SOURCE_TYPE_TRANSITION) {
-					uint32_t flags =
-						obs_properties_get_flags(
-							properties.get());
-					deferUpdate =
-						(flags &
-						 OBS_PROPERTIES_DEFER_UPDATE) !=
-						0;
-				}
-			}
-		}
 	} else {
 		properties.reset(reloadCallback((void *)type.c_str()));
 		obs_properties_apply_settings(properties.get(), settings);
 	}
 
+	uint32_t flags = obs_properties_get_flags(properties.get());
+	deferUpdate = enableDefer && (flags & OBS_PROPERTIES_DEFER_UPDATE) != 0;
+
 	RefreshProperties();
 }
 
@@ -136,7 +124,8 @@
 	layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
 	widget->setLayout(layout);
 
-	QSizePolicy mainPolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+	QSizePolicy mainPolicy(QSizePolicy::MinimumExpanding,
+			 QSizePolicy::MinimumExpanding);
 
 	layout->setLabelAlignment(Qt::AlignRight);
 
@@ -259,13 +248,14 @@
 	VScrollArea::resizeEvent(event);
 }
 
-QWidget *OBSPropertiesView::NewWidget(obs_property_t *prop, QWidget *widget,
-				 const char *signal)
+template<typename Sender, typename SenderParent, typename... Args>
+QWidget *OBSPropertiesView::NewWidget(obs_property_t *prop, Sender *widget,
+				 void (SenderParent::*signal)(Args...))
 {
 	const char *long_desc = obs_property_long_description(prop);
 
 	WidgetInfo *info = new WidgetInfo(this, prop, widget);
-	connect(widget, signal, info, SLOT(ControlChanged()));
+	QObject::connect(widget, signal, info, &WidgetInfo::ControlChanged);
 	children.emplace_back(info);
 
 	widget->setToolTip(QT_UTF8(long_desc));
@@ -280,7 +270,7 @@
 
 	QCheckBox *checkbox = new QCheckBox(QT_UTF8(desc));
 	checkbox->setCheckState(val ? Qt::Checked : Qt::Unchecked);
-	return NewWidget(prop, checkbox, SIGNAL(stateChanged(int)));
+	return NewWidget(prop, checkbox, &QCheckBox::stateChanged);
 }
 
 QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout,
@@ -295,7 +285,7 @@
 		OBSPlainTextEdit *edit = new OBSPlainTextEdit(this, monospace);
 		edit->setPlainText(QT_UTF8(val));
 		edit->setTabStopDistance(40);
-		return NewWidget(prop, edit, SIGNAL(textChanged()));
+		return NewWidget(prop, edit, &OBSPlainTextEdit::textChanged);
 
 	} else if (type == OBS_TEXT_PASSWORD) {
 		QLayout *subLayout = new QHBoxLayout();
@@ -323,8 +313,8 @@
 
 		edit->setToolTip(QT_UTF8(obs_property_long_description(prop)));
 
-		connect(edit, SIGNAL(textEdited(const QString &)), info,
-			SLOT(ControlChanged()));
+		connect(edit, &QLineEdit::textEdited, info,
+			&WidgetInfo::ControlChanged);
 		return nullptr;
 	} else if (type == OBS_TEXT_INFO) {
 		QString desc = QT_UTF8(obs_property_description(prop));
@@ -377,7 +367,7 @@
 	edit->setText(QT_UTF8(val));
 	edit->setToolTip(QT_UTF8(obs_property_long_description(prop)));
 
-	return NewWidget(prop, edit, SIGNAL(textEdited(const QString &)));
+	return NewWidget(prop, edit, &QLineEdit::textEdited);
 }
 
 void OBSPropertiesView::AddPath(obs_property_t *prop, QFormLayout *layout,
@@ -403,7 +393,8 @@
 	subLayout->addWidget(button);
 
 	WidgetInfo *info = new WidgetInfo(this, prop, edit);
-	connect(button, SIGNAL(clicked()), info, SLOT(ControlChanged()));
+	connect(button, &QPushButton::clicked, info,
+		&WidgetInfo::ControlChanged);
 	children.emplace_back(info);
 
 	*label = new QLabel(QT_UTF8(obs_property_description(prop)));
@@ -447,13 +438,14 @@
 		slider->setEnabled(obs_property_enabled(prop));
 		subLayout->addWidget(slider);
 
-		connect(slider, SIGNAL(valueChanged(int)), spin,
-			SLOT(setValue(int)));
-		connect(spin, SIGNAL(valueChanged(int)), slider,
-			SLOT(setValue(int)));
+		connect(slider, &QSlider::valueChanged, spin,
+			&QSpinBox::setValue);
+		connect(spin, &QSpinBox::valueChanged, slider,
+			&QSlider::setValue);
 	}
 
-	connect(spin, SIGNAL(valueChanged(int)), info, SLOT(ControlChanged()));
+	connect(spin, &QSpinBox::valueChanged, info,
+		&WidgetInfo::ControlChanged);
 
 	subLayout->addWidget(spin);
 
@@ -503,14 +495,14 @@
 		slider->setOrientation(Qt::Horizontal);
 		subLayout->addWidget(slider);
 
-		connect(slider, SIGNAL(doubleValChanged(double)), spin,
-			SLOT(setValue(double)));
-		connect(spin, SIGNAL(valueChanged(double)), slider,
-			SLOT(setDoubleVal(double)));
+		connect(slider, &DoubleSlider::doubleValChanged, spin,
+			&QDoubleSpinBox::setValue);
+		connect(spin, &QDoubleSpinBox::valueChanged, slider,
+			&DoubleSlider::setDoubleVal);
 	}
 
-	connect(spin, SIGNAL(valueChanged(double)), info,
-		SLOT(ControlChanged()));
+	connect(spin, &QDoubleSpinBox::valueChanged, info,
+		&WidgetInfo::ControlChanged);
 
 	subLayout->addWidget(spin);
 
@@ -518,23 +510,30 @@
 	layout->addRow(*label, subLayout);
 }
 
-static void AddComboItem(QComboBox *combo, obs_property_t *prop,
-			 obs_combo_format format, size_t idx)
+static QVariant propertyListToQVariant(obs_property_t *prop, size_t idx)
 {
-	const char *name = obs_property_list_item_name(prop, idx);
-	QVariant var;
+	obs_combo_format format = obs_property_list_format(prop);
 
+	QVariant var;
 	if (format == OBS_COMBO_FORMAT_INT) {
 		long long val = obs_property_list_item_int(prop, idx);
 		var = QVariant::fromValue<long long>(val);
-
 	} else if (format == OBS_COMBO_FORMAT_FLOAT) {
 		double val = obs_property_list_item_float(prop, idx);
 		var = QVariant::fromValue<double>(val);
-
 	} else if (format == OBS_COMBO_FORMAT_STRING) {
 		var = QByteArray(obs_property_list_item_string(prop, idx));
+	} else if (format == OBS_COMBO_FORMAT_BOOL) {
+		bool val = obs_property_list_item_bool(prop, idx);
+		var = QVariant::fromValue<bool>(val);
 	}
+	return var;
+}
+
+static void AddComboItem(QComboBox *combo, obs_property_t *prop, size_t idx)
+{
+	const char *name = obs_property_list_item_name(prop, idx);
+	QVariant var = propertyListToQVariant(prop, idx);
 
 	combo->addItem(QT_UTF8(name), var);
 
@@ -554,9 +553,23 @@
 	item->setFlags(Qt::NoItemFlags);
 }
 
+static void AddRadioItem(QButtonGroup *buttonGroup, QFormLayout *layout,
+			 obs_property_t *prop, QVariant value, size_t idx)
+{
+	const char *name = obs_property_list_item_name(prop, idx);
+
+	QVariant var = propertyListToQVariant(prop, idx);
+	QRadioButton *button = new QRadioButton(name);
+	button->setChecked(value == var);
+	button->setProperty("value", var);
+	buttonGroup->addButton(button);
+	layout->addRow(button);
+}
+
 template<long long get_int(obs_data_t *, const char *),
 	 double get_double(obs_data_t *, const char *),
-	 const char *get_string(obs_data_t *, const char *)>
+	 const char *get_string(obs_data_t *, const char *),
+	 bool get_bool(obs_data_t *, const char *)>
 static QVariant from_obs_data(obs_data_t *data, const char *name,
 			 obs_combo_format format)
 {
@@ -567,6 +580,8 @@
 		return QVariant::fromValue(get_double(data, name));
 	case OBS_COMBO_FORMAT_STRING:
 		return QByteArray(get_string(data, name));
+	case OBS_COMBO_FORMAT_BOOL:
+		return QVariant::fromValue(get_bool(data, name));
 	default:
 		return QVariant();
 	}
@@ -576,29 +591,55 @@
 			 obs_combo_format format)
 {
 	return from_obs_data<obs_data_get_int, obs_data_get_double,
-			 obs_data_get_string>(data, name, format);
+			 obs_data_get_string, obs_data_get_bool>(data, name,
+								 format);
 }
 
 static QVariant from_obs_data_autoselect(obs_data_t *data, const char *name,
 					 obs_combo_format format)
 {
-	return from_obs_data<obs_data_get_autoselect_int,
-			 obs_data_get_autoselect_double,
-			 obs_data_get_autoselect_string>(data, name,
-							 format);
+	return from_obs_data<
+		obs_data_get_autoselect_int, obs_data_get_autoselect_double,
+		obs_data_get_autoselect_string, obs_data_get_autoselect_bool>(
+		data, name, format);
 }
 
 QWidget *OBSPropertiesView::AddList(obs_property_t *prop, bool &warning)
 {
 	const char *name = obs_property_name(prop);
-	QComboBox *combo = new QComboBox();
 	obs_combo_type type = obs_property_list_type(prop);
 	obs_combo_format format = obs_property_list_format(prop);
 	size_t count = obs_property_list_item_count(prop);
+
+	QVariant value = from_obs_data(settings, name, format);
+
+	if (type == OBS_COMBO_TYPE_RADIO) {
+		QButtonGroup *buttonGroup = new QButtonGroup();
+		QFormLayout *subLayout = new QFormLayout();
+		subLayout->setContentsMargins(0, 0, 0, 0);
+
+		for (size_t idx = 0; idx < count; idx++)
+			AddRadioItem(buttonGroup, subLayout, prop, value, idx);
+
+		if (count > 0) {
+			buttonGroup->setExclusive(true);
+			WidgetInfo *info = new WidgetInfo(
+				this, prop, buttonGroup->buttons()0);
+			children.emplace_back(info);
+			connect(buttonGroup, &QButtonGroup::buttonClicked, info,
+				&WidgetInfo::ControlChanged);
+		}
+
+		QWidget *widget = new QWidget();
+		widget->setLayout(subLayout);
+		return widget;
+	}
+
 	int idx = -1;
 
+	QComboBox *combo = new QComboBox();
 	for (size_t i = 0; i < count; i++)
-		AddComboItem(combo, prop, format, i);
+		AddComboItem(combo, prop, i);
 
 	if (type == OBS_COMBO_TYPE_EDITABLE)
 		combo->setEditable(true);
@@ -606,8 +647,6 @@
 	combo->setMaxVisibleItems(40);
 	combo->setToolTip(QT_UTF8(obs_property_long_description(prop)));
 
-	QVariant value = from_obs_data(settings, name, format);
-
 	if (format == OBS_COMBO_FORMAT_STRING &&
 	 type == OBS_COMBO_TYPE_EDITABLE) {
 		combo->lineEdit()->setText(value.toString());
@@ -616,8 +655,7 @@
 	}
 
 	if (type == OBS_COMBO_TYPE_EDITABLE)
-		return NewWidget(prop, combo,
-				 SIGNAL(editTextChanged(const QString &)));
+		return NewWidget(prop, combo, &QComboBox::editTextChanged);
 
 	if (idx != -1)
 		combo->setCurrentIndex(idx);
@@ -642,8 +680,8 @@
 		 model->flags(model->index(idx, 0)) == Qt::NoItemFlags;
 
 	WidgetInfo *info = new WidgetInfo(this, prop, combo);
-	connect(combo, SIGNAL(currentIndexChanged(int)), info,
-		SLOT(ControlChanged()));
+	connect(combo, &QComboBox::currentIndexChanged, info,
+		&WidgetInfo::ControlChanged);
 	children.emplace_back(info);
 
 	/* trigger a settings update if the index was not found */
@@ -693,8 +731,8 @@
 	WidgetInfo *info = new WidgetInfo(this, prop, list);
 
 	list->setDragDropMode(QAbstractItemView::InternalMove);
-	connect(list->model(), SIGNAL(rowsMoved()), info,
-		SLOT(EditListReordered()));
+	connect(list->model(), &QAbstractItemModel::rowsMoved,
+		info() { info->EditableListChanged(); });
 
 	QVBoxLayout *sideLayout = new QVBoxLayout();
 	NewButton(sideLayout, info, "addIconSmall", &WidgetInfo::EditListAdd);
@@ -725,7 +763,7 @@
 	QPushButton *button = new QPushButton(QT_UTF8(desc));
 	button->setProperty("themeID", "settingsButtons");
 	button->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-	return NewWidget(prop, button, SIGNAL(clicked()));
+	return NewWidget(prop, button, &QPushButton::clicked);
 }
 
 void OBSPropertiesView::AddColorInternal(obs_property_t *prop,
@@ -774,7 +812,8 @@
 	subLayout->addWidget(button);
 
 	WidgetInfo *info = new WidgetInfo(this, prop, colorLabel);
-	connect(button, SIGNAL(clicked()), info, SLOT(ControlChanged()));
+	connect(button, &QPushButton::clicked, info,
+		&WidgetInfo::ControlChanged);
 	children.emplace_back(info);
 
 	label = new QLabel(QT_UTF8(obs_property_description(prop)));
@@ -862,7 +901,8 @@
 	subLayout->addWidget(button);
 
 	WidgetInfo *info = new WidgetInfo(this, prop, fontLabel);
-	connect(button, SIGNAL(clicked()), info, SLOT(ControlChanged()));
+	connect(button, &QPushButton::clicked, info,
+		&WidgetInfo::ControlChanged);
 	children.emplace_back(info);
 
 	label = new QLabel(QT_UTF8(obs_property_description(prop)));
@@ -879,7 +919,7 @@
 	void operator()(obs_data_item_t *item) { obs_data_item_release(&item); }
 };
 
-}
+} // namespace std
 
 template<typename T> static double make_epsilon(T val)
 {
@@ -956,9 +996,13 @@
 }
 
 static const common_frame_rate common_fps = {
-	{"60", {60, 1}}, {"59.94", {60000, 1001}}, {"50", {50, 1}},
-	{"48", {48, 1}}, {"30", {30, 1}}, {"29.97", {30000, 1001}},
-	{"25", {25, 1}}, {"24", {24, 1}}, {"23.976", {24000, 1001}},
+	{"240", {240, 1}}, {"144", {144, 1}},
+	{"120", {120, 1}}, {"119.88", {120000, 1001}},
+	{"60", {60, 1}}, {"59.94", {60000, 1001}},
+	{"50", {50, 1}}, {"48", {48, 1}},
+	{"30", {30, 1}}, {"29.97", {30000, 1001}},
+	{"25", {25, 1}}, {"24", {24, 1}},
+	{"23.976", {24000, 1001}},
 };
 
 static void UpdateSimpleFPSSelection(OBSFrameRatePropertyWidget *fpsProps,
@@ -1471,7 +1515,8 @@
 	children.emplace_back(info);
 
 	// Signals
-	connect(groupBox, SIGNAL(toggled(bool)), info, SLOT(ControlChanged()));
+	connect(groupBox, &QGroupBox::toggled, info,
+		&WidgetInfo::ControlChanged);
 }
 
 void OBSPropertiesView::AddProperty(obs_property_t *property,
@@ -1668,7 +1713,9 @@
 	if (!variant.canConvert<frame_rate_tag>())
 		return false;
 
-	auto StopUpdating = &(void *) { w->updating = false; };
+	auto StopUpdating = &(void *) {
+		w->updating = false;
+	};
 	unique_ptr<void, decltype(StopUpdating)> signalGuard(
 		static_cast<void *>(w), StopUpdating);
 	w->updating = true;
@@ -1785,14 +1832,19 @@
 
 void WidgetInfo::ListChanged(const char *setting)
 {
-	QComboBox *combo = static_cast<QComboBox *>(widget);
 	obs_combo_format format = obs_property_list_format(property);
 	obs_combo_type type = obs_property_list_type(property);
 	QVariant data;
 
-	if (type == OBS_COMBO_TYPE_EDITABLE) {
-		data = combo->currentText().toUtf8();
+	if (type == OBS_COMBO_TYPE_RADIO) {
+		QButtonGroup *group =
+			static_cast<QAbstractButton *>(widget)->group();
+		QAbstractButton *button = group->checkedButton();
+		data = button->property("value");
+	} else if (type == OBS_COMBO_TYPE_EDITABLE) {
+		data = static_cast<QComboBox *>(widget)->currentText().toUtf8();
 	} else {
+		QComboBox *combo = static_cast<QComboBox *>(widget);
 		int index = combo->currentIndex();
 		if (index != -1)
 			data = combo->itemData(index);
@@ -1815,6 +1867,10 @@
 		obs_data_set_string(view->settings, setting,
 				 data.toByteArray().constData());
 		break;
+	case OBS_COMBO_FORMAT_BOOL:
+		obs_data_set_bool(view->settings, setting,
+				 data.value<double>());
+		break;
 	}
 }
 
@@ -1892,12 +1948,16 @@
 
 	if (!font_obj) {
 		QFont initial;
-		font = QFontDialog::getFont(&success, initial, view,
-					 "Pick a Font", options);
+		font = QFontDialog::getFont(
+			&success, initial, view,
+			QTStr("Basic.PropertiesWindow.SelectFont.WindowTitle"),
+			options);
 	} else {
 		MakeQFont(font_obj, font);
-		font = QFontDialog::getFont(&success, font, view, "Pick a Font",
-					 options);
+		font = QFontDialog::getFont(
+			&success, font, view,
+			QTStr("Basic.PropertiesWindow.SelectFont.WindowTitle"),
+			options);
 	}
 
 	if (!success)
@@ -1932,11 +1992,6 @@
 						 : true);
 }
 
-void WidgetInfo::EditListReordered()
-{
-	EditableListChanged();
-}
-
 void WidgetInfo::EditableListChanged()
 {
 	const char *setting = obs_property_name(property);
@@ -2160,8 +2215,10 @@
 		setLayout(mainLayout);
 		resize(QSize(400, 80));
 
-		connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-		connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+		connect(buttonBox, &QDialogButtonBox::accepted, this,
+			&EditableItemDialog::accept);
+		connect(buttonBox, &QDialogButtonBox::rejected, this,
+			&EditableItemDialog::reject);
 	}
 
 	inline QString GetText() const { return edit->text(); }

obs-studio-29.1.3.tar.xz/UI/properties-view.hpp -> obs-studio-30.0.2.tar.xz/UI/properties-view.hpp Changed

@@ -51,7 +51,9 @@
 public:
 	inline WidgetInfo(OBSPropertiesView *view_, obs_property_t *prop,
 			 QWidget *widget_)
-		: view(view_), property(prop), widget(widget_)
+		: view(view_),
+		 property(prop),
+		 widget(widget_)
 	{
 	}
 
@@ -77,7 +79,6 @@
 	void EditListEdit();
 	void EditListUp();
 	void EditListDown();
-	void EditListReordered();
 };
 
 /* ------------------------------------------------------------------------- */
@@ -106,9 +107,11 @@
 	std::string lastFocused;
 	QWidget *lastWidget = nullptr;
 	bool deferUpdate;
+	bool enableDefer = true;
 
-	QWidget *NewWidget(obs_property_t *prop, QWidget *widget,
-			 const char *signal);
+	template<typename Sender, typename SenderParent, typename... Args>
+	QWidget *NewWidget(obs_property_t *prop, Sender *widget,
+			 void (SenderParent::*signal)(Args...));
 
 	QWidget *AddCheckbox(obs_property_t *prop);
 	QWidget *AddText(obs_property_t *prop, QFormLayout *layout,
@@ -194,6 +197,7 @@
 			visUpdateCb(OBSGetStrongRef(weakObj), settings);
 	}
 	inline bool DeferUpdate() const { return deferUpdate; }
+	inline void SetDeferrable(bool deferrable) { enableDefer = deferrable; }
 
 	inline OBSObject GetObject() const { return OBSGetStrongRef(weakObj); }

obs-studio-29.1.3.tar.xz/UI/qt-display.cpp -> obs-studio-30.0.2.tar.xz/UI/qt-display.cpp Changed

@@ -13,15 +13,11 @@
 #include <Windows.h>
 #endif
 
-#ifdef ENABLE_WAYLAND
-#include <obs-nix-platform.h>
-
 class SurfaceEventFilter : public QObject {
 	OBSQTDisplay *display;
-	int mTimerId;
 
 public:
-	SurfaceEventFilter(OBSQTDisplay *src) : display(src), mTimerId(0) {}
+	SurfaceEventFilter(OBSQTDisplay *src) : QObject(src), display(src) {}
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *event) override
@@ -35,22 +31,12 @@
 				static_cast<QPlatformSurfaceEvent *>(event);
 
 			switch (surfaceEvent->surfaceEventType()) {
-			case QPlatformSurfaceEvent::SurfaceCreated:
-				if (display->windowHandle()->isExposed())
-					createOBSDisplay();
-				else
-					mTimerId = startTimer(67); // Arbitrary
-				break;
 			case QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed:
 				display->DestroyDisplay();
 				break;
 			default:
 				break;
 			}
-
-			break;
-		case QEvent::Expose:
-			createOBSDisplay();
 			break;
 		default:
 			break;
@@ -58,25 +44,8 @@
 
 		return result;
 	}
-
-	void timerEvent(QTimerEvent *) override
-	{
-		createOBSDisplay(display->isVisible());
-	}
-
-private:
-	void createOBSDisplay(bool force = false)
-	{
-		display->CreateDisplay(force);
-		if (mTimerId > 0) {
-			killTimer(mTimerId);
-			mTimerId = 0;
-		}
-	}
 };
 
-#endif
-
 static inline long long color_to_int(const QColor &color)
 {
 	auto shift = &(unsigned val, int shift) {
@@ -130,11 +99,7 @@
 	connect(windowHandle(), &QWindow::visibleChanged, windowVisible);
 	connect(windowHandle(), &QWindow::screenChanged, screenChanged);
 
-#ifdef ENABLE_WAYLAND
-	if (obs_get_nix_platform() == OBS_NIX_PLATFORM_WAYLAND)
-		windowHandle()->installEventFilter(
-			new SurfaceEventFilter(this));
-#endif
+	windowHandle()->installEventFilter(new SurfaceEventFilter(this));
 }
 
 QColor OBSQTDisplay::GetDisplayBackgroundColor() const
@@ -157,12 +122,15 @@
 	obs_display_set_background_color(display, backgroundColor);
 }
 
-void OBSQTDisplay::CreateDisplay(bool force)
+void OBSQTDisplay::CreateDisplay()
 {
 	if (display)
 		return;
 
-	if (!windowHandle()->isExposed() && !force)
+	if (destroying)
+		return;
+
+	if (!windowHandle()->isExposed())
 		return;
 
 	QSize size = GetPixelSize(this);
@@ -195,11 +163,7 @@
 	OnMove();
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool OBSQTDisplay::nativeEvent(const QByteArray &, void *message, qintptr *)
-#else
-bool OBSQTDisplay::nativeEvent(const QByteArray &, void *message, long *)
-#endif
 {
 #ifdef _WIN32
 	const MSG &msg = *static_cast<MSG *>(message);

obs-studio-29.1.3.tar.xz/UI/qt-display.hpp -> obs-studio-30.0.2.tar.xz/UI/qt-display.hpp Changed

obs-studio-29.1.3.tar.xz/UI/qt-wrappers.cpp -> obs-studio-30.0.2.tar.xz/UI/qt-wrappers.cpp Changed

obs-studio-29.1.3.tar.xz/UI/qt-wrappers.hpp -> obs-studio-30.0.2.tar.xz/UI/qt-wrappers.hpp Changed

obs-studio-29.1.3.tar.xz/UI/remote-text.cpp -> obs-studio-30.0.2.tar.xz/UI/remote-text.cpp Changed

obs-studio-29.1.3.tar.xz/UI/remote-text.hpp -> obs-studio-30.0.2.tar.xz/UI/remote-text.hpp Changed

obs-studio-29.1.3.tar.xz/UI/scene-tree.cpp -> obs-studio-30.0.2.tar.xz/UI/scene-tree.cpp Changed

@@ -1,12 +1,11 @@
-#include "obs.hpp"
 #include "scene-tree.hpp"
-#include "obs-app.hpp"
 
 #include <QSizePolicy>
 #include <QScrollBar>
 #include <QDropEvent>
 #include <QPushButton>
 #include <QTimer>
+#include <cmath>
 
 SceneTree::SceneTree(QWidget *parent_) : QListWidget(parent_)
 {
@@ -17,7 +16,6 @@
 
 void SceneTree::SetGridMode(bool grid)
 {
-	config_set_bool(App()->GlobalConfig(), "BasicWindow", "gridMode", grid);
 	parent()->setProperty("gridMode", grid);
 	gridMode = grid;
 
@@ -81,7 +79,7 @@
 		}
 
 		int wid = contentsRect().width() - scrollWid - 1;
-		int items = (int)ceil((float)wid / maxWidth);
+		int items = (int)std::ceil((float)wid / maxWidth);
 		int itemWidth = wid / items;
 
 		setGridSize(QSize(itemWidth, itemHeight));
@@ -127,16 +125,12 @@
 
 		float wid = contentsRect().width() - scrollWid - 1;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 		QPoint point = event->position().toPoint();
-#else
-		QPoint point = event->pos();
-#endif
 
-		int x = (float)point.x() / wid * ceil(wid / maxWidth);
+		int x = (float)point.x() / wid * std::ceil(wid / maxWidth);
 		int y = (point.y() + firstItemY) / itemHeight;
 
-		int r = x + y * ceil(wid / maxWidth);
+		int r = x + y * std::ceil(wid / maxWidth);
 
 		QListWidgetItem *item = takeItem(selectedIndexes()0.row());
 		insertItem(r, item);
@@ -172,16 +166,12 @@
 	float wid = contentsRect().width() - scrollWid - 1;
 
 	if (event) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 		QPoint point = event->position().toPoint();
-#else
-		QPoint point = event->pos();
-#endif
 
-		int x = (float)point.x() / wid * ceil(wid / maxWidth);
+		int x = (float)point.x() / wid * std::ceil(wid / maxWidth);
 		int y = (point.y() + firstItemY) / itemHeight;
 
-		int r = x + y * ceil(wid / maxWidth);
+		int r = x + y * std::ceil(wid / maxWidth);
 		int orig = selectedIndexes()0.row();
 
 		for (int i = 0; i < count(); i++) {
@@ -196,8 +186,8 @@
 				 (i > orig && i > r ? 1 : 0) -
 				 (i > orig && i == r ? 2 : 0);
 
-			int xPos = (i + off) % (int)ceil(wid / maxWidth);
-			int yPos = (i + off) / (int)ceil(wid / maxWidth);
+			int xPos = (i + off) % (int)std::ceil(wid / maxWidth);
+			int yPos = (i + off) / (int)std::ceil(wid / maxWidth);
 			QSize g = gridSize();
 
 			QPoint position(xPos * g.width(), yPos * g.height());
@@ -212,8 +202,8 @@
 
 			QModelIndex index = indexFromItem(wItem);
 
-			int xPos = i % (int)ceil(wid / maxWidth);
-			int yPos = i / (int)ceil(wid / maxWidth);
+			int xPos = i % (int)std::ceil(wid / maxWidth);
+			int yPos = i / (int)std::ceil(wid / maxWidth);
 			QSize g = gridSize();
 
 			QPoint position(xPos * g.width(), yPos * g.height());

obs-studio-29.1.3.tar.xz/UI/screenshot-obj.hpp -> obs-studio-30.0.2.tar.xz/UI/screenshot-obj.hpp Changed

obs-studio-29.1.3.tar.xz/UI/slider-ignorewheel.cpp -> obs-studio-30.0.2.tar.xz/UI/slider-ignorewheel.cpp Changed

obs-studio-29.1.3.tar.xz/UI/source-tree.cpp -> obs-studio-30.0.2.tar.xz/UI/source-tree.cpp Changed

@@ -4,7 +4,6 @@
 #include "qt-wrappers.hpp"
 #include "visibility-checkbox.hpp"
 #include "locked-checkbox.hpp"
-#include "expand-checkbox.hpp"
 #include "platform.hpp"
 
 #include <obs-frontend-api.h>
@@ -33,7 +32,8 @@
 /* ========================================================================= */
 
 SourceTreeItem::SourceTreeItem(SourceTree *tree_, OBSSceneItem sceneitem_)
-	: tree(tree_), sceneitem(sceneitem_)
+	: tree(tree_),
+	 sceneitem(sceneitem_)
 {
 	setAttribute(Qt::WA_TranslucentBackground);
 	setMouseTracking(true);
@@ -133,12 +133,13 @@
 		obs_source_t *scenesource = obs_scene_get_source(scene);
 		int64_t id = obs_sceneitem_get_id(sceneitem);
 		const char *name = obs_source_get_name(scenesource);
+		const char *uuid = obs_source_get_uuid(scenesource);
 		obs_source_t *source = obs_sceneitem_get_source(sceneitem);
 
-		auto undo_redo = (const std::string &name, int64_t id,
+		auto undo_redo = (const std::string &uuid, int64_t id,
 				 bool val) {
 			OBSSourceAutoRelease s =
-				obs_get_source_by_name(name.c_str());
+				obs_get_source_by_uuid(uuid.c_str());
 			obs_scene_t *sc = obs_group_or_scene_from_source(s);
 			obs_sceneitem_t *si =
 				obs_scene_find_sceneitem_by_id(sc, id);
@@ -154,7 +155,7 @@
 			str.arg(obs_source_get_name(source), name),
 			std::bind(undo_redo, std::placeholders::_1, id, !val),
 			std::bind(undo_redo, std::placeholders::_1, id, val),
-			name, name);
+			uuid, uuid);
 
 		SignalBlocker sourcesSignalBlocker(this);
 		obs_sceneitem_set_visible(sceneitem, val);
@@ -334,11 +335,7 @@
 	}
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 void SourceTreeItem::enterEvent(QEnterEvent *event)
-#else
-void SourceTreeItem::enterEvent(QEvent *event)
-#endif
 {
 	QWidget::enterEvent(event);
 
@@ -452,32 +449,33 @@
 
 	SignalBlocker sourcesSignalBlocker(this);
 	std::string prevName(obs_source_get_name(source));
-	std::string scene_name =
-		obs_source_get_name(main->GetCurrentSceneSource());
-	auto undo = scene_name, prevName, main(const std::string &data) {
+	std::string scene_uuid =
+		obs_source_get_uuid(main->GetCurrentSceneSource());
+	auto undo = scene_uuid, prevName, main(const std::string &data) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(data.c_str());
+			obs_get_source_by_uuid(data.c_str());
 		obs_source_set_name(source, prevName.c_str());
 
 		OBSSourceAutoRelease scene_source =
-			obs_get_source_by_name(scene_name.c_str());
+			obs_get_source_by_uuid(scene_uuid.c_str());
 		main->SetCurrentScene(scene_source.Get(), true);
 	};
 
 	std::string editedName = newName;
 
-	auto redo = scene_name, main, editedName(const std::string &data) {
+	auto redo = scene_uuid, main, editedName(const std::string &data) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(data.c_str());
+			obs_get_source_by_uuid(data.c_str());
 		obs_source_set_name(source, editedName.c_str());
 
 		OBSSourceAutoRelease scene_source =
-			obs_get_source_by_name(scene_name.c_str());
+			obs_get_source_by_uuid(scene_uuid.c_str());
 		main->SetCurrentScene(scene_source.Get(), true);
 	};
 
+	const char *uuid = obs_source_get_uuid(source);
 	main->undo_s.add_action(QTStr("Undo.Rename").arg(newName.c_str()), undo,
-				redo, newName, prevName);
+				redo, uuid, uuid);
 
 	obs_source_set_name(source, newName.c_str());
 	label->setText(QT_UTF8(newName.c_str()));
@@ -641,6 +639,9 @@
 		stm->SceneChanged();
 		break;
 	case OBS_FRONTEND_EVENT_EXIT:
+		stm->Clear();
+		obs_frontend_remove_event_callback(OBSFrontendEvent, stm);
+		break;
 	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP:
 		stm->Clear();
 		break;
@@ -855,16 +856,12 @@
 }
 
 SourceTreeModel::SourceTreeModel(SourceTree *st_)
-	: QAbstractListModel(st_), st(st_)
+	: QAbstractListModel(st_),
+	 st(st_)
 {
 	obs_frontend_add_event_callback(OBSFrontendEvent, this);
 }
 
-SourceTreeModel::~SourceTreeModel()
-{
-	obs_frontend_remove_event_callback(OBSFrontendEvent, this);
-}
-
 int SourceTreeModel::rowCount(const QModelIndex &parent) const
 {
 	return parent.isValid() ? 0 : items.count();
@@ -1184,14 +1181,7 @@
 	QModelIndexList indices = selectedIndexes();
 
 	DropIndicatorPosition indicator = dropIndicatorPosition();
-	int row = indexAt(
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-			 event->position().toPoint()
-#else
-			 event->pos()
-#endif
-				 )
-			 .row();
+	int row = indexAt(event->position().toPoint()).row();
 	bool emptyDrop = row == -1;
 
 	if (emptyDrop) {
@@ -1525,7 +1515,7 @@
 				 "theoretically, it should be\nimpossible "
 				 "for this code to be reached. But if this "
 				 "code is reached,\nfeel free to laugh at "
-				 "Jim, because apparently it is, in fact, "
+				 "Lain, because apparently it is, in fact, "
 				 "actually\npossible for this code to be "
 				 "reached. But I mean, again, theoretically\n"
 				 "it should be impossible. So if you see "

obs-studio-29.1.3.tar.xz/UI/source-tree.hpp -> obs-studio-30.0.2.tar.xz/UI/source-tree.hpp Changed

obs-studio-29.1.3.tar.xz/UI/update/crypto-helpers-mac.mm -> obs-studio-30.0.2.tar.xz/UI/update/crypto-helpers-mac.mm Changed

@@ -4,29 +4,25 @@
 #import <Security/Security.h>
 #import <Security/SecKey.h>
 
-bool VerifySignature(const uint8_t *pubKey, const size_t pubKeyLen,
-		 const uint8_t *buf, const size_t len, const uint8_t *sig,
-		 const size_t sigLen)
+bool VerifySignature(const uint8_t *pubKey, const size_t pubKeyLen, const uint8_t *buf, const size_t len,
+ const uint8_t *sig, const size_t sigLen)
 {
-	NSData *pubKeyData = NSData dataWithBytes:pubKey length:pubKeyLen;
-	CFArrayRef items = nullptr;
+ NSData *pubKeyData = NSData dataWithBytes:pubKey length:pubKeyLen;
+ CFArrayRef items = nullptr;
 
-	OSStatus res = SecItemImport((CFDataRef)pubKeyData, nullptr, nullptr,
-				 nullptr, (SecItemImportExportFlags)0,
-				 nullptr, nullptr, &items);
-	if (res != errSecSuccess)
-		return false;
+ OSStatus res = SecItemImport((CFDataRef) pubKeyData, nullptr, nullptr, nullptr, (SecItemImportExportFlags) 0,
+ nullptr, nullptr, &items);
+ if (res != errSecSuccess)
+ return false;
 
-	SecKeyRef pubKeyRef = (SecKeyRef)CFArrayGetValueAtIndex(items, 0);
-	NSData *signedData = NSData dataWithBytes:buf length:len;
-	NSData *signature = NSData dataWithBytes:sig length:sigLen;
+ SecKeyRef pubKeyRef = (SecKeyRef) CFArrayGetValueAtIndex(items, 0);
+ NSData *signedData = NSData dataWithBytes:buf length:len;
+ NSData *signature = NSData dataWithBytes:sig length:sigLen;
 
-	CFErrorRef errRef;
-	bool result = SecKeyVerifySignature(
-		pubKeyRef, kSecKeyAlgorithmRSASignatureMessagePKCS1v15SHA512,
-		(__bridge CFDataRef)signedData, (__bridge CFDataRef)signature,
-		&errRef);
+ CFErrorRef errRef;
+ bool result = SecKeyVerifySignature(pubKeyRef, kSecKeyAlgorithmRSASignatureMessagePKCS1v15SHA512,
+ (__bridge CFDataRef) signedData, (__bridge CFDataRef) signature, &errRef);
 
-	CFRelease(items);
-	return result;
+ CFRelease(items);
+ return result;
 };

obs-studio-30.0.2.tar.xz/UI/update/models Added

obs-studio-30.0.2.tar.xz/UI/update/models/branches.hpp Added

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023 Dennis Sädtler <dennis@obsproject.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+struct JsonBranch {
+	/* Internal name / ID of the branch (used in updater) */
+	std::string name;
+	/* Human readable name */
+	std::string display_name;
+	/* Description */
+	std::string description;
+	/* Whether updating should use the branch if selected or fall back to stable */
+	bool enabled = false;
+	/* Whether the branch should be displayed in the UI */
+	bool visible = false;
+	/* OS compatibility */
+	bool windows = false;
+	bool macos = false;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(JsonBranch, name,
+						 display_name, description,
+						 enabled, visible, windows,
+						 macos)
+};
+
+using JsonBranches = std::vector<JsonBranch>;

obs-studio-30.0.2.tar.xz/UI/update/models/whatsnew.hpp Added

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2023 Dennis Sädtler <dennis@obsproject.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#include <string>
+#include <optional>
+
+#include <nlohmann/json.hpp>
+
+/* Ubuntu 22.04 be damned. */
+#ifndef NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT
+#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) \
+	nlohmann_json_t.v1 = \
+		nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1);
+
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) \
+	friend void to_json(nlohmann::json &nlohmann_json_j, \
+			 const Type &nlohmann_json_t) \
+	{ \
+		NLOHMANN_JSON_EXPAND( \
+			NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) \
+	} \
+	friend void from_json(const nlohmann::json &nlohmann_json_j, \
+			 Type &nlohmann_json_t) \
+	{ \
+		Type nlohmann_json_default_obj; \
+		NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE( \
+			NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) \
+	}
+
+#endif
+
+/*
+ * Support for (de-)serialising std::optional
+ * Adapted from https://github.com/nlohmann/json/issues/1749#issuecomment-1555093802
+ */
+template<typename T> struct nlohmann::adl_serializer<std::optional<T>> {
+	static std::optional<T> from_json(const json &json)
+	{
+		return json.is_null() ? std::nullopt
+				 : std::optional{json.get<T>()};
+	}
+
+	static void to_json(json &json, std::optional<T> t)
+	{
+		if (t)
+			json = *t;
+		else
+			json = nullptr;
+	}
+};
+
+struct WhatsNewPlatforms {
+	bool windows = false;
+	bool macos = false;
+	bool linux = false;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(WhatsNewPlatforms, windows,
+						 macos, linux)
+};
+
+struct WhatsNewItem {
+	/* Target OBS version (patch is ignored) */
+	std::string version;
+	/* Beta/RC release to target */
+	int Beta = 0;
+	int RC = 0;
+	/* URL of webpage to be displayed */
+	std::string url;
+	/* Increment for this version's item */
+	int increment = 0;
+	/* Optional OS filter */
+	std::optional<WhatsNewPlatforms> os = std::nullopt;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(WhatsNewItem, version, Beta,
+						 RC, url, increment, os)
+};
+
+using WhatsNewList = std::vector<WhatsNewItem>;

obs-studio-29.1.3.tar.xz/UI/update/shared-update.cpp -> obs-studio-30.0.2.tar.xz/UI/update/shared-update.cpp Changed

@@ -10,6 +10,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <filesystem>
 
 #include <QRandomGenerator>
 #include <QByteArray>
@@ -47,9 +48,10 @@
 
 /* ------------------------------------------------------------------------ */
 
-static bool QuickWriteFile(const char *file, std::string &data)
+static bool QuickWriteFile(const char *file, const std::string &data)
 try {
-	std::ofstream fileStream(file, std::ios::binary);
+	std::ofstream fileStream(std::filesystem::u8path(file),
+				 std::ios::binary);
 	if (fileStream.fail())
 		throw strprintf("Failed to open file '%s': %s", file,
 				strerror(errno));
@@ -68,7 +70,8 @@
 
 static bool QuickReadFile(const char *file, std::string &data)
 try {
-	std::ifstream fileStream(file, std::ifstream::binary);
+	std::ifstream fileStream(std::filesystem::u8path(file),
+				 std::ios::binary);
 	if (!fileStream.is_open() || fileStream.fail())
 		throw strprintf("Failed to open file '%s': %s", file,
 				strerror(errno));
@@ -97,7 +100,7 @@
 	if (blake2b_init(&blake2, BLAKE2_HASH_LENGTH) != 0)
 		return false;
 
-	std::ifstream file(path, std::ios::binary);
+	std::ifstream file(std::filesystem::u8path(path), std::ios::binary);
 	if (!file.is_open() || file.fail())
 		return false;
 
@@ -232,7 +235,7 @@
 						 BLAKE2_HASH_LENGTH);
 
 		QString header = "If-None-Match: " + hash.toHex();
-		headers.push_back(std::move(header.toStdString()));
+		headers.push_back(header.toStdString());
 	}
 
 	/* ----------------------------------- *

obs-studio-29.1.3.tar.xz/UI/update/sparkle-updater.mm -> obs-studio-30.0.2.tar.xz/UI/update/sparkle-updater.mm Changed

@@ -16,80 +16,64 @@
 
 @synthesize branch;
 
-- (nonnull NSSet<NSString *> *)allowedChannelsForUpdater:
-	(nonnull SPUUpdater *)updater
+- (nonnull NSSet<NSString *> *)allowedChannelsForUpdater:(nonnull SPUUpdater *)updater
 {
-	return NSSet setWithObject:branch;
+ return NSSet setWithObject:branch;
 }
 
 - (void)observeCanCheckForUpdatesWithAction:(QAction *)action
 {
-	_updaterController.updater
-		addObserver:self
-		 forKeyPath:NSStringFromSelector(@selector(canCheckForUpdates))
-		 options:(NSKeyValueObservingOptionInitial |
-			 NSKeyValueObservingOptionNew)
-		 context:(void *)action;
+ _updaterController.updater addObserver:self forKeyPath:NSStringFromSelector(@selector(canCheckForUpdates))
+ options:(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew)
+ context:(void *) action;
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath
-		 ofObject:(id)object
-			change:(NSDictionary<NSKeyValueChangeKey, id> *)change
-		 context:(void *)context
+ ofObject:(id)object
+ change:(NSDictionary<NSKeyValueChangeKey, id> *)change
+ context:(void *)context
 {
-	if (keyPath isEqualToString:NSStringFromSelector(
-					 @selector(canCheckForUpdates))) {
-		QAction *menuAction = (QAction *)context;
-		menuAction->setEnabled(
-			_updaterController.updater.canCheckForUpdates);
-	} else {
-		super observeValueForKeyPath:keyPath
-				 ofObject:object
-				 change:change
-				 context:context;
-	}
+ if (keyPath isEqualToString:NSStringFromSelector(@selector(canCheckForUpdates))) {
+ QAction *menuAction = (QAction *) context;
+ menuAction->setEnabled(_updaterController.updater.canCheckForUpdates);
+ } else {
+ super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
+ }
 }
 
 - (void)dealloc
 {
-	@autoreleasepool {
-		_updaterController.updater
-			removeObserver:self
-			 forKeyPath:NSStringFromSelector(
-					 @selector(canCheckForUpdates));
-	}
+ @autoreleasepool {
+ _updaterController.updater removeObserver:self forKeyPath:NSStringFromSelector(@selector(canCheckForUpdates));
+ }
 }
 
 @end
 
 OBSSparkle::OBSSparkle(const char *branch, QAction *checkForUpdatesAction)
 {
-	@autoreleasepool {
-		updaterDelegate = OBSUpdateDelegate alloc init;
-		updaterDelegate.branch = NSString stringWithUTF8String:branch;
-		updaterDelegate.updaterController =
-			SPUStandardUpdaterController alloc
-				initWithStartingUpdater:YES
-					updaterDelegate:updaterDelegate
-				 userDriverDelegate:nil;
-		updaterDelegate observeCanCheckForUpdatesWithAction:
-					 checkForUpdatesAction;
-	}
+ @autoreleasepool {
+ updaterDelegate = OBSUpdateDelegate alloc init;
+ updaterDelegate.branch = NSString stringWithUTF8String:branch;
+ updaterDelegate.updaterController =
+ SPUStandardUpdaterController alloc initWithStartingUpdater:YES updaterDelegate:updaterDelegate
+ userDriverDelegate:nil;
+ updaterDelegate observeCanCheckForUpdatesWithAction:checkForUpdatesAction;
+ }
 }
 
 void OBSSparkle::setBranch(const char *branch)
 {
-	updaterDelegate.branch = NSString stringWithUTF8String:branch;
+ updaterDelegate.branch = NSString stringWithUTF8String:branch;
 }
 
 void OBSSparkle::checkForUpdates(bool manualCheck)
 {
-	@autoreleasepool {
-		if (manualCheck) {
-			updaterDelegate.updaterController checkForUpdates:nil;
-		} else {
-			updaterDelegate.updaterController
-					.updater checkForUpdatesInBackground;
-		}
-	}
+ @autoreleasepool {
+ if (manualCheck) {
+ updaterDelegate.updaterController checkForUpdates:nil;
+ } else {
+ updaterDelegate.updaterController.updater checkForUpdatesInBackground;
+ }
+ }
 }

obs-studio-29.1.3.tar.xz/UI/update/win-update.cpp -> obs-studio-30.0.2.tar.xz/UI/update/win-update.cpp Changed

@@ -1,3 +1,4 @@
+#include "../win-update/updater/manifest.hpp"
 #include "update-helpers.hpp"
 #include "shared-update.hpp"
 #include "update-window.hpp"
@@ -17,14 +18,13 @@
 
 #include <util/windows/WinHandle.hpp>
 #include <util/util.hpp>
-#include <json11.hpp>
 
 #ifdef BROWSER_AVAILABLE
 #include <browser-panel.hpp>
 #endif
 
 using namespace std;
-using namespace json11;
+using namespace updater;
 
 /* ------------------------------------------------------------------------ */
 
@@ -50,92 +50,57 @@
 
 /* ------------------------------------------------------------------------ */
 
-#if defined(OBS_RELEASE_CANDIDATE) && OBS_RELEASE_CANDIDATE > 0
-#define CUR_VER \
-	((uint64_t)OBS_RELEASE_CANDIDATE_VER << 16ULL | OBS_RELEASE_CANDIDATE \
-								<< 8ULL)
-#define PRE_RELEASE true
-#elif OBS_BETA > 0
-#define CUR_VER ((uint64_t)OBS_BETA_VER << 16ULL | OBS_BETA)
-#define PRE_RELEASE true
-#elif defined(OBS_COMMIT)
-#define CUR_VER 1 << 16ULL
-#define CUR_COMMIT OBS_COMMIT
-#define PRE_RELEASE true
-#else
-#define CUR_VER ((uint64_t)LIBOBS_API_VER << 16ULL)
-#define PRE_RELEASE false
-#endif
-
-#ifndef CUR_COMMIT
-#define CUR_COMMIT "00000000"
-#endif
-
-static bool ParseUpdateManifest(const char *manifest, bool *updatesAvailable,
-				string &notes_str, uint64_t &updateVer,
-				string &branch)
+static bool ParseUpdateManifest(const char *manifest_data,
+				bool *updatesAvailable, string &notes,
+				string &updateVer, const string &branch)
 try {
-
-	string error;
-	Json root = Json::parse(manifest, error);
-	if (!error.empty())
-		throw strprintf("Failed reading json string: %s",
-				error.c_str());
-
-	if (!root.is_object())
-		throw string("Root of manifest is not an object");
-
-	int major = root"version_major".int_value();
-	int minor = root"version_minor".int_value();
-	int patch = root"version_patch".int_value();
-	int rc = root"rc".int_value();
-	int beta = root"beta".int_value();
-	string commit_hash = root"commit".string_value();
-
-	if (major == 0 && commit_hash.empty())
-		throw strprintf("Invalid version number: %d.%d.%d", major,
-				minor, patch);
-
-	const Json &notes = root"notes";
-	if (!notes.is_string())
-		throw string("'notes' value invalid");
-
-	notes_str = notes.string_value();
-
-	const Json &packages = root"packages";
-	if (!packages.is_array())
-		throw string("'packages' value invalid");
-
-	uint64_t cur_ver;
-	uint64_t new_ver;
-
-	if (commit_hash.empty()) {
-		cur_ver = CUR_VER;
-		new_ver = MAKE_SEMANTIC_VERSION(
-			(uint64_t)major, (uint64_t)minor, (uint64_t)patch);
+	constexpr uint64_t currentVersion = (uint64_t)LIBOBS_API_VER << 16ULL |
+					 OBS_RELEASE_CANDIDATE << 8ULL |
+					 OBS_BETA;
+	constexpr bool isPreRelease =
+		currentVersion & 0xffff ||
+		std::char_traits<char>::length(OBS_COMMIT);
+
+	json manifestContents = json::parse(manifest_data);
+	Manifest manifest = manifestContents.get<Manifest>();
+
+	if (manifest.version_major == 0 && manifest.commit.empty())
+		throw strprintf("Invalid version number: %d.%d.%d",
+				manifest.version_major, manifest.version_minor,
+				manifest.version_patch);
+
+	notes = manifest.notes;
+
+	if (manifest.commit.empty()) {
+		uint64_t new_ver =
+			MAKE_SEMANTIC_VERSION((uint64_t)manifest.version_major,
+					 (uint64_t)manifest.version_minor,
+					 (uint64_t)manifest.version_patch);
 		new_ver <<= 16;
 		/* RC builds are shifted so that rc1 and beta1 versions do not result
 		 * in the same new_ver. */
-		if (rc > 0)
-			new_ver |= (uint64_t)rc << 8;
-		else if (beta > 0)
-			new_ver |= (uint64_t)beta;
+		if (manifest.rc > 0)
+			new_ver |= (uint64_t)manifest.rc << 8;
+		else if (manifest.beta > 0)
+			new_ver |= (uint64_t)manifest.beta;
+
+		updateVer = to_string(new_ver);
+
+		/* When using a pre-release build or non-default branch we only check if
+		 * the manifest version is different, so that it can be rolled back. */
+		if (branch != WIN_DEFAULT_BRANCH || isPreRelease)
+			*updatesAvailable = new_ver != currentVersion;
+		else
+			*updatesAvailable = new_ver > currentVersion;
 	} else {
 		/* Test or nightly builds may not have a (valid) version number,
 		 * so compare commit hashes instead. */
-		cur_ver = stoul(CUR_COMMIT, nullptr, 16);
-		new_ver = stoul(commit_hash.substr(0, 8), nullptr, 16);
+		updateVer = manifest.commit.substr(0, 8);
+		*updatesAvailable = !currentVersion ||
+				 !manifest.commit.compare(
+					 0, strlen(OBS_COMMIT), OBS_COMMIT);
 	}
 
-	updateVer = new_ver;
-
-	/* When using a pre-release build or non-default branch we only check if
-	 * the manifest version is different, so that it can be rolled-back. */
-	if (branch != WIN_DEFAULT_BRANCH || PRE_RELEASE)
-		*updatesAvailable = new_ver != cur_ver;
-	else
-		*updatesAvailable = new_ver > cur_ver;
-
 	return true;
 
 } catch (string &text) {
@@ -143,10 +108,6 @@
 	return false;
 }
 
-#undef CUR_COMMIT
-#undef CUR_VER
-#undef PRE_RELEASE
-
 /* ------------------------------------------------------------------------ */
 
 bool GetBranchAndUrl(string &selectedBranch, string &manifestUrl)
@@ -282,7 +243,7 @@
 	 * check manifest for update */
 
 	string notes;
-	uint64_t updateVer = 0;
+	string updateVer;
 
 	if (!ParseUpdateManifest(text.c_str(), &updatesAvailable, notes,
 				 updateVer, branch))
@@ -302,9 +263,10 @@
 	/* ----------------------------------- *
 	 * skip this version if set to skip */
 
-	uint64_t skipUpdateVer = config_get_uint(GetGlobalConfig(), "General",
-						 "SkipUpdateVersion");
-	if (!manualUpdate && updateVer == skipUpdateVer && !repairMode)
+	const char *skipUpdateVer = config_get_string(
+		GetGlobalConfig(), "General", "SkipUpdateVersion");
+	if (!manualUpdate && !repairMode && skipUpdateVer &&
+	 updateVer == skipUpdateVer)
 		return;
 
 	/* ----------------------------------- *
@@ -332,8 +294,9 @@
 			return;
 
 		} else if (queryResult == OBSUpdate::Skip) {
-			config_set_uint(GetGlobalConfig(), "General",
-					"SkipUpdateVersion", updateVer);
+			config_set_string(GetGlobalConfig(), "General",
+					 "SkipUpdateVersion",
+					 updateVer.c_str());
 			return;
 		}
 	}
@@ -364,13 +327,25 @@
 	execInfo.cbSize = sizeof(execInfo);
 	execInfo.lpFile = wUpdateFilePath;
 
-	string parameters = "";
-	if (App()->IsPortableMode())
-		parameters += "--portable";
-	if (branch != WIN_DEFAULT_BRANCH) {
+	string parameters;
+	if (branch != WIN_DEFAULT_BRANCH)
+		parameters += "--branch=" + branch;
+
+	obs_cmdline_args obs_args = obs_get_cmdline_args();
+	for (int idx = 1; idx < obs_args.argc; idx++) {
 		if (!parameters.empty())
 			parameters += " ";
-		parameters += "--branch=" + branch;
+
+		parameters += obs_args.argvidx;
+	}
+
+	/* Portable mode can be enabled via sentinel files, so copying the
+	 * command line doesn't guarantee the flag to be there. */
+	if (App()->IsPortableMode() &&
+	 parameters.find("--portable") == string::npos) {
+		if (!parameters.empty())
+			parameters += " ";
+		parameters += "--portable";
 	}
 
 	BPtr<wchar_t> lpParameters;
@@ -392,7 +367,8 @@
 	/* force OBS to perform another update check immediately after updating
 	 * in case of issues with the new version */
 	config_set_int(GetGlobalConfig(), "General", "LastUpdateCheck", 0);
-	config_set_int(GetGlobalConfig(), "General", "SkipUpdateVersion", 0);
+	config_set_string(GetGlobalConfig(), "General", "SkipUpdateVersion",
+			 "0");
 
 	QMetaObject::invokeMethod(App()->GetMainWindow(), "close");

obs-studio-29.1.3.tar.xz/UI/update/win-update.hpp -> obs-studio-30.0.2.tar.xz/UI/update/win-update.hpp Changed

obs-studio-29.1.3.tar.xz/UI/visibility-item-widget.cpp -> obs-studio-30.0.2.tar.xz/UI/visibility-item-widget.cpp Changed

obs-studio-29.1.3.tar.xz/UI/visibility-item-widget.hpp -> obs-studio-30.0.2.tar.xz/UI/visibility-item-widget.hpp Changed

obs-studio-29.1.3.tar.xz/UI/volume-control.cpp -> obs-studio-30.0.2.tar.xz/UI/volume-control.cpp Changed

@@ -23,7 +23,7 @@
 // Padding on top and bottom of vertical meters
 #define METER_PADDING 1
 
-QWeakPointer<VolumeMeterTimer> VolumeMeter::updateTimer;
+std::weak_ptr<VolumeMeterTimer> VolumeMeter::updateTimer;
 
 static inline Qt::CheckState GetCheckState(bool muted, bool unassigned)
 {
@@ -156,9 +156,9 @@
 			ShowUnassignedWarning(obs_source_get_name(source));
 	}
 
-	auto undo_redo = (const std::string &name, bool val) {
+	auto undo_redo = (const std::string &uuid, bool val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_muted(source, val);
 	};
 
@@ -166,11 +166,12 @@
 		QTStr(checked ? "Undo.Volume.Mute" : "Undo.Volume.Unmute");
 
 	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		text.arg(name),
 		std::bind(undo_redo, std::placeholders::_1, prev),
-		std::bind(undo_redo, std::placeholders::_1, checked), name,
-		name);
+		std::bind(undo_redo, std::placeholders::_1, checked), uuid,
+		uuid);
 }
 
 void VolControl::SliderChanged(int vol)
@@ -180,18 +181,19 @@
 	obs_fader_set_deflection(obs_fader, float(vol) / FADER_PRECISION);
 	updateText();
 
-	auto undo_redo = (const std::string &name, float val) {
+	auto undo_redo = (const std::string &uuid, float val) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(name.c_str());
+			obs_get_source_by_uuid(uuid.c_str());
 		obs_source_set_volume(source, val);
 	};
 
 	float val = obs_source_get_volume(source);
 	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 	OBSBasic::Get()->undo_s.add_action(
 		QTStr("Undo.Volume.Change").arg(name),
 		std::bind(undo_redo, std::placeholders::_1, prev),
-		std::bind(undo_redo, std::placeholders::_1, val), name, name,
+		std::bind(undo_redo, std::placeholders::_1, val), uuid, uuid,
 		true);
 }
 
@@ -299,12 +301,15 @@
 		controlLayout->setContentsMargins(0, 0, 0, 0);
 		controlLayout->setSpacing(0);
 
-		if (showConfig)
+		if (showConfig) {
 			controlLayout->addWidget(config);
+			controlLayout->setAlignment(config, Qt::AlignVCenter);
+		}
 
 		controlLayout->addItem(new QSpacerItem(3, 0));
 		// Add Headphone (audio monitoring) widget here
 		controlLayout->addWidget(mute);
+		controlLayout->setAlignment(mute, Qt::AlignVCenter);
 
 		meterLayout->setContentsMargins(0, 0, 0, 0);
 		meterLayout->setSpacing(0);
@@ -386,8 +391,8 @@
 			 "audio_monitoring", OBSMixersOrMonitoringChanged,
 			 this);
 
-	QWidget::connect(slider, SIGNAL(valueChanged(int)), this,
-			 SLOT(SliderChanged(int)));
+	QWidget::connect(slider, &VolumeSlider::valueChanged, this,
+			 &VolControl::SliderChanged);
 	QWidget::connect(mute, &MuteCheckBox::clicked, this,
 			 &VolControl::SetMuted);
 
@@ -429,8 +434,6 @@
 				 "audio_monitoring",
 				 OBSMixersOrMonitoringChanged, this);
 
-	obs_fader_destroy(obs_fader);
-	obs_volmeter_destroy(obs_volmeter);
 	if (contextMenu)
 		contextMenu->close();
 }
@@ -826,7 +829,9 @@
 
 VolumeMeter::VolumeMeter(QWidget *parent, obs_volmeter_t *obs_volmeter,
 			 bool vertical)
-	: QWidget(parent), obs_volmeter(obs_volmeter), vertical(vertical)
+	: QWidget(parent),
+	 obs_volmeter(obs_volmeter),
+	 vertical(vertical)
 {
 	setAttribute(Qt::WA_OpaquePaintEvent, true);
 
@@ -865,9 +870,9 @@
 	channels = (int)audio_output_get_channels(obs_get_audio());
 
 	doLayout();
-	updateTimerRef = updateTimer.toStrongRef();
+	updateTimerRef = updateTimer.lock();
 	if (!updateTimerRef) {
-		updateTimerRef = QSharedPointer<VolumeMeterTimer>::create();
+		updateTimerRef = std::make_shared<VolumeMeterTimer>();
 		updateTimerRef->setTimerType(Qt::PreciseTimer);
 		updateTimerRef->start(16);
 		updateTimer = updateTimerRef;
@@ -1161,11 +1166,6 @@
 
 #define CLIP_FLASH_DURATION_MS 1000
 
-void VolumeMeter::ClipEnding()
-{
-	clipping = false;
-}
-
 inline int VolumeMeter::convertToInt(float number)
 {
 	constexpr int min = std::numeric_limits<int>::min();
@@ -1262,7 +1262,7 @@
 	} else if (int(magnitude) != 0) {
 		if (!clipping) {
 			QTimer::singleShot(CLIP_FLASH_DURATION_MS, this,
-					 SLOT(ClipEnding()));
+					 &() { clipping = false; });
 			clipping = true;
 		}
 
@@ -1374,7 +1374,7 @@
 	} else {
 		if (!clipping) {
 			QTimer::singleShot(CLIP_FLASH_DURATION_MS, this,
-					 SLOT(ClipEnding()));
+					 &() { clipping = false; });
 			clipping = true;
 		}

obs-studio-29.1.3.tar.xz/UI/volume-control.hpp -> obs-studio-30.0.2.tar.xz/UI/volume-control.hpp Changed

obs-studio-29.1.3.tar.xz/UI/win-update/updater/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/CMakeLists.txt Changed

@@ -2,18 +2,8 @@
 
 legacy_check()
 
-option(ENABLE_UPDATER "Build with Windows updater" ON)
-
-if(NOT ENABLE_UPDATER)
-  target_disable_feature(obs "Windows updater")
-  return()
-endif()
-
 find_package(zstd)
-
-if(NOT TARGET OBS::json11)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/deps/json11" "${CMAKE_BINARY_DIR}/deps/json11")
-endif()
+find_package(nlohmann_json 3 REQUIRED)
 
 add_executable(updater WIN32)
 
@@ -24,6 +14,7 @@
           helpers.hpp
           http.cpp
           init-hook-files.c
+          manifest.hpp
           patch.cpp
           resource.h
           updater.cpp
@@ -36,7 +27,8 @@
 
 target_include_directories(updater PRIVATE "${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_SOURCE_DIR}/UI/win-update")
 
-target_link_libraries(updater PRIVATE OBS::blake2 OBS::json11 zstd::libzstd_static comctl32 shell32 winhttp)
+target_link_libraries(updater PRIVATE OBS::blake2 nlohmann_json::nlohmann_json zstd::libzstd_static comctl32 shell32
+                                      winhttp)
 target_link_options(updater PRIVATE /IGNORE:4098)
 
-set_target_properties_obs(updater PROPERTIES FOLDER frontend OUTPUT_NAME updater)
+set_target_properties(updater PROPERTIES FOLDER frontend OUTPUT_NAME updater)

obs-studio-29.1.3.tar.xz/UI/win-update/updater/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/cmake/legacy.cmake Changed

@@ -8,6 +8,7 @@
 endif()
 
 find_package(zstd)
+find_package(nlohmann_json 3 REQUIRED)
 
 add_executable(updater WIN32)
 
@@ -23,11 +24,9 @@
           init-hook-files.c
           updater.manifest
           helpers.cpp
-          helpers.hpp
-          ${CMAKE_SOURCE_DIR}/deps/json11/json11.hpp
-          ${CMAKE_SOURCE_DIR}/deps/json11/json11.cpp)
+          helpers.hpp)
 
-target_include_directories(updater PRIVATE ${CMAKE_SOURCE_DIR}/libobs ${CMAKE_SOURCE_DIR}/deps/json11)
+target_include_directories(updater PRIVATE ${CMAKE_SOURCE_DIR}/libobs)
 
 target_compile_definitions(updater PRIVATE NOMINMAX "PSAPI_VERSION=2")
 
@@ -37,6 +36,7 @@
   target_link_options(updater PRIVATE "LINKER:/IGNORE:4098")
 endif()
 
-target_link_libraries(updater PRIVATE OBS::blake2 zstd::libzstd_static comctl32 shell32 winhttp)
+target_link_libraries(updater PRIVATE OBS::blake2 nlohmann_json::nlohmann_json zstd::libzstd_static comctl32 shell32
+                                      winhttp)
 
 set_target_properties(updater PROPERTIES FOLDER "frontend")

obs-studio-29.1.3.tar.xz/UI/win-update/updater/hash.cpp -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/hash.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -21,33 +21,33 @@
 
 using namespace std;
 
-void HashToString(const uint8_t *in, wchar_t *out)
+void HashToString(const B2Hash &in, string &out)
 {
-	const wchar_t alphabet = L"0123456789abcdef";
+	constexpr char alphabet = "0123456789abcdef";
+	out.resize(kBlake2StrLength);
 
-	for (int i = 0; i != BLAKE2_HASH_LENGTH; ++i) {
-		out2 * i = alphabetini / 16;
-		out2 * i + 1 = alphabetini % 16;
+	for (size_t i = 0; i != kBlake2HashLength; ++i) {
+		out2 * i = alphabet(uint8_t)ini / 16;
+		out2 * i + 1 = alphabet(uint8_t)ini % 16;
 	}
-
-	outBLAKE2_HASH_LENGTH * 2 = 0;
 }
 
-void StringToHash(const wchar_t *in, BYTE *out)
+void StringToHash(const string &in, B2Hash &out)
 {
 	unsigned int temp;
+	const char *str = in.c_str();
 
-	for (int i = 0; i < BLAKE2_HASH_LENGTH; i++) {
-		swscanf_s(in + i * 2, L"%02x", &temp);
-		outi = (BYTE)temp;
+	for (size_t i = 0; i < kBlake2HashLength; i++) {
+		sscanf_s(str + i * 2, "%02x", &temp);
+		outi = static_cast<std::byte>(temp);
 	}
 }
 
-bool CalculateFileHash(const wchar_t *path, BYTE *hash)
+bool CalculateFileHash(const wchar_t *path, B2Hash &hash)
 {
 	static __declspec(thread) vector<BYTE> hashBuffer;
 	blake2b_state blake2;
-	if (blake2b_init(&blake2, BLAKE2_HASH_LENGTH) != 0)
+	if (blake2b_init(&blake2, kBlake2HashLength) != 0)
 		return false;
 
 	hashBuffer.resize(1048576);
@@ -59,18 +59,18 @@
 
 	for (;;) {
 		DWORD read = 0;
-		if (!ReadFile(handle, &hashBuffer0, (DWORD)hashBuffer.size(),
-			 &read, nullptr))
+		if (!ReadFile(handle, hashBuffer.data(),
+			 (DWORD)hashBuffer.size(), &read, nullptr))
 			return false;
 
 		if (!read)
 			break;
 
-		if (blake2b_update(&blake2, &hashBuffer0, read) != 0)
+		if (blake2b_update(&blake2, hashBuffer.data(), read) != 0)
 			return false;
 	}
 
-	if (blake2b_final(&blake2, hash, BLAKE2_HASH_LENGTH) != 0)
+	if (blake2b_final(&blake2, hash.data(), hash.size()) != 0)
 		return false;
 
 	return true;

obs-studio-29.1.3.tar.xz/UI/win-update/updater/helpers.hpp -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/helpers.hpp Changed

obs-studio-29.1.3.tar.xz/UI/win-update/updater/http.cpp -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/http.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -352,3 +352,131 @@
 
 	return true;
 }
+
+bool HTTPGetBuffer(HINTERNET hConnect, const wchar_t *url,
+		 const wchar_t *extraHeaders, vector<std::byte> &out,
+		 int *responseCode)
+{
+	HttpHandle hRequest;
+
+	const wchar_t *acceptTypes = {L"*/*", nullptr};
+
+	URL_COMPONENTS urlComponents = {};
+	bool secure = false;
+
+	wchar_t hostName256;
+	wchar_t path1024;
+
+	/* -------------------------------------- *
+	 * get URL components */
+
+	urlComponents.dwStructSize = sizeof(urlComponents);
+
+	urlComponents.lpszHostName = hostName;
+	urlComponents.dwHostNameLength = _countof(hostName);
+
+	urlComponents.lpszUrlPath = path;
+	urlComponents.dwUrlPathLength = _countof(path);
+
+	WinHttpCrackUrl(url, 0, 0, &urlComponents);
+
+	if (urlComponents.nPort == 443)
+		secure = true;
+
+	/* -------------------------------------- *
+	 * request data */
+
+	hRequest = WinHttpOpenRequest(hConnect, L"GET", path, nullptr,
+				 WINHTTP_NO_REFERER, acceptTypes,
+				 secure ? WINHTTP_FLAG_SECURE |
+						 WINHTTP_FLAG_REFRESH
+					 : WINHTTP_FLAG_REFRESH);
+	if (!hRequest) {
+		*responseCode = -3;
+		return false;
+	}
+
+	bool bResults = !!WinHttpSendRequest(hRequest, extraHeaders,
+					 extraHeaders ? -1 : 0,
+					 WINHTTP_NO_REQUEST_DATA, 0, 0, 0);
+
+	/* -------------------------------------- *
+	 * end request */
+
+	if (bResults) {
+		bResults = !!WinHttpReceiveResponse(hRequest, nullptr);
+	} else {
+		*responseCode = GetLastError();
+		return false;
+	}
+
+	/* -------------------------------------- *
+	 * get headers */
+
+	wchar_t statusCode8;
+	DWORD statusCodeLen;
+
+	statusCodeLen = sizeof(statusCode);
+	if (!WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_STATUS_CODE,
+				 WINHTTP_HEADER_NAME_BY_INDEX, &statusCode,
+				 &statusCodeLen, WINHTTP_NO_HEADER_INDEX)) {
+		*responseCode = -4;
+		return false;
+	} else {
+		statusCode_countof(statusCode) - 1 = 0;
+	}
+
+	/* -------------------------------------- *
+	 * read data */
+
+	*responseCode = wcstoul(statusCode, nullptr, 10);
+
+	/* are we supposed to return true here? */
+	if (!bResults || *responseCode != 200)
+		return true;
+
+	BYTE bufferREAD_BUF_SIZE;
+	DWORD dwSize, outSize;
+	int lastPosition = 0;
+
+	do {
+		/* Check for available data. */
+		dwSize = 0;
+		if (!WinHttpQueryDataAvailable(hRequest, &dwSize)) {
+			*responseCode = -8;
+			return false;
+		}
+
+		dwSize = std::min(dwSize, (DWORD)sizeof(buffer));
+
+		if (!WinHttpReadData(hRequest, (void *)buffer, dwSize,
+				 &outSize)) {
+			*responseCode = -9;
+			return false;
+		} else {
+			if (!outSize)
+				break;
+
+			out.insert(out.end(), (std::byte *)buffer,
+				 (std::byte *)buffer + outSize);
+
+			completedFileSize += outSize;
+			int position = (int)(((float)completedFileSize /
+					 (float)totalFileSize) *
+					 100.0f);
+			if (position > lastPosition) {
+				lastPosition = position;
+				SendDlgItemMessage(hwndMain, IDC_PROGRESS,
+						 PBM_SETPOS, position, 0);
+			}
+		}
+
+		if (WaitForSingleObject(cancelRequested, 0) == WAIT_OBJECT_0) {
+			*responseCode = -14;
+			return false;
+		}
+
+	} while (dwSize > 0);
+
+	return true;
+}

obs-studio-30.0.2.tar.xz/UI/win-update/updater/manifest.hpp Added

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2023 Dennis Sädtler <dennis@obsproject.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#include <string>
+#include <nlohmann/json.hpp>
+
+using json = nlohmann::json;
+
+namespace updater {
+struct File {
+	/* 160-bit blake2b hashes of zstd compressed and raw file (hex string) */
+	std::string compressed_hash;
+	std::string hash;
+	/* Relative path */
+	std::string name;
+	/* Uncompressed size in bytes */
+	size_t size = 0;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(File, compressed_hash, hash, name, size)
+};
+
+struct Package {
+	std::string name;
+	std::vector<File> files = {};
+	/* Relative paths of files to remove */
+	std::vector<std::string> removed_files = {};
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(Package, name, files, removed_files)
+};
+
+struct Manifest {
+	/* Update packages */
+	std::vector<Package> packages = {};
+
+	/* Version information */
+	uint8_t version_major = 0;
+	uint8_t version_minor = 0;
+	uint8_t version_patch = 0;
+	uint8_t beta = 0;
+	uint8_t rc = 0;
+	std::string commit;
+
+	/* Hash of VC redist file */
+	std::string vc2019_redist_x64;
+
+	/* Release notes in HTML format */
+	std::string notes;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(Manifest, packages, version_major,
+				 version_minor, version_patch, beta, rc,
+				 commit, vc2019_redist_x64, notes)
+};
+
+struct PatchRequest {
+	/* Relative path of file */
+	std::string name;
+	/* 160-bit blake2b hash of existing file */
+	std::string hash;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(PatchRequest, name, hash)
+};
+
+using PatchesRequest = std::vector<PatchRequest>;
+
+struct PatchResponse {
+	/* Relative path of file */
+	std::string name;
+	/* 160-bit blake2b hash of patch file */
+	std::string hash;
+	/* Download URL for patch file */
+	std::string source;
+	/* Size of patch file */
+	size_t size = 0;
+
+	NLOHMANN_DEFINE_TYPE_INTRUSIVE(PatchResponse, name, hash, size, source)
+};
+
+using PatchesResponse = std::vector<PatchResponse>;
+} // namespace updater

obs-studio-29.1.3.tar.xz/UI/win-update/updater/patch.cpp -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/patch.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,6 @@
 
 #include "updater.hpp"
 
-#include <stdint.h>
 #include <vector>
 
 using namespace std;
@@ -51,24 +50,21 @@
 
 /* ------------------------------------------------------------------------ */
 
-int ApplyPatch(ZSTD_DCtx *zstdCtx, const wchar_t *patchFile,
-	 const wchar_t *targetFile)
+constexpr const char *kDeltaMagic = "BOUF//ZSTD//DICT";
+constexpr int kMagicSize = 16;
+constexpr int kHeaderSize = kMagicSize + 8; // magic + int64_t delta size
+
+int ApplyPatch(ZSTD_DCtx *zstdCtx, const std::byte *patch_data,
+	 const size_t patch_size, const wchar_t *targetFile)
 try {
-	uint8_t header24;
 	int64_t newsize;
 	bool success;
 
-	WinHandle hPatch;
 	WinHandle hTarget;
 
 	/* --------------------------------- *
 	 * open patch and file to patch */
 
-	hPatch = CreateFile(patchFile, GENERIC_READ, 0, nullptr, OPEN_EXISTING,
-			 0, nullptr);
-	if (!hPatch.Valid())
-		throw int(GetLastError());
-
 	hTarget = CreateFile(targetFile, GENERIC_READ, 0, nullptr,
 			 OPEN_EXISTING, 0, nullptr);
 	if (!hTarget.Valid())
@@ -77,29 +73,17 @@
 	/* --------------------------------- *
 	 * read patch header */
 
-	DWORD read;
-	DWORD patchFileSize;
-
-	patchFileSize = GetFileSize(hPatch, nullptr);
-	if (patchFileSize == INVALID_FILE_SIZE)
-		throw int(GetLastError());
-
-	success = !!ReadFile(hPatch, header, sizeof(header), &read, nullptr);
-	if (success && read == sizeof(header)) {
-		if (memcmp(header, "BOUF//ZSTD//DICT", 16))
-			throw int(-4);
-	} else {
-		throw int(GetLastError());
-	}
+	if (memcmp(patch_data, kDeltaMagic, kMagicSize) != 0)
+		throw int(-4);
 
 	/* --------------------------------- *
 	 * allocate new file size data */
 
-	newsize = offtin(header + 16);
+	newsize = offtin((const uint8_t *)patch_data + kMagicSize);
 	if (newsize < 0 || newsize >= 0x7ffffffff)
 		throw int(-5);
 
-	vector<uint8_t> newData;
+	vector<std::byte> newData;
 	try {
 		newData.resize((size_t)newsize);
 	} catch (...) {
@@ -107,49 +91,34 @@
 	}
 
 	/* --------------------------------- *
-	 * read remainder of patch file */
-
-	vector<uint8_t> patchData;
-	try {
-		patchData.resize(patchFileSize - sizeof(header));
-	} catch (...) {
-		throw int(-1);
-	}
-
-	if (!ReadFile(hPatch, &patchData0, patchFileSize - sizeof(header),
-		 &read, nullptr))
-		throw int(GetLastError());
-
-	if (read != (patchFileSize - sizeof(header)))
-		throw int(-1);
-
-	/* --------------------------------- *
 	 * read old file */
 
-	DWORD targetFileSize;
+	DWORD read;
+	DWORD oldFileSize;
 
-	targetFileSize = GetFileSize(hTarget, nullptr);
-	if (targetFileSize == INVALID_FILE_SIZE)
+	oldFileSize = GetFileSize(hTarget, nullptr);
+	if (oldFileSize == INVALID_FILE_SIZE)
 		throw int(GetLastError());
 
-	vector<uint8_t> oldData;
+	vector<std::byte> oldData;
 	try {
-		oldData.resize(targetFileSize);
+		oldData.resize(oldFileSize);
 	} catch (...) {
 		throw int(-1);
 	}
 
-	if (!ReadFile(hTarget, &oldData0, targetFileSize, &read, nullptr))
+	if (!ReadFile(hTarget, oldData.data(), oldFileSize, &read, nullptr))
 		throw int(GetLastError());
-	if (read != targetFileSize)
+	if (read != oldFileSize)
 		throw int(-1);
 
 	/* --------------------------------- *
 	 * patch to new file data */
 
 	size_t result = ZSTD_decompress_usingDict(
-		zstdCtx, &newData0, newData.size(), patchData.data(),
-		patchData.size(), oldData.data(), oldData.size());
+		zstdCtx, newData.data(), newData.size(),
+		patch_data + kHeaderSize, patch_size - kHeaderSize,
+		oldData.data(), oldData.size());
 
 	if (result != newsize || ZSTD_isError(result))
 		throw int(-9);
@@ -175,74 +144,3 @@
 } catch (int code) {
 	return code;
 }
-
-int DecompressFile(ZSTD_DCtx *ctx, const wchar_t *tempFile, size_t newSize)
-try {
-	WinHandle hTemp;
-
-	hTemp = CreateFile(tempFile, GENERIC_READ, 0, nullptr, OPEN_EXISTING, 0,
-			 nullptr);
-	if (!hTemp.Valid())
-		throw int(GetLastError());
-
-	/* --------------------------------- *
-	 * read compressed data */
-
-	DWORD read;
-	DWORD compressedFileSize;
-
-	compressedFileSize = GetFileSize(hTemp, nullptr);
-	if (compressedFileSize == INVALID_FILE_SIZE)
-		throw int(GetLastError());
-
-	vector<uint8_t> oldData;
-	try {
-		oldData.resize(compressedFileSize);
-	} catch (...) {
-		throw int(-1);
-	}
-
-	if (!ReadFile(hTemp, &oldData0, compressedFileSize, &read, nullptr))
-		throw int(GetLastError());
-	if (read != compressedFileSize)
-		throw int(-1);
-
-	/* --------------------------------- *
-	 * decompress data */
-
-	vector<uint8_t> newData;
-	try {
-		newData.resize((size_t)newSize);
-	} catch (...) {
-		throw int(-1);
-	}
-
-	size_t result = ZSTD_decompressDCtx(ctx, &newData0, newData.size(),
-					 oldData.data(), oldData.size());
-
-	if (result != newSize)
-		throw int(-9);
-	if (ZSTD_isError(result))
-		throw int(-10);
-
-	/* --------------------------------- *
-	 * overwrite temp file with new data */
-
-	hTemp = nullptr;
-	hTemp = CreateFile(tempFile, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS,
-			 0, nullptr);
-	if (!hTemp.Valid())
-		throw int(GetLastError());
-
-	bool success;
-	DWORD written;
-
-	success = !!WriteFile(hTemp, newData.data(), (DWORD)newSize, &written,
-			 nullptr);
-	if (!success || written != newSize)
-		throw int(GetLastError());
-
-	return 0;
-} catch (int code) {
-	return code;
-}

obs-studio-29.1.3.tar.xz/UI/win-update/updater/updater.cpp -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/updater.cpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -15,20 +15,30 @@
 */
 
 #include "updater.hpp"
+#include "manifest.hpp"
 
 #include <psapi.h>
 
 #include <util/windows/CoTaskMemPtr.hpp>
 
 #include <future>
-#include <vector>
 #include <string>
+#include <string_view>
 #include <mutex>
 #include <unordered_set>
 #include <queue>
 
 using namespace std;
-using namespace json11;
+using namespace updater;
+
+/* ----------------------------------------------------------------------- */
+
+constexpr const string_view kCDNUrl = "https://cdn-fastly.obsproject.com/";
+constexpr const wchar_t *kCDNHostname = L"cdn-fastly.obsproject.com";
+constexpr const wchar_t *kCDNUpdateBaseUrl =
+	L"https://cdn-fastly.obsproject.com/update_studio";
+constexpr const wchar_t *kPatchManifestURL =
+	L"https://obsproject.com/update_studio/getpatchmanifest";
 
 /* ----------------------------------------------------------------------- */
 
@@ -43,8 +53,8 @@
 
 static bool downloadThreadFailure = false;
 
-int totalFileSize = 0;
-int completedFileSize = 0;
+size_t totalFileSize = 0;
+size_t completedFileSize = 0;
 static int completedUpdates = 0;
 
 static wchar_t tempPathMAX_PATH;
@@ -116,20 +126,6 @@
 	va_end(argptr);
 }
 
-static void CreateFoldersForPath(const wchar_t *path)
-{
-	wchar_t *p = (wchar_t *)path;
-
-	while (*p) {
-		if (*p == '\\' || *p == '/') {
-			*p = 0;
-			CreateDirectory(path, nullptr);
-			*p = '\\';
-		}
-		p++;
-	}
-}
-
 static bool MyCopyFile(const wchar_t *src, const wchar_t *dest)
 try {
 	WinHandle hSrc;
@@ -164,7 +160,7 @@
 
 	return true;
 
-} catch (LastError error) {
+} catch (LastError &error) {
 	SetLastError(error.code);
 	return false;
 }
@@ -180,7 +176,7 @@
 		return;
 
 	/* If all else fails, schedule the file to be deleted on reboot */
-	MoveFileEx(filename.c_str(), NULL, MOVEFILE_DELAY_UNTIL_REBOOT);
+	MoveFileEx(filename.c_str(), nullptr, MOVEFILE_DELAY_UNTIL_REBOOT);
 }
 
 static bool IsSafeFilename(const wchar_t *path)
@@ -213,30 +209,61 @@
 	WinHandle handle = CreateFileW(path, GENERIC_READ, 0, nullptr,
 				 OPEN_EXISTING, 0, nullptr);
 	if (!handle.Valid()) {
-		return string();
+		return {};
 	}
 
 	LARGE_INTEGER size;
 
 	if (!GetFileSizeEx(handle, &size)) {
-		return string();
+		return {};
 	}
 
 	data.resize((size_t)size.QuadPart);
 
 	DWORD read;
-	if (!ReadFile(handle, &data0, (DWORD)data.size(), &read, nullptr)) {
-		return string();
+	if (!ReadFile(handle, data.data(), (DWORD)data.size(), &read,
+		 nullptr)) {
+		return {};
 	}
 	if (read != size.QuadPart) {
-		return string();
+		return {};
 	}
 
 	return data;
 }
 
+static bool QuickWriteFile(const wchar_t *file, const void *data, size_t size)
+try {
+	WinHandle handle = CreateFile(file, GENERIC_WRITE, 0, nullptr,
+				 CREATE_ALWAYS, FILE_FLAG_WRITE_THROUGH,
+				 nullptr);
+
+	if (handle == INVALID_HANDLE_VALUE)
+		throw GetLastError();
+
+	DWORD written;
+	if (!WriteFile(handle, data, (DWORD)size, &written, nullptr))
+		throw GetLastError();
+
+	return true;
+
+} catch (LastError &error) {
+	SetLastError(error.code);
+	return false;
+}
+
 /* ----------------------------------------------------------------------- */
 
+/* Extend std::hash for B2Hash */
+template<> struct std::hash<B2Hash> {
+	size_t operator()(const B2Hash &value) const noexcept
+	{
+		return hash<string_view>{}(string_view(
+			reinterpret_cast<const char *>(value.data()),
+			value.size()));
+	}
+};
+
 enum state_t {
 	STATE_INVALID,
 	STATE_PENDING_DOWNLOAD,
@@ -250,46 +277,31 @@
 struct update_t {
 	wstring sourceURL;
 	wstring outputPath;
-	wstring tempPath;
 	wstring previousFile;
-	wstring basename;
 	string packageName;
 
-	DWORD fileSize = 0;
-	BYTE hashBLAKE2_HASH_LENGTH;
-	BYTE downloadhashBLAKE2_HASH_LENGTH;
-	BYTE my_hashBLAKE2_HASH_LENGTH;
+	B2Hash hash;
+	B2Hash my_hash;
+	B2Hash downloadHash;
+
+	size_t fileSize = 0;
 	state_t state = STATE_INVALID;
 	bool has_hash = false;
 	bool patchable = false;
 	bool compressed = false;
 
-	inline update_t() {}
-	inline update_t(const update_t &from)
-		: sourceURL(from.sourceURL),
-		 outputPath(from.outputPath),
-		 tempPath(from.tempPath),
-		 previousFile(from.previousFile),
-		 basename(from.basename),
-		 packageName(from.packageName),
-		 fileSize(from.fileSize),
-		 state(from.state),
-		 has_hash(from.has_hash),
-		 patchable(from.patchable),
-		 compressed(from.compressed)
-	{
-		memcpy(hash, from.hash, sizeof(hash));
-		memcpy(downloadhash, from.downloadhash, sizeof(downloadhash));
-		memcpy(my_hash, from.my_hash, sizeof(my_hash));
-	}
+	update_t() = default;
+
+	update_t(const update_t &from) = default;
 
-	inline update_t(update_t &&from)
+	update_t(update_t &&from) noexcept
 		: sourceURL(std::move(from.sourceURL)),
 		 outputPath(std::move(from.outputPath)),
-		 tempPath(std::move(from.tempPath)),
 		 previousFile(std::move(from.previousFile)),
-		 basename(std::move(from.basename)),
 		 packageName(std::move(from.packageName)),
+		 hash(from.hash),
+		 my_hash(from.my_hash),
+		 downloadHash(from.downloadHash),
 		 fileSize(from.fileSize),
 		 state(from.state),
 		 has_hash(from.has_hash),
@@ -297,13 +309,9 @@
 		 compressed(from.compressed)
 	{
 		from.state = STATE_INVALID;
-
-		memcpy(hash, from.hash, sizeof(hash));
-		memcpy(downloadhash, from.downloadhash, sizeof(downloadhash));
-		memcpy(my_hash, from.my_hash, sizeof(my_hash));
 	}
 
-	void CleanPartialUpdate()
+	void CleanPartialUpdate() const
 	{
 		if (state == STATE_INSTALL_FAILED || state == STATE_INSTALLED) {
 			if (!previousFile.empty()) {
@@ -314,40 +322,17 @@
 			} else {
 				DeleteFile(outputPath.c_str());
 			}
-			if (state == STATE_INSTALL_FAILED)
-				DeleteFile(tempPath.c_str());
-		} else if (state == STATE_DOWNLOADED) {
-			DeleteFile(tempPath.c_str());
 		}
 	}
 
-	inline update_t &operator=(const update_t &from)
-	{
-		sourceURL = from.sourceURL;
-		outputPath = from.outputPath;
-		tempPath = from.tempPath;
-		previousFile = from.previousFile;
-		basename = from.basename;
-		packageName = from.packageName;
-		fileSize = from.fileSize;
-		state = from.state;
-		has_hash = from.has_hash;
-		patchable = from.patchable;
-		compressed = from.compressed;
-
-		memcpy(hash, from.hash, sizeof(hash));
-		memcpy(downloadhash, from.downloadhash, sizeof(downloadhash));
-		memcpy(my_hash, from.my_hash, sizeof(my_hash));
-
-		return *this;
-	}
+	update_t &operator=(const update_t &from) = default;
 };
 
 struct deletion_t {
 	wstring originalFilename;
 	wstring deleteMeFilename;
 
-	void UndoRename()
+	void UndoRename() const
 	{
 		if (!deleteMeFilename.empty())
 			MoveFile(deleteMeFilename.c_str(),
@@ -355,7 +340,8 @@
 	}
 };
 
-static unordered_map<string, wstring> hashes;
+static unordered_map<B2Hash, vector<std::byte>> download_data;
+static unordered_map<string, B2Hash> hashes;
 static vector<update_t> updates;
 static vector<deletion_t> deletions;
 static mutex updateMutex;
@@ -371,6 +357,29 @@
 
 /* ----------------------------------------------------------------------- */
 
+static int Decompress(ZSTD_DCtx *ctx, std::vector<std::byte> &buf, size_t size)
+{
+	// Copy compressed data
+	vector<std::byte> comp(buf.begin(), buf.end());
+
+	try {
+		buf.resize(size);
+	} catch (...) {
+		return -1;
+	}
+
+	// Overwrite buffer with decompressed data
+	size_t result = ZSTD_decompressDCtx(ctx, buf.data(), buf.size(),
+					 comp.data(), comp.size());
+
+	if (result != size)
+		return -9;
+	if (ZSTD_isError(result))
+		return -10;
+
+	return 0;
+}
+
 bool DownloadWorkerThread()
 {
 	const DWORD tlsProtocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 |
@@ -399,12 +408,11 @@
 	WinHttpSetOption(hSession, WINHTTP_OPTION_DECOMPRESSION,
 			 (LPVOID)&compressionFlags, sizeof(compressionFlags));
 
-	HttpHandle hConnect = WinHttpConnect(hSession,
-					 L"cdn-fastly.obsproject.com",
+	HttpHandle hConnect = WinHttpConnect(hSession, kCDNHostname,
 					 INTERNET_DEFAULT_HTTPS_PORT, 0);
 	if (!hConnect) {
 		downloadThreadFailure = true;
-		Status(L"Update failed: Couldn't connect to cdn-fastly.obsproject.com");
+		Status(L"Update failed: Couldn't connect to %S", kCDNHostname);
 		return false;
 	}
 
@@ -437,61 +445,51 @@
 				return false;
 			}
 
-			Status(L"Downloading %s", update.outputPath.c_str());
-
-			if (!HTTPGetFile(hConnect, update.sourceURL.c_str(),
-					 update.tempPath.c_str(),
-					 L"Accept-Encoding: gzip",
-					 &responseCode)) {
+			auto &buf = download_dataupdate.downloadHash;
+			/* Reserve required memory */
+			buf.reserve(update.fileSize);
 
+			if (!HTTPGetBuffer(hConnect, update.sourceURL.c_str(),
+					 L"Accept-Encoding: gzip", buf,
+					 &responseCode)) {
 				downloadThreadFailure = true;
-				DeleteFile(update.tempPath.c_str());
 				Status(L"Update failed: Could not download "
 				 L"%s (error code %d)",
 				 update.outputPath.c_str(), responseCode);
-				return 1;
+				return true;
 			}
 
 			if (responseCode != 200) {
 				downloadThreadFailure = true;
-				DeleteFile(update.tempPath.c_str());
 				Status(L"Update failed: Could not download "
 				 L"%s (error code %d)",
 				 update.outputPath.c_str(), responseCode);
-				return 1;
+				return true;
 			}
 
-			BYTE downloadHashBLAKE2_HASH_LENGTH;
-			if (!CalculateFileHash(update.tempPath.c_str(),
-					 downloadHash)) {
-				downloadThreadFailure = true;
-				DeleteFile(update.tempPath.c_str());
-				Status(L"Update failed: Couldn't verify "
-				 L"integrity of %s",
-				 update.outputPath.c_str());
-				return 1;
-			}
+			/* Validate hash of downloaded data. */
+			B2Hash dataHash;
+			blake2b(dataHash.data(), dataHash.size(), buf.data(),
+				buf.size(), nullptr, 0);
 
-			if (memcmp(update.downloadhash, downloadHash, 20)) {
+			if (dataHash != update.downloadHash) {
 				downloadThreadFailure = true;
-				DeleteFile(update.tempPath.c_str());
 				Status(L"Update failed: Integrity check "
 				 L"failed on %s",
 				 update.outputPath.c_str());
-				return 1;
+				return true;
 			}
 
+			/* Decompress data in compressed buffer. */
 			if (update.compressed && !update.patchable) {
-				int res = DecompressFile(
-					zCtx, update.tempPath.c_str(),
-					update.fileSize);
+				int res =
+					Decompress(zCtx, buf, update.fileSize);
 				if (res) {
 					downloadThreadFailure = true;
-					DeleteFile(update.tempPath.c_str());
 					Status(L"Update failed: Decompression "
 					 L"failed on %s (error code %d)",
 					 update.outputPath.c_str(), res);
-					return 1;
+					return true;
 				}
 			}
 
@@ -534,9 +532,7 @@
 
 /* ----------------------------------------------------------------------- */
 
-#define WAITIFOBS_SUCCESS 0
-#define WAITIFOBS_WRONG_PROCESS 1
-#define WAITIFOBS_CANCELLED 2
+enum { WAITIFOBS_SUCCESS, WAITIFOBS_WRONG_PROCESS, WAITIFOBS_CANCELLED };
 
 static inline DWORD WaitIfOBS(DWORD id, const wchar_t *expected)
 {
@@ -557,7 +553,7 @@
 
 	// check it's actually our exe that's running
 	size_t len = wcslen(obs_base_directory);
-	if (wcsncmp(path, obs_base_directory, len))
+	if (wcsncmp(path, obs_base_directory, len) != 0)
 		return WAITIFOBS_WRONG_PROCESS;
 
 	name = wcsrchr(path, L'\\');
@@ -630,8 +626,7 @@
 
 void HasherThread()
 {
-	bool hasherThreadFailure = false;
-	unique_lock<mutex> ulock(updateMutex, defer_lock);
+	unique_lock ulock(updateMutex, defer_lock);
 
 	while (true) {
 		ulock.lock();
@@ -650,26 +645,21 @@
 		if (!IsSafeFilename(updateFileName))
 			continue;
 
-		BYTE existingHashBLAKE2_HASH_LENGTH;
-		wchar_t fileHashStrBLAKE2_HASH_STR_LENGTH;
-
+		B2Hash existingHash;
 		if (CalculateFileHash(updateFileName, existingHash)) {
-			HashToString(existingHash, fileHashStr);
 			ulock.lock();
-			hashes.emplace(fileName, fileHashStr);
+			hashes.emplace(fileName, existingHash);
 			ulock.unlock();
 		}
 	}
 }
 
-static void RunHasherWorkers(int num, const Json &packages)
+static void RunHasherWorkers(int num, const vector<Package> &packages)
 try {
 
-	for (const Json &package : packages.array_items()) {
-		for (const Json &file : package"files".array_items()) {
-			if (!file"name".is_string())
-				continue;
-			hashQueue.push(file"name".string_value());
+	for (const Package &package : packages) {
+		for (const File &file : package.files) {
+			hashQueue.push(file.name);
 		}
 	}
 
@@ -707,74 +697,32 @@
 	return false;
 }
 
-#define UPDATE_URL L"https://cdn-fastly.obsproject.com/update_studio"
-
-static bool AddPackageUpdateFiles(const Json &root, size_t idx,
-				 const wchar_t *tempPath,
-				 const wchar_t *branch)
+static bool AddPackageUpdateFiles(const Package &package, const wchar_t *branch)
 {
-	const Json &package = rootidx;
-	const Json &name = package"name";
-	const Json &files = package"files";
-
-	if (!files.is_array())
-		return true;
-	if (!name.is_string())
-		return true;
-
 	wchar_t wPackageName512;
-	const string &packageName = name.string_value();
-	size_t fileCount = files.array_items().size();
-
-	if (!UTF8ToWideBuf(wPackageName, packageName.c_str()))
+	if (!UTF8ToWideBuf(wPackageName, package.name.c_str()))
 		return false;
 
-	if (packageName != "core" &&
-	 !NonCorePackageInstalled(packageName.c_str()))
+	if (package.name != "core" &&
+	 !NonCorePackageInstalled(package.name.c_str()))
 		return true;
 
-	for (size_t j = 0; j < fileCount; j++) {
-		const Json &file = filesj;
-		const Json &fileName = file"name";
-		const Json &hash = file"hash";
-		const Json &dlHash = file"compressed_hash";
-		const Json &size = file"size";
-
-		if (!fileName.is_string())
-			continue;
-		if (!hash.is_string())
-			continue;
-		if (!size.is_number())
-			continue;
-
-		const string &fileUTF8 = fileName.string_value();
-		const string &hashUTF8 = hash.string_value();
-		const string &dlHashUTF8 = dlHash.string_value();
-		int fileSize = size.int_value();
-
-		if (hashUTF8.size() != BLAKE2_HASH_LENGTH * 2)
+	for (const File &file : package.files) {
+		if (file.hash.size() != kBlake2StrLength)
 			continue;
 
 		/* The download hash may not exist if a file is uncompressed */
 
 		bool compressed = false;
-		if (dlHashUTF8.size() == BLAKE2_HASH_LENGTH * 2)
+		if (file.compressed_hash.size() == kBlake2StrLength)
 			compressed = true;
 
 		/* convert strings to wide */
 
 		wchar_t sourceURL1024;
 		wchar_t updateFileNameMAX_PATH;
-		wchar_t updateHashStrBLAKE2_HASH_STR_LENGTH;
-		wchar_t downloadHashStrBLAKE2_HASH_STR_LENGTH;
-		wchar_t tempFilePathMAX_PATH;
 
-		if (!UTF8ToWideBuf(updateFileName, fileUTF8.c_str()))
-			continue;
-		if (!UTF8ToWideBuf(updateHashStr, hashUTF8.c_str()))
-			continue;
-		if (compressed &&
-		 !UTF8ToWideBuf(downloadHashStr, dlHashUTF8.c_str()))
+		if (!UTF8ToWideBuf(updateFileName, file.name.c_str()))
 			continue;
 
 		/* make sure paths are safe */
@@ -787,76 +735,61 @@
 		}
 
 		StringCbPrintf(sourceURL, sizeof(sourceURL), L"%s/%s/%s/%s",
-			 UPDATE_URL, branch, wPackageName,
+			 kCDNUpdateBaseUrl, branch, wPackageName,
 			 updateFileName);
-		StringCbPrintf(tempFilePath, sizeof(tempFilePath), L"%s\\%s",
-			 tempPath, updateHashStr);
-
-		/* Check file hash */
 
-		wstring fileHashStr;
-		bool has_hash;
+		/* Convert hashes */
+		B2Hash updateHash;
+		StringToHash(file.hash, updateHash);
 
 		/* We don't really care if this fails, it's just to avoid
 		 * wasting bandwidth by downloading unmodified files */
-		if (hashes.count(fileUTF8)) {
-			fileHashStr = hashesfileUTF8;
-			if (fileHashStr == updateHashStr)
+		B2Hash localFileHash;
+		bool has_hash = false;
+
+		if (hashes.count(file.name)) {
+			localFileHash = hashesfile.name;
+			if (localFileHash == updateHash)
 				continue;
 
 			has_hash = true;
-		} else {
-			has_hash = false;
 		}
 
 		/* Add update file */
-
 		update_t update;
-		update.fileSize = fileSize;
-		update.basename = updateFileName;
+		update.fileSize = file.size;
 		update.outputPath = updateFileName;
-		update.tempPath = tempFilePath;
 		update.sourceURL = sourceURL;
-		update.packageName = packageName;
+		update.packageName = package.name;
 		update.state = STATE_PENDING_DOWNLOAD;
 		update.patchable = false;
 		update.compressed = compressed;
-
-		StringToHash(updateHashStr, update.hash);
+		update.hash = updateHash;
 
 		if (compressed) {
 			update.sourceURL += L".zst";
-			StringToHash(downloadHashStr, update.downloadhash);
+			StringToHash(file.compressed_hash, update.downloadHash);
 		} else {
-			memcpy(update.downloadhash, update.hash,
-			 sizeof(update.downloadhash));
+			update.downloadHash = updateHash;
 		}
 
 		update.has_hash = has_hash;
 		if (has_hash)
-			StringToHash(fileHashStr.data(), update.my_hash);
+			update.my_hash = localFileHash;
 
-		updates.push_back(move(update));
+		updates.push_back(std::move(update));
 
-		totalFileSize += fileSize;
+		totalFileSize += file.size;
 	}
 
 	return true;
 }
 
-static void AddPackageRemovedFiles(const Json &package)
+static void AddPackageRemovedFiles(const Package &package)
 {
-	const Json &removed_files = package"removed_files";
-	if (!removed_files.is_array())
-		return;
-
-	for (auto &item : removed_files.array_items()) {
-		if (!item.is_string())
-			continue;
-
+	for (const string &filename : package.removed_files) {
 		wchar_t removedFileNameMAX_PATH;
-		if (!UTF8ToWideBuf(removedFileName,
-				 item.string_value().c_str()))
+		if (!UTF8ToWideBuf(removedFileName, filename.c_str()))
 			continue;
 
 		/* Ensure paths are safe, also check if file exists */
@@ -885,11 +818,16 @@
 	_TCHAR randomStrMAX_PATH;
 
 	BYTE junk40;
-	BYTE hashBLAKE2_HASH_LENGTH;
+	B2Hash hash;
+	string temp;
 
 	CryptGenRandom(hProvider, sizeof(junk), junk);
-	blake2b(hash, sizeof(hash), junk, sizeof(junk), NULL, 0);
-	HashToString(hash, randomStr);
+	blake2b(hash.data(), hash.size(), junk, sizeof(junk), nullptr, 0);
+	HashToString(hash, temp);
+
+	if (!UTF8ToWideBuf(randomStr, temp.c_str()))
+		return false;
+
 	randomStr8 = 0;
 
 	StringCbCopy(deleteMeName, sizeof(deleteMeName),
@@ -908,71 +846,60 @@
 	return false;
 }
 
-static void UpdateWithPatchIfAvailable(const char *name, const char *hash,
-				 const char *source, int size)
+static void UpdateWithPatchIfAvailable(const PatchResponse &patch)
 {
 	wchar_t widePatchableFilenameMAX_PATH;
-	wchar_t widePatchHashMAX_PATH;
 	wchar_t sourceURL1024;
-	wchar_t patchHashStrBLAKE2_HASH_STR_LENGTH;
 
-	if (strncmp(source, "https://cdn-fastly.obsproject.com/", 34) != 0)
+	if (patch.source.compare(0, kCDNUrl.size(), kCDNUrl) != 0)
 		return;
 
-	string patchPackageName = name;
-
-	const char *slash = strchr(name, '/');
-	if (!slash)
+	if (patch.name.find('/') == string::npos)
 		return;
 
-	patchPackageName.resize(slash - name);
-	name = slash + 1;
+	string patchPackageName(patch.name, 0, patch.name.find('/'));
+	string fileName(patch.name, patch.name.find('/') + 1);
 
-	if (!UTF8ToWideBuf(widePatchableFilename, name))
-		return;
-	if (!UTF8ToWideBuf(widePatchHash, hash))
+	if (!UTF8ToWideBuf(widePatchableFilename, fileName.c_str()))
 		return;
-	if (!UTF8ToWideBuf(sourceURL, source))
-		return;
-	if (!UTF8ToWideBuf(patchHashStr, hash))
+	if (!UTF8ToWideBuf(sourceURL, patch.source.c_str()))
 		return;
 
 	for (update_t &update : updates) {
 		if (update.packageName != patchPackageName)
 			continue;
-		if (update.basename != widePatchableFilename)
+		if (update.outputPath != widePatchableFilename)
 			continue;
 
-		StringToHash(patchHashStr, update.downloadhash);
+		update.patchable = true;
 
-		/* Replace the source URL with the patch file, mark it as
-		 * patchable, and re-calculate download size */
-		totalFileSize -= (update.fileSize - size);
+		/* Replace the source URL with the patch file, update
+	 * the download hash, and re-calculate download size */
+		StringToHash(patch.hash, update.downloadHash);
 		update.sourceURL = sourceURL;
-		update.fileSize = size;
-		update.patchable = true;
+		totalFileSize -= (update.fileSize - patch.size);
+		update.fileSize = patch.size;
 
-		/* Since the patch depends on the previous version, we can
-		 * no longer rely on the temp name being unique to the
-		 * new file's hash */
-		update.tempPath = tempPath;
-		update.tempPath += L"\\";
-		update.tempPath += patchHashStr;
 		break;
 	}
 }
 
-static bool MoveInUseFileAway(update_t &file)
+static bool MoveInUseFileAway(const update_t &file)
 {
 	_TCHAR deleteMeNameMAX_PATH;
 	_TCHAR randomStrMAX_PATH;
 
 	BYTE junk40;
-	BYTE hashBLAKE2_HASH_LENGTH;
+	B2Hash hash;
+	string temp;
 
 	CryptGenRandom(hProvider, sizeof(junk), junk);
-	blake2b(hash, sizeof(hash), junk, sizeof(junk), NULL, 0);
-	HashToString(hash, randomStr);
+	blake2b(hash.data(), hash.size(), junk, sizeof(junk), nullptr, 0);
+	HashToString(hash, temp);
+
+	if (!UTF8ToWideBuf(randomStr, temp.c_str()))
+		return false;
+
 	randomStr8 = 0;
 
 	StringCbCopy(deleteMeName, sizeof(deleteMeName),
@@ -1001,23 +928,20 @@
 {
 	wchar_t oldFileRenamedPathMAX_PATH;
 
-	if (file.patchable)
-		Status(L"Updating %s...", file.outputPath.c_str());
-	else
-		Status(L"Installing %s...", file.outputPath.c_str());
+	/* Grab the patch/file data from the global cache. */
+	vector<std::byte> &patch_data = download_datafile.downloadHash;
 
 	/* Check if we're replacing an existing file or just installing a new
 	 * one */
 	DWORD attribs = GetFileAttributes(file.outputPath.c_str());
 
 	if (attribs != INVALID_FILE_ATTRIBUTES) {
-		wchar_t *curFileName = nullptr;
 		wchar_t baseNameMAX_PATH;
 
 		StringCbCopy(baseName, sizeof(baseName),
 			 file.outputPath.c_str());
 
-		curFileName = wcsrchr(baseName, '/');
+		wchar_t *curFileName = wcsrchr(baseName, '/');
 		if (curFileName) {
 			curFileName0 = '\0';
 			curFileName++;
@@ -1031,8 +955,10 @@
 			 L".old");
 
 		if (!MyCopyFile(file.outputPath.c_str(), oldFileRenamedPath)) {
+			DWORD err = GetLastError();
 			int is_sharing_violation =
-				(GetLastError() == ERROR_SHARING_VIOLATION);
+				(err == ERROR_SHARING_VIOLATION ||
+				 err == ERROR_USER_MAPPED_FILE);
 
 			if (is_sharing_violation)
 				Status(L"Update failed: %s is still in use. "
@@ -1054,12 +980,14 @@
 	retryAfterMovingFile:
 
 		if (file.patchable) {
-			error_code = ApplyPatch(ctx, file.tempPath.c_str(),
+			error_code = ApplyPatch(ctx, patch_data.data(),
+						file.fileSize,
 						file.outputPath.c_str());
+
 			installed_ok = (error_code == 0);
 
 			if (installed_ok) {
-				BYTE patchedFileHashBLAKE2_HASH_LENGTH;
+				B2Hash patchedFileHash;
 				if (!CalculateFileHash(file.outputPath.c_str(),
 						 patchedFileHash)) {
 					Status(L"Update failed: Couldn't "
@@ -1070,8 +998,7 @@
 					return false;
 				}
 
-				if (memcmp(file.hash, patchedFileHash,
-					 BLAKE2_HASH_LENGTH) != 0) {
+				if (file.hash != patchedFileHash) {
 					Status(L"Update failed: Integrity "
 					 L"check of patched "
 					 L"%s failed",
@@ -1082,14 +1009,16 @@
 				}
 			}
 		} else {
-			installed_ok = MyCopyFile(file.tempPath.c_str(),
-						 file.outputPath.c_str());
+			installed_ok = QuickWriteFile(file.outputPath.c_str(),
+						 patch_data.data(),
+						 patch_data.size());
 			error_code = GetLastError();
 		}
 
 		if (!installed_ok) {
 			int is_sharing_violation =
-				(error_code == ERROR_SHARING_VIOLATION);
+				(error_code == ERROR_SHARING_VIOLATION ||
+				 error_code == ERROR_USER_MAPPED_FILE);
 
 			if (is_sharing_violation) {
 				if (!already_tried_to_move) {
@@ -1126,12 +1055,14 @@
 
 		/* We may be installing into new folders,
 		 * make sure they exist */
-		CreateFoldersForPath(file.outputPath.c_str());
+		filesystem::path filePath(file.outputPath.c_str());
+		create_directories(filePath.parent_path());
 
 		file.previousFile = L"";
 
-		bool success = !!MyCopyFile(file.tempPath.c_str(),
-					 file.outputPath.c_str());
+		bool success = !!QuickWriteFile(file.outputPath.c_str(),
+						patch_data.data(),
+						patch_data.size());
 		if (!success) {
 			Status(L"Update failed: Couldn't install %s (error %d)",
 			 file.outputPath.c_str(), GetLastError());
@@ -1187,9 +1118,8 @@
 
 static bool RunUpdateWorkers(int num)
 try {
-	for (update_t &update : updates) {
-		updateQueue.push(update);
-	}
+	for (update_t &update : updates)
+		updateQueue.emplace(update);
 
 	vector<future<bool>> thread_success_results;
 	thread_success_results.resize(num);
@@ -1209,11 +1139,7 @@
 	return false;
 }
 
-#define PATCH_MANIFEST_URL \
-	L"https://obsproject.com/update_studio/getpatchmanifest"
-#define HASH_NULL L"0000000000000000000000000000000000000000"
-
-static bool UpdateVS2019Redists(const Json &root)
+static bool UpdateVS2019Redists(const string &vc_redist_hash)
 {
 	/* ------------------------------------------ *
 	 * Initialize session */
@@ -1237,11 +1163,10 @@
 	WinHttpSetOption(hSession, WINHTTP_OPTION_DECOMPRESSION,
 			 (LPVOID)&compressionFlags, sizeof(compressionFlags));
 
-	HttpHandle hConnect = WinHttpConnect(hSession,
-					 L"cdn-fastly.obsproject.com",
+	HttpHandle hConnect = WinHttpConnect(hSession, kCDNHostname,
 					 INTERNET_DEFAULT_HTTPS_PORT, 0);
 	if (!hConnect) {
-		Status(L"Update failed: Couldn't connect to cdn-fastly.obsproject.com");
+		Status(L"Update failed: Couldn't connect to %S", kCDNHostname);
 		return false;
 	}
 
@@ -1277,30 +1202,13 @@
 	/* ------------------------------------------ *
 	 * Get expected hash */
 
-	const Json &redistJson = root"vc2019_redist_x64";
-	if (!redistJson.is_string()) {
-		Status(L"Update failed: Could not parse VC2019 redist json");
-		return false;
-	}
-
-	const string &expectedHashUTF8 = redistJson.string_value();
-	wchar_t expectedHashWideBLAKE2_HASH_STR_LENGTH;
-	BYTE expectedHashBLAKE2_HASH_LENGTH;
-
-	if (!UTF8ToWideBuf(expectedHashWide, expectedHashUTF8.c_str())) {
-		DeleteFile(destPath.c_str());
-		Status(L"Update failed: Couldn't convert Json for redist hash");
-		return false;
-	}
-
-	StringToHash(expectedHashWide, expectedHash);
-
-	wchar_t downloadHashWideBLAKE2_HASH_STR_LENGTH;
-	BYTE downloadHashBLAKE2_HASH_LENGTH;
+	B2Hash expectedHash;
+	StringToHash(vc_redist_hash, expectedHash);
 
 	/* ------------------------------------------ *
 	 * Get download hash */
 
+	B2Hash downloadHash;
 	if (!CalculateFileHash(destPath.c_str(), downloadHash)) {
 		DeleteFile(destPath.c_str());
 		Status(L"Update failed: Couldn't verify integrity of %s",
@@ -1311,8 +1219,7 @@
 	/* ------------------------------------------ *
 	 * If hashes do not match, integrity failed */
 
-	HashToString(downloadHash, downloadHashWide);
-	if (wcscmp(expectedHashWide, downloadHashWide) != 0) {
+	if (downloadHash == expectedHash) {
 		DeleteFile(destPath.c_str());
 		Status(L"Update failed: Couldn't verify integrity of %s",
 		 L"Visual C++ 2019 Redistributable");
@@ -1355,6 +1262,52 @@
 	return success;
 }
 
+static void UpdateRegistryVersion(const Manifest &manifest)
+{
+	const char *regKey =
+		R"(Software\Microsoft\Windows\CurrentVersion\Uninstall\OBS Studio)";
+	LSTATUS res;
+	HKEY key;
+	char version32;
+	int formattedLen;
+
+	/* The manifest does not store a version string, so we gotta make one ourselves. */
+	if (manifest.beta || manifest.rc) {
+		formattedLen = sprintf_s(
+			version, sizeof(version), "%d.%d.%d-%s%d",
+			manifest.version_major, manifest.version_minor,
+			manifest.version_patch, manifest.beta ? "beta" : "rc",
+			manifest.beta ? manifest.beta : manifest.rc);
+	} else {
+		formattedLen = sprintf_s(version, sizeof(version), "%d.%d.%d",
+					 manifest.version_major,
+					 manifest.version_minor,
+					 manifest.version_patch);
+	}
+
+	if (formattedLen <= 0)
+		return;
+
+	res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, regKey, 0,
+			 KEY_WRITE | KEY_WOW64_32KEY, &key);
+	if (res != ERROR_SUCCESS)
+		return;
+
+	RegSetValueExA(key, "DisplayVersion", 0, REG_SZ, (const BYTE *)version,
+		 formattedLen + 1);
+	RegCloseKey(key);
+}
+
+static void ClearShaderCache()
+{
+	wchar_t shader_pathMAX_PATH;
+	SHGetFolderPathW(NULL, CSIDL_COMMON_APPDATA, NULL, SHGFP_TYPE_CURRENT,
+			 shader_path);
+	StringCbCatW(shader_path, sizeof(shader_path),
+		 L"\\obs-studio\\shader-cache");
+	filesystem::remove_all(shader_path);
+}
+
 extern "C" void UpdateHookFiles(void);
 
 static bool Update(wchar_t *cmdLine)
@@ -1511,7 +1464,7 @@
 	/* ------------------------------------- *
 	 * Load manifest file */
 
-	Json root;
+	Manifest manifest;
 	{
 		string manifestFile = QuickReadFile(manifestPath);
 		if (manifestFile.empty()) {
@@ -1519,40 +1472,33 @@
 			return false;
 		}
 
-		string error;
-		root = Json::parse(manifestFile, error);
-
-		if (!error.empty()) {
+		try {
+			json manifestContents = json::parse(manifestFile);
+			manifest = manifestContents.get<Manifest>();
+		} catch (json::exception &e) {
 			Status(L"Update failed: Couldn't parse update "
 			 L"manifest: %S",
-			 error.c_str());
+			 e.what());
 			return false;
 		}
 	}
 
-	if (!root.is_object()) {
-		Status(L"Update failed: Invalid update manifest");
-		return false;
-	}
-
 	/* ------------------------------------- *
 	 * Hash local files listed in manifest */
 
-	RunHasherWorkers(4, root"packages");
+	RunHasherWorkers(4, manifest.packages);
 
 	/* ------------------------------------- *
 	 * Parse current manifest update files */
 
-	const Json::array &packages = root"packages".array_items();
-	for (size_t i = 0; i < packages.size(); i++) {
-		if (!AddPackageUpdateFiles(packages, i, tempPath,
-					 branch.c_str())) {
+	for (const Package &package : manifest.packages) {
+		if (!AddPackageUpdateFiles(package, branch.c_str())) {
 			Status(L"Update failed: Failed to process update packages");
 			return false;
 		}
 
 		/* Add removed files to deletion queue (if any) */
-		AddPackageRemovedFiles(packagesi);
+		AddPackageRemovedFiles(package);
 	}
 
 	SendDlgItemMessage(hwndMain, IDC_PROGRESS, PBM_SETMARQUEE, 0, 0);
@@ -1561,7 +1507,7 @@
 	/* ------------------------------------- *
 	 * Exit if updates already installed */
 
-	if (!updates.size()) {
+	if (updates.empty()) {
 		Status(L"All available updates are already installed.");
 		SetDlgItemText(hwndMain, IDC_BUTTON, L"Launch OBS");
 		return true;
@@ -1571,7 +1517,7 @@
 	 * Check for VS2019 redistributables */
 
 	if (!HasVS2019Redist()) {
-		if (!UpdateVS2019Redists(root)) {
+		if (!UpdateVS2019Redists(manifest.vc2019_redist_x64)) {
 			return false;
 		}
 	}
@@ -1579,47 +1525,33 @@
 	/* ------------------------------------- *
 	 * Generate file hash json */
 
-	Json::array files;
-
+	PatchesRequest files;
 	for (update_t &update : updates) {
-		wchar_t whash_stringBLAKE2_HASH_STR_LENGTH;
-		char hash_stringBLAKE2_HASH_STR_LENGTH;
-		char outputPathMAX_PATH;
-
 		if (!update.has_hash)
 			continue;
 
-		/* check hash */
-		HashToString(update.my_hash, whash_string);
-		if (wcscmp(whash_string, HASH_NULL) == 0)
+		char outputPathMAX_PATH;
+		if (!WideToUTF8Buf(outputPath, update.outputPath.c_str()))
 			continue;
 
-		if (!WideToUTF8Buf(hash_string, whash_string))
-			continue;
-		if (!WideToUTF8Buf(outputPath, update.basename.c_str()))
-			continue;
+		string hash_string;
+		HashToString(update.my_hash, hash_string);
 
 		string package_path;
 		package_path = update.packageName;
 		package_path += "/";
 		package_path += outputPath;
 
-		files.emplace_back(Json::object{
-			{"name", package_path},
-			{"hash", hash_string},
-		});
+		files.push_back({package_path, hash_string});
 	}
 
 	/* ------------------------------------- *
 	 * Send file hashes */
 
 	string newManifest;
-
-	if (files.size() > 0) {
-		string post_body;
-		Json(files).dump(post_body);
-
-		int responseCode;
+	if (!files.empty()) {
+		json request = files;
+		string post_body = request.dump();
 
 		int len = (int)post_body.size();
 		size_t compressSize = ZSTD_compressBound(len);
@@ -1628,21 +1560,22 @@
 		compressedJson.resize(compressSize);
 
 		size_t result =
-			ZSTD_compress(&compressedJson0, compressedJson.size(),
-				 post_body.data(), post_body.size(),
-				 ZSTD_CLEVEL_DEFAULT);
+			ZSTD_compress(compressedJson.data(),
+				 compressedJson.size(), post_body.data(),
+				 post_body.size(), ZSTD_CLEVEL_DEFAULT);
 
 		if (ZSTD_isError(result))
 			return false;
 
 		compressedJson.resize(result);
 
-		wstring manifestUrl(PATCH_MANIFEST_URL);
+		wstring manifestUrl(kPatchManifestURL);
 		if (branch != L"stable")
 			manifestUrl += L"?branch=" + branch;
 
+		int responseCode;
 		bool success = !!HTTPPostData(manifestUrl.c_str(),
-					 (BYTE *)&compressedJson0,
+					 (BYTE *)compressedJson.data(),
 					 (int)compressedJson.size(),
 					 L"Accept-Encoding: gzip",
 					 &responseCode, newManifest);
@@ -1663,70 +1596,39 @@
 	/* ------------------------------------- *
 	 * Parse new manifest */
 
-	string error;
-	root = Json::parse(newManifest, error);
-	if (!error.empty()) {
+	PatchesResponse patches;
+	try {
+		json patchManifest = json::parse(newManifest);
+		patches = patchManifest.get<PatchesResponse>();
+	} catch (json::exception &e) {
 		Status(L"Update failed: Couldn't parse patch manifest: %S",
-		 error.c_str());
+		 e.what());
 		return false;
 	}
 
-	if (!root.is_array()) {
-		Status(L"Update failed: Invalid patch manifest");
-		return false;
-	}
-
-	size_t packageCount = root.array_items().size();
-
-	for (size_t i = 0; i < packageCount; i++) {
-		const Json &patch = rooti;
-
-		if (!patch.is_object()) {
-			Status(L"Update failed: Invalid patch manifest");
-			return false;
-		}
-
-		const Json &name_json = patch"name";
-		const Json &hash_json = patch"hash";
-		const Json &source_json = patch"source";
-		const Json &size_json = patch"size";
-
-		if (!name_json.is_string())
-			continue;
-		if (!hash_json.is_string())
-			continue;
-		if (!source_json.is_string())
-			continue;
-		if (!size_json.is_number())
-			continue;
-
-		const string &name = name_json.string_value();
-		const string &hash = hash_json.string_value();
-		const string &source = source_json.string_value();
-		int size = size_json.int_value();
-
-		UpdateWithPatchIfAvailable(name.c_str(), hash.c_str(),
-					 source.c_str(), size);
+	/* Update updates with patch information. */
+	for (const PatchResponse &patch : patches) {
+		UpdateWithPatchIfAvailable(patch);
 	}
 
 	/* ------------------------------------- *
 	 * Deduplicate Downloads */
 
-	unordered_set<wstring> tempFiles;
+	unordered_set<B2Hash> downloadHashes;
 	for (update_t &update : updates) {
-		if (tempFiles.count(update.tempPath)) {
+		if (downloadHashes.count(update.downloadHash)) {
 			update.state = STATE_ALREADY_DOWNLOADED;
 			totalFileSize -= update.fileSize;
 			completedUpdates++;
-			continue;
+		} else {
+			downloadHashes.insert(update.downloadHash);
 		}
-
-		tempFiles.insert(update.tempPath);
 	}
 
 	/* ------------------------------------- *
 	 * Download Updates */
 
+	Status(L"Downloading updates...");
 	if (!RunDownloadWorkers(4))
 		return false;
 
@@ -1738,11 +1640,9 @@
 	/* ------------------------------------- *
 	 * Install updates */
 
-	int updatesInstalled = 0;
-	int lastPosition = 0;
-
 	SendDlgItemMessage(hwndMain, IDC_PROGRESS, PBM_SETPOS, 0, 0);
 
+	Status(L"Installing updates...");
 	if (!RunUpdateWorkers(4))
 		return false;
 
@@ -1811,6 +1711,20 @@
 	UpdateHookFiles();
 
 	/* ------------------------------------- *
+	 * Clear shader cache */
+
+	Status(L"Clearing shader cache...");
+	ClearShaderCache();
+
+	/* ------------------------------------- *
+	 * Update installed version in registry */
+
+	if (!bIsPortable) {
+		Status(L"Updating version information...");
+		UpdateRegistryVersion(manifest);
+	}
+
+	/* ------------------------------------- *
 	 * Finish */
 
 	Status(L"Cleaning up...");
@@ -1819,10 +1733,6 @@
 	for (update_t &update : updates) {
 		if (!update.previousFile.empty())
 			DeleteFile(update.previousFile.c_str());
-
-		/* We delete here not above in case of duplicate hashes */
-		if (!update.tempPath.empty())
-			DeleteFile(update.tempPath.c_str());
 	}
 
 	/* Delete all removed files mentioned in the manifest */
@@ -1882,7 +1792,7 @@
 	}
 }
 
-static void LaunchOBS(bool portable)
+static void LaunchOBS(LPWSTR lpCmdLine)
 {
 	wchar_t newCwdMAX_PATH;
 	wchar_t obsPathMAX_PATH;
@@ -1908,8 +1818,8 @@
 	execInfo.lpDirectory = newCwd;
 	execInfo.nShow = SW_SHOWNORMAL;
 
-	if (portable)
-		execInfo.lpParameters = L"--portable";
+	if (lpCmdLine0)
+		execInfo.lpParameters = lpCmdLine;
 
 	ShellExecuteEx(&execInfo);
 }
@@ -1974,14 +1884,14 @@
 	SHELLEXECUTEINFO shExInfo = {0};
 	shExInfo.cbSize = sizeof(shExInfo);
 	shExInfo.fMask = SEE_MASK_NOCLOSEPROCESS;
-	shExInfo.hwnd = 0;
+	shExInfo.hwnd = nullptr;
 	shExInfo.lpVerb = L"runas"; /* Operation to perform */
 	shExInfo.lpFile = myPath; /* Application to start */
 	shExInfo.lpParameters =
 		elevatedCmdLine.c_str(); /* Additional parameters */
 	shExInfo.lpDirectory = cwd;
 	shExInfo.nShow = SW_NORMAL;
-	shExInfo.hInstApp = 0;
+	shExInfo.hInstApp = nullptr;
 
 	/* annoyingly the actual elevated updater will disappear behind other
 	 * windows :( */
@@ -2027,9 +1937,6 @@
 	wchar_t cwdMAX_PATH;
 	GetCurrentDirectoryW(_countof(cwd) - 1, cwd);
 
-	bool isPortable = wcsstr(lpCmdLine, L"Portable") != nullptr ||
-			 wcsstr(lpCmdLine, L"--portable") != nullptr;
-
 	if (!IsWindows10OrGreater()) {
 		MessageBox(
 			nullptr,
@@ -2064,7 +1971,7 @@
 					obs_base_directory, nullptr);
 			SetCurrentDirectory(obs_base_directory);
 
-			LaunchOBS(isPortable);
+			LaunchOBS(lpCmdLine);
 		}
 
 		if (hLowMutex) {
@@ -2113,7 +2020,7 @@
 		WinHandle hMutex = OpenMutex(
 			SYNCHRONIZE, false, L"OBSUpdaterRunningAsNonAdminUser");
 		if (msg.wParam == 1 && !hMutex) {
-			LaunchOBS(isPortable);
+			LaunchOBS(lpCmdLine);
 		}
 
 		return (int)msg.wParam;

obs-studio-29.1.3.tar.xz/UI/win-update/updater/updater.hpp -> obs-studio-30.0.2.tar.xz/UI/win-update/updater/updater.hpp Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -36,12 +36,15 @@
 #include <blake2.h>
 #include <zstd.h>
 
+#include <array>
 #include <string>
+#include <vector>
 
 #include "helpers.hpp"
 
-#define BLAKE2_HASH_LENGTH 20
-#define BLAKE2_HASH_STR_LENGTH ((BLAKE2_HASH_LENGTH * 2) + 1)
+constexpr uint8_t kBlake2HashLength = 20;
+constexpr uint8_t kBlake2StrLength = kBlake2HashLength * 2;
+using B2Hash = std::array<std::byte, kBlake2HashLength>;
 
 #if defined _M_IX86
 #pragma comment(linker, "/manifestdependency:\"type='win32' " \
@@ -73,28 +76,30 @@
 #endif
 
 #include <util/windows/WinHandle.hpp>
-#include <json11.hpp>
 #include "resource.h"
 
 bool HTTPGetFile(HINTERNET hConnect, const wchar_t *url,
 		 const wchar_t *outputPath, const wchar_t *extraHeaders,
 		 int *responseCode);
+bool HTTPGetBuffer(HINTERNET hConnect, const wchar_t *url,
+		 const wchar_t *extraHeaders, std::vector<std::byte> &out,
+		 int *responseCode);
 bool HTTPPostData(const wchar_t *url, const BYTE *data, int dataLen,
 		 const wchar_t *extraHeaders, int *responseCode,
 		 std::string &response);
 
-void HashToString(const BYTE *in, wchar_t *out);
-void StringToHash(const wchar_t *in, BYTE *out);
+void HashToString(const B2Hash &in, std::string &out);
+void StringToHash(const std::string &in, B2Hash &out);
 
-bool CalculateFileHash(const wchar_t *path, BYTE *hash);
+bool CalculateFileHash(const wchar_t *path, B2Hash &hash);
 
-int ApplyPatch(ZSTD_DCtx *ctx, LPCTSTR patchFile, LPCTSTR targetFile);
-int DecompressFile(ZSTD_DCtx *ctx, LPCTSTR tempFile, size_t newSize);
+int ApplyPatch(ZSTD_DCtx *zstdCtx, const std::byte *patch_data,
+	 size_t patch_size, const wchar_t *targetFile);
 
 extern HWND hwndMain;
 extern HCRYPTPROV hProvider;
-extern int totalFileSize;
-extern int completedFileSize;
+extern size_t totalFileSize;
+extern size_t completedFileSize;
 extern HANDLE cancelRequested;
 
 #pragma pack(push, r1, 1)

obs-studio-29.1.3.tar.xz/UI/window-basic-about.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-about.cpp Changed

@@ -24,7 +24,7 @@
 		bitness = " (64 bit)";
 
 #ifdef HAVE_OBSCONFIG_H
-	ver += OBS_VERSION;
+	ver += obs_get_version_string();
 #else
 	ver += LIBOBS_API_MAJOR_VER + "." + LIBOBS_API_MINOR_VER + "." +
 	 LIBOBS_API_PATCH_VER;
@@ -61,9 +61,12 @@
 	ui->license->setProperty("themeID", "aboutHLayout");
 	ui->info->setProperty("themeID", "aboutInfo");
 
-	connect(ui->about, SIGNAL(clicked()), this, SLOT(ShowAbout()));
-	connect(ui->authors, SIGNAL(clicked()), this, SLOT(ShowAuthors()));
-	connect(ui->license, SIGNAL(clicked()), this, SLOT(ShowLicense()));
+	connect(ui->about, &ClickableLabel::clicked, this,
+		&OBSAbout::ShowAbout);
+	connect(ui->authors, &ClickableLabel::clicked, this,
+		&OBSAbout::ShowAuthors);
+	connect(ui->license, &ClickableLabel::clicked, this,
+		&OBSAbout::ShowLicense);
 
 	QPointer<OBSAbout> about(this);
 
@@ -74,10 +77,8 @@
 			"application/json");
 		QObject::connect(thread, &RemoteTextThread::Result, main,
 				 &OBSBasic::UpdatePatronJson);
-		QObject::connect(
-			thread,
-			SIGNAL(Result(const QString &, const QString &)), this,
-			SLOT(ShowAbout()));
+		QObject::connect(thread, &RemoteTextThread::Result, this,
+				 &OBSAbout::ShowAbout);
 		main->patronJsonThread.reset(thread);
 		thread->start();
 	} else {

obs-studio-29.1.3.tar.xz/UI/window-basic-auto-config-test.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-auto-config-test.cpp Changed

@@ -249,6 +249,10 @@
 		config_get_string(main->Config(), "Output", "BindIP");
 	obs_data_set_string(output_settings, "bind_ip", bind_ip);
 
+	const char *ip_family =
+		config_get_string(main->Config(), "Output", "IPFamily");
+	obs_data_set_string(output_settings, "ip_family", ip_family);
+
 	/* -----------------------------------*/
 	/* determine which servers to test    */
 
@@ -534,7 +538,10 @@
 	int fps_den;
 
 	inline Result(int cx_, int cy_, int fps_num_, int fps_den_)
-		: cx(cx_), cy(cy_), fps_num(fps_num_), fps_den(fps_den_)
+		: cx(cx_),
+		  cy(cy_),
+		  fps_num(fps_num_),
+		  fps_den(fps_den_)
 	{
 	}
 };
@@ -947,6 +954,16 @@
 		wiz->streamingEncoder = AutoConfig::Encoder::x264;
 	}
 
+#ifdef __linux__
+	// On linux CBR rate control is not guaranteed so fallback to x264.
+	if (wiz->streamingEncoder == AutoConfig::Encoder::QSV) {
+		wiz->streamingEncoder = AutoConfig::Encoder::x264;
+		if (!TestSoftwareEncoding()) {
+			return;
+		}
+	}
+#endif
+
 	if (preferHardware && !softwareTested && wiz->hardwareEncodingAvailable)
 		FindIdealHardwareResolution();
 
@@ -1217,7 +1234,8 @@
 }
 
 AutoConfigTestPage::AutoConfigTestPage(QWidget *parent)
-	: QWizardPage(parent), ui(new Ui_AutoConfigTestPage)
+	: QWizardPage(parent),
+	  ui(new Ui_AutoConfigTestPage)
 {
 	ui->setupUi(this);
 	setTitle(QTStr("Basic.AutoConfig.TestPage"));

obs-studio-29.1.3.tar.xz/UI/window-basic-auto-config.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-auto-config.cpp Changed

@@ -19,7 +19,7 @@
 
 #include "auth-oauth.hpp"
 #include "ui-config.h"
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 #include "youtube-api-wrappers.hpp"
 #endif
 
@@ -67,7 +67,8 @@
 /* ------------------------------------------------------------------------- */
 
 AutoConfigStartPage::AutoConfigStartPage(QWidget *parent)
-	: QWizardPage(parent), ui(new Ui_AutoConfigStartPage)
+	: QWizardPage(parent),
+	 ui(new Ui_AutoConfigStartPage)
 {
 	ui->setupUi(this);
 	setTitle(QTStr("Basic.AutoConfig.StartPage"));
@@ -120,7 +121,8 @@
 #define FPS_PREFER_HIGH_RES RES_TEXT("FPS.PreferHighRes")
 
 AutoConfigVideoPage::AutoConfigVideoPage(QWidget *parent)
-	: QWizardPage(parent), ui(new Ui_AutoConfigVideoPage)
+	: QWizardPage(parent),
+	 ui(new Ui_AutoConfigVideoPage)
 {
 	ui->setupUi(this);
 
@@ -134,7 +136,7 @@
 		(long double)ovi.fps_num / (long double)ovi.fps_den;
 
 	QString fpsStr = (ovi.fps_den > 1) ? QString::number(fpsVal, 'f', 2)
-					 : QString::number(fpsVal, 'g', 2);
+					 : QString::number(fpsVal, 'g');
 
 	ui->fps->addItem(QTStr(FPS_PREFER_HIGH_FPS),
 			 (int)AutoConfig::FPSType::PreferHighFPS);
@@ -250,7 +252,8 @@
 };
 
 AutoConfigStreamPage::AutoConfigStreamPage(QWidget *parent)
-	: QWizardPage(parent), ui(new Ui_AutoConfigStreamPage)
+	: QWizardPage(parent),
+	 ui(new Ui_AutoConfigStreamPage)
 {
 	ui->setupUi(this);
 	ui->bitrateLabel->setVisible(false);
@@ -280,38 +283,41 @@
 
 	LoadServices(false);
 
-	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(ServiceChanged()));
-	connect(ui->customServer, SIGNAL(textChanged(const QString &)), this,
-		SLOT(ServiceChanged()));
-	connect(ui->customServer, SIGNAL(textChanged(const QString &)), this,
-		SLOT(UpdateKeyLink()));
-	connect(ui->customServer, SIGNAL(editingFinished()), this,
-		SLOT(UpdateKeyLink()));
-	connect(ui->doBandwidthTest, SIGNAL(toggled(bool)), this,
-		SLOT(ServiceChanged()));
-
-	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateServerList()));
-
-	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateKeyLink()));
-	connect(ui->service, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateMoreInfoLink()));
-
-	connect(ui->useStreamKeyAdv, &QPushButton::clicked, this,
-		&() { ui->streamKeyWidget->setVisible(true); });
-
-	connect(ui->key, SIGNAL(textChanged(const QString &)), this,
-		SLOT(UpdateCompleted()));
-	connect(ui->regionUS, SIGNAL(toggled(bool)), this,
-		SLOT(UpdateCompleted()));
-	connect(ui->regionEU, SIGNAL(toggled(bool)), this,
-		SLOT(UpdateCompleted()));
-	connect(ui->regionAsia, SIGNAL(toggled(bool)), this,
-		SLOT(UpdateCompleted()));
-	connect(ui->regionOther, SIGNAL(toggled(bool)), this,
-		SLOT(UpdateCompleted()));
+	connect(ui->service, &QComboBox::currentIndexChanged, this,
+		&AutoConfigStreamPage::ServiceChanged);
+	connect(ui->customServer, &QLineEdit::textChanged, this,
+		&AutoConfigStreamPage::ServiceChanged);
+	connect(ui->customServer, &QLineEdit::textChanged, this,
+		&AutoConfigStreamPage::UpdateKeyLink);
+	connect(ui->customServer, &QLineEdit::editingFinished, this,
+		&AutoConfigStreamPage::UpdateKeyLink);
+	connect(ui->doBandwidthTest, &QCheckBox::toggled, this,
+		&AutoConfigStreamPage::ServiceChanged);
+
+	connect(ui->service, &QComboBox::currentIndexChanged, this,
+		&AutoConfigStreamPage::UpdateServerList);
+
+	connect(ui->service, &QComboBox::currentIndexChanged, this,
+		&AutoConfigStreamPage::UpdateKeyLink);
+	connect(ui->service, &QComboBox::currentIndexChanged, this,
+		&AutoConfigStreamPage::UpdateMoreInfoLink);
+
+	connect(ui->useStreamKeyAdv, &QPushButton::clicked, &() {
+		ui->streamKeyWidget->setVisible(true);
+		ui->streamKeyLabel->setVisible(true);
+		ui->useStreamKeyAdv->setVisible(false);
+	});
+
+	connect(ui->key, &QLineEdit::textChanged, this,
+		&AutoConfigStreamPage::UpdateCompleted);
+	connect(ui->regionUS, &QCheckBox::toggled, this,
+		&AutoConfigStreamPage::UpdateCompleted);
+	connect(ui->regionEU, &QCheckBox::toggled, this,
+		&AutoConfigStreamPage::UpdateCompleted);
+	connect(ui->regionAsia, &QCheckBox::toggled, this,
+		&AutoConfigStreamPage::UpdateCompleted);
+	connect(ui->regionOther, &QCheckBox::toggled, this,
+		&AutoConfigStreamPage::UpdateCompleted);
 }
 
 AutoConfigStreamPage::~AutoConfigStreamPage() {}
@@ -355,7 +361,7 @@
 	} else {
 		/* Default test target is 10 Mbps */
 		bitrate = 10000;
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		if (IsYouTubeService(wiz->serviceName)) {
 			/* Adjust upper bound to YouTube limits
 			 * for resolutions above 1080p */
@@ -394,7 +400,7 @@
 	if (!wiz->customServer) {
 		if (wiz->serviceName == "Twitch")
 			wiz->service = AutoConfig::Service::Twitch;
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		else if (IsYouTubeService(wiz->serviceName))
 			wiz->service = AutoConfig::Service::YouTube;
 #endif
@@ -450,7 +456,7 @@
 		ui->connectedAccountLabel->setVisible(false);
 		ui->connectedAccountText->setVisible(false);
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		if (IsYouTubeService(a->service())) {
 			ui->key->clear();
 
@@ -567,7 +573,7 @@
 
 void AutoConfigStreamPage::reset_service_ui_fields(std::string &service)
 {
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	// when account is already connected:
 	OAuthStreamKey *a = reinterpret_cast<OAuthStreamKey *>(auth.get());
 	if (a && service == a->service() && IsYouTubeService(a->service())) {
@@ -660,7 +666,7 @@
 		auto system_auth_service = main->auth->service();
 		bool service_check = service.find(system_auth_service) !=
 				 std::string::npos;
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		service_check =
 			service_check ? service_check
 				 : IsYouTubeService(system_auth_service) &&
@@ -728,9 +734,24 @@
 	if (serviceName == "Dacast") {
 		ui->streamKeyLabel->setText(
 			QTStr("Basic.AutoConfig.StreamPage.EncoderKey"));
-	} else {
+		ui->streamKeyLabel->setToolTip("");
+	} else if (!IsCustomService()) {
 		ui->streamKeyLabel->setText(
 			QTStr("Basic.AutoConfig.StreamPage.StreamKey"));
+		ui->streamKeyLabel->setToolTip("");
+	} else {
+		/* add tooltips for stream key */
+		QString file = !App()->IsThemeDark()
+				 ? ":/res/images/help.svg"
+				 : ":/res/images/help_light.svg";
+		QString lStr = "<html>%1 <img src='%2' style=' \
+				vertical-align: bottom; \
+				' /></html>";
+
+		ui->streamKeyLabel->setText(lStr.arg(
+			QTStr("Basic.AutoConfig.StreamPage.StreamKey"), file));
+		ui->streamKeyLabel->setToolTip(
+			QTStr("Basic.AutoConfig.StreamPage.StreamKey.ToolTip"));
 	}
 
 	if (QString(streamKeyLink).isNull() ||
@@ -1047,6 +1068,13 @@
 		if (type == Type::Streaming)
 			SaveStreamSettings();
 		SaveSettings();
+
+#ifdef YOUTUBE_ENABLED
+		if (YouTubeAppDock::IsYTServiceSelected()) {
+			OBSBasic *main = OBSBasic::Get();
+			main->NewYouTubeAppDock();
+		}
+#endif
 	}
 }
 
@@ -1083,8 +1111,8 @@
 	if (!customServer)
 		obs_data_set_string(settings, "service", serviceName.c_str());
 	obs_data_set_string(settings, "server", server.c_str());
-#if YOUTUBE_ENABLED
-	if (!IsYouTubeService(serviceName))
+#ifdef YOUTUBE_ENABLED
+	if (!streamPage->auth || !IsYouTubeService(serviceName))
 		obs_data_set_string(settings, "key", key.c_str());
 #else
 	obs_data_set_string(settings, "key", key.c_str());

obs-studio-29.1.3.tar.xz/UI/window-basic-auto-config.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-auto-config.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-filters.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-filters.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2015 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -89,19 +89,26 @@
 	installEventFilter(CreateShortcutFilter());
 
 	connect(ui->asyncFilters->itemDelegate(),
-		SIGNAL(closeEditor(QWidget *)), this,
-		SLOT(AsyncFilterNameEdited(QWidget *)));
+		&QAbstractItemDelegate::closeEditor, this(QWidget *editor) {
+			FilterNameEdited(editor, ui->asyncFilters);
+		});
 
 	connect(ui->effectFilters->itemDelegate(),
-		SIGNAL(closeEditor(QWidget *)), this,
-		SLOT(EffectFilterNameEdited(QWidget *)));
+		&QAbstractItemDelegate::closeEditor, this(QWidget *editor) {
+			FilterNameEdited(editor, ui->effectFilters);
+		});
 
 	QPushButton *close = ui->buttonBox->button(QDialogButtonBox::Close);
-	connect(close, SIGNAL(clicked()), this, SLOT(close()));
+	connect(close, &QPushButton::clicked, this, &OBSBasicFilters::close);
 	close->setDefault(true);
 
 	connect(ui->buttonBox->button(QDialogButtonBox::RestoreDefaults),
-		SIGNAL(clicked()), this, SLOT(ResetFilters()));
+		&QPushButton::clicked, this, &OBSBasicFilters::ResetFilters);
+
+	connect(ui->asyncFilters->model(), &QAbstractItemModel::rowsMoved, this,
+		&OBSBasicFilters::FiltersMoved);
+	connect(ui->effectFilters->model(), &QAbstractItemModel::rowsMoved,
+		this, &OBSBasicFilters::FiltersMoved);
 
 	uint32_t caps = obs_source_get_output_flags(source);
 	bool audio = (caps & OBS_SOURCE_AUDIO) != 0;
@@ -194,34 +201,25 @@
 			 obs_data_t *new_settings)
 {
 	obs_source_t *source = reinterpret_cast<obs_source_t *>(vp);
-	obs_source_t *parent = obs_filter_get_parent(source);
-	const char *source_name = obs_source_get_name(source);
+	const char *source_uuid = obs_source_get_uuid(source);
 	OBSBasic *main = OBSBasic::Get();
 
 	OBSDataAutoRelease redo_wrapper = obs_data_create();
-	obs_data_set_string(redo_wrapper, "name", source_name);
+	obs_data_set_string(redo_wrapper, "uuid", source_uuid);
 	obs_data_set_string(redo_wrapper, "settings",
 			 obs_data_get_json(new_settings));
-	obs_data_set_string(redo_wrapper, "parent",
-			 obs_source_get_name(parent));
-
-	OBSDataAutoRelease filter_settings = obs_source_get_settings(source);
 
 	OBSDataAutoRelease undo_wrapper = obs_data_create();
-	obs_data_set_string(undo_wrapper, "name", source_name);
+	obs_data_set_string(undo_wrapper, "uuid", source_uuid);
 	obs_data_set_string(undo_wrapper, "settings",
 			 obs_data_get_json(nd_old_settings));
-	obs_data_set_string(undo_wrapper, "parent",
-			 obs_source_get_name(parent));
 
 	auto undo_redo = (const std::string &data) {
 		OBSDataAutoRelease dat =
 			obs_data_create_from_json(data.c_str());
-		OBSSourceAutoRelease parent_source = obs_get_source_by_name(
-			obs_data_get_string(dat, "parent"));
-		const char *filter_name = obs_data_get_string(dat, "name");
-		OBSSourceAutoRelease filter = obs_source_get_filter_by_name(
-			parent_source, filter_name);
+		const char *filter_uuid = obs_data_get_string(dat, "uuid");
+		OBSSourceAutoRelease filter =
+			obs_get_source_by_uuid(filter_uuid);
 		OBSDataAutoRelease new_settings = obs_data_create_from_json(
 			obs_data_get_string(dat, "settings"));
 
@@ -235,10 +233,9 @@
 
 	main->undo_s.enable();
 
-	std::string name = std::string(obs_source_get_name(source));
 	std::string undo_data = obs_data_get_json(undo_wrapper);
 	std::string redo_data = obs_data_get_json(redo_wrapper);
-	main->undo_s.add_action(QTStr("Undo.Filters").arg(name.c_str()),
+	main->undo_s.add_action(QTStr("Undo.Filters").arg(source_uuid),
 				undo_redo, undo_redo, undo_data, redo_data);
 
 	obs_source_update(source, new_settings);
@@ -507,7 +504,8 @@
 		string name;
 
 		inline FilterInfo(const char *type_, const char *name_)
-			: type(type_), name(name_)
+			: type(type_),
+			 name(name_)
 		{
 		}
 
@@ -545,8 +543,8 @@
 		QAction *popupItem =
 			new QAction(QT_UTF8(type.name.c_str()), this);
 		popupItem->setData(QT_UTF8(type.type.c_str()));
-		connect(popupItem, SIGNAL(triggered(bool)), this,
-			SLOT(AddFilterFromAction()));
+		connect(popupItem, &QAction::triggered,
+			this, type() { AddNewFilter(type.type.c_str()); });
 		popup->addAction(popupItem);
 
 		foundValues = true;
@@ -597,84 +595,75 @@
 			return;
 		}
 
-		OBSDataAutoRelease wrapper = obs_data_create();
-		obs_data_set_string(wrapper, "sname",
-				 obs_source_get_name(source));
-		obs_data_set_string(wrapper, "fname", name.c_str());
-		std::string scene_name = obs_source_get_name(
+		OBSSourceAutoRelease filter =
+			obs_source_create(id, name.c_str(), nullptr, nullptr);
+		if (filter) {
+			const char *sourceName = obs_source_get_name(source);
+
+			blog(LOG_INFO,
+			 "User added filter '%s' (%s) to source '%s'",
+			 name.c_str(), id, sourceName);
+
+			obs_source_filter_add(source, filter);
+		} else {
+			blog(LOG_WARNING, "Creating filter '%s' failed!", id);
+			return;
+		}
+
+		std::string parent_uuid(obs_source_get_uuid(source));
+		std::string scene_uuid = obs_source_get_uuid(
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 				->GetCurrentSceneSource());
-		auto undo = scene_name(const std::string &data) {
-			obs_source_t *ssource =
-				obs_get_source_by_name(scene_name.c_str());
+		/* In order to ensure that the UUID persists through undo/redo,
+		 * we save the source data rather than just recreating the
+		 * source from scratch. */
+		OBSDataAutoRelease rwrapper = obs_save_source(filter);
+		obs_data_set_string(rwrapper, "undo_uuid", parent_uuid.c_str());
+
+		OBSDataAutoRelease uwrapper = obs_data_create();
+		obs_data_set_string(uwrapper, "fname",
+				 obs_source_get_name(filter));
+		obs_data_set_string(uwrapper, "suuid", parent_uuid.c_str());
+
+		auto undo = scene_uuid(const std::string &data) {
+			OBSSourceAutoRelease ssource =
+				obs_get_source_by_uuid(scene_uuid.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
-				->SetCurrentScene(ssource, true);
-			obs_source_release(ssource);
+				->SetCurrentScene(ssource.Get(), true);
 
-			obs_data_t *dat =
+			OBSDataAutoRelease dat =
 				obs_data_create_from_json(data.c_str());
-			obs_source_t *source = obs_get_source_by_name(
-				obs_data_get_string(dat, "sname"));
-			obs_source_t *filter = obs_source_get_filter_by_name(
-				source, obs_data_get_string(dat, "fname"));
+			OBSSourceAutoRelease source = obs_get_source_by_uuid(
+				obs_data_get_string(dat, "suuid"));
+			OBSSourceAutoRelease filter =
+				obs_source_get_filter_by_name(
+					source,
+					obs_data_get_string(dat, "fname"));
 			obs_source_filter_remove(source, filter);
-
-			obs_data_release(dat);
-			obs_source_release(source);
-			obs_source_release(filter);
 		};
 
-		OBSDataAutoRelease rwrapper = obs_data_create();
-		obs_data_set_string(rwrapper, "sname",
-				 obs_source_get_name(source));
-		auto redo = scene_name, id = std::string(id),
-			 name(const std::string &data) {
+		auto redo = scene_uuid(const std::string &data) {
 			OBSSourceAutoRelease ssource =
-				obs_get_source_by_name(scene_name.c_str());
+				obs_get_source_by_uuid(scene_uuid.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 				->SetCurrentScene(ssource.Get(), true);
 
 			OBSDataAutoRelease dat =
 				obs_data_create_from_json(data.c_str());
-			OBSSourceAutoRelease source = obs_get_source_by_name(
-				obs_data_get_string(dat, "sname"));
-
-			OBSSourceAutoRelease filter = obs_source_create(
-				id.c_str(), name.c_str(), nullptr, nullptr);
-			if (filter) {
-				obs_source_filter_add(source, filter);
-			}
+			OBSSourceAutoRelease source = obs_get_source_by_uuid(
+				obs_data_get_string(dat, "undo_uuid"));
+			OBSSourceAutoRelease filter = obs_load_source(dat);
+			obs_source_filter_add(source, filter);
 		};
 
-		std::string undo_data(obs_data_get_json(wrapper));
+		std::string undo_data(obs_data_get_json(uwrapper));
 		std::string redo_data(obs_data_get_json(rwrapper));
-		main->undo_s.add_action(QTStr("Undo.Add").arg(name.c_str()),
-					undo, redo, undo_data, redo_data);
-
-		OBSSourceAutoRelease filter =
-			obs_source_create(id, name.c_str(), nullptr, nullptr);
-		if (filter) {
-			const char *sourceName = obs_source_get_name(source);
-
-			blog(LOG_INFO,
-			 "User added filter '%s' (%s) "
-			 "to source '%s'",
-			 name.c_str(), id, sourceName);
-
-			obs_source_filter_add(source, filter);
-		}
+		main->undo_s.add_action(
+			QTStr("Undo.Add").arg(obs_source_get_name(filter)),
+			undo, redo, undo_data, redo_data, false);
 	}
 }
 
-void OBSBasicFilters::AddFilterFromAction()
-{
-	QAction *action = qobject_cast<QAction *>(sender());
-	if (!action)
-		return;
-
-	AddNewFilter(QT_TO_UTF8(action->data().toString()));
-}
-
 void OBSBasicFilters::closeEvent(QCloseEvent *event)
 {
 	QDialog::closeEvent(event);
@@ -687,11 +676,7 @@
 	main->SaveProject();
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool OBSBasicFilters::nativeEvent(const QByteArray &, void *message, qintptr *)
-#else
-bool OBSBasicFilters::nativeEvent(const QByteArray &, void *message, long *)
-#endif
 {
 #ifdef _WIN32
 	const MSG &msg = *static_cast<MSG *>(message);
@@ -939,20 +924,19 @@
 		popup.addMenu(addMenu);
 
 	if (item) {
-		const char *dulpicateSlot =
-			async ? SLOT(DuplicateAsyncFilter())
-			 : SLOT(DuplicateEffectFilter());
-
 		popup.addSeparator();
-		popup.addAction(QTStr("Duplicate"), this, dulpicateSlot);
+		popup.addAction(QTStr("Duplicate"), this, &() {
+			DuplicateItem(async ? ui->asyncFilters->currentItem()
+					 : ui->effectFilters->currentItem());
+		});
 		popup.addSeparator();
 		popup.addAction(ui->actionRenameFilter);
 		popup.addAction(ui->actionRemoveFilter);
 		popup.addSeparator();
 
 		QAction *copyAction = new QAction(QTStr("Copy"));
-		connect(copyAction, SIGNAL(triggered()), this,
-			SLOT(CopyFilter()));
+		connect(copyAction, &QAction::triggered, this,
+			&OBSBasicFilters::CopyFilter);
 		copyAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_C));
 		ui->effectWidget->addAction(copyAction);
 		ui->asyncWidget->addAction(copyAction);
@@ -961,7 +945,8 @@
 
 	QAction *pasteAction = new QAction(QTStr("Paste"));
 	pasteAction->setEnabled(main->copyFilter);
-	connect(pasteAction, SIGNAL(triggered()), this, SLOT(PasteFilter()));
+	connect(pasteAction, &QAction::triggered, this,
+		&OBSBasicFilters::PasteFilter);
 	pasteAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_V));
 	ui->effectWidget->addAction(pasteAction);
 	ui->asyncWidget->addAction(pasteAction);
@@ -1059,16 +1044,6 @@
 	EditItem(ui->effectFilters->currentItem(), false);
 }
 
-void OBSBasicFilters::DuplicateAsyncFilter()
-{
-	DuplicateItem(ui->asyncFilters->currentItem());
-}
-
-void OBSBasicFilters::DuplicateEffectFilter()
-{
-	DuplicateItem(ui->effectFilters->currentItem());
-}
-
 void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list)
 {
 	QListWidgetItem *listItem = list->currentItem();
@@ -1106,43 +1081,36 @@
 		listItem->setText(QT_UTF8(name.c_str()));
 		obs_source_set_name(filter, name.c_str());
 
-		std::string scene_name = obs_source_get_name(
+		std::string scene_uuid = obs_source_get_uuid(
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 				->GetCurrentSceneSource());
-		auto undo = scene_name, prev = std::string(prevName),
-			 name(const std::string &data) {
+		auto undo = scene_uuid, prev = std::string(prevName),
+			 name(const std::string &uuid) {
 			OBSSourceAutoRelease ssource =
-				obs_get_source_by_name(scene_name.c_str());
+				obs_get_source_by_uuid(scene_uuid.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 				->SetCurrentScene(ssource.Get(), true);
 
-			OBSSourceAutoRelease source =
-				obs_get_source_by_name(data.c_str());
 			OBSSourceAutoRelease filter =
-				obs_source_get_filter_by_name(source,
-							 name.c_str());
+				obs_get_source_by_uuid(uuid.c_str());
 			obs_source_set_name(filter, prev.c_str());
 		};
 
-		auto redo = scene_name, prev = std::string(prevName),
-			 name(const std::string &data) {
+		auto redo = scene_uuid, prev = std::string(prevName),
+			 name(const std::string &uuid) {
 			OBSSourceAutoRelease ssource =
-				obs_get_source_by_name(scene_name.c_str());
+				obs_get_source_by_uuid(scene_uuid.c_str());
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 				->SetCurrentScene(ssource.Get(), true);
 
-			OBSSourceAutoRelease source =
-				obs_get_source_by_name(data.c_str());
 			OBSSourceAutoRelease filter =
-				obs_source_get_filter_by_name(source,
-							 prev.c_str());
+				obs_get_source_by_uuid(uuid.c_str());
 			obs_source_set_name(filter, name.c_str());
 		};
 
-		std::string undo_data(sourceName);
-		std::string redo_data(sourceName);
+		std::string filter_uuid(obs_source_get_uuid(filter));
 		main->undo_s.add_action(QTStr("Undo.Rename").arg(name.c_str()),
-					undo, redo, undo_data, redo_data);
+					undo, redo, filter_uuid, filter_uuid);
 	}
 
 	listItem->setText(QString());
@@ -1150,16 +1118,6 @@
 	editActive = false;
 }
 
-void OBSBasicFilters::AsyncFilterNameEdited(QWidget *editor)
-{
-	FilterNameEdited(editor, ui->asyncFilters);
-}
-
-void OBSBasicFilters::EffectFilterNameEdited(QWidget *editor)
-{
-	FilterNameEdited(editor, ui->effectFilters);
-}
-
 static bool ConfirmReset(QWidget *parent)
 {
 	QMessageBox::StandardButton button;
@@ -1231,39 +1189,39 @@
 void OBSBasicFilters::delete_filter(OBSSource filter)
 {
 	OBSDataAutoRelease wrapper = obs_save_source(filter);
-	std::string parent_name(obs_source_get_name(source));
-	obs_data_set_string(wrapper, "undo_name", parent_name.c_str());
+	std::string parent_uuid(obs_source_get_uuid(source));
+	obs_data_set_string(wrapper, "undo_uuid", parent_uuid.c_str());
 
-	std::string scene_name = obs_source_get_name(
+	std::string scene_uuid = obs_source_get_uuid(
 		reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 			->GetCurrentSceneSource());
-	auto undo = scene_name(const std::string &data) {
+	auto undo = scene_uuid(const std::string &data) {
 		OBSSourceAutoRelease ssource =
-			obs_get_source_by_name(scene_name.c_str());
+			obs_get_source_by_uuid(scene_uuid.c_str());
 		reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 			->SetCurrentScene(ssource.Get(), true);
 
 		OBSDataAutoRelease dat =
 			obs_data_create_from_json(data.c_str());
-		OBSSourceAutoRelease source = obs_get_source_by_name(
-			obs_data_get_string(dat, "undo_name"));
+		OBSSourceAutoRelease source = obs_get_source_by_uuid(
+			obs_data_get_string(dat, "undo_uuid"));
 		OBSSourceAutoRelease filter = obs_load_source(dat);
 		obs_source_filter_add(source, filter);
 	};
 
 	OBSDataAutoRelease rwrapper = obs_data_create();
 	obs_data_set_string(rwrapper, "fname", obs_source_get_name(filter));
-	obs_data_set_string(rwrapper, "sname", parent_name.c_str());
-	auto redo = scene_name(const std::string &data) {
+	obs_data_set_string(rwrapper, "suuid", parent_uuid.c_str());
+	auto redo = scene_uuid(const std::string &data) {
 		OBSSourceAutoRelease ssource =
-			obs_get_source_by_name(scene_name.c_str());
+			obs_get_source_by_uuid(scene_uuid.c_str());
 		reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 			->SetCurrentScene(ssource.Get(), true);
 
 		OBSDataAutoRelease dat =
 			obs_data_create_from_json(data.c_str());
-		OBSSourceAutoRelease source = obs_get_source_by_name(
-			obs_data_get_string(dat, "sname"));
+		OBSSourceAutoRelease source = obs_get_source_by_uuid(
+			obs_data_get_string(dat, "suuid"));
 		OBSSourceAutoRelease filter = obs_source_get_filter_by_name(
 			source, obs_data_get_string(dat, "fname"));
 		obs_source_filter_remove(source, filter);
@@ -1276,3 +1234,28 @@
 		redo, undo_data, redo_data, false);
 	obs_source_filter_remove(source, filter);
 }
+
+void OBSBasicFilters::FiltersMoved(const QModelIndex &, int srcIdxStart, int,
+				 const QModelIndex &, int)
+{
+	QListWidget *list = isAsync ? ui->asyncFilters : ui->effectFilters;
+	int neighborIdx = 0;
+
+	if (srcIdxStart < list->currentRow())
+		neighborIdx = list->currentRow() - 1;
+	else if (srcIdxStart > list->currentRow())
+		neighborIdx = list->currentRow() + 1;
+	else
+		return;
+
+	if (neighborIdx > list->count() - 1)
+		neighborIdx = list->count() - 1;
+	else if (neighborIdx < 0)
+		neighborIdx = 0;
+
+	OBSSource neighbor = GetFilter(neighborIdx, isAsync);
+	int idx = obs_source_filter_get_index(source, neighbor);
+
+	OBSSource filter = GetFilter(list->currentRow(), isAsync);
+	obs_source_filter_set_index(source, filter, idx);
+}

obs-studio-29.1.3.tar.xz/UI/window-basic-filters.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-filters.hpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2015 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -87,12 +87,8 @@
 	void ReorderFilters();
 	void RenameAsyncFilter();
 	void RenameEffectFilter();
-	void DuplicateAsyncFilter();
-	void DuplicateEffectFilter();
 	void ResetFilters();
 
-	void AddFilterFromAction();
-
 	void on_addAsyncFilter_clicked();
 	void on_removeAsyncFilter_clicked();
 	void on_moveAsyncFilterUp_clicked();
@@ -115,12 +111,13 @@
 
 	void on_actionRenameFilter_triggered();
 
-	void AsyncFilterNameEdited(QWidget *editor);
-	void EffectFilterNameEdited(QWidget *editor);
-
 	void CopyFilter();
 	void PasteFilter();
 
+	void FiltersMoved(const QModelIndex &srcParent, int srcIdxStart,
+			 int srcIdxEnd, const QModelIndex &dstParent,
+			 int dstIdx);
+
 public:
 	OBSBasicFilters(QWidget *parent, OBSSource source_);
 	~OBSBasicFilters();
@@ -135,11 +132,6 @@
 
 protected:
 	virtual void closeEvent(QCloseEvent *event) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	virtual bool nativeEvent(const QByteArray &eventType, void *message,
 				 qintptr *result) override;
-#else
-	virtual bool nativeEvent(const QByteArray &eventType, void *message,
-				 long *result) override;
-#endif
 };

obs-studio-29.1.3.tar.xz/UI/window-basic-interaction.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-interaction.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -176,12 +176,8 @@
 					 this);
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool OBSBasicInteraction::nativeEvent(const QByteArray &, void *message,
 				 qintptr *)
-#else
-bool OBSBasicInteraction::nativeEvent(const QByteArray &, void *message, long *)
-#endif
 {
 #ifdef _WIN32
 	const MSG &msg = *static_cast<MSG *>(message);
@@ -366,14 +362,9 @@
 			yDelta = angleDelta.y();
 	}
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 	const QPointF position = event->position();
 	const int x = position.x();
 	const int y = position.y();
-#else
-	const int x = event->x();
-	const int y = event->y();
-#endif
 
 	if (GetSourceRelativeXY(x, y, mouseEvent.x, mouseEvent.y)) {
 		obs_source_send_mouse_wheel(source, &mouseEvent, xDelta,

obs-studio-29.1.3.tar.xz/UI/window-basic-interaction.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-interaction.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-main-browser.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-browser.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-main-dropfiles.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-dropfiles.cpp Changed

@@ -122,7 +122,6 @@
 	OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
 	OBSDataAutoRelease settings = obs_data_create();
 	const char *type = nullptr;
-	std::vector<const char *> types;
 	QString name;
 
 	obs_video_info ovi;
@@ -165,20 +164,16 @@
 		obs_data_set_int(settings, "width", ovi.base_width);
 		obs_data_set_int(settings, "height", ovi.base_height);
 		name = QUrl::fromLocalFile(QString(data)).fileName();
-		types = {"browser_source", "linuxbrowser-source"};
+		type = "browser_source";
 		break;
 	case DropType_Url:
 		AddDropURL(data, name, settings, ovi);
-		types = {"browser_source", "linuxbrowser-source"};
+		type = "browser_source";
 		break;
 	}
 
-	for (char const *t : types) {
-		if (obs_source_get_display_name(t)) {
-			type = t;
-			break;
-		}
-	}
+	type = obs_get_latest_input_type_id(type);
+
 	if (type == nullptr || !obs_source_get_display_name(type)) {
 		return;
 	}
@@ -189,32 +184,37 @@
 	OBSSourceAutoRelease source =
 		obs_source_create(type, sourceName.c_str(), settings, nullptr);
 	if (source) {
+		OBSDataAutoRelease wrapper = obs_save_source(source);
+
 		OBSScene scene = main->GetCurrentScene();
-		const char *sceneName =
-			obs_source_get_name(obs_scene_get_source(scene));
-		auto undo = sceneName, sourceName(const std::string &) {
+		std::string sceneUUID =
+			obs_source_get_uuid(obs_scene_get_source(scene));
+		std::string sourceUUID = obs_source_get_uuid(source);
+
+		auto undo = sceneUUID, sourceUUID(const std::string &) {
 			OBSSourceAutoRelease source =
-				obs_get_source_by_name(sourceName.c_str());
+				obs_get_source_by_uuid(sourceUUID.c_str());
 			obs_source_remove(source);
 			OBSSourceAutoRelease scene =
-				obs_get_source_by_name(sceneName);
+				obs_get_source_by_uuid(sceneUUID.c_str());
 			OBSBasic::Get()->SetCurrentScene(scene.Get(), true);
 		};
-		auto redo = sceneName, sourceName,
+		auto redo = sceneUUID, sourceName,
 			 type(const std::string &data) {
 			OBSSourceAutoRelease scene =
-				obs_get_source_by_name(sceneName);
+				obs_get_source_by_uuid(sceneUUID.c_str());
 			OBSBasic::Get()->SetCurrentScene(scene.Get(), true);
-			OBSDataAutoRelease settings =
+
+			OBSDataAutoRelease dat =
 				obs_data_create_from_json(data.c_str());
-			OBSSourceAutoRelease source = obs_source_create(
-				type, sourceName.c_str(), settings, nullptr);
+			OBSSourceAutoRelease source = obs_load_source(dat);
 			obs_scene_add(obs_scene_from_source(scene),
 				 source.Get());
 		};
+
 		undo_s.add_action(QTStr("Undo.Add").arg(sourceName.c_str()),
 				 undo, redo, "",
-				 std::string(obs_data_get_json(settings)));
+				 std::string(obs_data_get_json(wrapper)));
 		obs_scene_add(scene, source);
 	}
 }

obs-studio-29.1.3.tar.xz/UI/window-basic-main-outputs.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-outputs.cpp Changed

@@ -167,8 +167,11 @@
 	os_atomic_set_bool(&virtualcam_active, false);
 	QMetaObject::invokeMethod(output->main, "OnVirtualCamStop",
 				 Q_ARG(int, code));
+}
 
-	obs_output_set_media(output->virtualCam, nullptr, nullptr);
+static void OBSDeactivateVirtualCam(void *data, calldata_t * /* params */)
+{
+	BasicOutputHandler *output = static_cast<BasicOutputHandler *>(data);
 	output->DestroyVirtualCamView();
 }
 
@@ -293,21 +296,29 @@
 		startVirtualCam.Connect(signal, "start", OBSStartVirtualCam,
 					this);
 		stopVirtualCam.Connect(signal, "stop", OBSStopVirtualCam, this);
+		deactivateVirtualCam.Connect(signal, "deactivate",
+					 OBSDeactivateVirtualCam, this);
 	}
 }
 
+extern void log_vcam_changed(const VCamConfig &config, bool starting);
+
 bool BasicOutputHandler::StartVirtualCam()
 {
 	if (!main->vcamEnabled)
 		return false;
 
-	if (!virtualCamView)
+	bool typeIsProgram = main->vcamConfig.type ==
+			 VCamOutputType::ProgramView;
+
+	if (!virtualCamView && !typeIsProgram)
 		virtualCamView = obs_view_create();
 
 	UpdateVirtualCamOutputSource();
 
 	if (!virtualCamVideo) {
-		virtualCamVideo = obs_view_add(virtualCamView);
+		virtualCamVideo = typeIsProgram ? obs_get_video()
+						: obs_view_add(virtualCamView);
 
 		if (!virtualCamVideo)
 			return false;
@@ -318,8 +329,24 @@
 		SetupOutputs();
 
 	bool success = obs_output_start(virtualCam);
-	if (!success)
+	if (!success) {
+		QString errorReason;
+
+		const char *error = obs_output_get_last_error(virtualCam);
+		if (error) {
+			errorReason = QT_UTF8(error);
+		} else {
+			errorReason = QTStr("Output.StartFailedGeneric");
+		}
+
+		QMessageBox::critical(main,
+				 QTStr("Output.StartVirtualCamFailed"),
+				 errorReason);
+
 		DestroyVirtualCamView();
+	}
+
+	log_vcam_changed(main->vcamConfig, true);
 
 	return success;
 }
@@ -347,19 +374,17 @@
 	OBSSourceAutoRelease source;
 
 	switch (main->vcamConfig.type) {
-	case VCamOutputType::InternalOutput:
+	case VCamOutputType::Invalid:
+	case VCamOutputType::ProgramView:
 		DestroyVirtualCameraScene();
-		switch (main->vcamConfig.internal) {
-		case VCamInternalType::Default:
-			source = obs_get_output_source(0);
-			break;
-		case VCamInternalType::Preview:
-			OBSSource s = main->GetCurrentSceneSource();
-			obs_source_get_ref(s);
-			source = s.Get();
-			break;
-		}
+		return;
+	case VCamOutputType::PreviewOutput: {
+		DestroyVirtualCameraScene();
+		OBSSource s = main->GetCurrentSceneSource();
+		obs_source_get_ref(s);
+		source = s.Get();
 		break;
+	}
 	case VCamOutputType::SceneOutput:
 		DestroyVirtualCameraScene();
 		source = obs_get_source_by_name(main->vcamConfig.scene.c_str());
@@ -404,6 +429,11 @@
 
 void BasicOutputHandler::DestroyVirtualCamView()
 {
+	if (main->vcamConfig.type == VCamOutputType::ProgramView) {
+		virtualCamVideo = nullptr;
+		return;
+	}
+
 	obs_view_remove(virtualCamView);
 	obs_view_set_source(virtualCamView, 0, nullptr);
 	virtualCamVideo = nullptr;
@@ -796,6 +826,7 @@
 					 audioSettings);
 
 	if (!enforceBitrate) {
+		blog(LOG_INFO, "User is ignoring service bitrate limits.");
 		obs_data_set_int(videoSettings, "bitrate", videoBitrate);
 		obs_data_set_int(audioSettings, "bitrate", audioBitrate);
 	}
@@ -988,6 +1019,9 @@
 		UpdateRecordingSettings_amd_cqp(crf);
 #endif
 
+	} else if (videoEncoder == SIMPLE_ENCODER_AMD_AV1) {
+		UpdateRecordingSettings_amd_cqp(crf);
+
 	} else if (videoEncoder == SIMPLE_ENCODER_NVENC) {
 		UpdateRecordingSettings_nvenc(crf);
 
@@ -1172,6 +1206,8 @@
 		config_get_bool(main->Config(), "Output", "DelayPreserve");
 	const char *bindIP =
 		config_get_string(main->Config(), "Output", "BindIP");
+	const char *ipFamily =
+		config_get_string(main->Config(), "Output", "IPFamily");
 #ifdef _WIN32
 	bool enableNewSocketLoop = config_get_bool(main->Config(), "Output",
 						 "NewSocketLoopEnable");
@@ -1183,6 +1219,7 @@
 
 	OBSDataAutoRelease settings = obs_data_create();
 	obs_data_set_string(settings, "bind_ip", bindIP);
+	obs_data_set_string(settings, "ip_family", ipFamily);
 #ifdef _WIN32
 	obs_data_set_bool(settings, "new_socket_loop_enabled",
 			 enableNewSocketLoop);
@@ -1304,6 +1341,7 @@
 		config_get_int(main->Config(), "SimpleOutput", "RecTracks");
 
 	bool is_fragmented = strncmp(format, "fragmented", 10) == 0;
+	bool is_lossless = videoQuality == "Lossless";
 
 	string f;
 
@@ -1330,7 +1368,8 @@
 	}
 
 	// Use fragmented MOV/MP4 if user has not already specified custom movflags
-	if (is_fragmented && (!mux || strstr(mux, "movflags") == NULL)) {
+	if (is_fragmented && !is_lossless &&
+	 (!mux || strstr(mux, "movflags") == NULL)) {
 		string mux_frag =
 			"movflags=frag_keyframe+empty_moov+delay_moov";
 		if (mux) {
@@ -1340,7 +1379,7 @@
 		obs_data_set_string(settings, "muxer_settings",
 				 mux_frag.c_str());
 	} else {
-		if (is_fragmented)
+		if (is_fragmented && !is_lossless)
 			blog(LOG_WARNING,
 			 "User enabled fragmented recording, "
 			 "but custom muxer settings contained movflags.");
@@ -1683,13 +1722,18 @@
 		int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
 		obs_service_apply_encoder_settings(main->GetService(), settings,
 						 nullptr);
-		if (!enforceBitrate)
+		if (!enforceBitrate) {
+			blog(LOG_INFO,
+			 "User is ignoring service bitrate limits.");
 			obs_data_set_int(settings, "bitrate", bitrate);
+		}
 
 		int enforced_keyint_sec =
 			(int)obs_data_get_int(settings, "keyint_sec");
 		if (keyint_sec != 0 && keyint_sec < enforced_keyint_sec)
 			obs_data_set_int(settings, "keyint_sec", keyint_sec);
+	} else {
+		blog(LOG_WARNING, "User is ignoring service settings.");
 	}
 
 	if (dynBitrate && astrcmpi(streamEncoder, "jim_nvenc") == 0)
@@ -2122,6 +2166,8 @@
 		config_get_bool(main->Config(), "Output", "DelayPreserve");
 	const char *bindIP =
 		config_get_string(main->Config(), "Output", "BindIP");
+	const char *ipFamily =
+		config_get_string(main->Config(), "Output", "IPFamily");
 #ifdef _WIN32
 	bool enableNewSocketLoop = config_get_bool(main->Config(), "Output",
 						 "NewSocketLoopEnable");
@@ -2133,6 +2179,7 @@
 
 	OBSDataAutoRelease settings = obs_data_create();
 	obs_data_set_string(settings, "bind_ip", bindIP);
+	obs_data_set_string(settings, "ip_family", ipFamily);
 #ifdef _WIN32
 	obs_data_set_bool(settings, "new_socket_loop_enabled",
 			 enableNewSocketLoop);

obs-studio-29.1.3.tar.xz/UI/window-basic-main-outputs.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-outputs.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-main-profiles.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-profiles.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2015 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -317,6 +317,10 @@
 	if (create_new) {
 		auth.reset();
 		DestroyPanelCookieManager();
+#ifdef YOUTUBE_ENABLED
+		if (youtubeAppDock)
+			DeleteYouTubeAppDock();
+#endif
 	} else if (!rename) {
 		DuplicateCurrentCookieProfile(config);
 	}
@@ -782,6 +786,10 @@
 	Auth::Save();
 	auth.reset();
 	DestroyPanelCookieManager();
+#ifdef YOUTUBE_ENABLED
+	if (youtubeAppDock)
+		DeleteYouTubeAppDock();
+#endif
 
 	config.Swap(basicConfig);
 	InitBasicConfigDefaults();
@@ -793,6 +801,10 @@
 	UpdateVolumeControlsDecayRate();
 
 	Auth::Load();
+#ifdef YOUTUBE_ENABLED
+	if (YouTubeAppDock::IsYTServiceSelected() && !youtubeAppDock)
+		NewYouTubeAppDock();
+#endif
 
 	CheckForSimpleModeX264Fallback();
 
@@ -837,7 +849,7 @@
 	const char *id;
 
 	while (obs_enum_encoder_types(idx++, &id)) {
-		if (strcmp(id, "amd_amf_h264") == 0)
+		if (strcmp(id, "h264_texture_amf") == 0)
 			amd_supported = true;
 		else if (strcmp(id, "obs_qsv11") == 0)
 			qsv_supported = true;

obs-studio-29.1.3.tar.xz/UI/window-basic-main-scene-collections.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-scene-collections.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-main-screenshot.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-screenshot.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-main-transitions.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main-transitions.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2016 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -283,10 +283,6 @@
 		obs_transition_swap_begin(transition, oldTransition);
 		obs_set_output_source(0, transition);
 		obs_transition_swap_end(transition, oldTransition);
-
-		// Transition overrides don't raise an event so we need to call update directly
-		if (vcamEnabled)
-			outputHandler->UpdateVirtualCamOutputSource();
 	}
 }
 
@@ -346,6 +342,33 @@
 	if (usingPreviewProgram && stillTransitioning)
 		goto cleanup;
 
+	if (usingPreviewProgram) {
+		if (!black && !manual) {
+			const char *sceneName = obs_source_get_name(source);
+			blog(LOG_INFO, "User switched Program to scene '%s'",
+			 sceneName);
+
+		} else if (black && !prevFTBSource) {
+			OBSSourceAutoRelease target =
+				obs_transition_get_active_source(transition);
+			const char *sceneName = obs_source_get_name(target);
+			blog(LOG_INFO, "User faded from scene '%s' to black",
+			 sceneName);
+
+		} else if (black && prevFTBSource) {
+			const char *sceneName =
+				obs_source_get_name(prevFTBSource);
+			blog(LOG_INFO, "User faded from black to scene '%s'",
+			 sceneName);
+
+		} else if (manual) {
+			const char *sceneName = obs_source_get_name(source);
+			blog(LOG_INFO,
+			 "User started manual transition to scene '%s'",
+			 sceneName);
+		}
+	}
+
 	if (force) {
 		obs_transition_set(transition, source);
 		if (api)
@@ -426,10 +449,6 @@
 	ui->transitionRemove->setEnabled(configurable);
 	ui->transitionProps->setEnabled(configurable);
 
-	if (vcamEnabled && vcamConfig.type == VCamOutputType::InternalOutput &&
-	 vcamConfig.internal == VCamInternalType::Default)
-		outputHandler->UpdateVirtualCamOutputSource();
-
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_TRANSITION_CHANGED);
 }
@@ -445,14 +464,10 @@
 	SetTransition(transition);
 }
 
-void OBSBasic::AddTransition()
+void OBSBasic::AddTransition(const char *id)
 {
-	QAction *action = reinterpret_cast<QAction *>(sender());
-	QString idStr = action->property("id").toString();
-
 	string name;
-	QString placeHolderText =
-		QT_UTF8(obs_source_get_display_name(QT_TO_UTF8(idStr)));
+	QString placeHolderText = QT_UTF8(obs_source_get_display_name(id));
 	QString format = placeHolderText + " (%1)";
 	obs_source_t *source = nullptr;
 	int i = 1;
@@ -471,7 +486,7 @@
 			OBSMessageBox::warning(this,
 					 QTStr("NoNameEntered.Title"),
 					 QTStr("NoNameEntered.Text"));
-			AddTransition();
+			AddTransition(id);
 			return;
 		}
 
@@ -480,12 +495,11 @@
 			OBSMessageBox::warning(this, QTStr("NameExists.Title"),
 					 QTStr("NameExists.Text"));
 
-			AddTransition();
+			AddTransition(id);
 			return;
 		}
 
-		source = obs_source_create_private(QT_TO_UTF8(idStr),
-						 name.c_str(), NULL);
+		source = obs_source_create_private(id, name.c_str(), NULL);
 		InitTransition(source);
 		ui->transitions->addItem(
 			QT_UTF8(name.c_str()),
@@ -514,10 +528,9 @@
 		if (obs_is_source_configurable(id)) {
 			const char *name = obs_source_get_display_name(id);
 			QAction *action = new QAction(name, this);
-			action->setProperty("id", id);
 
-			connect(action, SIGNAL(triggered()), this,
-				SLOT(AddTransition()));
+			connect(action, &QAction::triggered,
+				this, id() { AddTransition(id); });
 
 			menu.addAction(action);
 			foundConfigurableTransitions = true;
@@ -559,12 +572,8 @@
 	RefreshQuickTransitions();
 }
 
-void OBSBasic::RenameTransition()
+void OBSBasic::RenameTransition(OBSSource transition)
 {
-	QAction *action = reinterpret_cast<QAction *>(sender());
-	QVariant variant = action->property("transition");
-	OBSSource transition = variant.value<OBSSource>();
-
 	string name;
 	QString placeHolderText = QT_UTF8(obs_source_get_name(transition));
 	obs_source_t *source = nullptr;
@@ -579,7 +588,7 @@
 	if (name.empty()) {
 		OBSMessageBox::warning(this, QTStr("NoNameEntered.Title"),
 				 QTStr("NoNameEntered.Text"));
-		RenameTransition();
+		RenameTransition(transition);
 		return;
 	}
 
@@ -588,12 +597,12 @@
 		OBSMessageBox::warning(this, QTStr("NameExists.Title"),
 				 QTStr("NameExists.Text"));
 
-		RenameTransition();
+		RenameTransition(transition);
 		return;
 	}
 
 	obs_source_set_name(transition, name.c_str());
-	int idx = ui->transitions->findData(variant);
+	int idx = ui->transitions->findData(QVariant::fromValue(transition));
 	if (idx != -1) {
 		ui->transitions->setItemText(idx, QT_UTF8(name.c_str()));
 
@@ -613,13 +622,15 @@
 	if (!obs_source_configurable(source))
 		return;
 
-	auto properties = &() { CreatePropertiesWindow(source); };
+	auto properties = &() {
+		CreatePropertiesWindow(source);
+	};
 
 	QMenu menu(this);
 
 	QAction *action = new QAction(QTStr("Rename"), &menu);
-	connect(action, SIGNAL(triggered()), this, SLOT(RenameTransition()));
-	action->setProperty("transition", QVariant::fromValue(source));
+	connect(action, &QAction::triggered,
+		this, source() { RenameTransition(source); });
 	menu.addAction(action);
 
 	action = new QAction(QTStr("Properties"), &menu);
@@ -697,8 +708,8 @@
 				ui->scenes->blockSignals(false);
 
 				if (vcamEnabled &&
-				 vcamConfig.internal ==
-					 VCamInternalType::Preview)
+				 vcamConfig.type ==
+					 VCamOutputType::PreviewOutput)
 					outputHandler
 						->UpdateVirtualCamOutputSource();
 
@@ -801,7 +812,7 @@
 	tBar->setProperty("themeID", "tBarSlider");
 
 	connect(tBar, &QSlider::valueChanged, this, &OBSBasic::TBarChanged);
-	connect(tBar, SIGNAL(sliderReleased()), this, SLOT(TBarReleased()));
+	connect(tBar, &QSlider::sliderReleased, this, &OBSBasic::TBarReleased);
 
 	layout->addStretch(0);
 	layout->addLayout(mainButtonLayout);
@@ -893,6 +904,11 @@
 		tBarActive = false;
 		EnableTransitionWidgets(true);
 
+		OBSSourceAutoRelease target =
+			obs_transition_get_active_source(transition);
+		const char *sceneName = obs_source_get_name(target);
+		blog(LOG_INFO, "Manual transition to scene '%s' finished",
+		 sceneName);
 	} else if (val <= T_BAR_CLAMP) {
 		obs_transition_set_manual_time(transition, 0.0f);
 		TransitionFullyStopped();
@@ -902,6 +918,7 @@
 		tBarActive = false;
 		EnableTransitionWidgets(true);
 		programScene = lastProgramScene;
+		blog(LOG_INFO, "Manual transition cancelled");
 	}
 
 	tBar->clearFocus();
@@ -1074,13 +1091,13 @@
 				 obs_source_t *tr)
 {
 	int64_t sceneItemId = obs_sceneitem_get_id(item);
-	std::string sceneName = obs_source_get_name(
+	std::string sceneUUID = obs_source_get_uuid(
 		obs_scene_get_source(obs_sceneitem_get_scene(item)));
 
-	auto undo_redo = sceneName, sceneItemId,
+	auto undo_redo = sceneUUID, sceneItemId,
 			 show(const std::string &data) {
 		OBSSourceAutoRelease source =
-			obs_get_source_by_name(sceneName.c_str());
+			obs_get_source_by_uuid(sceneUUID.c_str());
 		obs_scene_t *scene = obs_scene_from_source(source);
 		obs_sceneitem_t *i =
 			obs_scene_find_sceneitem_by_id(scene, sceneItemId);
@@ -1144,14 +1161,14 @@
 		QString id = action->property("transition_id").toString();
 		OBSSceneItem sceneItem = main->GetCurrentSceneItem();
 		int64_t sceneItemId = obs_sceneitem_get_id(sceneItem);
-		std::string sceneName =
-			obs_source_get_name(obs_scene_get_source(
+		std::string sceneUUID =
+			obs_source_get_uuid(obs_scene_get_source(
 				obs_sceneitem_get_scene(sceneItem)));
 
-		auto undo_redo = sceneName, sceneItemId,
+		auto undo_redo = sceneUUID, sceneItemId,
 				 visible(const std::string &data) {
 			OBSSourceAutoRelease source =
-				obs_get_source_by_name(sceneName.c_str());
+				obs_get_source_by_uuid(sceneUUID.c_str());
 			obs_scene_t *scene = obs_scene_from_source(source);
 			obs_sceneitem_t *i = obs_scene_find_sceneitem_by_id(
 				scene, sceneItemId);
@@ -1247,8 +1264,8 @@
 	if (curId && obs_is_source_configurable(curId)) {
 		menu->addSeparator();
 		menu->addAction(QTStr("Properties"), this,
-				visible ? SLOT(ShowTransitionProperties())
-					: SLOT(HideTransitionProperties()));
+				visible ? &OBSBasic::ShowTransitionProperties
+					: &OBSBasic::HideTransitionProperties);
 	}
 
 	auto copyTransition = this(QAction *, bool visible) {

obs-studio-29.1.3.tar.xz/UI/window-basic-main.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main.cpp Changed

@@ -1,7 +1,7 @@
 /******************************************************************************
- Copyright (C) 2013-2015 by Hugh Bailey <obs.jim@gmail.com>
- Zachary Lund <admin@computerquip.com>
- Philippe Groarke <philippe.groarke@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
+ Zachary Lund <admin@computerquip.com>
+ Philippe Groarke <philippe.groarke@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include <cstddef>
 #include <ctime>
 #include <functional>
+#include <unordered_set>
 #include <obs-data.h>
 #include <obs.h>
 #include <obs.hpp>
@@ -34,6 +35,7 @@
 #include <QSizePolicy>
 #include <QScrollBar>
 #include <QTextStream>
+#include <QActionGroup>
 
 #include <util/dstr.h>
 #include <util/util.hpp>
@@ -59,7 +61,7 @@
 #endif
 #include "window-projector.hpp"
 #include "window-remux.hpp"
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 #include "auth-youtube.hpp"
 #include "window-youtube-actions.hpp"
 #include "youtube-api-wrappers.hpp"
@@ -82,6 +84,10 @@
 #include "windows.h"
 #endif
 
+#ifdef WHATSNEW_ENABLED
+#include "update/models/whatsnew.hpp"
+#endif
+
 #if !defined(_WIN32) && defined(WHATSNEW_ENABLED)
 #include "update/shared-update.hpp"
 #endif
@@ -95,13 +101,10 @@
 
 #include <QWindow>
 
-#include <json11.hpp>
-
 #ifdef ENABLE_WAYLAND
 #include <obs-nix-platform.h>
 #endif
 
-using namespace json11;
 using namespace std;
 
 #ifdef BROWSER_AVAILABLE
@@ -115,6 +118,7 @@
 
 QCef *cef = nullptr;
 QCefCookieManager *panel_cookies = nullptr;
+bool cef_js_avail = false;
 
 void DestroyPanelCookieManager();
 
@@ -124,7 +128,7 @@
 	OBSRef ref;
 	vector<shared_ptr<OBSSignal>> handlers;
 };
-}
+} // namespace
 
 extern volatile long insideEventLoop;
 
@@ -231,6 +235,30 @@
 #endif
 }
 
+/* First-party modules considered to be potentially unsafe to load in Safe Mode
+ * due to them allowing external code (e.g. scripts) to modify OBS's state. */
+static const unordered_set<string> unsafe_modules = {
+	"frontend-tools", // Scripting
+	"obs-websocket", // Allows outside modifications
+};
+
+static void SetSafeModuleNames()
+{
+#ifndef SAFE_MODULES
+	return;
+#else
+	string module;
+	stringstream modules(SAFE_MODULES);
+
+	while (getline(modules, module, '|')) {
+		/* When only disallowing third-party plugins, still add
+		 * "unsafe" bundled modules to the safe list. */
+		if (disable_3p_plugins || !unsafe_modules.count(module))
+			obs_add_safe_module(module.c_str());
+	}
+#endif
+}
+
 extern obs_frontend_callbacks *InitializeAPIInterface(OBSBasic *main);
 
 void assignDockToggle(QDockWidget *dock, QAction *action)
@@ -266,40 +294,33 @@
 	};
 
 	// Replace the slot connected by default
-	action->disconnect(SIGNAL(triggered(bool)));
+	QObject::disconnect(action, &QAction::triggered, nullptr, 0);
 	dock->connect(action, &QAction::triggered, newToggleView);
 
 	// Make the action unable to be disabled
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	action->connect(action, &QAction::changed, neverDisable);
-#else
 	action->connect(action, &QAction::enabledChanged, neverDisable);
-#endif
 }
 
 extern void RegisterTwitchAuth();
 extern void RegisterRestreamAuth();
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 extern void RegisterYoutubeAuth();
 #endif
 
 OBSBasic::OBSBasic(QWidget *parent)
-	: OBSMainWindow(parent), undo_s(ui), ui(new Ui::OBSBasic)
+	: OBSMainWindow(parent),
+	 undo_s(ui),
+	 ui(new Ui::OBSBasic)
 {
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	qRegisterMetaTypeStreamOperators<SignalContainer<OBSScene>>(
-		"SignalContainer<OBSScene>");
-#endif
-
 	setAttribute(Qt::WA_NativeWindow);
 
-#if TWITCH_ENABLED
+#ifdef TWITCH_ENABLED
 	RegisterTwitchAuth();
 #endif
-#if RESTREAM_ENABLED
+#ifdef RESTREAM_ENABLED
 	RegisterRestreamAuth();
 #endif
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	RegisterYoutubeAuth();
 #endif
 
@@ -339,12 +360,6 @@
 	qRegisterMetaType<obs_hotkey_id>("obs_hotkey_id");
 	qRegisterMetaType<SavedProjectorInfo *>("SavedProjectorInfo *");
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	qRegisterMetaTypeStreamOperators<std::vector<std::shared_ptr<OBSSignal>>>(
-		"std::vector<std::shared_ptr<OBSSignal>>");
-	qRegisterMetaTypeStreamOperators<OBSScene>("OBSScene");
-#endif
-
 	ui->scenes->setAttribute(Qt::WA_MacShowFocusRect, false);
 	ui->sources->setAttribute(Qt::WA_MacShowFocusRect, false);
 
@@ -352,6 +367,11 @@
 					 "gridMode");
 	ui->scenes->SetGridMode(sceneGrid);
 
+	if (sceneGrid)
+		ui->actionSceneGridMode->setChecked(true);
+	else
+		ui->actionSceneListMode->setChecked(true);
+
 	ui->scenes->setItemDelegate(new SceneRenameDelegate(ui->scenes));
 
 	auto displayResize = this() {
@@ -379,28 +399,29 @@
 
 	UpdateTitleBar();
 
-	connect(ui->scenes->itemDelegate(), SIGNAL(closeEditor(QWidget *)),
-		this, SLOT(SceneNameEdited(QWidget *)));
+	connect(ui->scenes->itemDelegate(), &QAbstractItemDelegate::closeEditor,
+		this, &OBSBasic::SceneNameEdited);
 
 	cpuUsageInfo = os_cpu_usage_info_start();
 	cpuUsageTimer = new QTimer(this);
-	connect(cpuUsageTimer.data(), SIGNAL(timeout()), ui->statusbar,
-		SLOT(UpdateCPUUsage()));
+	connect(cpuUsageTimer.data(), &QTimer::timeout, ui->statusbar,
+		&OBSBasicStatusBar::UpdateCPUUsage);
 	cpuUsageTimer->start(3000);
 
 	diskFullTimer = new QTimer(this);
-	connect(diskFullTimer, SIGNAL(timeout()), this,
-		SLOT(CheckDiskSpaceRemaining()));
+	connect(diskFullTimer, &QTimer::timeout, this,
+		&OBSBasic::CheckDiskSpaceRemaining);
 
 	renameScene = new QAction(QTStr("Rename"), ui->scenesDock);
 	renameScene->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-	connect(renameScene, SIGNAL(triggered()), this, SLOT(EditSceneName()));
+	connect(renameScene, &QAction::triggered, this,
+		&OBSBasic::EditSceneName);
 	ui->scenesDock->addAction(renameScene);
 
 	renameSource = new QAction(QTStr("Rename"), ui->sourcesDock);
 	renameSource->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-	connect(renameSource, SIGNAL(triggered()), this,
-		SLOT(EditSceneItemName()));
+	connect(renameSource, &QAction::triggered, this,
+		&OBSBasic::EditSceneItemName);
 	ui->sourcesDock->addAction(renameSource);
 
 #ifdef __APPLE__
@@ -504,18 +525,25 @@
 	QPoint newPos = curPos + statsDockPos;
 	statsDock->move(newPos);
 
+#ifdef HAVE_OBSCONFIG_H
+	ui->actionReleaseNotes->setVisible(true);
+#endif
+
 	ui->previewDisabledWidget->setContextMenuPolicy(Qt::CustomContextMenu);
-	connect(ui->enablePreviewButton, SIGNAL(clicked()), this,
-		SLOT(TogglePreview()));
+	connect(ui->enablePreviewButton, &QPushButton::clicked, this,
+		&OBSBasic::TogglePreview);
 
-	connect(ui->scenes, SIGNAL(scenesReordered()), this,
-		SLOT(ScenesReordered()));
+	connect(ui->scenes, &SceneTree::scenesReordered,
+		() { OBSProjector::UpdateMultiviewProjectors(); });
 
 	connect(ui->broadcastButton, &QPushButton::clicked, this,
 		&OBSBasic::BroadcastButtonClicked);
 
-	connect(App(), &OBSApp::StyleChanged, this,
-		&OBSBasic::ResetProxyStyleSliders);
+	connect(App(), &OBSApp::StyleChanged, this, &OBSBasic::ThemeChanged);
+
+	QActionGroup *actionGroup = new QActionGroup(this);
+	actionGroup->addAction(ui->actionSceneListMode);
+	actionGroup->addAction(ui->actionSceneGridMode);
 
 	UpdatePreviewSafeAreas();
 	UpdatePreviewSpacingHelpers();
@@ -785,11 +813,11 @@
 	if (vcamEnabled) {
 		OBSDataAutoRelease obj = obs_data_create();
 
-		obs_data_set_int(obj, "type", (int)vcamConfig.type);
+		obs_data_set_int(obj, "type2", (int)vcamConfig.type);
 		switch (vcamConfig.type) {
-		case VCamOutputType::InternalOutput:
-			obs_data_set_int(obj, "internal",
-					 (int)vcamConfig.internal);
+		case VCamOutputType::Invalid:
+		case VCamOutputType::ProgramView:
+		case VCamOutputType::PreviewOutput:
 			break;
 		case VCamOutputType::SceneOutput:
 			obs_data_set_string(obj, "scene",
@@ -805,9 +833,18 @@
 	}
 
 	if (api) {
-		OBSDataAutoRelease moduleObj = obs_data_create();
-		api->on_save(moduleObj);
-		obs_data_set_obj(saveData, "modules", moduleObj);
+		if (safeModeModuleData) {
+			/* If we're in Safe Mode and have retained unloaded
+			 * plugin data, update the existing data object instead
+			 * of creating a new one. */
+			api->on_save(safeModeModuleData);
+			obs_data_set_obj(saveData, "modules",
+					 safeModeModuleData);
+		} else {
+			OBSDataAutoRelease moduleObj = obs_data_create();
+			api->on_save(moduleObj);
+			obs_data_set_obj(saveData, "modules", moduleObj);
+		}
 	}
 
 	if (!obs_data_save_json_safe(saveData, file, "tmp", "bak"))
@@ -1088,6 +1125,12 @@
 	if (api)
 		api->on_preload(modulesObj);
 
+	if (safe_mode || disable_3p_plugins) {
+		/* Keep a reference to "modules" data so plugins that are not
+		 * loaded do not have their collection specific data lost. */
+		safeModeModuleData = obs_data_get_obj(data, "modules");
+	}
+
 	OBSDataArrayAutoRelease sceneOrder =
 		obs_data_get_array(data, "scene_order");
 	OBSDataArrayAutoRelease sources = obs_data_get_array(data, "sources");
@@ -1229,9 +1272,26 @@
 		OBSDataAutoRelease obj =
 			obs_data_get_obj(data, "virtual-camera");
 
-		vcamConfig.type = (VCamOutputType)obs_data_get_int(obj, "type");
-		vcamConfig.internal =
-			(VCamInternalType)obs_data_get_int(obj, "internal");
+		vcamConfig.type =
+			(VCamOutputType)obs_data_get_int(obj, "type2");
+		if (vcamConfig.type == VCamOutputType::Invalid)
+			vcamConfig.type =
+				(VCamOutputType)obs_data_get_int(obj, "type");
+
+		if (vcamConfig.type == VCamOutputType::Invalid) {
+			VCamInternalType internal =
+				(VCamInternalType)obs_data_get_int(obj,
+								 "internal");
+
+			switch (internal) {
+			case VCamInternalType::Default:
+				vcamConfig.type = VCamOutputType::ProgramView;
+				break;
+			case VCamInternalType::Preview:
+				vcamConfig.type = VCamOutputType::PreviewOutput;
+				break;
+			}
+		}
 		vcamConfig.scene = obs_data_get_string(obj, "scene");
 		vcamConfig.source = obs_data_get_string(obj, "source");
 	}
@@ -1246,14 +1306,14 @@
 	if (!opt_starting_scene.empty())
 		opt_starting_scene.clear();
 
-	if (opt_start_streaming) {
+	if (opt_start_streaming && !safe_mode) {
 		blog(LOG_INFO, "Starting stream due to command line parameter");
 		QMetaObject::invokeMethod(this, "StartStreaming",
 					 Qt::QueuedConnection);
 		opt_start_streaming = false;
 	}
 
-	if (opt_start_recording) {
+	if (opt_start_recording && !safe_mode) {
 		blog(LOG_INFO,
 		 "Starting recording due to command line parameter");
 		QMetaObject::invokeMethod(this, "StartRecording",
@@ -1261,13 +1321,13 @@
 		opt_start_recording = false;
 	}
 
-	if (opt_start_replaybuffer) {
+	if (opt_start_replaybuffer && !safe_mode) {
 		QMetaObject::invokeMethod(this, "StartReplayBuffer",
 					 Qt::QueuedConnection);
 		opt_start_replaybuffer = false;
 	}
 
-	if (opt_start_virtualcam) {
+	if (opt_start_virtualcam && !safe_mode) {
 		QMetaObject::invokeMethod(this, "StartVirtualCam",
 					 Qt::QueuedConnection);
 		opt_start_virtualcam = false;
@@ -1342,7 +1402,8 @@
 		return false;
 
 	/* Enforce Opus on FTL if needed */
-	if (strcmp(obs_service_get_protocol(service), "FTL") == 0) {
+	if (strcmp(obs_service_get_protocol(service), "FTL") == 0 ||
+	 strcmp(obs_service_get_protocol(service), "WHIP") == 0) {
 		const char *option = config_get_string(
 			basicConfig, "SimpleOutput", "StreamAudioEncoder");
 		if (strcmp(option, "opus") != 0)
@@ -1620,6 +1681,8 @@
 	config_set_default_uint(basicConfig, "Output", "MaxRetries", 25);
 
 	config_set_default_string(basicConfig, "Output", "BindIP", "default");
+	config_set_default_string(basicConfig, "Output", "IPFamily",
+				 "IPv4+IPv6");
 	config_set_default_bool(basicConfig, "Output", "NewSocketLoopEnable",
 				false);
 	config_set_default_bool(basicConfig, "Output", "LowLatencyEnable",
@@ -1943,15 +2006,18 @@
 	/* hack to prevent elgato from loading its own QtNetwork that it tries
 	 * to ship with */
 #if defined(_WIN32) && !defined(_DEBUG)
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-	LoadLibraryW(L"Qt5Network");
-#else
 	LoadLibraryW(L"Qt6Network");
 #endif
-#endif
 	struct obs_module_failure_info mfi;
 
-	AddExtraModulePaths();
+	/* Safe Mode disables third-party plugins so we don't need to add earch
+	 * paths outside the OBS bundle/installation. */
+	if (safe_mode || disable_3p_plugins) {
+		SetSafeModuleNames();
+	} else {
+		AddExtraModulePaths();
+	}
+
 	blog(LOG_INFO, "---------------------------------");
 	obs_load_all_modules2(&mfi);
 	blog(LOG_INFO, "---------------------------------");
@@ -1963,6 +2029,7 @@
 
 #ifdef BROWSER_AVAILABLE
 	cef = obs_browser_init_panel();
+	cef_js_avail = cef && obs_browser_qcef_version() >= 3;
 #endif
 
 	OBSDataAutoRelease obsData = obs_get_private_data();
@@ -2111,6 +2178,9 @@
 
 	/* ----------------------------- */
 	/* add custom browser docks */
+#if defined(BROWSER_AVAILABLE) && defined(YOUTUBE_ENABLED)
+	YouTubeAppDock::CleanupYouTubeUrls();
+#endif
 
 #ifdef BROWSER_AVAILABLE
 	if (cef) {
@@ -2128,6 +2198,12 @@
 	}
 #endif
 
+#ifdef YOUTUBE_ENABLED
+	/* setup YouTube app dock */
+	if (YouTubeAppDock::IsYTServiceSelected())
+		NewYouTubeAppDock();
+#endif
+
 	const char *dockStateStr = config_get_string(
 		App()->GlobalConfig(), "BasicWindow", "DockState");
 
@@ -2161,6 +2237,13 @@
 	ui->lockDocks->setChecked(docksLocked);
 	ui->lockDocks->blockSignals(false);
 
+	bool sideDocks = config_get_bool(App()->GlobalConfig(), "BasicWindow",
+					 "SideDocks");
+	on_sideDocks_toggled(sideDocks);
+	ui->sideDocks->blockSignals(true);
+	ui->sideDocks->setChecked(sideDocks);
+	ui->sideDocks->blockSignals(false);
+
 	SystemTray(true);
 
 	TaskbarOverlayInit();
@@ -2212,7 +2295,7 @@
 	ui->viewMenu->addSeparator();
 
 	AddProjectorMenuMonitors(ui->multiviewProjectorMenu, this,
-				 SLOT(OpenMultiviewProjector()));
+				 &OBSBasic::OpenMultiviewProjector);
 	connect(ui->viewMenu->menuAction(), &QAction::hovered, this,
 		&OBSBasic::UpdateMultiviewProjectorMenu);
 
@@ -2257,10 +2340,16 @@
 	ui->actionShowWhatsNew = nullptr;
 #endif
 
+	if (safe_mode) {
+		ui->actionRestartSafe->setText(
+			QTStr("Basic.MainMenu.Help.RestartNormal"));
+	}
+
 	UpdatePreviewProgramIndicators();
 	OnFirstLoad();
 
-	activateWindow();
+	if (!hideWindowOnStart)
+		activateWindow();
 
 	/* ------------------------------------------- */
 	/* display warning message for failed modules */
@@ -2308,18 +2397,6 @@
 		on_actionViewCurrentLog_triggered();
 }
 
-#if defined(OBS_RELEASE_CANDIDATE) && OBS_RELEASE_CANDIDATE > 0
-#define CUR_VER \
-	((uint64_t)OBS_RELEASE_CANDIDATE_VER << 16ULL | OBS_RELEASE_CANDIDATE)
-#define LAST_INFO_VERSION_STRING "InfoLastRCVersion"
-#elif OBS_BETA > 0
-#define CUR_VER ((uint64_t)OBS_BETA_VER << 16ULL | OBS_BETA)
-#define LAST_INFO_VERSION_STRING "InfoLastBetaVersion"
-#else
-#define CUR_VER ((uint64_t)LIBOBS_API_VER << 16ULL)
-#define LAST_INFO_VERSION_STRING "InfoLastVersion"
-#endif
-
 /* shows a "what's new" page on startup of new versions using CEF */
 void OBSBasic::ReceivedIntroJson(const QString &text)
 {
@@ -2327,54 +2404,43 @@
 	if (closing)
 		return;
 
-	std::string err;
-	Json json = Json::parse(QT_TO_UTF8(text), err);
-	if (!err.empty())
+	WhatsNewList items;
+	try {
+		nlohmann::json json = nlohmann::json::parse(text.toStdString());
+		items = json.get<WhatsNewList>();
+	} catch (nlohmann::json::exception &e) {
+		blog(LOG_WARNING, "Parsing whatsnew data failed: %s", e.what());
 		return;
+	}
 
 	std::string info_url;
 	int info_increment = -1;
 
 	/* check to see if there's an info page for this version */
-	const Json::array &items = json.array_items();
-	for (const Json &item : items) {
-		if (item"os".is_object()) {
-			Json::object platforms = item"os".object_items();
+	for (const WhatsNewItem &item : items) {
+		if (item.os) {
+			WhatsNewPlatforms platforms = *item.os;
 #ifdef _WIN32
-			if (!platforms"windows".bool_value())
+			if (!platforms.windows)
 				continue;
 #elif defined(__APPLE__)
-			if (!platforms"macos".bool_value())
+			if (!platforms.macos)
 				continue;
 #else
-			if (!platforms"linux".bool_value())
+			if (!platforms.linux)
 				continue;
 #endif
 		}
 
-		const std::string &version = item"version".string_value();
-		const std::string &url = item"url".string_value();
-		int increment = item"increment".int_value();
-		int beta = item"Beta".int_value();
-		int rc = item"RC".int_value();
-
 		int major = 0;
 		int minor = 0;
 
-		sscanf(version.c_str(), "%d.%d", &major, &minor);
-#if defined(OBS_RELEASE_CANDIDATE) && OBS_RELEASE_CANDIDATE > 0
-		if (major == OBS_RELEASE_CANDIDATE_MAJOR &&
-		 minor == OBS_RELEASE_CANDIDATE_MINOR &&
-		 rc == OBS_RELEASE_CANDIDATE) {
-#elif OBS_BETA > 0
-		if (major == OBS_BETA_MAJOR && minor == OBS_BETA_MINOR &&
-		 beta == OBS_BETA) {
-#else
+		sscanf(item.version.c_str(), "%d.%d", &major, &minor);
 		if (major == LIBOBS_API_MAJOR_VER &&
-		 minor == LIBOBS_API_MINOR_VER && rc == 0 && beta == 0) {
-#endif
-			info_url = url;
-			info_increment = increment;
+		 minor == LIBOBS_API_MINOR_VER &&
+		 item.RC == OBS_RELEASE_CANDIDATE && item.Beta == OBS_BETA) {
+			info_url = item.url;
+			info_increment = item.increment;
 		}
 	}
 
@@ -2383,15 +2449,26 @@
 		return;
 	}
 
+#if OBS_RELEASE_CANDIDATE > 0
+	constexpr const char *lastInfoVersion = "InfoLastRCVersion";
+#elif OBS_BETA > 0
+	constexpr const char *lastInfoVersion = "InfoLastBetaVersion";
+#else
+	constexpr const char *lastInfoVersion = "InfoLastVersion";
+#endif
+	constexpr uint64_t currentVersion = (uint64_t)LIBOBS_API_VER << 16ULL |
+					 OBS_RELEASE_CANDIDATE << 8ULL |
+					 OBS_BETA;
 	uint64_t lastVersion = config_get_uint(App()->GlobalConfig(), "General",
-					 LAST_INFO_VERSION_STRING);
+					 lastInfoVersion);
 	int current_version_increment = -1;
 
-	if ((lastVersion & ~0xFFFF0000ULL) < (CUR_VER & ~0xFFFF0000ULL)) {
+	if ((lastVersion & ~0xFFFF0000ULL) <
+	 (currentVersion & ~0xFFFF0000ULL)) {
 		config_set_int(App()->GlobalConfig(), "General",
 			 "InfoIncrement", -1);
 		config_set_uint(App()->GlobalConfig(), "General",
-				LAST_INFO_VERSION_STRING, CUR_VER);
+				lastInfoVersion, currentVersion);
 	} else {
 		current_version_increment = config_get_int(
 			App()->GlobalConfig(), "General", "InfoIncrement");
@@ -2421,9 +2498,6 @@
 #endif
 }
 
-#undef CUR_VER
-#undef LAST_INFO_VERSION_STRING
-
 void OBSBasic::ShowWhatsNew(const QString &url)
 {
 #ifdef BROWSER_AVAILABLE
@@ -2471,7 +2545,7 @@
 {
 	ui->multiviewProjectorMenu->clear();
 	AddProjectorMenuMonitors(ui->multiviewProjectorMenu, this,
-				 SLOT(OpenMultiviewProjector()));
+				 &OBSBasic::OpenMultiviewProjector);
 }
 
 void OBSBasic::InitHotkeys()
@@ -2569,7 +2643,21 @@
 	};
 
 	auto LoadHotkeyPair = &(obs_hotkey_pair_id id, const char *name0,
-				 const char *name1) {
+				 const char *name1,
+				 const char *oldName = NULL) {
+		if (oldName) {
+			const auto info = config_get_string(basicConfig,
+							 "Hotkeys", oldName);
+			if (info) {
+				config_set_string(basicConfig, "Hotkeys", name0,
+						 info);
+				config_set_string(basicConfig, "Hotkeys", name1,
+						 info);
+				config_remove_value(basicConfig, "Hotkeys",
+						 oldName);
+				config_save(basicConfig);
+			}
+		}
 		OBSDataArrayAutoRelease array0 =
 			obs_data_get_array(LoadHotkeyData(name0), "bindings");
 		OBSDataArrayAutoRelease array1 =
@@ -2689,6 +2777,23 @@
 	LoadHotkeyPair(togglePreviewHotkeys, "OBSBasic.EnablePreview",
 		 "OBSBasic.DisablePreview");
 
+	togglePreviewProgramHotkeys = obs_hotkey_pair_register_frontend(
+		"OBSBasic.EnablePreviewProgram",
+		Str("Basic.EnablePreviewProgramMode"),
+		"OBSBasic.DisablePreviewProgram",
+		Str("Basic.DisablePreviewProgramMode"),
+		MAKE_CALLBACK(!basic.IsPreviewProgramMode(),
+			 basic.EnablePreviewProgram,
+			 "Enabling preview program"),
+		MAKE_CALLBACK(basic.IsPreviewProgramMode(),
+			 basic.DisablePreviewProgram,
+			 "Disabling preview program"),
+		this, this);
+	LoadHotkeyPair(togglePreviewProgramHotkeys,
+		 "OBSBasic.EnablePreviewProgram",
+		 "OBSBasic.DisablePreviewProgram",
+		 "OBSBasic.TogglePreviewProgram");
+
 	contextBarHotkeys = obs_hotkey_pair_register_frontend(
 		"OBSBasic.ShowContextBar", Str("Basic.Main.ShowContextBar"),
 		"OBSBasic.HideContextBar", Str("Basic.Main.HideContextBar"),
@@ -2701,20 +2806,6 @@
 		 "OBSBasic.HideContextBar");
 #undef MAKE_CALLBACK
 
-	auto togglePreviewProgram = (void *data, obs_hotkey_id,
-				 obs_hotkey_t *, bool pressed) {
-		if (pressed)
-			QMetaObject::invokeMethod(static_cast<OBSBasic *>(data),
-						 "on_modeSwitch_clicked",
-						 Qt::QueuedConnection);
-	};
-
-	togglePreviewProgramHotkey = obs_hotkey_register_frontend(
-		"OBSBasic.TogglePreviewProgram",
-		Str("Basic.TogglePreviewProgramMode"), togglePreviewProgram,
-		this);
-	LoadHotkey(togglePreviewProgramHotkey, "OBSBasic.TogglePreviewProgram");
-
 	auto transition = (void *data, obs_hotkey_id, obs_hotkey_t *,
 			 bool pressed) {
 		if (pressed)
@@ -2776,8 +2867,8 @@
 	obs_hotkey_pair_unregister(vcamHotkeys);
 	obs_hotkey_pair_unregister(togglePreviewHotkeys);
 	obs_hotkey_pair_unregister(contextBarHotkeys);
+	obs_hotkey_pair_unregister(togglePreviewProgramHotkeys);
 	obs_hotkey_unregister(forceStreamingStopHotkey);
-	obs_hotkey_unregister(togglePreviewProgramHotkey);
 	obs_hotkey_unregister(transitionHotkey);
 	obs_hotkey_unregister(statsHotkey);
 	obs_hotkey_unregister(screenshotHotkey);
@@ -2867,13 +2958,6 @@
 
 	config_set_int(App()->GlobalConfig(), "General", "LastVersion",
 		 LIBOBS_API_VER);
-#if defined(OBS_RELEASE_CANDIDATE) && OBS_RELEASE_CANDIDATE > 0
-	config_set_int(App()->GlobalConfig(), "General", "LastRCVersion",
-		 OBS_RELEASE_CANDIDATE_VER);
-#elif OBS_BETA > 0
-	config_set_int(App()->GlobalConfig(), "General", "LastBetaVersion",
-		 OBS_BETA_VER);
-#endif
 
 	config_set_bool(App()->GlobalConfig(), "BasicWindow", "PreviewEnabled",
 			previewEnabled);
@@ -2889,6 +2973,8 @@
 			"PreviewProgramMode", IsPreviewProgramMode());
 	config_set_bool(App()->GlobalConfig(), "BasicWindow", "DocksLocked",
 			ui->lockDocks->isChecked());
+	config_set_bool(App()->GlobalConfig(), "BasicWindow", "SideDocks",
+			ui->sideDocks->isChecked());
 	config_save_safe(App()->GlobalConfig(), "tmp", nullptr);
 
 #ifdef BROWSER_AVAILABLE
@@ -3041,7 +3127,7 @@
 
 	QListWidgetItem *item = new QListWidgetItem(QT_UTF8(name));
 	SetOBSRef(item, OBSScene(scene));
-	ui->scenes->addItem(item);
+	ui->scenes->insertItem(ui->scenes->currentRow() + 1, item);
 
 	obs_hotkey_register_source(
 		source, "OBSBasic.SelectScene",
@@ -3527,7 +3613,9 @@
 	using UnhideAudioMixer_t = decltype(UnhideAudioMixer);
 
 	auto PreEnum = (void *data, obs_source_t *source) -> bool /* -- */
-	{ return (*reinterpret_cast<UnhideAudioMixer_t *>(data))(source); };
+	{
+		return (*reinterpret_cast<UnhideAudioMixer_t *>(data))(source);
+	};
 
 	obs_enum_sources(PreEnum, &UnhideAudioMixer);
 }
@@ -4458,8 +4546,6 @@
 		 100.0f);
 	gs_reset_viewport();
 
-	window->ui->preview->DrawSceneEditing();
-
 	uint32_t targetCX = window->previewCX;
 	uint32_t targetCY = window->previewCY;
 
@@ -4473,6 +4559,8 @@
 		RenderSafeAreas(window->rightLine, targetCX, targetCY);
 	}
 
+	window->ui->preview->DrawSceneEditing();
+
 	if (window->drawSpacingHelpers)
 		window->ui->preview->DrawSpacingHelpers();
 
@@ -4634,14 +4722,14 @@
 	ovi.gpu_conversion = true;
 	ovi.scale_type = GetScaleType(basicConfig);
 
-	if (ovi.base_width < 8 || ovi.base_height < 8) {
+	if (ovi.base_width < 32 || ovi.base_height < 32) {
 		ovi.base_width = 1920;
 		ovi.base_height = 1080;
 		config_set_uint(basicConfig, "Video", "BaseCX", 1920);
 		config_set_uint(basicConfig, "Video", "BaseCY", 1080);
 	}
 
-	if (ovi.output_width < 8 || ovi.output_height < 8) {
+	if (ovi.output_width < 32 || ovi.output_height < 32) {
 		ovi.output_width = ovi.base_width;
 		ovi.output_height = ovi.base_height;
 		config_set_uint(basicConfig, "Video", "OutputCX",
@@ -4651,30 +4739,16 @@
 	}
 
 	ret = AttemptToResetVideo(&ovi);
-	if (IS_WIN32 && ret != OBS_VIDEO_SUCCESS) {
-		if (ret == OBS_VIDEO_CURRENTLY_ACTIVE) {
-			blog(LOG_WARNING, "Tried to reset when "
-					 "already active");
-			return ret;
-		}
-
-		/* Try OpenGL if DirectX fails on windows */
-		if (astrcmpi(ovi.graphics_module, DL_OPENGL) != 0) {
-			blog(LOG_WARNING,
-			 "Failed to initialize obs video (%d) "
-			 "with graphics_module='%s', retrying "
-			 "with graphics_module='%s'",
-			 ret, ovi.graphics_module, DL_OPENGL);
-			ovi.graphics_module = DL_OPENGL;
-			ret = AttemptToResetVideo(&ovi);
-		}
-	} else if (ret == OBS_VIDEO_SUCCESS) {
+	if (ret == OBS_VIDEO_CURRENTLY_ACTIVE) {
+		blog(LOG_WARNING, "Tried to reset when already active");
+		return ret;
+	}
+
+	if (ret == OBS_VIDEO_SUCCESS) {
 		ResizePreview(ovi.base_width, ovi.base_height);
 		if (program)
 			ResizeProgram(ovi.base_width, ovi.base_height);
-	}
 
-	if (ret == OBS_VIDEO_SUCCESS) {
 		const float sdr_white_level = (float)config_get_uint(
 			basicConfig, "Video", "SdrWhiteLevel");
 		const float hdr_nominal_peak_level = (float)config_get_uint(
@@ -4863,11 +4937,11 @@
 	/* Reset VCam to default to clear its private scene and any references
 	 * it holds. It will be reconfigured during loading. */
 	if (vcamEnabled) {
-		vcamConfig.type = VCamOutputType::InternalOutput;
-		vcamConfig.internal = VCamInternalType::Default;
+		vcamConfig.type = VCamOutputType::ProgramView;
 		outputHandler->UpdateVirtualCamOutputSource();
 	}
 
+	safeModeModuleData = nullptr;
 	lastScene = nullptr;
 	swapScene = nullptr;
 	programScene = nullptr;
@@ -4952,15 +5026,15 @@
 	 * could be inside of an Auth::LoadUI call. Keep trying once per
 	 * second until we've exit any known sub-loops. */
 	if (os_atomic_load_long(&insideEventLoop) != 0) {
-		QTimer::singleShot(1000, this, SLOT(close()));
+		QTimer::singleShot(1000, this, &OBSBasic::close);
 		event->ignore();
 		return;
 	}
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	/* Also don't close the window if the youtube stream check is active */
 	if (youtubeStreamCheckThread) {
-		QTimer::singleShot(1000, this, SLOT(close()));
+		QTimer::singleShot(1000, this, &OBSBasic::close);
 		event->ignore();
 		return;
 	}
@@ -5003,6 +5077,16 @@
 
 	closing = true;
 
+	/* While closing, a resize event to OBSQTDisplay could be triggered.
+	 * The graphics thread on macOS dispatches a lambda function to be
+	 * executed asynchronously in the main thread. However, the display is
+	 * sometimes deleted before the lambda function is actually executed.
+	 * To avoid such a case, destroy displays earlier than others such as
+	 * deleting browser docks. */
+	ui->preview->DestroyDisplay();
+	if (program)
+		program->DestroyDisplay();
+
 	if (outputHandler->VirtualCamActive())
 		outputHandler->StopVirtualCam();
 
@@ -5029,10 +5113,6 @@
 
 	delete extraBrowsers;
 
-	ui->preview->DestroyDisplay();
-	if (program)
-		program->DestroyDisplay();
-
 	config_set_string(App()->GlobalConfig(), "BasicWindow", "DockState",
 			 saveState().toBase64().constData());
 
@@ -5055,14 +5135,14 @@
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_EXIT);
 
+	// Destroys the frontend API so plugins can't continue calling it
+	obs_frontend_set_callbacks_internal(nullptr);
+	api = nullptr;
+
 	QMetaObject::invokeMethod(App(), "quit", Qt::QueuedConnection);
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool OBSBasic::nativeEvent(const QByteArray &, void *message, qintptr *)
-#else
-bool OBSBasic::nativeEvent(const QByteArray &, void *message, long *)
-#endif
 {
 #ifdef _WIN32
 	const MSG &msg = *static_cast<MSG *>(message);
@@ -5157,7 +5237,7 @@
 	 * once per second until we've exit any known sub-loops. */
 	if (os_atomic_load_long(&insideEventLoop) != 0) {
 		QTimer::singleShot(1000, this,
-				 SLOT(on_action_Settings_triggered()));
+				 &OBSBasic::on_action_Settings_triggered);
 		return;
 	}
 
@@ -5290,8 +5370,7 @@
 
 	SetCurrentScene(source);
 
-	if (vcamEnabled && vcamConfig.type == VCamOutputType::InternalOutput &&
-	 vcamConfig.internal == VCamInternalType::Preview)
+	if (vcamEnabled && vcamConfig.type == VCamOutputType::PreviewOutput)
 		outputHandler->UpdateVirtualCamOutputSource();
 
 	if (api)
@@ -5311,10 +5390,9 @@
 	item->setFlags(flags);
 }
 
-void OBSBasic::AddProjectorMenuMonitors(QMenu *parent, QObject *target,
-					const char *slot)
+QList<QString> OBSBasic::GetProjectorMenuMonitorsFormatted()
 {
-	QAction *action;
+	QList<QString> projectorsFormatted;
 	QList<QScreen *> screens = QGuiApplication::screens();
 	for (int i = 0; i < screens.size(); i++) {
 		QScreen *screen = screensi;
@@ -5351,10 +5429,9 @@
 						 ratio),
 				 QString::number(screenGeometry.x()),
 				 QString::number(screenGeometry.y()));
-
-		action = parent->addAction(str, target, slot);
-		action->setProperty("monitor", i);
+		projectorsFormatted.push_back(str);
 	}
+	return projectorsFormatted;
 }
 
 void OBSBasic::on_scenes_customContextMenuRequested(const QPoint &pos)
@@ -5365,23 +5442,23 @@
 	QMenu order(QTStr("Basic.MainMenu.Edit.Order"), this);
 
 	popup.addAction(QTStr("Add"), this,
-			SLOT(on_actionAddScene_triggered()));
+			&OBSBasic::on_actionAddScene_triggered);
 
 	if (item) {
 		QAction *copyFilters = new QAction(QTStr("Copy.Filters"), this);
 		copyFilters->setEnabled(false);
-		connect(copyFilters, SIGNAL(triggered()), this,
-			SLOT(SceneCopyFilters()));
+		connect(copyFilters, &QAction::triggered, this,
+			&OBSBasic::SceneCopyFilters);
 		QAction *pasteFilters =
 			new QAction(QTStr("Paste.Filters"), this);
 		pasteFilters->setEnabled(
 			!obs_weak_source_expired(copyFiltersSource));
-		connect(pasteFilters, SIGNAL(triggered()), this,
-			SLOT(ScenePasteFilters()));
+		connect(pasteFilters, &QAction::triggered, this,
+			&OBSBasic::ScenePasteFilters);
 
 		popup.addSeparator();
 		popup.addAction(QTStr("Duplicate"), this,
-				SLOT(DuplicateSelectedScene()));
+				&OBSBasic::DuplicateSelectedScene);
 		popup.addAction(copyFilters);
 		popup.addAction(pasteFilters);
 		popup.addSeparator();
@@ -5390,14 +5467,14 @@
 		popup.addSeparator();
 
 		order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveUp"), this,
-				SLOT(on_actionSceneUp_triggered()));
+				&OBSBasic::on_actionSceneUp_triggered);
 		order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveDown"),
-				this, SLOT(on_actionSceneDown_triggered()));
+				this, &OBSBasic::on_actionSceneDown_triggered);
 		order.addSeparator();
 		order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveToTop"),
-				this, SLOT(MoveSceneToTop()));
+				this, &OBSBasic::MoveSceneToTop);
 		order.addAction(QTStr("Basic.MainMenu.Edit.Order.MoveToBottom"),
-				this, SLOT(MoveSceneToBottom()));
+				this, &OBSBasic::MoveSceneToBottom);
 		popup.addMenu(&order);
 
 		popup.addSeparator();
@@ -5405,18 +5482,18 @@
 		delete sceneProjectorMenu;
 		sceneProjectorMenu = new QMenu(QTStr("SceneProjector"));
 		AddProjectorMenuMonitors(sceneProjectorMenu, this,
-					 SLOT(OpenSceneProjector()));
+					 &OBSBasic::OpenSceneProjector);
 		popup.addMenu(sceneProjectorMenu);
 
 		QAction *sceneWindow = popup.addAction(
-			QTStr("SceneWindow"), this, SLOT(OpenSceneWindow()));
+			QTStr("SceneWindow"), this, &OBSBasic::OpenSceneWindow);
 
 		popup.addAction(sceneWindow);
 		popup.addAction(QTStr("Screenshot.Scene"), this,
-				SLOT(ScreenshotScene()));
+				&OBSBasic::ScreenshotScene);
 		popup.addSeparator();
 		popup.addAction(QTStr("Filters"), this,
-				SLOT(OpenSceneFilters()));
+				&OBSBasic::OpenSceneFilters);
 
 		popup.addSeparator();
 
@@ -5459,17 +5536,35 @@
 	QAction *gridAction = new QAction(grid ? QTStr("Basic.Main.ListMode")
 					 : QTStr("Basic.Main.GridMode"),
 					 this);
-	connect(gridAction, SIGNAL(triggered()), this,
-		SLOT(GridActionClicked()));
+	connect(gridAction, &QAction::triggered, this,
+		&OBSBasic::GridActionClicked);
 	popup.addAction(gridAction);
 
 	popup.exec(QCursor::pos());
 }
 
+void OBSBasic::on_actionSceneListMode_triggered()
+{
+	ui->scenes->SetGridMode(false);
+}
+
+void OBSBasic::on_actionSceneGridMode_triggered()
+{
+	ui->scenes->SetGridMode(true);
+}
+
 void OBSBasic::GridActionClicked()
 {
 	bool gridMode = !ui->scenes->GetGridMode();
 	ui->scenes->SetGridMode(gridMode);
+
+	if (gridMode)
+		ui->actionSceneGridMode->setChecked(true);
+	else
+		ui->actionSceneListMode->setChecked(true);
+
+	config_set_bool(App()->GlobalConfig(), "BasicWindow", "gridMode",
+			gridMode);
 }
 
 void OBSBasic::on_actionAddScene_triggered()
@@ -5613,11 +5708,11 @@
 		obs_source_get_deinterlace_field_order(source);
 	QAction *action;
 
-#define ADD_MODE(name, mode) \
-	action = menu->addAction(QTStr("" name), this, \
-				 SLOT(SetDeinterlacingMode())); \
-	action->setProperty("mode", (int)mode); \
-	action->setCheckable(true); \
+#define ADD_MODE(name, mode) \
+	action = menu->addAction(QTStr("" name), this, \
+				 &OBSBasic::SetDeinterlacingMode); \
+	action->setProperty("mode", (int)mode); \
+	action->setCheckable(true); \
 	action->setChecked(deinterlaceMode == mode);
 
 	ADD_MODE("Disable", OBS_DEINTERLACE_MODE_DISABLE);
@@ -5635,7 +5730,7 @@
 
 #define ADD_ORDER(name, order) \
 	action = menu->addAction(QTStr("Deinterlacing." name), this, \
-				 SLOT(SetDeinterlacingOrder())); \
+				 &OBSBasic::SetDeinterlacingOrder); \
 	action->setProperty("order", (int)order); \
 	action->setCheckable(true); \
 	action->setChecked(deinterlaceOrder == order);
@@ -5661,11 +5756,11 @@
 	obs_scale_type scaleFilter = obs_sceneitem_get_scale_filter(item);
 	QAction *action;
 
-#define ADD_MODE(name, mode) \
-	action = \
-		menu->addAction(QTStr("" name), this, SLOT(SetScaleFilter())); \
-	action->setProperty("mode", (int)mode); \
-	action->setCheckable(true); \
+#define ADD_MODE(name, mode) \
+	action = menu->addAction(QTStr("" name), this, \
+				 &OBSBasic::SetScaleFilter); \
+	action->setProperty("mode", (int)mode); \
+	action->setCheckable(true); \
 	action->setChecked(scaleFilter == mode);
 
 	ADD_MODE("Disable", OBS_SCALE_DISABLE);
@@ -5695,11 +5790,11 @@
 		obs_sceneitem_get_blending_method(item);
 	QAction *action;
 
-#define ADD_MODE(name, method) \
-	action = menu->addAction(QTStr("" name), this, \
-				 SLOT(SetBlendingMethod())); \
-	action->setProperty("method", (int)method); \
-	action->setCheckable(true); \
+#define ADD_MODE(name, method) \
+	action = menu->addAction(QTStr("" name), this, \
+				 &OBSBasic::SetBlendingMethod); \
+	action->setProperty("method", (int)method); \
+	action->setCheckable(true); \
 	action->setChecked(blendingMethod == method);
 
 	ADD_MODE("BlendingMethod.Default", OBS_BLEND_METHOD_DEFAULT);
@@ -5724,11 +5819,11 @@
 	obs_blending_type blendingMode = obs_sceneitem_get_blending_mode(item);
 	QAction *action;
 
-#define ADD_MODE(name, mode) \
-	action = menu->addAction(QTStr("" name), this, \
-				 SLOT(SetBlendingMode())); \
-	action->setProperty("mode", (int)mode); \
-	action->setCheckable(true); \
+#define ADD_MODE(name, mode) \
+	action = menu->addAction(QTStr("" name), this, \
+				 &OBSBasic::SetBlendingMode); \
+	action->setProperty("mode", (int)mode); \
+	action->setCheckable(true); \
 	action->setChecked(blendingMode == mode);
 
 	ADD_MODE("BlendingMode.Normal", OBS_BLEND_NORMAL);
@@ -5766,13 +5861,13 @@
 	obs_data_set_default_int(privData, "color-preset", 0);
 	int preset = obs_data_get_int(privData, "color-preset");
 
-	action = menu->addAction(QTStr("Clear"), this, +SLOT(ColorChange()));
+	action = menu->addAction(QTStr("Clear"), this, &OBSBasic::ColorChange);
 	action->setCheckable(true);
 	action->setProperty("bgColor", 0);
 	action->setChecked(preset == 0);
 
 	action = menu->addAction(QTStr("CustomColor"), this,
-				 +SLOT(ColorChange()));
+				 &OBSBasic::ColorChange);
 	action->setCheckable(true);
 	action->setProperty("bgColor", 1);
 	action->setChecked(preset == 1);
@@ -5790,8 +5885,8 @@
 			colorButton->setStyleSheet("border: 2px solid black");
 
 		colorButton->setProperty("bgColor", i);
-		select->connect(colorButton, SIGNAL(released()), this,
-				SLOT(ColorChange()));
+		select->connect(colorButton, &QPushButton::released, this,
+				&OBSBasic::ColorChange);
 	}
 
 	menu->addAction(widgetAction);
@@ -5800,7 +5895,8 @@
 }
 
 ColorSelect::ColorSelect(QWidget *parent)
-	: QWidget(parent), ui(new Ui::ColorSelect)
+	: QWidget(parent),
+	 ui(new Ui::ColorSelect)
 {
 	ui->setupUi(this);
 }
@@ -5821,7 +5917,7 @@
 	if (preview) {
 		QAction *action = popup.addAction(
 			QTStr("Basic.Main.PreviewConextMenu.Enable"), this,
-			SLOT(TogglePreview()));
+			&OBSBasic::TogglePreview);
 		action->setCheckable(true);
 		action->setChecked(
 			obs_display_enabled(ui->preview->GetDisplay()));
@@ -5833,18 +5929,18 @@
 
 		previewProjectorSource = new QMenu(QTStr("PreviewProjector"));
 		AddProjectorMenuMonitors(previewProjectorSource, this,
-					 SLOT(OpenPreviewProjector()));
+					 &OBSBasic::OpenPreviewProjector);
 
 		popup.addMenu(previewProjectorSource);
 
 		QAction *previewWindow =
 			popup.addAction(QTStr("PreviewWindow"), this,
-					SLOT(OpenPreviewWindow()));
+					&OBSBasic::OpenPreviewWindow);
 
 		popup.addAction(previewWindow);
 
 		popup.addAction(QTStr("Screenshot.Preview"), this,
-				SLOT(ScreenshotScene()));
+				&OBSBasic::ScreenshotScene);
 
 		popup.addSeparator();
 	}
@@ -5856,12 +5952,12 @@
 	if (ui->sources->MultipleBaseSelected()) {
 		popup.addSeparator();
 		popup.addAction(QTStr("Basic.Main.GroupItems"), ui->sources,
-				SLOT(GroupSelectedItems()));
+				&SourceTree::GroupSelectedItems);
 
 	} else if (ui->sources->GroupsSelected()) {
 		popup.addSeparator();
 		popup.addAction(QTStr("Basic.Main.Ungroup"), ui->sources,
-				SLOT(UngroupSelectedGroups()));
+				&SourceTree::UngroupSelectedGroups);
 	}
 
 	popup.addSeparator();
@@ -5906,7 +6002,7 @@
 		if (hasAudio) {
 			QAction *actionHideMixer =
 				popup.addAction(QTStr("HideMixer"), this,
-						SLOT(ToggleHideMixer()));
+						&OBSBasic::ToggleHideMixer);
 			actionHideMixer->setCheckable(true);
 			actionHideMixer->setChecked(SourceMixerHidden(source));
 			popup.addSeparator();
@@ -5915,14 +6011,14 @@
 		if (hasVideo) {
 			QAction *resizeOutput = popup.addAction(
 				QTStr("ResizeOutputSizeOfSource"), this,
-				SLOT(ResizeOutputSizeOfSource()));
+				&OBSBasic::ResizeOutputSizeOfSource);
 
 			int width = obs_source_get_width(source);
 			int height = obs_source_get_height(source);
 
 			resizeOutput->setEnabled(!obs_video_active());
 
-			if (width < 8 || height < 8)
+			if (width < 32 || height < 32)
 				resizeOutput->setEnabled(false);
 
 			scaleFilteringMenu = new QMenu(QTStr("ScaleFiltering"));
@@ -5948,26 +6044,28 @@
 			popup.addSeparator();
 
 			sourceProjector = new QMenu(QTStr("SourceProjector"));
-			AddProjectorMenuMonitors(sourceProjector, this,
-						 SLOT(OpenSourceProjector()));
+			AddProjectorMenuMonitors(
+				sourceProjector, this,
+				&OBSBasic::OpenSourceProjector);
 			popup.addMenu(sourceProjector);
 			popup.addAction(QTStr("SourceWindow"), this,
-					SLOT(OpenSourceWindow()));
+					&OBSBasic::OpenSourceWindow);
 
 			popup.addAction(QTStr("Screenshot.Source"), this,
-					SLOT(ScreenshotSelectedSource()));
+					&OBSBasic::ScreenshotSelectedSource);
 		}
 
 		popup.addSeparator();
 
 		if (flags & OBS_SOURCE_INTERACTION)
 			popup.addAction(QTStr("Interact"), this,
-					SLOT(on_actionInteract_triggered()));
+					&OBSBasic::on_actionInteract_triggered);
 
-		popup.addAction(QTStr("Filters"), this, SLOT(OpenFilters()));
+		popup.addAction(QTStr("Filters"), this,
+				&() { OpenFilters(); });
 		QAction *action = popup.addAction(
 			QTStr("Properties"), this,
-			SLOT(on_actionSourceProperties_triggered()));
+			&OBSBasic::on_actionSourceProperties_triggered);
 		action->setEnabled(obs_source_configurable(source));
 	}
 
@@ -6051,9 +6149,8 @@
 						const char *name) {
 		QString qname = QT_UTF8(name);
 		QAction *popupItem = new QAction(qname, this);
-		popupItem->setData(QT_UTF8(type));
-		connect(popupItem, SIGNAL(triggered(bool)), this,
-			SLOT(AddSourceFromAction()));
+		connect(popupItem, &QAction::triggered,
+			this, type() { AddSource(type); });
 
 		QIcon icon;
 
@@ -6088,10 +6185,9 @@
 
 	popup->addSeparator();
 	QAction *addGroup = new QAction(QTStr("Group"), this);
-	addGroup->setData(QT_UTF8("group"));
 	addGroup->setIcon(GetGroupIcon());
-	connect(addGroup, SIGNAL(triggered(bool)), this,
-		SLOT(AddSourceFromAction()));
+	connect(addGroup, &QAction::triggered,
+		this() { AddSource("group"); });
 	popup->addAction(addGroup);
 
 	if (!foundDeprecated) {
@@ -6111,15 +6207,6 @@
 	return popup;
 }
 
-void OBSBasic::AddSourceFromAction()
-{
-	QAction *action = qobject_cast<QAction *>(sender());
-	if (!action)
-		return;
-
-	AddSource(QT_TO_UTF8(action->data().toString()));
-}
-
 void OBSBasic::AddSourcePopupMenu(const QPoint &pos)
 {
 	if (!GetCurrentScene()) {
@@ -6509,6 +6596,20 @@
 #endif
 }
 
+void OBSBasic::on_actionRestartSafe_triggered()
+{
+	QMessageBox::StandardButton button = OBSMessageBox::question(
+		this, QTStr("Restart"),
+		safe_mode ? QTStr("SafeMode.RestartNormal")
+			 : QTStr("SafeMode.Restart"));
+
+	if (button == QMessageBox::Yes) {
+		restart = safe_mode;
+		restart_safe = !safe_mode;
+		close();
+	}
+}
+
 void OBSBasic::logUploadFinished(const QString &text, const QString &error)
 {
 	ui->menuLogFiles->setEnabled(true);
@@ -6579,21 +6680,20 @@
 		auto undo = prev = std::string(prevName)(
 				 const std::string &data) {
 			OBSSourceAutoRelease source =
-				obs_get_source_by_name(data.c_str());
+				obs_get_source_by_uuid(data.c_str());
 			obs_source_set_name(source, prev.c_str());
 		};
 
 		auto redo = name(const std::string &data) {
 			OBSSourceAutoRelease source =
-				obs_get_source_by_name(data.c_str());
+				obs_get_source_by_uuid(data.c_str());
 			obs_source_set_name(source, name.c_str());
 		};
 
-		std::string undo_data(name);
-		std::string redo_data(prevName);
+		std::string source_uuid(obs_source_get_uuid(source));
 		parent->undo_s.add_action(
 			QTStr("Undo.Rename").arg(name.c_str()), undo, redo,
-			undo_data, redo_data);
+			source_uuid, source_uuid);
 
 		listItem->setText(QT_UTF8(name.c_str()));
 		obs_source_set_name(source, name.c_str());
@@ -6696,10 +6796,11 @@
 	QMessageBox::critical(this, QTStr("Output.StartStreamFailed"), message);
 }
 
-#if YOUTUBE_ENABLED
-void OBSBasic::YouTubeActionDialogOk(const QString &id, const QString &key,
-				 bool autostart, bool autostop,
-				 bool start_now)
+#ifdef YOUTUBE_ENABLED
+void OBSBasic::YouTubeActionDialogOk(const QString &broadcast_id,
+				 const QString &stream_id,
+				 const QString &key, bool autostart,
+				 bool autostop, bool start_now)
 {
 	//blog(LOG_DEBUG, "Stream key: %s", QT_TO_UTF8(key));
 	obs_service_t *service_obj = GetService();
@@ -6708,8 +6809,11 @@
 	const std::string a_key = QT_TO_UTF8(key);
 	obs_data_set_string(settings, "key", a_key.c_str());
 
-	const std::string an_id = QT_TO_UTF8(id);
-	obs_data_set_string(settings, "stream_id", an_id.c_str());
+	const std::string b_id = QT_TO_UTF8(broadcast_id);
+	obs_data_set_string(settings, "broadcast_id", b_id.c_str());
+
+	const std::string s_id = QT_TO_UTF8(stream_id);
+	obs_data_set_string(settings, "stream_id", s_id.c_str());
 
 	obs_service_update(service_obj, settings);
 	autoStartBroadcast = autostart;
@@ -6725,7 +6829,7 @@
 	YoutubeApiWrappers *apiYouTube(
 		dynamic_cast<YoutubeApiWrappers *>(GetAuth()));
 	if (!apiYouTube) {
-		/* technically we should never get here -Jim */
+		/* technically we should never get here -Lain */
 		QMetaObject::invokeMethod(this, "ForceStopStreaming",
 					 Qt::QueuedConnection);
 		youtubeStreamCheckThread->deleteLater();
@@ -6892,7 +6996,7 @@
 	if (replayBufferWhileStreaming)
 		StartReplayBuffer();
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	if (!autoStartBroadcast)
 		OBSBasic::ShowYouTubeAutoStartWarning();
 #endif
@@ -6909,7 +7013,7 @@
 	}
 
 	if (!autoStartBroadcast) {
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		std::shared_ptr<YoutubeApiWrappers> ytAuth =
 			dynamic_pointer_cast<YoutubeApiWrappers>(auth);
 		if (ytAuth.get()) {
@@ -6949,7 +7053,7 @@
 		ui->broadcastButton->style()->unpolish(ui->broadcastButton);
 		ui->broadcastButton->style()->polish(ui->broadcastButton);
 	} else if (!autoStopBroadcast) {
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
 					 "WarnBeforeStoppingStream");
 		if (confirm && isVisible()) {
@@ -7008,7 +7112,7 @@
 
 void OBSBasic::SetupBroadcast()
 {
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	Auth *const auth = GetAuth();
 	if (IsYouTubeService(auth->service())) {
 		OBSYoutubeActions dialog(this, auth, broadcastReady);
@@ -7222,9 +7326,9 @@
 
 	startStreamMenu = new QMenu();
 	startStreamMenu->addAction(QTStr("Basic.Main.StopStreaming"), this,
-				 SLOT(StopStreaming()));
+				 &OBSBasic::StopStreaming);
 	startStreamMenu->addAction(QTStr("Basic.Main.ForceStopStreaming"), this,
-				 SLOT(ForceStopStreaming()));
+				 &OBSBasic::ForceStopStreaming);
 	ui->streamButton->setMenu(startStreamMenu);
 
 	ui->statusbar->StreamDelayStarting(sec);
@@ -7248,9 +7352,9 @@
 
 	startStreamMenu = new QMenu();
 	startStreamMenu->addAction(QTStr("Basic.Main.StartStreaming"), this,
-				 SLOT(StartStreaming()));
+				 &OBSBasic::StartStreaming);
 	startStreamMenu->addAction(QTStr("Basic.Main.ForceStopStreaming"), this,
-				 SLOT(ForceStopStreaming()));
+				 &OBSBasic::ForceStopStreaming);
 	ui->streamButton->setMenu(startStreamMenu);
 
 	ui->statusbar->StreamDelayStopping(sec);
@@ -7271,7 +7375,7 @@
 		sysTrayStream->setEnabled(true);
 	}
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	if (!autoStartBroadcast) {
 		// get a current stream key
 		obs_service_t *service_obj = GetService();
@@ -7293,6 +7397,11 @@
 
 	OnActivate();
 
+#ifdef YOUTUBE_ENABLED
+	if (YouTubeAppDock::IsYTServiceSelected())
+		youtubeAppDock->IngestionStarted();
+#endif
+
 	blog(LOG_INFO, STREAMING_START);
 }
 
@@ -7373,6 +7482,11 @@
 
 	OnDeactivate();
 
+#ifdef YOUTUBE_ENABLED
+	if (YouTubeAppDock::IsYTServiceSelected())
+		youtubeAppDock->IngestionStopped();
+#endif
+
 	blog(LOG_INFO, STREAMING_STOP);
 
 	if (encode_error) {
@@ -7458,17 +7572,23 @@
 	const char *format = config_get_string(
 		config, isSimpleMode ? "SimpleOutput" : "AdvOut", "RecFormat2");
 
-	/* AV1+PCM cannot be remuxed into any supported format (until FFmpeg 6.1) */
-	if (strcmp(vCodecName, "av1") == 0 &&
-	 strncmp(aCodecName, "pcm", 3) == 0)
+	bool audio_is_pcm = strncmp(aCodecName, "pcm", 3) == 0;
+
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(60, 5, 100)
+	/* FFmpeg <= 6.0 cannot remux AV1+PCM into any supported format. */
+	if (audio_is_pcm && strcmp(vCodecName, "av1") == 0)
 		return;
+#endif
 
 	/* Retain original container for fMP4/fMOV */
 	if (strncmp(format, "fragmented", 10) == 0) {
 		output += "remuxed." + suffix;
-	} else if (strcmp(vCodecName, "prores") == 0 ||
-		 strncmp(aCodecName, "pcm", 3) == 0) {
+	} else if (strcmp(vCodecName, "prores") == 0) {
 		output += "mov";
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(60, 5, 100)
+	} else if (audio_is_pcm) {
+		output += "mov";
+#endif
 	} else {
 		output += "mp4";
 	}
@@ -7589,8 +7709,8 @@
 		errorDescription = Str("Output.RecordError.Msg");
 
 		if (use_last_error && !last_error.isEmpty())
-			dstr_printf(errorMessage, "%s\n\n%s", errorDescription,
-				 QT_TO_UTF8(last_error));
+			dstr_printf(errorMessage, "%s %s",
+				 errorDescription, QT_TO_UTF8(last_error));
 		else
 			dstr_copy(errorMessage, errorDescription);
 
@@ -7907,6 +8027,13 @@
 	blog(LOG_INFO, VIRTUAL_CAM_STOP);
 
 	OnDeactivate();
+
+	if (!restartingVCam)
+		return;
+
+	/* Restarting needs to be delayed to make sure that the virtual camera
+	 * implementation is stopped and avoid race condition. */
+	QTimer::singleShot(100, this, &OBSBasic::RestartingVirtualCam);
 }
 
 void OBSBasic::on_streamButton_clicked()
@@ -7915,7 +8042,7 @@
 		bool confirm = config_get_bool(GetGlobalConfig(), "BasicWindow",
 					 "WarnBeforeStoppingStream");
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		if (isVisible() && auth && IsYouTubeService(auth->service()) &&
 		 autoStopBroadcast) {
 			QMessageBox::StandardButton button = OBSMessageBox::question(
@@ -8061,19 +8188,66 @@
 
 void OBSBasic::VCamConfigButtonClicked()
 {
-	OBSBasicVCamConfig dialog(vcamConfig, this);
+	OBSBasicVCamConfig dialog(vcamConfig, outputHandler->VirtualCamActive(),
+				 this);
 
 	connect(&dialog, &OBSBasicVCamConfig::Accepted, this,
 		&OBSBasic::UpdateVirtualCamConfig);
+	connect(&dialog, &OBSBasicVCamConfig::AcceptedAndRestart, this,
+		&OBSBasic::RestartVirtualCam);
 
 	dialog.exec();
 }
 
+void log_vcam_changed(const VCamConfig &config, bool starting)
+{
+	const char *action = starting ? "Starting" : "Changing";
+
+	switch (config.type) {
+	case VCamOutputType::Invalid:
+		break;
+	case VCamOutputType::ProgramView:
+		blog(LOG_INFO, "%s Virtual Camera output to Program", action);
+		break;
+	case VCamOutputType::PreviewOutput:
+		blog(LOG_INFO, "%s Virtual Camera output to Preview", action);
+		break;
+	case VCamOutputType::SceneOutput:
+		blog(LOG_INFO, "%s Virtual Camera output to Scene : %s", action,
+		 config.scene.c_str());
+		break;
+	case VCamOutputType::SourceOutput:
+		blog(LOG_INFO, "%s Virtual Camera output to Source : %s",
+		 action, config.source.c_str());
+		break;
+	}
+}
+
 void OBSBasic::UpdateVirtualCamConfig(const VCamConfig &config)
 {
 	vcamConfig = config;
 
 	outputHandler->UpdateVirtualCamOutputSource();
+	log_vcam_changed(config, false);
+}
+
+void OBSBasic::RestartVirtualCam(const VCamConfig &config)
+{
+	restartingVCam = true;
+
+	StopVirtualCam();
+
+	vcamConfig = config;
+}
+
+void OBSBasic::RestartingVirtualCam()
+{
+	if (!restartingVCam)
+		return;
+
+	outputHandler->UpdateVirtualCamOutputSource();
+	StartVirtualCam();
+	restartingVCam = false;
 }
 
 void OBSBasic::on_settingsButton_clicked()
@@ -8118,6 +8292,14 @@
 #endif
 }
 
+void OBSBasic::on_actionReleaseNotes_triggered()
+{
+	QString addr("https://github.com/obsproject/obs-studio/releases");
+	QUrl url(QString("%1/%2").arg(addr, obs_get_version_string()),
+		 QUrl::TolerantMode);
+	QDesktopServices::openUrl(url);
+}
+
 void OBSBasic::on_actionShowSettingsFolder_triggered()
 {
 	char path512;
@@ -8162,18 +8344,18 @@
 
 	studioProgramProjector = new QMenu(QTStr("StudioProgramProjector"));
 	AddProjectorMenuMonitors(studioProgramProjector, this,
-				 SLOT(OpenStudioProgramProjector()));
+				 &OBSBasic::OpenStudioProgramProjector);
 
 	popup.addMenu(studioProgramProjector);
 
 	QAction *studioProgramWindow =
 		popup.addAction(QTStr("StudioProgramWindow"), this,
-				SLOT(OpenStudioProgramWindow()));
+				&OBSBasic::OpenStudioProgramWindow);
 
 	popup.addAction(studioProgramWindow);
 
 	popup.addAction(QTStr("Screenshot.StudioProgram"), this,
-			SLOT(ScreenshotProgram()));
+			&OBSBasic::ScreenshotProgram);
 
 	popup.exec(QCursor::pos());
 }
@@ -8185,16 +8367,16 @@
 
 	QAction *action =
 		popup.addAction(QTStr("Basic.Main.PreviewConextMenu.Enable"),
-				this, SLOT(TogglePreview()));
+				this, &OBSBasic::TogglePreview);
 	action->setCheckable(true);
 	action->setChecked(obs_display_enabled(ui->preview->GetDisplay()));
 
 	previewProjectorMain = new QMenu(QTStr("PreviewProjector"));
 	AddProjectorMenuMonitors(previewProjectorMain, this,
-				 SLOT(OpenPreviewProjector()));
+				 &OBSBasic::OpenPreviewProjector);
 
 	QAction *previewWindow = popup.addAction(QTStr("PreviewWindow"), this,
-						 SLOT(OpenPreviewWindow()));
+						 &OBSBasic::OpenPreviewWindow);
 
 	popup.addMenu(previewProjectorMain);
 	popup.addAction(previewWindow);
@@ -8288,8 +8470,10 @@
 		GetFPSInteger(num, den);
 	else if (type == 2) //"Fraction"
 		GetFPSFraction(num, den);
-	else if (false) //"Nanoseconds", currently not implemented
-		GetFPSNanoseconds(num, den);
+	/*
+	 * 	else if (false) //"Nanoseconds", currently not implemented
+	 *		GetFPSNanoseconds(num, den);
+	 */
 	else
 		GetFPSCommon(num, den);
 }
@@ -8299,13 +8483,56 @@
 	return basicConfig;
 }
 
+#ifdef YOUTUBE_ENABLED
+YouTubeAppDock *OBSBasic::GetYouTubeAppDock()
+{
+	return youtubeAppDock;
+}
+
+#ifndef SEC_TO_NSEC
+#define SEC_TO_NSEC 1000000000
+#endif
+
+void OBSBasic::NewYouTubeAppDock()
+{
+	if (!cef_js_avail)
+		return;
+
+	/* make sure that the youtube app dock can't be immediately recreated.
+	 * dumb hack. blame chromium. or this particular dock. or both. if CEF
+	 * creates/destroys/creates a widget too quickly it can lead to a
+	 * crash. */
+	uint64_t ts = os_gettime_ns();
+	if ((ts - lastYouTubeAppDockCreationTime) < (5ULL * SEC_TO_NSEC))
+		return;
+
+	lastYouTubeAppDockCreationTime = ts;
+
+	if (youtubeAppDock)
+		RemoveDockWidget(youtubeAppDock->objectName());
+
+	youtubeAppDock = new YouTubeAppDock("YouTube Live Control Panel");
+}
+
+void OBSBasic::DeleteYouTubeAppDock()
+{
+	if (!cef_js_avail)
+		return;
+
+	if (youtubeAppDock)
+		RemoveDockWidget(youtubeAppDock->objectName());
+
+	youtubeAppDock = nullptr;
+}
+#endif
+
 void OBSBasic::UpdateEditMenu()
 {
 	QModelIndexList items = GetAllSelectedSourceItems();
-	int count = items.count();
+	int totalCount = items.count();
 	size_t filter_count = 0;
 
-	if (count == 1) {
+	if (totalCount == 1) {
 		OBSSceneItem sceneItem =
 			ui->sources->Get(GetTopSelectedSourceItem());
 		OBSSource source = obs_sceneitem_get_source(sceneItem);
@@ -8328,39 +8555,48 @@
 			allowPastingDuplicate = false;
 	}
 
-	ui->actionCopySource->setEnabled(count > 0);
-	ui->actionEditTransform->setEnabled(count == 1);
-	ui->actionCopyTransform->setEnabled(count == 1);
-	ui->actionPasteTransform->setEnabled(hasCopiedTransform && count > 0);
+	int videoCount = 0;
+	bool canTransformMultiple = false;
+	for (int i = 0; i < totalCount; i++) {
+		OBSSceneItem item = ui->sources->Get(items.value(i).row());
+		OBSSource source = obs_sceneitem_get_source(item);
+		const uint32_t flags = obs_source_get_output_flags(source);
+		const bool hasVideo = (flags & OBS_SOURCE_VIDEO) != 0;
+		if (hasVideo && !obs_sceneitem_locked(item))
+			canTransformMultiple = true;
+
+		if (hasVideo)
+			videoCount++;
+	}
+	const bool canTransformSingle = videoCount == 1 && totalCount == 1;
+
+	ui->actionCopySource->setEnabled(totalCount > 0);
+	ui->actionEditTransform->setEnabled(canTransformSingle);
+	ui->actionCopyTransform->setEnabled(canTransformSingle);
+	ui->actionPasteTransform->setEnabled(hasCopiedTransform &&
+					 videoCount > 0);
 	ui->actionCopyFilters->setEnabled(filter_count > 0);
 	ui->actionPasteFilters->setEnabled(
-		!obs_weak_source_expired(copyFiltersSource) && count > 0);
+		!obs_weak_source_expired(copyFiltersSource) && totalCount > 0);
 	ui->actionPasteRef->setEnabled(!!clipboard.size());
 	ui->actionPasteDup->setEnabled(allowPastingDuplicate);
 
-	ui->actionMoveUp->setEnabled(count > 0);
-	ui->actionMoveDown->setEnabled(count > 0);
-	ui->actionMoveToTop->setEnabled(count > 0);
-	ui->actionMoveToBottom->setEnabled(count > 0);
-
-	bool canTransform = false;
-	for (int i = 0; i < count; i++) {
-		OBSSceneItem item = ui->sources->Get(items.value(i).row());
-		if (!obs_sceneitem_locked(item))
-			canTransform = true;
-	}
-
-	ui->actionResetTransform->setEnabled(canTransform);
-	ui->actionRotate90CW->setEnabled(canTransform);
-	ui->actionRotate90CCW->setEnabled(canTransform);
-	ui->actionRotate180->setEnabled(canTransform);
-	ui->actionFlipHorizontal->setEnabled(canTransform);
-	ui->actionFlipVertical->setEnabled(canTransform);
-	ui->actionFitToScreen->setEnabled(canTransform);
-	ui->actionStretchToScreen->setEnabled(canTransform);
-	ui->actionCenterToScreen->setEnabled(canTransform);
-	ui->actionVerticalCenter->setEnabled(canTransform);
-	ui->actionHorizontalCenter->setEnabled(canTransform);
+	ui->actionMoveUp->setEnabled(totalCount > 0);
+	ui->actionMoveDown->setEnabled(totalCount > 0);
+	ui->actionMoveToTop->setEnabled(totalCount > 0);
+	ui->actionMoveToBottom->setEnabled(totalCount > 0);
+
+	ui->actionResetTransform->setEnabled(canTransformMultiple);
+	ui->actionRotate90CW->setEnabled(canTransformMultiple);
+	ui->actionRotate90CCW->setEnabled(canTransformMultiple);
+	ui->actionRotate180->setEnabled(canTransformMultiple);
+	ui->actionFlipHorizontal->setEnabled(canTransformMultiple);
+	ui->actionFlipVertical->setEnabled(canTransformMultiple);
+	ui->actionFitToScreen->setEnabled(canTransformMultiple);
+	ui->actionStretchToScreen->setEnabled(canTransformMultiple);
+	ui->actionCenterToScreen->setEnabled(canTransformMultiple);
+	ui->actionVerticalCenter->setEnabled(canTransformMultiple);
+	ui->actionHorizontalCenter->setEnabled(canTransformMultiple);
 }
 
 void OBSBasic::on_actionEditTransform_triggered()
@@ -8397,7 +8633,7 @@
 {
 	OBSDataAutoRelease dat = obs_data_create_from_json(data.c_str());
 	OBSSourceAutoRelease source =
-		obs_get_source_by_name(obs_data_get_string(dat, "scene_name"));
+		obs_get_source_by_uuid(obs_data_get_string(dat, "scene_uuid"));
 	reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 		->SetCurrentScene(source.Get(), true);
 
@@ -8906,6 +9142,16 @@
 	EnablePreviewDisplay(false);
 }
 
+void OBSBasic::EnablePreviewProgram()
+{
+	SetPreviewProgramMode(true);
+}
+
+void OBSBasic::DisablePreviewProgram()
+{
+	SetPreviewProgramMode(false);
+}
+
 static bool nudge_callback(obs_scene_t *, obs_sceneitem_t *item, void *param)
 {
 	if (obs_sceneitem_locked(item))
@@ -9185,6 +9431,8 @@
 		name << "Studio ";
 
 	name << App()->GetVersionString(false);
+	if (safe_mode)
+		name << " (" << Str("TitleBar.SafeMode") << ")";
 	if (App()->IsPortableMode())
 		name << " - " << Str("TitleBar.PortableMode");
 
@@ -9224,16 +9472,20 @@
 	for (int i = oldExtraDocks.size() - 1; i >= 0; i--) {
 		if (!oldExtraDocksi) {
 			oldExtraDocks.removeAt(i);
+			oldExtraDockNames.removeAt(i);
 		}
 	}
 
 #ifdef BROWSER_AVAILABLE
 	if ((oldExtraDocks.size() || extraDocks.size() ||
-	 extraBrowserDocks.size()) &&
-	 !force) {
+	 extraCustomDocks.size() || extraBrowserDocks.size()) &&
+	 !force)
 #else
-	if ((oldExtraDocks.size() || extraDocks.size()) && !force) {
+	if ((oldExtraDocks.size() || extraDocks.size() ||
+	 extraCustomDocks.size()) &&
+	 !force)
 #endif
+	{
 		QMessageBox::StandardButton button = QMessageBox::question(
 			this, QTStr("ResetUIWarning.Title"),
 			QTStr("ResetUIWarning.Text"));
@@ -9265,6 +9517,7 @@
 	}
 
 	RESET_DOCKLIST(extraDocks)
+	RESET_DOCKLIST(extraCustomDocks)
 #ifdef BROWSER_AVAILABLE
 	RESET_DOCKLIST(extraBrowserDocks)
 #endif
@@ -9324,6 +9577,9 @@
 	for (int i = extraDocks.size() - 1; i >= 0; i--)
 		extraDocksi->setFeatures(features);
 
+	for (int i = extraCustomDocks.size() - 1; i >= 0; i--)
+		extraCustomDocksi->setFeatures(features);
+
 #ifdef BROWSER_AVAILABLE
 	for (int i = extraBrowserDocks.size() - 1; i >= 0; i--)
 		extraBrowserDocksi->setFeatures(features);
@@ -9332,12 +9588,28 @@
 	for (int i = oldExtraDocks.size() - 1; i >= 0; i--) {
 		if (!oldExtraDocksi) {
 			oldExtraDocks.removeAt(i);
+			oldExtraDockNames.removeAt(i);
 		} else {
 			oldExtraDocksi->setFeatures(features);
 		}
 	}
 }
 
+void OBSBasic::on_sideDocks_toggled(bool side)
+{
+	if (side) {
+		setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
+		setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
+		setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
+		setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
+	} else {
+		setCorner(Qt::TopLeftCorner, Qt::TopDockWidgetArea);
+		setCorner(Qt::TopRightCorner, Qt::TopDockWidgetArea);
+		setCorner(Qt::BottomLeftCorner, Qt::BottomDockWidgetArea);
+		setCorner(Qt::BottomRightCorner, Qt::BottomDockWidgetArea);
+	}
+}
+
 void OBSBasic::on_resetUI_triggered()
 {
 	on_resetDocks_triggered();
@@ -9346,6 +9618,8 @@
 	ui->toggleContextBar->setChecked(true);
 	ui->toggleSourceIcons->setChecked(true);
 	ui->toggleStatusBar->setChecked(true);
+	ui->scenes->SetGridMode(false);
+	ui->actionSceneListMode->setChecked(true);
 }
 
 void OBSBasic::on_multiviewProjectorWindowed_triggered()
@@ -9357,6 +9631,7 @@
 {
 	ui->sourcesToolbar->setVisible(visible);
 	ui->scenesToolbar->setVisible(visible);
+	ui->mixerToolbar->setVisible(visible);
 
 	config_set_bool(App()->GlobalConfig(), "BasicWindow",
 			"ShowListboxToolbars", visible);
@@ -9475,7 +9750,7 @@
 
 		if (showHide)
 			showHide->setText(QTStr("Basic.SystemTray.Show"));
-		QTimer::singleShot(0, this, SLOT(hide()));
+		QTimer::singleShot(0, this, &OBSBasic::hide);
 
 		if (previewEnabled)
 			EnablePreviewDisplay(false);
@@ -9487,7 +9762,7 @@
 	} else if (showing && !isVisible()) {
 		if (showHide)
 			showHide->setText(QTStr("Basic.SystemTray.Hide"));
-		QTimer::singleShot(0, this, SLOT(show()));
+		QTimer::singleShot(0, this, &OBSBasic::show);
 
 		if (previewEnabled)
 			EnablePreviewDisplay(true);
@@ -9567,9 +9842,9 @@
 	previewProjector = new QMenu(QTStr("PreviewProjector"));
 	studioProgramProjector = new QMenu(QTStr("StudioProgramProjector"));
 	AddProjectorMenuMonitors(previewProjector, this,
-				 SLOT(OpenPreviewProjector()));
+				 &OBSBasic::OpenPreviewProjector);
 	AddProjectorMenuMonitors(studioProgramProjector, this,
-				 SLOT(OpenStudioProgramProjector()));
+				 &OBSBasic::OpenStudioProgramProjector);
 	trayMenu->addAction(showHide);
 	trayMenu->addSeparator();
 	trayMenu->addMenu(previewProjector);
@@ -9592,19 +9867,18 @@
 	if (Active())
 		OnActivate(true);
 
-	connect(trayIcon.data(),
-		SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this,
-		SLOT(IconActivated(QSystemTrayIcon::ActivationReason)));
-	connect(showHide, SIGNAL(triggered()), this, SLOT(ToggleShowHide()));
-	connect(sysTrayStream, SIGNAL(triggered()), this,
-		SLOT(on_streamButton_clicked()));
-	connect(sysTrayRecord, SIGNAL(triggered()), this,
-		SLOT(on_recordButton_clicked()));
+	connect(trayIcon.data(), &QSystemTrayIcon::activated, this,
+		&OBSBasic::IconActivated);
+	connect(showHide, &QAction::triggered, this, &OBSBasic::ToggleShowHide);
+	connect(sysTrayStream, &QAction::triggered, this,
+		&OBSBasic::on_streamButton_clicked);
+	connect(sysTrayRecord, &QAction::triggered, this,
+		&OBSBasic::on_recordButton_clicked);
 	connect(sysTrayReplayBuffer.data(), &QAction::triggered, this,
 		&OBSBasic::ReplayBufferClicked);
 	connect(sysTrayVirtualCam.data(), &QAction::triggered, this,
 		&OBSBasic::VCamButtonClicked);
-	connect(exit, SIGNAL(triggered()), this, SLOT(close()));
+	connect(exit, &QAction::triggered, this, &OBSBasic::close);
 }
 
 void OBSBasic::IconActivated(QSystemTrayIcon::ActivationReason reason)
@@ -9613,9 +9887,9 @@
 	previewProjector->clear();
 	studioProgramProjector->clear();
 	AddProjectorMenuMonitors(previewProjector, this,
-				 SLOT(OpenPreviewProjector()));
+				 &OBSBasic::OpenPreviewProjector);
 	AddProjectorMenuMonitors(studioProgramProjector, this,
-				 SLOT(OpenStudioProgramProjector()));
+				 &OBSBasic::OpenStudioProgramProjector);
 
 #ifdef __APPLE__
 	UNUSED_PARAMETER(reason);
@@ -9778,6 +10052,7 @@
 	obs_source_t *source = vol->GetSource();
 
 	copyFiltersSource = obs_source_get_weak_source(source);
+	ui->actionPasteFilters->setEnabled(true);
 }
 
 void OBSBasic::AudioMixerPasteFilters()
@@ -9798,6 +10073,7 @@
 void OBSBasic::SceneCopyFilters()
 {
 	copyFiltersSource = obs_source_get_weak_source(GetCurrentSceneSource());
+	ui->actionPasteFilters->setEnabled(true);
 }
 
 void OBSBasic::ScenePasteFilters()
@@ -9837,8 +10113,8 @@
 			obs_data_create_from_json(json.c_str());
 		OBSDataArrayAutoRelease array =
 			obs_data_get_array(data, "array");
-		const char *name = obs_data_get_string(data, "name");
-		OBSSourceAutoRelease source = obs_get_source_by_name(name);
+		OBSSourceAutoRelease source = obs_get_source_by_uuid(
+			obs_data_get_string(data, "uuid"));
 
 		obs_source_restore_filters(source, array);
 
@@ -9846,14 +10122,14 @@
 			filters->UpdateSource(source);
 	};
 
-	const char *name = obs_source_get_name(source);
+	const char *uuid = obs_source_get_uuid(source);
 
 	OBSDataAutoRelease undo_data = obs_data_create();
 	OBSDataAutoRelease redo_data = obs_data_create();
 	obs_data_set_array(undo_data, "array", undo_array);
 	obs_data_set_array(redo_data, "array", redo_array);
-	obs_data_set_string(undo_data, "name", name);
-	obs_data_set_string(redo_data, "name", name);
+	obs_data_set_string(undo_data, "uuid", uuid);
+	obs_data_set_string(redo_data, "uuid", uuid);
 
 	undo_s.add_action(text, undo_redo, undo_redo,
 			 obs_data_get_json(undo_data),
@@ -10124,6 +10400,10 @@
 
 QAction *OBSBasic::AddDockWidget(QDockWidget *dock)
 {
+	// Prevent the object name from being changed
+	connect(dock, &QObject::objectNameChanged, this,
+		&OBSBasic::RepairOldExtraDockName);
+
 #ifdef BROWSER_AVAILABLE
 	QAction *action = new QAction(dock->windowTitle(), ui->menuDocks);
 
@@ -10138,6 +10418,7 @@
 	action->setCheckable(true);
 	assignDockToggle(dock, action);
 	oldExtraDocks.push_back(dock);
+	oldExtraDockNames.push_back(dock->objectName());
 
 	bool lock = ui->lockDocks->isChecked();
 	QDockWidget::DockWidgetFeatures features =
@@ -10152,12 +10433,30 @@
 	for (int i = oldExtraDocks.size() - 1; i >= 0; i--) {
 		if (!oldExtraDocksi) {
 			oldExtraDocks.removeAt(i);
+			oldExtraDockNames.removeAt(i);
 		}
 	}
 
 	return action;
 }
 
+void OBSBasic::RepairOldExtraDockName()
+{
+	QDockWidget *dock = reinterpret_cast<QDockWidget *>(sender());
+	int idx = oldExtraDocks.indexOf(dock);
+	QSignalBlocker block(dock);
+
+	if (idx == -1) {
+		blog(LOG_WARNING, "A dock got its object name changed");
+		return;
+	}
+
+	blog(LOG_WARNING, "The dock '%s' got its object name restored",
+	 QT_TO_UTF8(oldExtraDockNamesidx));
+
+	dock->setObjectName(oldExtraDockNamesidx);
+}
+
 void OBSBasic::AddDockWidget(QDockWidget *dock, Qt::DockWidgetArea area,
 			 bool extraBrowser)
 {
@@ -10194,18 +10493,75 @@
 #endif
 
 	extraDockNames.push_back(dock->objectName());
-	extraDocks.push_back(QSharedPointer<QDockWidget>(dock));
+	extraDocks.push_back(std::shared_ptr<QDockWidget>(dock));
 }
 
 void OBSBasic::RemoveDockWidget(const QString &name)
 {
-	if (!extraDockNames.contains(name))
+	if (extraDockNames.contains(name)) {
+		int idx = extraDockNames.indexOf(name);
+		extraDockNames.removeAt(idx);
+		extraDocksidx.reset();
+		extraDocks.removeAt(idx);
+	} else if (extraCustomDockNames.contains(name)) {
+		int idx = extraCustomDockNames.indexOf(name);
+		extraCustomDockNames.removeAt(idx);
+		removeDockWidget(extraCustomDocksidx);
+		extraCustomDocks.removeAt(idx);
+	}
+}
+
+bool OBSBasic::IsDockObjectNameUsed(const QString &name)
+{
+	QStringList list;
+	list << "scenesDock"
+	 << "sourcesDock"
+	 << "mixerDock"
+	 << "transitionsDock"
+	 << "controlsDock"
+	 << "statsDock";
+	list << oldExtraDockNames;
+	list << extraDockNames;
+	list << extraCustomDockNames;
+
+	return list.contains(name);
+}
+
+void OBSBasic::AddCustomDockWidget(QDockWidget *dock)
+{
+	// Prevent the object name from being changed
+	connect(dock, &QObject::objectNameChanged, this,
+		&OBSBasic::RepairCustomExtraDockName);
+
+	bool lock = ui->lockDocks->isChecked();
+	QDockWidget::DockWidgetFeatures features =
+		lock ? QDockWidget::NoDockWidgetFeatures
+		 : (QDockWidget::DockWidgetClosable |
+			QDockWidget::DockWidgetMovable |
+			QDockWidget::DockWidgetFloatable);
+
+	dock->setFeatures(features);
+	addDockWidget(Qt::RightDockWidgetArea, dock);
+
+	extraCustomDockNames.push_back(dock->objectName());
+	extraCustomDocks.push_back(dock);
+}
+
+void OBSBasic::RepairCustomExtraDockName()
+{
+	QDockWidget *dock = reinterpret_cast<QDockWidget *>(sender());
+	int idx = extraCustomDocks.indexOf(dock);
+	QSignalBlocker block(dock);
+
+	if (idx == -1) {
+		blog(LOG_WARNING, "A custom dock got its object name changed");
 		return;
+	}
+
+	blog(LOG_WARNING, "The custom dock '%s' got its object name restored",
+	 QT_TO_UTF8(extraCustomDockNamesidx));
 
-	int idx = extraDockNames.indexOf(name);
-	extraDockNames.removeAt(idx);
-	extraDocksidx.clear();
-	extraDocks.removeAt(idx);
+	dock->setObjectName(extraCustomDockNamesidx);
 }
 
 OBSBasic *OBSBasic::Get()
@@ -10530,16 +10886,13 @@
 	}
 }
 
-void OBSBasic::ScenesReordered()
-{
-	OBSProjector::UpdateMultiviewProjectors();
-}
-
 void OBSBasic::ResetStatsHotkey()
 {
-	QList<OBSBasicStats *> list = findChildren<OBSBasicStats *>();
+	const QList<OBSBasicStats *> list = findChildren<OBSBasicStats *>();
 
-	foreach(OBSBasicStats * s, list) s->Reset();
+	for (OBSBasicStats *s : list) {
+		s->Reset();
+	}
 }
 
 void OBSBasic::on_OBSBasic_customContextMenuRequested(const QPoint &pos)
@@ -10717,7 +11070,7 @@
 	return dpi;
 }
 
-void OBSBasic::ResetProxyStyleSliders()
+void OBSBasic::ThemeChanged()
 {
 	/* Since volume/media sliders are using QProxyStyle, they are not
 	* updated when themes are changed, so re-initialize them. */

obs-studio-29.1.3.tar.xz/UI/window-basic-main.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-main.hpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -36,6 +36,9 @@
 #include "window-missing-files.hpp"
 #include "window-projector.hpp"
 #include "window-basic-about.hpp"
+#ifdef YOUTUBE_ENABLED
+#include "window-dock-youtube-app.hpp"
+#endif
 #include "auth-base.hpp"
 #include "log-viewer.hpp"
 #include "undo-stack-obs.hpp"
@@ -229,6 +232,9 @@
 	std::vector<OBSSignal> signalHandlers;
 
 	QList<QPointer<QDockWidget>> oldExtraDocks;
+	QStringList oldExtraDockNames;
+
+	OBSDataAutoRelease safeModeModuleData;
 
 	bool loaded = false;
 	long disableSaving = 1;
@@ -259,6 +265,10 @@
 	QPointer<OBSBasicAdvAudio> advAudioWindow;
 	QPointer<OBSBasicFilters> filters;
 	QPointer<QDockWidget> statsDock;
+#ifdef YOUTUBE_ENABLED
+	QPointer<YouTubeAppDock> youtubeAppDock;
+	uint64_t lastYouTubeAppDockCreationTime = 0;
+#endif
 	QPointer<OBSAbout> about;
 	QPointer<OBSMissingFiles> missDialog;
 	QPointer<OBSLogViewer> logView;
@@ -504,7 +514,7 @@
 	bool sceneDuplicationMode = true;
 	bool swapScenesMode = true;
 	volatile bool previewProgramMode = false;
-	obs_hotkey_id togglePreviewProgramHotkey = 0;
+	obs_hotkey_pair_id togglePreviewProgramHotkeys = 0;
 	obs_hotkey_id transitionHotkey = 0;
 	obs_hotkey_id statsHotkey = 0;
 	obs_hotkey_id screenshotHotkey = 0;
@@ -554,12 +564,16 @@
 	void UpdatePreviewProgramIndicators();
 
 	QStringList extraDockNames;
-	QList<QSharedPointer<QDockWidget>> extraDocks;
+	QList<std::shared_ptr<QDockWidget>> extraDocks;
+
+	QStringList extraCustomDockNames;
+	QList<QPointer<QDockWidget>> extraCustomDocks;
 
 #ifdef BROWSER_AVAILABLE
 	QPointer<QAction> extraBrowserMenuDocksSeparator;
 
-	QList<QSharedPointer<QDockWidget>> extraBrowserDocks;
+	QList<std::shared_ptr<QDockWidget>> extraBrowserDocks;
+	QStringList extraBrowserDockNames;
 	QStringList extraBrowserDockTargets;
 
 	void ClearExtraBrowserDocks();
@@ -622,10 +636,11 @@
 	bool broadcastActive = false;
 	bool broadcastReady = false;
 	QPointer<QThread> youtubeStreamCheckThread;
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	void YoutubeStreamCheck(const std::string &key);
 	void ShowYouTubeAutoStartWarning();
-	void YouTubeActionDialogOk(const QString &id, const QString &key,
+	void YouTubeActionDialogOk(const QString &broadcast_id,
+				 const QString &stream_id, const QString &key,
 				 bool autostart, bool autostop,
 				 bool start_now);
 #endif
@@ -656,6 +671,8 @@
 
 	void UpdatePreviewOverflowSettings();
 
+	bool restartingVCam = false;
+
 public slots:
 	void DeferSaveBegin();
 	void DeferSaveEnd();
@@ -748,8 +765,8 @@
 
 	void ProcessHotkey(obs_hotkey_id id, bool pressed);
 
-	void AddTransition();
-	void RenameTransition();
+	void AddTransition(const char *id);
+	void RenameTransition(OBSSource transition);
 	void TransitionClicked();
 	void TransitionStopped();
 	void TransitionFullyStopped();
@@ -796,14 +813,15 @@
 	void EnablePreview();
 	void DisablePreview();
 
+	void EnablePreviewProgram();
+	void DisablePreviewProgram();
+
 	void SceneCopyFilters();
 	void ScenePasteFilters();
 
 	void CheckDiskSpaceRemaining();
 	void OpenSavedProjector(SavedProjectorInfo *info);
 
-	void ScenesReordered();
-
 	void ResetStatsHotkey();
 
 	void SetImageIcon(const QIcon &icon);
@@ -827,9 +845,11 @@
 	void TBarReleased();
 
 	void LockVolumeControl(bool lock);
-	void ResetProxyStyleSliders();
+	void ThemeChanged();
 
 	void UpdateVirtualCamConfig(const VCamConfig &config);
+	void RestartVirtualCam(const VCamConfig &config);
+	void RestartingVirtualCam();
 
 private:
 	/* OBS Callbacks */
@@ -966,14 +986,27 @@
 	void AddDockWidget(QDockWidget *dock, Qt::DockWidgetArea area,
 			 bool extraBrowser = false);
 	void RemoveDockWidget(const QString &name);
+	bool IsDockObjectNameUsed(const QString &name);
+	void AddCustomDockWidget(QDockWidget *dock);
 
 	static OBSBasic *Get();
 
 	const char *GetCurrentOutputPath();
 
 	void DeleteProjector(OBSProjector *projector);
-	void AddProjectorMenuMonitors(QMenu *parent, QObject *target,
-				 const char *slot);
+
+	static QList<QString> GetProjectorMenuMonitorsFormatted();
+	template<typename Receiver, typename... Args>
+	static void AddProjectorMenuMonitors(QMenu *parent, Receiver *target,
+					 void (Receiver::*slot)(Args...))
+	{
+		auto projectors = GetProjectorMenuMonitorsFormatted();
+		for (int i = 0; i < projectors.size(); i++) {
+			QString str = projectorsi;
+			QAction *action = parent->addAction(str, target, slot);
+			action->setProperty("monitor", i);
+		}
+	}
 
 	QIcon GetSourceIcon(const char *id) const;
 	QIcon GetGroupIcon() const;
@@ -1010,13 +1043,8 @@
 
 protected:
 	virtual void closeEvent(QCloseEvent *event) override;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	virtual bool nativeEvent(const QByteArray &eventType, void *message,
 				 qintptr *result) override;
-#else
-	virtual bool nativeEvent(const QByteArray &eventType, void *message,
-				 long *result) override;
-#endif
 	virtual void changeEvent(QEvent *event) override;
 
 private slots:
@@ -1037,6 +1065,7 @@
 	void on_actionCheckForUpdates_triggered();
 	void on_actionRepair_triggered();
 	void on_actionShowWhatsNew_triggered();
+	void on_actionRestartSafe_triggered();
 
 	void on_actionShowCrashLogs_triggered();
 	void on_actionUploadLastCrashLog_triggered();
@@ -1062,6 +1091,8 @@
 					 QListWidgetItem *prev);
 	void on_scenes_customContextMenuRequested(const QPoint &pos);
 	void GridActionClicked();
+	void on_actionSceneListMode_triggered();
+	void on_actionSceneGridMode_triggered();
 	void on_actionAddScene_triggered();
 	void on_actionRemoveScene_triggered();
 	void on_actionSceneUp_triggered();
@@ -1100,6 +1131,7 @@
 	void on_actionHelpPortal_triggered();
 	void on_actionWebsite_triggered();
 	void on_actionDiscord_triggered();
+	void on_actionReleaseNotes_triggered();
 
 	void on_preview_customContextMenuRequested();
 	void ProgramViewContextMenuRequested();
@@ -1152,6 +1184,7 @@
 	void on_resetDocks_triggered(bool force = false);
 	void on_lockDocks_toggled(bool lock);
 	void on_multiviewProjectorWindowed_triggered();
+	void on_sideDocks_toggled(bool side);
 
 	void PauseToggled();
 
@@ -1161,8 +1194,6 @@
 
 	void updateCheckFinished();
 
-	void AddSourceFromAction();
-
 	void MoveSceneToTop();
 	void MoveSceneToBottom();
 
@@ -1195,6 +1226,9 @@
 
 	void ResizeOutputSizeOfSource();
 
+	void RepairOldExtraDockName();
+	void RepairCustomExtraDockName();
+
 public slots:
 	void on_actionResetTransform_triggered();
 
@@ -1227,8 +1261,15 @@
 				 const char *file) const override;
 
 	static void InitBrowserPanelSafeBlock();
+#ifdef YOUTUBE_ENABLED
+	void NewYouTubeAppDock();
+	void DeleteYouTubeAppDock();
+	YouTubeAppDock *GetYouTubeAppDock();
+#endif
 };
 
+extern bool cef_js_avail;
+
 class SceneRenameDelegate : public QStyledItemDelegate {
 	Q_OBJECT

obs-studio-29.1.3.tar.xz/UI/window-basic-preview.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-preview.cpp Changed

@@ -13,7 +13,7 @@
 
 #define HANDLE_RADIUS 4.0f
 #define HANDLE_SEL_RADIUS (HANDLE_RADIUS * 1.5f)
-#define HELPER_ROT_BREAKPONT 45.0f
+#define HELPER_ROT_BREAKPOINT 45.0f
 
 /* TODO: make C++ math classes and clean up code here later */
 
@@ -77,7 +77,8 @@
 	SceneFindData &operator=(SceneFindData &&) = delete;
 
 	inline SceneFindData(const vec2 &pos_, bool selectBelow_)
-		: pos(pos_), selectBelow(selectBelow_)
+		: pos(pos_),
+		 selectBelow(selectBelow_)
 	{
 	}
 };
@@ -93,7 +94,8 @@
 	SceneFindBoxData &operator=(SceneFindData &&) = delete;
 
 	inline SceneFindBoxData(const vec2 &startPos_, const vec2 &pos_)
-		: startPos(startPos_), pos(pos_)
+		: startPos(startPos_),
+		 pos(pos_)
 	{
 	}
 };
@@ -314,7 +316,8 @@
 	HandleFindData &operator=(HandleFindData &&) = delete;
 
 	inline HandleFindData(const vec2 &pos_, float scale)
-		: pos(pos_), radius(HANDLE_SEL_RADIUS / scale)
+		: pos(pos_),
+		 radius(HANDLE_SEL_RADIUS / scale)
 	{
 		matrix4_identity(&parent_xform);
 	}
@@ -387,24 +390,24 @@
 	TestHandle(0.5f, 1.0f, ItemHandle::BottomCenter);
 	TestHandle(1.0f, 1.0f, ItemHandle::BottomRight);
 
+	vec2 scale;
+	obs_sceneitem_get_scale(item, &scale);
+	obs_bounds_type boundsType = obs_sceneitem_get_bounds_type(item);
 	vec2 rotHandleOffset;
 	vec2_set(&rotHandleOffset, 0.0f,
 		 HANDLE_RADIUS * data.radius * 1.5 - data.radius);
-	RotatePos(&rotHandleOffset, atan2(transform.x.y, transform.x.x));
+	bool invertx = scale.x < 0.0f && boundsType == OBS_BOUNDS_NONE;
+	float angle = atan2(invertx ? transform.x.y * -1.0f : transform.x.y,
+			 invertx ? transform.x.x * -1.0f : transform.x.x);
+	RotatePos(&rotHandleOffset, angle);
 	RotatePos(&rotHandleOffset, RAD(data.angleOffset));
 
-	vec2 scale;
-	obs_sceneitem_get_scale(item, &scale);
-	bool invert = scale.y < 0.0f;
+	bool inverty = scale.y < 0.0f && boundsType == OBS_BOUNDS_NONE;
 	vec3 handlePos =
-		GetTransformedPos(0.5f, invert ? 1.0f : 0.0f, transform);
+		GetTransformedPos(0.5f, inverty ? 1.0f : 0.0f, transform);
 	vec3_transform(&handlePos, &handlePos, &data.parent_xform);
 	handlePos.x -= rotHandleOffset.x;
-
-	if (scale.x < 0.0f)
-		handlePos.y += rotHandleOffset.y;
-	else
-		handlePos.y -= rotHandleOffset.y;
+	handlePos.y -= rotHandleOffset.y;
 
 	float dist = vec3_dist(&handlePos, &pos3);
 	if (dist < data.radius) {
@@ -517,6 +520,8 @@
 							 &invGroupTransform);
 			matrix4_inv(&invGroupTransform, &invGroupTransform);
 			obs_sceneitem_defer_group_resize_begin(stretchGroup);
+		} else {
+			stretchGroup = nullptr;
 		}
 	}
 }
@@ -573,11 +578,7 @@
 
 void OBSBasicPreview::mousePressEvent(QMouseEvent *event)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	QPointF pos = event->position();
-#else
-	QPointF pos = event->localPos();
-#endif
 
 	if (scrollMode && IsFixedScaling() &&
 	 event->button() == Qt::LeftButton) {
@@ -794,8 +795,8 @@
 	auto undo_redo = (const std::string &data) {
 		OBSDataAutoRelease dat =
 			obs_data_create_from_json(data.c_str());
-		OBSSourceAutoRelease source = obs_get_source_by_name(
-			obs_data_get_string(dat, "scene_name"));
+		OBSSourceAutoRelease source = obs_get_source_by_uuid(
+			obs_data_get_string(dat, "scene_uuid"));
 		reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 			->SetCurrentScene(source.Get(), true);
 
@@ -1361,9 +1362,13 @@
 	vec3_transform(&pos3, &pos3, &screenToItem);
 
 	obs_sceneitem_crop crop = startCrop;
-	vec2 scale;
+	vec2 scale, rawscale;
 
-	obs_sceneitem_get_scale(stretchItem, &scale);
+	obs_sceneitem_get_scale(stretchItem, &rawscale);
+	vec2_set(&scale,
+		 boundsType == OBS_BOUNDS_NONE ? rawscale.x : fabsf(rawscale.x),
+		 boundsType == OBS_BOUNDS_NONE ? rawscale.y
+					 : fabsf(rawscale.y));
 
 	vec2 max_tl;
 	vec2 max_br;
@@ -1375,10 +1380,18 @@
 
 	typedef std::function<float(float, float)> minmax_func_t;
 
-	minmax_func_t min_x = scale.x < 0.0f ? maxfunc : minfunc;
-	minmax_func_t min_y = scale.y < 0.0f ? maxfunc : minfunc;
-	minmax_func_t max_x = scale.x < 0.0f ? minfunc : maxfunc;
-	minmax_func_t max_y = scale.y < 0.0f ? minfunc : maxfunc;
+	minmax_func_t min_x = scale.x < 0.0f && boundsType == OBS_BOUNDS_NONE
+				 ? maxfunc
+				 : minfunc;
+	minmax_func_t min_y = scale.y < 0.0f && boundsType == OBS_BOUNDS_NONE
+				 ? maxfunc
+				 : minfunc;
+	minmax_func_t max_x = scale.x < 0.0f && boundsType == OBS_BOUNDS_NONE
+				 ? minfunc
+				 : maxfunc;
+	minmax_func_t max_y = scale.y < 0.0f && boundsType == OBS_BOUNDS_NONE
+				 ? minfunc
+				 : maxfunc;
 
 	pos3.x = min_x(pos3.x, max_br.x);
 	pos3.x = max_x(pos3.x, max_tl.x);
@@ -1595,11 +1608,7 @@
 	OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
 	changed = true;
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 	QPointF qtPos = event->position();
-#else
-	QPointF qtPos = event->localPos();
-#endif
 
 	float pixelRatio = main->GetDevicePixelRatio();
 
@@ -2121,7 +2130,8 @@
 			prev->circleFill = gs_render_save();
 		}
 
-		bool invert = info.scale.y < 0.0f;
+		bool invert = info.scale.y < 0.0f &&
+			 info.bounds_type == OBS_BOUNDS_NONE;
 		DrawRotationHandle(prev->circleFill, info.rot + prev->groupRot,
 				 pixelRatio, invert);
 	}
@@ -2451,12 +2461,13 @@
 	vec2 s;
 	SceneFindBoxData data(s, s);
 
-	obs_scene_enum_items(main->GetCurrentScene(), FindSelected, &data);
+	OBSScene scene = main->GetCurrentScene();
+	obs_scene_enum_items(scene, FindSelected, &data);
 
-	if (data.sceneItems.size() > 1)
+	if (data.sceneItems.size() != 1)
 		return;
 
-	OBSSceneItem item = main->GetCurrentSceneItem();
+	OBSSceneItem item = data.sceneItems0;
 	if (!item)
 		return;
 
@@ -2467,9 +2478,7 @@
 	if (itemSize.x == 0.0f || itemSize.y == 0.0f)
 		return;
 
-	obs_sceneitem_t *parentGroup =
-		obs_sceneitem_get_group(main->GetCurrentScene(), item);
-
+	obs_sceneitem_t *parentGroup = obs_sceneitem_get_group(scene, item);
 	if (parentGroup && obs_sceneitem_locked(parentGroup))
 		return;
 
@@ -2515,7 +2524,7 @@
 	}
 
 	// Switch top/bottom or right/left if scale is negative
-	if (oti.scale.x < 0.0f) {
+	if (oti.scale.x < 0.0f && oti.bounds_type == OBS_BOUNDS_NONE) {
 		vec3 l = left;
 		vec3 r = right;
 
@@ -2523,7 +2532,7 @@
 		vec3_copy(&right, &l);
 	}
 
-	if (oti.scale.y < 0.0f) {
+	if (oti.scale.y < 0.0f && oti.bounds_type == OBS_BOUNDS_NONE) {
 		vec3 t = top;
 		vec3 b = bottom;
 
@@ -2531,8 +2540,8 @@
 		vec3_copy(&bottom, &t);
 	}
 
-	if (rot >= HELPER_ROT_BREAKPONT) {
-		for (float i = HELPER_ROT_BREAKPONT; i <= 360.0f; i += 90.0f) {
+	if (rot >= HELPER_ROT_BREAKPOINT) {
+		for (float i = HELPER_ROT_BREAKPOINT; i <= 360.0f; i += 90.0f) {
 			if (rot < i)
 				break;
 
@@ -2546,8 +2555,8 @@
 			vec3_copy(&bottom, &r);
 			vec3_copy(&left, &b);
 		}
-	} else if (rot <= -HELPER_ROT_BREAKPONT) {
-		for (float i = -HELPER_ROT_BREAKPONT; i >= -360.0f;
+	} else if (rot <= -HELPER_ROT_BREAKPOINT) {
+		for (float i = -HELPER_ROT_BREAKPOINT; i >= -360.0f;
 		 i -= 90.0f) {
 			if (rot > i)
 				break;

obs-studio-29.1.3.tar.xz/UI/window-basic-properties.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-properties.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -84,8 +84,8 @@
 	ui->propertiesLayout->addWidget(view);
 
 	if (type == OBS_SOURCE_TYPE_TRANSITION) {
-		connect(view, SIGNAL(PropertiesRefreshed()), this,
-			SLOT(AddPreviewButton()));
+		connect(view, &OBSPropertiesView::PropertiesRefreshed, this,
+			&OBSBasicProperties::AddPreviewButton);
 	}
 
 	view->show();
@@ -317,20 +317,20 @@
 
 	if (val == QDialogButtonBox::AcceptRole) {
 
-		std::string scene_name =
-			obs_source_get_name(main->GetCurrentSceneSource());
+		std::string scene_uuid =
+			obs_source_get_uuid(main->GetCurrentSceneSource());
 
-		auto undo_redo = scene_name(const std::string &data) {
+		auto undo_redo = scene_uuid(const std::string &data) {
 			OBSDataAutoRelease settings =
 				obs_data_create_from_json(data.c_str());
-			OBSSourceAutoRelease source = obs_get_source_by_name(
-				obs_data_get_string(settings, "undo_sname"));
+			OBSSourceAutoRelease source = obs_get_source_by_uuid(
+				obs_data_get_string(settings, "undo_uuid"));
 			obs_source_reset_settings(source, settings);
 
 			obs_source_update_properties(source);
 
 			OBSSourceAutoRelease scene_source =
-				obs_get_source_by_name(scene_name.c_str());
+				obs_get_source_by_uuid(scene_uuid.c_str());
 
 			OBSBasic::Get()->SetCurrentScene(scene_source.Get(),
 							 true);
@@ -340,10 +340,10 @@
 		OBSDataAutoRelease curr_settings =
 			obs_source_get_settings(source);
 		obs_data_apply(new_settings, curr_settings);
-		obs_data_set_string(new_settings, "undo_sname",
-				 obs_source_get_name(source));
-		obs_data_set_string(oldSettings, "undo_sname",
-				 obs_source_get_name(source));
+		obs_data_set_string(new_settings, "undo_uuid",
+				 obs_source_get_uuid(source));
+		obs_data_set_string(oldSettings, "undo_uuid",
+				 obs_source_get_uuid(source));
 
 		std::string undo_data(obs_data_get_json(oldSettings));
 		std::string redo_data(obs_data_get_json(new_settings));
@@ -490,12 +490,8 @@
 	Cleanup();
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool OBSBasicProperties::nativeEvent(const QByteArray &, void *message,
 				 qintptr *)
-#else
-bool OBSBasicProperties::nativeEvent(const QByteArray &, void *message, long *)
-#endif
 {
 #ifdef _WIN32
 	const MSG &msg = *static_cast<MSG *>(message);

obs-studio-29.1.3.tar.xz/UI/window-basic-properties.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-properties.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-settings-a11y.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-settings-a11y.cpp Changed

@@ -50,6 +50,7 @@
 {
 	config_t *config = GetGlobalConfig();
 
+	loading = true;
 	if (!presetChange) {
 		preset = config_get_int(config, "Accessibility", "ColorPreset");
 
@@ -107,6 +108,8 @@
 	}
 
 	UpdateA11yColors();
+
+	loading = false;
 }
 
 void OBSBasicSettings::SaveA11ySettings()
@@ -133,26 +136,25 @@
 	main->RefreshVolumeColors();
 }
 
-#define SetStyle(label, colorVal)                                             \
-	color = color_from_int(colorVal);                                     \
-	color.setAlpha(255);                                                  \
-	palette = QPalette(color);                                            \
-	label->setFrameStyle(QFrame::Sunken | QFrame::Panel);                 \
-	label->setText(color.name(QColor::HexRgb));                           \
-	label->setPalette(palette);                                           \
-	label->setStyleSheet(QString("background-color: %1; color: %2;")      \
-				     .arg(palette.color(QPalette::Window)     \
-						  .name(QColor::HexRgb))      \
-				     .arg(palette.color(QPalette::WindowText) \
-						  .name(QColor::HexRgb)));    \
-	label->setAutoFillBackground(true);                                   \
+static void SetStyle(QLabel *label, uint32_t colorVal)
+{
+	QColor color = color_from_int(colorVal);
+	color.setAlpha(255);
+	QPalette palette = QPalette(color);
+	label->setFrameStyle(QFrame::Sunken | QFrame::Panel);
+	label->setText(color.name(QColor::HexRgb));
+	label->setPalette(palette);
+	label->setStyleSheet(QString("background-color: %1; color: %2;")
+				     .arg(palette.color(QPalette::Window)
+						  .name(QColor::HexRgb))
+				     .arg(palette.color(QPalette::WindowText)
+						  .name(QColor::HexRgb)));
+	label->setAutoFillBackground(true);
 	label->setAlignment(Qt::AlignCenter);
+}
 
 void OBSBasicSettings::UpdateA11yColors()
 {
-	QPalette palette;
-	QColor color;
-
 	SetStyle(ui->color1, selectRed);
 	SetStyle(ui->color2, selectGreen);
 	SetStyle(ui->color3, selectBlue);

obs-studio-29.1.3.tar.xz/UI/window-basic-settings-stream.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-settings-stream.cpp Changed

@@ -16,7 +16,7 @@
 
 #include "ui-config.h"
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 #include "youtube-api-wrappers.hpp"
 #endif
 
@@ -29,6 +29,7 @@
 enum class ListOpt : int {
 	ShowAll = 1,
 	Custom,
+	WHIP,
 };
 
 enum class Section : int {
@@ -41,6 +42,11 @@
 	return ui->service->currentData().toInt() == (int)ListOpt::Custom;
 }
 
+inline bool OBSBasicSettings::IsWHIP() const
+{
+	return ui->service->currentData().toInt() == (int)ListOpt::WHIP;
+}
+
 void OBSBasicSettings::InitStreamPage()
 {
 	ui->connectAccount2->setVisible(false);
@@ -78,10 +84,10 @@
 	ui->twitchAddonDropdown->addItem(
 		QTStr("Basic.Settings.Stream.TTVAddon.Both"));
 
-	connect(ui->ignoreRecommended, SIGNAL(clicked(bool)), this,
-		SLOT(DisplayEnforceWarning(bool)));
-	connect(ui->ignoreRecommended, SIGNAL(toggled(bool)), this,
-		SLOT(UpdateResFPSLimits()));
+	connect(ui->ignoreRecommended, &QCheckBox::clicked, this,
+		&OBSBasicSettings::DisplayEnforceWarning);
+	connect(ui->ignoreRecommended, &QCheckBox::toggled, this,
+		&OBSBasicSettings::UpdateResFPSLimits);
 }
 
 void OBSBasicSettings::LoadStream1Settings()
@@ -91,6 +97,9 @@
 
 	obs_service_t *service_obj = main->GetService();
 	const char *type = obs_service_get_type(service_obj);
+	bool is_rtmp_custom = (strcmp(type, "rtmp_custom") == 0);
+	bool is_rtmp_common = (strcmp(type, "rtmp_common") == 0);
+	bool is_whip = (strcmp(type, "whip_custom") == 0);
 
 	loading = true;
 
@@ -100,10 +109,14 @@
 	const char *server = obs_data_get_string(settings, "server");
 	const char *key = obs_data_get_string(settings, "key");
 	protocol = QT_UTF8(obs_service_get_protocol(service_obj));
+	const char *bearer_token =
+		obs_data_get_string(settings, "bearer_token");
 
-	if (strcmp(type, "rtmp_custom") == 0) {
-		ui->service->setCurrentIndex(0);
+	if (is_rtmp_custom || is_whip)
 		ui->customServer->setText(server);
+
+	if (is_rtmp_custom) {
+		ui->service->setCurrentIndex(0);
 		lastServiceIdx = 0;
 		lastCustomServer = ui->customServer->text();
 
@@ -115,29 +128,6 @@
 		ui->authUsername->setText(QT_UTF8(username));
 		ui->authPw->setText(QT_UTF8(password));
 		ui->useAuth->setChecked(use_auth);
-
-		/* add tooltips for stream key, user, password fields */
-		QString file = !App()->IsThemeDark()
-				 ? ":/res/images/help.svg"
-				 : ":/res/images/help_light.svg";
-		QString lStr = "<html>%1 <img src='%2' style=' \
-				vertical-align: bottom; \
-				' /></html>";
-
-		ui->streamKeyLabel->setText(
-			lStr.arg(ui->streamKeyLabel->text(), file));
-		ui->streamKeyLabel->setToolTip(
-			QTStr("Basic.AutoConfig.StreamPage.StreamKey.ToolTip"));
-
-		ui->authUsernameLabel->setText(
-			lStr.arg(ui->authUsernameLabel->text(), file));
-		ui->authUsernameLabel->setToolTip(
-			QTStr("Basic.Settings.Stream.Custom.Username.ToolTip"));
-
-		ui->authPwLabel->setText(
-			lStr.arg(ui->authPwLabel->text(), file));
-		ui->authPwLabel->setToolTip(
-			QTStr("Basic.Settings.Stream.Custom.Password.ToolTip"));
 	} else {
 		int idx = ui->service->findText(service);
 		if (idx == -1) {
@@ -157,7 +147,7 @@
 
 	UpdateServerList();
 
-	if (strcmp(type, "rtmp_common") == 0) {
+	if (is_rtmp_common) {
 		int idx = ui->server->findData(server);
 		if (idx == -1) {
 			if (server && *server)
@@ -167,10 +157,12 @@
 		ui->server->setCurrentIndex(idx);
 	}
 
-	ui->key->setText(key);
+	if (is_whip)
+		ui->key->setText(bearer_token);
+	else
+		ui->key->setText(key);
 
-	lastService.clear();
-	ServiceChanged();
+	ServiceChanged(true);
 
 	UpdateKeyLink();
 	UpdateMoreInfoLink();
@@ -191,14 +183,21 @@
 void OBSBasicSettings::SaveStream1Settings()
 {
 	bool customServer = IsCustomService();
-	const char *service_id = customServer ? "rtmp_custom" : "rtmp_common";
+	bool whip = IsWHIP();
+	const char *service_id = "rtmp_common";
+
+	if (customServer) {
+		service_id = "rtmp_custom";
+	} else if (whip) {
+		service_id = "whip_custom";
+	}
 
 	obs_service_t *oldService = main->GetService();
 	OBSDataAutoRelease hotkeyData = obs_hotkeys_save_service(oldService);
 
 	OBSDataAutoRelease settings = obs_data_create();
 
-	if (!customServer) {
+	if (!customServer && !whip) {
 		obs_data_set_string(settings, "service",
 				 QT_TO_UTF8(ui->service->currentText()));
 		obs_data_set_string(settings, "protocol", QT_TO_UTF8(protocol));
@@ -239,7 +238,14 @@
 		obs_data_set_bool(settings, "bwtest", false);
 	}
 
-	obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));
+	if (whip) {
+		obs_data_set_string(settings, "service", "WHIP");
+		obs_data_set_string(settings, "bearer_token",
+				 QT_TO_UTF8(ui->key->text()));
+	} else {
+		obs_data_set_string(settings, "key",
+				 QT_TO_UTF8(ui->key->text()));
+	}
 
 	OBSServiceAutoRelease newService = obs_service_create(
 		service_id, "default_service", settings, hotkeyData);
@@ -262,7 +268,7 @@
 
 void OBSBasicSettings::UpdateMoreInfoLink()
 {
-	if (IsCustomService()) {
+	if (IsCustomService() || IsWHIP()) {
 		ui->moreInfoButton->hide();
 		return;
 	}
@@ -312,9 +318,38 @@
 	if (serviceName == "Dacast") {
 		ui->streamKeyLabel->setText(
 			QTStr("Basic.AutoConfig.StreamPage.EncoderKey"));
+		ui->streamKeyLabel->setToolTip("");
+	} else if (IsWHIP()) {
+		ui->streamKeyLabel->setText(
+			QTStr("Basic.AutoConfig.StreamPage.BearerToken"));
+		ui->streamKeyLabel->setToolTip("");
 	} else if (!IsCustomService()) {
 		ui->streamKeyLabel->setText(
 			QTStr("Basic.AutoConfig.StreamPage.StreamKey"));
+		ui->streamKeyLabel->setToolTip("");
+	} else {
+		/* add tooltips for stream key, user, password fields */
+		QString file = !App()->IsThemeDark()
+				 ? ":/res/images/help.svg"
+				 : ":/res/images/help_light.svg";
+		QString lStr = "<html>%1 <img src='%2' style=' \
+				vertical-align: bottom; \
+				' /></html>";
+
+		ui->streamKeyLabel->setText(lStr.arg(
+			QTStr("Basic.AutoConfig.StreamPage.StreamKey"), file));
+		ui->streamKeyLabel->setToolTip(
+			QTStr("Basic.AutoConfig.StreamPage.StreamKey.ToolTip"));
+
+		ui->authUsernameLabel->setText(lStr.arg(
+			QTStr("Basic.Settings.Stream.Custom.Username"), file));
+		ui->authUsernameLabel->setToolTip(
+			QTStr("Basic.Settings.Stream.Custom.Username.ToolTip"));
+
+		ui->authPwLabel->setText(lStr.arg(
+			QTStr("Basic.Settings.Stream.Custom.Password"), file));
+		ui->authPwLabel->setToolTip(
+			QTStr("Basic.Settings.Stream.Custom.Password.ToolTip"));
 	}
 
 	if (QString(streamKeyLink).isNull() ||
@@ -356,6 +391,11 @@
 	for (QString &name : names)
 		ui->service->addItem(name);
 
+	if (obs_is_output_protocol_registered("WHIP")) {
+		ui->service->addItem(QTStr("WHIP"),
+				 QVariant((int)ListOpt::WHIP));
+	}
+
 	if (!showAll) {
 		ui->service->addItem(
 			QTStr("Basic.AutoConfig.StreamPage.Service.ShowAll"),
@@ -420,7 +460,7 @@
 	ui->disconnectAccount->setVisible(false);
 }
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 static void get_yt_ch_title(Ui::OBSBasicSettings *ui)
 {
 	const char *name = config_get_string(OBSBasic::Get()->Config(),
@@ -440,6 +480,8 @@
 void OBSBasicSettings::UseStreamKeyAdvClicked()
 {
 	ui->streamKeyWidget->setVisible(true);
+	ui->streamKeyLabel->setVisible(true);
+	ui->useStreamKeyAdv->setVisible(false);
 }
 
 void OBSBasicSettings::on_service_currentIndexChanged(int idx)
@@ -480,17 +522,18 @@
 		lastCustomServer = ui->customServer->text();
 }
 
-void OBSBasicSettings::ServiceChanged()
+void OBSBasicSettings::ServiceChanged(bool resetFields)
 {
 	std::string service = QT_TO_UTF8(ui->service->currentText());
 	bool custom = IsCustomService();
+	bool whip = IsWHIP();
 
 	ui->disconnectAccount->setVisible(false);
 	ui->bandwidthTestEnable->setVisible(false);
 	ui->twitchAddonDropdown->setVisible(false);
 	ui->twitchAddonLabel->setVisible(false);
 
-	if (lastService != service.c_str()) {
+	if (resetFields || lastService != service.c_str()) {
 		reset_service_ui_fields(ui.get(), service, loading);
 	}
 
@@ -500,7 +543,7 @@
 	ui->authPwLabel->setVisible(custom);
 	ui->authPwWidget->setVisible(custom);
 
-	if (custom) {
+	if (custom || whip) {
 		ui->streamkeyPageLayout->insertRow(1, ui->serverLabel,
 						 ui->serverStackedWidget);
 
@@ -521,7 +564,7 @@
 	auto system_auth_service = main->auth->service();
 	bool service_check = service.find(system_auth_service) !=
 			 std::string::npos;
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	service_check = service_check ? service_check
 				 : IsYouTubeService(system_auth_service) &&
 						IsYouTubeService(service);
@@ -628,11 +671,18 @@
 OBSService OBSBasicSettings::SpawnTempService()
 {
 	bool custom = IsCustomService();
-	const char *service_id = custom ? "rtmp_custom" : "rtmp_common";
+	bool whip = IsWHIP();
+	const char *service_id = "rtmp_common";
+
+	if (custom) {
+		service_id = "rtmp_custom";
+	} else if (whip) {
+		service_id = "whip_custom";
+	}
 
 	OBSDataAutoRelease settings = obs_data_create();
 
-	if (!custom) {
+	if (!custom && !whip) {
 		obs_data_set_string(settings, "service",
 				 QT_TO_UTF8(ui->service->currentText()));
 		obs_data_set_string(
@@ -643,7 +693,13 @@
 			settings, "server",
 			QT_TO_UTF8(ui->customServer->text().trimmed()));
 	}
-	obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));
+
+	if (whip)
+		obs_data_set_string(settings, "bearer_token",
+				 QT_TO_UTF8(ui->key->text()));
+	else
+		obs_data_set_string(settings, "key",
+				 QT_TO_UTF8(ui->key->text()));
 
 	OBSServiceAutoRelease newService = obs_service_create(
 		service_id, "temp_service", settings, nullptr);
@@ -676,7 +732,7 @@
 		} else {
 			ui->bandwidthTestEnable->setChecked(false);
 		}
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 		if (IsYouTubeService(a->service())) {
 			ui->key->clear();
 
@@ -719,6 +775,14 @@
 	auth = OAuthStreamKey::Login(this, service);
 	if (!!auth) {
 		OnAuthConnected();
+#ifdef YOUTUBE_ENABLED
+		if (cef_js_avail && IsYouTubeService(service)) {
+			if (!main->GetYouTubeAppDock()) {
+				main->NewYouTubeAppDock();
+			}
+			main->GetYouTubeAppDock()->AccountConnected();
+		}
+#endif
 
 		ui->useStreamKeyAdv->setVisible(false);
 	}
@@ -761,6 +825,16 @@
 
 	ui->connectedAccountLabel->setVisible(false);
 	ui->connectedAccountText->setVisible(false);
+
+#ifdef YOUTUBE_ENABLED
+	if (cef_js_avail && IsYouTubeService(service)) {
+		if (!main->GetYouTubeAppDock()) {
+			main->NewYouTubeAppDock();
+		}
+		main->GetYouTubeAppDock()->AccountDisconnected();
+		main->GetYouTubeAppDock()->Update();
+	}
+#endif
 }
 
 void OBSBasicSettings::on_useStreamKey_clicked()
@@ -819,10 +893,10 @@
 						 &pos, nullptr);
 	ui->simpleStreamingLayout->insertRow(pos + 1, nullptr, simpleVodTrack);
 
-	HookWidget(simpleVodTrack, SIGNAL(clicked(bool)),
-		 SLOT(OutputsChanged()));
-	connect(ui->simpleOutAdvanced, SIGNAL(toggled(bool)),
-		simpleVodTrack.data(), SLOT(setVisible(bool)));
+	HookWidget(simpleVodTrack.data(), &QCheckBox::clicked,
+		 &OBSBasicSettings::OutputsChanged);
+	connect(ui->simpleOutAdvanced, &QCheckBox::toggled,
+		simpleVodTrack.data(), &QCheckBox::setVisible);
 
 	/* -------------------------------------- */
 	/* advanced output mode vod track widgets */
@@ -838,12 +912,12 @@
 		vodTracki = new QRadioButton(QString::number(i + 1));
 		vodTrackLayout->addWidget(vodTracki);
 
-		HookWidget(vodTracki, SIGNAL(clicked(bool)),
-			 SLOT(OutputsChanged()));
+		HookWidget(vodTracki.data(), &QRadioButton::clicked,
+			 &OBSBasicSettings::OutputsChanged);
 	}
 
-	HookWidget(vodTrackCheckbox, SIGNAL(clicked(bool)),
-		 SLOT(OutputsChanged()));
+	HookWidget(vodTrackCheckbox.data(), &QCheckBox::clicked,
+		 &OBSBasicSettings::OutputsChanged);
 
 	vodTrackLayout->addStretch();
 	vodTrackLayout->setContentsMargins(0, 0, 0, 0);
@@ -857,8 +931,8 @@
 	vodTrackCheckbox->setChecked(vodTrackEnabled);
 	vodTrackContainer->setEnabled(vodTrackEnabled);
 
-	connect(vodTrackCheckbox, SIGNAL(clicked(bool)), vodTrackContainer,
-		SLOT(setEnabled(bool)));
+	connect(vodTrackCheckbox, &QCheckBox::clicked, vodTrackContainer,
+		&QWidget::setEnabled);
 
 	int trackIndex =
 		config_get_int(main->Config(), "AdvOut", "VodTrackIndex");
@@ -931,7 +1005,7 @@
 	}
 #undef ENFORCE_TEXT
 
-#if YOUTUBE_ENABLED
+#ifdef YOUTUBE_ENABLED
 	if (IsYouTubeService(QT_TO_UTF8(ui->service->currentText()))) {
 		if (!text.isEmpty())
 			text += " ";
@@ -1167,8 +1241,8 @@
 		ui->outputResolution->clear();
 		ui->outputResolution->setEditable(false);
 		HookWidget(ui->outputResolution,
-			 SIGNAL(currentIndexChanged(int)),
-			 SLOT(VideoChangedResolution()));
+			 &QComboBox::currentIndexChanged,
+			 &OBSBasicSettings::VideoChangedResolution);
 
 		int new_res_index = -1;
 
@@ -1372,7 +1446,7 @@
 {
 	const char *codec = obs_get_encoder_codec(QT_TO_UTF8(enc));
 
-	if (strcmp(codec, "aac") == 0)
+	if (codec && strcmp(codec, "aac") == 0)
 		return "ffmpeg_opus";
 
 	QString aac_default = "ffmpeg_aac";
@@ -1549,9 +1623,7 @@
 
 	if (!streamOnly) {
 		ui->advOutRecEncoder->clear();
-		ui->advOutRecEncoder->addItem(TEXT_USE_STREAM_ENC, "none");
 		ui->advOutRecAEncoder->clear();
-		ui->advOutRecAEncoder->addItem(TEXT_USE_STREAM_ENC, "none");
 	}
 
 	/* ------------------------------------------------- */
@@ -1583,6 +1655,18 @@
 		}
 	}
 
+	ui->advOutEncoder->model()->sort(0);
+	ui->advOutAEncoder->model()->sort(0);
+
+	if (!streamOnly) {
+		ui->advOutRecEncoder->model()->sort(0);
+		ui->advOutRecEncoder->insertItem(0, TEXT_USE_STREAM_ENC,
+						 "none");
+		ui->advOutRecAEncoder->model()->sort(0);
+		ui->advOutRecAEncoder->insertItem(0, TEXT_USE_STREAM_ENC,
+						 "none");
+	}
+
 	/* ------------------------------------------------- */
 	/* load simple stream encoders */
 
@@ -1590,6 +1674,7 @@
 
 	ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software"),
 					 QString(SIMPLE_ENCODER_X264));
+#ifdef _WIN32
 	if (service_supports_encoder(vcodecs, "obs_qsv11"))
 		ui->simpleOutStrEncoder->addItem(
 			ENCODER_STR("Hardware.QSV.H264"),
@@ -1598,6 +1683,7 @@
 		ui->simpleOutStrEncoder->addItem(
 			ENCODER_STR("Hardware.QSV.AV1"),
 			QString(SIMPLE_ENCODER_QSV_AV1));
+#endif
 	if (service_supports_encoder(vcodecs, "ffmpeg_nvenc"))
 		ui->simpleOutStrEncoder->addItem(
 			ENCODER_STR("Hardware.NVENC.H264"),

obs-studio-29.1.3.tar.xz/UI/window-basic-settings.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-settings.cpp Changed

@@ -1,6 +1,6 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
- Philippe Groarke <philippe.groarke@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
+ Philippe Groarke <philippe.groarke@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -48,6 +48,10 @@
 #include "window-basic-main-outputs.hpp"
 #include "window-projector.hpp"
 
+#ifdef YOUTUBE_ENABLED
+#include "youtube-api-wrappers.hpp"
+#endif
+
 #include <util/platform.h>
 #include <util/dstr.hpp>
 #include "ui-config.h"
@@ -83,49 +87,6 @@
 	}
 };
 
-// Used for QVariant in codec comboboxes
-namespace {
-static bool StringEquals(QString left, QString right)
-{
-	return left == right;
-}
-struct FormatDesc {
-	const char *name = nullptr;
-	const char *mimeType = nullptr;
-	const ff_format_desc *desc = nullptr;
-
-	inline FormatDesc() = default;
-	inline FormatDesc(const char *name, const char *mimeType,
-			 const ff_format_desc *desc = nullptr)
-		: name(name), mimeType(mimeType), desc(desc)
-	{
-	}
-
-	bool operator==(const FormatDesc &f) const
-	{
-		if (!StringEquals(name, f.name))
-			return false;
-		return StringEquals(mimeType, f.mimeType);
-	}
-};
-struct CodecDesc {
-	const char *name = nullptr;
-	int id = 0;
-
-	inline CodecDesc() = default;
-	inline CodecDesc(const char *name, int id) : name(name), id(id) {}
-
-	bool operator==(const CodecDesc &codecDesc) const
-	{
-		if (id != codecDesc.id)
-			return false;
-		return StringEquals(name, codecDesc.name);
-	}
-};
-}
-Q_DECLARE_METATYPE(FormatDesc)
-Q_DECLARE_METATYPE(CodecDesc)
-
 static inline bool ResTooHigh(uint32_t cx, uint32_t cy)
 {
 	return cx > 16384 || cy > 16384;
@@ -133,7 +94,7 @@
 
 static inline bool ResTooLow(uint32_t cx, uint32_t cy)
 {
-	return cx < 8 || cy < 8;
+	return cx < 32 || cy < 32;
 }
 
 /* parses "widthxheight", string, i.e. 1024x768 */
@@ -229,38 +190,19 @@
 
 static int FindEncoder(QComboBox *combo, const char *name, int id)
 {
-	CodecDesc codecDesc(name, id);
+	FFmpegCodec codec{name, id};
+
 	for (int i = 0; i < combo->count(); i++) {
 		QVariant v = combo->itemData(i);
 		if (!v.isNull()) {
-			if (codecDesc == v.value<CodecDesc>()) {
+			if (codec == v.value<FFmpegCodec>()) {
 				return i;
-				break;
 			}
 		}
 	}
 	return -1;
 }
 
-static CodecDesc GetDefaultCodecDesc(const ff_format_desc *formatDesc,
-				 ff_codec_type codecType)
-{
-	int id = 0;
-	switch (codecType) {
-	case FF_CODEC_AUDIO:
-		id = ff_format_desc_audio(formatDesc);
-		break;
-	case FF_CODEC_VIDEO:
-		id = ff_format_desc_video(formatDesc);
-		break;
-	default:
-		return CodecDesc();
-	}
-
-	return CodecDesc(ff_format_desc_get_default_name(formatDesc, codecType),
-			 id);
-}
-
 #define INVALID_BITRATE 10000
 static int FindClosestAvailableAudioBitrate(QComboBox *box, int bitrate)
 {
@@ -387,31 +329,25 @@
 
 void RestrictResetBitrates(initializer_list<QComboBox *> boxes, int maxbitrate);
 
-void OBSBasicSettings::HookWidget(QWidget *widget, const char *signal,
-				 const char *slot)
-{
-	QObject::connect(widget, signal, this, slot);
-	widget->setProperty("changed", QVariant(false));
-}
-
 /* clang-format off */
-#define COMBO_CHANGED SIGNAL(currentIndexChanged(int))
-#define EDIT_CHANGED SIGNAL(textChanged(const QString &))
-#define CBEDIT_CHANGED SIGNAL(editTextChanged(const QString &))
-#define CHECK_CHANGED SIGNAL(clicked(bool))
-#define SCROLL_CHANGED SIGNAL(valueChanged(int))
-#define DSCROLL_CHANGED SIGNAL(valueChanged(double))
-
-#define GENERAL_CHANGED SLOT(GeneralChanged())
-#define STREAM1_CHANGED SLOT(Stream1Changed())
-#define OUTPUTS_CHANGED SLOT(OutputsChanged())
-#define AUDIO_RESTART SLOT(AudioChangedRestart())
-#define AUDIO_CHANGED SLOT(AudioChanged())
-#define VIDEO_RES SLOT(VideoChangedResolution())
-#define VIDEO_CHANGED SLOT(VideoChanged())
-#define A11Y_CHANGED SLOT(A11yChanged())
-#define ADV_CHANGED SLOT(AdvancedChanged())
-#define ADV_RESTART SLOT(AdvancedChangedRestart())
+#define COMBO_CHANGED &QComboBox::currentIndexChanged
+#define EDIT_CHANGED &QLineEdit::textChanged
+#define CBEDIT_CHANGED &QComboBox::editTextChanged
+#define CHECK_CHANGED &QCheckBox::toggled
+#define GROUP_CHANGED &QGroupBox::toggled
+#define SCROLL_CHANGED &QSpinBox::valueChanged
+#define DSCROLL_CHANGED &QDoubleSpinBox::valueChanged
+
+#define GENERAL_CHANGED &OBSBasicSettings::GeneralChanged
+#define STREAM1_CHANGED &OBSBasicSettings::Stream1Changed
+#define OUTPUTS_CHANGED &OBSBasicSettings::OutputsChanged
+#define AUDIO_RESTART &OBSBasicSettings::AudioChangedRestart
+#define AUDIO_CHANGED &OBSBasicSettings::AudioChanged
+#define VIDEO_RES &OBSBasicSettings::VideoChangedResolution
+#define VIDEO_CHANGED &OBSBasicSettings::VideoChanged
+#define A11Y_CHANGED &OBSBasicSettings::A11yChanged
+#define ADV_CHANGED &OBSBasicSettings::AdvancedChanged
+#define ADV_RESTART &OBSBasicSettings::AdvancedChangedRestart
 /* clang-format on */
 
 OBSBasicSettings::OBSBasicSettings(QWidget *parent)
@@ -594,7 +530,7 @@
 	HookWidget(ui->fpsInteger, SCROLL_CHANGED, VIDEO_CHANGED);
 	HookWidget(ui->fpsNumerator, SCROLL_CHANGED, VIDEO_CHANGED);
 	HookWidget(ui->fpsDenominator, SCROLL_CHANGED, VIDEO_CHANGED);
-	HookWidget(ui->colorsGroupBox, CHECK_CHANGED, A11Y_CHANGED);
+	HookWidget(ui->colorsGroupBox, GROUP_CHANGED, A11Y_CHANGED);
 	HookWidget(ui->colorPreset, COMBO_CHANGED, A11Y_CHANGED);
 	HookWidget(ui->renderer, COMBO_CHANGED, ADV_RESTART);
 	HookWidget(ui->adapter, COMBO_CHANGED, ADV_RESTART);
@@ -626,6 +562,7 @@
 	HookWidget(ui->processPriority, COMBO_CHANGED, ADV_CHANGED);
 	HookWidget(ui->confirmOnExit, CHECK_CHANGED, ADV_CHANGED);
 	HookWidget(ui->bindToIP, COMBO_CHANGED, ADV_CHANGED);
+	HookWidget(ui->ipFamily, COMBO_CHANGED, ADV_CHANGED);
 	HookWidget(ui->enableNewSocketLoop, CHECK_CHANGED, ADV_CHANGED);
 	HookWidget(ui->enableLowLatencyMode, CHECK_CHANGED, ADV_CHANGED);
 	HookWidget(ui->hotkeyFocusType, COMBO_CHANGED, ADV_CHANGED);
@@ -733,33 +670,30 @@
 	ui->resetOSXVSync = nullptr;
 #endif
 
-	connect(ui->streamDelaySec, SIGNAL(valueChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->outputMode, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->simpleOutputVBitrate, SIGNAL(valueChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->simpleOutputABitrate, SIGNAL(currentIndexChanged(int)),
-		this, SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->advOutTrack1Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->advOutTrack2Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->advOutTrack3Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->advOutTrack4Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->advOutTrack5Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(ui->advOutTrack6Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(UpdateStreamDelayEstimate()));
+	connect(ui->streamDelaySec, &QSpinBox::valueChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->outputMode, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->simpleOutputVBitrate, &QSpinBox::valueChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->simpleOutputABitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->advOutTrack1Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->advOutTrack2Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->advOutTrack3Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->advOutTrack4Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->advOutTrack5Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(ui->advOutTrack6Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
 
 	//Apply button disabled until change.
 	EnableApplyButton(false);
 
-	// Initialize libff library
-	ff_init();
-
 	installEventFilter(new SettingsEventFilter());
 
 	LoadColorRanges();
@@ -812,78 +746,78 @@
 	if (obs_audio_monitoring_available())
 		FillAudioMonitoringDevices();
 
-	connect(ui->channelSetup, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SurroundWarning(int)));
-	connect(ui->channelSetup, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SpeakerLayoutChanged(int)));
-	connect(ui->lowLatencyBuffering, SIGNAL(clicked(bool)), this,
-		SLOT(LowLatencyBufferingChanged(bool)));
-	connect(ui->simpleOutRecQuality, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SimpleRecordingQualityChanged()));
-	connect(ui->simpleOutRecQuality, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SimpleRecordingQualityLosslessWarning(int)));
-	connect(ui->simpleOutRecFormat, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->simpleOutStrEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SimpleStreamingEncoderChanged()));
-	connect(ui->simpleOutStrEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->simpleOutRecEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->simpleOutRecAEncoder, SIGNAL(currentIndexChanged(int)),
-		this, SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->simpleOutputVBitrate, SIGNAL(valueChanged(int)), this,
-		SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->simpleOutputABitrate, SIGNAL(currentIndexChanged(int)),
-		this, SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->simpleOutAdvanced, SIGNAL(toggled(bool)), this,
-		SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->ignoreRecommended, SIGNAL(toggled(bool)), this,
-		SLOT(SimpleRecordingEncoderChanged()));
-	connect(ui->simpleReplayBuf, SIGNAL(toggled(bool)), this,
-		SLOT(SimpleReplayBufferChanged()));
-	connect(ui->simpleOutputVBitrate, SIGNAL(valueChanged(int)), this,
-		SLOT(SimpleReplayBufferChanged()));
-	connect(ui->simpleOutputABitrate, SIGNAL(currentIndexChanged(int)),
-		this, SLOT(SimpleReplayBufferChanged()));
-	connect(ui->simpleRBSecMax, SIGNAL(valueChanged(int)), this,
-		SLOT(SimpleReplayBufferChanged()));
-	connect(ui->advOutSplitFile, SIGNAL(stateChanged(int)), this,
-		SLOT(AdvOutSplitFileChanged()));
-	connect(ui->advOutSplitFileType, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvOutSplitFileChanged()));
-	connect(ui->advReplayBuf, SIGNAL(toggled(bool)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecTrack1, SIGNAL(toggled(bool)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecTrack2, SIGNAL(toggled(bool)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecTrack3, SIGNAL(toggled(bool)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecTrack4, SIGNAL(toggled(bool)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecTrack5, SIGNAL(toggled(bool)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecTrack6, SIGNAL(toggled(bool)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutTrack1Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutTrack2Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutTrack3Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutTrack4Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutTrack5Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutTrack6Bitrate, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecType, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advOutRecEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
-	connect(ui->advRBSecMax, SIGNAL(valueChanged(int)), this,
-		SLOT(AdvReplayBufferChanged()));
+	connect(ui->channelSetup, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SurroundWarning);
+	connect(ui->channelSetup, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SpeakerLayoutChanged);
+	connect(ui->lowLatencyBuffering, &QCheckBox::clicked, this,
+		&OBSBasicSettings::LowLatencyBufferingChanged);
+	connect(ui->simpleOutRecQuality, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleRecordingQualityChanged);
+	connect(ui->simpleOutRecQuality, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleRecordingQualityLosslessWarning);
+	connect(ui->simpleOutRecFormat, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->simpleOutStrEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleStreamingEncoderChanged);
+	connect(ui->simpleOutStrEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->simpleOutRecEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->simpleOutRecAEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->simpleOutputVBitrate, &QSpinBox::valueChanged, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->simpleOutputABitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->simpleOutAdvanced, &QCheckBox::toggled, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->ignoreRecommended, &QCheckBox::toggled, this,
+		&OBSBasicSettings::SimpleRecordingEncoderChanged);
+	connect(ui->simpleReplayBuf, &QCheckBox::toggled, this,
+		&OBSBasicSettings::SimpleReplayBufferChanged);
+	connect(ui->simpleOutputVBitrate, &QSpinBox::valueChanged, this,
+		&OBSBasicSettings::SimpleReplayBufferChanged);
+	connect(ui->simpleOutputABitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleReplayBufferChanged);
+	connect(ui->simpleRBSecMax, &QSpinBox::valueChanged, this,
+		&OBSBasicSettings::SimpleReplayBufferChanged);
+	connect(ui->advOutSplitFile, &QCheckBox::stateChanged, this,
+		&OBSBasicSettings::AdvOutSplitFileChanged);
+	connect(ui->advOutSplitFileType, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvOutSplitFileChanged);
+	connect(ui->advReplayBuf, &QCheckBox::toggled, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecTrack1, &QCheckBox::toggled, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecTrack2, &QCheckBox::toggled, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecTrack3, &QCheckBox::toggled, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecTrack4, &QCheckBox::toggled, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecTrack5, &QCheckBox::toggled, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecTrack6, &QCheckBox::toggled, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutTrack1Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutTrack2Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutTrack3Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutTrack4Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutTrack5Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutTrack6Bitrate, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecType, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advOutRecEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
+	connect(ui->advRBSecMax, &QSpinBox::valueChanged, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
 
 	// Get Bind to IP Addresses
 	obs_properties_t *ppts = obs_get_output_properties("rtmp_output");
@@ -897,6 +831,17 @@
 		ui->bindToIP->addItem(QT_UTF8(name), val);
 	}
 
+	// Add IP Family options
+	p = obs_properties_get(ppts, "ip_family");
+
+	count = obs_property_list_item_count(p);
+	for (size_t i = 0; i < count; i++) {
+		const char *name = obs_property_list_item_name(p, i);
+		const char *val = obs_property_list_item_string(p, i);
+
+		ui->ipFamily->addItem(QT_UTF8(name), val);
+	}
+
 	obs_properties_destroy(ppts);
 
 	InitStreamPage();
@@ -953,29 +898,30 @@
 		QTStr("Basic.Settings.Output.Reconnect"));
 
 	// Add warning checks to advanced output recording section controls
-	connect(ui->advOutRecTrack1, SIGNAL(clicked()), this,
-		SLOT(AdvOutRecCheckWarnings()));
-	connect(ui->advOutRecTrack2, SIGNAL(clicked()), this,
-		SLOT(AdvOutRecCheckWarnings()));
-	connect(ui->advOutRecTrack3, SIGNAL(clicked()), this,
-		SLOT(AdvOutRecCheckWarnings()));
-	connect(ui->advOutRecTrack4, SIGNAL(clicked()), this,
-		SLOT(AdvOutRecCheckWarnings()));
-	connect(ui->advOutRecTrack5, SIGNAL(clicked()), this,
-		SLOT(AdvOutRecCheckWarnings()));
-	connect(ui->advOutRecTrack6, SIGNAL(clicked()), this,
-		SLOT(AdvOutRecCheckWarnings()));
-	connect(ui->advOutRecEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvOutRecCheckWarnings()));
-	connect(ui->advOutRecAEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvOutRecCheckWarnings()));
+	connect(ui->advOutRecTrack1, &QCheckBox::clicked, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
+	connect(ui->advOutRecTrack2, &QCheckBox::clicked, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
+	connect(ui->advOutRecTrack3, &QCheckBox::clicked, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
+	connect(ui->advOutRecTrack4, &QCheckBox::clicked, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
+	connect(ui->advOutRecTrack5, &QCheckBox::clicked, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
+	connect(ui->advOutRecTrack6, &QCheckBox::clicked, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
+	connect(ui->advOutRecFormat, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
+	connect(ui->advOutRecEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvOutRecCheckWarnings);
 
 	// Check codec compatibility when format (container) changes
-	connect(ui->advOutRecFormat, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvOutRecCheckCodecs()));
+	connect(ui->advOutRecFormat, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvOutRecCheckCodecs);
 
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
 	// Set placeholder used when selection was reset due to incompatibilities
+	ui->advOutAEncoder->setPlaceholderText(
+		QTStr("CodecCompat.CodecPlaceholder"));
 	ui->advOutRecEncoder->setPlaceholderText(
 		QTStr("CodecCompat.CodecPlaceholder"));
 	ui->advOutRecAEncoder->setPlaceholderText(
@@ -986,7 +932,6 @@
 		QTStr("CodecCompat.CodecPlaceholder"));
 	ui->simpleOutRecFormat->setPlaceholderText(
 		QTStr("CodecCompat.ContainerPlaceholder"));
-#endif
 
 	SimpleRecordingQualityChanged();
 	AdvOutSplitFileChanged();
@@ -1009,15 +954,15 @@
 	ui->advOutRecRescale->lineEdit()->setValidator(validator);
 	ui->advOutFFRescale->lineEdit()->setValidator(validator);
 
-	connect(ui->useStreamKeyAdv, SIGNAL(clicked()), this,
-		SLOT(UseStreamKeyAdvClicked()));
+	connect(ui->useStreamKeyAdv, &QCheckBox::clicked, this,
+		&OBSBasicSettings::UseStreamKeyAdvClicked);
 
-	connect(ui->simpleOutStrAEncoder, SIGNAL(currentIndexChanged(int)),
-		this, SLOT(SimpleStreamAudioEncoderChanged()));
-	connect(ui->advOutAEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvAudioEncodersChanged()));
-	connect(ui->advOutRecAEncoder, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(AdvAudioEncodersChanged()));
+	connect(ui->simpleOutStrAEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::SimpleStreamAudioEncoderChanged);
+	connect(ui->advOutAEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvAudioEncodersChanged);
+	connect(ui->advOutRecAEncoder, &QComboBox::currentIndexChanged, this,
+		&OBSBasicSettings::AdvAudioEncodersChanged);
 
 	UpdateAudioWarnings();
 	UpdateAdvNetworkGroup();
@@ -1134,25 +1079,21 @@
 #define FORMAT_STR(str) QTStr("Basic.Settings.Output.Format." str)
 	ui->advOutFFFormat->blockSignals(true);
 
-	formats.reset(ff_format_supported());
-	const ff_format_desc *format = formats.get();
+	formats = GetSupportedFormats();
+
+	for (auto &format : formats) {
+		bool audio = format.HasAudio();
+		bool video = format.HasVideo();
 
-	while (format != nullptr) {
-		bool audio = ff_format_desc_has_audio(format);
-		bool video = ff_format_desc_has_video(format);
-		FormatDesc formatDesc(ff_format_desc_name(format),
-				 ff_format_desc_mime_type(format), format);
 		if (audio || video) {
-			QString itemText(ff_format_desc_name(format));
+			QString itemText(format.name);
 			if (audio ^ video)
 				itemText += QString(" (%1)").arg(
 					audio ? AUDIO_STR : VIDEO_STR);
 
 			ui->advOutFFFormat->addItem(
-				itemText, QVariant::fromValue(formatDesc));
+				itemText, QVariant::fromValue(format));
 		}
-
-		format = ff_format_desc_next(format);
 	}
 
 	ui->advOutFFFormat->model()->sort(0);
@@ -1181,80 +1122,80 @@
 #undef FORMAT_STR
 }
 
-static void AddCodec(QComboBox *combo, const ff_codec_desc *codec_desc)
+static void AddCodec(QComboBox *combo, const FFmpegCodec &codec)
 {
-	QString itemText(ff_codec_desc_name(codec_desc));
-	if (ff_codec_desc_is_alias(codec_desc))
-		itemText += QString(" (%1)").arg(
-			ff_codec_desc_base_name(codec_desc));
-
-	CodecDesc cd(ff_codec_desc_name(codec_desc),
-		 ff_codec_desc_id(codec_desc));
+	QString itemText;
+	if (codec.long_name)
+		itemText = QString("%1 - %2").arg(codec.name, codec.long_name);
+	else
+		itemText = codec.name;
 
-	combo->addItem(itemText, QVariant::fromValue(cd));
+	combo->addItem(itemText, QVariant::fromValue(codec));
 }
 
 #define AV_ENCODER_DEFAULT_STR \
 	QTStr("Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault")
 
-static void AddDefaultCodec(QComboBox *combo, const ff_format_desc *formatDesc,
-			 ff_codec_type codecType)
+static void AddDefaultCodec(QComboBox *combo, const FFmpegFormat &format,
+			 FFmpegCodecType codecType)
 {
-	CodecDesc cd = GetDefaultCodecDesc(formatDesc, codecType);
+	FFmpegCodec codec = format.GetDefaultEncoder(codecType);
 
-	int existingIdx = FindEncoder(combo, cd.name, cd.id);
+	int existingIdx = FindEncoder(combo, codec.name, codec.id);
 	if (existingIdx >= 0)
 		combo->removeItem(existingIdx);
 
-	combo->addItem(QString("%1 (%2)").arg(cd.name, AV_ENCODER_DEFAULT_STR),
-		 QVariant::fromValue(cd));
+	QString itemText;
+	if (codec.long_name) {
+		itemText = QString("%1 - %2 (%3)")
+				 .arg(codec.name, codec.long_name,
+					AV_ENCODER_DEFAULT_STR);
+	} else {
+		itemText = QString("%1 (%2)").arg(codec.name,
+						 AV_ENCODER_DEFAULT_STR);
+	}
+
+	combo->addItem(itemText, QVariant::fromValue(codec));
 }
 
 #define AV_ENCODER_DISABLE_STR \
 	QTStr("Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable")
 
-void OBSBasicSettings::ReloadCodecs(const ff_format_desc *formatDesc)
+void OBSBasicSettings::ReloadCodecs(const FFmpegFormat &format)
 {
 	ui->advOutFFAEncoder->blockSignals(true);
 	ui->advOutFFVEncoder->blockSignals(true);
 	ui->advOutFFAEncoder->clear();
 	ui->advOutFFVEncoder->clear();
 
-	if (formatDesc == nullptr)
-		return;
-
-	bool ignore_compatability = ui->advOutFFIgnoreCompat->isChecked();
-	OBSFFCodecDesc codecDescs(
-		ff_codec_supported(formatDesc, ignore_compatability));
-
-	const ff_codec_desc *codec = codecDescs.get();
-
-	while (codec != nullptr) {
-		switch (ff_codec_desc_type(codec)) {
-		case FF_CODEC_AUDIO:
+	bool ignore_compatibility = ui->advOutFFIgnoreCompat->isChecked();
+	vector<FFmpegCodec> supportedCodecs =
+		GetFormatCodecs(format, ignore_compatibility);
+
+	for (auto &codec : supportedCodecs) {
+		switch (codec.type) {
+		case AUDIO:
 			AddCodec(ui->advOutFFAEncoder, codec);
 			break;
-		case FF_CODEC_VIDEO:
+		case VIDEO:
 			AddCodec(ui->advOutFFVEncoder, codec);
 			break;
 		default:
 			break;
 		}
-
-		codec = ff_codec_desc_next(codec);
 	}
 
-	if (ff_format_desc_has_audio(formatDesc))
-		AddDefaultCodec(ui->advOutFFAEncoder, formatDesc,
-				FF_CODEC_AUDIO);
-	if (ff_format_desc_has_video(formatDesc))
-		AddDefaultCodec(ui->advOutFFVEncoder, formatDesc,
-				FF_CODEC_VIDEO);
+	if (format.HasAudio())
+		AddDefaultCodec(ui->advOutFFAEncoder, format,
+				FFmpegCodecType::AUDIO);
+	if (format.HasVideo())
+		AddDefaultCodec(ui->advOutFFVEncoder, format,
+				FFmpegCodecType::VIDEO);
 
 	ui->advOutFFAEncoder->model()->sort(0);
 	ui->advOutFFVEncoder->model()->sort(0);
 
-	QVariant disable = QVariant::fromValue(CodecDesc());
+	QVariant disable = QVariant::fromValue(FFmpegCodec());
 
 	ui->advOutFFAEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);
 	ui->advOutFFVEncoder->insertItem(0, AV_ENCODER_DISABLE_STR, disable);
@@ -1419,8 +1360,8 @@
 					"HideOBSWindowsFromCapture");
 		ui->hideOBSFromCapture->setChecked(hideWindowFromCapture);
 
-		connect(ui->hideOBSFromCapture, SIGNAL(stateChanged(int)), this,
-			SLOT(HideOBSWindowWarning(int)));
+		connect(ui->hideOBSFromCapture, &QCheckBox::stateChanged, this,
+			&OBSBasicSettings::HideOBSWindowWarning);
 	}
 #endif
 
@@ -2139,7 +2080,8 @@
 	view->setFrameShape(QFrame::NoFrame);
 	view->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 	view->setProperty("changed", QVariant(changed));
-	QObject::connect(view, SIGNAL(Changed()), this, SLOT(OutputsChanged()));
+	QObject::connect(view, &OBSPropertiesView::Changed, this,
+			 &OBSBasicSettings::OutputsChanged);
 
 	return view;
 }
@@ -2156,10 +2098,10 @@
 					 QSizePolicy::Minimum);
 	ui->advOutEncoderLayout->addWidget(streamEncoderProps);
 
-	connect(streamEncoderProps, SIGNAL(Changed()), this,
-		SLOT(UpdateStreamDelayEstimate()));
-	connect(streamEncoderProps, SIGNAL(Changed()), this,
-		SLOT(AdvReplayBufferChanged()));
+	connect(streamEncoderProps, &OBSPropertiesView::Changed, this,
+		&OBSBasicSettings::UpdateStreamDelayEstimate);
+	connect(streamEncoderProps, &OBSPropertiesView::Changed, this,
+		&OBSBasicSettings::AdvReplayBufferChanged);
 
 	curAdvStreamEncoder = type;
 
@@ -2272,8 +2214,8 @@
 						 QSizePolicy::Minimum);
 		ui->advOutRecEncoderProps->layout()->addWidget(
 			recordEncoderProps);
-		connect(recordEncoderProps, SIGNAL(Changed()), this,
-			SLOT(AdvReplayBufferChanged()));
+		connect(recordEncoderProps, &OBSPropertiesView::Changed, this,
+			&OBSBasicSettings::AdvReplayBufferChanged);
 	}
 
 	curAdvRecordEncoder = type;
@@ -2295,12 +2237,12 @@
 static void SelectFormat(QComboBox *combo, const char *name,
 			 const char *mimeType)
 {
-	FormatDesc formatDesc(name, mimeType);
+	FFmpegFormat format{name, mimeType};
 
 	for (int i = 0; i < combo->count(); i++) {
 		QVariant v = combo->itemData(i);
 		if (!v.isNull()) {
-			if (formatDesc == v.value<FormatDesc>()) {
+			if (format == v.value<FFmpegFormat>()) {
 				combo->setCurrentIndex(i);
 				return;
 			}
@@ -2487,7 +2429,8 @@
 
 	const char *type =
 		config_get_string(main->Config(), "AdvOut", "AudioEncoder");
-	SetComboByValue(ui->advOutAEncoder, type);
+	if (!SetComboByValue(ui->advOutAEncoder, type))
+		ui->advOutAEncoder->setCurrentIndex(-1);
 
 	LoadAdvOutputRecordingSettings();
 	LoadAdvOutputRecordingEncoderProperties();
@@ -2516,14 +2459,14 @@
 	loading = false;
 }
 
-void OBSBasicSettings::SetAdvOutputFFmpegEnablement(ff_codec_type encoderType,
+void OBSBasicSettings::SetAdvOutputFFmpegEnablement(FFmpegCodecType encoderType,
 						 bool enabled,
 						 bool enableEncoder)
 {
 	bool rescale = config_get_bool(main->Config(), "AdvOut", "FFRescale");
 
 	switch (encoderType) {
-	case FF_CODEC_VIDEO:
+	case FFmpegCodecType::VIDEO:
 		ui->advOutFFVBitrate->setEnabled(enabled);
 		ui->advOutFFVGOPSize->setEnabled(enabled);
 		ui->advOutFFUseRescale->setEnabled(enabled);
@@ -2531,7 +2474,7 @@
 		ui->advOutFFVEncoder->setEnabled(enabled || enableEncoder);
 		ui->advOutFFVCfg->setEnabled(enabled);
 		break;
-	case FF_CODEC_AUDIO:
+	case FFmpegCodecType::AUDIO:
 		ui->advOutFFABitrate->setEnabled(enabled);
 		ui->advOutFFAEncoder->setEnabled(enabled || enableEncoder);
 		ui->advOutFFACfg->setEnabled(enabled);
@@ -2897,10 +2840,10 @@
 		App()->GlobalConfig(), "General", "HotkeyFocusType");
 	bool dynBitrate =
 		config_get_bool(main->Config(), "Output", "DynamicBitrate");
-
+	const char *ipFamily =
+		config_get_string(main->Config(), "Output", "IPFamily");
 	bool confirmOnExit =
 		config_get_bool(GetGlobalConfig(), "General", "ConfirmOnExit");
-	ui->confirmOnExit->setChecked(confirmOnExit);
 
 	loading = true;
 
@@ -2911,6 +2854,8 @@
 		SetInvalidValue(ui->monitoringDevice, monDevName.toUtf8(),
 				monDevId.toUtf8());
 
+	ui->confirmOnExit->setChecked(confirmOnExit);
+
 	ui->filenameFormatting->setText(filename);
 	ui->overwriteIfExists->setChecked(overwriteIfExists);
 	ui->simpleRBPrefix->setText(rbPrefix);
@@ -2936,6 +2881,7 @@
 	ui->sdrWhiteLevel->setValue(sdrWhiteLevel);
 	ui->hdrNominalPeakLevel->setValue(hdrNominalPeakLevel);
 
+	SetComboByValue(ui->ipFamily, ipFamily);
 	if (!SetComboByValue(ui->bindToIP, bindIP))
 		SetInvalidValue(ui->bindToIP, bindIP, bindIP);
 
@@ -3669,6 +3615,7 @@
 	SaveSpinBox(ui->reconnectRetryDelay, "Output", "RetryDelay");
 	SaveSpinBox(ui->reconnectMaxRetries, "Output", "MaxRetries");
 	SaveComboData(ui->bindToIP, "Output", "BindIP");
+	SaveComboData(ui->ipFamily, "Output", "IPFamily");
 	SaveCheckBox(ui->autoRemux, "Video", "AutoRemux");
 	SaveCheckBox(ui->dynBitrate, "Output", "DynamicBitrate");
 
@@ -3756,13 +3703,13 @@
 {
 	QVariant v = combo->currentData();
 	if (!v.isNull()) {
-		FormatDesc desc = v.value<FormatDesc>();
+		auto format = v.value<FFmpegFormat>();
 		config_set_string(main->Config(), "AdvOut", "FFFormat",
-				 desc.name);
+				 format.name);
 		config_set_string(main->Config(), "AdvOut", "FFFormatMimeType",
-				 desc.mimeType);
+				 format.mime_type);
 
-		const char *ext = ff_format_desc_extensions(desc.desc);
+		const char *ext = format.extensions;
 		string extStr = ext ? ext : "";
 
 		char *comma = strchr(&extStr0, ',');
@@ -3785,9 +3732,10 @@
 				 const char *value)
 {
 	QVariant v = combo->currentData();
-	CodecDesc cd;
+	FFmpegCodec cd{};
 	if (!v.isNull())
-		cd = v.value<CodecDesc>();
+		cd = v.value<FFmpegCodec>();
+
 	config_set_int(main->Config(), section,
 		 QT_TO_UTF8(QString("%1Id").arg(value)), cd.id);
 	if (cd.id != 0)
@@ -4301,6 +4249,27 @@
 	pageIndex = row;
 }
 
+void OBSBasicSettings::UpdateYouTubeAppDockSettings()
+{
+#if defined(BROWSER_AVAILABLE) && defined(YOUTUBE_ENABLED)
+	if (cef_js_avail) {
+		std::string service = ui->service->currentText().toStdString();
+		if (IsYouTubeService(service)) {
+			if (!main->GetYouTubeAppDock()) {
+				main->NewYouTubeAppDock();
+			}
+			main->GetYouTubeAppDock()->SettingsUpdated(
+				!IsYouTubeService(service) || stream1Changed);
+		} else {
+			if (main->GetYouTubeAppDock()) {
+				main->GetYouTubeAppDock()->AccountDisconnected();
+			}
+			main->DeleteYouTubeAppDock();
+		}
+	}
+#endif
+}
+
 void OBSBasicSettings::on_buttonBox_clicked(QAbstractButton *button)
 {
 	QDialogButtonBox::ButtonRole val = ui->buttonBox->buttonRole(button);
@@ -4311,6 +4280,8 @@
 			return;
 
 		SaveSettings();
+
+		UpdateYouTubeAppDockSettings();
 		ClearChanged();
 	}
 
@@ -4403,8 +4374,8 @@
 						 QSizePolicy::Minimum);
 		ui->advOutRecEncoderProps->layout()->addWidget(
 			recordEncoderProps);
-		connect(recordEncoderProps, SIGNAL(Changed()), this,
-			SLOT(AdvReplayBufferChanged()));
+		connect(recordEncoderProps, &OBSPropertiesView::Changed, this,
+			&OBSBasicSettings::AdvReplayBufferChanged);
 	}
 
 	ui->advOutRecUseRescale->setVisible(true);
@@ -4427,27 +4398,29 @@
 	const QVariant itemDataVariant = ui->advOutFFFormat->itemData(idx);
 
 	if (!itemDataVariant.isNull()) {
-		FormatDesc desc = itemDataVariant.value<FormatDesc>();
-		SetAdvOutputFFmpegEnablement(
-			FF_CODEC_AUDIO, ff_format_desc_has_audio(desc.desc),
-			false);
-		SetAdvOutputFFmpegEnablement(
-			FF_CODEC_VIDEO, ff_format_desc_has_video(desc.desc),
-			false);
-		ReloadCodecs(desc.desc);
-		ui->advOutFFFormatDesc->setText(
-			ff_format_desc_long_name(desc.desc));
-
-		CodecDesc defaultAudioCodecDesc =
-			GetDefaultCodecDesc(desc.desc, FF_CODEC_AUDIO);
-		CodecDesc defaultVideoCodecDesc =
-			GetDefaultCodecDesc(desc.desc, FF_CODEC_VIDEO);
+		auto format = itemDataVariant.value<FFmpegFormat>();
+		SetAdvOutputFFmpegEnablement(FFmpegCodecType::AUDIO,
+					 format.HasAudio(), false);
+		SetAdvOutputFFmpegEnablement(FFmpegCodecType::VIDEO,
+					 format.HasVideo(), false);
+		ReloadCodecs(format);
+
+		ui->advOutFFFormatDesc->setText(format.long_name);
+
+		FFmpegCodec defaultAudioCodecDesc =
+			format.GetDefaultEncoder(FFmpegCodecType::AUDIO);
+		FFmpegCodec defaultVideoCodecDesc =
+			format.GetDefaultEncoder(FFmpegCodecType::VIDEO);
 		SelectEncoder(ui->advOutFFAEncoder, defaultAudioCodecDesc.name,
 			 defaultAudioCodecDesc.id);
 		SelectEncoder(ui->advOutFFVEncoder, defaultVideoCodecDesc.name,
 			 defaultVideoCodecDesc.id);
 	} else {
-		ReloadCodecs(nullptr);
+		ui->advOutFFAEncoder->blockSignals(true);
+		ui->advOutFFVEncoder->blockSignals(true);
+		ui->advOutFFAEncoder->clear();
+		ui->advOutFFVEncoder->clear();
+
 		ui->advOutFFFormatDesc->setText(DEFAULT_CONTAINER_STR);
 	}
 }
@@ -4456,10 +4429,9 @@
 {
 	const QVariant itemDataVariant = ui->advOutFFAEncoder->itemData(idx);
 	if (!itemDataVariant.isNull()) {
-		CodecDesc desc = itemDataVariant.value<CodecDesc>();
+		auto desc = itemDataVariant.value<FFmpegCodec>();
 		SetAdvOutputFFmpegEnablement(
-			FF_CODEC_AUDIO, desc.id != 0 || desc.name != nullptr,
-			true);
+			AUDIO, desc.id != 0 || desc.name != nullptr, true);
 	}
 }
 
@@ -4467,10 +4439,9 @@
 {
 	const QVariant itemDataVariant = ui->advOutFFVEncoder->itemData(idx);
 	if (!itemDataVariant.isNull()) {
-		CodecDesc desc = itemDataVariant.value<CodecDesc>();
+		auto desc = itemDataVariant.value<FFmpegCodec>();
 		SetAdvOutputFFmpegEnablement(
-			FF_CODEC_VIDEO, desc.id != 0 || desc.name != nullptr,
-			true);
+			VIDEO, desc.id != 0 || desc.name != nullptr, true);
 	}
 }
 
@@ -4896,7 +4867,7 @@
 		return h2;
 	}
 };
-}
+} // namespace std
 
 bool OBSBasicSettings::ScanDuplicateHotkeys(QFormLayout *layout)
 {
@@ -4984,42 +4955,6 @@
 	ui->advOutSplitFileSize->setVisible(splitFileType == 1);
 }
 
-static const unordered_set<string> builtin_codecs = {
-	"h264", "hevc", "av1", "prores", "aac", "opus",
-	"alac", "flac", "pcm_s16le", "pcm_s24le", "pcm_f32le"};
-
-static const unordered_map<string, unordered_set<string>> codec_compat = {
-	// Technically our muxer supports HEVC and AV1 as well, but nothing else does
-	{"flv", {"h264", "aac"}},
-	{"mpegts", {"h264", "hevc", "aac", "opus"}},
-	{"hls",
-	 {"h264", "hevc", "aac"}}, // Also using MPEG-TS, but no Opus support
-	{"mov",
-	 {"h264", "hevc", "prores", "aac", "alac", "pcm_s16le", "pcm_s24le",
-	 "pcm_f32le"}},
-	{"mp4", {"h264", "hevc", "av1", "aac", "opus", "alac", "flac"}},
-	{"fragmented_mov",
-	 {"h264", "hevc", "prores", "aac", "alac", "pcm_s16le", "pcm_s24le",
-	 "pcm_f32le"}},
-	{"fragmented_mp4",
-	 {"h264", "hevc", "av1", "aac", "opus", "alac", "flac"}},
-	// MKV supports everything
-	{"mkv", {}},
-};
-
-static bool ContainerSupportsCodec(const string &container, const string &codec)
-{
-	auto iter = codec_compat.find(container);
-	if (iter == codec_compat.end())
-		return false;
-
-	auto codecs = iter->second;
-	// Assume everything is supported
-	if (codecs.empty())
-		return true;
-	return codecs.count(codec) > 0;
-}
-
 static void DisableIncompatibleCodecs(QComboBox *cbox, const QString &format,
 				 const QString &formatName,
 				 const QString &streamEncoder)
@@ -5039,15 +4974,20 @@
 						 ? strEncLabel
 						 : obs_encoder_get_display_name(
 							 encoderId.c_str());
+
+		/* Something has gone horribly wrong and there's no encoder */
+		if (encoderId.empty())
+			continue;
+
 		const char *codec = obs_get_encoder_codec(encoderId.c_str());
 
 		bool is_compatible =
 			ContainerSupportsCodec(format.toStdString(), codec);
 		/* Fall back to FFmpeg check if codec not one of the built-in ones. */
-		if (!is_compatible && !builtin_codecs.count(codec)) {
+		if (!is_compatible && !IsBuiltinCodec(codec)) {
 			string ext = GetFormatExt(QT_TO_UTF8(format));
 			is_compatible =
-				ff_format_codec_compatible(codec, ext.c_str());
+				FFCodecAndFormatCompatible(codec, ext.c_str());
 		}
 
 		QStandardItemModel *model =
@@ -5131,7 +5071,9 @@
 
 void OBSBasicSettings::AdvOutRecCheckWarnings()
 {
-	auto Checked = (QCheckBox *box) { return box->isChecked() ? 1 : 0; };
+	auto Checked = (QCheckBox *box) {
+		return box->isChecked() ? 1 : 0;
+	};
 
 	QString errorMsg;
 	QString warningMsg;
@@ -5907,14 +5849,12 @@
 
 	if (qual == "Stream") {
 		ui->simpleRecTrackWidget->setCurrentWidget(ui->simpleFlvTracks);
-		ui->simpleFlvTracks->setEnabled(false);
 	} else if (qual == "Lossless") {
 		ui->simpleRecTrackWidget->setCurrentWidget(ui->simpleRecTracks);
 	} else {
 		if (format == "flv") {
 			ui->simpleRecTrackWidget->setCurrentWidget(
 				ui->simpleFlvTracks);
-			ui->simpleFlvTracks->setEnabled(false);
 		} else {
 			ui->simpleRecTrackWidget->setCurrentWidget(
 				ui->simpleRecTracks);
@@ -6226,6 +6166,8 @@
 	ui->bindToIPLabel->setVisible(enabled);
 	ui->bindToIP->setVisible(enabled);
 	ui->dynBitrate->setVisible(enabled);
+	ui->ipFamilyLabel->setVisible(enabled);
+	ui->ipFamily->setVisible(enabled);
 #ifdef _WIN32
 	ui->enableNewSocketLoop->setVisible(enabled);
 	ui->enableLowLatencyMode->setVisible(enabled);

obs-studio-29.1.3.tar.xz/UI/window-basic-settings.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-settings.hpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 Philippe Groarke <philippe.groarke@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
@@ -24,11 +24,10 @@
 #include <memory>
 #include <string>
 
-#include <libff/ff-util.h>
-
 #include <obs.hpp>
 
 #include "auth-base.hpp"
+#include "ffmpeg-utils.hpp"
 
 class OBSBasic;
 class QAbstractButton;
@@ -69,20 +68,6 @@
 	}
 };
 
-class OBSFFDeleter {
-public:
-	void operator()(const ff_format_desc *format)
-	{
-		ff_format_desc_free(format);
-	}
-	void operator()(const ff_codec_desc *codec)
-	{
-		ff_codec_desc_free(codec);
-	}
-};
-using OBSFFCodecDesc = std::unique_ptr<const ff_codec_desc, OBSFFDeleter>;
-using OBSFFFormatDesc = std::unique_ptr<const ff_format_desc, OBSFFDeleter>;
-
 class OBSBasicSettings : public QDialog {
 	Q_OBJECT
 	Q_PROPERTY(QIcon generalIcon READ GetGeneralIcon WRITE SetGeneralIcon
@@ -135,7 +120,7 @@
 	static constexpr uint32_t ENCODER_HIDE_FLAGS =
 		(OBS_ENCODER_CAP_DEPRECATED | OBS_ENCODER_CAP_INTERNAL);
 
-	OBSFFFormatDesc formats;
+	std::vector<FFmpegFormat> formats;
 
 	OBSPropertiesView *streamProperties = nullptr;
 	OBSPropertiesView *streamEncoderProps = nullptr;
@@ -221,7 +206,15 @@
 		EnableApplyButton(false);
 	}
 
-	void HookWidget(QWidget *widget, const char *signal, const char *slot);
+	template<typename Widget, typename WidgetParent, typename... SignalArgs,
+		 typename... SlotArgs>
+	void HookWidget(Widget *widget,
+			void (WidgetParent::*signal)(SignalArgs...),
+			void (OBSBasicSettings::*slot)(SlotArgs...))
+	{
+		QObject::connect(widget, signal, this, slot);
+		widget->setProperty("changed", QVariant(false));
+	}
 
 	bool QueryChanges();
 	bool QueryAllowedToClose();
@@ -231,7 +224,7 @@
 	void LoadColorSpaces();
 	void LoadColorFormats();
 	void LoadFormats();
-	void ReloadCodecs(const ff_format_desc *formatDesc);
+	void ReloadCodecs(const FFmpegFormat &format);
 
 	void UpdateColorFormatSpaceWarning();
 
@@ -258,6 +251,7 @@
 	/* stream */
 	void InitStreamPage();
 	inline bool IsCustomService() const;
+	inline bool IsWHIP() const;
 	void LoadServices(bool showAll);
 	void OnOAuthStreamKeyConnected();
 	void OnAuthConnected();
@@ -267,7 +261,7 @@
 	int prevLangIndex;
 	bool prevBrowserAccel;
 
-	void ServiceChanged();
+	void ServiceChanged(bool resetFields = false);
 	QString FindProtocol();
 	void UpdateServerList();
 	void UpdateKeyLink();
@@ -300,7 +294,7 @@
 	void LoadAdvOutputRecordingEncoderProperties();
 	void LoadAdvOutputFFmpegSettings();
 	void LoadAdvOutputAudioSettings();
-	void SetAdvOutputFFmpegEnablement(ff_codec_type encoderType,
+	void SetAdvOutputFFmpegEnablement(FFmpegCodecType encoderType,
 					 bool enabled,
 					 bool enableEncode = false);
 
@@ -356,6 +350,8 @@
 
 	bool AskIfCanCloseSettings();
 
+	void UpdateYouTubeAppDockSettings();
+
 	QIcon generalIcon;
 	QIcon streamIcon;
 	QIcon outputIcon;

obs-studio-29.1.3.tar.xz/UI/window-basic-source-select.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-source-select.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 bool OBSBasicSourceSelect::EnumSources(void *data, obs_source_t *source)
 {
 	if (obs_source_is_hidden(source))
-		return false;
+		return true;
 
 	OBSBasicSourceSelect *window =
 		static_cast<OBSBasicSourceSelect *>(data);
@@ -408,6 +408,26 @@
 
 	installEventFilter(CreateShortcutFilter());
 
+	connect(ui->createNew, &QRadioButton::pressed, &() {
+		QPushButton *button =
+			ui->buttonBox->button(QDialogButtonBox::Ok);
+		if (!button->isEnabled())
+			button->setEnabled(true);
+	});
+	connect(ui->selectExisting, &QRadioButton::pressed, &() {
+		QPushButton *button =
+			ui->buttonBox->button(QDialogButtonBox::Ok);
+		bool enabled = ui->sourceList->selectedItems().size() != 0;
+		if (button->isEnabled() != enabled)
+			button->setEnabled(enabled);
+	});
+	connect(ui->sourceList, &QListWidget::itemSelectionChanged, &() {
+		QPushButton *button =
+			ui->buttonBox->button(QDialogButtonBox::Ok);
+		if (!button->isEnabled())
+			button->setEnabled(true);
+	});
+
 	if (strcmp(id_, "scene") == 0) {
 		OBSBasic *main =
 			reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
@@ -417,6 +437,7 @@
 		ui->createNew->setChecked(false);
 		ui->createNew->setEnabled(false);
 		ui->sourceName->setEnabled(false);
+		ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 
 		int count = main->ui->scenes->count();
 		for (int i = 0; i < count; i++) {

obs-studio-29.1.3.tar.xz/UI/window-basic-source-select.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-source-select.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-stats.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-stats.cpp Changed

@@ -29,6 +29,12 @@
 	case OBS_FRONTEND_EVENT_RECORDING_STOPPED:
 		stats->ResetRecTimeLeft();
 		break;
+	case OBS_FRONTEND_EVENT_EXIT:
+		// This is only reached when the non-closable (dock) stats
+		// window is being cleaned up. The closable stats window is
+		// already gone by this point as it's deleted on close.
+		obs_frontend_remove_event_callback(OBSFrontendEvent, stats);
+		break;
 	default:
 		break;
 	}
@@ -36,9 +42,8 @@
 
 static QString MakeTimeLeftText(int hours, int minutes)
 {
-	return QString::asprintf("%d %s, %d %s", hours,
-				 QT_TO_UTF8(QTStr("Hours")), minutes,
-				 QT_TO_UTF8(QTStr("Minutes")));
+	return QString::asprintf("%d %s, %d %s", hours, Str("Hours"), minutes,
+				 Str("Minutes"));
 }
 
 static QString MakeMissedFramesText(uint32_t total_lagged,
@@ -50,7 +55,7 @@
 		     QString::number(num, 'f', 1));
 }
 
-OBSBasicStats::OBSBasicStats(QWidget *parent, bool closeable)
+OBSBasicStats::OBSBasicStats(QWidget *parent, bool closable)
 	: QFrame(parent),
 	  cpu_info(os_cpu_usage_info_start()),
 	  timer(this),
@@ -110,13 +115,13 @@
 
 	/* --------------------------------------------- */
 	QPushButton *closeButton = nullptr;
-	if (closeable)
+	if (closable)
 		closeButton = new QPushButton(QTStr("Close"));
 	QPushButton *resetButton = new QPushButton(QTStr("Reset"));
 	QHBoxLayout *buttonLayout = new QHBoxLayout;
 	buttonLayout->addStretch();
 	buttonLayout->addWidget(resetButton);
-	if (closeable)
+	if (closable)
 		buttonLayout->addWidget(closeButton);
 
 	/* --------------------------------------------- */
@@ -160,7 +165,7 @@
 	setLayout(mainLayout);
 
 	/* --------------------------------------------- */
-	if (closeable)
+	if (closable)
 		connect(closeButton, &QPushButton::clicked,
 			this() { close(); });
 	connect(resetButton, &QPushButton::clicked, this() { Reset(); });
@@ -229,13 +234,15 @@
 		config_save_safe(main->Config(), "tmp", nullptr);
 	}
 
+	// This code is only reached when the non-dockable stats window is
+	// manually closed or OBS is exiting.
+	obs_frontend_remove_event_callback(OBSFrontendEvent, this);
+
 	QWidget::closeEvent(event);
 }
 
 OBSBasicStats::~OBSBasicStats()
 {
-	obs_frontend_remove_event_callback(OBSFrontendEvent, this);
-
 	delete shortcutFilter;
 	os_cpu_usage_info_destroy(cpu_info);
 }

obs-studio-29.1.3.tar.xz/UI/window-basic-status-bar.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-status-bar.cpp Changed

@@ -1,105 +1,81 @@
-#include <QLabel>
-#include <QHBoxLayout>
 #include <QPainter>
 #include <QPixmap>
 #include "obs-app.hpp"
 #include "window-basic-main.hpp"
 #include "window-basic-status-bar.hpp"
 #include "window-basic-main-outputs.hpp"
+#include "qt-wrappers.hpp"
+#include "platform.hpp"
+
+#include "ui_StatusBarWidget.h"
+
+static constexpr int bitrateUpdateSeconds = 2;
+static constexpr int congestionUpdateSeconds = 4;
+static constexpr float excellentThreshold = 0.0f;
+static constexpr float goodThreshold = 0.3333f;
+static constexpr float mediocreThreshold = 0.6667f;
+static constexpr float badThreshold = 1.0f;
+
+StatusBarWidget::StatusBarWidget(QWidget *parent)
+	: QWidget(parent),
+	 ui(new Ui::StatusBarWidget)
+{
+	ui->setupUi(this);
+}
+
+StatusBarWidget::~StatusBarWidget() {}
 
 OBSBasicStatusBar::OBSBasicStatusBar(QWidget *parent)
 	: QStatusBar(parent),
-	 delayInfo(new QLabel),
-	 droppedFrames(new QLabel),
-	 streamIcon(new QLabel),
-	 streamTime(new QLabel),
-	 recordTime(new QLabel),
-	 recordIcon(new QLabel),
-	 cpuUsage(new QLabel),
-	 transparentPixmap(20, 20),
-	 greenPixmap(20, 20),
-	 grayPixmap(20, 20),
-	 redPixmap(20, 20),
+	 excellentPixmap(QIcon(":/res/images/network-excellent.svg")
+				 .pixmap(QSize(16, 16))),
+	 goodPixmap(
+		 QIcon(":/res/images/network-good.svg").pixmap(QSize(16, 16))),
+	 mediocrePixmap(QIcon(":/res/images/network-mediocre.svg")
+				 .pixmap(QSize(16, 16))),
+	 badPixmap(
+		 QIcon(":/res/images/network-bad.svg").pixmap(QSize(16, 16))),
 	 recordingActivePixmap(QIcon(":/res/images/recording-active.svg")
-					.pixmap(QSize(20, 20))),
+					.pixmap(QSize(16, 16))),
 	 recordingPausePixmap(QIcon(":/res/images/recording-pause.svg")
-				 .pixmap(QSize(20, 20))),
-	 recordingPauseInactivePixmap(
-		 QIcon(":/res/images/recording-pause-inactive.svg")
-			 .pixmap(QSize(20, 20))),
-	 recordingInactivePixmap(QIcon(":/res/images/recording-inactive.svg")
-					 .pixmap(QSize(20, 20))),
+				 .pixmap(QSize(16, 16))),
 	 streamingActivePixmap(QIcon(":/res/images/streaming-active.svg")
-					.pixmap(QSize(20, 20))),
-	 streamingInactivePixmap(QIcon(":/res/images/streaming-inactive.svg")
-					 .pixmap(QSize(20, 20)))
+					.pixmap(QSize(16, 16)))
 {
-	streamTime->setText(QString("LIVE: 00:00:00"));
-	recordTime->setText(QString("REC: 00:00:00"));
-	cpuUsage->setText(QString("CPU: 0.0%, 0.00 fps"));
-
-	streamIcon->setPixmap(streamingInactivePixmap);
-	recordIcon->setPixmap(recordingInactivePixmap);
-
-	QWidget *brWidget = new QWidget(this);
-	QHBoxLayout *brLayout = new QHBoxLayout(brWidget);
-	brLayout->setContentsMargins(0, 0, 0, 0);
-
-	statusSquare = new QLabel(brWidget);
-	brLayout->addWidget(statusSquare);
-
-	kbps = new QLabel(brWidget);
-	brLayout->addWidget(kbps);
-
-	brWidget->setLayout(brLayout);
-
-	delayInfo->setAlignment(Qt::AlignRight);
-	delayInfo->setAlignment(Qt::AlignVCenter);
-	droppedFrames->setAlignment(Qt::AlignRight);
-	droppedFrames->setAlignment(Qt::AlignVCenter);
-	streamIcon->setAlignment(Qt::AlignRight);
-	streamIcon->setAlignment(Qt::AlignVCenter);
-	streamTime->setAlignment(Qt::AlignRight);
-	streamTime->setAlignment(Qt::AlignVCenter);
-	recordIcon->setAlignment(Qt::AlignRight);
-	recordIcon->setAlignment(Qt::AlignVCenter);
-	recordTime->setAlignment(Qt::AlignRight);
-	recordTime->setAlignment(Qt::AlignVCenter);
-	cpuUsage->setAlignment(Qt::AlignRight);
-	cpuUsage->setAlignment(Qt::AlignVCenter);
-	kbps->setAlignment(Qt::AlignRight);
-	kbps->setAlignment(Qt::AlignVCenter);
-
-	delayInfo->setIndent(20);
-	droppedFrames->setIndent(20);
-	streamIcon->setIndent(20);
-	recordIcon->setIndent(20);
-	cpuUsage->setIndent(20);
-	kbps->setIndent(10);
-
-	addPermanentWidget(droppedFrames);
-	addPermanentWidget(streamIcon);
-	addPermanentWidget(streamTime);
-	addPermanentWidget(recordIcon);
-	addPermanentWidget(recordTime);
-	addPermanentWidget(cpuUsage);
-	addPermanentWidget(delayInfo);
-	addPermanentWidget(brWidget);
-
-	transparentPixmap.fill(QColor(0, 0, 0, 0));
-	greenPixmap.fill(QColor(0, 255, 0));
-	grayPixmap.fill(QColor(72, 72, 72));
-	redPixmap.fill(QColor(255, 0, 0));
-
-	statusSquare->setPixmap(transparentPixmap);
+	statusWidget = new StatusBarWidget(this);
+	statusWidget->ui->delayInfo->setText("");
+	statusWidget->ui->droppedFrames->setText(
+		QTStr("DroppedFrames").arg("0", "0.0"));
+	statusWidget->ui->statusIcon->setPixmap(inactivePixmap);
+	statusWidget->ui->streamIcon->setPixmap(streamingInactivePixmap);
+	statusWidget->ui->streamTime->setDisabled(true);
+	statusWidget->ui->recordIcon->setPixmap(recordingInactivePixmap);
+	statusWidget->ui->recordTime->setDisabled(true);
+	statusWidget->ui->delayFrame->hide();
+	statusWidget->ui->issuesFrame->hide();
+	statusWidget->ui->kbps->hide();
+
+	addPermanentWidget(statusWidget, 1);
+	setMinimumHeight(statusWidget->height());
+
+	UpdateIcons();
+	connect(App(), &OBSApp::StyleChanged, this,
+		&OBSBasicStatusBar::UpdateIcons);
+
+	messageTimer = new QTimer(this);
+	messageTimer->setSingleShot(true);
+	connect(messageTimer, &QTimer::timeout, this,
+		&OBSBasicStatusBar::clearMessage);
+
+	clearMessage();
 }
 
 void OBSBasicStatusBar::Activate()
 {
 	if (!active) {
 		refreshTimer = new QTimer(this);
-		connect(refreshTimer, SIGNAL(timeout()), this,
-			SLOT(UpdateStatusBar()));
+		connect(refreshTimer, &QTimer::timeout, this,
+			&OBSBasicStatusBar::UpdateStatusBar);
 
 		int skipped = video_output_get_skipped_frames(obs_get_video());
 		int total = video_output_get_total_frames(obs_get_video());
@@ -114,16 +90,21 @@
 		active = true;
 
 		if (streamOutput) {
-			statusSquare->setPixmap(grayPixmap);
+			statusWidget->ui->statusIcon->setPixmap(inactivePixmap);
 		}
 	}
 
 	if (streamOutput) {
-		streamIcon->setPixmap(streamingActivePixmap);
+		statusWidget->ui->streamIcon->setPixmap(streamingActivePixmap);
+		statusWidget->ui->streamTime->setDisabled(false);
+		statusWidget->ui->issuesFrame->show();
+		statusWidget->ui->kbps->show();
+		firstCongestionUpdate = true;
 	}
 
 	if (recordOutput) {
-		recordIcon->setPixmap(recordingActivePixmap);
+		statusWidget->ui->recordIcon->setPixmap(recordingActivePixmap);
+		statusWidget->ui->recordTime->setDisabled(false);
 	}
 }
 
@@ -134,23 +115,35 @@
 		return;
 
 	if (!streamOutput) {
-		streamTime->setText(QString("LIVE: 00:00:00"));
-		streamIcon->setPixmap(streamingInactivePixmap);
+		statusWidget->ui->streamTime->setText(QString("00:00:00"));
+		statusWidget->ui->streamTime->setDisabled(true);
+		statusWidget->ui->streamIcon->setPixmap(
+			streamingInactivePixmap);
+		statusWidget->ui->statusIcon->setPixmap(inactivePixmap);
+		statusWidget->ui->delayFrame->hide();
+		statusWidget->ui->issuesFrame->hide();
+		statusWidget->ui->kbps->hide();
 		totalStreamSeconds = 0;
+		congestionArray.clear();
+		disconnected = false;
+		firstCongestionUpdate = false;
 	}
 
 	if (!recordOutput) {
-		recordTime->setText(QString("REC: 00:00:00"));
-		recordIcon->setPixmap(recordingInactivePixmap);
+		statusWidget->ui->recordTime->setText(QString("00:00:00"));
+		statusWidget->ui->recordTime->setDisabled(true);
+		statusWidget->ui->recordIcon->setPixmap(
+			recordingInactivePixmap);
 		totalRecordSeconds = 0;
 	}
 
 	if (main->outputHandler && !main->outputHandler->Active()) {
 		delete refreshTimer;
 
-		delayInfo->setText("");
-		droppedFrames->setText("");
-		kbps->setText("");
+		statusWidget->ui->delayInfo->setText("");
+		statusWidget->ui->droppedFrames->setText(
+			QTStr("DroppedFrames").arg("0", "0.0"));
+		statusWidget->ui->kbps->setText("0 kbps");
 
 		delaySecTotal = 0;
 		delaySecStarting = 0;
@@ -159,7 +152,7 @@
 		active = false;
 		overloadedNotify = true;
 
-		statusSquare->setPixmap(transparentPixmap);
+		statusWidget->ui->statusIcon->setPixmap(inactivePixmap);
 	}
 }
 
@@ -184,19 +177,20 @@
 			msg = QTStr("Basic.StatusBar.Delay");
 			msg = msg.arg(QString::number(delaySecTotal));
 		}
-	}
 
-	delayInfo->setText(msg);
-}
+		if (!statusWidget->ui->delayFrame->isVisible())
+			statusWidget->ui->delayFrame->show();
 
-#define BITRATE_UPDATE_SECONDS 2
+		statusWidget->ui->delayInfo->setText(msg);
+	}
+}
 
 void OBSBasicStatusBar::UpdateBandwidth()
 {
 	if (!streamOutput)
 		return;
 
-	if (++bitrateUpdateSeconds < BITRATE_UPDATE_SECONDS)
+	if (++seconds < bitrateUpdateSeconds)
 		return;
 
 	uint64_t bytesSent = obs_output_get_total_bytes(streamOutput);
@@ -215,14 +209,18 @@
 	double kbitsPerSec = double(bitsBetween) / timePassed / 1000.0;
 
 	QString text;
-	text += QString("kb/s: ") + QString::number(kbitsPerSec, 'f', 0);
+	text += QString::number(kbitsPerSec, 'f', 0) + QString(" kbps");
 
-	kbps->setText(text);
-	kbps->setMinimumWidth(kbps->width());
+	statusWidget->ui->kbps->setText(text);
+	statusWidget->ui->kbps->setMinimumWidth(
+		statusWidget->ui->kbps->width());
+
+	if (!statusWidget->ui->kbps->isVisible())
+		statusWidget->ui->kbps->show();
 
 	lastBytesSent = bytesSent;
 	lastBytesSentTime = bytesSentTime;
-	bitrateUpdateSeconds = 0;
+	seconds = 0;
 }
 
 void OBSBasicStatusBar::UpdateCPUUsage()
@@ -233,11 +231,27 @@
 
 	QString text;
 	text += QString("CPU: ") +
-		QString::number(main->GetCPUUsage(), 'f', 1) + QString("%, ") +
-		QString::number(obs_get_active_fps(), 'f', 2) + QString(" fps");
+		QString::number(main->GetCPUUsage(), 'f', 1) + QString("%");
+
+	statusWidget->ui->cpuUsage->setText(text);
+	statusWidget->ui->cpuUsage->setMinimumWidth(
+		statusWidget->ui->cpuUsage->width());
 
-	cpuUsage->setText(text);
-	cpuUsage->setMinimumWidth(cpuUsage->width());
+	UpdateCurrentFPS();
+}
+
+void OBSBasicStatusBar::UpdateCurrentFPS()
+{
+	struct obs_video_info ovi;
+	obs_get_video_info(&ovi);
+	float targetFPS = (float)ovi.fps_num / (float)ovi.fps_den;
+
+	QString text = QString::asprintf("%.2f / %.2f FPS",
+					 obs_get_active_fps(), targetFPS);
+
+	statusWidget->ui->fpsCurrent->setText(text);
+	statusWidget->ui->fpsCurrent->setMinimumWidth(
+		statusWidget->ui->fpsCurrent->width());
 }
 
 void OBSBasicStatusBar::UpdateStreamTime()
@@ -249,16 +263,20 @@
 	int minutes = totalMinutes % 60;
 	int hours = totalMinutes / 60;
 
-	QString text = QString::asprintf("LIVE: %02d:%02d:%02d", hours, minutes,
-					 seconds);
-	streamTime->setText(text);
-	streamTime->setMinimumWidth(streamTime->width());
+	QString text =
+		QString::asprintf("%02d:%02d:%02d", hours, minutes, seconds);
+	statusWidget->ui->streamTime->setText(text);
+	if (streamOutput && !statusWidget->ui->streamTime->isEnabled())
+		statusWidget->ui->streamTime->setDisabled(false);
 
 	if (reconnectTimeout > 0) {
 		QString msg = QTStr("Basic.StatusBar.Reconnecting")
 				 .arg(QString::number(retries),
 					 QString::number(reconnectTimeout));
 		showMessage(msg);
+		disconnected = true;
+		statusWidget->ui->statusIcon->setPixmap(disconnectedPixmap);
+		congestionArray.clear();
 		reconnectTimeout--;
 
 	} else if (retries > 0) {
@@ -289,14 +307,15 @@
 		int minutes = totalMinutes % 60;
 		int hours = totalMinutes / 60;
 
-		QString text = QString::asprintf("REC: %02d:%02d:%02d", hours,
+		QString text = QString::asprintf("%02d:%02d:%02d", hours,
 						 minutes, seconds);
 
-		recordTime->setText(text);
-		recordTime->setMinimumWidth(recordTime->width());
+		statusWidget->ui->recordTime->setText(text);
+		if (recordOutput && !statusWidget->ui->recordTime->isEnabled())
+			statusWidget->ui->recordTime->setDisabled(false);
 	} else {
-		recordIcon->setPixmap(streamPauseIconToggle
-					 ? recordingPauseInactivePixmap
+		statusWidget->ui->recordIcon->setPixmap(
+			streamPauseIconToggle ? recordingPauseInactivePixmap
 					 : recordingPausePixmap);
 
 		streamPauseIconToggle = !streamPauseIconToggle;
@@ -318,8 +337,10 @@
 	QString text = QTStr("DroppedFrames");
 	text = text.arg(QString::number(totalDropped),
 			QString::number(percent, 'f', 1));
-	droppedFrames->setText(text);
-	droppedFrames->setMinimumWidth(droppedFrames->width());
+	statusWidget->ui->droppedFrames->setText(text);
+
+	if (!statusWidget->ui->issuesFrame->isVisible())
+		statusWidget->ui->issuesFrame->show();
 
 	/* ----------------------------------- *
 	 * calculate congestion color */
@@ -331,28 +352,37 @@
 	if (avgCongestion > 1.0f)
 		avgCongestion = 1.0f;
 
-	if (avgCongestion < EPSILON) {
-		statusSquare->setPixmap(greenPixmap);
-	} else if (fabsf(avgCongestion - 1.0f) < EPSILON) {
-		statusSquare->setPixmap(redPixmap);
-	} else {
-		QPixmap pixmap(20, 20);
+	lastCongestion = congestion;
 
-		float red = avgCongestion * 2.0f;
-		if (red > 1.0f)
-			red = 1.0f;
-		red *= 255.0;
+	if (disconnected)
+		return;
 
-		float green = (1.0f - avgCongestion) * 2.0f;
-		if (green > 1.0f)
-			green = 1.0f;
-		green *= 255.0;
+	bool update = firstCongestionUpdate;
+	float congestionOverTime = avgCongestion;
 
-		pixmap.fill(QColor(int(red), int(green), 0));
-		statusSquare->setPixmap(pixmap);
+	if (congestionArray.size() >= congestionUpdateSeconds) {
+		congestionOverTime = accumulate(congestionArray.begin(),
+						congestionArray.end(), 0.0f) /
+				 (float)congestionArray.size();
+		congestionArray.clear();
+		update = true;
+	} else {
+		congestionArray.emplace_back(avgCongestion);
 	}
 
-	lastCongestion = congestion;
+	if (update) {
+		if (congestionOverTime <= excellentThreshold + EPSILON)
+			statusWidget->ui->statusIcon->setPixmap(
+				excellentPixmap);
+		else if (congestionOverTime <= goodThreshold)
+			statusWidget->ui->statusIcon->setPixmap(goodPixmap);
+		else if (congestionOverTime <= mediocreThreshold)
+			statusWidget->ui->statusIcon->setPixmap(mediocrePixmap);
+		else if (congestionOverTime <= badThreshold)
+			statusWidget->ui->statusIcon->setPixmap(badPixmap);
+
+		firstCongestionUpdate = false;
+	}
 }
 
 void OBSBasicStatusBar::OBSOutputReconnect(void *data, calldata_t *params)
@@ -395,7 +425,7 @@
 {
 	retries = 0;
 	reconnectTimeout = 0;
-	bitrateUpdateSeconds = -1;
+	seconds = -1;
 	lastBytesSent = 0;
 	lastBytesSentTime = os_gettime_ns();
 	delaySecTotal = 0;
@@ -414,6 +444,8 @@
 	if (streamOutput) {
 		delaySecTotal = obs_output_get_active_delay(streamOutput);
 		UpdateDelayMsg();
+		disconnected = false;
+		firstCongestionUpdate = true;
 	}
 }
 
@@ -518,11 +550,12 @@
 
 void OBSBasicStatusBar::RecordingPaused()
 {
-	QString text = recordTime->text() + QStringLiteral(" (PAUSED)");
-	recordTime->setText(text);
+	QString text = statusWidget->ui->recordTime->text() +
+		 QStringLiteral(" (PAUSED)");
+	statusWidget->ui->recordTime->setText(text);
 
 	if (recordOutput) {
-		recordIcon->setPixmap(recordingPausePixmap);
+		statusWidget->ui->recordIcon->setPixmap(recordingPausePixmap);
 		streamPauseIconToggle = true;
 	}
 }
@@ -530,6 +563,68 @@
 void OBSBasicStatusBar::RecordingUnpaused()
 {
 	if (recordOutput) {
-		recordIcon->setPixmap(recordingActivePixmap);
+		statusWidget->ui->recordIcon->setPixmap(recordingActivePixmap);
 	}
 }
+
+static QPixmap GetPixmap(const QString &filename)
+{
+	bool darkTheme = obs_frontend_is_theme_dark();
+	QString path;
+
+	if (darkTheme) {
+		std::string darkPath;
+		QString themePath = QString("themes/Dark/") + filename;
+		GetDataFilePath(QT_TO_UTF8(themePath), darkPath);
+		path = QT_UTF8(darkPath.c_str());
+	} else {
+		path = QString(":/res/images/" + filename);
+	}
+
+	return QIcon(path).pixmap(QSize(16, 16));
+}
+
+void OBSBasicStatusBar::UpdateIcons()
+{
+	disconnectedPixmap = GetPixmap("network-disconnected.svg");
+	inactivePixmap = GetPixmap("network-inactive.svg");
+
+	streamingInactivePixmap = GetPixmap("streaming-inactive.svg");
+
+	recordingInactivePixmap = GetPixmap("recording-inactive.svg");
+	recordingPauseInactivePixmap =
+		GetPixmap("recording-pause-inactive.svg");
+
+	bool streaming = obs_frontend_streaming_active();
+
+	if (!streaming) {
+		statusWidget->ui->streamIcon->setPixmap(
+			streamingInactivePixmap);
+		statusWidget->ui->statusIcon->setPixmap(inactivePixmap);
+	} else {
+		if (disconnected)
+			statusWidget->ui->statusIcon->setPixmap(
+				disconnectedPixmap);
+	}
+
+	bool recording = obs_frontend_recording_active();
+
+	if (!recording)
+		statusWidget->ui->recordIcon->setPixmap(
+			recordingInactivePixmap);
+}
+
+void OBSBasicStatusBar::showMessage(const QString &message, int timeout)
+{
+	messageTimer->stop();
+
+	statusWidget->ui->message->setText(message);
+
+	if (timeout)
+		messageTimer->start(timeout);
+}
+
+void OBSBasicStatusBar::clearMessage()
+{
+	statusWidget->ui->message->setText("");
+}

obs-studio-29.1.3.tar.xz/UI/window-basic-status-bar.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-status-bar.hpp Changed

@@ -3,30 +3,39 @@
 #include <QStatusBar>
 #include <QPointer>
 #include <QTimer>
-#include <util/platform.h>
 #include <obs.h>
+#include <memory>
 
-class QLabel;
+class Ui_StatusBarWidget;
+
+class StatusBarWidget : public QWidget {
+	Q_OBJECT
+
+	friend class OBSBasicStatusBar;
+
+private:
+	std::unique_ptr<Ui_StatusBarWidget> ui;
+
+public:
+	StatusBarWidget(QWidget *parent = nullptr);
+	~StatusBarWidget();
+};
 
 class OBSBasicStatusBar : public QStatusBar {
 	Q_OBJECT
 
 private:
-	QLabel *delayInfo;
-	QLabel *droppedFrames;
-	QLabel *streamIcon;
-	QLabel *streamTime;
-	QLabel *recordTime;
-	QLabel *recordIcon;
-	QLabel *cpuUsage;
-	QLabel *kbps;
-	QLabel *statusSquare;
+	StatusBarWidget *statusWidget = nullptr;
 
 	obs_output_t *streamOutput = nullptr;
 	obs_output_t *recordOutput = nullptr;
 	bool active = false;
 	bool overloadedNotify = true;
 	bool streamPauseIconToggle = false;
+	bool disconnected = false;
+	bool firstCongestionUpdate = false;
+
+	std::vector<float> congestionArray;
 
 	int retries = 0;
 	int totalStreamSeconds = 0;
@@ -42,14 +51,16 @@
 	int startTotalFrameCount = 0;
 	int lastSkippedFrameCount = 0;
 
-	int bitrateUpdateSeconds = 0;
+	int seconds = 0;
 	uint64_t lastBytesSent = 0;
 	uint64_t lastBytesSentTime = 0;
 
-	QPixmap transparentPixmap;
-	QPixmap greenPixmap;
-	QPixmap grayPixmap;
-	QPixmap redPixmap;
+	QPixmap excellentPixmap;
+	QPixmap goodPixmap;
+	QPixmap mediocrePixmap;
+	QPixmap badPixmap;
+	QPixmap disconnectedPixmap;
+	QPixmap inactivePixmap;
 
 	QPixmap recordingActivePixmap;
 	QPixmap recordingPausePixmap;
@@ -61,6 +72,7 @@
 	float lastCongestion = 0.0f;
 
 	QPointer<QTimer> refreshTimer;
+	QPointer<QTimer> messageTimer;
 
 	obs_output_t *GetOutput();
 
@@ -76,11 +88,18 @@
 	static void OBSOutputReconnect(void *data, calldata_t *params);
 	static void OBSOutputReconnectSuccess(void *data, calldata_t *params);
 
+public slots:
+	void UpdateCPUUsage();
+
+	void clearMessage();
+	void showMessage(const QString &message, int timeout = 0);
+
 private slots:
 	void Reconnect(int seconds);
 	void ReconnectSuccess();
 	void UpdateStatusBar();
-	void UpdateCPUUsage();
+	void UpdateCurrentFPS();
+	void UpdateIcons();
 
 public:
 	OBSBasicStatusBar(QWidget *parent);

obs-studio-29.1.3.tar.xz/UI/window-basic-transform.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-transform.cpp Changed

@@ -30,37 +30,47 @@
 	return item;
 }
 
-void OBSBasicTransform::HookWidget(QWidget *widget, const char *signal,
-				 const char *slot)
-{
-	QObject::connect(widget, signal, this, slot);
-}
-
-#define COMBO_CHANGED SIGNAL(currentIndexChanged(int))
-#define ISCROLL_CHANGED SIGNAL(valueChanged(int))
-#define DSCROLL_CHANGED SIGNAL(valueChanged(double))
+#define COMBO_CHANGED &QComboBox::currentIndexChanged
+#define ISCROLL_CHANGED &QSpinBox::valueChanged
+#define DSCROLL_CHANGED &QDoubleSpinBox::valueChanged
 
 OBSBasicTransform::OBSBasicTransform(OBSSceneItem item, OBSBasic *parent)
-	: QDialog(parent), ui(new Ui::OBSBasicTransform), main(parent)
+	: QDialog(parent),
+	 ui(new Ui::OBSBasicTransform),
+	 main(parent)
 {
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
 	ui->setupUi(this);
 
-	HookWidget(ui->positionX, DSCROLL_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->positionY, DSCROLL_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->rotation, DSCROLL_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->sizeX, DSCROLL_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->sizeY, DSCROLL_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->align, COMBO_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->boundsType, COMBO_CHANGED, SLOT(OnBoundsType(int)));
-	HookWidget(ui->boundsAlign, COMBO_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->boundsWidth, DSCROLL_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->boundsHeight, DSCROLL_CHANGED, SLOT(OnControlChanged()));
-	HookWidget(ui->cropLeft, ISCROLL_CHANGED, SLOT(OnCropChanged()));
-	HookWidget(ui->cropRight, ISCROLL_CHANGED, SLOT(OnCropChanged()));
-	HookWidget(ui->cropTop, ISCROLL_CHANGED, SLOT(OnCropChanged()));
-	HookWidget(ui->cropBottom, ISCROLL_CHANGED, SLOT(OnCropChanged()));
+	HookWidget(ui->positionX, DSCROLL_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->positionY, DSCROLL_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->rotation, DSCROLL_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->sizeX, DSCROLL_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->sizeY, DSCROLL_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->align, COMBO_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->boundsType, COMBO_CHANGED,
+		 &OBSBasicTransform::OnBoundsType);
+	HookWidget(ui->boundsAlign, COMBO_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->boundsWidth, DSCROLL_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->boundsHeight, DSCROLL_CHANGED,
+		 &OBSBasicTransform::OnControlChanged);
+	HookWidget(ui->cropLeft, ISCROLL_CHANGED,
+		 &OBSBasicTransform::OnCropChanged);
+	HookWidget(ui->cropRight, ISCROLL_CHANGED,
+		 &OBSBasicTransform::OnCropChanged);
+	HookWidget(ui->cropTop, ISCROLL_CHANGED,
+		 &OBSBasicTransform::OnCropChanged);
+	HookWidget(ui->cropBottom, ISCROLL_CHANGED,
+		 &OBSBasicTransform::OnCropChanged);
 
 	ui->buttonBox->button(QDialogButtonBox::Close)->setDefault(true);
 
@@ -93,8 +103,8 @@
 	auto undo_redo = (const std::string &data) {
 		OBSDataAutoRelease dat =
 			obs_data_create_from_json(data.c_str());
-		OBSSourceAutoRelease source = obs_get_source_by_name(
-			obs_data_get_string(dat, "scene_name"));
+		OBSSourceAutoRelease source = obs_get_source_by_uuid(
+			obs_data_get_string(dat, "scene_uuid"));
 		reinterpret_cast<OBSBasic *>(App()->GetMainWindow())
 			->SetCurrentScene(source.Get(), true);
 		obs_scene_load_transform_states(data.c_str());

obs-studio-29.1.3.tar.xz/UI/window-basic-transform.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-transform.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-vcam-config.cpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-vcam-config.cpp Changed

@@ -5,35 +5,55 @@
 #include <util/util.hpp>
 #include <util/platform.h>
 
+#include <QStandardItem>
+
 OBSBasicVCamConfig::OBSBasicVCamConfig(const VCamConfig &_config,
-				 QWidget *parent)
-	: config(_config), QDialog(parent), ui(new Ui::OBSBasicVCamConfig)
+				 bool _vcamActive, QWidget *parent)
+	: config(_config),
+	 vcamActive(_vcamActive),
+	 activeType(_config.type),
+	 QDialog(parent),
+	 ui(new Ui::OBSBasicVCamConfig)
 {
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
 	ui->setupUi(this);
 
-	ui->outputType->setCurrentIndex(config.type);
-	OutputTypeChanged(config.type);
-	connect(ui->outputType, SIGNAL(currentIndexChanged(int)), this,
-		SLOT(OutputTypeChanged(int)));
+	ui->outputType->addItem(QTStr("Basic.VCam.OutputType.Program"),
+				(int)VCamOutputType::ProgramView);
+	ui->outputType->addItem(QTStr("StudioMode.Preview"),
+				(int)VCamOutputType::PreviewOutput);
+	ui->outputType->addItem(QTStr("Basic.Scene"),
+				(int)VCamOutputType::SceneOutput);
+	ui->outputType->addItem(QTStr("Basic.Main.Source"),
+				(int)VCamOutputType::SourceOutput);
+
+	ui->outputType->setCurrentIndex(
+		ui->outputType->findData((int)config.type));
+	OutputTypeChanged();
+	connect(ui->outputType, &QComboBox::currentIndexChanged, this,
+		&OBSBasicVCamConfig::OutputTypeChanged);
 
 	connect(ui->buttonBox, &QDialogButtonBox::accepted, this,
 		&OBSBasicVCamConfig::UpdateConfig);
 }
 
-void OBSBasicVCamConfig::OutputTypeChanged(int type)
+void OBSBasicVCamConfig::OutputTypeChanged()
 {
+	VCamOutputType type =
+		(VCamOutputType)ui->outputType->currentData().toInt();
+	ui->outputSelection->setDisabled(false);
+
 	auto list = ui->outputSelection;
 	list->clear();
 
-	switch ((VCamOutputType)type) {
-	case VCamOutputType::InternalOutput:
-		list->addItem(QTStr("Basic.VCam.InternalDefault"));
-		list->addItem(QTStr("Basic.VCam.InternalPreview"));
-		list->setCurrentIndex(config.internal);
+	switch (type) {
+	case VCamOutputType::Invalid:
+	case VCamOutputType::ProgramView:
+	case VCamOutputType::PreviewOutput:
+		ui->outputSelection->setDisabled(true);
+		list->addItem(QTStr("Basic.VCam.OutputSelection.NoSelection"));
 		break;
-
 	case VCamOutputType::SceneOutput: {
 		// Scenes in default order
 		BPtr<char *> scenes = obs_frontend_get_scene_names();
@@ -45,7 +65,6 @@
 		}
 		break;
 	}
-
 	case VCamOutputType::SourceOutput: {
 		// Sources in alphabetical order
 		std::vector<std::string> sources;
@@ -81,15 +100,25 @@
 		break;
 	}
 	}
+
+	if (!vcamActive)
+		return;
+
+	requireRestart = (activeType == VCamOutputType::ProgramView &&
+			 type != VCamOutputType::ProgramView) ||
+			 (activeType != VCamOutputType::ProgramView &&
+			 type == VCamOutputType::ProgramView);
+
+	ui->warningLabel->setVisible(requireRestart);
 }
 
 void OBSBasicVCamConfig::UpdateConfig()
 {
-	VCamOutputType type = (VCamOutputType)ui->outputType->currentIndex();
+	VCamOutputType type =
+		(VCamOutputType)ui->outputType->currentData().toInt();
 	switch (type) {
-	case VCamOutputType::InternalOutput:
-		config.internal =
-			(VCamInternalType)ui->outputSelection->currentIndex();
+	case VCamOutputType::ProgramView:
+	case VCamOutputType::PreviewOutput:
 		break;
 	case VCamOutputType::SceneOutput:
 		config.scene = ui->outputSelection->currentText().toStdString();
@@ -105,5 +134,9 @@
 
 	config.type = type;
 
-	emit Accepted(config);
+	if (requireRestart) {
+		emit AcceptedAndRestart(config);
+	} else {
+		emit Accepted(config);
+	}
 }

obs-studio-29.1.3.tar.xz/UI/window-basic-vcam-config.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-vcam-config.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-basic-vcam.hpp -> obs-studio-30.0.2.tar.xz/UI/window-basic-vcam.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-dock-browser.cpp -> obs-studio-30.0.2.tar.xz/UI/window-dock-browser.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-dock-browser.hpp -> obs-studio-30.0.2.tar.xz/UI/window-dock-browser.hpp Changed

obs-studio-30.0.2.tar.xz/UI/window-dock-youtube-app.cpp Added

@@ -0,0 +1,478 @@
+#include <QUuid>
+
+#include "window-basic-main.hpp"
+#include "youtube-api-wrappers.hpp"
+#include "window-dock-youtube-app.hpp"
+
+#include "ui-config.h"
+#include "qt-wrappers.hpp"
+
+#include <nlohmann/json.hpp>
+using json = nlohmann::json;
+
+#ifdef YOUTUBE_WEBAPP_PLACEHOLDER
+static constexpr const char *YOUTUBE_WEBAPP_PLACEHOLDER_URL =
+	YOUTUBE_WEBAPP_PLACEHOLDER;
+#else
+static constexpr const char *YOUTUBE_WEBAPP_PLACEHOLDER_URL =
+	"https://studio.youtube.com/live/channel/UC/console?kc=OBS";
+#endif
+
+#ifdef YOUTUBE_WEBAPP_ADDRESS
+static constexpr const char *YOUTUBE_WEBAPP_ADDRESS_URL =
+	YOUTUBE_WEBAPP_ADDRESS;
+#else
+static constexpr const char *YOUTUBE_WEBAPP_ADDRESS_URL =
+	"https://studio.youtube.com/live/channel/%1/console?kc=OBS";
+#endif
+
+static constexpr const char *BROADCAST_CREATED = "BROADCAST_CREATED";
+static constexpr const char *BROADCAST_SELECTED = "BROADCAST_SELECTED";
+static constexpr const char *INGESTION_STARTED = "INGESTION_STARTED";
+static constexpr const char *INGESTION_STOPPED = "INGESTION_STOPPED";
+
+YouTubeAppDock::YouTubeAppDock(const QString &title)
+	: BrowserDock(title),
+	 dockBrowser(nullptr),
+	 cookieManager(nullptr)
+{
+	cef->init_browser();
+	OBSBasic::InitBrowserPanelSafeBlock();
+	AddYouTubeAppDock();
+}
+
+YouTubeAppDock::~YouTubeAppDock()
+{
+	if (cookieManager) {
+		cookieManager->FlushStore();
+		delete cookieManager;
+	}
+}
+
+bool YouTubeAppDock::IsYTServiceSelected()
+{
+	if (!cef_js_avail)
+		return false;
+
+	obs_service_t *service_obj = OBSBasic::Get()->GetService();
+	OBSDataAutoRelease settings = obs_service_get_settings(service_obj);
+	const char *service = obs_data_get_string(settings, "service");
+	return IsYouTubeService(service);
+}
+
+void YouTubeAppDock::AccountConnected()
+{
+	channelId.clear(); // renew channel id
+	UpdateChannelId();
+}
+
+void YouTubeAppDock::AccountDisconnected()
+{
+	SettingsUpdated(true);
+}
+
+void YouTubeAppDock::SettingsUpdated(bool cleanup)
+{
+	bool ytservice = IsYTServiceSelected();
+	SetVisibleYTAppDockInMenu(ytservice);
+
+	// definitely cleanup if YT switched off
+	if (!ytservice || cleanup) {
+		if (cookieManager)
+			cookieManager->DeleteCookies("", "");
+	}
+	if (ytservice)
+		Update();
+}
+
+std::string YouTubeAppDock::InitYTUserUrl()
+{
+	std::string user_url(YOUTUBE_WEBAPP_PLACEHOLDER_URL);
+
+	if (IsUserSignedIntoYT()) {
+		YoutubeApiWrappers *apiYouTube = GetYTApi();
+		if (apiYouTube) {
+			ChannelDescription channel_description;
+			if (apiYouTube->GetChannelDescription(
+				 channel_description)) {
+				QString url =
+					QString(YOUTUBE_WEBAPP_ADDRESS_URL)
+						.arg(channel_description.id);
+				user_url = url.toStdString();
+			} else {
+				blog(LOG_ERROR,
+				 "YT: InitYTUserUrl() Failed to get channel id");
+			}
+		}
+	} else {
+		blog(LOG_ERROR, "YT: InitYTUserUrl() User is not signed");
+	}
+
+	blog(LOG_DEBUG, "YT: InitYTUserUrl() User url: %s", user_url.c_str());
+	return user_url;
+}
+
+void YouTubeAppDock::AddYouTubeAppDock()
+{
+	QString bId(QUuid::createUuid().toString());
+	bId.replace(QRegularExpression("{}-"), "");
+	this->setProperty("uuid", bId);
+	this->setObjectName("youtubeLiveControlPanel");
+	this->resize(580, 500);
+	this->setMinimumSize(400, 300);
+	this->setAllowedAreas(Qt::AllDockWidgetAreas);
+
+	OBSBasic::Get()->AddDockWidget(this, Qt::RightDockWidgetArea);
+
+	if (IsYTServiceSelected()) {
+		const std::string url = InitYTUserUrl();
+		CreateBrowserWidget(url);
+	} else {
+		this->setVisible(false);
+		this->toggleViewAction()->setVisible(false);
+	}
+}
+
+void YouTubeAppDock::CreateBrowserWidget(const std::string &url)
+{
+	std::string dir_name = std::string("obs_profile_cookies_youtube/") +
+			 config_get_string(OBSBasic::Get()->Config(),
+						 "Panels", "CookieId");
+	if (cookieManager)
+		delete cookieManager;
+	cookieManager = cef->create_cookie_manager(dir_name, true);
+
+	if (dockBrowser)
+		delete dockBrowser;
+	dockBrowser = cef->create_widget(this, url, cookieManager);
+	if (!dockBrowser)
+		return;
+
+	if (obs_browser_qcef_version() >= 1)
+		dockBrowser->allowAllPopups(true);
+
+	this->SetWidget(dockBrowser);
+	Update();
+}
+
+void YouTubeAppDock::SetVisibleYTAppDockInMenu(bool visible)
+{
+	if (visible && toggleViewAction()->isVisible())
+		return;
+
+	toggleViewAction()->setVisible(visible);
+	this->setVisible(visible);
+}
+
+// only 'ACCOUNT' mode supported
+void YouTubeAppDock::BroadcastCreated(const char *stream_id)
+{
+	DispatchYTEvent(BROADCAST_CREATED, stream_id, YTSM_ACCOUNT);
+}
+
+// only 'ACCOUNT' mode supported
+void YouTubeAppDock::BroadcastSelected(const char *stream_id)
+{
+	DispatchYTEvent(BROADCAST_SELECTED, stream_id, YTSM_ACCOUNT);
+}
+
+// both 'ACCOUNT' and 'STREAM_KEY' modes supported
+void YouTubeAppDock::IngestionStarted()
+{
+	obs_service_t *service_obj = OBSBasic::Get()->GetService();
+	OBSDataAutoRelease settings = obs_service_get_settings(service_obj);
+	const char *service = obs_data_get_string(settings, "service");
+	if (IsYouTubeService(service)) {
+		if (IsUserSignedIntoYT()) {
+			const char *broadcast_id =
+				obs_data_get_string(settings, "broadcast_id");
+			this->IngestionStarted(broadcast_id,
+					 YouTubeAppDock::YTSM_ACCOUNT);
+		} else {
+			const char *stream_key =
+				obs_data_get_string(settings, "key");
+			this->IngestionStarted(stream_key,
+					 YouTubeAppDock::YTSM_STREAM_KEY);
+		}
+	}
+}
+
+void YouTubeAppDock::IngestionStarted(const char *stream_id,
+				 streaming_mode_t mode)
+{
+	DispatchYTEvent(INGESTION_STARTED, stream_id, mode);
+}
+
+// both 'ACCOUNT' and 'STREAM_KEY' modes supported
+void YouTubeAppDock::IngestionStopped()
+{
+	obs_service_t *service_obj = OBSBasic::Get()->GetService();
+	OBSDataAutoRelease settings = obs_service_get_settings(service_obj);
+	const char *service = obs_data_get_string(settings, "service");
+
+	if (IsYouTubeService(service)) {
+		if (IsUserSignedIntoYT()) {
+			const char *broadcast_id =
+				obs_data_get_string(settings, "broadcast_id");
+			this->IngestionStopped(broadcast_id,
+					 YouTubeAppDock::YTSM_ACCOUNT);
+		} else {
+			const char *stream_key =
+				obs_data_get_string(settings, "key");
+			this->IngestionStopped(stream_key,
+					 YouTubeAppDock::YTSM_STREAM_KEY);
+		}
+	}
+}
+
+void YouTubeAppDock::IngestionStopped(const char *stream_id,
+				 streaming_mode_t mode)
+{
+	DispatchYTEvent(INGESTION_STOPPED, stream_id, mode);
+}
+
+void YouTubeAppDock::showEvent(QShowEvent *)
+{
+	if (!dockBrowser)
+		Update();
+}
+
+void YouTubeAppDock::closeEvent(QCloseEvent *event)
+{
+	BrowserDock::closeEvent(event);
+	this->SetWidget(nullptr);
+}
+
+void YouTubeAppDock::DispatchYTEvent(const char *event, const char *video_id,
+				 streaming_mode_t mode)
+{
+	if (!dockBrowser)
+		return;
+
+	// update channelId if empty:
+	UpdateChannelId();
+
+	// notify YouTube Live Streaming API:
+	std::string script;
+	if (mode == YTSM_ACCOUNT) {
+		script = QString(R"""(
+			if (window.location.hostname == 'studio.youtube.com') {
+				let event = {
+					type: '%1',
+					channelId: '%2',
+					videoId: '%3',
+				};
+				console.log(event);
+				if (window.ytlsapi && window.ytlsapi.dispatchEvent)
+					window.ytlsapi.dispatchEvent(event);
+			}
+		)""")
+				 .arg(event)
+				 .arg(channelId)
+				 .arg(video_id)
+				 .toStdString();
+	} else {
+		const char *stream_key = video_id;
+		script = QString(R"""(
+			if (window.location.hostname == 'studio.youtube.com') {
+				let event = {
+					type: '%1',
+					streamKey: '%2',
+				};
+				console.log(event);
+				if (window.ytlsapi && window.ytlsapi.dispatchEvent)
+					window.ytlsapi.dispatchEvent(event);
+			}
+		)""")
+				 .arg(event)
+				 .arg(stream_key)
+				 .toStdString();
+	}
+	dockBrowser->executeJavaScript(script);
+
+	// in case of user still not logged in in dock panel, remember last event
+	SetInitEvent(mode, event, video_id, channelId.toStdString().c_str());
+}
+
+void YouTubeAppDock::Update()
+{
+	std::string url = InitYTUserUrl();
+
+	if (!dockBrowser) {
+		CreateBrowserWidget(url);
+	} else {
+		dockBrowser->setURL(url);
+	}
+
+	// if streaming already run, let's notify YT about past event
+	if (OBSBasic::Get()->StreamingActive()) {
+		obs_service_t *service_obj = OBSBasic::Get()->GetService();
+		OBSDataAutoRelease settings =
+			obs_service_get_settings(service_obj);
+		if (IsUserSignedIntoYT()) {
+			channelId.clear(); // renew channelId
+			UpdateChannelId();
+			const char *broadcast_id =
+				obs_data_get_string(settings, "broadcast_id");
+			SetInitEvent(YTSM_ACCOUNT, INGESTION_STARTED,
+				 broadcast_id,
+				 channelId.toStdString().c_str());
+		} else {
+			const char *stream_key =
+				obs_data_get_string(settings, "key");
+			SetInitEvent(YTSM_STREAM_KEY, INGESTION_STARTED,
+				 stream_key);
+		}
+	} else {
+		SetInitEvent(IsUserSignedIntoYT() ? YTSM_ACCOUNT
+						 : YTSM_STREAM_KEY);
+	}
+
+	dockBrowser->reloadPage();
+}
+
+void YouTubeAppDock::UpdateChannelId()
+{
+	if (channelId.isEmpty()) {
+		YoutubeApiWrappers *apiYouTube = GetYTApi();
+		if (apiYouTube) {
+			ChannelDescription channel_description;
+			if (apiYouTube->GetChannelDescription(
+				 channel_description)) {
+				channelId = channel_description.id;
+			} else {
+				blog(LOG_ERROR, "YT: AccountConnected() Failed "
+						"to get channel id");
+			}
+		}
+	}
+}
+
+void YouTubeAppDock::SetInitEvent(streaming_mode_t mode, const char *event,
+				 const char *video_id, const char *channelId)
+{
+	const std::string version = App()->GetVersionString();
+
+	QString api_event;
+	if (event) {
+		if (mode == YTSM_ACCOUNT) {
+			api_event = QString(R"""(,
+					initEvent: {
+						type: '%1',
+						channelId: '%2',
+						videoId: '%3',
+					}
+			)""")
+					 .arg(event)
+					 .arg(channelId)
+					 .arg(video_id);
+		} else {
+			api_event = QString(R"""(,
+					initEvent: {
+						type: '%1',
+						streamKey: '%2',
+					}
+			)""")
+					 .arg(event)
+					 .arg(video_id);
+		}
+	}
+
+	std::string script = QString(R"""(
+		let obs_name = '%1';
+		let obs_version = '%2';
+		let client_mode = %3;
+		if (window.location.hostname == 'studio.youtube.com') {
+			console.log("name:", obs_name);
+			console.log("version:", obs_version);
+			console.log("initEvent:", {
+					initClientMode: client_mode
+					%4 });
+			if (window.ytlsapi && window.ytlsapi.init)
+				window.ytlsapi.init(obs_name, obs_version, undefined, {
+					initClientMode: client_mode
+					%4 });
+		}
+	)""")
+				 .arg("OBS")
+				 .arg(version.c_str())
+				 .arg(mode == YTSM_ACCOUNT ? "'ACCOUNT'"
+							 : "'STREAM_KEY'")
+				 .arg(api_event)
+				 .toStdString();
+	dockBrowser->setStartupScript(script);
+}
+
+YoutubeApiWrappers *YouTubeAppDock::GetYTApi()
+{
+	Auth *auth = OBSBasic::Get()->GetAuth();
+	if (auth) {
+		YoutubeApiWrappers *apiYouTube(
+			dynamic_cast<YoutubeApiWrappers *>(auth));
+		if (apiYouTube) {
+			return apiYouTube;
+		} else {
+			blog(LOG_ERROR,
+			 "YT: GetYTApi() Failed to get YoutubeApiWrappers");
+		}
+	} else {
+		blog(LOG_ERROR, "YT: GetYTApi() Failed to get Auth");
+	}
+	return nullptr;
+}
+
+void YouTubeAppDock::CleanupYouTubeUrls()
+{
+	if (!cef_js_avail)
+		return;
+
+	static constexpr const char *YOUTUBE_VIDEO_URL =
+		"://studio.youtube.com/video/";
+	// remove legacy YouTube Browser Docks (once)
+
+	bool youtube_cleanup_done = config_get_bool(
+		App()->GlobalConfig(), "General", "YtDockCleanupDone");
+
+	if (youtube_cleanup_done)
+		return;
+
+	config_set_bool(App()->GlobalConfig(), "General", "YtDockCleanupDone",
+			true);
+
+	const char *jsonStr = config_get_string(
+		App()->GlobalConfig(), "BasicWindow", "ExtraBrowserDocks");
+	if (!jsonStr)
+		return;
+
+	json array = json::parse(jsonStr);
+	if (!array.is_array())
+		return;
+
+	json save_array;
+	std::string removedYTUrl;
+
+	for (json &item : array) {
+		auto url = item"url".get<std::string>();
+
+		if (url.find(YOUTUBE_VIDEO_URL) != std::string::npos) {
+			blog(LOG_DEBUG, "YT: found legacy url: %s",
+			 url.c_str());
+			removedYTUrl += url;
+			removedYTUrl += ";\n";
+		} else {
+			save_array.push_back(item);
+		}
+	}
+
+	if (!removedYTUrl.empty()) {
+		const QString msg_title = QTStr("YouTube.DocksRemoval.Title");
+		const QString msg_text =
+			QTStr("YouTube.DocksRemoval.Text")
+				.arg(QT_UTF8(removedYTUrl.c_str()));
+		OBSMessageBox::warning(OBSBasic::Get(), msg_title, msg_text);
+
+		std::string output = save_array.dump();
+		config_set_string(App()->GlobalConfig(), "BasicWindow",
+				 "ExtraBrowserDocks", output.c_str());
+	}
+}

obs-studio-30.0.2.tar.xz/UI/window-dock-youtube-app.hpp Added

@@ -0,0 +1,53 @@
+#pragma once
+
+#include "window-dock-browser.hpp"
+#include "youtube-api-wrappers.hpp"
+
+class QAction;
+class QCefWidget;
+
+class YouTubeAppDock : public BrowserDock {
+	Q_OBJECT
+
+public:
+	YouTubeAppDock(const QString &title);
+	~YouTubeAppDock();
+
+	enum streaming_mode_t { YTSM_ACCOUNT, YTSM_STREAM_KEY };
+
+	void AccountConnected();
+	void AccountDisconnected();
+	void SettingsUpdated(bool cleanup = false);
+	void Update();
+
+	void BroadcastCreated(const char *stream_id);
+	void BroadcastSelected(const char *stream_id);
+	void IngestionStarted();
+	void IngestionStopped();
+
+	static bool IsYTServiceSelected();
+	static YoutubeApiWrappers *GetYTApi();
+	static void CleanupYouTubeUrls();
+
+protected:
+	void IngestionStarted(const char *stream_id, streaming_mode_t mode);
+	void IngestionStopped(const char *stream_id, streaming_mode_t mode);
+
+private:
+	std::string InitYTUserUrl();
+	void SetVisibleYTAppDockInMenu(bool visible);
+	void AddYouTubeAppDock();
+	void CreateBrowserWidget(const std::string &url);
+	virtual void showEvent(QShowEvent *event) override;
+	virtual void closeEvent(QCloseEvent *event) override;
+	void DispatchYTEvent(const char *event, const char *video_id,
+			 streaming_mode_t mode);
+	void UpdateChannelId();
+	void SetInitEvent(streaming_mode_t mode, const char *event = nullptr,
+			 const char *video_id = nullptr,
+			 const char *channelId = nullptr);
+
+	QString channelId;
+	QPointer<QCefWidget> dockBrowser;
+	QCefCookieManager *cookieManager; // is not a Qt object
+};

obs-studio-29.1.3.tar.xz/UI/window-dock.cpp -> obs-studio-30.0.2.tar.xz/UI/window-dock.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-dock.hpp -> obs-studio-30.0.2.tar.xz/UI/window-dock.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-extra-browsers.cpp -> obs-studio-30.0.2.tar.xz/UI/window-extra-browsers.cpp Changed

@@ -32,12 +32,9 @@
 	OBSBasic *main = OBSBasic::Get();
 
 	for (int i = 0; i < main->extraBrowserDocks.size(); i++) {
-		BrowserDock *dock = reinterpret_cast<BrowserDock *>(
-			main->extraBrowserDocksi.data());
-
 		Item item;
 		item.prevIdx = i;
-		item.title = dock->windowTitle();
+		item.title = main->extraBrowserDockNamesi;
 		item.url = main->extraBrowserDockTargetsi;
 		items.push_back(item);
 	}
@@ -123,7 +120,8 @@
 class EditWidget : public QLineEdit {
 public:
 	inline EditWidget(QWidget *parent, QModelIndex index_)
-		: QLineEdit(parent), index(index_)
+		: QLineEdit(parent),
+		 index(index_)
 	{
 	}
 
@@ -176,10 +174,16 @@
 
 	OBSBasic *main = OBSBasic::Get();
 	BrowserDock *dock = reinterpret_cast<BrowserDock *>(
-		main->extraBrowserDocksidx.data());
+		main->extraBrowserDocksidx.get());
 	dock->setWindowTitle(item.title);
 	dock->setObjectName(item.title + OBJ_NAME_SUFFIX);
 
+	if (main->extraBrowserDockNamesidx != item.title) {
+		main->extraBrowserDockNamesidx = item.title;
+		dock->toggleViewAction()->setText(item.title);
+		dock->setTitle(item.title);
+	}
+
 	if (main->extraBrowserDockTargetsidx != item.url) {
 		dock->cefWidget->setURL(QT_TO_UTF8(item.url));
 		main->extraBrowserDockTargetsidx = item.url;
@@ -234,6 +238,7 @@
 	for (int i = deleted.size() - 1; i >= 0; i--) {
 		int idx = deletedi;
 		main->extraBrowserDockTargets.removeAt(idx);
+		main->extraBrowserDockNames.removeAt(idx);
 		main->extraBrowserDocks.removeAt(idx);
 	}
 
@@ -420,7 +425,8 @@
 /* ------------------------------------------------------------------------- */
 
 OBSExtraBrowsers::OBSExtraBrowsers(QWidget *parent)
-	: QDialog(parent), ui(new Ui::OBSExtraBrowsers)
+	: QDialog(parent),
+	 ui(new Ui::OBSExtraBrowsers)
 {
 	ui->setupUi(this);
 
@@ -460,6 +466,7 @@
 void OBSBasic::ClearExtraBrowserDocks()
 {
 	extraBrowserDockTargets.clear();
+	extraBrowserDockNames.clear();
 	extraBrowserDocks.clear();
 }
 
@@ -491,11 +498,12 @@
 {
 	Json::array array;
 	for (int i = 0; i < extraBrowserDocks.size(); i++) {
-		QDockWidget *dock = extraBrowserDocksi.data();
+		QDockWidget *dock = extraBrowserDocksi.get();
+		QString title = extraBrowserDockNamesi;
 		QString url = extraBrowserDockTargetsi;
 		QString uuid = dock->property("uuid").toString();
 		Json::object obj{
-			{"title", QT_TO_UTF8(dock->windowTitle())},
+			{"title", QT_TO_UTF8(title)},
 			{"url", QT_TO_UTF8(url)},
 			{"uuid", QT_TO_UTF8(uuid)},
 		};
@@ -527,7 +535,7 @@
 		panel_version = obs_browser_qcef_version();
 	}
 
-	BrowserDock *dock = new BrowserDock();
+	BrowserDock *dock = new BrowserDock(title);
 	QString bId(uuid.isEmpty() ? QUuid::createUuid().toString() : uuid);
 	bId.replace(QRegularExpression("{}-"), "");
 	dock->setProperty("uuid", bId);
@@ -563,7 +571,8 @@
 	}
 
 	AddDockWidget(dock, Qt::RightDockWidgetArea, true);
-	extraBrowserDocks.push_back(QSharedPointer<QDockWidget>(dock));
+	extraBrowserDocks.push_back(std::shared_ptr<QDockWidget>(dock));
+	extraBrowserDockNames.push_back(title);
 	extraBrowserDockTargets.push_back(url);
 
 	if (firstCreate) {

obs-studio-29.1.3.tar.xz/UI/window-extra-browsers.hpp -> obs-studio-30.0.2.tar.xz/UI/window-extra-browsers.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-importer.cpp -> obs-studio-30.0.2.tar.xz/UI/window-importer.cpp Changed

@@ -93,8 +93,8 @@
 					QSizePolicy::ControlType::LineEdit));
 	layout->addWidget(text);
 
-	QObject::connect(text, SIGNAL(editingFinished()), this,
-			 SLOT(updateText()));
+	QObject::connect(text, &QLineEdit::editingFinished, this,
+			 &ImporterEntryPathItemDelegate::updateText);
 
 	QToolButton *browseButton = new QToolButton();
 	browseButton->setText("...");
@@ -419,8 +419,8 @@
 	ui->tableView->horizontalHeader()->setSectionResizeMode(
 		ImporterColumn::Path, QHeaderView::ResizeMode::Stretch);
 
-	connect(optionsModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
-		this, SLOT(dataChanged()));
+	connect(optionsModel, &ImporterModel::dataChanged, this,
+		&OBSImporter::dataChanged);
 
 	ui->tableView->setEditTriggers(
 		QAbstractItemView::EditTrigger::CurrentChanged);
@@ -428,12 +428,12 @@
 	ui->buttonBox->button(QDialogButtonBox::Ok)->setText(QTStr("Import"));
 	ui->buttonBox->button(QDialogButtonBox::Open)->setText(QTStr("Add"));
 
-	connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()),
-		this, SLOT(importCollections()));
+	connect(ui->buttonBox->button(QDialogButtonBox::Ok),
+		&QPushButton::clicked, this, &OBSImporter::importCollections);
 	connect(ui->buttonBox->button(QDialogButtonBox::Open),
-		SIGNAL(clicked()), this, SLOT(browseImport()));
+		&QPushButton::clicked, this, &OBSImporter::browseImport);
 	connect(ui->buttonBox->button(QDialogButtonBox::Close),
-		SIGNAL(clicked()), this, SLOT(close()));
+		&QPushButton::clicked, this, &OBSImporter::close);
 
 	ImportersInit();

obs-studio-29.1.3.tar.xz/UI/window-log-reply.cpp -> obs-studio-30.0.2.tar.xz/UI/window-log-reply.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-log-reply.hpp -> obs-studio-30.0.2.tar.xz/UI/window-log-reply.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-missing-files.cpp -> obs-studio-30.0.2.tar.xz/UI/window-missing-files.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-namedialog.cpp -> obs-studio-30.0.2.tar.xz/UI/window-namedialog.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-namedialog.hpp -> obs-studio-30.0.2.tar.xz/UI/window-namedialog.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-permissions.cpp -> obs-studio-30.0.2.tar.xz/UI/window-permissions.cpp Changed

obs-studio-29.1.3.tar.xz/UI/window-permissions.hpp -> obs-studio-30.0.2.tar.xz/UI/window-permissions.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-projector.cpp -> obs-studio-30.0.2.tar.xz/UI/window-projector.cpp Changed

@@ -16,7 +16,8 @@
 
 OBSProjector::OBSProjector(QWidget *widget, obs_source_t *source_, int monitor,
 			 ProjectorType type_)
-	: OBSQTDisplay(widget, Qt::Window), weakSource(OBSGetWeakRef(source_))
+	: OBSQTDisplay(widget, Qt::Window),
+	 weakSource(OBSGetWeakRef(source_))
 {
 	OBSSource source = GetSource();
 	if (source) {
@@ -60,7 +61,8 @@
 	QAction *action = new QAction(this);
 	action->setShortcut(Qt::Key_Escape);
 	addAction(action);
-	connect(action, SIGNAL(triggered()), this, SLOT(EscapeTriggered()));
+	connect(action, &QAction::triggered, this,
+		&OBSProjector::EscapeTriggered);
 
 	setAttribute(Qt::WA_DeleteOnClose, true);
 
@@ -254,22 +256,21 @@
 	OBSQTDisplay::mousePressEvent(event);
 
 	if (event->button() == Qt::RightButton) {
-		OBSBasic *main =
-			reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
-		QMenu popup(this);
-
 		QMenu *projectorMenu = new QMenu(QTStr("Fullscreen"));
-		main->AddProjectorMenuMonitors(projectorMenu, this,
-					 SLOT(OpenFullScreenProjector()));
+		OBSBasic::AddProjectorMenuMonitors(
+			projectorMenu, this,
+			&OBSProjector::OpenFullScreenProjector);
+
+		QMenu popup(this);
 		popup.addMenu(projectorMenu);
 
 		if (GetMonitor() > -1) {
 			popup.addAction(QTStr("Windowed"), this,
-					SLOT(OpenWindowedProjector()));
+					&OBSProjector::OpenWindowedProjector);
 
 		} else if (!this->isMaximized()) {
 			popup.addAction(QTStr("ResizeProjectorWindowToContent"),
-					this, SLOT(ResizeToContent()));
+					this, &OBSProjector::ResizeToContent);
 		}
 
 		QAction *alwaysOnTopButton = new QAction(
@@ -282,7 +283,8 @@
 
 		popup.addAction(alwaysOnTopButton);
 
-		popup.addAction(QTStr("Close"), this, SLOT(EscapeTriggered()));
+		popup.addAction(QTStr("Close"), this,
+				&OBSProjector::EscapeTriggered);
 		popup.exec(QCursor::pos());
 	} else if (event->button() == Qt::LeftButton) {
 		// Only MultiView projectors handle left click

obs-studio-29.1.3.tar.xz/UI/window-remux.cpp -> obs-studio-30.0.2.tar.xz/UI/window-remux.cpp Changed

@@ -56,7 +56,9 @@
 
 RemuxEntryPathItemDelegate::RemuxEntryPathItemDelegate(
 	bool isOutput, const QString &defaultPath)
-	: QStyledItemDelegate(), isOutput(isOutput), defaultPath(defaultPath)
+	: QStyledItemDelegate(),
+	 isOutput(isOutput),
+	 defaultPath(defaultPath)
 {
 }
 
@@ -112,8 +114,8 @@
 				 QSizePolicy::ControlType::LineEdit));
 		layout->addWidget(text);
 
-		QObject::connect(text, SIGNAL(editingFinished()), this,
-				 SLOT(updateText()));
+		QObject::connect(text, &QLineEdit::editingFinished, this,
+				 &RemuxEntryPathItemDelegate::updateText);
 
 		QToolButton *browseButton = new QToolButton();
 		browseButton->setText("...");
@@ -698,35 +700,30 @@
 		->setText(QTStr("Remux.ClearAll"));
 	ui->buttonBox->button(QDialogButtonBox::Reset)->setDisabled(true);
 
-	connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()),
-		this, SLOT(beginRemux()));
+	connect(ui->buttonBox->button(QDialogButtonBox::Ok),
+		&QPushButton::clicked, this, &OBSRemux::beginRemux);
 	connect(ui->buttonBox->button(QDialogButtonBox::Reset),
-		SIGNAL(clicked()), this, SLOT(clearFinished()));
+		&QPushButton::clicked, this, &OBSRemux::clearFinished);
 	connect(ui->buttonBox->button(QDialogButtonBox::RestoreDefaults),
-		SIGNAL(clicked()), this, SLOT(clearAll()));
+		&QPushButton::clicked, this, &OBSRemux::clearAll);
 	connect(ui->buttonBox->button(QDialogButtonBox::Close),
-		SIGNAL(clicked()), this, SLOT(close()));
+		&QPushButton::clicked, this, &OBSRemux::close);
 
 	worker->moveToThread(&remuxer);
 	remuxer.start();
 
-	//gcc-4.8 can't use QPointer<RemuxWorker> below
-	RemuxWorker *worker_ = worker;
-	connect(worker_, &RemuxWorker::updateProgress, this,
+	connect(worker.data(), &RemuxWorker::updateProgress, this,
 		&OBSRemux::updateProgress);
-	connect(&remuxer, &QThread::finished, worker_, &QObject::deleteLater);
-	connect(worker_, &RemuxWorker::remuxFinished, this,
+	connect(&remuxer, &QThread::finished, worker.data(),
+		&QObject::deleteLater);
+	connect(worker.data(), &RemuxWorker::remuxFinished, this,
 		&OBSRemux::remuxFinished);
-	connect(this, &OBSRemux::remux, worker_, &RemuxWorker::remux);
+	connect(this, &OBSRemux::remux, worker.data(), &RemuxWorker::remux);
 
-	// Guessing the GCC bug mentioned above would also affect
-	// QPointer<RemuxQueueModel>? Unsure.
-	RemuxQueueModel *queueModel_ = queueModel;
-	connect(queueModel_,
-		SIGNAL(rowsInserted(const QModelIndex &, int, int)), this,
-		SLOT(rowCountChanged(const QModelIndex &, int, int)));
-	connect(queueModel_, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
-		this, SLOT(rowCountChanged(const QModelIndex &, int, int)));
+	connect(queueModel.data(), &RemuxQueueModel::rowsInserted, this,
+		&OBSRemux::rowCountChanged);
+	connect(queueModel.data(), &RemuxQueueModel::rowsRemoved, this,
+		&OBSRemux::rowCountChanged);
 
 	QModelIndex index = queueModel->createIndex(0, 1);
 	QMetaObject::invokeMethod(ui->tableView, "setCurrentIndex",
@@ -943,7 +940,7 @@
 	queueModel->finishEntry(success);
 
 	if (autoRemux && autoRemuxFile != "") {
-		QTimer::singleShot(3000, this, SLOT(close()));
+		QTimer::singleShot(3000, this, &OBSRemux::close);
 
 		OBSBasic *main = OBSBasic::Get();
 		main->ShowStatusBarMessage(

obs-studio-29.1.3.tar.xz/UI/window-remux.hpp -> obs-studio-30.0.2.tar.xz/UI/window-remux.hpp Changed

obs-studio-29.1.3.tar.xz/UI/window-youtube-actions.cpp -> obs-studio-30.0.2.tar.xz/UI/window-youtube-actions.cpp Changed

@@ -444,12 +444,12 @@
 	}
 }
 bool OBSYoutubeActions::CreateEventAction(YoutubeApiWrappers *api,
+					  BroadcastDescription &broadcast,
 					  StreamDescription &stream,
 					  bool stream_later,
 					  bool ready_broadcast)
 {
 	YoutubeApiWrappers *apiYouTube = api;
-	BroadcastDescription broadcast = {};
 	UiToBroadcast(broadcast);
 
 	if (stream_later) {
@@ -513,6 +513,12 @@
 		}
 	}
 
+#ifdef YOUTUBE_ENABLED
+	if (OBSBasic::Get()->GetYouTubeAppDock())
+		OBSBasic::Get()->GetYouTubeAppDock()->BroadcastCreated(
+			broadcast.id.toStdString().c_str());
+#endif
+
 	return true;
 }
 
@@ -568,6 +574,12 @@
 	else
 		apiYouTube->ResetChat();
 
+#ifdef YOUTUBE_ENABLED
+	if (OBSBasic::Get()->GetYouTubeAppDock())
+		OBSBasic::Get()->GetYouTubeAppDock()->BroadcastSelected(
+			selectedBroadcast.toStdString().c_str());
+#endif
+
 	return true;
 }
 
@@ -585,6 +597,7 @@
 
 void OBSYoutubeActions::InitBroadcast()
 {
+	BroadcastDescription broadcast;
 	StreamDescription stream;
 	QMessageBox msgBox(this);
 	msgBox.setWindowFlags(msgBox.windowFlags() &
@@ -597,10 +610,12 @@
 	auto action = &() {
 		if (ui->tabWidget->currentIndex() == 0) {
 			success = this->CreateEventAction(
-				apiYouTube, stream,
+				apiYouTube, broadcast, stream,
 				ui->checkScheduledLater->isChecked());
 		} else {
 			success = this->ChooseAnEventAction(apiYouTube, stream);
+			if (success)
+				broadcast.id = this->selectedBroadcast;
 		};
 		QMetaObject::invokeMethod(&msgBox, "accept",
 					  Qt::QueuedConnection);
@@ -627,15 +642,17 @@
 				// Stream now usecase.
 				blog(LOG_DEBUG, "New valid stream: %s",
 				     QT_TO_UTF8(stream.name));
-				emit ok(QT_TO_UTF8(stream.id),
+				emit ok(QT_TO_UTF8(broadcast.id),
+					QT_TO_UTF8(stream.id),
 					QT_TO_UTF8(stream.name), true, true,
 					true);
 				Accept();
 			}
 		} else {
 			// Stream to precreated broadcast usecase.
-			emit ok(QT_TO_UTF8(stream.id), QT_TO_UTF8(stream.name),
-				autostart, autostop, true);
+			emit ok(QT_TO_UTF8(broadcast.id), QT_TO_UTF8(stream.id),
+				QT_TO_UTF8(stream.name), autostart, autostop,
+				true);
 			Accept();
 		}
 	} else {
@@ -654,6 +671,7 @@
 
 void OBSYoutubeActions::ReadyBroadcast()
 {
+	BroadcastDescription broadcast;
 	StreamDescription stream;
 	QMessageBox msgBox(this);
 	msgBox.setWindowFlags(msgBox.windowFlags() &
@@ -666,10 +684,12 @@
 	auto action = &() {
 		if (ui->tabWidget->currentIndex() == 0) {
 			success = this->CreateEventAction(
-				apiYouTube, stream,
+				apiYouTube, broadcast, stream,
 				ui->checkScheduledLater->isChecked(), true);
 		} else {
 			success = this->ChooseAnEventAction(apiYouTube, stream);
+			if (success)
+				broadcast.id = this->selectedBroadcast;
 		};
 		QMetaObject::invokeMethod(&msgBox, "accept",
 					  Qt::QueuedConnection);
@@ -680,8 +700,8 @@
 	thread->wait();
 
 	if (success) {
-		emit ok(QT_TO_UTF8(stream.id), QT_TO_UTF8(stream.name),
-			autostart, autostop, false);
+		emit ok(QT_TO_UTF8(broadcast.id), QT_TO_UTF8(stream.id),
+			QT_TO_UTF8(stream.name), autostart, autostop, false);
 		Accept();
 	} else {
 		// Fail.

obs-studio-29.1.3.tar.xz/UI/window-youtube-actions.hpp -> obs-studio-30.0.2.tar.xz/UI/window-youtube-actions.hpp Changed

obs-studio-29.1.3.tar.xz/UI/xdg-data/com.obsproject.Studio.appdata.xml.in -> obs-studio-30.0.2.tar.xz/UI/xdg-data/com.obsproject.Studio.appdata.xml.in Changed

obs-studio-29.1.3.tar.xz/UI/youtube-api-wrappers.cpp -> obs-studio-30.0.2.tar.xz/UI/youtube-api-wrappers.cpp Changed

obs-studio-29.1.3.tar.xz/UI/youtube-api-wrappers.hpp -> obs-studio-30.0.2.tar.xz/UI/youtube-api-wrappers.hpp Changed

obs-studio-30.0.2.tar.xz/build-aux Added

obs-studio-30.0.2.tar.xz/build-aux/.functions Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/log_debug Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/log_error Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/log_group Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/log_info Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/log_output Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/log_status Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/log_warning Added

obs-studio-30.0.2.tar.xz/build-aux/.functions/set_loglevel Added

obs-studio-30.0.2.tar.xz/build-aux/.run-format.zsh Added

@@ -0,0 +1,190 @@
+#!/usr/bin/env zsh
+
+builtin emulate -L zsh
+setopt EXTENDED_GLOB
+setopt PUSHD_SILENT
+setopt ERR_EXIT
+setopt ERR_RETURN
+setopt NO_UNSET
+setopt PIPE_FAIL
+setopt NO_AUTO_PUSHD
+setopt NO_PUSHD_IGNORE_DUPS
+setopt FUNCTION_ARGZERO
+
+## Enable for script debugging
+# setopt WARN_CREATE_GLOBAL
+# setopt WARN_NESTED_VAR
+# setopt XTRACE
+
+autoload -Uz is-at-least && if ! is-at-least 5.2; then
+ print -u2 -PR "%F{1}${funcstack1##*/}:%f Running on Zsh version %B${ZSH_VERSION}%b, but Zsh %B5.2%b is the minimum supported version. Upgrade zsh to fix this issue."
+ exit 1
+fi
+
+invoke_formatter() {
+ if (( # < 1 )) {
+ log_error "Usage invoke_formatter formatter_name"
+ exit 2
+ }
+
+ case ${1} {
+ clang)
+ if (( ${+commandsclang-format-16} )) {
+ local formatter=clang-format-16
+ } elif (( ${+commandsclang-format} )) {
+ local formatter=clang-format
+ } else {
+ log_error "No viable clang-format version found (required 16.0.5)"
+ exit 2
+ }
+
+ local -a formatter_version=($(${formatter} --version))
+
+ if ! is-at-least 16.0.5 ${formatter_version-1}; then
+ log_error "clang-format is not version 16.0.5 or above (found ${formatter_version-1}."
+ exit 2
+ fi
+
+ if ! is-at-least ${formatter_version-1} 16.0.5; then
+ log_error "clang-format is more recent than version 16.0.5 (found ${formatter_version-1})."
+ exit 2
+ fi
+
+ local -a source_files=((libobs|libobs-*|UI|plugins|deps)/**/*.(c|cpp|h|hpp|m|mm)(.N))
+ source_files=(${source_files:#*/(obs-websocket/deps|decklink/*/decklink-sdk|mac-syphon/syphon-framework|obs-outputs/ftl-sdk|win-dshow/libdshowcapture)/*})
+
+ local -a format_args=(-style=file -fallback-style=none)
+ if (( _loglevel > 2 )) format_args+=(--verbose)
+ ;;
+ cmake)
+ local formatter=cmake-format
+ if (( ${+commandscmake-format} )) {
+ local cmake_format_version=$(cmake-format --version)
+
+ if ! is-at-least 0.6.13 ${cmake_format_version}; then
+ log_error "cmake-format is not version 0.6.13 or above (found ${cmake_format_version})."
+ exit 2
+ fi
+ } else {
+ log_error "No viable cmake-format version found (required 0.6.13)"
+ exit 2
+ }
+
+ local -a source_files=((libobs|libobs-*|UI|plugins|deps|cmake)/**/(CMakeLists.txt|*.cmake)(.N))
+ source_files=(${source_files:#*/(obs-outputs/ftl-sdk|jansson|decklink/*/decklink-sdk|obs-websocket|obs-browser|win-dshow/libdshowcapture)/*})
+
+ local -a format_args=()
+ if (( _loglevel > 2 )) format_args+=(--log-level debug)
+ ;;
+ swift)
+ local formatter=swift-format
+ if (( ${+commandsswift-format} )) {
+ local swift_format_version=$(swift-format --version)
+
+ if ! is-at-least 508.0.0 ${swift_format_version}; then
+ log_error "swift-format is not version 508.0.0 or above (found ${swift_format_version})."
+ exit 2
+ fi
+ } else {
+ log_error "No viable swift-format version found (required 508.0.0)"
+ exit 2
+ }
+
+ local -a source_files=((libobs|libobs-*|UI|plugins)/**/*.swift(.N))
+
+ local -a format_args=()
+ ;;
+ *) log_error "Invalid formatter specified: ${1}. Valid options are clang-format, cmake-format, and swift-format."; exit 2 ;;
+ }
+
+ local file
+ local -i num_failures=0
+ if (( check_only )) {
+ for file (${source_files}) {
+ if (( _loglevel > 1 )) log_info "Checking format of ${file}..."
+
+ if ! "${formatter}" ${format_args} "${file}" | diff -q "${file}" - &> /dev/null; then
+ log_error "${file} requires formatting changes."
+
+ if (( fail_on_error == 2 )) return 2;
+ num_failures=$(( num_failures + 1 ))
+ else
+ if (( _loglevel > 1 )) log_status "${file} requires no formatting changes."
+ fi
+ }
+ if (( fail_on_error && num_failures )) return 2;
+ } elif (( ${#source_files} )) {
+ format_args+=(-i)
+ "${formatter}" ${format_args} ${source_files}
+ }
+}
+
+run_format() {
+ if (( ! ${+SCRIPT_HOME} )) typeset -g SCRIPT_HOME=${ZSH_ARGZERO:A:h}
+ if (( ! ${+FORMATTER_NAME} )) typeset -g FORMATTER_NAME=${${(s:-:)ZSH_ARGZERO:t:r}2}
+
+ typeset -g host_os=${${(L)$(uname -s)}//darwin/macos}
+ local -i fail_on_error=0
+ local -i check_only=0
+ local -i verbosity=1
+ local -r _version='1.0.0'
+
+ fpath=("${SCRIPT_HOME}/.functions" ${fpath})
+ autoload -Uz set_loglevel log_info log_error log_output log_status log_warning
+
+ local -r _usage="
+Usage: %B${functrace1%:*}%b <option>
+
+%BOptions%b:
+
+%F{yellow} Formatting options%f
+ -----------------------------------------------------------------------------
+ %B-c | --check%b Check only, no actual formatting takes place
+
+%F{yellow} Output options%f
+ -----------------------------------------------------------------------------
+ %B-v | --verbose%b Verbose (more detailed output)
+ %B--fail-never|error Fail script never/on formatting change - default: %B%F{green}never%f%b
+ %B--debug%b Debug (very detailed and added output)
+
+%F{yellow} General options%f
+ -----------------------------------------------------------------------------
+ %B-h | --help%b Print this usage help
+ %B-V | --version%b Print script version information"
+
+ local -a args
+ while (( # )) {
+ case ${1} {
+ --)
+ shift
+ args+=($@)
+ break
+ ;;
+ -c|--check) check_only=1; shift ;;
+ -v|--verbose) (( verbosity += 1 )); shift ;;
+ -h|--help) log_output ${_usage}; exit 0 ;;
+ -V|--version) print -Pr "${_version}"; exit 0 ;;
+ --debug) verbosity=3; shift ;;
+ --fail-never)
+ fail_on_error=0
+ shift
+ ;;
+ --fail-error)
+ fail_on_error=1
+ shift
+ ;;
+ --fail-fast)
+ fail_on_error=2
+ shift
+ ;;
+ *) log_error "Unknown option: %B${1}%b"; log_output ${_usage}; exit 2 ;;
+ }
+ }
+
+ set -- ${(@)args}
+ set_loglevel ${verbosity}
+
+ invoke_formatter ${FORMATTER_NAME}
+}
+
+run_format ${@}

obs-studio-30.0.2.tar.xz/build-aux/README.md Added

@@ -0,0 +1,26 @@
+# `build-aux` folder
+
+This folder contains:
+- The Flatpak manifest used to build OBS Studio
+- The script `format-manifest.py` which format manifest JSON files
+
+## OBS Studio Flatpak Manifest
+
+The manifest is composed of multiple files:
+ - The main manifest `com.obsproject.Studio.json`
+ - The `modules` folder which contains OBS Studio dependencies modules
+
+### Manifest modules
+
+Modules are ordered/dispatched in numbered categories following a short list of rules:
+- A module must not depend on another module from the same category, so a module can only depend on modules from lower numbered categories.
+- A module without dependencies must be placed in the highest numbered category in use, excluding categories meant for specific types of dependency.
+
+Actual categories:
+ - `99-`: CEF
+ - `90-`: Headers-only libraries that are dependencies of only OBS Studio
+ - `50-`: Modules that are dependencies of only OBS Studio
+ - `40-`: Modules that are dependencies of the `50-` category
+ - `30-`: FFmpeg
+ - `20-`: Modules that are dependencies of FFmpeg
+ - `10-`: Modules that are dependencies of the `20-` category

obs-studio-30.0.2.tar.xz/build-aux/com.obsproject.Studio.json Added

@@ -0,0 +1,113 @@
+{
+    "id": "com.obsproject.Studio",
+    "runtime": "org.kde.Platform",
+    "runtime-version": "6.5",
+    "sdk": "org.kde.Sdk",
+    "command": "obs",
+    "finish-args": 
+        "--socket=wayland",
+        "--socket=x11",
+        "--socket=pulseaudio",
+        "--device=all",
+        "--share=network",
+        "--share=ipc",
+        "--filesystem=xdg-run/pipewire-0",
+        "--filesystem=host",
+        "--talk-name=org.kde.StatusNotifierWatcher",
+        "--talk-name=org.freedesktop.Flatpak",
+        "--talk-name=org.freedesktop.Notifications",
+        "--talk-name=org.a11y.Bus",
+        "--system-talk-name=org.freedesktop.Avahi",
+        "--env=VST_PATH=/app/extensions/Plugins/vst"
+    ,
+    "add-extensions": {
+        "com.obsproject.Studio.Plugin": {
+            "directory": "plugins",
+            "subdirectories": true,
+            "add-ld-path": "lib",
+            "merge-dirs": "lib/obs-plugins;share/obs/obs-plugins",
+            "no-autodownload": true,
+            "autodelete": true
+        },
+        "org.freedesktop.LinuxAudio.Plugins": {
+            "directory": "extensions/Plugins",
+            "version": "22.08",
+            "add-ld-path": "lib",
+            "merge-dirs": "vst",
+            "subdirectories": true,
+            "no-autodownload": true
+        }
+    },
+    "cleanup": 
+        "/share/man",
+        "*.la"
+    ,
+    "modules": 
+        "modules/10-mbedtls.json",
+        "modules/20-aom.json",
+        "modules/20-librist.json",
+        "modules/20-nv-codec.json",
+        "modules/20-srt.json",
+        "modules/20-svt-av1.json",
+        "modules/20-x264.json",
+        "modules/30-ffmpeg.json",
+        "modules/40-luajit.json",
+        "modules/40-plog.json",
+        "modules/40-usrsctp.json",
+        "modules/50-intel-media-sdk.json",
+        "modules/50-jansson.json",
+        "modules/50-libdatachannel.json",
+        "modules/50-libqrcodegencpp.json",
+        "modules/50-ntv2.json",
+        "modules/50-onevpl-intel-gpu.json",
+        "modules/50-onevpl.json",
+        "modules/50-pipewire.json",
+        "modules/50-rnnoise.json",
+        "modules/50-swig.json",
+        "modules/50-v4l-utils.json",
+        "modules/90-asio.json",
+        "modules/90-nlohmann-json.json",
+        "modules/90-websocketpp.json",
+        "modules/99-cef.json",
+        {
+            "name": "obs",
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "config-opts": 
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DENABLE_WAYLAND=ON",
+                "-DENABLE_BROWSER=ON",
+                "-DCEF_ROOT_DIR=/app/cef",
+                "-DUSE_XDG=ON",
+                "-DENABLE_ALSA=OFF",
+                "-DENABLE_PULSEAUDIO=ON",
+                "-DENABLE_JACK=ON",
+                "-DENABLE_RTMPS=ON",
+                "-DENABLE_VLC=OFF",
+                "-DENABLE_AJA=ON",
+                "-DENABLE_LIBFDK=ON",
+                "-DENABLE_QSV11=ON"
+            ,
+            "secret-opts": 
+                "-DRESTREAM_CLIENTID=$RESTREAM_CLIENTID",
+                "-DRESTREAM_HASH=$RESTREAM_HASH",
+                "-DTWITCH_CLIENTID=$TWITCH_CLIENTID",
+                "-DTWITCH_HASH=$TWITCH_HASH",
+                "-DYOUTUBE_CLIENTID=$YOUTUBE_CLIENTID",
+                "-DYOUTUBE_CLIENTID_HASH=$YOUTUBE_CLIENTID_HASH",
+                "-DYOUTUBE_SECRET=$YOUTUBE_SECRET",
+                "-DYOUTUBE_SECRET_HASH=$YOUTUBE_SECRET_HASH"
+            ,
+            "post-install": 
+                "install -d /app/plugins",
+                "install -d /app/extensions/Plugins"
+            ,
+            "sources": 
+                {
+                    "type": "dir",
+                    "path": "../"
+                }
+            
+        }
+    
+}

obs-studio-30.0.2.tar.xz/build-aux/format-manifest.py Added

@@ -0,0 +1,96 @@
+import argparse
+import glob
+import json
+import logging
+import os
+import sys
+from typing import Any
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description="Format Flatpak manifest")
+    parser.add_argument(
+        "manifest_file",
+        metavar="FILE",
+        type=str,
+        help="Manifest file to adjust format for",
+    )
+    parser.add_argument(
+        "--check",
+        action="store_true",
+        help="Check for necessary changes only",
+        default=False,
+        required=False,
+    )
+    parser.add_argument(
+        "--loglevel", type=str, help="Set log level", default="WARNING", required=False
+    )
+
+    arguments = parser.parse_args()
+
+    logging.basicConfig(level=arguments.loglevel, format="%(message)s")
+    logger = logging.getLogger()
+
+    manifest_file = arguments.manifest_file
+
+    try:
+        with open(manifest_file, "r+") as manifest:
+            manifest_path = os.path.dirname(manifest_file)
+            manifest_string = manifest.read()
+            manifest_data = json.loads(manifest_string)
+
+            module_list = manifest_data.get("modules", )
+
+            obs_object = module_list-1
+
+            if type(obs_object) != dict:
+                logger.error(
+                    f"❌ Last element in modules list is not the obs-studio object"
+                )
+                return 2
+
+            new_module_list = 
+
+            for module in module_list:
+                if type(module) == str:
+                    if not os.path.isfile(os.path.join(manifest_path, module)):
+                        logger.warning(
+                            f"⚠️ Specified module {os.path.basename(module)} not found."
+                        )
+                        continue
+
+                    new_module_list.append(module)
+
+            new_module_list.sort()
+            new_module_list.append(obs_object)
+            manifest_data"modules" = new_module_list
+
+            new_manifest_string = (
+                f"{json.dumps(manifest_data, indent=4, ensure_ascii=False)}\n"
+            )
+
+            if arguments.check:
+                if new_module_list != module_list:
+                    logger.error(f"❌ Module list failed order validation")
+                    return 2
+                elif new_manifest_string != manifest_string:
+                    logger.error(f"❌ Manifest file is not correctly formatted")
+                    return 2
+                else:
+                    logger.info(f"✅ Module list passed order validation")
+                    return 0
+
+            manifest.seek(0)
+            manifest.truncate()
+            manifest.write(new_manifest_string)
+
+            logger.info(f"✅ Updated manifest file '{manifest_file}")
+    except IOError:
+        logger.error(f"❌ Unable to read manifest file '{manifest_file}'")
+        return 2
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

obs-studio-30.0.2.tar.xz/build-aux/modules Added

obs-studio-30.0.2.tar.xz/build-aux/modules/10-mbedtls.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/20-aom.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/20-librist.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/20-nv-codec.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/20-srt.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/20-svt-av1.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/20-x264.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/30-ffmpeg.json Added

@@ -0,0 +1,46 @@
+{
+    "name": "ffmpeg",
+    "config-opts": 
+        "--enable-gpl",
+        "--enable-shared",
+        "--disable-static",
+        "--enable-gnutls",
+        "--disable-doc",
+        "--disable-programs",
+        "--disable-devices",
+        "--enable-libopus",
+        "--enable-libvpx",
+        "--enable-libvorbis",
+        "--enable-libx264",
+        "--enable-nvenc",
+        "--enable-libsrt",
+        "--enable-librist",
+        "--enable-libaom",
+        "--enable-libsvtav1"
+    ,
+    "cleanup": 
+        "/share/ffmpeg"
+    ,
+    "sources": 
+        {
+            "type": "git",
+            "url": "https://github.com/FFmpeg/FFmpeg.git",
+            "commit": "a6dc92968a325d331bb6dcf9b3b2248026cd1d6c",
+            "disable-shallow-clone": true
+        },
+        {
+            "type": "git",
+            "dest": "obs-deps",
+            "url": "https://github.com/obsproject/obs-deps.git",
+            "tag": "2023-06-22",
+            "commit": "d86fb6f86455d328f67e563d87f494bcf1ff6dca"
+        },
+        {
+            "type": "shell",
+            "commands": 
+                "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0001-flvdec-handle-unknown.patch",
+                "patch -Np1 -i obs-deps/deps.ffmpeg/patches/FFmpeg/0002-libaomenc-presets.patch"
+            
+        }
+    
+}

obs-studio-30.0.2.tar.xz/build-aux/modules/40-luajit.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/40-plog.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/40-usrsctp.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-intel-media-sdk.json Added

@@ -0,0 +1,38 @@
+{
+    "name": "intel-media-sdk",
+    "buildsystem": "cmake-ninja",
+    "builddir": true,
+    "config-opts": 
+        "-DCMAKE_BUILD_TYPE=Release",
+        "-DBUILD_SAMPLES=OFF",
+        "-DBUILD_TUTORIALS=OFF",
+        "-DENABLE_OPENCL=OFF",
+        "-DENABLE_WAYLAND=OFF",
+        "-DENABLE_X11=OFF",
+        "-DENABLE_X11_DRI3=OFF"
+    ,
+    "cleanup": 
+        "/include",
+        "/lib/pkgconfig"
+    ,
+    "sources": 
+        {
+            "type": "git",
+            "url": "https://github.com/Intel-Media-SDK/MediaSDK.git",
+            "commit": "869b60a6c3d7b5e9f7c3b3b914986322dca4bbae",
+            "tag": "intel-mediasdk-23.2.2"
+        },
+        {
+            "type": "file",
+            "dest-filename": "010-intel-media-sdk-fix-reproducible-build.patch",
+            "url": "https://github.com/Intel-Media-SDK/MediaSDK/commit/f6925886f27a39eed2e43c5b7b6c342d00f7a970.patch",
+            "sha256": "f1d8a4edf953cfec1516f1a8383c5ee033245aba16cfae0bc79b7de1a6365fcc"
+        },
+        {
+            "type": "shell",
+            "commands": 
+                "patch -Np1 -i 010-intel-media-sdk-fix-reproducible-build.patch"
+            
+        }
+    
+}

obs-studio-30.0.2.tar.xz/build-aux/modules/50-jansson.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-libdatachannel.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-libqrcodegencpp.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-ntv2.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-onevpl-intel-gpu.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-onevpl.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-pipewire.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-rnnoise.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-swig.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/50-v4l-utils.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/90-asio.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/90-nlohmann-json.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/90-websocketpp.json Added

obs-studio-30.0.2.tar.xz/build-aux/modules/99-cef.json Added

obs-studio-30.0.2.tar.xz/build-aux/run-clang-format Added

obs-studio-30.0.2.tar.xz/build-aux/run-cmake-format Added

obs-studio-30.0.2.tar.xz/build-aux/run-swift-format Added

obs-studio-30.0.2.tar.xz/build-aux/steam Added

obs-studio-30.0.2.tar.xz/build-aux/steam/obs_build.vdf Changed

obs-studio-30.0.2.tar.xz/build-aux/steam/obs_playtest_build.vdf Changed

obs-studio-30.0.2.tar.xz/build-aux/steam/scripts_macos Added

obs-studio-30.0.2.tar.xz/build-aux/steam/scripts_macos/launch.sh Added

obs-studio-30.0.2.tar.xz/build-aux/steam/scripts_windows Added

obs-studio-30.0.2.tar.xz/build-aux/steam/scripts_windows/install.bat Changed

obs-studio-30.0.2.tar.xz/build-aux/steam/scripts_windows/installscript.vdf Changed

obs-studio-30.0.2.tar.xz/build-aux/steam/scripts_windows/uninstall.bat Added

@@ -0,0 +1,34 @@
+@echo off
+@cd /d "%~dp0"
+goto checkAdmin
+
+:checkAdmin
+	net session >nul 2>&1
+	if %errorLevel% == 0 (
+		echo.
+	) else (
+		echo Administrative rights are required. Please re-run this script as Administrator.
+		goto end
+	)
+
+:clearRegistry
+	reg delete "HKLM\SOFTWARE\OBS Studio" /f /reg:32
+	reg delete "HKLM\SOFTWARE\OBS Studio" /f /reg:64
+	:: Vulkan layer keys
+	reg delete "HKLM\SOFTWARE\Khronos\Vulkan\ImplicitLayers" /f /v "%PROGRAMDATA%\obs-studio-hook\obs-vulkan64.json" /reg:32
+	reg delete "HKLM\SOFTWARE\Khronos\Vulkan\ImplicitLayers" /f /v "%PROGRAMDATA%\obs-studio-hook\obs-vulkan32.json" /reg:64
+
+:deleteProgramDataFolder
+	RMDIR /S /Q "%PROGRAMDATA%\obs-studio-hook"
+	RMDIR /S /Q "%PROGRAMDATA%\obs-studio\shader-cache"
+
+:uninstallDLLs
+	regsvr32.exe /u /s %1\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll
+	regsvr32.exe /u /s %1\data\obs-plugins\win-dshow\obs-virtualcam-module64.dll
+
+:endSuccess
+	echo Virtual Cam uninstalled!
+	echo.
+
+:end
+	exit

obs-studio-29.1.3.tar.xz/buildspec.json -> obs-studio-30.0.2.tar.xz/buildspec.json Changed

@@ -1,29 +1,26 @@
 {
     "dependencies": {
         "prebuilt": {
-            "version": "2023-04-12",
+            "version": "2023-11-03",
             "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
             "label": "Pre-Built obs-deps",
             "hashes": {
-                "macos-x86_64": "81120ffa33bb050c6c5fcd236e5cedfd7b80f7053fdba271fead5af20be0b5f5",
-                "macos-arm64": "b9bab79611774c4651d084e14259abe889d2b8d1653787a843d08cf3f0db881c",
-                "macos-universal": "9535c6e1ad96f7d49960251e85a245774088d48da1d602bb82f734b10219125a",
-                "windows-x64": "c13a14a1acc4224b21304d97b63da4121de1ed6981297e50496fbc474abc0503",
-                "linux-x86_64": "056425a8a7a4a0c242ed5ab9c1eba4dd6b004386877de4304524e7bea11c0ee2"
+                "macos-universal": "90c2fc069847ec2768dcc867c1c63b112c615ed845a907dc44acab7a97181974",
+                "windows-x64": "d0825a6fb65822c993a3059edfba70d72d2e632ef74893588cf12b1f0d329ce6",
+                "windows-x86": "b69c864275189464483c240ef3f25ea16fba3050b136fe6c3db6e9ee63036683",
+                "linux-x86_64": "9217c6b70854a08575cc3debe85ed5496bb0d8a9de54a1f8148aa71ad71f98d6"
             }
         },
         "qt6": {
-            "version": "2023-04-12",
+            "version": "2023-11-03",
             "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
             "label": "Pre-Built Qt6",
             "hashes": {
-                "macos-x86_64": "2622d6ecd484a596da12b6a45b709fe563821eda558d0bbb27335c8c2f63945c",
-                "macos-arm64": "4f72aa1103d88a00d90c01bb3650276ffa1408e16ef40579177605483b986dc9",
-                "macos-universal": "eb7614544ab4f3d2c6052c797635602280ca5b028a6b987523d8484222ce45d1",
-                "windows-x64": "4d39364b8a8dee5aa24fcebd8440d5c22bb4551c6b440ffeacce7d61f2ed1add"
+                "macos-universal": "ba4a7152848da0053f63427a2a2cb0a199af3992997c0db08564df6f48c9db98",
+                "windows-x64": "bc57dedf76b47119a6dce0435a2f21b35b08c8f2948b1cb34a157320f77732d1"
             },
             "debugSymbols": {
-                "windows-x64": "f34ee5067be19ed370268b15c53684b7b8aaa867dc800b68931df905d679e31f"
+                "windows-x64": "fd8ecd1d8cd2ef049d9f4d7fb5c134f784836d6020758094855dfa98bd025036"
             }
         },
         "cef": {
@@ -31,41 +28,38 @@
             "baseUrl": "https://cdn-fastly.obsproject.com/downloads",
             "label": "Chromium Embedded Framework",
             "hashes": {
-                "macos-x86_64": "7ef71717ff2e4ff4212274c33f0993729f47c109c464e499544fd3f63586a069",
-                "macos-arm64": "a9da8909202aefc8f35509d03eff9a7c837b5d3b2ed3afb39b67121cb16d457b",
-                "linux-x86_64": "bf4aa9388bab7e94fa945cc3bba16b6da63b6a30f9c0342d42235468b39d84bf",
-                "linux-aarch64": "68d915c9ba2639cba762a54cd3430fce2527aa6355d831d3cfcb6157664206b0",
-                "windows-x64": "c1b47beb7ee42e98f1a41b6d694c26842a4a3d452e44bdf6f758c9785696533d"
+                "macos-x86_64": "140bfd517b4b9d12343ac000abba7bb16eecefe80ecbd7225993d03f0b9c0603",
+                "macos-arm64": "3970a781132b033bb9be6a9fe328a07e97fa7737fdf1575b1c5db24a3e130da1",
+                "linux-x86_64": "1253a6a36c3b8ac5b5ece9bfdb6eae6ab75e49516375fc475e2e871795ad9bea",
+                "linux-aarch64": "66ebcfce94a4527c8dd085a685691d0c43291adab9f2be4f8a0762f4a614083a",
+                "windows-x64": "7480e9ed5688e09919db67237d130eef9a4c24df32ba2a7b8a5587de45ff8e69"
             },
             "revision": {
-                "macos-x86_64": 2,
-                "macos-arm64": 2
+                "macos-x86_64": 4,
+                "macos-arm64": 4,
+                "linux-x86_64": 3,
+                "linux-aarch64": 3,
+                "windows-x64": 3
             }
+        }
+    },
+    "tools": {
+        "sparkle": {
+            "version": "2.4.2",
+            "baseUrl": "https://github.com/sparkle-project/Sparkle/releases/download",
+            "label": "Sparkle 2",
+            "hash": "64ca2b157eb94dfad6580ccb98192b48cd008076b8e72ee6a02d753595f0c731"
         },
-        "vlc": {
-            "version": "3.0.8",
-            "baseUrl": "https://downloads.videolan.org/vlc",
-            "label": "VLC",
-            "hashes": {
-                "windows-x64": "91f589ef69fce51645a3ecbb215b405c98db7b891479474ec3b5ed3b63c25e4a"
-            }
+        "ccache-win": {
+            "version": "4.8.1",
+            "baseUrl": "https://github.com/ccache/ccache/releases/download/",
+            "label": "Ccache for Windows x64",
+            "hash": "ca59770e9f46b59d6bec6e7036a17a27d601a0a5a0a721fe8e03fea734ccf732"
         }
     },
     "platformConfig": {
-        "macos-x86_64": {
-            "qtVersion": 6,
-            "deploymentTarget": "11.0",
-            "buildTarget": "11.0"
-        },
-        "macos-arm64": {
-            "qtVersion": 6,
-            "deploymentTarget": "11.0",
-            "buildTarget": "11.0"
-        },
         "macos-universal": {
-            "qtVersion": 6,
-            "deploymentTarget": "11.0",
-            "buildTarget": "11.0"
+            "qtVersion": 6
         },
         "windows-x64": {
             "qtVersion": 6

obs-studio-30.0.2.tar.xz/cmake/32bit Added

obs-studio-30.0.2.tar.xz/cmake/32bit/projects.cmake Added

@@ -0,0 +1,63 @@
+# OBS CMake 32-bit slice module
+
+include_guard(GLOBAL)
+
+include(compilerconfig)
+
+# legacy_check: Helper macro to automatically include available 32-bit build script
+macro(legacy_check)
+  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/32bit-build.cmake")
+    include(cmake/32bit-build.cmake)
+  endif()
+  return()
+endmacro()
+
+# cmake-format: off
+macro(target_disable_feature)
+endmacro()
+
+macro(target_disable)
+endmacro()
+# cmake-format: on
+
+# check_uuid: Helper function to check for valid UUID
+function(check_uuid uuid_string return_value)
+  set(valid_uuid TRUE)
+  set(uuid_token_lengths 8 4 4 4 12)
+  set(token_num 0)
+
+  string(REPLACE "-" ";" uuid_tokens ${uuid_string})
+  list(LENGTH uuid_tokens uuid_num_tokens)
+
+  if(uuid_num_tokens EQUAL 5)
+    message(DEBUG "UUID ${uuid_string} is valid with 5 tokens.")
+    foreach(uuid_token IN LISTS uuid_tokens)
+      list(GET uuid_token_lengths ${token_num} uuid_target_length)
+      string(LENGTH "${uuid_token}" uuid_actual_length)
+      if(uuid_actual_length EQUAL uuid_target_length)
+        string(REGEX MATCH "0-9a-fA-F+" uuid_hex_match ${uuid_token})
+        if(NOT uuid_hex_match STREQUAL uuid_token)
+          set(valid_uuid FALSE)
+          break()
+        endif()
+      else()
+        set(valid_uuid FALSE)
+        break()
+      endif()
+      math(EXPR token_num "${token_num}+1")
+    endforeach()
+  else()
+    set(valid_uuid FALSE)
+  endif()
+  message(DEBUG "UUID ${uuid_string} valid: ${valid_uuid}")
+  # cmake-format: off
+  set(${return_value} ${valid_uuid} PARENT_SCOPE)
+  # cmake-format: on
+endfunction()
+
+if(OS_WINDOWS)
+  include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/windows/buildspec.cmake")
+  add_subdirectory(libobs)
+  add_subdirectory(plugins/win-capture)
+  add_subdirectory(plugins/win-dshow)
+endif()

obs-studio-29.1.3.tar.xz/cmake/Modules/CopyMSVCBins.cmake -> obs-studio-30.0.2.tar.xz/cmake/Modules/CopyMSVCBins.cmake Changed

@@ -87,7 +87,9 @@
   "${FFMPEG_avcodec_INCLUDE_DIR}/../bin${_bin_suffix}/libbz2*.dll"
   "${FFMPEG_avcodec_INCLUDE_DIR}/../bin${_bin_suffix}/zlib*.dll"
   "${FFMPEG_avcodec_INCLUDE_DIR}/bin${_bin_suffix}/libbz2*.dll"
-  "${FFMPEG_avcodec_INCLUDE_DIR}/bin${_bin_suffix}/zlib*.dll")
+  "${FFMPEG_avcodec_INCLUDE_DIR}/bin${_bin_suffix}/zlib*.dll"
+  "${FFMPEG_avcodec_INCLUDE_DIR}/../bin/*datachannel*.dll"
+  "${FFMPEG_avcodec_INCLUDE_DIR}/bin/*datachannel*.dll")
 
 file(GLOB X264_BIN_FILES "${X264_INCLUDE_DIR}/../bin${_bin_suffix}/libx264-*.dll"
      "${X264_INCLUDE_DIR}/../bin/libx264-*.dll" "${X264_INCLUDE_DIR}/bin/libx264-*.dll"
@@ -164,7 +166,7 @@
 file(GLOB RNNOISE_BIN_FILES "${RNNOISE_INCLUDE_DIR}/../bin${_bin_suffix}/rnnoise*.dll"
      "${RNNOISE_INCLUDE_DIR}/../bin/rnnoise*.dll")
 
-set(QtCore_DIR "${Qt${_QT_VERSION}Core_DIR}")
+set(QtCore_DIR "${Qt6Core_DIR}")
 cmake_path(SET QtCore_DIR_NORM NORMALIZE "${QtCore_DIR}/../../..")
 set(QtCore_BIN_DIR "${QtCore_DIR_NORM}bin")
 set(QtCore_PLUGIN_DIR "${QtCore_DIR_NORM}plugins")
@@ -174,13 +176,12 @@
 file(
   GLOB
   QT_DEBUG_BIN_FILES
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Cored.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Guid.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Widgetsd.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}WinExtrasd.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Svgd.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Xmld.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Networkd.dll"
+  "${QtCore_BIN_DIR}/Qt6Cored.dll"
+  "${QtCore_BIN_DIR}/Qt6Guid.dll"
+  "${QtCore_BIN_DIR}/Qt6Widgetsd.dll"
+  "${QtCore_BIN_DIR}/Qt6Svgd.dll"
+  "${QtCore_BIN_DIR}/Qt6Xmld.dll"
+  "${QtCore_BIN_DIR}/Qt6Networkd.dll"
   "${QtCore_BIN_DIR}/libGLESv2d.dll"
   "${QtCore_BIN_DIR}/libEGLd.dll")
 file(GLOB QT_DEBUG_PLAT_BIN_FILES "${QtCore_PLUGIN_DIR}/platforms/qwindowsd.dll")
@@ -192,13 +193,12 @@
 file(
   GLOB
   QT_BIN_FILES
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Core.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Gui.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Widgets.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}WinExtras.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Svg.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Xml.dll"
-  "${QtCore_BIN_DIR}/Qt${_QT_VERSION}Network.dll"
+  "${QtCore_BIN_DIR}/Qt6Core.dll"
+  "${QtCore_BIN_DIR}/Qt6Gui.dll"
+  "${QtCore_BIN_DIR}/Qt6Widgets.dll"
+  "${QtCore_BIN_DIR}/Qt6Svg.dll"
+  "${QtCore_BIN_DIR}/Qt6Xml.dll"
+  "${QtCore_BIN_DIR}/Qt6Network.dll"
   "${QtCore_BIN_DIR}/libGLESv2.dll"
   "${QtCore_BIN_DIR}/libEGL.dll")
 file(GLOB QT_PLAT_BIN_FILES "${QtCore_PLUGIN_DIR}/platforms/qwindows.dll")

obs-studio-30.0.2.tar.xz/cmake/Modules/FindFFnvcodec.cmake Added

@@ -0,0 +1,96 @@
+#=======================================================================.rst
+FindFFnvcodec
+-------------
+
+FindModule for FFnvcodec and the associated headers
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``FFnvcodec::FFnvcodec``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``FFnvcodec_FOUND``
+  True, if headers was found.
+``FFnvcodec_VERSION``
+  Detected version of found FFnvcodec headers.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``FFnvcodec_INCLUDE_DIR``
+  Directory containing ``nvEncodeAPI.h``.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(PC_FFnvcodec QUIET ffnvcodec)
+endif()
+
+find_path(
+  FFnvcodec_INCLUDE_DIR
+  NAMES ffnvcodec/nvEncodeAPI.h
+  HINTS ${PC_FFnvcodec_INCLUDE_DIRS}
+  PATHS /usr/include /usr/local/include
+  DOC "FFnvcodec include directory")
+
+if(PC_FFnvcodec_VERSION VERSION_GREATER 0)
+  set(FFnvcodec_VERSION ${PC_FFnvcodec_VERSION})
+elseif(EXISTS "${FFnvcodec_INCLUDE_DIR}/ffnvcodec/nvEncodeAPI.h")
+  file(STRINGS "${FFnvcodec_INCLUDE_DIR}/ffnvcodec/nvEncodeAPI.h" _version_string
+       REGEX "^.*NVENCAPI_(MAJOR|MINOR)_VERSION \t+0-9+ \t*$")
+
+  string(REGEX REPLACE ".*MAJOR_VERSION \t+(0-9+).*" "\\1" _version_major "${_version_string}")
+  string(REGEX REPLACE ".*MINOR_VERSION \t+(0-9+).*" "\\1" _version_minor "${_version_string}")
+
+  set(FFnvcodec_VERSION "${_version_major}.${_version_minor}")
+  unset(_version_major)
+  unset(_version_minor)
+else()
+  if(NOT FFnvcodec_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find FFnvcodec version.")
+  endif()
+  set(FFnvcodec_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(FFnvcodec_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(FFnvcodec_ERROR_REASON "Ensure FFnvcodec headers are available in local include paths.")
+endif()
+
+find_package_handle_standard_args(
+  FFnvcodec
+  REQUIRED_VARS FFnvcodec_INCLUDE_DIR
+  VERSION_VAR FFnvcodec_VERSION REASON_FAILURE_MESSAGE "${FFnvcodec_ERROR_REASON}")
+mark_as_advanced(FFnvcodec_INCLUDE_DIR)
+unset(FFnvcodec_ERROR_REASON)
+
+if(FFnvcodec_FOUND)
+  if(NOT TARGET FFnvcodec::FFnvcodec)
+    add_library(FFnvcodec::FFnvcodec INTERFACE IMPORTED)
+    set_target_properties(FFnvcodec::FFnvcodec PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FFnvcodec_INCLUDE_DIR}")
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  FFnvcodec PROPERTIES
+  URL "https://github.com/FFmpeg/nv-codec-headers/"
+  DESCRIPTION "FFmpeg version of headers required to interface with NVIDIA's codec APIs.")

obs-studio-29.1.3.tar.xz/cmake/Modules/FindLibva.cmake -> obs-studio-30.0.2.tar.xz/cmake/Modules/FindLibva.cmake Changed

obs-studio-30.0.2.tar.xz/cmake/Modules/FindVPL.cmake Added

@@ -0,0 +1,147 @@
+#=======================================================================.rst
+FindVPL
+-------
+
+FindModule for VPL and associated headers
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``VPL::VPL``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``VPL_FOUND``
+  True, if headers were found.
+``VPL_VERSION``
+  Detected version of found VPL headers.
+``VPL_LIBRARIES``
+  Libraries needed to link to VPL.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``VPL_INCLUDE_DIR``
+  Directory containing ``mfxdispatcher.h``.
+``VPL_LIBRARY_RELEASE``
+  Path to the library component of VPL in non-debug configuration.
+``VPL_LIBRARY_DEBUG``
+  Optional path to the library component of VPL in debug configuration.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(_VPL IMPORTED_TARGET QUIET vpl)
+  if(_VPL_FOUND)
+    add_library(VPL::VPL ALIAS PkgConfig::_VPL)
+    return()
+  endif()
+endif()
+
+find_path(
+  VPL_INCLUDE_DIR
+  NAMES vpl/mfxstructures.h
+  HINTS ${_VPL_INCLUDE_DIRS} ${_VPL_INCLUDE_DIRS}
+  PATHS /usr/include /usr/local/include /opt/local/include /sw/include
+  DOC "VPL include directory")
+
+find_library(
+  VPL_LIBRARY_RELEASE
+  NAMES ${_VPL_LIBRARIES} ${_VPL_LIBRARIES} vpl
+  HINTS ${_VPL_LIBRARY_DIRS} ${_VPL_LIBRARY_DIRS}
+  PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib
+  DOC "VPL library location")
+
+find_library(
+  VPL_LIBRARY_DEBUG
+  NAMES ${_VPL_LIBRARIES} ${_VPL_LIBRARIES} vpld
+  HINTS ${_VPL_LIBRARY_DIRS} ${_VPL_LIBRARY_DIRS}
+  PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib
+  DOC "VPL debug library location")
+
+include(SelectLibraryConfigurations)
+select_library_configurations(VPL)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  VPL
+  REQUIRED_VARS VPL_LIBRARY VPL_INCLUDE_DIR
+  VERSION_VAR VPL_VERSION REASON_FAILURE_MESSAGE "${VPL_ERROR_REASON}")
+mark_as_advanced(VPL_INCLUDE_DIR VPL_LIBRARY)
+unset(VPL_ERROR_REASON)
+
+if(EXISTS "${VPL_INCLUDE_DIR}/vpl/mfxdefs.h")
+  file(STRINGS "${VPL_INCLUDE_DIR}/vpl/mfxdefs.h" _version_string REGEX "^.*VERSION_(MAJOR|MINOR) \t+0-9+ \t*$")
+
+  string(REGEX REPLACE ".*VERSION_MAJOR \t+(0-9+).*" "\\1" _version_major "${_version_string}")
+  string(REGEX REPLACE ".*VERSION_MINOR \t+(0-9+).*" "\\1" _version_minor "${_version_string}")
+
+  set(VPL_VERSION "${_version_major}.${_version_minor}")
+  unset(_version_major)
+  unset(_version_minor)
+else()
+  if(NOT VPL_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find VPL version.")
+  endif()
+  set(VPL_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(VPL_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(VPL_ERROR_REASON "Ensure VPL headers are available in local library paths.")
+endif()
+
+if(VPL_FOUND)
+  set(VPL_INCLUDE_DIRS ${VPL_INCLUDE_DIR})
+  set(VPL_LIBRARIES ${VPL_LIBRARY})
+
+  if(NOT TARGET VPL::VPL)
+    if(IS_ABSOLUTE "${VPL_LIBRARY_RELEASE}")
+      add_library(VPL::VPL UNKNOWN IMPORTED)
+      set_target_properties(VPL::VPL PROPERTIES IMPORTED_LOCATION "${VPL_LIBRARY_RELEASE}")
+    else()
+      add_library(VPL::VPL INTERFACE IMPORTED)
+      set_target_properties(VPL::VPL PROPERTIES IMPORTED_LIBNAME "${VPL_LIBRARY_RELEASE}")
+    endif()
+
+    set_target_properties(
+      VPL::VPL
+      PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${VPL_INCLUDE_DIRS}"
+                 VERSION ${VPL_VERSION}
+                 IMPORTED_CONFIGURATIONS Release)
+
+    if(VPL_LIBRARY_DEBUG)
+      if(IS_ABSOLUTE "${VPL_LIBRARY_DEBUG}")
+        set_target_properties(VPL::VPL PROPERTIES IMPORTED_LOCATION_DEBUG "${VPL_LIBRARY_DEBUG}")
+      else()
+        set_target_properties(VPL::VPL PROPERTIES IMPORTED_LIBNAME_DEBUG "${VPL_LIBRARY_DEBUG}")
+      endif()
+      set_property(
+        TARGET VPL::VPL
+        APPEND
+        PROPERTY IMPORTED_CONFIGURATIONS Debug)
+    endif()
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  VPL PROPERTIES
+  URL "https://github.com/oneapi-src/oneVPL"
+  DESCRIPTION
+    "Intel® oneAPI Video Processing Library (oneVPL) supports AI visual inference, media delivery, cloud gaming, and virtual desktop infrastructure use cases by providing access to hardware accelerated video decode, encode, and frame processing capabilities on Intel® GPUs."
+)

obs-studio-30.0.2.tar.xz/cmake/Modules/Findqrcodegencpp.cmake Added

@@ -0,0 +1,174 @@
+#=======================================================================.rst
+Findqrcodegencpp
+----------------
+
+FindModule for qrcodegencpp and associated libraries
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``qrcodegencpp::qrcodegencpp``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``qrcodegencpp_FOUND``
+  True, if all required components and the core library were found.
+``qrcodegencpp_VERSION``
+  Detected version of found qrcodegencpp libraries.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``qrcodegencpp_LIBRARY``
+  Path to the library component of qrcodegencpp.
+``qrcodegencpp_INCLUDE_DIR``
+  Directory containing ``qrcodegen.hpp``.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(PC_qrcodegencpp QUIET qrcodegencpp)
+endif()
+
+# qrcodegencpp_set_soname: Set SONAME on imported library target
+macro(qrcodegencpp_set_soname)
+  if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
+    execute_process(
+      COMMAND sh -c "otool -D '${qrcodegencpp_LIBRARY}' | grep -v '${qrcodegencpp_LIBRARY}'"
+      OUTPUT_VARIABLE _output
+      RESULT_VARIABLE _result)
+
+    if(_result EQUAL 0 AND _output MATCHES "^@rpath/")
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_SONAME "${_output}")
+    endif()
+  elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+    execute_process(
+      COMMAND sh -c "${CMAKE_OBJDUMP} -p '${qrcodegencpp_LIBRARY}' | grep SONAME"
+      OUTPUT_VARIABLE _output
+      RESULT_VARIABLE _result)
+
+    if(_result EQUAL 0)
+      string(REGEX REPLACE " \t+SONAME \t+(^ \t+)" "\\1" _soname "${_output}")
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_SONAME "${_soname}")
+      unset(_soname)
+    endif()
+  endif()
+  unset(_output)
+  unset(_result)
+endmacro()
+
+# qrcodegencpp_find_dll: Find DLL for corresponding import library
+macro(qrcodegencpp_find_dll)
+  cmake_path(GET qrcodegencpp_IMPLIB PARENT_PATH _implib_path)
+  cmake_path(SET _bin_path NORMALIZE "${_implib_path}/../bin")
+
+  string(REGEX REPLACE "0-9+\\.(0-9+)\\.0-9+" "\\1" _dll_version "${qrcodegencpp_VERSION}")
+
+  find_program(
+    qrcodegencpp_LIBRARY
+    NAMES qrcodegencpp.dll
+    HINTS ${_implib_path} ${_bin_path}
+    DOC "qrcodegencpp DLL location")
+
+  if(NOT qrcodegencpp_LIBRARY)
+    set(qrcodegencpp_LIBRARY "${qrcodegencpp_IMPLIB}")
+  endif()
+  unset(_implib_path)
+  unset(_bin_path)
+  unset(_dll_version)
+endmacro()
+
+find_path(
+  qrcodegencpp_INCLUDE_DIR
+  NAMES qrcodegen.hpp
+  HINTS ${PC_qrcodegencpp_INCLUDE_DIRS}
+  PATHS /usr/include /usr/local/include
+  PATH_SUFFIXES qrcodegencpp qrcodegen
+  DOC "qrcodegencpp include directory")
+
+if(PC_qrcodegencpp_VERSION VERSION_GREATER 0)
+  set(qrcodegencpp_VERSION ${PC_qrcodegencpp_VERSION})
+else()
+  if(NOT qrcodegencpp_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find qrcodegencpp version.")
+  endif()
+  set(qrcodegencpp_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+  find_library(
+    qrcodegencpp_IMPLIB
+    NAMES qrcodegencpp qrcodegencpp
+    DOC "qrcodegencpp import library location")
+
+  qrcodegencpp_find_dll()
+else()
+  find_library(
+    qrcodegencpp_LIBRARY
+    NAMES qrcodegencpp qrcodegencpp
+    HINTS ${PC_qrcodegencpp_LIBRARY_DIRS}
+    PATHS /usr/lib /usr/local/lib
+    DOC "qrcodegencpp location")
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(qrcodegencpp_ERROR_REASON "Ensure that a qrcodegencpp distribution is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(qrcodegencpp_ERROR_REASON "Ensure that qrcodegencpp is installed on the system.")
+endif()
+
+find_package_handle_standard_args(
+  qrcodegencpp
+  REQUIRED_VARS qrcodegencpp_LIBRARY qrcodegencpp_INCLUDE_DIR
+  VERSION_VAR qrcodegencpp_VERSION REASON_FAILURE_MESSAGE "${qrcodegencpp_ERROR_REASON}")
+mark_as_advanced(qrcodegencpp_INCLUDE_DIR qrcodegencpp_LIBRARY qrcodegencpp_IMPLIB)
+unset(qrcodegencpp_ERROR_REASON)
+
+if(qrcodegencpp_FOUND)
+  if(NOT TARGET qrcodegencpp::qrcodegencpp)
+    if(IS_ABSOLUTE "${qrcodegencpp_LIBRARY}")
+      if(DEFINED qrcodegencpp_IMPLIB)
+        if(qrcodegencpp_IMPLIB STREQUAL qrcodegencpp_LIBRARY)
+          add_library(qrcodegencpp::qrcodegencpp STATIC IMPORTED)
+        else()
+          add_library(qrcodegencpp::qrcodegencpp SHARED IMPORTED)
+          set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_IMPLIB "${qrcodegencpp_IMPLIB}")
+        endif()
+      else()
+        add_library(qrcodegencpp::qrcodegencpp UNKNOWN IMPORTED)
+      endif()
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_LOCATION "${qrcodegencpp_LIBRARY}")
+    else()
+      add_library(qrcodegencpp::qrcodegencpp INTERFACE IMPORTED)
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_LIBNAME "${qrcodegencpp_LIBRARY}")
+    endif()
+
+    qrcodegencpp_set_soname()
+    set_target_properties(
+      qrcodegencpp::qrcodegencpp
+      PROPERTIES INTERFACE_COMPILE_OPTIONS "${PC_qrcodegencpp_CFLAGS_OTHER}"
+                 INTERFACE_INCLUDE_DIRECTORIES "${qrcodegencpp_INCLUDE_DIR}"
+                 VERSION ${qrcodegencpp_VERSION})
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  qrcodegencpp PROPERTIES
+  URL "https://www.nayuki.io/page/qr-code-generator-library"
+  DESCRIPTION "This project aims to be the best, clearest library for generating QR Codes in C++.")

obs-studio-29.1.3.tar.xz/cmake/Modules/ObsHelpers.cmake -> obs-studio-30.0.2.tar.xz/cmake/Modules/ObsHelpers.cmake Changed

@@ -309,78 +309,29 @@
   endforeach()
 endfunction()
 
-if(NOT QT_VERSION)
-  set(QT_VERSION
-      AUTO
-      CACHE STRING "OBS Qt version AUTO, 5, 6" FORCE)
-  set_property(CACHE QT_VERSION PROPERTY STRINGS AUTO 5 6)
-endif()
-
 macro(find_qt)
   set(multiValueArgs COMPONENTS COMPONENTS_WIN COMPONENTS_MAC COMPONENTS_LINUX)
   cmake_parse_arguments(FIND_QT "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
   set(QT_NO_CREATE_VERSIONLESS_TARGETS ON)
   find_package(
-    Qt5
-    COMPONENTS Core
-    QUIET)
-  find_package(
     Qt6
     COMPONENTS Core
-    QUIET)
-
-  if(NOT _QT_VERSION AND QT_VERSION STREQUAL AUTO)
-    if(TARGET Qt6::Core)
-      set(_QT_VERSION
-          6
-          CACHE INTERNAL "")
-    elseif(TARGET Qt5::Core)
-      set(_QT_VERSION
-          5
-          CACHE INTERNAL "")
-    endif()
-    obs_status(STATUS "Qt version: ${_QT_VERSION}")
-  elseif(NOT _QT_VERSION)
-    if(TARGET Qt${QT_VERSION}::Core)
-      set(_QT_VERSION
-          ${QT_VERSION}
-          CACHE INTERNAL "")
-    else()
-      if(QT_VERSION EQUAL 6)
-        set(FALLBACK_QT_VERSION 5)
-      else()
-        set(FALLBACK_QT_VERSION 6)
-      endif()
-      message(WARNING "Qt${QT_VERSION} was not found, falling back to Qt${FALLBACK_QT_VERSION}")
-
-      if(TARGET Qt${FALLBACK_QT_VERSION}::Core)
-        set(_QT_VERSION
-            ${FALLBACK_QT_VERSION}
-            CACHE INTERNAL "")
-      endif()
-    endif()
-    obs_status(STATUS "Qt version: ${_QT_VERSION}")
-  endif()
-
+    REQUIRED)
   set(QT_NO_CREATE_VERSIONLESS_TARGETS OFF)
 
-  if(NOT _QT_VERSION)
-    message(FATAL_ERROR "Neither Qt5 or Qt6 were found")
-  endif()
-
   if(OS_WINDOWS)
     find_package(
-      Qt${_QT_VERSION}
+      Qt6
       COMPONENTS ${FIND_QT_COMPONENTS} ${FIND_QT_COMPONENTS_WIN}
       REQUIRED)
   elseif(OS_MACOS)
     find_package(
-      Qt${_QT_VERSION}
+      Qt6
       COMPONENTS ${FIND_QT_COMPONENTS} ${FIND_QT_COMPONENTS_MAC}
       REQUIRED)
   else()
     find_package(
-      Qt${_QT_VERSION}
+      Qt6
       COMPONENTS ${FIND_QT_COMPONENTS} ${FIND_QT_COMPONENTS_LINUX}
       REQUIRED)
   endif()
@@ -392,10 +343,10 @@
   endif()
 
   foreach(_COMPONENT IN LISTS FIND_QT_COMPONENTS FIND_QT_COMPONENTS_WIN FIND_QT_COMPONENTS_MAC FIND_QT_COMPONENTS_LINUX)
-    if(NOT TARGET Qt::${_COMPONENT} AND TARGET Qt${_QT_VERSION}::${_COMPONENT})
+    if(NOT TARGET Qt::${_COMPONENT} AND TARGET Qt6::${_COMPONENT})
 
       add_library(Qt::${_COMPONENT} INTERFACE IMPORTED)
-      set_target_properties(Qt::${_COMPONENT} PROPERTIES INTERFACE_LINK_LIBRARIES "Qt${_QT_VERSION}::${_COMPONENT}")
+      set_target_properties(Qt::${_COMPONENT} PROPERTIES INTERFACE_LINK_LIBRARIES "Qt6::${_COMPONENT}")
     endif()
   endforeach()
 endmacro()

obs-studio-29.1.3.tar.xz/cmake/Modules/VersionConfig.cmake -> obs-studio-30.0.2.tar.xz/cmake/Modules/VersionConfig.cmake Changed

obs-studio-29.1.3.tar.xz/cmake/common/bootstrap.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/bootstrap.cmake Changed

@@ -1,34 +1,58 @@
 # OBS CMake bootstrap module
 
+include_guard(GLOBAL)
+
 # Enable automatic PUSH and POP of policies to parent scope
 if(POLICY CMP0011)
 cmake_policy(SET CMP0011 NEW)
 endif()
 
+# Enable distinction between Clang and AppleClang
+if(POLICY CMP0025)
+ cmake_policy(SET CMP0025 NEW)
+endif()
+
+# Enable strict checking of "break()" usage
+if(POLICY CMP0055)
+ cmake_policy(SET CMP0055 NEW)
+endif()
+
+# Honor visibility presets for all target types (executable, shared, module, static)
+if(POLICY CMP0063)
+ cmake_policy(SET CMP0063 NEW)
+endif()
+
+# Disable export function calls to populate package registry by default
+if(POLICY CMP0090)
+ cmake_policy(SET CMP0090 NEW)
+endif()
+
+set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO RelWithDebInfo Release MinSizeRel "")
+set(CMAKE_MAP_IMPORTED_CONFIG_MINSIZEREL MinSizeRel Release RelWithDebInfo "")
+set(CMAKE_MAP_IMPORTED_CONFIG_RELEASE Release RelWithDebInfo MinSizeRel "")
+
 # Prohibit in-source builds
-if("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
- message(
- FATAL_ERROR
- "OBS: In-source builds of OBS are not supported. Specify a build directory via 'cmake -S <SOURCE DIRECTORY> -B <BUILD_DIRECTORY>' instead."
- )
+if("${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ message(FATAL_ERROR "In-source builds of OBS are not supported. "
+ "Specify a build directory via 'cmake -S <SOURCE DIRECTORY> -B <BUILD_DIRECTORY>' instead.")
+ file(REMOVE_RECURSE "${CMAKE_CURRENT_SOURCE_DIR}/CMakeCache.txt" "${CMAKE_CURRENT_SOURCE_DIR}/CMakeFiles")
 endif()
-file(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/CMakeCache.txt" "${CMAKE_SOURCE_DIR}/CMakeFiles")
 
 # Use folders for source file organization with IDE generators (Visual Studio/Xcode)
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(GLOBAL PROPERTY USE_FOLDERS TRUE)
 
 # Set default global project variables
 set(OBS_COMPANY_NAME "OBS Project")
 set(OBS_PRODUCT_NAME "OBS Studio")
 set(OBS_WEBSITE "https://www.obsproject.com")
 set(OBS_COMMENTS "Free and open source software for video recording and live streaming")
-set(OBS_LEGAL_COPYRIGHT "(C) Hugh Bailey")
+set(OBS_LEGAL_COPYRIGHT "(C) Lain Bailey")
+set(OBS_CMAKE_VERSION 3.0.0)
 
 # Configure default version strings
-message(DEBUG "Setting default project version variables...")
 set(_obs_default_version "0" "0" "1")
-set(_obs_release_candidate "0" "0" "0" "0")
-set(_obs_beta "0" "0" "0" "0")
+set(_obs_release_candidate 0)
+set(_obs_beta 0)
 
 # Add common module directories to default search path
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/common" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/finders")
@@ -38,7 +62,7 @@
 include(osconfig)
 
 # Allow selection of common build types via UI
-if(NOT CMAKE_BUILD_TYPE)
+if(NOT CMAKE_GENERATOR MATCHES "(Xcode|Visual Studio .+)")
 set(CMAKE_BUILD_TYPE
 "RelWithDebInfo"
 CACHE STRING "OBS build type Release, RelWithDebInfo, Debug, MinSizeRel" FORCE)

obs-studio-29.1.3.tar.xz/cmake/common/buildnumber.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/buildnumber.cmake Changed

obs-studio-30.0.2.tar.xz/cmake/common/buildspec_common.cmake Added

@@ -0,0 +1,187 @@
+# OBS common build dependencies module
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=E1126
+# cmake-lint: disable=R0912
+# cmake-lint: disable=R0915
+# cmake-format: on
+
+include_guard(GLOBAL)
+
+# _check_deps_version: Checks for obs-deps VERSION file in prefix paths
+function(_check_deps_version version)
+  # cmake-format: off
+  set(found FALSE PARENT_SCOPE)
+  # cmake-format: on
+
+  foreach(path IN LISTS CMAKE_PREFIX_PATH)
+    if(EXISTS "${path}/share/obs-deps/VERSION")
+      if(dependency STREQUAL qt6 AND NOT EXISTS "${path}/lib/cmake/Qt6/Qt6Config.cmake")
+        # cmake-format: off
+        set(found FALSE PARENT_SCOPE)
+        # cmake-format: on
+        continue()
+      endif()
+
+      file(READ "${path}/share/obs-deps/VERSION" _check_version)
+      string(REPLACE "\n" "" _check_version "${_check_version}")
+      string(REPLACE "-" "." _check_version "${_check_version}")
+      string(REPLACE "-" "." version "${version}")
+
+      if(_check_version VERSION_EQUAL version)
+        # cmake-format: off
+        set(found TRUE PARENT_SCOPE)
+        # cmake-format: on
+        break()
+      elseif(_check_version VERSION_LESS version)
+        message(AUTHOR_WARNING "Older ${label} version detected in ${path}: \n"
+                               "Found ${_check_version}, require ${version}")
+        list(REMOVE_ITEM CMAKE_PREFIX_PATH "${path}")
+        list(APPEND CMAKE_PREFIX_PATH "${path}")
+        # cmake-format: off
+        set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
+        # cmake-format: on
+        continue()
+      else()
+        message(AUTHOR_WARNING "Newer ${label} version detected in ${path}: \n"
+                               "Found ${_check_version}, require ${version}")
+        # cmake-format: off
+        set(found TRUE PARENT_SCOPE)
+        # cmake-format: on
+        break()
+      endif()
+    endif()
+  endforeach()
+endfunction()
+
+# _check_dependencies: Fetch and extract pre-built OBS build dependencies
+function(_check_dependencies)
+  file(READ "${CMAKE_CURRENT_SOURCE_DIR}/buildspec.json" buildspec)
+
+  # cmake-format: off
+  string(JSON dependency_data GET ${buildspec} dependencies)
+  # cmake-format: on
+
+  foreach(dependency IN LISTS dependencies_list)
+    if(dependency STREQUAL cef AND arch STREQUAL universal)
+      if(CMAKE_OSX_ARCHITECTURES MATCHES ".+;.+")
+        continue()
+      endif()
+      set(arch ${CMAKE_OSX_ARCHITECTURES})
+      set(platform macos-${arch})
+    endif()
+
+    # cmake-format: off
+    string(JSON data GET ${dependency_data} ${dependency})
+    string(JSON version GET ${data} version)
+    string(JSON hash GET ${data} hashes ${platform})
+    string(JSON url GET ${data} baseUrl)
+    string(JSON label GET ${data} label)
+    string(JSON revision ERROR_VARIABLE error GET ${data} revision ${platform})
+    # cmake-format: on
+
+    message(STATUS "Setting up ${label} (${arch})")
+
+    set(file "${${dependency}_filename}")
+    set(destination "${${dependency}_destination}")
+    string(REPLACE "VERSION" "${version}" file "${file}")
+    string(REPLACE "VERSION" "${version}" destination "${destination}")
+    string(REPLACE "ARCH" "${arch}" file "${file}")
+    string(REPLACE "ARCH" "${arch}" destination "${destination}")
+    if(revision)
+      string(REPLACE "_REVISION" "_v${revision}" file "${file}")
+      string(REPLACE "-REVISION" "-v${revision}" file "${file}")
+    else()
+      string(REPLACE "_REVISION" "" file "${file}")
+      string(REPLACE "-REVISION" "" file "${file}")
+    endif()
+
+    if(EXISTS "${dependencies_dir}/.dependency_${dependency}_${arch}.sha256")
+      file(READ "${dependencies_dir}/.dependency_${dependency}_${arch}.sha256"
+           OBS_DEPENDENCY_${dependency}_${arch}_HASH)
+    endif()
+
+    set(skip FALSE)
+    if(dependency STREQUAL prebuilt OR dependency STREQUAL qt6)
+      if(OBS_DEPENDENCY_${dependency}_${arch}_HASH STREQUAL ${hash})
+        _check_deps_version(${version})
+
+        if(found)
+          set(skip TRUE)
+        endif()
+      endif()
+    elseif(dependency STREQUAL cef)
+      if(NOT ENABLE_BROWSER)
+        set(skip TRUE)
+      elseif(OBS_DEPENDENCY_${dependency}_${arch}_HASH STREQUAL ${hash} AND (CEF_ROOT_DIR AND EXISTS "${CEF_ROOT_DIR}"))
+        set(skip TRUE)
+      endif()
+    endif()
+
+    if(skip)
+      message(STATUS "Setting up ${label} (${arch}) - skipped")
+      continue()
+    endif()
+
+    if(dependency STREQUAL cef)
+      set(url ${url}/${file})
+    else()
+      set(url ${url}/${version}/${file})
+    endif()
+
+    if(NOT EXISTS "${dependencies_dir}/${file}")
+      message(STATUS "Downloading ${url}")
+      file(
+        DOWNLOAD "${url}" "${dependencies_dir}/${file}"
+        STATUS download_status
+        EXPECTED_HASH SHA256=${hash})
+
+      list(GET download_status 0 error_code)
+      list(GET download_status 1 error_message)
+      if(error_code GREATER 0)
+        message(STATUS "Downloading ${url} - Failure")
+        message(FATAL_ERROR "Unable to download ${url}, failed with error: ${error_message}")
+        file(REMOVE "${dependencies_dir}/${file}")
+      else()
+        message(STATUS "Downloading ${url} - done")
+      endif()
+    endif()
+
+    if(NOT OBS_DEPENDENCY_${dependency}_${arch}_HASH STREQUAL ${hash})
+      file(REMOVE_RECURSE "${dependencies_dir}/${destination}")
+    endif()
+
+    if(NOT EXISTS "${dependencies_dir}/${destination}")
+      file(MAKE_DIRECTORY "${dependencies_dir}/${destination}")
+      if(dependency STREQUAL obs-studio)
+        file(ARCHIVE_EXTRACT INPUT "${dependencies_dir}/${file}" DESTINATION "${dependencies_dir}")
+      else()
+        file(ARCHIVE_EXTRACT INPUT "${dependencies_dir}/${file}" DESTINATION "${dependencies_dir}/${destination}")
+      endif()
+    endif()
+
+    file(WRITE "${dependencies_dir}/.dependency_${dependency}_${arch}.sha256" "${hash}")
+
+    if(dependency STREQUAL prebuilt)
+      set(VLC_PATH
+          "${dependencies_dir}/${destination}"
+          CACHE PATH "VLC source code directory" FORCE)
+      list(APPEND CMAKE_PREFIX_PATH "${dependencies_dir}/${destination}")
+    elseif(dependency STREQUAL qt6)
+      list(APPEND CMAKE_PREFIX_PATH "${dependencies_dir}/${destination}")
+    elseif(dependency STREQUAL cef)
+      set(CEF_ROOT_DIR
+          "${dependencies_dir}/${destination}"
+          CACHE PATH "CEF root directory" FORCE)
+    endif()
+
+    message(STATUS "Setting up ${label} (${arch}) - done")
+  endforeach()
+
+  list(REMOVE_DUPLICATES CMAKE_PREFIX_PATH)
+
+  # cmake-format: off
+  set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} CACHE PATH "CMake prefix search path" FORCE)
+  # cmake-format: on
+endfunction()

obs-studio-29.1.3.tar.xz/cmake/common/ccache.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/ccache.cmake Changed

obs-studio-29.1.3.tar.xz/cmake/common/compiler_common.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/compiler_common.cmake Changed

@@ -1,1 +1,83 @@
 # OBS CMake common compiler options module
+
+include_guard(GLOBAL)
+
+# Set C and C++ language standards to C17 and C++17
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.21)
+  set(CMAKE_C_STANDARD 17)
+else()
+  set(CMAKE_C_STANDARD 11)
+endif()
+set(CMAKE_C_STANDARD_REQUIRED TRUE)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
+# Set symbols to be hidden by default for C and C++
+set(CMAKE_C_VISIBILITY_PRESET hidden)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
+
+# clang options for C, C++, ObjC, and ObjC++
+set(_obs_clang_common_options
+    -fno-strict-aliasing
+    -Wno-trigraphs
+    -Wno-missing-field-initializers
+    -Wno-missing-prototypes
+    -Werror=return-type
+    -Wunreachable-code
+    -Wquoted-include-in-framework-header
+    -Wno-missing-braces
+    -Wparentheses
+    -Wswitch
+    -Wno-unused-function
+    -Wno-unused-label
+    -Wunused-parameter
+    -Wunused-variable
+    -Wunused-value
+    -Wempty-body
+    -Wuninitialized
+    -Wno-unknown-pragmas
+    -Wfour-char-constants
+    -Wconstant-conversion
+    -Wno-conversion
+    -Wint-conversion
+    -Wbool-conversion
+    -Wenum-conversion
+    -Wnon-literal-null-conversion
+    -Wsign-compare
+    -Wshorten-64-to-32
+    -Wpointer-sign
+    -Wnewline-eof
+    -Wno-implicit-fallthrough
+    -Wdeprecated-declarations
+    -Wno-sign-conversion
+    -Winfinite-recursion
+    -Wcomma
+    -Wno-strict-prototypes
+    -Wno-semicolon-before-method-body
+    -Wformat-security
+    -Wvla
+    -Wno-error=shorten-64-to-32)
+
+# clang options for C
+set(_obs_clang_c_options ${_obs_clang_common_options} -Wno-shadow -Wno-float-conversion)
+
+# clang options for C++
+set(_obs_clang_cxx_options
+    ${_obs_clang_common_options}
+    -Wno-non-virtual-dtor
+    -Wno-overloaded-virtual
+    -Wno-exit-time-destructors
+    -Wno-shadow
+    -Winvalid-offsetof
+    -Wmove
+    -Werror=block-capture-autoreleasing
+    -Wrange-loop-analysis)
+
+if(CMAKE_CXX_STANDARD GREATER_EQUAL 20)
+  list(APPEND _obs_clang_cxx_options -fno-char8_t)
+endif()
+
+if(NOT DEFINED CMAKE_COMPILE_WARNING_AS_ERROR)
+  set(CMAKE_COMPILE_WARNING_AS_ERROR ON)
+endif()

obs-studio-29.1.3.tar.xz/cmake/common/cpackconfig_common.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/cpackconfig_common.cmake Changed

obs-studio-29.1.3.tar.xz/cmake/common/helpers_common.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/helpers_common.cmake Changed

@@ -8,6 +8,8 @@
 # cmake-lint: disable=R0915
 # cmake-format: on
 
+include_guard(GLOBAL)
+
 # message_configuration: Function to print configuration outcome
 function(message_configuration)
 include(FeatureSummary)
@@ -31,6 +33,7 @@
 COMPARE NATURAL
 CASE SENSITIVE
 ORDER ASCENDING)
+
 if(OBS_FEATURES_ENABLED)
 message(NOTICE "------------------------ Enabled Features ------------------------")
 foreach(feature IN LISTS OBS_FEATURES_ENABLED)
@@ -44,6 +47,7 @@
 COMPARE NATURAL
 CASE SENSITIVE
 ORDER ASCENDING)
+
 if(OBS_FEATURES_DISABLED)
 message(NOTICE "------------------------ Disabled Features ------------------------")
 foreach(feature IN LISTS OBS_FEATURES_DISABLED)
@@ -58,6 +62,7 @@
 COMPARE NATURAL
 CASE SENSITIVE
 ORDER ASCENDING)
+
 if(OBS_MODULES_ENABLED)
 message(NOTICE "------------------------ Enabled Modules ------------------------")
 foreach(feature IN LISTS OBS_MODULES_ENABLED)
@@ -71,6 +76,7 @@
 COMPARE NATURAL
 CASE SENSITIVE
 ORDER ASCENDING)
+
 if(OBS_MODULES_DISABLED)
 message(NOTICE "------------------------ Disabled Modules ------------------------")
 foreach(feature IN LISTS OBS_MODULES_DISABLED)
@@ -104,16 +110,6 @@
 set_property(GLOBAL APPEND PROPERTY OBS_MODULES_DISABLED ${target})
 endfunction()
 
-# * Use QT_VERSION value as a hint for desired Qt version
-# * If "AUTO" was specified, prefer Qt6 over Qt5
-# * Creates versionless targets of desired component if none had been created by Qt itself (Qt versions < 5.15)
-if(NOT QT_VERSION)
- set(QT_VERSION
- AUTO
- CACHE STRING "OBS Qt version AUTO, 5, 6" FORCE)
- set_property(CACHE QT_VERSION PROPERTY STRINGS AUTO 5 6)
-endif()
-
 # find_qt: Macro to find best possible Qt version for use with the project:
 macro(find_qt)
 set(multiValueArgs COMPONENTS COMPONENTS_WIN COMPONENTS_MAC COMPONENTS_LINUX)
@@ -123,38 +119,11 @@
 # find_package runs
 set(QT_NO_CREATE_VERSIONLESS_TARGETS TRUE)
 
- message(DEBUG "Start Qt version discovery...")
- # Loop until _QT_VERSION is set or FATAL_ERROR aborts script execution early
- while(NOT _QT_VERSION)
- message(DEBUG "QT_VERSION set to ${QT_VERSION}")
- if(QT_VERSION STREQUAL AUTO AND NOT qt_test_version)
- set(qt_test_version 6)
- elseif(NOT QT_VERSION STREQUAL AUTO)
- set(qt_test_version ${QT_VERSION})
- endif()
- message(DEBUG "Attempting to find Qt${qt_test_version}")
-
- find_package(
- Qt${qt_test_version}
- COMPONENTS Core
- QUIET)
-
- if(TARGET Qt${qt_test_version}::Core)
- set(_QT_VERSION
- ${qt_test_version}
- CACHE INTERNAL "")
- message(STATUS "Qt version found: ${_QT_VERSION}")
- unset(qt_test_version)
- break()
- elseif(QT_VERSION STREQUAL AUTO)
- if(qt_test_version EQUAL 6)
- message(WARNING "Qt6 was not found, falling back to Qt5")
- set(qt_test_version 5)
- continue()
- endif()
- endif()
- message(FATAL_ERROR "Neither Qt6 nor Qt5 found.")
- endwhile()
+ message(DEBUG "Attempting to find Qt 6")
+ find_package(
+ Qt6
+ COMPONENTS Core
+ REQUIRED)
 
 # Enable versionless targets for the remaining Qt components
 set(QT_NO_CREATE_VERSIONLESS_TARGETS FALSE)
@@ -169,7 +138,7 @@
 endif()
 message(DEBUG "Trying to find Qt components ${qt_components}...")
 
- find_package(Qt${_QT_VERSION} REQUIRED ${qt_components})
+ find_package(Qt6 REQUIRED ${qt_components})
 
 list(APPEND qt_components Core)
 
@@ -180,9 +149,9 @@
 # Check for versionless targets of each requested component and create if necessary
 foreach(component IN LISTS qt_components)
 message(DEBUG "Checking for target Qt::${component}")
- if(NOT TARGET Qt::${component} AND TARGET Qt${_QT_VERSION}::${component})
+ if(NOT TARGET Qt::${component} AND TARGET Qt6::${component})
 add_library(Qt::${component} INTERFACE IMPORTED)
- set_target_properties(Qt::${component} PROPERTIES INTERFACE_LINK_LIBRARIES Qt${_QT_VERSION}::${component})
+ set_target_properties(Qt::${component} PROPERTIES INTERFACE_LINK_LIBRARIES Qt6::${component})
 endif()
 endforeach()
 endmacro()
@@ -226,7 +195,7 @@
 list(GET gen_expression 0 gen_platform)
 list(GET gen_expression 1 gen_library)
 string(REPLACE "," ";" gen_platform "${gen_platform}")
- if(CMAKE_HOST_SYSTEM_NAME IN_LIST platform)
+ if(CMAKE_SYSTEM_NAME IN_LIST platform)
 set(library "${gen_library}")
 else()
 continue()

obs-studio-29.1.3.tar.xz/cmake/common/osconfig.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/osconfig.cmake Changed

obs-studio-29.1.3.tar.xz/cmake/common/versionconfig.cmake -> obs-studio-30.0.2.tar.xz/cmake/common/versionconfig.cmake Changed

@@ -4,67 +4,46 @@
 # cmake-lint: disable=C0301
 # cmake-format: on
 
-# Attempt to automatically discover expected OBS version
-if(NOT DEFINED OBS_VERSION_OVERRIDE)
- if(DEFINED RELEASE_CANDIDATE)
- if(RELEASE_CANDIDATE MATCHES "0-9+\\.0-9+\\.0-9+-rc0-9+")
- string(REGEX REPLACE "(0-9+)\\.(0-9+)\\.(0-9+)-rc(0-9)+" "\\1;\\2;\\3;\\4" _obs_release_candidate
- ${RELEASE_CANDIDATE})
- list(GET _obs_release_candidate 0 1 2 _obs_version_canonical)
- set(_obs_version ${RELEASE_CANDIDATE})
- else()
- message(FATAL_ERROR "Invalid release candidate version supplied - must be <MAJOR>.<MINOR>.<PATCH>-rc<CANDIDATE>.")
- endif()
- elseif(DEFINED BETA)
- if(BETA MATCHES "0-9+\\.0-9+\\.0-9+-beta0-9+")
- string(REGEX REPLACE "(0-9+)\\.(0-9+)\\.(0-9+)-beta(0-9)+" "\\1;\\2;\\3;\\4" _obs_beta ${BETA})
- list(GET _obs_beta 0 1 2 _obs_version_canonical)
- set(_obs_version ${BETA})
- else()
- message(FATAL_ERROR "Invalid beta version supplied - must be <MAJOR>.<MINOR>.<PATCH>-beta<RELEASE>.")
- endif()
- elseif(EXISTS "${CMAKE_SOURCE_DIR}/.git")
- execute_process(
- COMMAND git describe --always --tags --dirty=-modified
- OUTPUT_VARIABLE _obs_version
- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
- RESULT_VARIABLE _obs_version_result
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+include_guard(GLOBAL)
+
+set(_obs_version ${_obs_default_version})
+set(_obs_version_canonical ${_obs_default_version})
 
- if(_obs_version_result EQUAL 0)
- if(_obs_version MATCHES "rc0-9+$")
- set(RELEASE_CANDIDATE ${_obs_version})
- elseif(_obs_version MATCHES "beta0-9+$")
- set(BETA ${_obs_version})
- endif()
+# Attempt to automatically discover expected OBS version
+if(NOT DEFINED OBS_VERSION_OVERRIDE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+ execute_process(
+ COMMAND git describe --always --tags --dirty=-modified
+ OUTPUT_VARIABLE _obs_version
+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ RESULT_VARIABLE _obs_version_result
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
 
- string(REGEX REPLACE "(0-9+)\\.(0-9+)\\.(0-9+).*" "\\1;\\2;\\3" _obs_version_canonical ${_obs_version})
- else()
- set(_obs_version ${_obs_default_version})
- set(_obs_version_canonical ${_obs_default_version})
- endif()
+ if(_obs_version_result EQUAL 0)
+ string(REGEX REPLACE "(0-9+)\\.(0-9+)\\.(0-9+).*" "\\1;\\2;\\3" _obs_version_canonical ${_obs_version})
 endif()
-else()
+elseif(DEFINED OBS_VERSION_OVERRIDE)
 if(OBS_VERSION_OVERRIDE MATCHES "(0-9+)\\.(0-9+)\\.(0-9+).*")
 string(REGEX REPLACE "(0-9+)\\.(0-9+)\\.(0-9+).*" "\\1;\\2;\\3" _obs_version_canonical
 ${OBS_VERSION_OVERRIDE})
 set(_obs_version ${OBS_VERSION_OVERRIDE})
 else()
- message(FATAL_ERROR "Invalid version supplied - must be <MAJOR>.<MINOR>.<PATCH>.")
+ message(FATAL_ERROR "Invalid version supplied - must be <MAJOR>.<MINOR>.<PATCH>-(rc|beta)<NUMBER>.")
 endif()
 endif()
 
+# Set beta/rc versions if suffix included in version string
+if(_obs_version MATCHES "0-9+\\.0-9+\\.0-9+-rc0-9+")
+ string(REGEX REPLACE "0-9+\\.0-9+\\.0-9+-rc(0-9+).*$" "\\1" _obs_release_candidate ${_obs_version})
+elseif(_obs_version MATCHES "0-9+\\.0-9+\\.0-9+-beta0-9+")
+ string(REGEX REPLACE "0-9+\\.0-9+\\.0-9+-beta(0-9+).*$" "\\1" _obs_beta ${_obs_version})
+endif()
+
 list(GET _obs_version_canonical 0 OBS_VERSION_MAJOR)
 list(GET _obs_version_canonical 1 OBS_VERSION_MINOR)
 list(GET _obs_version_canonical 2 OBS_VERSION_PATCH)
-list(GET _obs_release_candidate 0 OBS_RELEASE_CANDIDATE_MAJOR)
-list(GET _obs_release_candidate 1 OBS_RELEASE_CANDIDATE_MINOR)
-list(GET _obs_release_candidate 2 OBS_RELEASE_CANDIDATE_PATCH)
-list(GET _obs_release_candidate 3 OBS_RELEASE_CANDIDATE)
-list(GET _obs_beta 0 OBS_BETA_MAJOR)
-list(GET _obs_beta 1 OBS_BETA_MINOR)
-list(GET _obs_beta 2 OBS_BETA_PATCH)
-list(GET _obs_beta 3 OBS_BETA)
+
+set(OBS_RELEASE_CANDIDATE ${_obs_release_candidate})
+set(OBS_BETA ${_obs_beta})
 
 string(REPLACE ";" "." OBS_VERSION_CANONICAL "${_obs_version_canonical}")
 string(REPLACE ";" "." OBS_VERSION "${_obs_version}")

obs-studio-30.0.2.tar.xz/cmake/finders/FindAMF.cmake Added

@@ -0,0 +1,92 @@
+#=======================================================================.rst
+FindAMF
+-------
+
+FindModule for AMF and associated headers
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``AMF::AMF``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``AMF_FOUND``
+  True, if headers were found.
+``AMF_VERSION``
+  Detected version of found AMF headers.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``AMF_INCLUDE_DIR``
+  Directory containing ``AMF/core/Factory.h``.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_path(
+  AMF_INCLUDE_DIR
+  NAMES AMF/core/Factory.h
+  PATHS /usr/include /usr/local/include
+  DOC "AMF include directory")
+
+if(EXISTS "${AMF_INCLUDE_DIR}/AMF/core/Version.h")
+  file(STRINGS "${AMF_INCLUDE_DIR}/AMF/core/Version.h" _version_string
+       REGEX "^.*VERSION_(MAJOR|MINOR|RELEASE|BUILD_NUM) \t+0-9+ \t*$")
+
+  string(REGEX REPLACE ".*VERSION_MAJOR \t+(0-9+).*" "\\1" _version_major "${_version_string}")
+  string(REGEX REPLACE ".*VERSION_MINOR \t+(0-9+).*" "\\1" _version_minor "${_version_string}")
+  string(REGEX REPLACE ".*VERSION_RELEASE \t+(0-9+).*" "\\1" _version_release "${_version_string}")
+
+  set(AMF_VERSION "${_version_major}.${_version_minor}.${_version_release}")
+  unset(_version_major)
+  unset(_version_minor)
+  unset(_version_release)
+else()
+  if(NOT AMF_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find AMF version.")
+  endif()
+  set(AMF_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(AMF_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(AMF_ERROR_REASON "Ensure AMF headers are available in local library paths.")
+endif()
+
+find_package_handle_standard_args(
+  AMF
+  REQUIRED_VARS AMF_INCLUDE_DIR
+  VERSION_VAR AMF_VERSION REASON_FAILURE_MESSAGE "${AMF_ERROR_REASON}")
+mark_as_advanced(AMF_INCLUDE_DIR)
+unset(AMF_ERROR_REASON)
+
+if(AMF_FOUND)
+  if(NOT TARGET AMF::AMF)
+    add_library(AMF::AMF INTERFACE IMPORTED)
+    set_target_properties(AMF::AMF PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${AMF_INCLUDE_DIR}")
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  AMF PROPERTIES
+  URL "https://github.com/GPUOpen-LibrariesAndSDKs/AMF"
+  DESCRIPTION
+    "AMF is a light-weight, portable multimedia framework that abstracts away most of the platform and API-specific details and allows for easy implementation of multimedia applications using a variety of technologies, such as DirectX 11, OpenGL, and OpenCL and facilitates an efficient interop between them."
+)

obs-studio-29.1.3.tar.xz/cmake/finders/FindCEF.cmake -> obs-studio-30.0.2.tar.xz/cmake/finders/FindCEF.cmake Changed

obs-studio-30.0.2.tar.xz/cmake/finders/FindDetours.cmake Added

@@ -0,0 +1,124 @@
+#=======================================================================.rst
+FindDetours
+-----------
+
+FindModule for Detours and associated libraries
+
+.. versionchanged:: 3.0
+  Updated FindModule to CMake standards
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``Detours::Detours``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``Detours_FOUND``
+  True, if all required components and the core library were found.
+``Detours_VERSION``
+  Detected version of found Detours libraries.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``Detours_LIBRARY``
+  Path to the library component of Detours.
+``Detours_INCLUDE_DIR``
+  Directory containing ``detours.h``.
+
+#=======================================================================
+
+# cmake-format: off
+# bmake-lint: disable=C0103
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_Detours QUIET detours)
+endif()
+
+find_path(
+  Detours_INCLUDE_DIR
+  NAMES detours.h
+  HINTS ${PC_Detours_INCLUDE_DIRS}
+  DOC "Detours include directory")
+
+find_library(
+  Detours_IMPLIB
+  NAMES detours
+  HINTS ${PC_Detours_LIBRARY_DIRS}
+  DOC "Detours location")
+
+cmake_path(GET Detours_IMPLIB PARENT_PATH _implib_path)
+cmake_path(SET _bin_path NORMALIZE "${_implib_path}/../bin")
+
+find_program(
+  Detours_LIBRARY
+  NAMES detours.dll
+  HINTS ${_implib_path} ${_bin_path}
+  DOC "Detours DLL location")
+
+if(NOT Detours_LIBRARY)
+  set(Detours_LIBRARY "${Detours_IMPLIB}")
+endif()
+unset(_implib_path)
+unset(_bin_path)
+
+if(PC_Detours_VERSION VERSION_GREATER 0)
+  set(Detours_VERSION ${PC_Detours_VERSION})
+else()
+  if(NOT Detours_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find detours version.")
+  endif()
+  set(Detours_VERSION 0.0.0)
+endif()
+
+find_package_handle_standard_args(
+  Detours
+  REQUIRED_VARS Detours_LIBRARY Detours_INCLUDE_DIR
+  VERSION_VAR Detours_VERSION REASON_FAILURE_MESSAGE "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+mark_as_advanced(Detours_INCLUDE_DIR Detours_LIBRARY)
+
+if(Detours_FOUND)
+  if(NOT TARGET Detours::Detours)
+    if(IS_ABSOLUTE "${Detours_LIBRARY}")
+      if(DEFINED Detours_IMPLIB)
+        if(Detours_IMPLIB STREQUAL Detours_LIBRARY)
+          add_library(Detours::Detours STATIC IMPORTED)
+        else()
+          add_library(Detours::Detours SHARED IMPORTED)
+          set_property(TARGET Detours::Detours PROPERTY IMPORTED_IMPLIB "${Detours_IMPLIB}")
+        endif()
+      else()
+        add_library(Detours::Detours UNKNOWN IMPORTED)
+      endif()
+
+      set_property(TARGET Detours::Detours PROPERTY IMPORTED_LOCATION "${Detours_LIBRARY}")
+    else()
+      add_library(Detours::Detours INTERFACE IMPORTED)
+      set_property(TARGET Detours::Detours PROPERTY IMPORTED_LIBNAME "${Detours_LIBRARY}")
+    endif()
+
+    set_target_properties(
+      Detours::Detours
+      PROPERTIES INTERFACE_COMPILE_OPTIONS "${PC_Detours_CFLAGS_OTHER}"
+                 INTERFACE_INCLUDE_DIRECTORIES "${Detours_INCLUDE_DIR}"
+                 VERSION ${Detours_VERSION})
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  Detours PROPERTIES
+  URL "https://github.com/microsoft/detours"
+  DESCRIPTION "Detours is a software package for monitoring and instrumenting API calls on Windows.")

obs-studio-30.0.2.tar.xz/cmake/finders/FindFFnvcodec.cmake Added

@@ -0,0 +1,96 @@
+#=======================================================================.rst
+FindFFnvcodec
+-------------
+
+FindModule for FFnvcodec and the associated headers
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``FFnvcodec::FFnvcodec``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``FFnvcodec_FOUND``
+  True, if headers was found.
+``FFnvcodec_VERSION``
+  Detected version of found FFnvcodec headers.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``FFnvcodec_INCLUDE_DIR``
+  Directory containing ``nvEncodeAPI.h``.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(PC_FFnvcodec QUIET ffnvcodec)
+endif()
+
+find_path(
+  FFnvcodec_INCLUDE_DIR
+  NAMES ffnvcodec/nvEncodeAPI.h
+  HINTS ${PC_FFnvcodec_INCLUDE_DIRS}
+  PATHS /usr/include /usr/local/include
+  DOC "FFnvcodec include directory")
+
+if(PC_FFnvcodec_VERSION VERSION_GREATER 0)
+  set(FFnvcodec_VERSION ${PC_FFnvcodec_VERSION})
+elseif(EXISTS "${FFnvcodec_INCLUDE_DIR}/ffnvcodec/nvEncodeAPI.h")
+  file(STRINGS "${FFnvcodec_INCLUDE_DIR}/ffnvcodec/nvEncodeAPI.h" _version_string
+       REGEX "^.*NVENCAPI_(MAJOR|MINOR)_VERSION \t+0-9+ \t*$")
+
+  string(REGEX REPLACE ".*MAJOR_VERSION \t+(0-9+).*" "\\1" _version_major "${_version_string}")
+  string(REGEX REPLACE ".*MINOR_VERSION \t+(0-9+).*" "\\1" _version_minor "${_version_string}")
+
+  set(FFnvcodec_VERSION "${_version_major}.${_version_minor}")
+  unset(_version_major)
+  unset(_version_minor)
+else()
+  if(NOT FFnvcodec_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find FFnvcodec version.")
+  endif()
+  set(FFnvcodec_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(FFnvcodec_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(FFnvcodec_ERROR_REASON "Ensure FFnvcodec headers are available in local include paths.")
+endif()
+
+find_package_handle_standard_args(
+  FFnvcodec
+  REQUIRED_VARS FFnvcodec_INCLUDE_DIR
+  VERSION_VAR FFnvcodec_VERSION REASON_FAILURE_MESSAGE "${FFnvcodec_ERROR_REASON}")
+mark_as_advanced(FFnvcodec_INCLUDE_DIR)
+unset(FFnvcodec_ERROR_REASON)
+
+if(FFnvcodec_FOUND)
+  if(NOT TARGET FFnvcodec::FFnvcodec)
+    add_library(FFnvcodec::FFnvcodec INTERFACE IMPORTED)
+    set_target_properties(FFnvcodec::FFnvcodec PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FFnvcodec_INCLUDE_DIR}")
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  FFnvcodec PROPERTIES
+  URL "https://github.com/FFmpeg/nv-codec-headers/"
+  DESCRIPTION "FFmpeg version of headers required to interface with NVIDIA's codec APIs.")

obs-studio-30.0.2.tar.xz/cmake/finders/FindVPL.cmake Added

@@ -0,0 +1,143 @@
+#=======================================================================.rst
+FindVPL
+-------
+
+FindModule for VPL and associated headers
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``VPL::VPL``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``VPL_FOUND``
+  True, if headers were found.
+``VPL_VERSION``
+  Detected version of found VPL headers.
+``VPL_LIBRARIES``
+  Libraries needed to link to VPL.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``VPL_INCLUDE_DIR``
+  Directory containing ``mfxdispatcher.h``.
+``VPL_LIBRARY_RELEASE``
+  Path to the library component of VPL in non-debug configuration.
+``VPL_LIBRARY_DEBUG``
+  Optional path to the library component of VPL in debug configuration.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(_VPL QUIET vpl)
+endif()
+
+find_path(
+  VPL_INCLUDE_DIR
+  NAMES vpl/mfxstructures.h
+  HINTS ${_VPL_INCLUDE_DIRS} ${_VPL_INCLUDE_DIRS}
+  PATHS /usr/include /usr/local/include /opt/local/include /sw/include
+  DOC "VPL include directory")
+
+find_library(
+  VPL_LIBRARY_RELEASE
+  NAMES ${_VPL_LIBRARIES} ${_VPL_LIBRARIES} vpl
+  HINTS ${_VPL_LIBRARY_DIRS} ${_VPL_LIBRARY_DIRS}
+  PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib
+  DOC "VPL library location")
+
+find_library(
+  VPL_LIBRARY_DEBUG
+  NAMES ${_VPL_LIBRARIES} ${_VPL_LIBRARIES} vpld
+  HINTS ${_VPL_LIBRARY_DIRS} ${_VPL_LIBRARY_DIRS}
+  PATHS /usr/lib /usr/local/lib /opt/local/lib /sw/lib
+  DOC "VPL debug library location")
+
+include(SelectLibraryConfigurations)
+select_library_configurations(VPL)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+  VPL
+  REQUIRED_VARS VPL_LIBRARY VPL_INCLUDE_DIR
+  VERSION_VAR VPL_VERSION REASON_FAILURE_MESSAGE "${VPL_ERROR_REASON}")
+mark_as_advanced(VPL_INCLUDE_DIR VPL_LIBRARY)
+unset(VPL_ERROR_REASON)
+
+if(EXISTS "${VPL_INCLUDE_DIR}/vpl/mfxdefs.h")
+  file(STRINGS "${VPL_INCLUDE_DIR}/vpl/mfxdefs.h" _version_string REGEX "^.*VERSION_(MAJOR|MINOR) \t+0-9+ \t*$")
+
+  string(REGEX REPLACE ".*VERSION_MAJOR \t+(0-9+).*" "\\1" _version_major "${_version_string}")
+  string(REGEX REPLACE ".*VERSION_MINOR \t+(0-9+).*" "\\1" _version_minor "${_version_string}")
+
+  set(VPL_VERSION "${_version_major}.${_version_minor}")
+  unset(_version_major)
+  unset(_version_minor)
+else()
+  if(NOT VPL_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find VPL version.")
+  endif()
+  set(VPL_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(VPL_ERROR_REASON "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(VPL_ERROR_REASON "Ensure VPL headers are available in local library paths.")
+endif()
+
+if(VPL_FOUND)
+  set(VPL_INCLUDE_DIRS ${VPL_INCLUDE_DIR})
+  set(VPL_LIBRARIES ${VPL_LIBRARY})
+
+  if(NOT TARGET VPL::VPL)
+    if(IS_ABSOLUTE "${VPL_LIBRARY_RELEASE}")
+      add_library(VPL::VPL UNKNOWN IMPORTED)
+      set_target_properties(VPL::VPL PROPERTIES IMPORTED_LOCATION "${VPL_LIBRARY_RELEASE}")
+    else()
+      add_library(VPL::VPL INTERFACE IMPORTED)
+      set_target_properties(VPL::VPL PROPERTIES IMPORTED_LIBNAME "${VPL_LIBRARY_RELEASE}")
+    endif()
+
+    set_target_properties(
+      VPL::VPL
+      PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${VPL_INCLUDE_DIRS}"
+                 VERSION ${VPL_VERSION}
+                 IMPORTED_CONFIGURATIONS Release)
+
+    if(VPL_LIBRARY_DEBUG)
+      if(IS_ABSOLUTE "${VPL_LIBRARY_DEBUG}")
+        set_target_properties(VPL::VPL PROPERTIES IMPORTED_LOCATION_DEBUG "${VPL_LIBRARY_DEBUG}")
+      else()
+        set_target_properties(VPL::VPL PROPERTIES IMPORTED_LIBNAME_DEBUG "${VPL_LIBRARY_DEBUG}")
+      endif()
+      set_property(
+        TARGET VPL::VPL
+        APPEND
+        PROPERTY IMPORTED_CONFIGURATIONS Debug)
+    endif()
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  VPL PROPERTIES
+  URL "https://github.com/oneapi-src/oneVPL"
+  DESCRIPTION
+    "Intel® oneAPI Video Processing Library (oneVPL) supports AI visual inference, media delivery, cloud gaming, and virtual desktop infrastructure use cases by providing access to hardware accelerated video decode, encode, and frame processing capabilities on Intel® GPUs."
+)

obs-studio-30.0.2.tar.xz/cmake/finders/Findqrcodegencpp.cmake Added

@@ -0,0 +1,174 @@
+#=======================================================================.rst
+Findqrcodegencpp
+----------------
+
+FindModule for qrcodegencpp and associated libraries
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 3.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``qrcodegencpp::qrcodegencpp``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``qrcodegencpp_FOUND``
+  True, if all required components and the core library were found.
+``qrcodegencpp_VERSION``
+  Detected version of found qrcodegencpp libraries.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``qrcodegencpp_LIBRARY``
+  Path to the library component of qrcodegencpp.
+``qrcodegencpp_INCLUDE_DIR``
+  Directory containing ``qrcodegen.hpp``.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_search_module(PC_qrcodegencpp QUIET qrcodegencpp)
+endif()
+
+# qrcodegencpp_set_soname: Set SONAME on imported library target
+macro(qrcodegencpp_set_soname)
+  if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
+    execute_process(
+      COMMAND sh -c "otool -D '${qrcodegencpp_LIBRARY}' | grep -v '${qrcodegencpp_LIBRARY}'"
+      OUTPUT_VARIABLE _output
+      RESULT_VARIABLE _result)
+
+    if(_result EQUAL 0 AND _output MATCHES "^@rpath/")
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_SONAME "${_output}")
+    endif()
+  elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+    execute_process(
+      COMMAND sh -c "${CMAKE_OBJDUMP} -p '${qrcodegencpp_LIBRARY}' | grep SONAME"
+      OUTPUT_VARIABLE _output
+      RESULT_VARIABLE _result)
+
+    if(_result EQUAL 0)
+      string(REGEX REPLACE " \t+SONAME \t+(^ \t+)" "\\1" _soname "${_output}")
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_SONAME "${_soname}")
+      unset(_soname)
+    endif()
+  endif()
+  unset(_output)
+  unset(_result)
+endmacro()
+
+# qrcodegencpp_find_dll: Find DLL for corresponding import library
+macro(qrcodegencpp_find_dll)
+  cmake_path(GET qrcodegencpp_IMPLIB PARENT_PATH _implib_path)
+  cmake_path(SET _bin_path NORMALIZE "${_implib_path}/../bin")
+
+  string(REGEX REPLACE "0-9+\\.(0-9+)\\.0-9+" "\\1" _dll_version "${qrcodegencpp_VERSION}")
+
+  find_program(
+    qrcodegencpp_LIBRARY
+    NAMES qrcodegencpp.dll
+    HINTS ${_implib_path} ${_bin_path}
+    DOC "qrcodegencpp DLL location")
+
+  if(NOT qrcodegencpp_LIBRARY)
+    set(qrcodegencpp_LIBRARY "${qrcodegencpp_IMPLIB}")
+  endif()
+  unset(_implib_path)
+  unset(_bin_path)
+  unset(_dll_version)
+endmacro()
+
+find_path(
+  qrcodegencpp_INCLUDE_DIR
+  NAMES qrcodegen.hpp
+  HINTS ${PC_qrcodegencpp_INCLUDE_DIRS}
+  PATHS /usr/include /usr/local/include
+  PATH_SUFFIXES qrcodegencpp qrcodegen
+  DOC "qrcodegencpp include directory")
+
+if(PC_qrcodegencpp_VERSION VERSION_GREATER 0)
+  set(qrcodegencpp_VERSION ${PC_qrcodegencpp_VERSION})
+else()
+  if(NOT qrcodegencpp_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find qrcodegencpp version.")
+  endif()
+  set(qrcodegencpp_VERSION 0.0.0)
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
+  find_library(
+    qrcodegencpp_IMPLIB
+    NAMES qrcodegencpp qrcodegencpp
+    DOC "qrcodegencpp import library location")
+
+  qrcodegencpp_find_dll()
+else()
+  find_library(
+    qrcodegencpp_LIBRARY
+    NAMES qrcodegencpp qrcodegencpp
+    HINTS ${PC_qrcodegencpp_LIBRARY_DIRS}
+    PATHS /usr/lib /usr/local/lib
+    DOC "qrcodegencpp location")
+endif()
+
+if(CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin|Windows")
+  set(qrcodegencpp_ERROR_REASON "Ensure that a qrcodegencpp distribution is provided as part of CMAKE_PREFIX_PATH.")
+elseif(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux|FreeBSD")
+  set(qrcodegencpp_ERROR_REASON "Ensure that qrcodegencpp is installed on the system.")
+endif()
+
+find_package_handle_standard_args(
+  qrcodegencpp
+  REQUIRED_VARS qrcodegencpp_LIBRARY qrcodegencpp_INCLUDE_DIR
+  VERSION_VAR qrcodegencpp_VERSION REASON_FAILURE_MESSAGE "${qrcodegencpp_ERROR_REASON}")
+mark_as_advanced(qrcodegencpp_INCLUDE_DIR qrcodegencpp_LIBRARY qrcodegencpp_IMPLIB)
+unset(qrcodegencpp_ERROR_REASON)
+
+if(qrcodegencpp_FOUND)
+  if(NOT TARGET qrcodegencpp::qrcodegencpp)
+    if(IS_ABSOLUTE "${qrcodegencpp_LIBRARY}")
+      if(DEFINED qrcodegencpp_IMPLIB)
+        if(qrcodegencpp_IMPLIB STREQUAL qrcodegencpp_LIBRARY)
+          add_library(qrcodegencpp::qrcodegencpp STATIC IMPORTED)
+        else()
+          add_library(qrcodegencpp::qrcodegencpp SHARED IMPORTED)
+          set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_IMPLIB "${qrcodegencpp_IMPLIB}")
+        endif()
+      else()
+        add_library(qrcodegencpp::qrcodegencpp UNKNOWN IMPORTED)
+      endif()
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_LOCATION "${qrcodegencpp_LIBRARY}")
+    else()
+      add_library(qrcodegencpp::qrcodegencpp INTERFACE IMPORTED)
+      set_property(TARGET qrcodegencpp::qrcodegencpp PROPERTY IMPORTED_LIBNAME "${qrcodegencpp_LIBRARY}")
+    endif()
+
+    qrcodegencpp_set_soname()
+    set_target_properties(
+      qrcodegencpp::qrcodegencpp
+      PROPERTIES INTERFACE_COMPILE_OPTIONS "${PC_qrcodegencpp_CFLAGS_OTHER}"
+                 INTERFACE_INCLUDE_DIRECTORIES "${qrcodegencpp_INCLUDE_DIR}"
+                 VERSION ${qrcodegencpp_VERSION})
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  qrcodegencpp PROPERTIES
+  URL "https://www.nayuki.io/page/qr-code-generator-library"
+  DESCRIPTION "This project aims to be the best, clearest library for generating QR Codes in C++.")

obs-studio-29.1.3.tar.xz/cmake/macos/buildspec.cmake -> obs-studio-30.0.2.tar.xz/cmake/macos/buildspec.cmake Changed

@@ -1,68 +1,16 @@
 # OBS CMake macOS build dependencies module
 
-# cmake-format: off
-# cmake-lint: disable=E1126
-# cmake-lint: disable=R0912
-# cmake-lint: disable=R0915
-# cmake-format: on
+include_guard(GLOBAL)
 
-# _check_deps_version: Checks for obs-deps VERSION file in prefix paths
-macro(_check_deps_version version)
-  set(found FALSE)
+include(buildspec_common)
 
-  foreach(path IN LISTS CMAKE_PREFIX_PATH)
-    if(EXISTS "${path}/share/obs-deps/VERSION")
-      if(dependency STREQUAL qt6 AND NOT EXISTS "${path}/lib/cmake/Qt6/Qt6Config.cmake")
-        set(found FALSE)
-        continue()
-      endif()
-
-      file(READ "${path}/share/obs-deps/VERSION" _check_version)
-      string(REPLACE "\n" "" _check_version "${_check_version}")
-      string(REPLACE "-" "." _check_version "${_check_version}")
-      string(REPLACE "-" "." version "${version}")
-
-      if(_check_version VERSION_EQUAL version)
-        set(found TRUE)
-        break()
-      elseif(_check_version VERSION_LESS version)
-        message(AUTHOR_WARNING "Outdated ${label} version detected in ${path}: \n"
-                               "Found ${_check_version}, require ${version}")
-        list(REMOVE_ITEM CMAKE_PREFIX_PATH "${path}")
-        list(APPEND CMAKE_PREFIX_PATH "${path}")
-        continue()
-      else()
-        message(AUTHOR_WARNING "Future ${label} version detected in ${path}: \n"
-                               "Found ${_check_version}, require ${version}")
-        set(found TRUE)
-        break()
-      endif()
-    endif()
-  endforeach()
-endmacro()
-
-# _check_dependencies: Fetch and extract pre-built OBS build dependencies
-function(_check_dependencies)
-  if(CMAKE_OSX_ARCHITECTURES MATCHES ".+;.+")
-    set(arch universal)
-  else()
-    set(arch ${CMAKE_OSX_ARCHITECTURES})
-  endif()
+# _check_dependencies_macos: Set up macOS slice for _check_dependencies
+function(_check_dependencies_macos)
+  set(arch universal)
+  set(platform macos-${arch})
 
   file(READ "${CMAKE_CURRENT_SOURCE_DIR}/buildspec.json" buildspec)
 
-  # cmake-format: off
-  string(JSON deployment_target GET ${buildspec} platformConfig macos-${arch} deploymentTarget)
-  string(JSON dependency_data GET ${buildspec} dependencies)
-  # cmake-format: on
-
-  if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET
-        ${_deployment_target}
-        CACHE STRING "Minimum macOS version to target for deployment (at runtime). Newer APIs will be weak-linked."
-              FORCE)
-  endif()
-
   set(dependencies_dir "${CMAKE_CURRENT_SOURCE_DIR}/.deps")
   set(prebuilt_filename "macos-deps-VERSION-ARCH-REVISION.tar.xz")
   set(prebuilt_destination "obs-deps-VERSION-ARCH")
@@ -70,130 +18,12 @@
   set(qt6_destination "obs-deps-qt6-VERSION-ARCH")
   set(cef_filename "cef_binary_VERSION_macos_ARCH_REVISION.tar.xz")
   set(cef_destination "cef_binary_VERSION_macos_ARCH")
+  set(dependencies_list prebuilt qt6 cef)
 
-  foreach(dependency IN ITEMS prebuilt qt6 cef)
-    if(dependency STREQUAL cef AND arch STREQUAL universal)
-      continue()
-    endif()
-
-    # cmake-format: off
-    string(JSON data GET ${dependency_data} ${dependency})
-    string(JSON version GET ${data} version)
-    string(JSON hash GET ${data} hashes macos-${arch})
-    string(JSON url GET ${data} baseUrl)
-    string(JSON label GET ${data} label)
-    string(JSON revision ERROR_VARIABLE error GET ${data} revision macos-${arch})
-    # cmake-format: on
-
-    message(STATUS "Setting up ${label}")
-
-    set(file "${${dependency}_filename}")
-    set(destination "${${dependency}_destination}")
-    string(REPLACE "VERSION" "${version}" file "${file}")
-    string(REPLACE "VERSION" "${version}" destination "${destination}")
-    string(REPLACE "ARCH" "${arch}" file "${file}")
-    string(REPLACE "ARCH" "${arch}" destination "${destination}")
-    if(revision)
-      string(REPLACE "_REVISION" "_v${revision}" file "${file}")
-      string(REPLACE "-REVISION" "-v${revision}" file "${file}")
-    else()
-      string(REPLACE "_REVISION" "" file "${file}")
-      string(REPLACE "-REVISION" "" file "${file}")
-    endif()
-
-    set(skip FALSE)
-    if(dependency STREQUAL prebuilt OR dependency STREQUAL qt6)
-      _check_deps_version(${version})
-
-      if(found)
-        set(skip TRUE)
-      endif()
-    elseif(_dependency STREQUAL sparkle)
-      find_library(SPARKLE Sparkle)
-
-      if(NOT ENABLE_SPARKLE OR SPARKLE)
-        set(skip TRUE)
-      else()
-        unset(SPARKLE CACHE)
-      endif()
-    elseif(dependency STREQUAL vlc)
-      if(NOT ENABLE_VLC OR (VLC_PATH AND EXISTS "${VLC_PATH}"))
-        set(skip TRUE)
-      endif()
-    elseif(dependency STREQUAL cef)
-      if(NOT ENABLE_BROWSER OR (CEF_ROOT_DIR AND EXISTS "${CEF_ROOT_DIR}"))
-        set(skip TRUE)
-      endif()
-    endif()
-
-    if(skip)
-      message(STATUS "Setting up ${label} - skipped")
-      continue()
-    endif()
-
-    if(dependency STREQUAL qt6 AND "$ENV{CI}")
-      # cmake-format: off
-      string(JSON hash GET ${buildspec} dependencies qt6 hashes macos-universal)
-      # cmake-format: on
-      string(REPLACE "${arch}" "universal" file "${file}")
-    endif()
-
-    if(dependency STREQUAL cef)
-      set(url ${url}/${file})
-    else()
-      set(url ${url}/${version}/${file})
-    endif()
-
-    if(NOT EXISTS "${dependencies_dir}/${file}")
-      message(STATUS "Downloading ${url}")
-      file(
-        DOWNLOAD "${url}" "${dependencies_dir}/${file}"
-        STATUS download_status
-        EXPECTED_HASH SHA256=${hash})
-
-      list(GET download_status 0 error_code)
-      list(GET download_status 1 error_message)
-      if(error_code GREATER 0)
-        message(STATUS "Downloading ${url} - Failure")
-        message(FATAL_ERROR "Unable to download ${url}, failed with error: ${error_message}")
-        file(REMOVE "${dependencies_dir}/${file}")
-      else()
-        message(STATUS "Downloading ${url} - done")
-      endif()
-    endif()
-
-    if(NOT EXISTS "${dependencies_dir}/${destination}")
-      file(MAKE_DIRECTORY "${dependencies_dir}/${destination}")
-      if(dependency STREQUAL vlc)
-        file(ARCHIVE_EXTRACT INPUT "${dependencies_dir}/${file}" DESTINATION "${dependencies_dir}")
-      else()
-        file(ARCHIVE_EXTRACT INPUT "${dependencies_dir}/${file}" DESTINATION "${dependencies_dir}/${destination}")
-      endif()
-      execute_process(COMMAND "xattr" -r -d com.apple.quarantine "${dependencies_dir}/${destination}"
-                      RESULT_VARIABLE result COMMAND_ERROR_IS_FATAL ANY)
-    endif()
-
-    if(dependency STREQUAL cef)
-      set(CEF_ROOT_DIR
-          "${dependencies_dir}/${destination}"
-          CACHE PATH "CEF Root directory" FORCE)
-    elseif(dependency STREQUAL prebuilt)
-      set(VLC_PATH
-          "${dependencies_dir}/${destination}"
-          CACHE PATH "VLC source code directory" FORCE)
-      list(APPEND CMAKE_PREFIX_PATH "${dependencies_dir}/${destination}")
-    elseif(dependency STREQUAL qt6)
-      list(APPEND CMAKE_PREFIX_PATH "${dependencies_dir}/${destination}")
-    endif()
-
-    message(STATUS "Setting up ${label} - done")
-  endforeach()
-
-  list(REMOVE_DUPLICATES CMAKE_PREFIX_PATH)
+  _check_dependencies()
 
-  set(CMAKE_PREFIX_PATH
-      ${CMAKE_PREFIX_PATH}
-      CACHE PATH "CMake prefix search path" FORCE)
+  execute_process(COMMAND "xattr" -r -d com.apple.quarantine "${dependencies_dir}/${destination}"
+                  RESULT_VARIABLE result COMMAND_ERROR_IS_FATAL ANY)
 endfunction()
 
-_check_dependencies()
+_check_dependencies_macos()

obs-studio-29.1.3.tar.xz/cmake/macos/compilerconfig.cmake -> obs-studio-30.0.2.tar.xz/cmake/macos/compilerconfig.cmake Changed

@@ -1,49 +1,72 @@
 # OBS CMake macOS compiler configuration module
 
-# Enable distinction between Clang and AppleClang
-if(POLICY CMP0025)
- cmake_policy(SET CMP0025 NEW)
-endif()
-
-# Honor visibility presets for all target types (executable, shared, module, static)
-if(POLICY CMP0063)
- cmake_policy(SET CMP0063 NEW)
-endif()
+include_guard(GLOBAL)
 
 include(ccache)
 include(compiler_common)
-include(simd)
 
-# Set C17 / C++17 standards as required and disable extensions
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
+add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:Swift>>:-fopenmp-simd>")
+
+# Enable selection between arm64 and x86_64 targets
+if(NOT CMAKE_OSX_ARCHITECTURES)
+ set(CMAKE_OSX_ARCHITECTURES
+ arm64
+ CACHE STRING "Build architectures for macOS" FORCE)
+endif()
+set_property(CACHE CMAKE_OSX_ARCHITECTURES PROPERTY STRINGS arm64 x86_64)
+
+# Make sure the macOS SDK is recent enough for OBS
+set(OBS_MACOS_MINIMUM_SDK "13.1") # Keep in sync with Xcode
+set(OBS_MACOS_MINIMUM_XCODE "14.2") # Keep in sync with SDK
+message(DEBUG "macOS SDK Path: ${CMAKE_OSX_SYSROOT}")
+string(REGEX MATCH ".+/MacOSX.platform/Developer/SDKs/MacOSX(0-9+\.0-9)+\.sdk$" _ ${CMAKE_OSX_SYSROOT})
+set(OBS_MACOS_CURRENT_SDK ${CMAKE_MATCH_1})
+message(DEBUG "macOS SDK version: ${OBS_MACOS_CURRENT_SDK}")
+if(OBS_MACOS_CURRENT_SDK VERSION_LESS OBS_MACOS_MINIMUM_SDK)
+ message(
+ FATAL_ERROR
+ "Your macOS SDK version (${OBS_MACOS_CURRENT_SDK}) is too low. The macOS ${OBS_MACOS_MINIMUM_SDK} SDK (Xcode ${OBS_MACOS_MINIMUM_XCODE}) is required to build OBS."
+ )
+endif()
+
+if(XCODE)
+ # Enable dSYM generator for release builds
+ string(APPEND CMAKE_C_FLAGS_RELEASE " -g")
+ string(APPEND CMAKE_CXX_FLAGS_RELEASE " -g")
+else()
+ option(ENABLE_COMPILER_TRACE "Enable clang time-trace (requires Ninja)" OFF)
+ mark_as_advanced(ENABLE_COMPILER_TRACE)
 
-set(CMAKE_C_STANDARD 17)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-set(CMAKE_C_EXTENSIONS OFF)
+ # clang options for ObjC
+ set(_obs_clang_objc_options
+ ${_obs_clang_common_options}
+ -Wno-implicit-atomic-properties
+ -Wno-objc-interface-ivars
+ -Warc-repeated-use-of-weak
+ -Wno-arc-maybe-repeated-use-of-weak
+ -Wimplicit-retain-self
+ -Wduplicate-method-match
+ -Wshadow
+ -Wfloat-conversion
+ -Wobjc-literal-conversion
+ -Wno-selector
+ -Wno-strict-selector-match
+ -Wundeclared-selector
+ -Wdeprecated-implementations
+ -Wprotocol
+ -Werror=block-capture-autoreleasing
+ -Wrange-loop-analysis)
 
-# Set symbols to be hidden by default for C and C++
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_C_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
+ # clang options for ObjC++
+ set(_obs_clang_objcxx_options ${_obs_clang_objc_options} -Wno-non-virtual-dtor)
 
-# Add default C and C++ compiler options if Xcode generator is not used
-if(NOT XCODE)
- list(
- APPEND
- _obs_c_options
- -Werror
- -Wextra
- -Wvla
- -Wswitch
- -Wformat-security
- -Wunused-parameter
- -Wno-unused-function
- -Wno-missing-field-initializers
- -Wformat
- -fno-strict-aliasing
- -Wno-error=shorten-64-to-32)
+ # cmake-format: off
+ add_compile_options(
+ "$<$<COMPILE_LANGUAGE:C>:${_obs_clang_c_options}>"
+ "$<$<COMPILE_LANGUAGE:CXX>:${_obs_clang_cxx_options}>"
+ "$<$<COMPILE_LANGUAGE:OBJC>:${_obs_clang_objc_options}>"
+ "$<$<COMPILE_LANGUAGE:OBJCXX>:${_obs_clang_objcxx_options}>")
+ # cmake-format: on
 
 # Enable stripping of dead symbols when not building for Debug configuration
 set(_release_configs RelWithDebInfo Release MinSizeRel)
@@ -51,22 +74,18 @@
 add_link_options(LINKER:-dead_strip)
 endif()
 
- add_compile_options("$<$<COMPILE_LANGUAGE:C>:${_obs_c_options}>" "$<$<COMPILE_LANGUAGE:CXX>:${_obs_c_options}>")
-
- option(ENABLE_COMPILER_TRACE "Enable clang time-trace (requires Ninja)" OFF)
- mark_as_advanced(ENABLE_COMPILER_TRACE)
+ # Enable color diagnostics for AppleClang
+ set(CMAKE_COLOR_DIAGNOSTICS ON)
 
 # Add time trace option to compiler, if enabled.
 if(ENABLE_COMPILER_TRACE AND CMAKE_GENERATOR STREQUAL "Ninja")
- add_compile_options($<$<COMPILE_LANGUAGE:C>:-ftime-trace> $<$<COMPILE_LANGUAGE:CXX>:-ftime-trace>)
+ add_compile_options($<$<NOT:$<COMPILE_LANGUAGE:Swift>>:-ftime-trace>)
 else()
 set(ENABLE_COMPILER_TRACE
 OFF
- CACHE STRING "Enable clang time-trace (requires Ninja)" FORCE)
+ CACHE BOOL "Enable clang time-trace (requires Ninja)" FORCE)
 endif()
-
- # Enable color diagnostics for AppleClang
- set(CMAKE_COLOR_DIAGNOSTICS ON)
 endif()
 
-add_compile_definitions($<$<CONFIG:DEBUG>:DEBUG> $<$<CONFIG:DEBUG>:_DEBUG>)
+add_compile_definitions(
+ "$<$<NOT:$<COMPILE_LANGUAGE:Swift>>:$<$<CONFIG:DEBUG>:DEBUG>;$<$<CONFIG:DEBUG>:_DEBUG>;SIMDE_ENABLE_OPENMP>")

obs-studio-29.1.3.tar.xz/cmake/macos/defaults.cmake -> obs-studio-30.0.2.tar.xz/cmake/macos/defaults.cmake Changed

@@ -1,12 +1,6 @@
 # OBS CMake macOS defaults module
 
-# Enable selection between arm64 and x86_64 targets
-if(NOT CMAKE_OSX_ARCHITECTURES)
- set(CMAKE_OSX_ARCHITECTURES
- arm64
- CACHE STRING "Build architectures for macOS" FORCE)
-endif()
-set_property(CACHE CMAKE_OSX_ARCHITECTURES PROPERTY STRINGS arm64 x86_64)
+include_guard(GLOBAL)
 
 # Set empty codesigning team if not specified as cache variable
 if(NOT OBS_CODESIGN_TEAM)
@@ -28,38 +22,9 @@
 
 include(buildspec)
 
-# Set default deployment target to 11.0 if not set and enable selection in GUI up to 13.0
-if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET
- 11.0
- CACHE STRING "Minimum macOS version to target for deployment (at runtime). Newer APIs will be weak-linked." FORCE)
-endif()
-set_property(CACHE CMAKE_OSX_DEPLOYMENT_TARGET PROPERTY STRINGS 13.0 12.0 11.0)
-
-# Use Applications directory as default install destination
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- set(CMAKE_INSTALL_PREFIX
- "/Applications"
- CACHE STRING "Directory to install OBS after building" FORCE)
-endif()
-
-# Show warning about missing CMAKE_PREFIX_PATH, usually required for successful builds
-if(NOT DEFINED CMAKE_PREFIX_PATH)
- message(
- WARNING "No CMAKE_PREFIX_PATH set: OBS supplies pre-built dependencies for building on macOS.\n"
- "While OBS can be built using packages installed via Homebrew, pre-built dependencies "
- "contain beneficial patches and fixes for use within OBS and is the suggested source "
- "of these dependencies.\n"
- "You can download the appropriate obs-deps package for your "
- "architecture and set CMAKE_PREFIX_PATH to this directory:\n"
- "CMAKE_PREFIX_PATH=\"<PATH_TO_OBS_DEPS>\"\n"
- "Download pre-built OBS dependencies at https://github.com/obsproject/obs-deps/releases\n")
-endif()
-
 # SWIG hard codes the directory to its library directory at compile time. As obs-deps need to be relocatable, we need to
 # force SWIG to look for its files in a directory relative to the PREFIX_PATH. The best way to ensure this is to set the
 # SWIG_LIB environment variable.
-
 foreach(path IN LISTS CMAKE_PREFIX_PATH)
 if(NOT DEFINED ENV{SWIG_LIB} AND EXISTS "${path}/bin/swig")
 set(ENV{SWIG_LIB} "${path}/share/swig/CURRENT")
@@ -67,16 +32,6 @@
 endif()
 endforeach()
 
-# Set default values for CMake's bundle generator and created Info.plist files
-set(MACOSX_BUNDLE_EXECUTABLE_NAME OBS)
-set(MACOSX_BUNDLE_BUNDLE_NAME "${OBS_PRODUCT_NAME}")
-set(MACOSX_BUNDLE_BUNDLE_VERSION ${OBS_BUILD_NUMBER})
-set(MACOSX_BUNDLE_COPYRIGHT "${OBS_LEGAL_COPYRIGHT}")
-set(MACOSX_BUNDLE_GUI_IDENTIFIER com.obsproject.obs-studio)
-set(MACOSX_BUNDLE_ICON_FILE AppIcon)
-set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${OBS_VERSION_CANONICAL})
-string(TIMESTAMP CURRENT_YEAR "%Y")
-
 # Enable find_package targets to become globally available targets
 set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE)
 # Enable RPATH support for generated binaries
@@ -93,4 +48,5 @@
 set(OBS_INCLUDE_DESTINATION "include/obs")
 set(OBS_CMAKE_DESTINATION "lib/cmake")
 
-include(cpackconfig)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/resources/package.applescript"
+ "${CMAKE_CURRENT_BINARY_DIR}/package.applescript" @ONLY)

obs-studio-29.1.3.tar.xz/cmake/macos/helpers.cmake -> obs-studio-30.0.2.tar.xz/cmake/macos/helpers.cmake Changed

@@ -7,8 +7,27 @@
 # cmake-lint: disable=E1126
 # cmake-format: on
 
+include_guard(GLOBAL)
+
 include(helpers_common)
 
+# set_target_xcode_properties: Sets Xcode-specific target attributes
+function(set_target_xcode_properties target)
+ set(options "")
+ set(oneValueArgs "")
+ set(multiValueArgs PROPERTIES)
+ cmake_parse_arguments(PARSE_ARGV 0 _STXP "${options}" "${oneValueArgs}" "${multiValueArgs}")
+
+ message(DEBUG "Setting Xcode properties for target ${target}...")
+
+ while(_STXP_PROPERTIES)
+ list(POP_FRONT _STXP_PROPERTIES key value)
+ # cmake-format: off
+ set_property(TARGET ${target} PROPERTY XCODE_ATTRIBUTE_${key} "${value}")
+ # cmake-format: on
+ endwhile()
+endfunction()
+
 # set_target_properties_obs: Set target properties for use in obs-studio
 function(set_target_properties_obs target)
 set(options "")
@@ -24,26 +43,39 @@
 endwhile()
 get_target_property(target_type ${target} TYPE)
 
+ string(TIMESTAMP CURRENT_YEAR "%Y")
+
 # Target is a GUI or CLI application
 if(target_type STREQUAL EXECUTABLE)
 if(target STREQUAL obs-studio)
- _check_info_plist()
 set_target_properties(
 ${target}
 PROPERTIES OUTPUT_NAME OBS
 MACOSX_BUNDLE TRUE
 MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
- XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio
- XCODE_ATTRIBUTE_PRODUCT_NAME OBS
- XCODE_ATTRIBUTE_ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
 XCODE_EMBED_FRAMEWORKS_REMOVE_HEADERS_ON_COPY YES
 XCODE_EMBED_FRAMEWORKS_CODE_SIGN_ON_COPY YES
 XCODE_EMBED_PLUGINS_REMOVE_HEADERS_ON_COPY YES
- XCODE_EMBED_PLUGINS_CODE_SIGN_ON_COPY YES
- XCODE_ATTRIBUTE_COPY_PHASE_STRIP NO
- XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
- XCODE_ATTRIBUTE_SKIP_INSTALL NO
- XCODE_ATTRIBUTE_INSTALL_PATH "$(LOCAL_APPS_DIR)")
+ XCODE_EMBED_PLUGINS_CODE_SIGN_ON_COPY YES)
+
+ # cmake-format: off
+ set_target_xcode_properties(
+ ${target}
+ PROPERTIES PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio
+ PRODUCT_NAME OBS
+ ASSETCATALOG_COMPILER_APPICON_NAME AppIcon
+ CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
+ MARKETING_VERSION ${OBS_VERSION_CANONICAL}
+ GENERATE_INFOPLIST_FILE YES
+ COPY_PHASE_STRIP NO
+ CLANG_ENABLE_OBJC_ARC YES
+ SKIP_INSTALL NO
+ INSTALL_PATH "$(LOCAL_APPS_DIR)"
+ INFOPLIST_KEY_CFBundleDisplayName "OBS Studio"
+ INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey"
+ INFOPLIST_KEY_NSCameraUsageDescription "OBS needs to access the camera to enable camera sources to work."
+ INFOPLIST_KEY_NSMicrophoneUsageDescription "OBS needs to access the microphone to enable audio input.")
+ # cmake-format: on
 
 get_property(obs_dependencies GLOBAL PROPERTY _OBS_DEPENDENCIES)
 add_dependencies(${target} ${obs_dependencies})
@@ -65,12 +97,22 @@
 PROPERTY XCODE_EMBED_FRAMEWORKS ${SPARKLE})
 endif()
 
+ if(TARGET mac-syphon)
+ set_property(
+ TARGET ${target}
+ APPEND
+ PROPERTY XCODE_EMBED_FRAMEWORKS ${SYPHON})
+ endif()
+
 get_property(obs_executables GLOBAL PROPERTY _OBS_EXECUTABLES)
 add_dependencies(${target} ${obs_executables})
 foreach(executable IN LISTS obs_executables)
- set_property(
- TARGET ${executable} PROPERTY XCODE_ATTRIBUTE_INSTALL_PATH
- "$(LOCAL_APPS_DIR)/$<TARGET_BUNDLE_DIR_NAME:${target}>/Contents/MacOS")
+ # cmake-format: off
+ set_target_xcode_properties(
+ ${executable}
+ PROPERTIES INSTALL_PATH "$(LOCAL_APPS_DIR)/$<TARGET_BUNDLE_DIR_NAME:${target}>/Contents/MacOS")
+ # cmake-format: on
+
 add_custom_command(
 TARGET ${target}
 POST_BUILD
@@ -79,8 +121,37 @@
 COMMENT "Copy ${executable} to application bundle")
 endforeach()
 
- _check_entitlements()
- configure_file(cmake/macos/exportOptions.plist.in ${CMAKE_BINARY_DIR}/exportOptions.plist)
+ if(VIRTUALCAM_DEVICE_UUID
+ AND VIRTUALCAM_SOURCE_UUID
+ AND VIRTUALCAM_SINK_UUID)
+ set(has_virtualcam_uuids TRUE)
+ else()
+ set(has_virtualcam_uuids FALSE)
+ endif()
+
+ if(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE STREQUAL Automatic)
+ if(has_virtualcam_uuids)
+ set(entitlements_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements-extension.plist")
+ else()
+ set(entitlements_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist")
+ endif()
+ else()
+ if(has_virtualcam_uuids AND OBS_PROVISIONING_PROFILE)
+ set(entitlements_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements-extension.plist")
+ set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_PROVISIONING_PROFILE_SPECIFIER
+ "${OBS_PROVISIONING_PROFILE}")
+ configure_file(cmake/macos/exportOptions-extension.plist.in ${CMAKE_BINARY_DIR}/exportOptions.plist)
+ else()
+ set(entitlements_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist")
+ configure_file(cmake/macos/exportOptions.plist.in ${CMAKE_BINARY_DIR}/exportOptions.plist)
+ endif()
+ endif()
+
+ if(NOT EXISTS "${entitlements_file}")
+ message(FATAL_ERROR "Target ${target} is missing an entitlements file in its cmake directory.")
+ endif()
+
+ set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${entitlements_file}")
 
 add_custom_command(
 TARGET ${target}
@@ -126,16 +197,32 @@
 COMMENT "Add OBS::python import module")
 endif()
 
+ if(TARGET mac-camera-extension AND (CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE STREQUAL Automatic
+ OR OBS_PROVISIONING_PROFILE))
+ target_enable_feature(mac-camera-extension "macOS CMIO Camera Extension")
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND
+ "${CMAKE_COMMAND}" -E copy_directory "$<TARGET_BUNDLE_DIR:mac-camera-extension>"
+ "$<TARGET_BUNDLE_CONTENT_DIR:${target}>/Library/SystemExtensions/$<TARGET_BUNDLE_DIR_NAME:mac-camera-extension>"
+ COMMENT "Add Camera Extension to application bundle")
+ else()
+ target_disable_feature(mac-camera-extension "macOS CMIO Camera Extension")
+ endif()
+
 _bundle_dependencies(${target})
 
 install(TARGETS ${target} BUNDLE DESTINATION "." COMPONENT Application)
+ elseif(${target} STREQUAL mac-camera-extension)
+ set_target_properties(${target} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
+ set_property(GLOBAL APPEND PROPERTY _OBS_DEPENDENCIES ${target})
 else()
 set_property(TARGET ${target} PROPERTY XCODE_ATTRIBUTE_SKIP_INSTALL NO)
 set_property(GLOBAL APPEND PROPERTY _OBS_EXECUTABLES ${target})
 set_property(GLOBAL APPEND PROPERTY _OBS_DEPENDENCIES ${target})
+ _add_entitlements()
 endif()
-
- _add_entitlements()
 elseif(target_type STREQUAL SHARED_LIBRARY)
 set_target_properties(
 ${target}
@@ -143,48 +230,75 @@
 MACHO_COMPATIBILITY_VERSION 1.0
 MACHO_CURRENT_VERSION ${OBS_VERSION_MAJOR}
 SOVERSION 0
- VERSION 0
- XCODE_ATTRIBUTE_DYLIB_COMPATIBILITY_VERSION 1.0
- XCODE_ATTRIBUTE_DYLIB_CURRENT_VERSION ${OBS_VERSION_MAJOR}
- XCODE_ATTRIBUTE_PRODUCT_NAME ${target}
- XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target}
- XCODE_ATTRIBUTE_SKIP_INSTALL YES)
+ VERSION 0)
+
+ # cmake-format: off
+ set_target_xcode_properties(
+ ${target}
+ PROPERTIES DYLIB_COMPATIBILITY_VERSION 1.0
+ DYLIB_CURRENT_VERSION ${OBS_VERSION_MAJOR}
+ PRODUCT_NAME ${target}
+ PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target}
+ SKIP_INSTALL YES)
+ # cmake-format: on
 
 get_target_property(is_framework ${target} FRAMEWORK)
 if(is_framework)
- _check_info_plist()
- set_target_properties(
+ set_target_properties(${target} PROPERTIES FRAMEWORK_VERSION A MACOSX_FRAMEWORK_IDENTIFIER
+ com.obsproject.${target})
+
+ # cmake-format: off
+ set_target_xcode_properties(
 ${target}
- PROPERTIES FRAMEWORK_VERSION A
- MACOSX_FRAMEWORK_IDENTIFIER com.obsproject.${target}
- MACOSX_FRAMEWORK_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
- XCODE_ATTRIBUTE_SKIP_INSTALL YES)
+ PROPERTIES CODE_SIGN_IDENTITY ""
+ DEVELOPMENT_TEAM ""
+ SKIP_INSTALL YES
+ PRODUCT_NAME ${target}
+ PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target}
+ CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
+ MARKETING_VERSION ${OBS_VERSION_CANONICAL}
+ GENERATE_INFOPLIST_FILE YES
+ INFOPLIST_FILE ""
+ INFOPLIST_KEY_CFBundleDisplayName ${target}
+ INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey")
+ # cmake-format: on
 endif()
 
- _add_entitlements()
-
 set_property(GLOBAL APPEND PROPERTY _OBS_FRAMEWORKS ${target})
 set_property(GLOBAL APPEND PROPERTY _OBS_DEPENDENCIES ${target})
 elseif(target_type STREQUAL MODULE_LIBRARY)
 if(target STREQUAL obspython)
- set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_NAME ${target}
- XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target})
+ # cmake-format: off
+ set_target_xcode_properties(
+ ${target}
+ PROPERTIES PRODUCT_NAME ${target}
+ PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target})
+ # cmake-format: on
 elseif(target STREQUAL obslua)
- set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_NAME ${target}
- XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target})
+ # cmake-format: off
+ set_target_xcode_properties(
+ ${target}
+ PROPERTIES PRODUCT_NAME ${target}
+ PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target})
+ # cmake-format: on
 elseif(target STREQUAL obs-dal-plugin)
 set_target_properties(${target} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
 set_property(GLOBAL APPEND PROPERTY _OBS_DEPENDENCIES ${target})
 return()
 else()
- _check_info_plist()
- set_target_properties(
+ set_target_properties(${target} PROPERTIES BUNDLE TRUE BUNDLE_EXTENSION plugin)
+
+ # cmake-format: off
+ set_target_xcode_properties(
 ${target}
- PROPERTIES BUNDLE TRUE
- BUNDLE_EXTENSION plugin
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
- XCODE_ATTRIBUTE_PRODUCT_NAME ${target}
- XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target})
+ PROPERTIES PRODUCT_NAME ${target}
+ PRODUCT_BUNDLE_IDENTIFIER com.obsproject.${target}
+ CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
+ MARKETING_VERSION ${OBS_VERSION_CANONICAL}
+ GENERATE_INFOPLIST_FILE YES
+ INFOPLIST_KEY_CFBundleDisplayName ${target}
+ INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2012-${CURRENT_YEAR} Lain Bailey")
+ # cmake-format: on
 
 if(target STREQUAL obs-browser)
 # Good-enough for now as there are no other variants - in _theory_ we should only add the appropriate variant,
@@ -236,13 +350,6 @@
 endif()
 endfunction()
 
-# _check_info_plist: Macro to check if project ships with Info.plist template
-macro(_check_info_plist)
- if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in")
- message(FATAL_ERROR "Target ${target} is missing an Info.plist template in its cmake directory.")
- endif()
-endmacro()
-
 # _check_entitlements: Macro to check if project ships with entitlements plist
 macro(_check_entitlements)
 if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist")
@@ -253,8 +360,11 @@
 # _add_entitlements: Macro to add entitlements shipped with project
 macro(_add_entitlements)
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist")
- set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS
- "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist")
+ # cmake-format: off
+ set_target_xcode_properties(
+ ${target}
+ PROPERTIES CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist")
+ # cmake-format: on
 endif()
 endmacro()
 
@@ -355,8 +465,7 @@
 find_qt_plugins(COMPONENT ${library} TARGET ${target} FOUND_VAR plugins_list)
 endif()
 list(APPEND library_paths ${library_location})
- elseif(NOT imported AND library_type STREQUAL "SHARED_LIBRARY")
- message(TRACE "${library} is a project target")
+ elseif(NOT is_imported AND library_type STREQUAL "SHARED_LIBRARY")
 list(APPEND library_paths ${library})
 endif()
 endforeach()

obs-studio-29.1.3.tar.xz/cmake/macos/resources/ccache-launcher-c.in -> obs-studio-30.0.2.tar.xz/cmake/macos/resources/ccache-launcher-c.in Changed

obs-studio-29.1.3.tar.xz/cmake/macos/resources/ccache-launcher-cxx.in -> obs-studio-30.0.2.tar.xz/cmake/macos/resources/ccache-launcher-cxx.in Changed

obs-studio-30.0.2.tar.xz/cmake/macos/resources/package.applescript Added

@@ -0,0 +1,70 @@
+on run (volumeName)
+    tell application "Finder"
+        tell disk (volumeName as string)
+            open
+
+            set theXOrigin to 100
+            set theYOrigin to 100
+            set theWidth to 540
+            set theHeight to 380
+
+            set theBottomRightX to (theXOrigin + theWidth)
+            set theBottomRightY to (theYOrigin + theHeight)
+            set dsStore to "\"" & "/Volumes/" & volumeName & "/" & ".DS_STORE\""
+
+            tell container window
+                set current view to icon view
+                set toolbar visible to false
+                set statusbar visible to false
+                set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
+                set statusbar visible to false
+                set position of every item to {theBottomRightX + 100, 100}
+            end tell
+
+            set opts to the icon view options of container window
+            tell opts
+                set icon size to 96
+                set text size to 16
+                set arrangement to not arranged
+            end tell
+            set background picture of opts to file ".background:background.tiff"
+            set position of item "OBS.app" to {124, 180}
+            set position of item "Applications" to {416, 180}
+            close
+            open
+            -- Force saving of the size
+            delay 1
+
+            tell container window
+                set statusbar visible to false
+                set the bounds to {theXOrigin, theYOrigin, theBottomRightX - 10, theBottomRightY - 10}
+            end tell
+        end tell
+
+        delay 1
+
+        tell disk (volumeName as string)
+            tell container window
+                set statusbar visible to false
+                set the bounds to {theXOrigin, theYOrigin, theBottomRightX, theBottomRightY}
+            end tell
+        end tell
+
+        --give the finder some time to write the .DS_Store file
+        delay 3
+
+        set waitTime to 0
+        set ejectMe to false
+        repeat while ejectMe is false
+            delay 1
+            set waitTime to waitTime + 1
+
+            if (do shell script " -f " & dsStore & " ; echo $?") = "0" then set ejectMe to true
+        end repeat
+        log "    >   Waited " & waitTime & " seconds for .DS_STORE to be created."
+
+        tell disk (volumeName as string)
+            close
+        end tell
+    end tell
+end run

obs-studio-29.1.3.tar.xz/cmake/macos/xcode.cmake -> obs-studio-30.0.2.tar.xz/cmake/macos/xcode.cmake Changed

@@ -1,13 +1,18 @@
 # OBS CMake macOS Xcode module
 
+include_guard(GLOBAL)
+
+set(CMAKE_XCODE_GENERATE_SCHEME TRUE)
+
 # Use a compiler wrapper to enable ccache in Xcode projects
 if(ENABLE_CCACHE AND CCACHE_PROGRAM)
-  configure_file("${CMAKE_SOURCE_DIR}/cmake/macos/resources/ccache-launcher-c.in" ccache-launcher-c)
-  configure_file("${CMAKE_SOURCE_DIR}/cmake/macos/resources/ccache-launcher-cxx.in" ccache-launcher-cxx)
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/resources/ccache-launcher-c.in" ccache-launcher-c)
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/resources/ccache-launcher-cxx.in" ccache-launcher-cxx)
 
-  execute_process(COMMAND chmod a+rx "${CMAKE_BINARY_DIR}/ccache-launcher-c" "${CMAKE_BINARY_DIR}/ccache-launcher-cxx")
-  set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_BINARY_DIR}/ccache-launcher-c")
-  set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_BINARY_DIR}/ccache-launcher-cxx")
+  execute_process(COMMAND chmod a+rx "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-c"
+                          "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-cxx")
+  set(CMAKE_XCODE_ATTRIBUTE_CC "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-c")
+  set(CMAKE_XCODE_ATTRIBUTE_CXX "${CMAKE_CURRENT_BINARY_DIR}/ccache-launcher-cxx")
   set(CMAKE_XCODE_ATTRIBUTE_LD "${CMAKE_C_COMPILER}")
   set(CMAKE_XCODE_ATTRIBUTE_LDPLUSPLUS "${CMAKE_CXX_COMPILER}")
 endif()
@@ -20,18 +25,27 @@
 # Set deployment target
 set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
 
+if(NOT OBS_PROVISIONING_PROFILE)
+  set(OBS_PROVISIONING_PROFILE
+      ""
+      CACHE STRING "OBS provisioning profile name for macOS" FORCE)
+else()
+  set(CMAKE_XCODE_ATTRIBUTE_PROVISIONING_PROFILE_NAME "${OBS_PROVISIONING_PROFILE}")
+endif()
+
 if(NOT OBS_CODESIGN_TEAM)
   # Switch to manual codesigning if no codesigning team is provided
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual)
   set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${OBS_CODESIGN_IDENTITY}")
 else()
-  if(DEFINED OBS_CODESIGN_IDENTITY AND NOT OBS_CODESIGN_IDENTITY STREQUAL "-")
+  if(OBS_CODESIGN_IDENTITY AND NOT OBS_CODESIGN_IDENTITY STREQUAL "-")
     # Switch to manual codesigning if a non-adhoc codesigning identity is provided
     set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE Manual)
     set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "${OBS_CODESIGN_IDENTITY}")
   else()
     # Switch to automatic codesigning via valid team ID
     set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic)
+    set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development")
   endif()
   set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "${OBS_CODESIGN_TEAM}")
 endif()
@@ -60,35 +74,52 @@
 # Use Swift version 5.0 by default
 set(CMAKE_XCODE_ATTRIBUTE_SWIFT_VERSION 5.0)
 
-# Use DWARF with separate dSYM files when in Release or MinSizeRel configuration
+# Use DWARF with separate dSYM files when in Release or MinSizeRel configuration.
+#
+# * Currently overruled by CMake's Xcode generator, requires adding '-g' flag to raw compiler command line for desired
+#   output configuration. Report to KitWare.
+#
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMATvariant=Debug dwarf)
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMATvariant=RelWithDebInfo dwarf)
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMATvariant=Release dwarf-with-dsym)
 set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMATvariant=MinSizeRel dwarf-with-dsym)
 
-# Strip generated and installed products only in Release or MinSizeRel configuration
-set(CMAKE_XCODE_ATTRIBUTE_STRIP_INSTALLED_PRODUCTvariant=Release YES)
-set(CMAKE_XCODE_ATTRIBUTE_STRIP_INSTALLED_PRODUCTvariant=MinSizeRel YES)
-
-# Make all symbols hidden by default
+# Make all symbols hidden by default (currently overriden by CMake's compiler flags)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_INLINES_ARE_PRIVATE_EXTERN YES)
 
-# Strip unused code in Release or MinSizeRel configuration only
-set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPINGvariant=Release YES)
-set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPINGvariant=MinSizeRel YES)
+# Strip unused code
+set(CMAKE_XCODE_ATTRIBUTE_DEAD_CODE_STRIPPING YES)
 
 # Display mangled names in Debug configuration
 set(CMAKE_XCODE_ATTRIBUTE_LINKER_DISPLAYS_MANGLED_NAMESvariant=Debug YES)
 
+# Build active architecture only in Debug configuration
+set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCHvariant=Debug YES)
+
+# Enable testability in Debug configuration
+set(CMAKE_XCODE_ATTRIBUTE_ENABLE_TESTABILITYvariant=Debug YES)
+
 # Disable using ARC in ObjC by default (OBS does not support this - yet)
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
+# Enable weak references in manual retain release
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_WEAK YES)
 # Disable strict aliasing
 set(CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO)
-# Set C language default to C17
-set(CMAKE_XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD c17)
+
+# Set C++ language default to c17
+#
+# * CMake explicitly sets the version via compiler flag when transitive dependencies require specific compiler feature
+#   set, resulting in the flag being added twice. Report to KitWare as a feature request for Xcode generator
+#
+# set(CMAKE_XCODE_ATTRIBUTE_GCC_C_LANGUAGE_STANDARD c17)
+#
 # Set C++ language default to c++17
-set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD c++17)
+#
+# * See above. Report to KitWare as a feature request for Xcode generator
+#
+# set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD c++17)
+
 # Enable support for module imports in ObjC
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES NO)
 # Enable automatic linking of imported modules in ObjC
@@ -98,33 +129,53 @@
 
 # Set default warnings for ObjC and C++
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING YES_ERROR)
-set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION NO)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_BOOL_CONVERSION YES)
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_COMMA YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_CONSTANT_CONVERSION YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_EMPTY_BODY YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_ENUM_CONVERSION YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_INFINITE_RECURSION YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_INT_CONVERSION YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_NON_LITERAL_NULL_CONVERSION YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_OBJC_LITERAL_CONVERSION YES)
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER YES)
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_RANGE_LOOP_ANALYSIS YES)
-set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_EMPTY_BODY YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_STRICT_PROTOTYPES NO)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION NO)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_MOVE YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN_UNREACHABLE_CODE YES)
+set(CMAKE_XCODE_ATTRIBUTE_CLANG_WARN__DUPLICATE_METHOD_MATCH YES)
 
 # Set default warnings for C and C++
+set(CMAKE_XCODE_ATTRIBUTE_GCC_NO_COMMON_BLOCKS YES)
+set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS NO)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_ABOUT_MISSING_NEWLINE YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_ABOUT_RETURN_TYPE YES_ERROR)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_CHECK_SWITCH_STATEMENTS YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_FOUR_CHARACTER_CONSTANTS YES)
-set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_SIGN_COMPARE YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_SHADOW NO)
+set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_SIGN_COMPARE YES)
+set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_TYPECHECK_CALLS_TO_PRINTF YES)
+set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNDECLARED_SELECTOR YES)
+set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNINITIALIZED_AUTOS YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNUSED_FUNCTION NO)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNUSED_PARAMETER YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VALUE YES)
 set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_UNUSED_VARIABLE YES)
-set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_TYPECHECK_CALLS_TO_PRINTF YES)
 
 # Add additional warning compiler flags
 set(CMAKE_XCODE_ATTRIBUTE_WARNING_CFLAGS "-Wvla -Wformat-security -Wno-error=shorten-64-to-32")
 
-set(CMAKE_XCODE_ATTRIBUTE_GCC_TREAT_WARNINGS_AS_ERRORS YES)
+if(CMAKE_COMPILE_WARNING_AS_ERROR)
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_TREAT_WARNINGS_AS_ERRORS YES)
+endif()
 
-# Disable color diagnostics
-set(CMAKE_COLOR_DIAGNOSTICS FALSE)
+# Enable color diagnostics
+set(CMAKE_COLOR_DIAGNOSTICS TRUE)
 
 # Disable usage of RPATH in build or install configurations
 set(CMAKE_SKIP_RPATH TRUE)

obs-studio-30.0.2.tar.xz/cmake/windows Added

obs-studio-30.0.2.tar.xz/cmake/windows/FindPython.cmake Added

@@ -0,0 +1,103 @@
+#=======================================================================.rst
+FindPython
+----------
+
+FindModule for Python import libraries and header on Windows
+
+.. versionchanged:: 3.0
+  Updated FindModule to CMake standards
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+.. versionadded:: 2.0
+
+This module defines the :prop_tgt:`IMPORTED` target ``Python::Python``.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module sets the following variables:
+
+``Python_FOUND``
+  True, if all required components and the core library were found.
+``Python_VERSION``
+  Detected version of found Python libraries.
+``Python_INCLUDE_DIRS``
+  Include directories needed for Python.
+``Python_LIBRARIES``
+  Libraries needed to link to Python.
+
+Cache variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``Python_LIBRARY``
+  Path to the library component of Python.
+``Python_INCLUDE_DIR``
+  Directory containing ``python.h``.
+
+#=======================================================================
+
+# cmake-format: off
+# cmake-lint: disable=C0103
+# cmake-lint: disable=C0301
+# cmake-format: on
+
+include(FindPackageHandleStandardArgs)
+
+find_path(
+  Python_INCLUDE_DIR
+  NAMES Python.h
+  PATH_SUFFIXES include include/python
+  DOC "Python include directory")
+
+find_library(
+  Python_LIBRARY
+  NAMES python3
+  PATHS lib
+  DOC "Python location")
+
+if(EXISTS "${Python_INCLUDE_DIR}/patchlevel.h")
+  file(STRINGS "${Python_INCLUDE_DIR}/patchlevel.h" _VERSION_STRING REGEX "^.*PY_VERSION \t+\"0-9\\.+\" \t*$")
+  string(REGEX REPLACE ".*PY_VERSION \t+\"(0-9\\.+)\".*" "\\1" Python_VERSION "${_VERSION_STRING}")
+else()
+  if(NOT Python_FIND_QUIETLY)
+    message(AUTHOR_WARNING "Failed to find Python version.")
+  endif()
+  set(Python_VERSION 0.0.0)
+endif()
+
+find_package_handle_standard_args(
+  Python
+  REQUIRED_VARS Python_LIBRARY Python_INCLUDE_DIR
+  VERSION_VAR Python_VERSION HANDLE_VERSION_RANGE REASON_FAILURE_MESSAGE
+                             "Ensure that obs-deps is provided as part of CMAKE_PREFIX_PATH.")
+mark_as_advanced(Python_INCLUDE_DIR Python_LIBRARY)
+
+if(Python_FOUND)
+  set(Python_INCLUDE_DIRS ${Python_INCLUDE_DIR})
+  set(Python_LIBRARIES ${Python_LIBRARY})
+  set(Python_DEFINITIONS ${PC_Python_CFLAGS_OTHER})
+
+  if(NOT TARGET Python::Python)
+    if(IS_ABSOLUTE "${Python_LIBRARY}")
+      add_library(Python::Python UNKNOWN IMPORTED)
+      set_property(TARGET Python::Python PROPERTY IMPORTED_LOCATION "${Python_LIBRARY}")
+    else()
+      add_library(Python::Python INTERFACE IMPORTED)
+      set_property(TARGET Python::Python PROPERTY IMPORTED_LIBNAME "${Python_LIBRARY}")
+    endif()
+
+    set_target_properties(Python::Python PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Python_INCLUDE_DIR}"
+                                                    VERSION ${Python_VERSION})
+  endif()
+endif()
+
+include(FeatureSummary)
+set_package_properties(
+  Python PROPERTIES
+  URL "https://www.python.org"
+  DESCRIPTION
+    "Python is a programming language that lets you work more quickly and integrate your systems more effectively.")

obs-studio-30.0.2.tar.xz/cmake/windows/buildspec.cmake Added

obs-studio-30.0.2.tar.xz/cmake/windows/compilerconfig.cmake Added

@@ -0,0 +1,60 @@
+# OBS CMake Windows compiler configuration module
+
+include_guard(GLOBAL)
+
+include(ccache)
+include(compiler_common)
+
+if(ENABLE_CCACHE AND CCACHE_PROGRAM)
+ if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+ file(COPY_FILE ${CCACHE_PROGRAM} "${CMAKE_CURRENT_BINARY_DIR}/cl.exe")
+ set(CMAKE_VS_GLOBALS "CLToolExe=cl.exe" "CLToolPath=${CMAKE_BINARY_DIR}" "TrackFileAccess=false"
+ "UseMultiToolTask=true")
+ set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded)
+ elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+ file(COPY_FILE ${CCACHE_PROGRAM} "${CMAKE_CURRENT_BINARY_DIR}/clang-cl.exe")
+ set(CMAKE_VS_GLOBALS "CLToolExe=clang-cl.exe" "CLToolPath=${CMAKE_BINARY_DIR}" "TrackFileAccess=false"
+ "UseMultiToolTask=true")
+ endif()
+endif()
+
+# CMake 3.24 introduces a bug mistakenly interpreting MSVC as supporting the '-pthread' compiler flag
+if(CMAKE_VERSION VERSION_EQUAL 3.24.0)
+ set(THREADS_HAVE_PTHREAD_ARG FALSE)
+endif()
+
+message(DEBUG "Current Windows API version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
+if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM)
+ message(DEBUG "Maximum Windows API version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM}")
+endif()
+
+if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.20348)
+ message(FATAL_ERROR "OBS requires Windows SDK version 10.0.20348.0 or more recent.\n"
+ "Please download and install the most recent Windows SDK.")
+endif()
+
+set(_obs_msvc_c_options /Brepro /MP /permissive- /Zc:__cplusplus /Zc:preprocessor)
+
+set(_obs_msvc_cpp_options /Brepro /MP /permissive- /Zc:__cplusplus /Zc:preprocessor)
+
+if(CMAKE_CXX_STANDARD GREATER_EQUAL 20)
+ list(APPEND _obs_msvc_cpp_options /Zc:char8_t-)
+endif()
+
+add_compile_options(
+ /W3
+ /utf-8
+ "$<$<COMPILE_LANG_AND_ID:C,MSVC>:${_obs_msvc_c_options}>"
+ "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:${_obs_msvc_cpp_options}>"
+ "$<$<COMPILE_LANG_AND_ID:C,Clang>:${_obs_clang_c_options}>"
+ "$<$<COMPILE_LANG_AND_ID:CXX,Clang>:${_obs_clang_cxx_options}>")
+
+add_compile_definitions(UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS $<$<CONFIG:DEBUG>:DEBUG>
+ $<$<CONFIG:DEBUG>:_DEBUG>)
+
+add_link_options("$<$<NOT:$<CONFIG:Debug>>:/OPT\:REF>" "$<$<CONFIG:Debug>:/INCREMENTAL\:NO>"
+ "$<$<CONFIG:RelWithDebInfo>:/INCREMENTAL\:NO>" "$<$<CONFIG:RelWithDebInfo>:/OPT\:ICF>" /Brepro)
+
+if(CMAKE_COMPILE_WARNING_AS_ERROR)
+ add_link_options(/WX)
+endif()

obs-studio-30.0.2.tar.xz/cmake/windows/cpackconfig.cmake Added

obs-studio-30.0.2.tar.xz/cmake/windows/defaults.cmake Added

@@ -0,0 +1,35 @@
+# OBS CMake Windows defaults module
+
+include_guard(GLOBAL)
+
+set(OBS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(OBS_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/rundir")
+
+set(OBS_PLUGIN_DESTINATION obs-plugins/64bit)
+set(OBS_DATA_DESTINATION data)
+set(OBS_CMAKE_DESTINATION cmake)
+set(OBS_SCRIPT_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-scripting/64bit")
+
+set(OBS_EXECUTABLE_DESTINATION bin/64bit)
+set(OBS_LIBRARY_DESTINATION lib)
+set(OBS_INCLUDE_DESTINATION include)
+# Set relative paths used by OBS for self-discovery
+set(OBS_PLUGIN_PATH "../../${CMAKE_INSTALL_LIBDIR}/obs-plugins/64bit")
+set(OBS_SCRIPT_PLUGIN_PATH "../../${OBS_DATA_DESTINATION}/obs-scripting/64bit")
+set(OBS_DATA_PATH "../../${OBS_DATA_DESTINATION}")
+
+# Enable find_package targets to become globally available targets
+set(CMAKE_FIND_PACKAGE_TARGETS_GLOBAL TRUE)
+
+include(buildspec)
+include(cpackconfig)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  execute_process(
+    COMMAND
+      "${CMAKE_COMMAND}" -S ${CMAKE_CURRENT_SOURCE_DIR} -B ${CMAKE_SOURCE_DIR}/build_x86 -A Win32 -G
+      "${CMAKE_GENERATOR}" -DCMAKE_SYSTEM_VERSION:STRING='${CMAKE_SYSTEM_VERSION}' -DOBS_CMAKE_VERSION:STRING=3.0.0
+      -DVIRTUALCAM_GUID:STRING=${VIRTUALCAM_GUID} -DCMAKE_MESSAGE_LOG_LEVEL=${CMAKE_MESSAGE_LOG_LEVEL}
+      -DENABLE_CCACHE=${ENABLE_CCACHE}
+    RESULT_VARIABLE _process_result COMMAND_ERROR_IS_FATAL ANY)
+endif()

obs-studio-30.0.2.tar.xz/cmake/windows/helpers.cmake Added

@@ -0,0 +1,547 @@
+# OBS CMake Windows helper functions module
+
+# cmake-format: off
+# cmake-lint: disable=C0301
+# cmake-lint: disable=R0915
+# cmake-format: on
+
+include_guard(GLOBAL)
+
+include(helpers_common)
+
+# set_target_properties_obs: Set target properties for use in obs-studio
+function(set_target_properties_obs target)
+ set(options "")
+ set(oneValueArgs "")
+ set(multiValueArgs PROPERTIES)
+ cmake_parse_arguments(PARSE_ARGV 0 _STPO "${options}" "${oneValueArgs}" "${multiValueArgs}")
+
+ message(DEBUG "Setting additional properties for target ${target}...")
+
+ while(_STPO_PROPERTIES)
+ list(POP_FRONT _STPO_PROPERTIES key value)
+ set_property(TARGET ${target} PROPERTY ${key} "${value}")
+ endwhile()
+
+ get_target_property(target_type ${target} TYPE)
+
+ if(target_type STREQUAL EXECUTABLE)
+ if(target STREQUAL obs-browser-helper)
+ set(OBS_EXECUTABLE_DESTINATION "${OBS_PLUGIN_DESTINATION}")
+ elseif(target STREQUAL inject-helper OR target STREQUAL get-graphics-offsets)
+ set(OBS_EXECUTABLE_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture")
+
+ # cmake-format: off
+ _target_install_obs(${target} DESTINATION ${OBS_EXECUTABLE_DESTINATION} 32BIT)
+ # cmake-format: on
+ endif()
+
+ # cmake-format: off
+ _target_install_obs(${target} DESTINATION ${OBS_EXECUTABLE_DESTINATION})
+ # cmake-format: on
+
+ if(target STREQUAL obs-studio)
+ get_property(obs_executables GLOBAL PROPERTY _OBS_EXECUTABLES)
+ get_property(obs_modules GLOBAL PROPERTY OBS_MODULES_ENABLED)
+ add_dependencies(${target} ${obs_executables} ${obs_modules})
+ _bundle_dependencies(${target})
+ target_add_resource(${target} "${CMAKE_CURRENT_SOURCE_DIR}/../AUTHORS"
+ "${OBS_DATA_DESTINATION}/obs-studio/authors")
+ elseif(target STREQUAL obs-browser-helper)
+ set_property(GLOBAL APPEND PROPERTY _OBS_EXECUTABLES ${target})
+ return()
+ else()
+ set_property(GLOBAL APPEND PROPERTY _OBS_EXECUTABLES ${target})
+ endif()
+ elseif(target_type STREQUAL SHARED_LIBRARY)
+ set_target_properties(${target} PROPERTIES VERSION ${OBS_VERSION_MAJOR} SOVERSION ${OBS_VERSION_CANONICAL})
+
+ # cmake-format: off
+ _target_install_obs(
+ ${target}
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}"
+ LIBRARY_DESTINATION "${OBS_LIBRARY_DESTINATION}"
+ HEADER_DESTINATION "${OBS_INCLUDE_DESTINATION}")
+ # cmake-format: on
+ elseif(target_type STREQUAL MODULE_LIBRARY)
+ set_target_properties(${target} PROPERTIES VERSION 0 SOVERSION ${OBS_VERSION_CANONICAL})
+
+ if(target STREQUAL libobs-d3d11
+ OR target STREQUAL libobs-opengl
+ OR target STREQUAL libobs-winrt)
+ set(target_destination "${OBS_EXECUTABLE_DESTINATION}")
+ elseif(target STREQUAL "obspython" OR target STREQUAL "obslua")
+ set(target_destination "${OBS_SCRIPT_PLUGIN_DESTINATION}")
+ elseif(target STREQUAL graphics-hook)
+ set(target_destination "${OBS_DATA_DESTINATION}/obs-plugins/win-capture")
+ target_add_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan64.json" "${target_destination}")
+ target_add_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan32.json" "${target_destination}")
+
+ # cmake-format: off
+ _target_install_obs(${target} DESTINATION ${target_destination} 32BIT)
+ # cmake-format: on
+ elseif(target STREQUAL obs-virtualcam-module)
+ set(target_destination "${OBS_DATA_DESTINATION}/obs-plugins/win-dshow")
+
+ # cmake-format: off
+ _target_install_obs(${target} DESTINATION ${target_destination} 32BIT)
+ # cmake-format: on
+ else()
+ set(target_destination "${OBS_PLUGIN_DESTINATION}")
+ endif()
+
+ # cmake-format: off
+ _target_install_obs(${target} DESTINATION ${target_destination})
+ # cmake-format: on
+
+ if(${target} STREQUAL obspython)
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_SCRIPT_PLUGIN_DESTINATION}/"
+ COMMAND "${CMAKE_COMMAND}" -E copy_if_different "$<TARGET_FILE_DIR:obspython>/obspython.py"
+ "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_SCRIPT_PLUGIN_DESTINATION}/"
+ COMMENT "Add obspython import module")
+
+ install(
+ FILES "$<TARGET_FILE_DIR:obspython>/obspython.py"
+ DESTINATION "${OBS_SCRIPT_PLUGIN_DESTINATION}"
+ COMPONENT Runtime)
+ elseif(${target} STREQUAL obs-browser)
+ message(DEBUG "Add Chromium Embedded Framework to project for obs-browser plugin...")
+ if(TARGET CEF::Library)
+ get_target_property(imported_location CEF::Library IMPORTED_LOCATION_RELEASE)
+
+ if(imported_location)
+ cmake_path(GET imported_location PARENT_PATH cef_location)
+ cmake_path(GET cef_location PARENT_PATH cef_root_location)
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}"
+ COMMAND
+ "${CMAKE_COMMAND}" -E copy_if_different "${imported_location}" "${cef_location}/chrome_elf.dll"
+ "${cef_location}/libEGL.dll" "${cef_location}/libGLESv2.dll" "${cef_location}/snapshot_blob.bin"
+ "${cef_location}/v8_context_snapshot.bin" "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}"
+ COMMAND
+ "${CMAKE_COMMAND}" -E copy_if_different "${cef_root_location}/Resources/chrome_100_percent.pak"
+ "${cef_root_location}/Resources/chrome_200_percent.pak" "${cef_root_location}/Resources/icudtl.dat"
+ "${cef_root_location}/Resources/resources.pak" "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}/"
+ COMMAND "${CMAKE_COMMAND}" -E copy_directory "${cef_root_location}/Resources/locales"
+ "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}/locales"
+ COMMENT "Add Chromium Embedded Framework to library directory")
+
+ install(
+ FILES "${imported_location}"
+ "${cef_location}/chrome_elf.dll"
+ "${cef_location}/libEGL.dll"
+ "${cef_location}/libGLESv2.dll"
+ "${cef_location}/snapshot_blob.bin"
+ "${cef_location}/v8_context_snapshot.bin"
+ "${cef_root_location}/Resources/chrome_100_percent.pak"
+ "${cef_root_location}/Resources/chrome_200_percent.pak"
+ "${cef_root_location}/Resources/icudtl.dat"
+ "${cef_root_location}/Resources/resources.pak"
+ DESTINATION "${target_destination}"
+ COMPONENT Runtime)
+
+ install(
+ DIRECTORY "${cef_root_location}/Resources/locales"
+ DESTINATION "${target_destination}"
+ USE_SOURCE_PERMISSIONS
+ COMPONENT Runtime)
+ endif()
+ endif()
+ endif()
+
+ set_property(GLOBAL APPEND PROPERTY OBS_MODULES_ENABLED ${target})
+ endif()
+
+ target_link_options(${target} PRIVATE "/PDBALTPATH:$<TARGET_PDB_FILE_NAME:${target}>")
+ target_install_resources(${target})
+
+ get_target_property(target_sources ${target} SOURCES)
+ set(target_ui_files ${target_sources})
+ list(FILTER target_ui_files INCLUDE REGEX ".+\\.(ui|qrc)")
+ source_group(
+ TREE "${CMAKE_CURRENT_SOURCE_DIR}"
+ PREFIX "UI Files"
+ FILES ${target_ui_files})
+
+ if(${target} STREQUAL libobs)
+ set(target_source_files ${target_sources})
+ set(target_header_files ${target_sources})
+ list(FILTER target_source_files INCLUDE REGEX ".+\\.(m|ccp?p?|swift)")
+ list(FILTER target_header_files INCLUDE REGEX ".+\\.h(pp)?")
+
+ source_group(
+ TREE "${CMAKE_CURRENT_SOURCE_DIR}"
+ PREFIX "Source Files"
+ FILES ${target_source_files})
+ source_group(
+ TREE "${CMAKE_CURRENT_SOURCE_DIR}"
+ PREFIX "Header Files"
+ FILES ${target_header_files})
+ endif()
+endfunction()
+
+# _target_install_obs: Helper function to install build artifacts to rundir and install location
+function(_target_install_obs target)
+ set(options "32BIT")
+ set(oneValueArgs "DESTINATION" "LIBRARY_DESTINATION" "HEADER_DESTINATION")
+ set(multiValueArgs "")
+ cmake_parse_arguments(PARSE_ARGV 0 _TIO "${options}" "${oneValueArgs}" "${multiValueArgs}")
+
+ if(_TIO_32BIT)
+ get_target_property(target_type ${target} TYPE)
+ if(target_type STREQUAL EXECUTABLE)
+ set(suffix exe)
+ else()
+ set(suffix dll)
+ endif()
+
+ cmake_path(RELATIVE_PATH CMAKE_CURRENT_SOURCE_DIR BASE_DIRECTORY "${OBS_SOURCE_DIR}" OUTPUT_VARIABLE project_path)
+
+ set(32bit_project_path "${OBS_SOURCE_DIR}/build_x86/${project_path}")
+ set(target_file "${32bit_project_path}/$<CONFIG>/${target}32.${suffix}")
+ set(target_pdb_file "${32bit_project_path}/$<CONFIG>/${target}32.pdb")
+ set(comment "Copy ${target} (32-bit) to destination")
+
+ install(
+ FILES "${32bit_project_path}/$<CONFIG>/${target}32.${suffix}"
+ DESTINATION "${_TIO_DESTINATION}"
+ COMPONENT Runtime
+ OPTIONAL)
+ else()
+ set(target_file "$<TARGET_FILE:${target}>")
+ set(target_pdb_file "$<TARGET_PDB_FILE:${target}>")
+ set(comment "Copy ${target} to destination")
+
+ get_target_property(target_type ${target} TYPE)
+ if(target_type STREQUAL EXECUTABLE)
+ install(TARGETS ${target} RUNTIME DESTINATION "${_TIO_DESTINATION}" COMPONENT Runtime)
+ elseif(target_type STREQUAL SHARED_LIBRARY)
+ if(NOT _TIO_LIBRARY_DESTINATION)
+ set(_TIO_LIBRARY_DESTINATION ${_TIO_DESTINATION})
+ endif()
+ if(NOT _TIO_HEADER_DESTINATION)
+ set(_TIO_HEADER_DESTINATION include)
+ endif()
+ install(
+ TARGETS ${target}
+ RUNTIME DESTINATION "${_TIO_DESTINATION}"
+ LIBRARY DESTINATION "${_TIO_LIBRARY_DESTINATION}"
+ COMPONENT Runtime
+ EXCLUDE_FROM_ALL
+ PUBLIC_HEADER
+ DESTINATION "${_TIO_HEADER_DESTINATION}"
+ COMPONENT Development
+ EXCLUDE_FROM_ALL)
+ elseif(target_type STREQUAL MODULE_LIBRARY)
+ install(
+ TARGETS ${target}
+ LIBRARY DESTINATION "${_TIO_DESTINATION}"
+ COMPONENT Runtime
+ NAMELINK_COMPONENT Development)
+ endif()
+ endif()
+
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${_TIO_DESTINATION}"
+ COMMAND "${CMAKE_COMMAND}" -E copy ${target_file} "${OBS_OUTPUT_DIR}/$<CONFIG>/${_TIO_DESTINATION}"
+ COMMAND "${CMAKE_COMMAND}" -E $<IF:$<CONFIG:Debug,RelWithDebInfo>,copy,true> ${target_pdb_file}
+ "${OBS_OUTPUT_DIR}/$<CONFIG>/${_TIO_DESTINATION}"
+ COMMENT "${comment}"
+ VERBATIM)
+
+ install(
+ FILES ${target_pdb_file}
+ CONFIGURATIONS RelWithDebInfo Debug
+ DESTINATION "${_TIO_DESTINATION}"
+ COMPONENT Runtime
+ OPTIONAL)
+endfunction()
+
+# target_export: Helper function to export target as CMake package
+function(target_export target)
+ # Exclude CMake package from 'ALL' target
+ set(exclude_variant EXCLUDE_FROM_ALL)
+ _target_export(${target})
+
+ install(
+ FILES "$<TARGET_PDB_FILE:${target}>"
+ CONFIGURATIONS RelWithDebInfo Debug
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}"
+ COMPONENT Development
+ OPTIONAL)
+endfunction()
+
+# Helper function to add resources into bundle
+function(target_install_resources target)
+ message(DEBUG "Installing resources for target ${target}...")
+ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/data")
+ file(GLOB_RECURSE data_files "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
+ foreach(data_file IN LISTS data_files)
+ cmake_path(RELATIVE_PATH data_file BASE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/" OUTPUT_VARIABLE
+ relative_path)
+ cmake_path(GET relative_path PARENT_PATH relative_path)
+ target_sources(${target} PRIVATE "${data_file}")
+ source_group("Resources/${relative_path}" FILES "${data_file}")
+ endforeach()
+
+ get_property(obs_module_list GLOBAL PROPERTY OBS_MODULES_ENABLED)
+ if(target IN_LIST obs_module_list)
+ set(target_destination "${OBS_DATA_DESTINATION}/obs-plugins/${target}")
+ elseif(target STREQUAL obs-studio)
+ set(target_destination "${OBS_DATA_DESTINATION}/obs-studio")
+ else()
+ set(target_destination "${OBS_DATA_DESTINATION}/${target}")
+ endif()
+
+ install(
+ DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/"
+ DESTINATION "${target_destination}"
+ USE_SOURCE_PERMISSIONS
+ COMPONENT Runtime)
+
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}"
+ COMMAND "${CMAKE_COMMAND}" -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/data"
+ "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}"
+ COMMENT "Copy ${target} resources to data directory"
+ VERBATIM)
+ endif()
+endfunction()
+
+# Helper function to add a specific resource to a bundle
+function(target_add_resource target resource)
+
+ get_property(obs_module_list GLOBAL PROPERTY OBS_MODULES_ENABLED)
+ if(ARGN)
+ set(target_destination "${ARGN}")
+ elseif(${target} IN_LIST obs_module_list)
+ set(target_destination "${OBS_DATA_DESTINATION}/obs-plugins/${target}")
+ elseif(target STREQUAL obs-studio)
+ set(target_destination "${OBS_DATA_DESTINATION}/obs-studio")
+ else()
+ set(target_destination "${OBS_DATA_DESTINATION}/${target}")
+ endif()
+
+ message(DEBUG "Add resource '${resource}' to target ${target} at destination '${target_destination}'...")
+
+ install(
+ FILES "${resource}"
+ DESTINATION "${target_destination}"
+ COMPONENT Runtime)
+
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}/"
+ COMMAND "${CMAKE_COMMAND}" -E copy "${resource}" "${OBS_OUTPUT_DIR}/$<CONFIG>/${target_destination}/"
+ COMMENT "Copy ${target} resource ${resource} to library directory"
+ VERBATIM)
+
+ source_group("Resources" FILES "${resource}")
+endfunction()
+
+# _bundle_dependencies: Resolve third party dependencies and add them to Windows binary directory
+function(_bundle_dependencies target)
+ message(DEBUG "Discover dependencies of target ${target}...")
+ set(found_dependencies)
+ find_dependencies(TARGET ${target} FOUND_VAR found_dependencies)
+
+ get_property(obs_module_list GLOBAL PROPERTY OBS_MODULES_ENABLED)
+ list(LENGTH obs_module_list num_modules)
+ if(num_modules GREATER 0)
+ add_dependencies(${target} ${obs_module_list})
+ foreach(module IN LISTS obs_module_list)
+ find_dependencies(TARGET ${module} FOUND_VAR found_dependencies)
+ endforeach()
+ endif()
+
+ list(REMOVE_DUPLICATES found_dependencies)
+ set(library_paths_DEBUG)
+ set(library_paths_RELWITHDEBINFO)
+ set(library_paths_RELEASE)
+ set(library_paths_MINSIZEREL)
+ set(plugins_list)
+
+ foreach(library IN LISTS found_dependencies)
+ # CEF needs to be placed in obs-plugins directory on Windows, which is handled already
+ if(${library} STREQUAL CEF::Library)
+ continue()
+ endif()
+
+ get_target_property(library_type ${library} TYPE)
+ get_target_property(is_imported ${library} IMPORTED)
+
+ if(is_imported)
+ get_target_property(imported_location ${library} IMPORTED_LOCATION)
+
+ foreach(config IN ITEMS RELEASE RELWITHDEBINFO MINSIZEREL DEBUG)
+ get_target_property(imported_location_${config} ${library} IMPORTED_LOCATION_${config})
+ if(imported_location_${config})
+ _check_library_location(${imported_location_${config}})
+ elseif(NOT imported_location_${config} AND imported_location_RELEASE)
+ _check_library_location(${imported_location_RELEASE})
+ else()
+ _check_library_location(${imported_location})
+ endif()
+ endforeach()
+
+ if(library MATCHES "Qt56?::.+")
+ find_qt_plugins(COMPONENT ${library} TARGET ${target} FOUND_VAR plugins_list)
+ endif()
+ endif()
+ endforeach()
+
+ foreach(config IN ITEMS DEBUG RELWITHDEBINFO RELEASE MINSIZEREL)
+ list(REMOVE_DUPLICATES library_paths_${config})
+ endforeach()
+
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}"
+ COMMAND "${CMAKE_COMMAND}" -E "$<IF:$<CONFIG:Debug>,copy_if_different,true>"
+ "$<$<CONFIG:Debug>:${library_paths_DEBUG}>" "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}"
+ COMMAND
+ "${CMAKE_COMMAND}" -E "$<IF:$<CONFIG:RelWithDebInfo>,copy_if_different,true>"
+ "$<$<CONFIG:RelWithDebInfo>:${library_paths_RELWITHDEBINFO}>"
+ "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}"
+ COMMAND "${CMAKE_COMMAND}" -E "$<IF:$<CONFIG:Release>,copy_if_different,true>"
+ "$<$<CONFIG:Release>:${library_paths_RELEASE}>" "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}"
+ COMMAND
+ "${CMAKE_COMMAND}" -E "$<IF:$<CONFIG:MinSizeRel>,copy_if_different,true>"
+ "$<$<CONFIG:MinSizeRel>:${library_paths_MINSIZEREL}>" "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}"
+ COMMENT "Copy dependencies to binary directory (${OBS_EXECUTABLE_DESTINATION})..."
+ VERBATIM COMMAND_EXPAND_LISTS)
+
+ install(
+ FILES ${library_paths_DEBUG}
+ CONFIGURATIONS Debug
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}"
+ COMPONENT Runtime)
+
+ install(
+ FILES ${library_paths_RELWITHDEBINFO}
+ CONFIGURATIONS RelWithDebInfo
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}"
+ COMPONENT Runtime)
+
+ install(
+ FILES ${library_paths_RELEASE}
+ CONFIGURATIONS Release
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}"
+ COMPONENT Runtime)
+
+ install(
+ FILES ${library_paths_MINSIZEREL}
+ CONFIGURATIONS MinSizeRel
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}"
+ COMPONENT Runtime)
+
+ list(REMOVE_DUPLICATES plugins_list)
+ foreach(plugin IN LISTS plugins_list)
+ message(TRACE "Adding Qt plugin ${plugin}...")
+
+ cmake_path(GET plugin PARENT_PATH plugin_path)
+ cmake_path(GET plugin_path STEM plugin_stem)
+
+ list(APPEND plugin_stems ${plugin_stem})
+
+ if(plugin MATCHES ".+d\\.dll$")
+ list(APPEND plugin_${plugin_stem}_debug ${plugin})
+ else()
+ list(APPEND plugin_${plugin_stem} ${plugin})
+ endif()
+ endforeach()
+
+ list(REMOVE_DUPLICATES plugin_stems)
+ foreach(stem IN LISTS plugin_stems)
+ set(plugin_list ${plugin_${stem}})
+ set(plugin_list_debug ${plugin_${stem}_debug})
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND "${CMAKE_COMMAND}" -E make_directory "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}/${stem}"
+ COMMAND "${CMAKE_COMMAND}" -E "$<IF:$<CONFIG:Debug>,copy_if_different,true>" "${plugin_list_debug}"
+ "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}/${stem}"
+ COMMAND "${CMAKE_COMMAND}" -E "$<IF:$<CONFIG:Debug>,true,copy_if_different>" "${plugin_list}"
+ "${OBS_OUTPUT_DIR}/$<CONFIG>/${OBS_EXECUTABLE_DESTINATION}/${stem}"
+ COMMENT "Copy Qt plugins ${stem} to binary directory (${OBS_EXECUTABLE_DESTINATION}/${stem})"
+ VERBATIM COMMAND_EXPAND_LISTS)
+
+ install(
+ FILES ${plugin_list_debug}
+ CONFIGURATIONS Debug
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}/${stem}"
+ COMPONENT Runtime)
+
+ install(
+ FILES ${plugin_list}
+ CONFIGURATIONS RelWithDebInfo Release MinSizeRel
+ DESTINATION "${OBS_EXECUTABLE_DESTINATION}/${stem}"
+ COMPONENT Runtime)
+ endforeach()
+endfunction()
+
+# _check_library_location: Check for corresponding DLL given an import library path
+macro(_check_library_location location)
+ if(library_type STREQUAL "SHARED_LIBRARY")
+ set(library_location "${location}")
+ else()
+ string(STRIP "${location}" location)
+ if(location MATCHES ".+lib$")
+ cmake_path(GET location FILENAME _dll_name)
+ cmake_path(GET location PARENT_PATH _implib_path)
+ cmake_path(SET _bin_path NORMALIZE "${_implib_path}/../bin")
+ string(REPLACE ".lib" ".dll" _dll_name "${_dll_name}")
+ string(REPLACE ".dll" ".pdb" _pdb_name "${_dll_name}")
+
+ find_program(
+ _dll_path
+ NAMES "${_dll_name}"
+ HINTS ${_implib_path} ${_bin_path} NO_CACHE
+ NO_DEFAULT_PATH)
+
+ find_program(
+ _pdb_path
+ NAMES "${_pdb_name}"
+ HINTS ${_implib_path} ${_bin_path} NO_CACHE
+ NO_DEFAULT_PATH)
+
+ if(_dll_path)
+ set(library_location "${_dll_path}")
+ set(library_pdb_location "${_pdb_path}")
+ else()
+ unset(library_location)
+ unset(library_pdb_location)
+ endif()
+ unset(_dll_path)
+ unset(_pdb_path)
+ unset(_bin_path)
+ unset(_implib_path)
+ unset(_dll_name)
+ unset(_pdb_name)
+ else()
+ unset(library_location)
+ unset(library_pdb_location)
+ endif()
+ endif()
+
+ if(library_location)
+ list(APPEND library_paths_${config} ${library_location})
+ endif()
+ if(library_pdb_location)
+ list(APPEND library_paths_${config} ${library_pdb_location})
+ endif()
+ unset(location)
+ unset(library_location)
+ unset(library_pdb_location)
+endmacro()

obs-studio-30.0.2.tar.xz/cmake/windows/idlfilehelper.cmake Added

@@ -0,0 +1,27 @@
+# target_add_idl_files: Compile IDL file and add generated source files to target
+function(target_add_idl_files target)
+ set(options target WITH_TLB)
+ set(oneValueArgs "")
+ set(multiValueArgs "")
+ cmake_parse_arguments(PARSE_ARGV 1 _AIF "${options}" "${oneValueArgs}" "${multiValueArgs}")
+ set(aif_files ${_AIF_UNPARSED_ARGUMENTS})
+
+ foreach(idl_file IN LISTS aif_files)
+ cmake_path(GET idl_file STEM idl_file_name)
+ cmake_path(GET idl_file PARENT_PATH idl_file_path)
+
+ set(idl_file_header "${CMAKE_CURRENT_BINARY_DIR}/${idl_file_name}.h")
+ set(idl_file_source "${CMAKE_CURRENT_BINARY_DIR}/${idl_file_name}_i.c")
+
+ add_custom_command(
+ OUTPUT "${idl_file_header}" "${idl_file_source}"
+ DEPENDS "${idl_file}"
+ COMMAND midl /h "${idl_file_name}.h" /iid "${idl_file_name}_i.c" "$<$<NOT:$<BOOL:${_AIF_WITH_TLIB}>>:/notlb>"
+ /win64 "${CMAKE_CURRENT_SOURCE_DIR}/${idl_file}"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+ COMMENT "Generate idl files")
+
+ set_source_files_properties(${idl_file} PROPERTIES HEADER_FILE_ONLY TRUE)
+ target_sources(${target} PRIVATE "${idl_file_source}" "${idl_file_header}")
+ endforeach()
+endfunction()

obs-studio-29.1.3.tar.xz/deps/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/blake2/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/blake2/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/deps/blake2/LICENSE.blake2 Added

obs-studio-29.1.3.tar.xz/deps/file-updater/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/file-updater/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/glad/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/glad/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/deps/happy-eyeballs Added

obs-studio-30.0.2.tar.xz/deps/happy-eyeballs/CMakeLists.txt Added

obs-studio-30.0.2.tar.xz/deps/happy-eyeballs/happy-eyeballs.c Added

@@ -0,0 +1,764 @@
+/**
+ * Copyright (c) 2023 Twitch Interactive, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#include "happy-eyeballs.h"
+#include "util/darray.h"
+#include "util/dstr.h"
+#include "util/platform.h"
+#include "util/threading.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef _WIN32
+#ifdef _MSC_VER
+#pragma warning(disable : 4996) /* depricated warnings */
+#endif
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define GetSockError() WSAGetLastError()
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+#else /* !_WIN32 */
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#define GetSockError() errno
+#endif
+
+/* ------------------------------------------------------------------------- */
+/* happy eyeballs coefficients */
+
+/* this is the same default as libcurl */
+#define HAPPY_EYEBALLS_DELAY_MS 200
+#define HAPPY_EYEBALLS_MAX_ATTEMPTS 6
+/* Total time to wait for sockets or to finish trying; whichever is shorter */
+#define HAPPY_EYEBALLS_CONNECTION_TIMEOUT_MS 25000
+
+/* ------------------------------------------------------------------------- */
+
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET ~0
+#endif
+
+#define STATUS_SUCCESS 0
+#define STATUS_FAILURE -1
+#define STATUS_INVALID_ARGUMENT -EINVAL
+
+struct happy_eyeballs_candidate {
+	SOCKET sockfd;
+	os_event_t *socket_completed_event;
+	pthread_t thread;
+	int error;
+};
+
+struct happy_eyeballs_ctx {
+	/**
+	 * socket_fd will be non-zero upon successful connection to the host
+	 * and port specified.
+	 */
+	SOCKET socket_fd;
+
+	/**
+	 * winner_addr will be non-zero upon successful connection to the host
+	 * and port specified.
+	 */
+	struct sockaddr_storage winner_addr;
+
+	/**
+	 * winner_addr_len will be non-zero upon successful connection to the
+	 * host and port specified.
+	 */
+	socklen_t winner_addr_len;
+
+	/**
+	 * error will be non-zero in case of an error during operation.
+	 */
+	int error;
+
+	/**
+	 * error_message may be set when there is a non-zero error code.
+	 */
+	const char *error_message;
+
+	/**
+	 * Set along with bind_addr to hint which interface to use.
+	 */
+	socklen_t bind_addr_len;
+
+	/**
+	 * Set along with bind_addr_len to hint which interface to use.
+	 */
+	struct sockaddr_storage bind_addr;
+
+	/**
+	 * List of in-flight connection attempts.
+	 */
+	DARRAY(struct happy_eyeballs_candidate) candidates;
+
+	/**
+	 * Protects against multiple simultaneous winners writing socket_fd,
+	 * winner_addr, and winner_addr_len
+	 */
+	pthread_mutex_t winner_mutex;
+
+	/**
+	 * Protects against mutating while iterating the candidate list
+	 */
+	pthread_mutex_t candidate_mutex;
+
+	/**
+	 * Event that signals completion of the race, either via winner or
+	 * error
+	 */
+	os_event_t *race_completed_event;
+
+	/**
+	 * Addresses gathered by getaddrinfo
+	 */
+	struct addrinfo *addresses;
+
+	/**
+	 * Domain name resolution time, in nanoseconds (0 until resolution
+	 * success)
+	 */
+	uint64_t name_resolution_time_ns;
+
+	/**
+	 * Connection time, in nanoseconds
+	 */
+	uint64_t connection_time_start;
+
+	uint64_t connection_time_end;
+
+	/**
+	 * Indicates whether we are in the initial phase of dispatching
+	 * connections, or if we are waiting for things to connect or time out.
+	 */
+	volatile bool is_starting;
+};
+
+struct happy_connect_worker_args {
+	SOCKET sockfd;
+	struct happy_eyeballs_ctx *context;
+	struct happy_eyeballs_candidate *candidate;
+	struct addrinfo *address;
+};
+
+static int check_comodo(struct happy_eyeballs_ctx *context)
+{
+#ifdef _WIN32
+	/* COMODO security software sandbox blocks all DNS by returning "host
+	 * not found" */
+	HOSTENT *h = gethostbyname("localhost");
+	if (!h && GetLastError() == WSAHOST_NOT_FOUND) {
+		context->error = WSAHOST_NOT_FOUND;
+		context->error_message =
+			"happy-eyeballs: Connection test failed. "
+			"This error is likely caused by Comodo Internet "
+			"Security running OBS in sandbox mode. Please add "
+			"OBS to the Comodo automatic sandbox exclusion list, "
+			"restart OBS and try again (11001).";
+		return STATUS_FAILURE;
+	}
+#else
+	(void)context;
+#endif
+	return STATUS_SUCCESS;
+}
+
+static int build_addr_list(const char *hostname, int port,
+			 struct happy_eyeballs_ctx *context)
+{
+	struct addrinfo hints = {0};
+
+	hints.ai_family = AF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	hints.ai_protocol = IPPROTO_TCP;
+
+	if (context->bind_addr_len == sizeof(struct sockaddr_in))
+		hints.ai_family = AF_INET;
+	else if (context->bind_addr_len == sizeof(struct sockaddr_in6))
+		hints.ai_family = AF_INET6;
+
+	struct dstr port_str;
+	dstr_init(&port_str);
+	dstr_printf(&port_str, "%d", port);
+
+	uint64_t start_time = os_gettime_ns();
+	int err = getaddrinfo(hostname, port_str.array, &hints,
+			 &context->addresses);
+	context->name_resolution_time_ns = os_gettime_ns() - start_time;
+	dstr_free(&port_str);
+	if (err) {
+		context->error = GetSockError();
+		context->error_message = strerror(GetSockError());
+		return STATUS_FAILURE;
+	}
+
+	/* Reorder addresses interleaving address family */
+	struct addrinfo *prev = context->addresses;
+	struct addrinfo *cur = prev->ai_next;
+
+	while (cur) {
+		if (prev->ai_family == cur->ai_family &&
+		 (cur->ai_family == AF_INET || cur->ai_family == AF_INET6)) {
+			/* If the current protocol family matches the previous
+			 * one, look for the next instance of the other kind */
+			const int target_family =
+				prev->ai_family == AF_INET ? AF_INET6 : AF_INET;
+			struct addrinfo *it = cur->ai_next;
+			struct addrinfo *prev_it = cur;
+
+			while (it) {
+				if (it->ai_family == target_family)
+					break;
+				prev_it = it;
+				it = it->ai_next;
+			}
+
+			if (!it) {
+				/* we're at the end and haven't found the other
+				 * kind, exit the loop early. */
+				break;
+			}
+
+			prev->ai_next = it;
+			prev_it->ai_next = it->ai_next;
+			it->ai_next = cur;
+		}
+		prev = cur;
+		cur = cur->ai_next;
+	}
+
+	return STATUS_SUCCESS;
+}
+
+static void signal_end(struct happy_eyeballs_ctx *context)
+{
+	if (os_event_try(context->race_completed_event) != EAGAIN)
+		return;
+
+	context->connection_time_end = os_gettime_ns();
+	os_event_signal(context->race_completed_event);
+}
+
+/**
+ * Takes the errors that may have been generated by workers, finds the most
+ * common one, and sets that to be the overall context error.
+ */
+static int coalesce_errors(struct happy_eyeballs_ctx *context)
+{
+	/* Don't coalesce errors while starting */
+	if (os_atomic_load_bool(&context->is_starting))
+		return STATUS_FAILURE;
+
+	/* Don't coalesce errors if we've already completed */
+	if (os_event_try(context->race_completed_event) != EAGAIN)
+		return STATUS_FAILURE;
+
+	/* We'll use the mode of the errors for now. */
+	struct mode {
+		int error;
+		int count;
+	};
+	DARRAY(struct mode) modes = {0};
+	da_init(modes);
+
+	/* Gather all the errors into counts for each error */
+	pthread_mutex_lock(&context->candidate_mutex);
+	for (size_t i = 0; i < context->candidates.num; i++) {
+		int err = context->candidates.arrayi.error;
+		struct mode *mode = NULL;
+
+		/* If the error is 0, just move on. */
+		if (err == 0) {
+			continue;
+		}
+
+		/* Find an existing index containing this error if it exists */
+		for (size_t j = 0; j < modes.num && mode == NULL; j++) {
+			if (modes.arrayj.error == err)
+				mode = &modes.arrayj;
+		}
+
+		/* Existing index doesn't exist, take the next available. */
+		if (mode == NULL) {
+			mode = da_push_back_new(modes);
+		}
+
+		/* Note the error code and increment the count. */
+		mode->error = err;
+		mode->count++;
+	}
+	pthread_mutex_unlock(&context->candidate_mutex);
+
+	int max_count = 0;
+	int max_value = 0;
+
+	/* Find the error with the most occurrences. */
+	for (size_t i = 0; i < modes.num; i++) {
+		if (max_count < modes.arrayi.count) {
+			max_value = modes.arrayi.error;
+			max_count = modes.arrayi.count;
+		}
+	}
+	da_free(modes);
+
+	/* Set the error */
+	context->error = max_value;
+	context->error_message = strerror(context->error);
+
+	return STATUS_SUCCESS;
+}
+
+static void *happy_connect_worker(void *arg)
+{
+	struct happy_connect_worker_args *args =
+		(struct happy_connect_worker_args *)arg;
+	struct happy_eyeballs_ctx *context = args->context;
+
+	if (args->sockfd == INVALID_SOCKET) {
+		goto success;
+	}
+	if (os_event_try(args->context->race_completed_event) == 0) {
+		/* Already lost, don't bother */
+		goto success;
+	}
+
+#if !defined(_WIN32) && defined(SO_NOSIGPIPE)
+	setsockopt(args->sockfd, SOL_SOCKET, SO_NOSIGPIPE, &(int){1},
+		 sizeof(int));
+#endif
+	if (context->bind_addr.ss_family != 0 &&
+	 bind(args->sockfd, (const struct sockaddr *)&context->bind_addr,
+		 context->bind_addr_len) < 0) {
+		goto failure;
+	}
+
+	if (connect(args->sockfd, args->address->ai_addr,
+		 (int)args->address->ai_addrlen) == 0) {
+
+		/* success, check if we're the winner. */
+		pthread_mutex_lock(&context->winner_mutex);
+		os_event_signal(args->candidate->socket_completed_event);
+
+		if (os_event_try(context->race_completed_event) == EAGAIN) {
+			/* We are the winner. */
+			context->socket_fd = args->sockfd;
+			memcpy(&context->winner_addr, args->address->ai_addr,
+			 args->address->ai_addrlen);
+			context->winner_addr_len =
+				(socklen_t)args->address->ai_addrlen;
+			signal_end(context);
+		}
+
+		pthread_mutex_unlock(&context->winner_mutex);
+		goto success;
+	}
+
+failure:
+	/* failure, note down the error */
+	args->candidate->error = GetSockError();
+	pthread_mutex_lock(&context->winner_mutex);
+	os_event_signal(args->candidate->socket_completed_event);
+
+	/* connection candidates may still be getting dispatched, treat as if
+	 * there's an active candidate */
+	bool active = os_atomic_load_bool(&context->is_starting);
+
+	/* check if we are the last worker running. If so, we'll set the error
+	 * status and signal the completion event. */
+	pthread_mutex_lock(&context->candidate_mutex);
+	for (size_t i = 0; i < context->candidates.num && !active; i++) {
+		active = os_event_try(context->candidates.arrayi
+					 .socket_completed_event) ==
+			 EAGAIN;
+	}
+
+	pthread_mutex_unlock(&context->candidate_mutex);
+	pthread_mutex_unlock(&context->winner_mutex);
+
+	if (active || context->error != 0) {
+		/* we're not last or there is already an error on the context,
+		 * let's exit. */
+		goto success;
+	}
+
+	/* Ok, we are last. Coalesce errors and signal completion. */
+	if (coalesce_errors(context) == STATUS_SUCCESS)
+		signal_end(context);
+
+success:
+	free(args);
+	return NULL;
+}
+
+static int launch_worker(struct happy_eyeballs_ctx *context,
+			 struct addrinfo *addr)
+{
+#ifdef _WIN32
+	SOCKET fd = WSASocket(addr->ai_family, SOCK_STREAM, IPPROTO_TCP, NULL,
+			 0, WSA_FLAG_OVERLAPPED);
+#else
+	SOCKET fd = socket(addr->ai_family, SOCK_STREAM, IPPROTO_TCP);
+#endif
+	if (fd == INVALID_SOCKET) {
+		context->error = GetSockError();
+		return STATUS_FAILURE;
+	}
+
+	pthread_mutex_lock(&context->candidate_mutex);
+
+	struct happy_eyeballs_candidate *candidate =
+		da_push_back_new(context->candidates);
+	candidate->sockfd = fd;
+	struct happy_connect_worker_args *args =
+		(struct happy_connect_worker_args *)malloc(
+			sizeof(struct happy_connect_worker_args));
+	if (args == NULL) {
+		context->error = ENOMEM;
+		context->error_message = "happy-eyeballs: Failed to allocate "
+					 "memory for worker context";
+		pthread_mutex_unlock(&context->candidate_mutex);
+		return STATUS_FAILURE;
+	}
+
+	int result = os_event_init(&candidate->socket_completed_event,
+				 OS_EVENT_TYPE_MANUAL);
+	if (result != 0) {
+		/* failure to create the socket completed event */
+		context->error = result;
+		context->error_message = "happy-eyeballs: Failed to initialize "
+					 "socket completed event";
+		free(args);
+		pthread_mutex_unlock(&context->candidate_mutex);
+		return STATUS_FAILURE;
+	}
+
+	args->sockfd = fd;
+	args->address = addr;
+	args->context = context;
+	args->candidate = candidate;
+	pthread_mutex_unlock(&context->candidate_mutex);
+
+	/* Launch worker thread; `args` ownership is passed to this thread */
+	result = pthread_create(&candidate->thread, NULL, happy_connect_worker,
+				args);
+	if (result != 0) {
+		/* failure to start the worker thread */
+		context->error = result;
+		context->error_message = strerror(result);
+		os_event_destroy(candidate->socket_completed_event);
+		free(args);
+		pthread_mutex_lock(&context->candidate_mutex);
+		da_erase_item(context->candidates, candidate);
+		pthread_mutex_unlock(&context->candidate_mutex);
+		return STATUS_FAILURE;
+	}
+
+	return STATUS_SUCCESS;
+}
+
+/* ------------------------------------------------------------------------- */
+/* Public functions */
+
+int happy_eyeballs_create(struct happy_eyeballs_ctx **context)
+{
+	if (context == NULL)
+		return STATUS_INVALID_ARGUMENT;
+
+	struct happy_eyeballs_ctx *ctx = (struct happy_eyeballs_ctx *)malloc(
+		sizeof(struct happy_eyeballs_ctx));
+
+	if (ctx == NULL)
+		return -ENOMEM;
+
+	memset(ctx, 0, sizeof(struct happy_eyeballs_ctx));
+
+	ctx->socket_fd = INVALID_SOCKET;
+	da_init(ctx->candidates);
+
+	/* race_completed_event will be signalled when there is a winner or all
+	 * attempts have failed */
+	int result =
+		os_event_init(&ctx->race_completed_event, OS_EVENT_TYPE_MANUAL);
+
+	/* this mutex is used to avoid the situation where we may have two
+	 * simultaneous winners and inconsistent values set to the context. */
+	if (result == 0)
+		result = pthread_mutex_init(&ctx->winner_mutex, NULL);
+	bool have_winner_mutex = result == 0;
+
+	/* this mutex is used to avoid the situation where we may be mutating
+	 * the candidate array while iterating it. */
+	if (result == 0)
+		result = pthread_mutex_init(&ctx->candidate_mutex, NULL);
+	bool have_candidate_mutex = result == 0;
+
+	if (result == 0) {
+		*context = ctx;
+		return STATUS_SUCCESS;
+	}
+
+	/* Failure, cleanup */
+	if (ctx->race_completed_event)
+		os_event_destroy((*context)->race_completed_event);
+
+	if (have_winner_mutex)
+		pthread_mutex_destroy(&(*context)->winner_mutex);
+
+	if (have_candidate_mutex)
+		pthread_mutex_destroy(&(*context)->candidate_mutex);
+
+	free(ctx);
+	*context = NULL;
+
+	/* Error codes from pthread_mutex_init are positive, os_event_init is
+	 * negative. We have promised to return negative error codes, so we are
+	 * making them all negative here. */
+	return -abs(result);
+}
+
+int happy_eyeballs_connect(struct happy_eyeballs_ctx *context,
+			 const char *hostname, int port)
+{
+	if (hostname == NULL || context == NULL || port == 0)
+		return STATUS_INVALID_ARGUMENT;
+
+	int result = check_comodo(context);
+	if (result == STATUS_SUCCESS)
+		result = build_addr_list(hostname, port, context);
+	if (result != STATUS_SUCCESS)
+		return result;
+
+	context->connection_time_start = os_gettime_ns();
+	int prev_family = 0;
+	struct addrinfo *next = context->addresses;
+	os_atomic_store_bool(&context->is_starting, true);
+
+	/* Exit the loop under the following conditions:
+	 * 1. We have reached the maximum allowed number of attempts
+	 * 2. There are no more candidates in the linked list (ie. `next` is
+	 * null)
+	 * 3. We have seen two candidates of the same family in a row, stop
+	 * happy eyeballs and let the previous attempt go it alone. */
+	for (int i = 0; i < HAPPY_EYEBALLS_MAX_ATTEMPTS && next &&
+			next->ai_family != prev_family;
+	 i++) {
+		/* Launch a worker thread for this address */
+		int result = launch_worker(context, next);
+		if (result != STATUS_SUCCESS)
+			return result;
+
+		/* Wait until the delay between attempts times out or we get
+		 * signalled... */
+		result = os_event_timedwait(context->race_completed_event,
+					 HAPPY_EYEBALLS_DELAY_MS);
+		if (result == 0) {
+			/* signalled. Break out of the loop. */
+			break;
+		} else if (result == EINVAL) {
+			/* we ran into an error. */
+			context->error = result;
+			context->error_message = "happy-eyeballs: Encountered "
+						 "error waiting for "
+						 "race_completed_event";
+			return STATUS_FAILURE;
+		}
+
+		/* timer timed out, move to the next candidate... */
+		prev_family = next->ai_family;
+		next = next->ai_next;
+	}
+
+	os_atomic_store_bool(&context->is_starting, false);
+
+	if (happy_eyeballs_try(context) == EAGAIN) {
+		int active_count = 0;
+		for (size_t i = 0; i < context->candidates.num; i++)
+			active_count +=
+				(os_event_try(
+					 context->candidates.arrayi
+						 .socket_completed_event) ==
+				 EAGAIN);
+		if (active_count == 0 &&
+		 coalesce_errors(context) == STATUS_SUCCESS)
+			signal_end(context);
+	}
+
+	return happy_eyeballs_try(context);
+}
+
+int happy_eyeballs_try(struct happy_eyeballs_ctx *context)
+{
+	int status = os_event_try(context->race_completed_event);
+
+	if (context->error != 0)
+		return STATUS_FAILURE;
+
+	if (status != 0 && status != EAGAIN) {
+		context->error = status;
+		context->error_message = strerror(status);
+		return STATUS_FAILURE;
+	}
+	return status;
+}
+
+int happy_eyeballs_timedwait_default(struct happy_eyeballs_ctx *context)
+{
+	return happy_eyeballs_timedwait(context,
+					HAPPY_EYEBALLS_CONNECTION_TIMEOUT_MS);
+}
+
+int happy_eyeballs_timedwait(struct happy_eyeballs_ctx *context,
+			 unsigned long time_in_millis)
+{
+	if (context == NULL)
+		return STATUS_INVALID_ARGUMENT;
+
+	int status = os_event_timedwait(context->race_completed_event,
+					time_in_millis);
+
+	if (context->error != 0)
+		return STATUS_FAILURE;
+
+	if (status != 0 && status != ETIMEDOUT) {
+		context->error = status;
+		return STATUS_FAILURE;
+	}
+	return status;
+}
+
+int happy_eyeballs_destroy(struct happy_eyeballs_ctx *context)
+{
+	if (context == NULL)
+		return STATUS_INVALID_ARGUMENT;
+
+#ifdef _WIN32
+#define SHUT_RDWR SD_BOTH
+#else
+#define closesocket(s) close(s)
+#endif
+	/* We do not need to lock context->candidate_mutex here because the
+	 * candidate array is _only_ mutated in happy_eyeballs_connect. Using
+	 * this function at the same time as connect is a programmer error.
+	 * Locking it here will cause a deadlock with join.
+	 *
+	 * Shutdown non-winning sockets (but keep the socket alive so that
+	 * things error out in threads) */
+	for (size_t i = 0; i < context->candidates.num; i++) {
+		if (context->candidates.arrayi.sockfd != INVALID_SOCKET &&
+		 context->candidates.arrayi.sockfd != context->socket_fd) {
+			shutdown(context->candidates.arrayi.sockfd,
+				 SHUT_RDWR);
+		}
+	}
+
+	/* Join threads */
+	for (size_t i = 0; i < context->candidates.num; i++) {
+		pthread_join(context->candidates.arrayi.thread, NULL);
+		os_event_destroy(
+			context->candidates.arrayi.socket_completed_event);
+	}
+
+	/* Close sockets */
+	for (size_t i = 0; i < context->candidates.num; i++) {
+		if (context->candidates.arrayi.sockfd != INVALID_SOCKET &&
+		 context->candidates.arrayi.sockfd != context->socket_fd) {
+			closesocket(context->candidates.arrayi.sockfd);
+		}
+	}
+
+	pthread_mutex_destroy(&context->winner_mutex);
+	pthread_mutex_destroy(&context->candidate_mutex);
+	os_event_destroy(context->race_completed_event);
+	if (context->addresses != NULL)
+		freeaddrinfo(context->addresses);
+
+	da_free(context->candidates);
+	free(context);
+	return STATUS_SUCCESS;
+}
+
+/* ------------------------------------------------------------------------- */
+/* Setters & Getters */
+
+int happy_eyeballs_set_bind_addr(struct happy_eyeballs_ctx *context,
+				 socklen_t addr_len,
+				 struct sockaddr_storage *addr_storage)
+{
+	if (!context)
+		return STATUS_INVALID_ARGUMENT;
+
+	if (addr_storage && addr_len > 0) {
+		memcpy(&context->bind_addr, addr_storage,
+		 sizeof(struct sockaddr_storage));
+		context->bind_addr_len = addr_len;
+	} else {
+		context->bind_addr_len = 0;
+		memset(&context->bind_addr, 0, sizeof(struct sockaddr_storage));
+	}
+	return STATUS_SUCCESS;
+}
+
+SOCKET happy_eyeballs_get_socket_fd(const struct happy_eyeballs_ctx *context)
+{
+	return context ? context->socket_fd : STATUS_INVALID_ARGUMENT;
+}
+
+int happy_eyeballs_get_remote_addr(const struct happy_eyeballs_ctx *context,
+				 struct sockaddr_storage *addr)
+{
+	if (!context || !addr)
+		return STATUS_INVALID_ARGUMENT;
+	if (context->winner_addr_len > 0)
+		memcpy(addr, &context->winner_addr, context->winner_addr_len);
+	return context->winner_addr_len;
+}
+
+int happy_eyeballs_get_error_code(const struct happy_eyeballs_ctx *context)
+{
+	return context ? context->error : STATUS_INVALID_ARGUMENT;
+}
+
+const char *
+happy_eyeballs_get_error_message(const struct happy_eyeballs_ctx *context)
+{
+	return context ? context->error_message : NULL;
+}
+
+uint64_t happy_eyeballs_get_name_resolution_time_ns(
+	const struct happy_eyeballs_ctx *context)
+{
+	return context ? context->name_resolution_time_ns : 0;
+}
+
+uint64_t
+happy_eyeballs_get_connection_time_ns(const struct happy_eyeballs_ctx *context)
+{
+	if (!context ||
+	 context->connection_time_start > context->connection_time_end)
+		return 0;
+
+	return context->connection_time_end - context->connection_time_start;
+}

obs-studio-30.0.2.tar.xz/deps/happy-eyeballs/happy-eyeballs.h Added

@@ -0,0 +1,191 @@
+/**
+ * An implementation of RFC 6555 (Happy Eyeballs) to connect to IPv6 hosts with
+ * IPv4 fast fallback. This implementation currently only works for TCP.
+ *
+ * More precisely this algorithm will attempt the configured preferred protocol
+ * family, followed by the other. So if the user has configured their operating
+ * system to prefer IPv4 it will attempt IPv4 first, followed by IPv6.
+ * Generally, though, the default is to prefer IPv6.
+ *
+ * Initial implementation by james hurley <jamesghurley@gmail.com>
+ */
+
+/**
+ * Copyright (c) 2023 Twitch Interactive, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <sys/socket.h>
+#include <unistd.h>
+#define SOCKET int
+#endif
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct happy_eyeballs_ctx;
+
+/**
+ * Create and initialize a Happy Eyeballs session. This context is expected to
+ * be accessed and mutated on a single thread. Accessing and mutating this
+ * context from multiple threads may lead to undefined behavior and deadlocks.
+ *
+ * On failure *context will always be NULL.
+ *
+ * You must call happy_eyeballs_destroy() to free any resources.
+ * This function will return 0 on success and *context will be non-NULL.
+ *
+ * -EINVAL if context is NULL
+ * -ENOMEM if there is an allocation failure.
+ * Another negative error code if there is a failure creating required
+ * resources.
+ */
+int happy_eyeballs_create(struct happy_eyeballs_ctx **context);
+
+/**
+ * Connect to a provided hostname and port. This function will block for up to
+ * 1.2 seconds. After this function returns with a success result (0), you need
+ * to check happy_eyeballs_try or happy_eyeballs_timedwait to determine if a
+ * connection has been established.
+ *
+ * Upon successfully starting the connection process and waiting for the
+ * initial delay timers, this function will return 0 if the connection has been
+ * successfully established, or EAGAIN if the caller should wait longer.
+ *
+ * This function will return -EINVAL if context, hostname, or port are not set.
+ */
+int happy_eyeballs_connect(struct happy_eyeballs_ctx *context,
+			 const char *hostname, int port);
+
+/**
+ * Optionally set the interface address. You may pass 0 and NULL for these
+ * parameters, respectively, to clear this setting. This must be called before
+ * happy_eyeballs_connect.
+ *
+ * Returns 0 on success or -EINVAL if context is not set.
+ */
+int happy_eyeballs_set_bind_addr(struct happy_eyeballs_ctx *context,
+				 socklen_t addr_len,
+				 struct sockaddr_storage *addr_storage);
+
+/**
+ * Returns a positive socket file descriptor if a winner is available.
+ *
+ * This function will only return a valid socket after happy_eyeballs_try or
+ * happy_eyeballs_timedwait has returned 0.
+ *
+ * Returns -1 if there is no socket available yet or -EINVAL if context is not
+ * set.
+ */
+SOCKET happy_eyeballs_get_socket_fd(const struct happy_eyeballs_ctx *context);
+
+/**
+ * Fills the addr struct with the winning socket address, if there is one.
+ *
+ * This function will only return a valid address after happy_eyeballs_try or
+ * happy_eyeballs_timedwait has returned 0.
+ *
+ * On success, returns the address length of the sockaddr or -EINVAL if context
+ * is not set.
+ */
+int happy_eyeballs_get_remote_addr(const struct happy_eyeballs_ctx *context,
+				 struct sockaddr_storage *addr);
+
+/**
+ * Returns the current error code for the context or -EINVAL if context is not
+ * set.
+ */
+int happy_eyeballs_get_error_code(const struct happy_eyeballs_ctx *context);
+
+/**
+ * Returns the current error message for the context. The returned value may be
+ * NULL if there is no error message.
+ */
+const char *
+happy_eyeballs_get_error_message(const struct happy_eyeballs_ctx *context);
+
+/**
+ * Returns the amount of time domain name resolution took, in nanoseconds
+ */
+uint64_t happy_eyeballs_get_name_resolution_time_ns(
+	const struct happy_eyeballs_ctx *context);
+
+/**
+ * Returns the amount of time connection (or failure) took, in nanoseconds, or
+ * 0 if happy eyeballs has not yet completed.
+ */
+uint64_t
+happy_eyeballs_get_connection_time_ns(const struct happy_eyeballs_ctx *context);
+
+/**
+ * Test if the process has completed without blocking. This function will
+ * return the following values:
+ *
+ * 0 on successful completion. You may use context.socket_fd.
+ *
+ * EAGAIN if the process is ongoing.
+ *
+ * -1 if some other error has occurred. Check happy_eyeballs_get_error_code and
+ * happy_eyeballs_get_error_message.
+ */
+int happy_eyeballs_try(struct happy_eyeballs_ctx *context);
+
+/**
+ * Block until the process has completed.
+ *
+ * This function will return the following values:
+ *
+ * 0 on successful completion. You may use context.socket_fd
+ *
+ * -1 on failure. Check happy_eyeballs_get_error_code and
+ * happy_eyeballs_get_error_message for more details.
+ *
+ * ETIMEDOUT on timeout. It is unlikely that context.socket_fd is set. You may
+ * continue to wait by calling this function again, or call
+ * happy_eyeballs_destroy to close the session.
+ */
+int happy_eyeballs_timedwait(struct happy_eyeballs_ctx *context,
+			 unsigned long time_in_millis);
+
+/**
+ * Call timedwait with a default wait duration of 25 seconds.
+ */
+int happy_eyeballs_timedwait_default(struct happy_eyeballs_ctx *context);
+
+/**
+ * Releases any resources claimed. Accessing context after calling this
+ * function will be a use-after-free error.
+ *
+ * This function will not close the socket specified in context->socket_fd. You
+ * must close that yourself!
+ */
+int happy_eyeballs_destroy(struct happy_eyeballs_ctx *context);
+
+#ifdef __cplusplus
+}
+#endif

obs-studio-29.1.3.tar.xz/deps/ipc-util/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/ipc-util/CMakeLists.txt Changed

@@ -1,20 +1,14 @@
-project(ipc-util)
+cmake_minimum_required(VERSION 3.24...3.25)
 
-add_library(ipc-util STATIC)
+# cmake-format: off
+add_library(ipc-util STATIC EXCLUDE_FROM_ALL)
+# cmake-format: on
 add_library(OBS::ipc-util ALIAS ipc-util)
 
 target_sources(ipc-util PRIVATE ipc-util/pipe.h)
+target_include_directories(ipc-util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 
-set_target_properties(ipc-util PROPERTIES FOLDER "deps" POSITION_INDEPENDENT_CODE ON)
+target_sources(ipc-util PRIVATE ipc-util/pipe-windows.c ipc-util/pipe-windows.h)
+target_compile_options(ipc-util PRIVATE $<IF:$<CONFIG:Debug>,/MTd,/MT> /Zl)
 
-target_include_directories(ipc-util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-if(OS_WINDOWS)
- if(MSVC)
- target_compile_options(ipc-util PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>" /Zl)
- endif()
-
- target_sources(ipc-util PRIVATE ipc-util/pipe-windows.c ipc-util/pipe-windows.h)
-else()
- target_sources(ipc-util PRIVATE ipc-util/pipe-posix.c ipc-util/pipe-posic.h)
-endif()
+set_target_properties(ipc-util PROPERTIES FOLDER deps POSITION_INDEPENDENT_CODE ON)

obs-studio-29.1.3.tar.xz/deps/ipc-util/ipc-util/pipe-posix.c -> obs-studio-30.0.2.tar.xz/deps/ipc-util/ipc-util/pipe-posix.c Changed

obs-studio-29.1.3.tar.xz/deps/ipc-util/ipc-util/pipe-posix.h -> obs-studio-30.0.2.tar.xz/deps/ipc-util/ipc-util/pipe-posix.h Changed

obs-studio-29.1.3.tar.xz/deps/ipc-util/ipc-util/pipe-windows.c -> obs-studio-30.0.2.tar.xz/deps/ipc-util/ipc-util/pipe-windows.c Changed

obs-studio-29.1.3.tar.xz/deps/ipc-util/ipc-util/pipe-windows.h -> obs-studio-30.0.2.tar.xz/deps/ipc-util/ipc-util/pipe-windows.h Changed

obs-studio-29.1.3.tar.xz/deps/ipc-util/ipc-util/pipe.h -> obs-studio-30.0.2.tar.xz/deps/ipc-util/ipc-util/pipe.h Changed

obs-studio-29.1.3.tar.xz/deps/json11/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/json11/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/libcaption/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/libcaption/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/media-playback/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/deps/media-playback/LICENSE.media-playback Added

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/cache.c -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/cache.c Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/cache.h -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/cache.h Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/closest-format.h -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/closest-format.h Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/decode.c -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/decode.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -20,11 +20,6 @@
 #include "media.h"
 #include <libavutil/mastering_display_metadata.h>
 
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(58, 4, 100)
-#define USE_NEW_HARDWARE_CODEC_METHOD
-#endif
-
-#ifdef USE_NEW_HARDWARE_CODEC_METHOD
 enum AVHWDeviceType hw_priority = {
 	AV_HWDEVICE_TYPE_D3D11VA, AV_HWDEVICE_TYPE_DXVA2,
 	AV_HWDEVICE_TYPE_CUDA, AV_HWDEVICE_TYPE_VAAPI,
@@ -74,14 +69,12 @@
 		d->hw = true;
 	}
 }
-#endif
 
 static int mp_open_codec(struct mp_decode *d, bool hw)
 {
 	AVCodecContext *c;
 	int ret;
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
 	c = avcodec_alloc_context3(d->codec);
 	if (!c) {
 		blog(LOG_WARNING, "MP: Failed to allocate context");
@@ -91,18 +84,11 @@
 	ret = avcodec_parameters_to_context(c, d->stream->codecpar);
 	if (ret < 0)
 		goto fail;
-#else
-	c = d->stream->codec;
-#endif
 
 	d->hw = false;
 
-#ifdef USE_NEW_HARDWARE_CODEC_METHOD
 	if (hw)
 		init_hw_decoder(d, c);
-#else
-	UNUSED_PARAMETER(hw);
-#endif
 
 	if (c->thread_count == 1 && c->codec_id != AV_CODEC_ID_PNG &&
 	 c->codec_id != AV_CODEC_ID_TIFF &&
@@ -172,12 +158,7 @@
 	if (ret < 0)
 		return false;
 	stream = d->stream = m->fmt->streamsret;
-
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
 	id = stream->codecpar->codec_id;
-#else
-	id = stream->codec->codec_id;
-#endif
 
 	if (type == AVMEDIA_TYPE_VIDEO)
 		d->max_luminance = get_max_luminance(stream);
@@ -278,11 +259,9 @@
 		av_free(d->sw_frame);
 	}
 
-#ifdef USE_NEW_HARDWARE_CODEC_METHOD
 	if (d->hw_ctx) {
 		av_buffer_unref(&d->hw_ctx);
 	}
-#endif
 
 	memset(d, 0, sizeof(*d));
 }
@@ -346,7 +325,6 @@
 		*got_frame = 1;
 	}
 
-#ifdef USE_NEW_HARDWARE_CODEC_METHOD
 	if (*got_frame && d->hw) {
 		if (d->hw_frame->format != d->hw_format) {
 			d->frame = d->hw_frame;
@@ -365,7 +343,6 @@
 			d->sw_frame->colorspace = d->hw_frame->colorspace;
 		}
 	}
-#endif
 
 	d->frame = d->sw_frame;
 	return ret;

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/decode.h -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/decode.h Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/media-playback.c -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/media-playback.c Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/media-playback.h -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/media-playback.h Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/media.c -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/media.c Changed

obs-studio-29.1.3.tar.xz/deps/media-playback/media-playback/media.h -> obs-studio-30.0.2.tar.xz/deps/media-playback/media-playback/media.h Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-callback.h -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-callback.h Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-internal.h -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-internal.h Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-logging.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-logging.c Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-lua-frontend.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-lua-frontend.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2017 by Hugh Bailey <jim@obsproject.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -297,37 +297,58 @@
 
 /* ----------------------------------- */
 
+typedef struct lua_function_tuple {
+	const char *name;
+	lua_CFunction function;
+} obs_frontend_func;
+
+static const obs_frontend_func functions = {
+	{.name = "obs_frontend_get_scene_names", .function = get_scene_names},
+	{.name = "obs_frontend_get_scenes", .function = get_scenes},
+	{.name = "obs_frontend_get_current_scene",
+	 .function = get_current_scene},
+	{.name = "obs_frontend_set_current_scene",
+	 .function = set_current_scene},
+	{.name = "obs_frontend_get_transitions", .function = get_transitions},
+	{.name = "obs_frontend_get_current_transition",
+	 .function = get_current_transition},
+	{.name = "obs_frontend_set_current_transition",
+	 .function = set_current_transition},
+	{.name = "obs_frontend_get_transition_duration",
+	 .function = get_transition_duration},
+	{.name = "obs_frontend_set_transition_duration",
+	 .function = set_transition_duration},
+	{.name = "obs_frontend_get_scene_collections",
+	 .function = get_scene_collections},
+	{.name = "obs_frontend_get_current_scene_collection",
+	 .function = get_current_scene_collection},
+	{.name = "obs_frontend_set_current_scene_collection",
+	 .function = set_current_scene_collection},
+	{.name = "obs_frontend_get_profiles", .function = get_profiles},
+	{.name = "obs_frontend_get_current_profile",
+	 .function = get_current_profile},
+	{.name = "obs_frontend_set_current_profile",
+	 .function = set_current_profile},
+	{.name = "obs_frontend_remove_event_callback",
+	 .function = remove_event_callback},
+	{.name = "obs_frontend_add_event_callback",
+	 .function = add_event_callback},
+	{.name = "obs_frontend_remove_save_callback",
+	 .function = remove_save_callback},
+	{.name = "obs_frontend_add_save_callback",
+	 .function = add_save_callback},
+};
+
 void add_lua_frontend_funcs(lua_State *script)
 {
 	lua_getglobal(script, "obslua");
 
-#define add_func(name) \
-	do { \
-		lua_pushstring(script, "obs_frontend_" #name); \
-		lua_pushcfunction(script, name); \
-		lua_rawset(script, -3); \
-	} while (false)
-
-	add_func(get_scene_names);
-	add_func(get_scenes);
-	add_func(get_current_scene);
-	add_func(set_current_scene);
-	add_func(get_transitions);
-	add_func(get_current_transition);
-	add_func(set_current_transition);
-	add_func(get_transition_duration);
-	add_func(set_transition_duration);
-	add_func(get_scene_collections);
-	add_func(get_current_scene_collection);
-	add_func(set_current_scene_collection);
-	add_func(get_profiles);
-	add_func(get_current_profile);
-	add_func(set_current_profile);
-	add_func(remove_event_callback);
-	add_func(add_event_callback);
-	add_func(remove_save_callback);
-	add_func(add_save_callback);
-#undef add_func
+	size_t num_items = OBS_COUNTOF(functions);
 
+	for (size_t i = 0; i < num_items; i++) {
+		lua_pushstring(script, functionsi.name);
+		lua_pushcfunction(script, functionsi.function);
+		lua_rawset(script, -3);
+	}
 	lua_pop(script, 1);
 }

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-lua-source.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-lua-source.c Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-lua.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-lua.c Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-lua.h -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-lua.h Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-python-frontend.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-python-frontend.c Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-python-import.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-python-import.c Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-python-import.h -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-python-import.h Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-python.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-python.c Changed

@@ -1,6 +1,6 @@
 /******************************************************************************
 Copyright (C) 2015 by Andrew Skinner <obs@theandyroid.com>
- Copyright (C) 2017 by Hugh Bailey <jim@obsproject.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -499,7 +499,7 @@
 
 	if (!script) {
 		PyErr_SetString(PyExc_RuntimeError,
-				"No active script, report this to Jim");
+				"No active script, report this to Lain");
 		return NULL;
 	}
 
@@ -524,7 +524,7 @@
 
 	if (!script) {
 		PyErr_SetString(PyExc_RuntimeError,
-				"No active script, report this to Jim");
+				"No active script, report this to Lain");
 		return NULL;
 	}
 
@@ -577,7 +577,7 @@
 
 	if (!script) {
 		PyErr_SetString(PyExc_RuntimeError,
-				"No active script, report this to Jim");
+				"No active script, report this to Lain");
 		return NULL;
 	}
 
@@ -623,7 +623,7 @@
 
 	if (!script) {
 		PyErr_SetString(PyExc_RuntimeError,
-				"No active script, report this to Jim");
+				"No active script, report this to Lain");
 		return NULL;
 	}
 
@@ -682,7 +682,7 @@
 
 	if (!script) {
 		PyErr_SetString(PyExc_RuntimeError,
-				"No active script, report this to Jim");
+				"No active script, report this to Lain");
 		return NULL;
 	}
 
@@ -724,7 +724,7 @@
 
 	if (!script) {
 		PyErr_SetString(PyExc_RuntimeError,
-				"No active script, report this to Jim");
+				"No active script, report this to Lain");
 		return NULL;
 	}
 
@@ -822,7 +822,7 @@
 
 	if (!script) {
 		PyErr_SetString(PyExc_RuntimeError,
-				"No active script, report this to Jim");
+				"No active script, report this to Lain");
 		return NULL;
 	}
 
@@ -1706,6 +1706,11 @@
 	PySys_SetArgv(argc, argv);
 	PRAGMA_WARN_POP
 
+#ifdef __APPLE__
+	PyRun_SimpleString("import sys");
+	PyRun_SimpleString("sys.dont_write_bytecode = True");
+#endif
+
 #ifdef DEBUG_PYTHON_STARTUP
 	/* ---------------------------------------------- */
 	/* Debug logging to file if startup is failing */

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting-python.h -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting-python.h Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting.c -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting.c Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obs-scripting.h -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obs-scripting.h Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obslua/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obslua/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obslua/obslua.i -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obslua/obslua.i Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obspython/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obspython/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/obs-scripting/obspython/obspython.i -> obs-studio-30.0.2.tar.xz/deps/obs-scripting/obspython/obspython.i Changed

obs-studio-29.1.3.tar.xz/deps/opts-parser/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/opts-parser/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/deps/uthash/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/deps/uthash/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/conf.py -> obs-studio-30.0.2.tar.xz/docs/sphinx/conf.py Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-core.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-core.rst Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-frontend-api.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-frontend-api.rst Changed

@@ -129,7 +129,10 @@
 
    - **OBS_FRONTEND_EVENT_EXIT**
 
-     Triggered when the program is about to exit.
+     Triggered when the program is about to exit. This is the last chance
+     to call any frontend API functions for any saving / cleanup / etc.
+     After returning from this event callback, it is not permitted to make
+     any further frontend API calls.
 
    - **OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTING**
 
@@ -361,7 +364,7 @@
 
 .. function:: void obs_frontend_set_current_scene_collection(const char *collection)
 
-   :param profile: Name of the scene collection to activate
+   :param collection: Name of the scene collection to activate
 
 ---------------------------------------
 
@@ -447,6 +450,48 @@
    :param dock: QDockWidget to add/create
    :return: A pointer to the added QAction
 
+.. deprecated:: 30.0
+   Prefer :c:func:`obs_frontend_add_dock_by_id()` or
+   :c:func:`obs_frontend_add_custom_qdock()` instead.
+
+---------------------------------------
+
+.. function:: bool obs_frontend_add_dock_by_id(const char *id, const char *title, void *widget)
+
+   Adds a dock with the widget to the UI with a toggle in the Docks
+   menu.
+
+   Note: Use :c:func:`obs_frontend_remove_dock` to remove the dock
+         and the id from the UI.
+
+   :param id: Unique identifier of the dock
+   :param title: Window title of the dock
+   :param widget: QWidget to insert in the dock
+   :return: *true* if the dock was added, *false* if the id was already
+            used
+
+---------------------------------------
+
+.. function:: void obs_frontend_remove_dock(const char *id)
+
+   Removes the dock with this id from the UI.
+
+   :param id: Unique identifier of the dock to remove.
+
+---------------------------------------
+
+.. function:: bool obs_frontend_add_custom_qdock(const char *id, void *dock)
+
+   Adds a custom dock to the UI with no toggle.
+
+   Note: Use :c:func:`obs_frontend_remove_dock` to remove the dock
+         reference and id from the UI.
+
+   :param id: Unique identifier of the dock
+   :param dock: QDockWidget to add
+   :return: *true* if the dock was added, *false* if the id was already
+            used
+
 ---------------------------------------
 
 .. function:: void obs_frontend_add_event_callback(obs_frontend_event_cb callback, void *private_data)
@@ -806,6 +851,8 @@
 
    :param item: The sceneitem to open the edit transform window of
 
+   .. versionadded:: 29.1
+
 ---------------------------------------
 
 .. function:: char *obs_frontend_get_current_record_output_path(void)
@@ -864,3 +911,5 @@
    :param redo_data: String with data for the redo callback
    :param repeatable: Allow multiple actions with the same name to be merged to 1 undo redo action.
                       This uses the undo action from the first and the redo action from the last action.
+
+   .. versionadded:: 29.1

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-libobs-graphics-math.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-libobs-graphics-math.rst Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-libobs-media-io.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-libobs-media-io.rst Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-libobs-util-darray.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-libobs-util-darray.rst Changed

@@ -11,7 +11,7 @@
 
 The base dynamic array structure.
 
-.. :c:macro:: DARRAY(type)
+.. macro:: DARRAY(type)
 
 Macro for a dynamic array based upon an actual type. Use this with
 da_* macros.
@@ -50,6 +50,42 @@
 /* free when complete */
 da_free(array_of_integers);
 
+To pass dynamic arrays to functions as parameters, create a typedef with the
+:c:macro:`DARRAY` macro and type so you can pass the dynamic array with a
+reference (&) operator. An alternative is to define a struct that will contain
+the dynamic array, and that struct will be passed to the functions, instead of
+the dynamic array directly. An example with the typedef method:
+
+.. code:: cpp
+
+ typedef DARRAY(int) int_array_t;
+
+ void generate_integers(int_array_t *integers, int start, int end)
+ {
+ for (int i = start; i < end; i++)
+ da_push_back(*integers, &i);
+ }
+
+ ...
+
+ int_array_t array_of_integers;
+ da_init(array_of_integers);
+
+ generate_integers(&array_of_integers, 0, 10);
+
+ /* free when complete */
+ da_free(array_of_integers);
+
+**IMPORTANT NOTE:** While it is also possible to accept the internal
+:c:struct:`darray` struct as a function parameter (via the ``da`` member
+variable of dynamic arrays) and redefine a variable with :c:macro:`DARRAY`
+inside the function, doing so is not safe and not recommended. One potential
+issue with it is having a type declaration in the function that is different
+than the type of the actual dynamic array that will be passed to the function,
+which will cause memory access issues that will not be caught by the compiler.
+As mentioned above, the recommended way is to create a typedef or a container
+struct, which will be safer in usage.
+
 .. function:: void da_init(da)
 
 Initializes a dynamic array.
@@ -144,12 +180,13 @@
 
 ---------------------
 
-.. function:: void da_push_back(da, const void *data)
+.. function:: size_t da_push_back(da, const void *data)
 
 Pushes data to the back of the array.
 
 :param da: The dynamic array
 :param data: Pointer to the new data to push
+ :return: Index of the new value
 
 ---------------------
 
@@ -163,13 +200,14 @@
 
 ---------------------
 
-.. function:: void da_push_back_array(da, const void *src_array, size_t item_count)
+.. function:: size_t da_push_back_array(da, const void *src_array, size_t item_count)
 
 Pushes an array of values to the back of the array.
 
 :param da: The dynamic array
 :param src_array: Pointer of the array of values
 :param item_count: Number of items to push back
+ :return: Index of the first new value
 
 ---------------------

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-libobs-util-dstr.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-libobs-util-dstr.rst Changed

@@ -87,8 +87,31 @@
 
 .. function:: char **strlist_split(const char *str, char split_ch, bool include_empty)
 
-   Splits a string in to a list of multiple sub-strings.  Free with
-   :c:func:`strlist_free()`.
+   Splits a string in to a list of multiple sub-strings, terminated by
+   ``NULL``. If ``split_ch`` does not exist in the string, the first
+   sub-string will be the same as ``str``. Free with :c:func:`strlist_free()`.
+
+   :param str: The string to be split
+   :param split_ch: The delimiter
+   :param include_empty: If *true*, empty strings caused by having the
+                         ``split_ch`` right next to another will be
+                         included in the list. If *false*, they won't
+                         be included.
+
+   Sample usage:
+
+   .. code:: cpp
+
+      char **words = strlist_split("OBS    Studio", ' ', false);
+      int count = 0;
+
+      for (char **word = words; *word; ++word) {
+              count++;
+              blog(LOG_DEBUG, "%s", *word);
+      }
+
+      strlist_free(words);
+      // count == 2
 
 ----------------------

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-libobs-util-platform.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-libobs-util-platform.rst Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-modules.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-modules.rst Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-outputs.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-outputs.rst Changed

@@ -244,6 +244,8 @@
 
    Required only if **OBS_OUTPUT_SERVICE** flag is set.
 
+   .. versionadded:: 29.1
+
 .. _output_signal_handler_reference:
 
 Output Signals
@@ -681,11 +683,15 @@
 .. function:: const char *obs_output_get_supported_video_codecs(const obs_output_t *output)
               const char *obs_get_output_supported_video_codecs(const char *id)
               const char *obs_output_get_supported_audio_codecs(const obs_output_t *output)
-              const char *obs_get_output_supported_video_codecs(const char *id)
+              const char *obs_get_output_supported_audio_codecs(const char *id)
 
    :return: Supported video/audio codecs of an encoded output, separated
             by semicolon
 
+   .. versionadded:: 29.1
+      :c:func:`obs_get_output_supported_video_codecs` and
+      :c:func:`obs_get_output_supported_audio_codecs`
+
 ---------------------
 
 .. function:: uint32_t obs_output_get_flags(const obs_output_t *output)
@@ -700,6 +706,8 @@
    :return: Supported protocols, separated by semicolon. Always NULL if the
             output is not **OBS_OUTPUT_SERVICE**.
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: bool obs_is_output_protocol_registered(const char *protocol)
@@ -709,12 +717,16 @@
    :return:                 A boolean showing if an output with the given
                             protocol is registered
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: bool obs_enum_output_protocols(size_t idx, char **protocol)
 
    Enumerates all registered protocol.
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: void obs_enum_output_types_with_protocol(const char *protocol, void *data, bool (*enum_cb)(void *data, const char *id))
@@ -727,6 +739,8 @@
                     of the output is passed to the callback
    :return:         When all outputs are enumerated or if the callback return *false*
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 Functions used by outputs
@@ -746,6 +760,9 @@
    Optionally sets/gets the video conversion information.  Only used by
    raw outputs.
 
+   .. versionadded:: 29.1
+     :c:func:`obs_output_get_video_conversion`
+
    Relevant data types used with this function:
 
 .. code:: cpp
@@ -810,6 +827,9 @@
 
            /* packed 4:2:2 format, 10 bpp */
            VIDEO_FORMAT_V210,
+
+           /* packed uncompressed 10-bit format */
+           VIDEO_FORMAT_R10L,
    };
 
    enum video_colorspace {
@@ -882,44 +902,41 @@
 
 ---------------------
 
-.. function:: bool obs_output_can_begin_data_capture(const obs_output_t *output, uint32_t flags)
+.. function:: bool obs_output_can_begin_data_capture(const obs_output_t *output, int flags)
 
    Determines whether video/audio capture (encoded or raw) is able to
-   start.  Call this before initializing any output data to ensure that
+   start.  Call this before initializing any output state to ensure that
    the output can start.
 
-   :param flags: Set to 0 to initialize both audio/video, otherwise a
-                 bitwise OR combination of OBS_OUTPUT_VIDEO and/or
-                 OBS_OUTPUT_AUDIO
+   :param output: The output
+   :param flags: Reserved. Set this to 0.
    :return:      *true* if data capture can begin
 
 ---------------------
 
-.. function:: bool obs_output_initialize_encoders(obs_output_t *output, uint32_t flags)
+.. function:: bool obs_output_initialize_encoders(obs_output_t *output, int flags)
 
    Initializes any encoders/services associated with the output.  This
    must be called for encoded outputs before calling
    :c:func:`obs_output_begin_data_capture()`.
 
-   :param flags: Set to 0 to initialize both audio/video, otherwise a
-                 bitwise OR combination of OBS_OUTPUT_VIDEO and/or
-                 OBS_OUTPUT_AUDIO
+   :param output: The output
+   :param flags: Reserved. Set this to 0.
    :return:      *true* if successful, *false* otherwise
 
 ---------------------
 
-.. function:: bool obs_output_begin_data_capture(obs_output_t *output, uint32_t flags)
+.. function:: bool obs_output_begin_data_capture(obs_output_t *output, int flags)
 
    Begins data capture from raw media or encoders.  This is typically
    when the output actually activates (starts) internally.  Video/audio
    data will start being sent to the callbacks of the output.
 
-   :param flags: Set to 0 to initialize both audio/video, otherwise a
-                 bitwise OR combination of OBS_OUTPUT_VIDEO and/or
-                 OBS_OUTPUT_AUDIO
+   :param output: The output
+   :param flags: Reserved. Set this to 0.
    :return:      *true* if successful, *false* otherwise.  Typically the
                  return value does not need to be checked if
-                 :c:func:`obs_output_can_begin_data_capture()` was
+                 :c:func:`obs_output_can_begin_data_capture2()` was
                  called
 
 ---------------------

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-properties.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-properties.rst Changed

@@ -51,9 +51,7 @@
                  - OBS_PROPERTIES_DEFER_UPDATE - A hint that tells the
                    front-end to defers updating the settings until the
                    user has finished editing all properties rather than
-                   immediately updating any settings. Currently only
-                   works for properties of input and transition sources,
-                   this flag is a no-op for other properties at this time.
+                   immediately updating any settings
 
 ---------------------
 
@@ -196,7 +194,8 @@
 
                           - **OBS_COMBO_TYPE_EDITABLE** - Can be edited.
                             Only used with string lists.
-                          - **OBS_COMBO_TYPE_LIST** - Not editable.
+                          - **OBS_COMBO_TYPE_LIST** - Not editable. Displayed as combo box.
+                          - **OBS_COMBO_TYPE_RADIO** - Not editable. Displayed as radio buttons.
 
    :param    format:      Can be one of the following values:
 
@@ -204,6 +203,7 @@
                           - **OBS_COMBO_FORMAT_FLOAT** - Floating point
                             list
                           - **OBS_COMBO_FORMAT_STRING** - String list
+                          - **OBS_COMBO_FORMAT_BOOL** - Boolean list
 
    :return:               The property
 
@@ -243,13 +243,16 @@
 ---------------------
 
 .. function:: obs_property_t *obs_properties_add_button(obs_properties_t *props, const char *name, const char *text, obs_property_clicked_t callback)
+              obs_property_t *obs_properties_add_button2(obs_properties_t *props, const char *name, const char *text, obs_property_clicked_t callback, void *priv)
 
    Adds a button property.  This property does not actually store any
    settings; it's used to implement a button in user interface if the
    properties are used to generate user interface.
 
    :param    name:        Setting identifier string
-   :param    description: Localized name shown to user
+   :param    text:        Localized name shown to user
+   :param    callback:    Callback to be executed when the button is pressed
+   :param    priv:        Pointer passed back as the `data` argument of the callback
    :return:               The property
 
    Important Related Functions:

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-scenes.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-scenes.rst Changed

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-services.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-services.rst Changed

@@ -157,10 +157,14 @@
             the data manually (typically best to use strlist_split to
             generate this)
 
+   .. versionadded:: 29.1
+
 .. member:: const char *(*obs_service_info.get_protocol)(void *data)
 
    :return: The protocol used by the service
 
+   .. versionadded:: 29.1
+
 .. member:: const char *(*obs_service_info.get_connect_info)(void *data, uint32_t type)
 
    Output a service connection info related to a given type value:
@@ -184,6 +188,8 @@
 
    Irrelevant or unused types can return `NULL`.
 
+   .. versionadded:: 29.1
+
 .. member:: bool (*obs_service_info.can_try_to_connect)(void *data)
 
    (Optional)
@@ -194,6 +200,8 @@
    NOTE: If not set, :c:func:`obs_service_can_try_to_connect()`
    returns *true* by default.
 
+   .. versionadded:: 29.1
+
 General Service Functions
 -------------------------
 
@@ -370,18 +378,24 @@
             codecs for the service, terminated with a *NULL* pointer.
             Does not need to be freed
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: const char *obs_service_get_protocol(const obs_service_t *service)
 
    :return: Protocol currently used for this service
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: const char *obs_service_get_preferred_output_type(const obs_service_t *service)
 
    :return: The output type that should be preferred with this service
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: const char *obs_service_get_connect_info(const obs_service_t *service, uint32_t type)
@@ -390,6 +404,8 @@
                 type values.
    :return: Connection info related to the type value.
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: bool obs_service_can_try_to_connect(const obs_service_t *service)
@@ -398,6 +414,8 @@
             able to connect. Returns `true` if
             :c:member:`obs_service_info.can_try_to_connect` is not set.
 
+   .. versionadded:: 29.1
+
 .. ---------------------------------------------------------------------------
 
 .. _libobs/obs-service.h: https://github.com/obsproject/obs-studio/blob/master/libobs/obs-service.h

obs-studio-29.1.3.tar.xz/docs/sphinx/reference-sources.rst -> obs-studio-30.0.2.tar.xz/docs/sphinx/reference-sources.rst Changed

@@ -410,6 +410,15 @@
    :param event:       Key event properties
    :param focus:       Key event type (true if mouse-up)
 
+.. member:: void (*obs_source_info.filter_add)(void *data, obs_source_t *source)
+
+   Called when the filter is added to a source.
+
+   (Optional)
+
+   :param  data:   Filter data
+   :param  source: Source that the filter is being added to
+
 .. member:: void (*obs_source_info.filter_remove)(void *data, obs_source_t *source)
 
    Called when the filter is removed from a source.
@@ -535,8 +544,10 @@
 
 .. _source_signal_handler_reference:
 
-Source Signals
---------------
+Common Source Signals
+---------------------
+
+The following signals are defined for every source type:
 
 **destroy** (ptr *source*)
 
@@ -616,7 +627,11 @@
 
 **update_properties** (ptr source)
 
-   Called when the properties of the source have been updated.
+   Called to signal to any properties view (or other users of the source's
+   obs_properties_t) that the presentable properties of the source have changed
+   and should be re-queried via obs_source_properties.
+   Does not mean that the source's *settings* (as configured by the user) have
+   changed. For that, use the `update` signal instead.
 
 **update_flags** (ptr source, int flags)
 
@@ -658,38 +673,162 @@
 
    Called when a transition has stopped.
 
-**media_started**
+**media_started** (ptr source)
 
    Called when media has started.
 
-**media_ended**
+**media_ended** (ptr source)
 
    Called when media has ended.
 
-**media_pause**
+**media_pause** (ptr source)
 
    Called when media has been paused.
 
-**media_play**
+**media_play** (ptr source)
 
    Called when media starts playing.
 
-**media_restart**
+**media_restart** (ptr source)
 
    Called when the playing of media has been restarted.
 
-**media_stopped**
+**media_stopped** (ptr source)
 
    Called when the playing of media has been stopped.
 
-**media_next**
+**media_next** (ptr source)
 
    Called when the media source switches to the next media.
 
-**media_previous**
+**media_previous** (ptr source)
 
    Called when the media source switches to the previous media.
 
+
+Source-specific Signals
+-----------------------
+
+The following signals are defined for specific sources only:
+
+**slide_changed** (int index, string path)
+
+   Called when the source's currently displayed image changes.
+
+   :Defined by: - Image Slide Show
+
+-----------------------
+
+**hooked** (ptr source, string title, string class, string executable)
+
+   Called when the source successfully captures an existing window.
+
+   :Defined by: - Window Capture (Windows)
+                - Game Capture (Windows)
+                - Application Audio Output Capture (Windows)
+
+-----------------------
+
+**hooked** (ptr source, string name, string class)
+
+   Called when the source successfully captures an existing window.
+
+   :Defined by: - Window Capture (Xcomposite)
+
+-----------------------
+
+**unhooked** (ptr source)
+
+   Called when the source stops capturing.
+
+   :Defined by: - Window Capture (Windows)
+                - Game Capture (Windows)
+                - Application Audio Output Capture (Windows)
+                - Window Capture (Xcomposite)
+
+-----------------------
+
+
+Source-specific Procedures
+--------------------------
+
+The following procedures are defined for specific sources only:
+
+**current_index** (out int current_index)
+
+   Returns the index of the currently displayed image in the slideshow.
+
+   :Defined by: - Image Slide Show
+
+-----------------------
+
+**total_files** (out int total_files)
+
+   Returns the total number of image files in the slideshow.
+
+   :Defined by: - Image Slide Show
+
+-----------------------
+
+**get_hooked** (out bool hooked, out string title, out string class, out string executable)
+
+   Returns whether the source is currently capturing a window and if yes, which.
+
+   :Defined by: - Window Capture (Windows)
+                - Game Capture (Windows)
+                - Application audio output capture (Windows)
+
+-----------------------
+
+**get_hooked** (out bool hooked, out string name, out string class)
+
+   Returns whether the source is currently capturing a window and if yes, which.
+
+   :Defined by: - Window Capture (Xcomposite)
+
+-----------------------
+
+**get_metadata** (in string tag_id, out string tag_data)
+
+   For a given metadata tag, returns the data associated with it.
+
+   :Defined by: - VLC Video Source
+
+-----------------------
+
+**restart** ()
+
+   Restarts the media.
+
+   :Defined by: - Media Source
+
+-----------------------
+
+**get_duration** (out int duration)
+
+   Returns the total duration of the media file, in nanoseconds.
+
+   :Defined by: - Media Source
+
+-----------------------
+
+**get_nb_frames** (out int num_frames)
+
+   Returns the total number of frames in the media file.
+
+   :Defined by: - Media Source
+
+-----------------------
+
+**activate** (in bool active)
+
+   Activates or deactivates the device.
+
+   :Defined by: - Video Capture Device Source (Windows)
+
+-----------------------
+
+
 General Source Functions
 ------------------------
 
@@ -950,6 +1089,8 @@
 
    :return: The UUID of the source
 
+   .. versionadded:: 29.1
+
 ---------------------
 
 .. function:: void obs_source_set_name(obs_source_t *source, const char *name)
@@ -1455,6 +1596,9 @@
 
            /* packed 4:2:2 format, 10 bpp */
            VIDEO_FORMAT_V210,
+
+           /* packed uncompressed 10-bit format */
+           VIDEO_FORMAT_R10L,
    };
 
    struct obs_source_frame {
@@ -1506,7 +1650,9 @@
 
 .. function:: void obs_source_update_properties(obs_source_t *source)
 
-   Signal an update to any currently used properties.
+   Signals to any currently opened properties views (or other users of the
+   source's obs_properties_t) that the source's presentable properties have
+   changed and that the view should be updated.
 
 ---------------------
 
@@ -1535,17 +1681,19 @@
 .. function:: obs_source_t *obs_filter_get_parent(const obs_source_t *filter)
 
    If the source is a filter, returns the parent source of the filter.
-   The parent source is the source being filtered.
+   The parent source is the source being filtered. Does not increment the
+   reference.
 
    Only guaranteed to be valid inside of the video_render, filter_audio,
-   filter_video, and filter_remove callbacks.
+   filter_video, filter_add, and filter_remove callbacks.
 
 ---------------------
 
 .. function:: obs_source_t *obs_filter_get_target(const obs_source_t *filter)
 
    If the source is a filter, returns the target source of the filter.
-   The target source is the next source in the filter chain.
+   The target source is the next source in the filter chain. Does not increment
+   the reference.
 
    Only guaranteed to be valid inside of the video_render, filter_audio,
    filter_video, and filter_remove callbacks.
@@ -1578,6 +1726,23 @@
 
 ---------------------
 
+.. function:: void obs_source_filter_set_index(obs_source_t *source, obs_source_t *filter, size_t index)
+
+   Moves a filter to the specified index in the filters array.
+
+   :param index: | The index to move the filter to.
+
+   .. versionadded:: 30.0
+
+---------------------
+
+.. function:: int obs_source_filter_get_index(obs_source_t *source, obs_source_t *filter)
+
+   Gets the index of the specified filter.
+
+   :return: Index of the filter or -1 if it is invalid/not found.
+
+   .. versionadded:: 30.0
 
 Functions used by filters
 -------------------------

obs-studio-29.1.3.tar.xz/libobs-d3d11/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/libobs-d3d11/CMakeLists.txt Changed

@@ -1,11 +1,16 @@
-project(libobs-d3d11)
+cmake_minimum_required(VERSION 3.24...3.25)
+
+legacy_check()
 
 add_library(libobs-d3d11 MODULE)
 add_library(OBS::libobs-d3d11 ALIAS libobs-d3d11)
 
 target_sources(
 libobs-d3d11
- PRIVATE d3d11-indexbuffer.cpp
+ PRIVATE # cmake-format: sortable
+ d3d11-duplicator.cpp
+ d3d11-indexbuffer.cpp
+ d3d11-rebuild.cpp
 d3d11-samplerstate.cpp
 d3d11-shader.cpp
 d3d11-shaderprocessor.cpp
@@ -16,35 +21,23 @@
 d3d11-texture2d.cpp
 d3d11-texture3d.cpp
 d3d11-vertexbuffer.cpp
- d3d11-duplicator.cpp
- d3d11-rebuild.cpp
 d3d11-zstencilbuffer.cpp)
 
-set(MODULE_DESCRIPTION "OBS Library D3D11 wrapper")
-configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in libobs-d3d11.rc)
-
-target_include_directories(libobs-d3d11 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-
+configure_file(cmake/windows/obs-module.rc.in libobs-d3d11.rc)
 target_sources(libobs-d3d11 PRIVATE libobs-d3d11.rc)
-
-target_compile_features(libobs-d3d11 PRIVATE cxx_std_17)
-
-target_compile_definitions(libobs-d3d11 PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
-
-if(NOT DEFINED GPU_PRIORITY_VAL
- OR "x${GPU_PRIORITY_VAL}x" STREQUAL "xx"
- OR "${GPU_PRIORITY_VAL}" STREQUAL "0")
- target_compile_definitions(libobs-d3d11 PRIVATE USE_GPU_PRIORITY=FALSE GPU_PRIORITY_VAL=0)
-else()
- target_compile_definitions(libobs-d3d11 PRIVATE USE_GPU_PRIORITY=TRUE GPU_PRIORITY_VAL=${GPU_PRIORITY_VAL})
-endif()
+target_compile_options(libobs-d3d11 PRIVATE /wd4595)
+target_compile_definitions(
+ libobs-d3d11 PRIVATE "$<$<BOOL:${GPU_PRIORITY_VAL}>:USE_GPU_PRIORITY>"
+ "$<IF:$<BOOL:${GPU_PRIORITY_VAL}>,GPU_PRIORITY_VAL=${GPU_PRIORITY_VAL},GPU_PRIORITY_VAL=0>")
 
 target_link_libraries(libobs-d3d11 PRIVATE OBS::libobs d3d9 d3d11 dxgi shcore)
 
-set_target_properties(
- libobs-d3d11
- PROPERTIES OUTPUT_NAME libobs-d3d11
- FOLDER "core"
- PREFIX "")
+target_enable_feature(libobs "Direct3D 11 renderer")
 
-setup_binary_target(libobs-d3d11)
+# cmake-format: off
+set_target_properties_obs(
+ libobs-d3d11
+ PROPERTIES FOLDER core
+ VERSION 0
+ SOVERSION ${OBS_VERSION_MAJOR})
+# cmake-format: on

obs-studio-30.0.2.tar.xz/libobs-d3d11/cmake Added

obs-studio-30.0.2.tar.xz/libobs-d3d11/cmake/legacy.cmake Added

@@ -0,0 +1,50 @@
+project(libobs-d3d11)
+
+add_library(libobs-d3d11 MODULE)
+add_library(OBS::libobs-d3d11 ALIAS libobs-d3d11)
+
+target_sources(
+  libobs-d3d11
+  PRIVATE d3d11-indexbuffer.cpp
+          d3d11-samplerstate.cpp
+          d3d11-shader.cpp
+          d3d11-shaderprocessor.cpp
+          d3d11-shaderprocessor.hpp
+          d3d11-stagesurf.cpp
+          d3d11-subsystem.cpp
+          d3d11-subsystem.hpp
+          d3d11-texture2d.cpp
+          d3d11-texture3d.cpp
+          d3d11-vertexbuffer.cpp
+          d3d11-duplicator.cpp
+          d3d11-rebuild.cpp
+          d3d11-zstencilbuffer.cpp)
+
+set(MODULE_DESCRIPTION "OBS Library D3D11 wrapper")
+configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in libobs-d3d11.rc)
+
+target_include_directories(libobs-d3d11 PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
+target_sources(libobs-d3d11 PRIVATE libobs-d3d11.rc)
+
+target_compile_features(libobs-d3d11 PRIVATE cxx_std_17)
+
+target_compile_definitions(libobs-d3d11 PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
+
+if(NOT DEFINED GPU_PRIORITY_VAL
+   OR "x${GPU_PRIORITY_VAL}x" STREQUAL "xx"
+   OR "${GPU_PRIORITY_VAL}" STREQUAL "0")
+  target_compile_definitions(libobs-d3d11 PRIVATE GPU_PRIORITY_VAL=0)
+else()
+  target_compile_definitions(libobs-d3d11 PRIVATE USE_GPU_PRIORITY=TRUE GPU_PRIORITY_VAL=${GPU_PRIORITY_VAL})
+endif()
+
+target_link_libraries(libobs-d3d11 PRIVATE OBS::libobs d3d9 d3d11 dxgi shcore)
+
+set_target_properties(
+  libobs-d3d11
+  PROPERTIES OUTPUT_NAME libobs-d3d11
+             FOLDER "core"
+             PREFIX "")
+
+setup_binary_target(libobs-d3d11)

obs-studio-30.0.2.tar.xz/libobs-d3d11/cmake/windows Added

obs-studio-30.0.2.tar.xz/libobs-d3d11/cmake/windows/obs-module.rc.in Added

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-duplicator.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-duplicator.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-indexbuffer.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-indexbuffer.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-rebuild.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-rebuild.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-samplerstate.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-samplerstate.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-shader.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-shader.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,6 +21,11 @@
 #include <graphics/vec3.h>
 #include <graphics/matrix3.h>
 #include <graphics/matrix4.h>
+#include <util/platform.h>
+#include <util/util.hpp>
+
+#include <filesystem>
+#include <fstream>
 
 void gs_vertex_shader::GetBuffersExpected(
 	const vector<D3D11_INPUT_ELEMENT_DESC> &inputs)
@@ -200,24 +205,111 @@
 		gs_shader_set_default(&paramsi);
 }
 
+static uint64_t fnv1a_hash(const char *str, size_t len)
+{
+	const uint64_t FNV_OFFSET = 14695981039346656037ULL;
+	const uint64_t FNV_PRIME = 1099511628211ULL;
+	uint64_t hash = FNV_OFFSET;
+	for (size_t i = 0; i < len; i++) {
+		hash ^= (uint64_t)stri;
+		hash *= FNV_PRIME;
+	}
+	return hash;
+}
+
 void gs_shader::Compile(const char *shaderString, const char *file,
 			const char *target, ID3D10Blob **shader)
 {
 	ComPtr<ID3D10Blob> errorsBlob;
 	HRESULT hr;
 
+	bool is_cached = false;
+	char hashstr20;
+
 	if (!shaderString)
 		throw "No shader string specified";
 
-	hr = device->d3dCompile(shaderString, strlen(shaderString), file, NULL,
-				NULL, "main", target,
-				D3D10_SHADER_OPTIMIZATION_LEVEL1, 0, shader,
-				errorsBlob.Assign());
-	if (FAILED(hr)) {
-		if (errorsBlob != NULL && errorsBlob->GetBufferSize())
-			throw ShaderError(errorsBlob, hr);
-		else
-			throw HRError("Failed to compile shader", hr);
+	size_t shaderStrLen = strlen(shaderString);
+	uint64_t hash = fnv1a_hash(shaderString, shaderStrLen);
+	snprintf(hashstr, sizeof(hashstr), "%02llx", hash);
+
+	BPtr program_data =
+		os_get_program_data_path_ptr("obs-studio/shader-cache");
+	auto cachePath = filesystem::u8path(program_data.Get()) / hashstr;
+	// Increment if on-disk format changes
+	cachePath += ".v2";
+
+	std::fstream cacheFile;
+	cacheFile.exceptions(fstream::badbit | fstream::eofbit);
+
+	if (filesystem::exists(cachePath) && !filesystem::is_empty(cachePath))
+		cacheFile.open(cachePath, ios::in | ios::binary | ios::ate);
+
+	if (cacheFile.is_open()) {
+		uint64_t checksum;
+
+		try {
+			streampos len = cacheFile.tellg();
+			// Not enough data for checksum + shader
+			if (len <= sizeof(checksum))
+				throw length_error("File truncated");
+
+			cacheFile.seekg(0, ios::beg);
+
+			len -= sizeof(checksum);
+			device->d3dCreateBlob(len, shader);
+			cacheFile.read((char *)(*shader)->GetBufferPointer(),
+				 len);
+			uint64_t calculated_checksum = fnv1a_hash(
+				(char *)(*shader)->GetBufferPointer(), len);
+
+			cacheFile.read((char *)&checksum, sizeof(checksum));
+			if (calculated_checksum != checksum)
+				throw exception("Checksum mismatch");
+
+			is_cached = true;
+		} catch (const exception &e) {
+			// Something went wrong reading the cache file, delete it
+			blog(LOG_WARNING,
+			 "Loading shader cache file failed with \"%s\": %s",
+			 e.what(), file);
+			cacheFile.close();
+			filesystem::remove(cachePath);
+		}
+	}
+
+	if (!is_cached) {
+		hr = device->d3dCompile(shaderString, shaderStrLen, file, NULL,
+					NULL, "main", target,
+					D3D10_SHADER_OPTIMIZATION_LEVEL3, 0,
+					shader, errorsBlob.Assign());
+		if (FAILED(hr)) {
+			if (errorsBlob != NULL && errorsBlob->GetBufferSize())
+				throw ShaderError(errorsBlob, hr);
+			else
+				throw HRError("Failed to compile shader", hr);
+		}
+
+		cacheFile.open(cachePath, ios::out | ios::binary);
+		if (cacheFile.is_open()) {
+			try {
+				uint64_t calculated_checksum = fnv1a_hash(
+					(char *)(*shader)->GetBufferPointer(),
+					(*shader)->GetBufferSize());
+
+				cacheFile.write(
+					(char *)(*shader)->GetBufferPointer(),
+					(*shader)->GetBufferSize());
+				cacheFile.write((char *)&calculated_checksum,
+						sizeof(calculated_checksum));
+			} catch (const exception &e) {
+				blog(LOG_WARNING,
+				 "Writing shader cache file failed with \"%s\": %s",
+				 e.what(), file);
+				cacheFile.close();
+				filesystem::remove(cachePath);
+			}
+		}
 	}
 
 #ifdef DISASSEMBLE_SHADERS

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-shaderprocessor.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-shaderprocessor.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-shaderprocessor.hpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-shaderprocessor.hpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-stagesurf.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-stagesurf.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-subsystem.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-subsystem.cpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 
 #include <cassert>
 #include <cinttypes>
+#include <optional>
 #include <util/base.h>
 #include <util/platform.h>
 #include <util/dstr.h>
@@ -51,7 +52,8 @@
 }
 
 gs_obj::gs_obj(gs_device_t *device_, gs_type type)
-	: device(device_), obj_type(type)
+	: device(device_),
+	 obj_type(type)
 {
 	prev_next = &device->first_obj;
 	next = device->first_obj;
@@ -292,12 +294,14 @@
 		if (module) {
 			d3dCompile = (pD3DCompile)GetProcAddress(module,
 								 "D3DCompile");
+			d3dCreateBlob = (pD3DCreateBlob)GetProcAddress(
+				module, "D3DCreateBlob");
 
 #ifdef DISASSEMBLE_SHADERS
 			d3dDisassemble = (pD3DDisassemble)GetProcAddress(
 				module, "D3DDisassemble");
 #endif
-			if (d3dCompile) {
+			if (d3dCompile && d3dCreateBlob) {
 				return;
 			}
 
@@ -472,7 +476,7 @@
 	return true;
 }
 
-#if USE_GPU_PRIORITY
+#ifdef USE_GPU_PRIORITY
 static bool set_priority(ID3D11Device *device, bool hags_enabled)
 {
 	ComQIPtr<IDXGIDevice> dxgiDevice(device);
@@ -503,18 +507,87 @@
 }
 #endif
 
-static bool adapter_hags_enabled(DXGI_ADAPTER_DESC *desc)
+struct HagsStatus {
+	enum DriverSupport {
+		ALWAYS_OFF,
+		ALWAYS_ON,
+		EXPERIMENTAL,
+		STABLE,
+		UNKNOWN
+	};
+
+	bool enabled;
+	bool enabled_by_default;
+	DriverSupport support;
+
+	explicit HagsStatus(const D3DKMT_WDDM_2_7_CAPS *caps)
+	{
+		enabled = caps->HwSchEnabled;
+		enabled_by_default = caps->HwSchEnabledByDefault;
+		support = caps->HwSchSupported ? DriverSupport::STABLE
+					 : DriverSupport::ALWAYS_OFF;
+	}
+
+	void SetDriverSupport(const UINT DXGKVal)
+	{
+		switch (DXGKVal) {
+		case DXGK_FEATURE_SUPPORT_ALWAYS_OFF:
+			support = ALWAYS_OFF;
+			break;
+		case DXGK_FEATURE_SUPPORT_ALWAYS_ON:
+			support = ALWAYS_ON;
+			break;
+		case DXGK_FEATURE_SUPPORT_EXPERIMENTAL:
+			support = EXPERIMENTAL;
+			break;
+		case DXGK_FEATURE_SUPPORT_STABLE:
+			support = STABLE;
+			break;
+		default:
+			support = UNKNOWN;
+		}
+	}
+
+	string ToString() const
+	{
+		string status = enabled ? "Enabled" : "Disabled";
+		status += " (Default: ";
+		status += enabled_by_default ? "Yes" : "No";
+		status += ", Driver status: ";
+		status += DriverSupportToString();
+		status += ")";
+
+		return status;
+	}
+
+private:
+	const char *DriverSupportToString() const
+	{
+		switch (support) {
+		case ALWAYS_OFF:
+			return "Unsupported";
+		case ALWAYS_ON:
+			return "Always On";
+		case EXPERIMENTAL:
+			return "Experimental";
+		case STABLE:
+			return "Supported";
+		default:
+			return "Unknown";
+		}
+	}
+};
+
+static optional<HagsStatus> GetAdapterHagsStatus(const DXGI_ADAPTER_DESC *desc)
 {
+	optional<HagsStatus> ret;
 	D3DKMT_OPENADAPTERFROMLUID d3dkmt_openluid{};
-	bool hags_enabled = false;
-	NTSTATUS res;
-
 	d3dkmt_openluid.AdapterLuid = desc->AdapterLuid;
 
-	res = D3DKMTOpenAdapterFromLuid(&d3dkmt_openluid);
+	NTSTATUS res = D3DKMTOpenAdapterFromLuid(&d3dkmt_openluid);
 	if (FAILED(res)) {
 		blog(LOG_DEBUG, "Failed opening D3DKMT adapter: %x", res);
-		return hags_enabled;
+		return ret;
 	}
 
 	D3DKMT_WDDM_2_7_CAPS caps = {};
@@ -525,10 +598,28 @@
 	args.PrivateDriverDataSize = sizeof(caps);
 	res = D3DKMTQueryAdapterInfo(&args);
 
-	/* On Windows 10 pre-2004 this will fail, but HAGS isn't supported
-	 * there anyway. */
-	if (SUCCEEDED(res))
-		hags_enabled = caps.HwSchEnabled;
+	/* If this still fails we're likely on Windows 10 pre-2004
+	 * where HAGS is not supported anyway. */
+	if (SUCCEEDED(res)) {
+		HagsStatus status(&caps);
+
+		/* Starting with Windows 10 21H2 we can query more detailed
+		 * support information (e.g. experimental status).
+		 * This Is optional and failure doesn't matter. */
+		D3DKMT_WDDM_2_9_CAPS ext_caps = {};
+		args.hAdapter = d3dkmt_openluid.hAdapter;
+		args.Type = KMTQAITYPE_WDDM_2_9_CAPS;
+		args.pPrivateDriverData = &ext_caps;
+		args.PrivateDriverDataSize = sizeof(ext_caps);
+		res = D3DKMTQueryAdapterInfo(&args);
+
+		if (SUCCEEDED(res))
+			status.SetDriverSupport(ext_caps.HwSchSupportState);
+
+		ret = status;
+	} else {
+		blog(LOG_WARNING, "Failed querying WDDM 2.7 caps: %x", res);
+	}
 
 	D3DKMT_CLOSEADAPTER d3dkmt_close = {d3dkmt_openluid.hAdapter};
 	res = D3DKMTCloseAdapter(&d3dkmt_close);
@@ -537,7 +628,7 @@
 		 d3dkmt_openluid.hAdapter, res);
 	}
 
-	return hags_enabled;
+	return ret;
 }
 
 static bool CheckFormat(ID3D11Device *device, DXGI_FORMAT format)
@@ -550,11 +641,28 @@
 	 ((support & required) == required);
 }
 
+static bool FastClearSupported(UINT vendorId, uint64_t version)
+{
+	/* Always true for non-NVIDIA GPUs */
+	if (vendorId != 0x10de)
+		return true;
+
+	const uint16_t aa = (version >> 48) & 0xffff;
+	const uint16_t bb = (version >> 32) & 0xffff;
+	const uint16_t ccccc = (version >> 16) & 0xffff;
+	const uint16_t ddddd = version & 0xffff;
+
+	/* Check for NVIDIA driver version >= 31.0.15.2737 */
+	return aa >= 31 && bb >= 0 && ccccc >= 15 && ddddd >= 2737;
+}
+
 void gs_device::InitDevice(uint32_t adapterIdx)
 {
 	wstring adapterName;
 	DXGI_ADAPTER_DESC desc;
 	D3D_FEATURE_LEVEL levelUsed = D3D_FEATURE_LEVEL_10_0;
+	LARGE_INTEGER umd;
+	uint64_t driverVersion = 0;
 	HRESULT hr = 0;
 
 	adpIdx = adapterIdx;
@@ -572,6 +680,10 @@
 	blog(LOG_INFO, "Loading up D3D11 on adapter %s (%" PRIu32 ")",
 	 adapterNameUTF8.Get(), adapterIdx);
 
+	hr = adapter->CheckInterfaceSupport(__uuidof(IDXGIDevice), &umd);
+	if (SUCCEEDED(hr))
+		driverVersion = umd.QuadPart;
+
 	hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL,
 			 createFlags, featureLevels,
 			 sizeof(featureLevels) /
@@ -590,14 +702,17 @@
 	}
 
 	/* Log HAGS status */
-	bool hags_enabled = adapter_hags_enabled(&desc);
+	bool hags_enabled = false;
+	if (auto hags_status = GetAdapterHagsStatus(&desc))
+		hags_enabled = hags_status->enabled;
+
 	if (hags_enabled) {
 		blog(LOG_WARNING,
 		 "Hardware-Accelerated GPU Scheduling enabled on adapter!");
 	}
 
 	/* adjust gpu thread priority on non-intel GPUs */
-#if USE_GPU_PRIORITY
+#ifdef USE_GPU_PRIORITY
 	if (desc.VendorId != 0x8086 && !set_priority(device, hags_enabled)) {
 		blog(LOG_INFO, "D3D11 GPU priority setup "
 			 "failed (not admin?)");
@@ -631,6 +746,8 @@
 	nv12Supported = CheckFormat(device, DXGI_FORMAT_NV12) &&
 			!HasBadNV12Output();
 	p010Supported = nv12Supported && CheckFormat(device, DXGI_FORMAT_P010);
+
+	fastClearSupported = FastClearSupported(desc.VendorId, driverVersion);
 }
 
 static inline void ConvertStencilSide(D3D11_DEPTH_STENCILOP_DESC &desc,
@@ -1336,6 +1453,11 @@
 	}
 }
 
+static inline double to_GiB(size_t bytes)
+{
+	return static_cast<double>(bytes) / (1 << 30);
+}
+
 static inline void LogD3DAdapters()
 {
 	ComPtr<IDXGIFactory1> factory;
@@ -1363,13 +1485,21 @@
 
 		os_wcs_to_utf8(desc.Description, 0, name, sizeof(name));
 		blog(LOG_INFO, "\tAdapter %u: %s", i, name);
-		blog(LOG_INFO, "\t Dedicated VRAM: %" PRIu64,
-		 desc.DedicatedVideoMemory);
-		blog(LOG_INFO, "\t Shared VRAM: %" PRIu64,
-		 desc.SharedSystemMemory);
-		blog(LOG_INFO, "\t PCI ID: %x:%x", desc.VendorId,
+		blog(LOG_INFO, "\t Dedicated VRAM: %" PRIu64 " (%.01f GiB)",
+		 desc.DedicatedVideoMemory,
+		 to_GiB(desc.DedicatedVideoMemory));
+		blog(LOG_INFO, "\t Shared VRAM: %" PRIu64 " (%.01f GiB)",
+		 desc.SharedSystemMemory, to_GiB(desc.SharedSystemMemory));
+		blog(LOG_INFO, "\t PCI ID: %x:%.4x", desc.VendorId,
 		 desc.DeviceId);
 
+		if (auto hags_support = GetAdapterHagsStatus(&desc)) {
+			blog(LOG_INFO, "\t HAGS Status: %s",
+			 hags_support->ToString().c_str());
+		} else {
+			blog(LOG_WARNING, "\t HAGS Status: Unknown");
+		}
+
 		/* driver version */
 		LARGE_INTEGER umd;
 		hr = adapter->CheckInterfaceSupport(__uuidof(IDXGIDevice),
@@ -1393,6 +1523,17 @@
 	}
 }
 
+static void CreateShaderCacheDirectory()
+{
+	BPtr cachePath =
+		os_get_program_data_path_ptr("obs-studio/shader-cache");
+
+	if (os_mkdirs(cachePath) == MKDIR_ERROR) {
+		blog(LOG_WARNING, "Failed to create shader cache directory, "
+				 "cache may not be available.");
+	}
+}
+
 int device_create(gs_device_t **p_device, uint32_t adapter)
 {
 	gs_device *device = NULL;
@@ -1402,6 +1543,7 @@
 		blog(LOG_INFO, "---------------------------------");
 		blog(LOG_INFO, "Initializing D3D11...");
 		LogD3DAdapters();
+		CreateShaderCacheDirectory();
 
 		device = new gs_device(adapter);
 
@@ -3457,3 +3599,8 @@
 
 	return count;
 }
+
+extern "C" EXPORT bool device_can_adapter_fast_clear(gs_device_t *device)
+{
+	return device->fastClearSupported;
+}

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-subsystem.hpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-subsystem.hpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -38,6 +38,9 @@
 
 // #define DISASSEMBLE_SHADERS
 
+typedef HRESULT(WINAPI *pD3DCreateBlob)(_In_ SIZE_T Size,
+					_Out_ ID3DBlob **ppBlob);
+
 struct shader_var;
 struct shader_sampler;
 struct gs_vertex_shader;
@@ -476,13 +479,16 @@
 
 	inline gs_texture(gs_texture_type type, uint32_t levels,
 			 gs_color_format format)
-		: type(type), levels(levels), format(format)
+		: type(type),
+		 levels(levels),
+		 format(format)
 	{
 	}
 
 	inline gs_texture(gs_device *device, gs_type obj_type,
 			 gs_texture_type type)
-		: gs_obj(device, obj_type), type(type)
+		: gs_obj(device, obj_type),
+		 type(type)
 	{
 	}
 
@@ -632,7 +638,9 @@
 	}
 
 	inline gs_zstencil_buffer()
-		: width(0), height(0), dxgiFormat(DXGI_FORMAT_UNKNOWN)
+		: width(0),
+		 height(0),
+		 dxgiFormat(DXGI_FORMAT_UNKNOWN)
 	{
 	}
 
@@ -693,7 +701,8 @@
 	HRESULT hr;
 
 	inline ShaderError(const ComPtr<ID3D10Blob> &errors, HRESULT hr)
-		: errors(errors), hr(hr)
+		: errors(errors),
+		 hr(hr)
 	{
 	}
 };
@@ -717,7 +726,9 @@
 
 	inline gs_shader(gs_device_t *device, gs_type obj_type,
 			 gs_shader_type type)
-		: gs_obj(device, obj_type), type(type), constantSize(0)
+		: gs_obj(device, obj_type),
+		 type(type),
+		 constantSize(0)
 	{
 	}
 
@@ -730,7 +741,8 @@
 
 	inline ShaderSampler(const char *name, gs_device_t *device,
 			 gs_sampler_info *info)
-		: name(name), sampler(device, info)
+		: name(name),
+		 sampler(device, info)
 	{
 	}
 };
@@ -894,7 +906,8 @@
 	inline void Release() { state.Release(); }
 
 	inline SavedBlendState(const BlendState &val, D3D11_BLEND_DESC &desc)
-		: BlendState(val), bd(desc)
+		: BlendState(val),
+		 bd(desc)
 	{
 	}
 };
@@ -906,7 +919,10 @@
 	gs_stencil_op_type zpass;
 
 	inline StencilSide()
-		: test(GS_ALWAYS), fail(GS_KEEP), zfail(GS_KEEP), zpass(GS_KEEP)
+		: test(GS_ALWAYS),
+		 fail(GS_KEEP),
+		 zfail(GS_KEEP),
+		 zpass(GS_KEEP)
 	{
 	}
 };
@@ -946,7 +962,8 @@
 
 	inline SavedZStencilState(const ZStencilState &val,
 				 D3D11_DEPTH_STENCIL_DESC desc)
-		: ZStencilState(val), dsd(desc)
+		: ZStencilState(val),
+		 dsd(desc)
 	{
 	}
 };
@@ -973,7 +990,8 @@
 
 	inline SavedRasterState(const RasterState &val,
 				D3D11_RASTERIZER_DESC &desc)
-		: RasterState(val), rd(desc)
+		: RasterState(val),
+		 rd(desc)
 	{
 	}
 };
@@ -1004,6 +1022,7 @@
 	uint32_t adpIdx = 0;
 	bool nv12Supported = false;
 	bool p010Supported = false;
+	bool fastClearSupported = false;
 
 	gs_texture_2d *curRenderTarget = nullptr;
 	gs_zstencil_buffer *curZStencilBuffer = nullptr;
@@ -1037,6 +1056,7 @@
 	D3D11_PRIMITIVE_TOPOLOGY curToplogy;
 
 	pD3DCompile d3dCompile = nullptr;
+	pD3DCreateBlob d3dCreateBlob = nullptr;
 #ifdef DISASSEMBLE_SHADERS
 	pD3DDisassemble d3dDisassemble = nullptr;
 #endif

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-texture2d.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-texture2d.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-texture3d.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-texture3d.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-vertexbuffer.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-d3d11/d3d11-zstencilbuffer.cpp -> obs-studio-30.0.2.tar.xz/libobs-d3d11/d3d11-zstencilbuffer.cpp Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/libobs-opengl/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-cocoa.m -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-cocoa.m Changed

@@ -22,443 +22,421 @@
 #import <AppKit/AppKit.h>
 
 struct gl_windowinfo {
-	NSView *view;
-	NSOpenGLContext *context;
-	gs_texture_t *texture;
-	GLuint fbo;
+ NSView *view;
+ NSOpenGLContext *context;
+ gs_texture_t *texture;
+ GLuint fbo;
 };
 
 struct gl_platform {
-	NSOpenGLContext *context;
+ NSOpenGLContext *context;
 };
 
 static NSOpenGLContext *gl_context_create(NSOpenGLContext *share)
 {
-	NSOpenGLPixelFormatAttribute attributes = {
-		NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile,
-		NSOpenGLProfileVersion3_2Core, 0};
-
-	NSOpenGLPixelFormat *pf;
-	pf = NSOpenGLPixelFormat alloc initWithAttributes:attributes;
-	if (!pf) {
-		blog(LOG_ERROR, "Failed to create pixel format");
-		return NULL;
-	}
-
-	NSOpenGLContext *context;
-	context = NSOpenGLContext alloc initWithFormat:pf
-					 shareContext:share;
-	pf release;
-	if (!context) {
-		blog(LOG_ERROR, "Failed to create context");
-		return NULL;
-	}
-
-	context clearDrawable;
-
-	return context;
+ NSOpenGLPixelFormatAttribute attributes = {NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile,
+ NSOpenGLProfileVersion3_2Core, 0};
+
+ NSOpenGLPixelFormat *pf;
+ pf = NSOpenGLPixelFormat alloc initWithAttributes:attributes;
+ if (!pf) {
+ blog(LOG_ERROR, "Failed to create pixel format");
+ return NULL;
+ }
+
+ NSOpenGLContext *context;
+ context = NSOpenGLContext alloc initWithFormat:pf shareContext:share;
+ pf release;
+ if (!context) {
+ blog(LOG_ERROR, "Failed to create context");
+ return NULL;
+ }
+
+ context clearDrawable;
+
+ return context;
 }
 
-struct gl_platform *gl_platform_create(gs_device_t *device __unused,
-				 uint32_t adapter __unused)
+struct gl_platform *gl_platform_create(gs_device_t *device __unused, uint32_t adapter __unused)
 {
-	NSOpenGLContext *context = gl_context_create(nil);
-	if (!context) {
-		blog(LOG_ERROR, "gl_context_create failed");
-		return NULL;
-	}
-
-	context makeCurrentContext;
-	GLint interval = 0;
-	context setValues:&interval
-		forParameter:NSOpenGLContextParameterSwapInterval;
-	const bool success = gladLoadGL() != 0;
-
-	if (!success) {
-		blog(LOG_ERROR, "gladLoadGL failed");
-		context release;
-		return NULL;
-	}
-
-	struct gl_platform *plat = bzalloc(sizeof(struct gl_platform));
-	plat->context = context;
-	return plat;
+ NSOpenGLContext *context = gl_context_create(nil);
+ if (!context) {
+ blog(LOG_ERROR, "gl_context_create failed");
+ return NULL;
+ }
+
+ context makeCurrentContext;
+ GLint interval = 0;
+ context setValues:&interval forParameter:NSOpenGLContextParameterSwapInterval;
+ const bool success = gladLoadGL() != 0;
+
+ if (!success) {
+ blog(LOG_ERROR, "gladLoadGL failed");
+ context release;
+ return NULL;
+ }
+
+ struct gl_platform *plat = bzalloc(sizeof(struct gl_platform));
+ plat->context = context;
+ return plat;
 }
 
 void gl_platform_destroy(struct gl_platform *platform)
 {
-	if (!platform)
-		return;
+ if (!platform)
+ return;
 
-	platform->context release;
-	platform->context = nil;
+ platform->context release;
+ platform->context = nil;
 
-	bfree(platform);
+ bfree(platform);
 }
 
 bool gl_platform_init_swapchain(struct gs_swap_chain *swap)
 {
-	NSOpenGLContext *parent = swap->device->plat->context;
-	NSOpenGLContext *context = gl_context_create(parent);
-	bool success = context != nil;
-	if (success) {
-		CGLContextObj parent_obj = parent CGLContextObj;
-		CGLLockContext(parent_obj);
-
-		parent makeCurrentContext;
-		struct gs_init_data *init_data = &swap->info;
-		swap->wi->texture = device_texture_create(
-			swap->device, init_data->cx, init_data->cy,
-			init_data->format, 1, NULL, GS_RENDER_TARGET);
-		glFlush();
-		NSOpenGLContext clearCurrentContext;
-
-		CGLContextObj context_obj = context CGLContextObj;
-		CGLLockContext(context_obj);
-
-		context makeCurrentContext;
+ NSOpenGLContext *parent = swap->device->plat->context;
+ NSOpenGLContext *context = gl_context_create(parent);
+ bool success = context != nil;
+ if (success) {
+ CGLContextObj parent_obj = parent CGLContextObj;
+ CGLLockContext(parent_obj);
+
+ parent makeCurrentContext;
+ struct gs_init_data *init_data = &swap->info;
+ swap->wi->texture = device_texture_create(swap->device, init_data->cx, init_data->cy, init_data->format, 1,
+ NULL, GS_RENDER_TARGET);
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
+
+ CGLContextObj context_obj = context CGLContextObj;
+ CGLLockContext(context_obj);
+
+ context makeCurrentContext;
 
 #pragma clang diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-		context setView:swap->wi->view;
+ context setView:swap->wi->view;
 #pragma clang diagnostic pop
-		GLint interval = 0;
-		context setValues:&interval
-			forParameter:NSOpenGLContextParameterSwapInterval;
-		gl_gen_framebuffers(1, &swap->wi->fbo);
-		gl_bind_framebuffer(GL_FRAMEBUFFER, swap->wi->fbo);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-				 GL_TEXTURE_2D,
-				 swap->wi->texture->texture, 0);
-		gl_success("glFrameBufferTexture2D");
-		glFlush();
-		NSOpenGLContext clearCurrentContext;
-
-		CGLUnlockContext(context_obj);
-
-		CGLUnlockContext(parent_obj);
-
-		swap->wi->context = context;
-	}
-
-	return success;
+ GLint interval = 0;
+ context setValues:&interval forParameter:NSOpenGLContextParameterSwapInterval;
+ gl_gen_framebuffers(1, &swap->wi->fbo);
+ gl_bind_framebuffer(GL_FRAMEBUFFER, swap->wi->fbo);
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, swap->wi->texture->texture, 0);
+ gl_success("glFrameBufferTexture2D");
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
+
+ CGLUnlockContext(context_obj);
+
+ CGLUnlockContext(parent_obj);
+
+ swap->wi->context = context;
+ }
+
+ return success;
 }
 
 void gl_platform_cleanup_swapchain(struct gs_swap_chain *swap)
 {
-	NSOpenGLContext *parent = swap->device->plat->context;
-	CGLContextObj parent_obj = parent CGLContextObj;
-	CGLLockContext(parent_obj);
+ NSOpenGLContext *parent = swap->device->plat->context;
+ CGLContextObj parent_obj = parent CGLContextObj;
+ CGLLockContext(parent_obj);
 
-	NSOpenGLContext *context = swap->wi->context;
-	CGLContextObj context_obj = context CGLContextObj;
-	CGLLockContext(context_obj);
+ NSOpenGLContext *context = swap->wi->context;
+ CGLContextObj context_obj = context CGLContextObj;
+ CGLLockContext(context_obj);
 
-	context makeCurrentContext;
-	gl_delete_framebuffers(1, &swap->wi->fbo);
-	glFlush();
-	NSOpenGLContext clearCurrentContext;
+ context makeCurrentContext;
+ gl_delete_framebuffers(1, &swap->wi->fbo);
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
 
-	CGLUnlockContext(context_obj);
+ CGLUnlockContext(context_obj);
 
-	parent makeCurrentContext;
-	gs_texture_destroy(swap->wi->texture);
-	glFlush();
-	NSOpenGLContext clearCurrentContext;
-	swap->wi->context = nil;
+ parent makeCurrentContext;
+ gs_texture_destroy(swap->wi->texture);
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
+ swap->wi->context = nil;
 
-	CGLUnlockContext(parent_obj);
+ CGLUnlockContext(parent_obj);
 }
 
 struct gl_windowinfo *gl_windowinfo_create(const struct gs_init_data *info)
 {
-	if (!info)
-		return NULL;
+ if (!info)
+ return NULL;
 
-	if (!info->window.view)
-		return NULL;
+ if (!info->window.view)
+ return NULL;
 
-	struct gl_windowinfo *wi = bzalloc(sizeof(struct gl_windowinfo));
+ struct gl_windowinfo *wi = bzalloc(sizeof(struct gl_windowinfo));
 
-	wi->view = info->window.view;
-	wi->view.window.colorSpace = NSColorSpace.sRGBColorSpace;
+ wi->view = info->window.view;
+ wi->view.window.colorSpace = NSColorSpace.sRGBColorSpace;
 #pragma clang diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-	wi->view.wantsBestResolutionOpenGLSurface = YES;
+ wi->view.wantsBestResolutionOpenGLSurface = YES;
 #pragma clang diagnostic pop
 
-	return wi;
+ return wi;
 }
 
 void gl_windowinfo_destroy(struct gl_windowinfo *wi)
 {
-	if (!wi)
-		return;
+ if (!wi)
+ return;
 
-	wi->view = nil;
-	bfree(wi);
+ wi->view = nil;
+ bfree(wi);
 }
 
 void gl_update(gs_device_t *device)
 {
-	gs_swapchain_t *swap = device->cur_swap;
-	NSOpenGLContext *parent = device->plat->context;
-	NSOpenGLContext *context = swap->wi->context;
-	dispatch_async(dispatch_get_main_queue(), ^() {
-		if (!swap || !swap->wi) {
-			return;
-		}
-
-		CGLContextObj parent_obj = parent CGLContextObj;
-		CGLLockContext(parent_obj);
-
-		CGLContextObj context_obj = context CGLContextObj;
-		CGLLockContext(context_obj);
-
-		context makeCurrentContext;
-		context update;
-		struct gs_init_data *info = &swap->info;
-		gs_texture_t *previous = swap->wi->texture;
-		swap->wi->texture = device_texture_create(device, info->cx,
-							 info->cy,
-							 info->format, 1, NULL,
-							 GS_RENDER_TARGET);
-		gl_bind_framebuffer(GL_FRAMEBUFFER, swap->wi->fbo);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-				 GL_TEXTURE_2D,
-				 swap->wi->texture->texture, 0);
-		gl_success("glFrameBufferTexture2D");
-		gs_texture_destroy(previous);
-		glFlush();
-		NSOpenGLContext clearCurrentContext;
-
-		CGLUnlockContext(context_obj);
-
-		CGLUnlockContext(parent_obj);
-	});
+ gs_swapchain_t *swap = device->cur_swap;
+ NSOpenGLContext *parent = device->plat->context;
+ NSOpenGLContext *context = swap->wi->context;
+ dispatch_async(dispatch_get_main_queue(), ^() {
+ if (!swap || !swap->wi) {
+ return;
+ }
+
+ CGLContextObj parent_obj = parent CGLContextObj;
+ CGLLockContext(parent_obj);
+
+ CGLContextObj context_obj = context CGLContextObj;
+ CGLLockContext(context_obj);
+
+ context makeCurrentContext;
+ context update;
+ struct gs_init_data *info = &swap->info;
+ gs_texture_t *previous = swap->wi->texture;
+ swap->wi->texture = device_texture_create(device, info->cx, info->cy, info->format, 1, NULL, GS_RENDER_TARGET);
+ gl_bind_framebuffer(GL_FRAMEBUFFER, swap->wi->fbo);
+ glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, swap->wi->texture->texture, 0);
+ gl_success("glFrameBufferTexture2D");
+ gs_texture_destroy(previous);
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
+
+ CGLUnlockContext(context_obj);
+
+ CGLUnlockContext(parent_obj);
+ });
 }
 
 void gl_clear_context(gs_device_t *device)
 {
-	UNUSED_PARAMETER(device);
-	NSOpenGLContext clearCurrentContext;
+ UNUSED_PARAMETER(device);
+ NSOpenGLContext clearCurrentContext;
 }
 
 void device_enter_context(gs_device_t *device)
 {
-	CGLLockContext(device->plat->context CGLContextObj);
+ CGLLockContext(device->plat->context CGLContextObj);
 
-	device->plat->context makeCurrentContext;
+ device->plat->context makeCurrentContext;
 }
 
 void device_leave_context(gs_device_t *device)
 {
-	glFlush();
-	NSOpenGLContext clearCurrentContext;
-	device->cur_vertex_buffer = NULL;
-	device->cur_index_buffer = NULL;
-	device->cur_render_target = NULL;
-	device->cur_zstencil_buffer = NULL;
-	device->cur_swap = NULL;
-	device->cur_fbo = NULL;
-
-	CGLUnlockContext(device->plat->context CGLContextObj);
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
+ device->cur_vertex_buffer = NULL;
+ device->cur_index_buffer = NULL;
+ device->cur_render_target = NULL;
+ device->cur_zstencil_buffer = NULL;
+ device->cur_swap = NULL;
+ device->cur_fbo = NULL;
+
+ CGLUnlockContext(device->plat->context CGLContextObj);
 }
 
 void *device_get_device_obj(gs_device_t *device)
 {
-	return device->plat->context;
+ return device->plat->context;
 }
 
 void device_load_swapchain(gs_device_t *device, gs_swapchain_t *swap)
 {
-	if (device->cur_swap == swap)
-		return;
+ if (device->cur_swap == swap)
+ return;
 
-	device->cur_swap = swap;
-	if (swap) {
-		device_set_render_target(device, swap->wi->texture, NULL);
-	}
+ device->cur_swap = swap;
+ if (swap) {
+ device_set_render_target(device, swap->wi->texture, NULL);
+ }
 }
 
 bool device_is_present_ready(gs_device_t *device __unused)
 {
-	return true;
+ return true;
 }
 
 void device_present(gs_device_t *device)
 {
-	glFlush();
-	NSOpenGLContext clearCurrentContext;
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
 
-	CGLLockContext(device->cur_swap->wi->context CGLContextObj);
+ CGLLockContext(device->cur_swap->wi->context CGLContextObj);
 
-	device->cur_swap->wi->context makeCurrentContext;
-	gl_bind_framebuffer(GL_READ_FRAMEBUFFER, device->cur_swap->wi->fbo);
-	gl_bind_framebuffer(GL_DRAW_FRAMEBUFFER, 0);
-	const uint32_t width = device->cur_swap->info.cx;
-	const uint32_t height = device->cur_swap->info.cy;
-	glBlitFramebuffer(0, 0, width, height, 0, height, width, 0,
-			 GL_COLOR_BUFFER_BIT, GL_NEAREST);
-	device->cur_swap->wi->context flushBuffer;
-	glFlush();
-	NSOpenGLContext clearCurrentContext;
+ device->cur_swap->wi->context makeCurrentContext;
+ gl_bind_framebuffer(GL_READ_FRAMEBUFFER, device->cur_swap->wi->fbo);
+ gl_bind_framebuffer(GL_DRAW_FRAMEBUFFER, 0);
+ const uint32_t width = device->cur_swap->info.cx;
+ const uint32_t height = device->cur_swap->info.cy;
+ glBlitFramebuffer(0, 0, width, height, 0, height, width, 0, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+ device->cur_swap->wi->context flushBuffer;
+ glFlush();
+ NSOpenGLContext clearCurrentContext;
 
-	CGLUnlockContext(device->cur_swap->wi->context CGLContextObj);
+ CGLUnlockContext(device->cur_swap->wi->context CGLContextObj);
 
-	device->plat->context makeCurrentContext;
+ device->plat->context makeCurrentContext;
 }
 
 bool device_is_monitor_hdr(gs_device_t *device __unused, void *monitor __unused)
 {
-	return false;
+ return false;
 }
 
-void gl_getclientsize(const struct gs_swap_chain *swap, uint32_t *width,
-		 uint32_t *height)
+void gl_getclientsize(const struct gs_swap_chain *swap, uint32_t *width, uint32_t *height)
 {
-	if (width)
-		*width = swap->info.cx;
-	if (height)
-		*height = swap->info.cy;
+ if (width)
+ *width = swap->info.cx;
+ if (height)
+ *height = swap->info.cy;
 }
 
-gs_texture_t *device_texture_create_from_iosurface(gs_device_t *device,
-						 void *iosurf)
+gs_texture_t *device_texture_create_from_iosurface(gs_device_t *device, void *iosurf)
 {
-	IOSurfaceRef ref = (IOSurfaceRef)iosurf;
-	struct gs_texture_2d *tex = bzalloc(sizeof(struct gs_texture_2d));
-
-	OSType pf = IOSurfaceGetPixelFormat(ref);
-
-	FourCharCode l10r_code = 0;
-	l10r_code = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
-
-	FourCharCode bgra_code = 0;
-	bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
-
-	const bool l10r = pf == l10r_code;
-	if (pf == 0)
-		blog(LOG_ERROR, "Invalid IOSurface Buffer");
-	else if ((pf != bgra_code) && !l10r)
-		blog(LOG_ERROR, "Unexpected pixel format: %d (%c%c%c%c)", pf,
-		 pf >> 24, pf >> 16, pf >> 8, pf);
-
-	const enum gs_color_format color_format = l10r ? GS_R10G10B10A2
-						 : GS_BGRA;
-
-	tex->base.device = device;
-	tex->base.type = GS_TEXTURE_2D;
-	tex->base.format = color_format;
-	tex->base.levels = 1;
-	tex->base.gl_format = l10r ? GL_BGRA : convert_gs_format(color_format);
-	tex->base.gl_internal_format = convert_gs_internal_format(color_format);
-	tex->base.gl_type = l10r ? GL_UNSIGNED_INT_2_10_10_10_REV
-				 : GL_UNSIGNED_INT_8_8_8_8_REV;
-	tex->base.gl_target = GL_TEXTURE_RECTANGLE_ARB;
-	tex->base.is_dynamic = false;
-	tex->base.is_render_target = false;
-	tex->base.gen_mipmaps = false;
-	tex->width = (uint32_t)IOSurfaceGetWidth(ref);
-	tex->height = (uint32_t)IOSurfaceGetHeight(ref);
-
-	if (!gl_gen_textures(1, &tex->base.texture))
-		goto fail;
-
-	if (!gl_bind_texture(tex->base.gl_target, tex->base.texture))
-		goto fail;
-
-	CGLError err = CGLTexImageIOSurface2D(
-		NSOpenGLContext currentContext CGLContextObj,
-		tex->base.gl_target, tex->base.gl_internal_format, tex->width,
-		tex->height, tex->base.gl_format, tex->base.gl_type, ref, 0);
-
-	if (err != kCGLNoError) {
-		blog(LOG_ERROR,
-		 "CGLTexImageIOSurface2D: %u, %s"
-		 " (device_texture_create_from_iosurface)",
-		 err, CGLErrorString(err));
-
-		gl_success("CGLTexImageIOSurface2D");
-		goto fail;
-	}
-
-	if (!gl_tex_param_i(tex->base.gl_target, GL_TEXTURE_MAX_LEVEL, 0))
-		goto fail;
-
-	if (!gl_bind_texture(tex->base.gl_target, 0))
-		goto fail;
-
-	return (gs_texture_t *)tex;
+ IOSurfaceRef ref = (IOSurfaceRef) iosurf;
+ struct gs_texture_2d *tex = bzalloc(sizeof(struct gs_texture_2d));
+
+ OSType pf = IOSurfaceGetPixelFormat(ref);
+
+ FourCharCode l10r_code = 0;
+ l10r_code = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
+
+ FourCharCode bgra_code = 0;
+ bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
+
+ const bool l10r = pf == l10r_code;
+ if (pf == 0)
+ blog(LOG_ERROR, "Invalid IOSurface Buffer");
+ else if ((pf != bgra_code) && !l10r)
+ blog(LOG_ERROR, "Unexpected pixel format: %d (%c%c%c%c)", pf, pf >> 24, pf >> 16, pf >> 8, pf);
+
+ const enum gs_color_format color_format = l10r ? GS_R10G10B10A2 : GS_BGRA;
+
+ tex->base.device = device;
+ tex->base.type = GS_TEXTURE_2D;
+ tex->base.format = color_format;
+ tex->base.levels = 1;
+ tex->base.gl_format = l10r ? GL_BGRA : convert_gs_format(color_format);
+ tex->base.gl_internal_format = convert_gs_internal_format(color_format);
+ tex->base.gl_type = l10r ? GL_UNSIGNED_INT_2_10_10_10_REV : GL_UNSIGNED_INT_8_8_8_8_REV;
+ tex->base.gl_target = GL_TEXTURE_RECTANGLE_ARB;
+ tex->base.is_dynamic = false;
+ tex->base.is_render_target = false;
+ tex->base.gen_mipmaps = false;
+ tex->width = (uint32_t) IOSurfaceGetWidth(ref);
+ tex->height = (uint32_t) IOSurfaceGetHeight(ref);
+
+ if (!gl_gen_textures(1, &tex->base.texture))
+ goto fail;
+
+ if (!gl_bind_texture(tex->base.gl_target, tex->base.texture))
+ goto fail;
+
+ CGLError err = CGLTexImageIOSurface2D(NSOpenGLContext currentContext CGLContextObj, tex->base.gl_target,
+ tex->base.gl_internal_format, tex->width, tex->height, tex->base.gl_format,
+ tex->base.gl_type, ref, 0);
+
+ if (err != kCGLNoError) {
+ blog(LOG_ERROR,
+ "CGLTexImageIOSurface2D: %u, %s"
+ " (device_texture_create_from_iosurface)",
+ err, CGLErrorString(err));
+
+ gl_success("CGLTexImageIOSurface2D");
+ goto fail;
+ }
+
+ if (!gl_tex_param_i(tex->base.gl_target, GL_TEXTURE_MAX_LEVEL, 0))
+ goto fail;
+
+ if (!gl_bind_texture(tex->base.gl_target, 0))
+ goto fail;
+
+ return (gs_texture_t *) tex;
 
 fail:
-	gs_texture_destroy((gs_texture_t *)tex);
-	blog(LOG_ERROR, "device_texture_create_from_iosurface (GL) failed");
-	return NULL;
+ gs_texture_destroy((gs_texture_t *) tex);
+ blog(LOG_ERROR, "device_texture_create_from_iosurface (GL) failed");
+ return NULL;
 }
 
 gs_texture_t *device_texture_open_shared(gs_device_t *device, uint32_t handle)
 {
-	gs_texture_t *texture = NULL;
-	IOSurfaceRef ref = IOSurfaceLookupFromMachPort((mach_port_t)handle);
-	texture = device_texture_create_from_iosurface(device, ref);
-	CFRelease(ref);
-	return texture;
+ gs_texture_t *texture = NULL;
+ IOSurfaceRef ref = IOSurfaceLookupFromMachPort((mach_port_t) handle);
+ texture = device_texture_create_from_iosurface(device, ref);
+ CFRelease(ref);
+ return texture;
 }
 
 bool device_shared_texture_available(void)
 {
-	return true;
+ return true;
 }
 
 bool gs_texture_rebind_iosurface(gs_texture_t *texture, void *iosurf)
 {
-	if (!texture)
-		return false;
+ if (!texture)
+ return false;
 
-	if (!iosurf)
-		return false;
+ if (!iosurf)
+ return false;
 
-	FourCharCode l10r_code = 0;
-	l10r_code = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
+ FourCharCode l10r_code = 0;
+ l10r_code = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
 
-	FourCharCode bgra_code = 0;
-	bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
+ FourCharCode bgra_code = 0;
+ bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
 
-	struct gs_texture_2d *tex = (struct gs_texture_2d *)texture;
-	IOSurfaceRef ref = (IOSurfaceRef)iosurf;
+ struct gs_texture_2d *tex = (struct gs_texture_2d *) texture;
+ IOSurfaceRef ref = (IOSurfaceRef) iosurf;
 
-	OSType pf = IOSurfaceGetPixelFormat(ref);
-	if (pf == 0) {
-		blog(LOG_ERROR, "Invalid IOSurface buffer");
-	} else if ((pf != bgra_code) && (pf != l10r_code)) {
-		blog(LOG_ERROR, "Unexpected pixel format: %d (%c%c%c%c)", pf,
-		 pf >> 24, pf >> 16, pf >> 8, pf);
-	}
+ OSType pf = IOSurfaceGetPixelFormat(ref);
+ if (pf == 0) {
+ blog(LOG_ERROR, "Invalid IOSurface buffer");
+ } else if ((pf != bgra_code) && (pf != l10r_code)) {
+ blog(LOG_ERROR, "Unexpected pixel format: %d (%c%c%c%c)", pf, pf >> 24, pf >> 16, pf >> 8, pf);
+ }
 
-	tex->width = (uint32_t)IOSurfaceGetWidth(ref);
-	tex->height = (uint32_t)IOSurfaceGetHeight(ref);
+ tex->width = (uint32_t) IOSurfaceGetWidth(ref);
+ tex->height = (uint32_t) IOSurfaceGetHeight(ref);
 
-	if (!gl_bind_texture(tex->base.gl_target, tex->base.texture))
-		return false;
+ if (!gl_bind_texture(tex->base.gl_target, tex->base.texture))
+ return false;
 
-	CGLError err = CGLTexImageIOSurface2D(
-		NSOpenGLContext currentContext CGLContextObj,
-		tex->base.gl_target, tex->base.gl_internal_format, tex->width,
-		tex->height, tex->base.gl_format, tex->base.gl_type, ref, 0);
+ CGLError err = CGLTexImageIOSurface2D(NSOpenGLContext currentContext CGLContextObj, tex->base.gl_target,
+ tex->base.gl_internal_format, tex->width, tex->height, tex->base.gl_format,
+ tex->base.gl_type, ref, 0);
 
-	if (err != kCGLNoError) {
-		blog(LOG_ERROR,
-		 "CGLTexImageIOSurface2D: %u, %s"
-		 " (gs_texture_rebind_iosurface)",
-		 err, CGLErrorString(err));
+ if (err != kCGLNoError) {
+ blog(LOG_ERROR,
+ "CGLTexImageIOSurface2D: %u, %s"
+ " (gs_texture_rebind_iosurface)",
+ err, CGLErrorString(err));
 
-		gl_success("CGLTexImageIOSurface2D");
-		return false;
-	}
+ gl_success("CGLTexImageIOSurface2D");
+ return false;
+ }
 
-	if (!gl_bind_texture(tex->base.gl_target, 0))
-		return false;
+ if (!gl_bind_texture(tex->base.gl_target, 0))
+ return false;
 
-	return true;
+ return true;
 }

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-helpers.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-helpers.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-helpers.h -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-helpers.h Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-indexbuffer.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-indexbuffer.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-shader.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-shader.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-shaderparser.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-shaderparser.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -71,6 +71,12 @@
 		dstr_cat(&glsp->gl_string, "ivec3");
 	else if (cmp_type(type, len, "int4", 4) == 0)
 		dstr_cat(&glsp->gl_string, "ivec4");
+	else if (cmp_type(type, len, "uint2", 5) == 0)
+		dstr_cat(&glsp->gl_string, "uvec2");
+	else if (cmp_type(type, len, "uint3", 5) == 0)
+		dstr_cat(&glsp->gl_string, "uvec3");
+	else if (cmp_type(type, len, "uint4", 5) == 0)
+		dstr_cat(&glsp->gl_string, "uvec4");
 	else if (cmp_type(type, len, "float3x3", 8) == 0)
 		dstr_cat(&glsp->gl_string, "mat3x3");
 	else if (cmp_type(type, len, "float3x4", 8) == 0)
@@ -267,6 +273,7 @@
 * lerp -> mix
 * lit -> (unsupported)
 * log10 -> (unsupported)
+ * mad -> (change to operator) fma needs GLSL 400
 * mul -> (change to operator)
 * rsqrt -> inversesqrt
 * saturate -> (use clamp)
@@ -280,6 +287,31 @@
 * All else can be left as-is
 */
 
+static bool gl_write_mad(struct gl_shader_parser *glsp,
+			 struct cf_token **p_token)
+{
+	struct cf_parser *cfp = &glsp->parser.cfp;
+	cfp->cur_token = *p_token;
+
+	if (!cf_next_token(cfp))
+		return false;
+	if (!cf_token_is(cfp, "("))
+		return false;
+
+	dstr_cat(&glsp->gl_string, "(");
+	gl_write_function_contents(glsp, &cfp->cur_token, ",");
+	dstr_cat(&glsp->gl_string, ") * (");
+	cf_next_token(cfp);
+	gl_write_function_contents(glsp, &cfp->cur_token, ",");
+	dstr_cat(&glsp->gl_string, ") + (");
+	cf_next_token(cfp);
+	gl_write_function_contents(glsp, &cfp->cur_token, ")");
+	dstr_cat(&glsp->gl_string, "))");
+
+	*p_token = cfp->cur_token;
+	return true;
+}
+
 static bool gl_write_mul(struct gl_shader_parser *glsp,
 			 struct cf_token **p_token)
 {
@@ -456,18 +488,21 @@
 		dstr_cat(&glsp->gl_string, "dFdx");
 	} else if (strref_cmp(&token->str, "ddy") == 0) {
 		dstr_cat(&glsp->gl_string, "dFdy");
+	} else if (strref_cmp(&token->str, "fmod") == 0) {
+		dstr_cat(&glsp->gl_string, "mod");
 	} else if (strref_cmp(&token->str, "frac") == 0) {
 		dstr_cat(&glsp->gl_string, "fract");
 	} else if (strref_cmp(&token->str, "lerp") == 0) {
 		dstr_cat(&glsp->gl_string, "mix");
-	} else if (strref_cmp(&token->str, "fmod") == 0) {
-		dstr_cat(&glsp->gl_string, "mod");
+	} else if (strref_cmp(&token->str, "mad") == 0) {
+		/* fma not available in GLSL 330 */
+		written = gl_write_mad(glsp, &token);
+	} else if (strref_cmp(&token->str, "mul") == 0) {
+		written = gl_write_mul(glsp, &token);
 	} else if (strref_cmp(&token->str, "rsqrt") == 0) {
 		dstr_cat(&glsp->gl_string, "inversesqrt");
 	} else if (strref_cmp(&token->str, "saturate") == 0) {
 		written = gl_write_saturate(glsp, &token);
-	} else if (strref_cmp(&token->str, "mul") == 0) {
-		written = gl_write_mul(glsp, &token);
 	} else if (strref_cmp(&token->str, "sincos") == 0) {
 		written = gl_write_sincos(glsp, &token);
 	} else {

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-shaderparser.h -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-shaderparser.h Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-stagesurf.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-stagesurf.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-subsystem.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-subsystem.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-subsystem.h -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-subsystem.h Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-texture2d.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-texture2d.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-texture3d.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-texture3d.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-texturecube.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-texturecube.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-vertexbuffer.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-vertexbuffer.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-windows.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-windows.c Changed

obs-studio-29.1.3.tar.xz/libobs-opengl/gl-zstencil.c -> obs-studio-30.0.2.tar.xz/libobs-opengl/gl-zstencil.c Changed

obs-studio-29.1.3.tar.xz/libobs-winrt/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/libobs-winrt/CMakeLists.txt Changed

@@ -1,4 +1,12 @@
-project(libobs-winrt)
+cmake_minimum_required(VERSION 3.24...3.25)
+
+legacy_check()
+
+add_library(libobs-winrt-headers INTERFACE)
+add_library(OBS::winrt-headers ALIAS libobs-winrt-headers)
+
+target_sources(libobs-winrt-headers INTERFACE winrt-capture.h)
+target_include_directories(libobs-winrt-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_library(libobs-winrt MODULE)
 add_library(OBS::libobs-winrt ALIAS libobs-winrt)
@@ -8,24 +16,18 @@
 target_precompile_headers(
 libobs-winrt
 PRIVATE
- "../libobs/util/windows/ComPtr.hpp"
- <obs-module.h>
 <d3d11.h>
 <DispatcherQueue.h>
 <dwmapi.h>
+ <obs-module.h>
+ <util/windows/ComPtr.hpp>
 <Windows.Graphics.Capture.Interop.h>
 <winrt/Windows.Foundation.Metadata.h>
 <winrt/Windows.Graphics.Capture.h>
 <winrt/Windows.System.h>)
 
-target_link_libraries(libobs-winrt PRIVATE OBS::libobs Dwmapi windowsapp)
-
-target_compile_features(libobs-winrt PRIVATE cxx_std_17)
-
-set_target_properties(
- libobs-winrt
- PROPERTIES OUTPUT_NAME libobs-winrt
- FOLDER "core"
- PREFIX "")
+target_link_libraries(libobs-winrt PRIVATE OBS::libobs OBS::COMutils Dwmapi windowsapp)
 
-setup_binary_target(libobs-winrt)
+# cmake-format: off
+set_target_properties_obs(libobs-winrt PROPERTIES FOLDER core)
+# cmake-format: on

obs-studio-30.0.2.tar.xz/libobs-winrt/cmake Added

obs-studio-30.0.2.tar.xz/libobs-winrt/cmake/legacy.cmake Added

obs-studio-29.1.3.tar.xz/libobs/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/libobs/CMakeLists.txt Changed

@@ -1,7 +1,15 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.22...3.25)
 
 legacy_check()
 
+# cmake-format: off
+add_library(libobs-version STATIC EXCLUDE_FROM_ALL)
+add_library(OBS::libobs-version ALIAS libobs-version)
+# cmake-format: on
+configure_file(obsversion.c.in obsversion.c @ONLY)
+target_sources(libobs-version PRIVATE obsversion.c obsversion.h)
+set_property(TARGET libobs-version PROPERTY FOLDER core)
+
 add_library(libobs SHARED)
 add_library(OBS::libobs ALIAS libobs)
 
@@ -214,18 +222,18 @@
 graphics/vec4.c
 graphics/vec4.h)
 
-target_compile_features(libobs PUBLIC $<INSTALL_INTERFACE:cxx_std_17>)
-target_compile_options(libobs PUBLIC ${ARCH_SIMD_FLAGS})
+target_compile_features(libobs PUBLIC cxx_std_17)
 target_compile_definitions(
 libobs
 PRIVATE IS_LIBOBS
- PUBLIC ${ARCH_SIMD_DEFINES} $<BUILD_INTERFACE:$<$<BOOL:${ENABLE_HEVC}>:ENABLE_HEVC>>
+ PUBLIC $<BUILD_INTERFACE:$<$<BOOL:${ENABLE_HEVC}>:ENABLE_HEVC>>
 $<BUILD_INTERFACE:$<$<BOOL:${ENABLE_FFMPEG_MUX_DEBUG}>:SHOW_SUBPROCESSES>>)
 
 target_link_libraries(
 libobs
 PRIVATE OBS::caption
 OBS::uthash
+ OBS::libobs-version
 FFmpeg::avcodec
 FFmpeg::avformat
 FFmpeg::avutil
@@ -253,20 +261,40 @@
 set(public_headers
 # cmake-format: sortable
 callback/calldata.h
+ callback/decl.h
 callback/proc.h
 callback/signal.h
+ graphics/axisang.h
+ graphics/bounds.h
+ graphics/effect-parser.h
+ graphics/effect.h
 graphics/graphics.h
+ graphics/image-file.h
 graphics/input.h
+ graphics/libnsgif/libnsgif.h
 graphics/math-defs.h
+ graphics/math-extra.h
+ graphics/matrix3.h
+ graphics/matrix4.h
+ graphics/plane.h
+ graphics/quat.h
+ graphics/shader-parser.h
 graphics/srgb.h
 graphics/vec2.h
 graphics/vec3.h
 graphics/vec4.h
 media-io/audio-io.h
+ media-io/audio-math.h
+ media-io/audio-resampler.h
+ media-io/format-conversion.h
 media-io/frame-rate.h
 media-io/media-io-defs.h
+ media-io/media-remux.h
+ media-io/video-frame.h
 media-io/video-io.h
+ media-io/video-scaler.h
 obs-audio-controls.h
+ obs-avc.h
 obs-config.h
 obs-data.h
 obs-defs.h
@@ -274,9 +302,10 @@
 obs-hotkey.h
 obs-hotkeys.h
 obs-interaction.h
- obs-internal.h
 obs-missing-files.h
 obs-module.h
+ obs-nal.h
+ obs-nix-platform.h
 obs-output.h
 obs-properties.h
 obs-service.h
@@ -284,48 +313,73 @@
 obs-ui.h
 obs.h
 obs.hpp
+ util/AlignedNew.hpp
+ util/apple/cfstring-utils.h
+ util/array-serializer.h
 util/base.h
+ util/bitstream.h
 util/bmem.h
 util/c99defs.h
+ util/cf-lexer.h
+ util/cf-parser.h
+ util/circlebuf.h
+ util/config-file.h
+ util/crc32.h
 util/darray.h
+ util/dstr.h
+ util/dstr.hpp
+ util/file-serializer.h
+ util/lexer.h
+ util/pipe.h
+ util/platform.h
 util/profiler.h
+ util/profiler.hpp
+ util/serializer.h
+ util/simde/check.h
+ util/simde/debug-trap.h
+ util/simde/hedley.h
+ util/simde/simde-align.h
+ util/simde/simde-arch.h
+ util/simde/simde-common.h
+ util/simde/simde-constify.h
+ util/simde/simde-detect-clang.h
+ util/simde/simde-diagnostic.h
+ util/simde/simde-features.h
+ util/simde/simde-math.h
+ util/simde/x86/mmx.h
+ util/simde/x86/sse.h
+ util/simde/x86/sse2.h
 util/sse-intrin.h
+ util/task.h
 util/text-lookup.h
- util/util_uint64.h)
+ util/threading-posix.h
+ util/threading-windows.h
+ util/threading.h
+ util/uthash.h
+ util/util.hpp
+ util/util_uint128.h
+ util/util_uint64.h
+ util/windows/ComPtr.hpp
+ util/windows/CoTaskMemPtr.hpp
+ util/windows/device-enum.h
+ util/windows/HRError.hpp
+ util/windows/win-registry.h
+ util/windows/win-version.h
+ util/windows/window-helpers.h
+ util/windows/WinHandle.hpp)
 
 if(ENABLE_HEVC)
 list(APPEND public_headers obs-hevc.h)
 endif()
 
-if(ARCH_SIMD_FLAGS)
- set(public_headers
- # cmake-format: sortable
- ${public_headers}
- util/simde/check.h
- util/simde/debug-trap.h
- util/simde/hedley.h
- util/simde/simde-align.h
- util/simde/simde-arch.h
- util/simde/simde-common.h
- util/simde/simde-constify.h
- util/simde/simde-detect-clang.h
- util/simde/simde-diagnostic.h
- util/simde/simde-features.h
- util/simde/simde-math.h
- util/simde/x86/mmx.h
- util/simde/x86/sse.h
- util/simde/x86/sse2.h)
-endif()
-
-set_property(
- TARGET libobs
- APPEND
- PROPERTY OBS_PUBLIC_HEADERS ${public_headers})
+# cmake-format: off
+set_property(TARGET libobs APPEND PROPERTY OBS_PUBLIC_HEADERS ${public_headers})
 
 set_target_properties_obs(
 libobs
 PROPERTIES FOLDER core
 VERSION 0
 SOVERSION "${OBS_VERSION_MAJOR}")
+# cmake-format: on
 
 target_export(libobs)

obs-studio-29.1.3.tar.xz/libobs/audio-monitoring/osx/coreaudio-enum-devices.c -> obs-studio-30.0.2.tar.xz/libobs/audio-monitoring/osx/coreaudio-enum-devices.c Changed

obs-studio-29.1.3.tar.xz/libobs/audio-monitoring/osx/coreaudio-output.c -> obs-studio-30.0.2.tar.xz/libobs/audio-monitoring/osx/coreaudio-output.c Changed

@@ -43,7 +43,7 @@
 	circlebuf_pop_front(&monitor->new_data, buf->mAudioData,
 			 monitor->buffer_size);
 
-	buf->mAudioDataByteSize = monitor->buffer_size;
+	buf->mAudioDataByteSize = (UInt32)monitor->buffer_size;
 
 	stat = AudioQueueEnqueueBuffer(monitor->queue, buf, 0, NULL);
 	if (!success(stat, "AudioQueueEnqueueBuffer")) {
@@ -54,6 +54,15 @@
 	return true;
 }
 
+static void on_audio_pause(void *data, calldata_t *calldata)
+{
+	UNUSED_PARAMETER(calldata);
+	struct audio_monitor *monitor = data;
+	pthread_mutex_lock(&monitor->mutex);
+	circlebuf_free(&monitor->new_data);
+	pthread_mutex_unlock(&monitor->mutex);
+}
+
 static void on_audio_playback(void *param, obs_source_t *source,
 			 const struct audio_data *audio_data, bool muted)
 {
@@ -216,7 +225,7 @@
 
 	for (size_t i = 0; i < 3; i++) {
 		stat = AudioQueueAllocateBuffer(monitor->queue,
-						monitor->buffer_size,
+						(UInt32)monitor->buffer_size,
 						&monitor->buffersi);
 		if (!success(stat, "allocation of buffer")) {
 			return false;
@@ -261,6 +270,8 @@
 	if (monitor->source) {
 		obs_source_remove_audio_capture_callback(
 			monitor->source, on_audio_playback, monitor);
+		obs_source_remove_audio_pause_callback(monitor->source,
+						 on_audio_pause, monitor);
 	}
 	if (monitor->active) {
 		AudioQueueStop(monitor->queue, true);
@@ -288,6 +299,8 @@
 
 	obs_source_add_audio_capture_callback(monitor->source,
 					 on_audio_playback, monitor);
+	obs_source_add_audio_pause_callback(monitor->source, on_audio_pause,
+					 monitor);
 }
 
 struct audio_monitor *audio_monitor_create(obs_source_t *source)

obs-studio-29.1.3.tar.xz/libobs/audio-monitoring/win32/wasapi-enum-devices.c -> obs-studio-30.0.2.tar.xz/libobs/audio-monitoring/win32/wasapi-enum-devices.c Changed

obs-studio-29.1.3.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c -> obs-studio-30.0.2.tar.xz/libobs/audio-monitoring/win32/wasapi-output.c Changed

obs-studio-29.1.3.tar.xz/libobs/callback/calldata.c -> obs-studio-30.0.2.tar.xz/libobs/callback/calldata.c Changed

obs-studio-29.1.3.tar.xz/libobs/callback/calldata.h -> obs-studio-30.0.2.tar.xz/libobs/callback/calldata.h Changed

obs-studio-29.1.3.tar.xz/libobs/callback/decl.c -> obs-studio-30.0.2.tar.xz/libobs/callback/decl.c Changed

obs-studio-29.1.3.tar.xz/libobs/callback/decl.h -> obs-studio-30.0.2.tar.xz/libobs/callback/decl.h Changed

obs-studio-29.1.3.tar.xz/libobs/callback/proc.c -> obs-studio-30.0.2.tar.xz/libobs/callback/proc.c Changed

obs-studio-29.1.3.tar.xz/libobs/callback/proc.h -> obs-studio-30.0.2.tar.xz/libobs/callback/proc.h Changed

obs-studio-29.1.3.tar.xz/libobs/callback/signal.c -> obs-studio-30.0.2.tar.xz/libobs/callback/signal.c Changed

obs-studio-29.1.3.tar.xz/libobs/callback/signal.h -> obs-studio-30.0.2.tar.xz/libobs/callback/signal.h Changed

obs-studio-29.1.3.tar.xz/libobs/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/libobs/cmake/legacy.cmake Changed

@@ -4,6 +4,16 @@
 
 project(libobs)
 
+# cmake-format: off
+add_library(libobs-version STATIC EXCLUDE_FROM_ALL)
+add_library(OBS::libobs-version ALIAS libobs-version)
+# cmake-format: on
+configure_file(obsversion.c.in obsversion.c @ONLY)
+target_sources(libobs-version PRIVATE obsversion.c obsversion.h)
+target_include_directories(libobs-version PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+set_property(TARGET libobs-version PROPERTY FOLDER core)
+
+find_package(Jansson 2.5 REQUIRED)
 find_package(Threads REQUIRED)
 find_package(
 FFmpeg REQUIRED
@@ -11,12 +21,6 @@
 OPTIONAL_COMPONENTS avcodec)
 find_package(ZLIB REQUIRED)
 
-if(ENABLE_UI)
- find_qt(COMPONENTS Core)
-else()
- set(_QT_VERSION 0)
-endif()
-
 add_library(libobs SHARED)
 add_library(OBS::libobs ALIAS libobs)
 
@@ -249,6 +253,7 @@
 Jansson::Jansson
 OBS::caption
 OBS::uthash
+ OBS::libobs-version
 ZLIB::ZLIB
 PUBLIC Threads::Threads)
 
@@ -304,7 +309,8 @@
 audio-monitoring/win32/wasapi-monitoring-available.c)
 
 target_compile_definitions(libobs PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
-
+ set_source_files_properties(obs-win-crash-handler.c PROPERTIES COMPILE_DEFINITIONS
+ OBS_VERSION="${OBS_VERSION_CANONICAL}")
 target_link_libraries(libobs PRIVATE dxgi Avrt Dwmapi winmm Rpcrt4)
 
 if(MSVC)
@@ -313,6 +319,21 @@
 target_compile_options(libobs PRIVATE "$<$<COMPILE_LANGUAGE:C>:/EHc->" "$<$<COMPILE_LANGUAGE:CXX>:/EHc->")
 
 target_link_options(libobs PRIVATE "LINKER:/IGNORE:4098" "LINKER:/SAFESEH:NO")
+
+ add_library(obs-obfuscate INTERFACE)
+ add_library(OBS::obfuscate ALIAS obs-obfuscate)
+ target_sources(obs-obfuscate INTERFACE util/windows/obfuscate.c util/windows/obfuscate.h)
+ target_include_directories(obs-obfuscate INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+ add_library(obs-comutils INTERFACE)
+ add_library(OBS::COMutils ALIAS obs-comutils)
+ target_sources(obs-comutils INTERFACE util/windows/ComPtr.hpp)
+ target_include_directories(obs-comutils INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+ add_library(obs-winhandle INTERFACE)
+ add_library(OBS::winhandle ALIAS obs-winhandle)
+ target_sources(obs-winhandle INTERFACE util/windows/WinHandle.hpp)
+ target_include_directories(obs-winhandle INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 endif()
 
 elseif(OS_MACOS)
@@ -448,8 +469,7 @@
 target_compile_definitions(
 libobs
 PUBLIC HAVE_OBSCONFIG_H
- PRIVATE "OBS_INSTALL_PREFIX=\"${OBS_INSTALL_PREFIX}\"" "OBS_QT_VERSION=${_QT_VERSION}"
- "$<$<BOOL:${LINUX_PORTABLE}>:LINUX_PORTABLE>")
+ PRIVATE "OBS_INSTALL_PREFIX=\"${OBS_INSTALL_PREFIX}\"" "$<$<BOOL:${LINUX_PORTABLE}>:LINUX_PORTABLE>")
 
 if(ENABLE_FFMPEG_MUX_DEBUG)
 target_compile_definitions(libobs PRIVATE SHOW_SUBPROCESSES)

obs-studio-29.1.3.tar.xz/libobs/cmake/os-freebsd.cmake -> obs-studio-30.0.2.tar.xz/libobs/cmake/os-freebsd.cmake Changed

@@ -1,20 +1,11 @@
 find_package(X11 REQUIRED)
 find_package(x11-xcb REQUIRED)
-find_package(
- xcb
- OPTIONAL_COMPONENTS xcb-xinput
- QUIET)
+# cmake-format: off
+find_package(xcb OPTIONAL_COMPONENTS xcb-xinput QUIET)
+# cmake-format: on
 find_package(gio)
 find_package(Sysinfo REQUIRED)
 
-target_link_libraries(libobs PRIVATE X11::x11-xcb xcb::xcb Sysinfo::Sysinfo)
-
-if(TARGET xcb::xcb-xinput)
- target_link_libraries(libobs PRIVATE xcb::xcb-xinput)
-endif()
-
-target_compile_definitions(libobs PRIVATE $<$<OR:$<C_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:GNU>>:ENABLE_DARRAY_TYPE_TEST>)
-
 target_sources(
 libobs
 PRIVATE obs-nix.c
@@ -25,6 +16,12 @@
 util/platform-nix.c
 util/threading-posix.c
 util/threading-posix.h)
+target_compile_definitions(libobs PRIVATE $<$<OR:$<C_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:GNU>>:ENABLE_DARRAY_TYPE_TEST>)
+
+target_link_libraries(libobs PRIVATE X11::x11-xcb xcb::xcb Sysinfo::Sysinfo)
+if(TARGET xcb::xcb-xinput)
+ target_link_libraries(libobs PRIVATE xcb::xcb-xinput)
+endif()
 
 if(ENABLE_PULSEAUDIO)
 find_package(PulseAudio REQUIRED)
@@ -36,31 +33,28 @@
 audio-monitoring/pulse/pulseaudio-wrapper.h)
 
 target_link_libraries(libobs PRIVATE PulseAudio::PulseAudio)
-
- set_property(GLOBAL APPEND PROPERTY OBS_FEATURES_ENABLED "PulseAudio audio monitoring (Linux)")
+ target_enable_feature(libobs "PulseAudio audio monitoring (Linux)")
 else()
 target_sources(libobs PRIVATE audio-monitoring/null/null-audio-monitoring.c)
- set_property(GLOBAL APPEND PROPERTY OBS_FEATURES_DISABLED "PulseAudio audio monitoring (Linux)")
+ target_disable_feature(libobs "PulseAudio audio monitoring (Linux)")
 endif()
 
 if(TARGET gio::gio)
- target_link_libraries(libobs PRIVATE gio::gio)
-
 target_sources(libobs PRIVATE util/platform-nix-dbus.c util/platform-nix-portal.c)
+ target_link_libraries(libobs PRIVATE gio::gio)
 endif()
 
 if(ENABLE_WAYLAND)
- find_package(
- Wayland
- COMPONENTS Client
- REQUIRED)
+ # cmake-format: off
+ find_package(Wayland COMPONENTS Client REQUIRED)
+ # cmake-format: on
 find_package(xkbcommon REQUIRED)
 
- target_link_libraries(libobs PRIVATE Wayland::Client xkbcommon::xkbcommon)
 target_sources(libobs PRIVATE obs-nix-wayland.c)
- set_property(GLOBAL APPEND PROPERTY OBS_FEATURES_ENABLED "Wayland compositor support (Linux)")
+ target_link_libraries(libobs PRIVATE Wayland::Client xkbcommon::xkbcommon)
+ target_enable_feature(libobs "Wayland compositor support (Linux)")
 else()
- set_property(GLOBAL APPEND PROPERTY OBS_FEATURES_DISABLED "Wayland compositor support (Linux)")
+ target_disable_feature(libobs "Wayland compositor support (Linux)")
 endif()
 
 set_target_properties(libobs PROPERTIES OUTPUT_NAME obs)

obs-studio-29.1.3.tar.xz/libobs/cmake/os-linux.cmake -> obs-studio-30.0.2.tar.xz/libobs/cmake/os-linux.cmake Changed

@@ -1,24 +1,11 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
 find_package(LibUUID REQUIRED)
 find_package(X11 REQUIRED)
 find_package(x11-xcb REQUIRED)
-find_package(
- xcb
- COMPONENTS xcb
- OPTIONAL_COMPONENTS xcb-xinput
- QUIET)
+# cmake-format: off
+find_package(xcb COMPONENTS xcb OPTIONAL_COMPONENTS xcb-xinput QUIET)
+# cmake-format: on
 find_package(gio)
 
-target_link_libraries(libobs PRIVATE X11::x11-xcb xcb::xcb LibUUID::LibUUID ${CMAKE_DL_LIBS})
-
-if(TARGET xcb::xcb-xinput)
- target_link_libraries(libobs PRIVATE xcb::xcb-xinput)
-endif()
-
-target_compile_definitions(libobs PRIVATE USE_XDG
- $<$<OR:$<C_COMPILER_ID:GNU>,$<CXX_COMPILER_ID:GNU>>:ENABLE_DARRAY_TYPE_TEST>)
-
 target_sources(
 libobs
 PRIVATE obs-nix.c
@@ -30,6 +17,13 @@
 util/threading-posix.c
 util/threading-posix.h)
 
+target_compile_definitions(libobs PRIVATE USE_XDG $<$<C_COMPILER_ID:GNU>:ENABLE_DARRAY_TYPE_TEST>)
+
+target_link_libraries(libobs PRIVATE X11::x11-xcb xcb::xcb LibUUID::LibUUID ${CMAKE_DL_LIBS})
+if(TARGET xcb::xcb-xinput)
+ target_link_libraries(libobs PRIVATE xcb::xcb-xinput)
+endif()
+
 if(ENABLE_PULSEAUDIO)
 find_package(PulseAudio REQUIRED)
 
@@ -40,7 +34,6 @@
 audio-monitoring/pulse/pulseaudio-wrapper.h)
 
 target_link_libraries(libobs PRIVATE PulseAudio::PulseAudio)
-
 target_enable_feature(libobs "PulseAudio audio monitoring (Linux)")
 else()
 target_sources(libobs PRIVATE audio-monitoring/null/null-audio-monitoring.c)
@@ -48,20 +41,18 @@
 endif()
 
 if(TARGET gio::gio)
- target_link_libraries(libobs PRIVATE gio::gio)
-
 target_sources(libobs PRIVATE util/platform-nix-dbus.c util/platform-nix-portal.c)
+ target_link_libraries(libobs PRIVATE gio::gio)
 endif()
 
 if(ENABLE_WAYLAND)
- find_package(
- Wayland
- COMPONENTS Client
- REQUIRED)
+ # cmake-format: off
+ find_package(Wayland COMPONENTS Client REQUIRED)
+ # cmake-format: on
 find_package(xkbcommon REQUIRED)
 
- target_link_libraries(libobs PRIVATE Wayland::Client xkbcommon::xkbcommon)
 target_sources(libobs PRIVATE obs-nix-wayland.c)
+ target_link_libraries(libobs PRIVATE Wayland::Client xkbcommon::xkbcommon)
 target_enable_feature(libobs "Wayland compositor support (Linux)")
 else()
 target_disable_feature(libobs "Wayland compositor support (Linux)")

obs-studio-29.1.3.tar.xz/libobs/cmake/os-macos.cmake -> obs-studio-30.0.2.tar.xz/libobs/cmake/os-macos.cmake Changed

@@ -1,29 +1,12 @@
-find_library(COCOA Cocoa)
-find_library(COREAUDIO CoreAudio)
-find_library(AUDIOTOOLBOX AudioToolbox)
-find_library(AUDIOUNIT AudioUnit)
-find_library(APPKIT AppKit)
-find_library(IOKIT IOKit)
-find_library(CARBON Carbon)
-
-mark_as_advanced(
- COCOA
- COREAUDIO
- AUDIOTOOLBOX
- AUDIOUNIT
- APPKIT
- IOKIT
- CARBON)
-
 target_link_libraries(
 libobs
- PRIVATE ${COCOA}
- ${COREAUDIO}
- ${AUDIOTOOLBOX}
- ${AUDIOUNIT}
- ${APPKIT}
- ${IOKIT}
- ${CARBON})
+ PRIVATE "$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreAudio.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,AudioToolbox.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,AudioUnit.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,IOKit.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,Carbon.framework>")
 
 target_sources(
 libobs
@@ -39,5 +22,7 @@
 util/threading-posix.h
 util/apple/cfstring-utils.h)
 
+target_compile_options(libobs PUBLIC -Wno-strict-prototypes -Wno-shorten-64-to-32)
+
 set_property(SOURCE util/platform-cocoa.m obs-cocoa.m PROPERTY COMPILE_FLAGS -fobjc-arc)
 set_property(TARGET libobs PROPERTY FRAMEWORK TRUE)

obs-studio-29.1.3.tar.xz/libobs/cmake/os-windows.cmake -> obs-studio-30.0.2.tar.xz/libobs/cmake/os-windows.cmake Changed

obs-studio-29.1.3.tar.xz/libobs/data/area.effect -> obs-studio-30.0.2.tar.xz/libobs/data/area.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/bicubic_scale.effect -> obs-studio-30.0.2.tar.xz/libobs/data/bicubic_scale.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/bilinear_lowres_scale.effect -> obs-studio-30.0.2.tar.xz/libobs/data/bilinear_lowres_scale.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/color.effect -> obs-studio-30.0.2.tar.xz/libobs/data/color.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/default.effect -> obs-studio-30.0.2.tar.xz/libobs/data/default.effect Changed

@@ -31,10 +31,34 @@
 float4 PSDrawAlphaDivide(VertInOut vert_in) : TARGET
 {
 	float4 rgba = image.Sample(def_sampler, vert_in.uv);
-	rgba.rgb *= max(1. / rgba.a, 0.);
+	rgba.rgb *= (rgba.a > 0.) ? (1. / rgba.a) : 0.;
 	return rgba;
 }
 
+float4 PSDrawAlphaDivideTonemap(VertInOut vert_in) : TARGET
+{
+	float4 rgba = image.Sample(def_sampler, vert_in.uv);
+	rgba.rgb *= (rgba.a > 0.) ? (1. / rgba.a) : 0.;
+	rgba.rgb = rec709_to_rec2020(rgba.rgb);
+	rgba.rgb = reinhard(rgba.rgb);
+	rgba.rgb = rec2020_to_rec709(rgba.rgb);
+	return rgba;
+}
+
+float4 PSDrawAlphaDivideR10L(VertInOut vert_in) : TARGET
+{
+	float4 rgba = image.Sample(def_sampler, vert_in.uv);
+	rgba.rgb *= (rgba.a > 0.) ? (multiplier / rgba.a) : 0.;
+	rgba.rgb = rec709_to_rec2020(rgba.rgb);
+	rgba.rgb = linear_to_st2084(rgba.rgb);
+	uint3 rgb1023 = uint3(mad(rgba.rgb, 1023., .5));
+	uint b = (rgb1023.b & 0x3Fu) << 2;
+	uint g = ((rgb1023.b & 0x3C0u) >> 6) | ((rgb1023.g & 0xFu) << 4);
+	uint r = ((rgb1023.g & 0x3F0u) >> 4) | ((rgb1023.r & 0x3u) << 6);
+	uint a = ((rgb1023.r & 0x3FCu) >> 2);
+	return float4(uint4(r, g, b, a)) / 255.;
+}
+
 float4 PSDrawNonlinearAlpha(VertInOut vert_in) : TARGET
 {
 	float4 rgba = image.Sample(def_sampler, vert_in.uv);
@@ -130,6 +154,24 @@
 	}
 }
 
+technique DrawAlphaDivideTonemap
+{
+	pass
+	{
+		vertex_shader = VSDefault(vert_in);
+		pixel_shader = PSDrawAlphaDivideTonemap(vert_in);
+	}
+}
+
+technique DrawAlphaDivideR10L
+{
+	pass
+	{
+		vertex_shader = VSDefault(vert_in);
+		pixel_shader = PSDrawAlphaDivideR10L(vert_in);
+	}
+}
+
 technique DrawNonlinearAlpha
 {
 	pass

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_base.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_base.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_blend.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_blend.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_blend_2x.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_blend_2x.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_discard.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_discard.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_discard_2x.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_discard_2x.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_linear.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_linear.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_linear_2x.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_linear_2x.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_yadif.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_yadif.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/deinterlace_yadif_2x.effect -> obs-studio-30.0.2.tar.xz/libobs/data/deinterlace_yadif_2x.effect Changed

obs-studio-29.1.3.tar.xz/libobs/data/format_conversion.effect -> obs-studio-30.0.2.tar.xz/libobs/data/format_conversion.effect Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -596,7 +596,7 @@
 	float2 cbcr = image.Sample(def_sampler, frag_in.uvuv.zw, 0).yw;
 	float leftover = frac(frag_in.uvuv.x);
 	float y = (leftover < 0.5) ? y01.x : y01.y;
-	float3 yuv = float3(y, cbcr);	
+	float3 yuv = float3(y, cbcr);
 	float3 pq = YUV_to_RGB(yuv);
 	float3 hdr2020 = st2084_to_linear_eetf(pq, hdr_lw, hdr_lmax) * maximum_over_sdr_white_nits;
 	float3 rgb = rec2020_to_rec709(hdr2020);
@@ -1054,6 +1054,72 @@
 	return rgb;
 }
 
+float3 compute_r10l_reverse(float2 pos, bool limited)
+{
+	float4 xyzw = image.Load(int3(pos, 0)).bgra;
+	uint4 xyzw255 = uint4(mad(xyzw, 255., 0.5));
+	uint r = ((xyzw255.z & 0xC0u) >> 6) | (xyzw255.w << 2);
+	uint g = ((xyzw255.y & 0xFu) >> 4) | ((xyzw255.z & 0x3Fu) << 4);
+	uint b = (xyzw255.x >> 2) | ((xyzw255.y & 0xFu) << 6);
+	float3 rgb = float3(uint3(r, g, b));
+	if (limited)
+	{
+		rgb = mad(rgb, 1. / 876., -16. / 219.);
+	}
+	else
+	{
+		rgb /= 1023.;
+	}
+
+	return rgb;
+}
+
+float4 PSR10L_SRGB_Full_Reverse(FragPos frag_in) : TARGET
+{
+	float3 rgb = compute_r10l_reverse(frag_in.pos.xy, false);
+	rgb = srgb_nonlinear_to_linear(rgb);
+	return float4(rgb, 1.);
+}
+
+float4 PSR10L_PQ_2020_709_Full_Reverse(FragPos frag_in) : TARGET
+{
+	float3 pq = compute_r10l_reverse(frag_in.pos.xy, false);
+	float3 hdr2020 = st2084_to_linear_eetf(pq, hdr_lw, hdr_lmax) * maximum_over_sdr_white_nits;
+	float3 rgb = rec2020_to_rec709(hdr2020);
+	return float4(rgb, 1.);
+}
+
+float4 PSR10L_HLG_2020_709_Full_Reverse(FragPos frag_in) : TARGET
+{
+	float3 hlg = compute_r10l_reverse(frag_in.pos.xy, false);
+	float3 hdr2020 = hlg_to_linear(hlg, hlg_exponent) * maximum_over_sdr_white_nits;
+	float3 rgb = rec2020_to_rec709(hdr2020);
+	return float4(rgb, 1.);
+}
+
+float4 PSR10L_SRGB_Limited_Reverse(FragPos frag_in) : TARGET
+{
+	float3 rgb = compute_r10l_reverse(frag_in.pos.xy, true);
+	rgb = srgb_nonlinear_to_linear(rgb);
+	return float4(rgb, 1.);
+}
+
+float4 PSR10L_PQ_2020_709_Limited_Reverse(FragPos frag_in) : TARGET
+{
+	float3 pq = compute_r10l_reverse(frag_in.pos.xy, true);
+	float3 hdr2020 = st2084_to_linear_eetf(pq, hdr_lw, hdr_lmax) * maximum_over_sdr_white_nits;
+	float3 rgb = rec2020_to_rec709(hdr2020);
+	return float4(rgb, 1.);
+}
+
+float4 PSR10L_HLG_2020_709_Limited_Reverse(FragPos frag_in) : TARGET
+{
+	float3 hlg = compute_r10l_reverse(frag_in.pos.xy, true);
+	float3 hdr2020 = hlg_to_linear(hlg, hlg_exponent) * maximum_over_sdr_white_nits;
+	float3 rgb = rec2020_to_rec709(hdr2020);
+	return float4(rgb, 1.);
+}
+
 technique Planar_Y
 {
 	pass
@@ -1701,3 +1767,57 @@
 		pixel_shader = PSBGR3_Full(frag_in);
 	}
 }
+
+technique R10L_SRGB_Full_Reverse
+{
+	pass
+	{
+		vertex_shader = VSPos(id);
+		pixel_shader = PSR10L_SRGB_Full_Reverse(frag_in);
+	}
+}
+
+technique R10L_PQ_2020_709_Full_Reverse
+{
+	pass
+	{
+		vertex_shader = VSPos(id);
+		pixel_shader = PSR10L_PQ_2020_709_Full_Reverse(frag_in);
+	}
+}
+
+technique R10L_HLG_2020_709_Full_Reverse
+{
+	pass
+	{
+		vertex_shader = VSPos(id);
+		pixel_shader = PSR10L_HLG_2020_709_Full_Reverse(frag_in);
+	}
+}
+
+technique R10L_SRGB_Limited_Reverse
+{
+	pass
+	{
+		vertex_shader = VSPos(id);
+		pixel_shader = PSR10L_SRGB_Limited_Reverse(frag_in);
+	}
+}
+
+technique R10L_PQ_2020_709_Limited_Reverse
+{
+	pass
+	{
+		vertex_shader = VSPos(id);
+		pixel_shader = PSR10L_PQ_2020_709_Limited_Reverse(frag_in);
+	}
+}
+
+technique R10L_HLG_2020_709_Limited_Reverse
+{
+	pass
+	{
+		vertex_shader = VSPos(id);
+		pixel_shader = PSR10L_HLG_2020_709_Limited_Reverse(frag_in);
+	}
+}

obs-studio-29.1.3.tar.xz/libobs/data/lanczos_scale.effect -> obs-studio-30.0.2.tar.xz/libobs/data/lanczos_scale.effect Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/axisang.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/axisang.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/axisang.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/axisang.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/bounds.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/bounds.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/bounds.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/bounds.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/device-exports.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/device-exports.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/effect-parser.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/effect-parser.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8 @@
 #include "effect-parser.h"
 #include "effect.h"
 
+typedef DARRAY(struct dstr) dstr_array_t;
+
 static inline bool ep_parse_param_assign(struct effect_parser *ep,
 					 struct ep_param *param);
 
@@ -394,7 +396,7 @@
 }
 
 static int ep_parse_annotations(struct effect_parser *ep,
-				struct darray *annotations)
+				ep_param_array_t *annotations)
 {
 	if (!cf_token_is(&ep->cfp, "<")) {
 		cf_adderror_expecting(&ep->cfp, "<");
@@ -433,7 +435,7 @@
 		if (do_break)
 			break;
 
-		darray_push_back(sizeof(struct ep_param), annotations, &var);
+		da_push_back(*annotations, &var);
 	}
 
 	if (!cf_token_is(&ep->cfp, ">")) {
@@ -452,11 +454,11 @@
 static int ep_parse_param_annotations(struct effect_parser *ep,
 				 struct ep_param *param)
 {
-	return ep_parse_annotations(ep, &param->annotations.da);
+	return ep_parse_annotations(ep, &param->annotations);
 }
 
 static inline int ep_parse_pass_command_call(struct effect_parser *ep,
-					 struct darray *call)
+					 cf_token_array_t *call)
 {
 	struct cf_token end_token;
 	cf_token_clear(&end_token);
@@ -467,31 +469,30 @@
 			return PARSE_CONTINUE;
 		}
 
-		darray_push_back(sizeof(struct cf_token), call,
-				 ep->cfp.cur_token);
+		da_push_back(*call, ep->cfp.cur_token);
 		if (!cf_next_valid_token(&ep->cfp))
 			return PARSE_EOF;
 	}
 
-	darray_push_back(sizeof(struct cf_token), call, ep->cfp.cur_token);
-	darray_push_back(sizeof(struct cf_token), call, &end_token);
+	da_push_back(*call, ep->cfp.cur_token);
+	da_push_back(*call, &end_token);
 	return PARSE_SUCCESS;
 }
 
 static int ep_parse_pass_command(struct effect_parser *ep, struct ep_pass *pass)
 {
-	struct darray *call; /* struct cf_token */
+	cf_token_array_t *call;
 
 	if (!cf_next_valid_token(&ep->cfp))
 		return PARSE_EOF;
 
 	if (cf_token_is(&ep->cfp, "vertex_shader") ||
 	 cf_token_is(&ep->cfp, "vertex_program")) {
-		call = &pass->vertex_program.da;
+		call = &pass->vertex_program;
 
 	} else if (cf_token_is(&ep->cfp, "pixel_shader") ||
 		 cf_token_is(&ep->cfp, "pixel_program")) {
-		call = &pass->fragment_program.da;
+		call = &pass->fragment_program;
 
 	} else {
 		cf_adderror_syntax_error(&ep->cfp);
@@ -1514,7 +1515,7 @@
 /* ------------------------------------------------------------------------- */
 
 static inline void ep_write_param(struct dstr *shader, struct ep_param *param,
-				 struct darray *used_params)
+				 dstr_array_t *used_params)
 {
 	if (param->written)
 		return;
@@ -1524,7 +1525,7 @@
 	} else if (param->is_uniform) {
 		struct dstr new;
 		dstr_init_copy(&new, param->name);
-		darray_push_back(sizeof(struct dstr), used_params, &new);
+		da_push_back(*used_params, &new);
 
 		dstr_cat(shader, "uniform ");
 	}
@@ -1544,7 +1545,7 @@
 static inline void ep_write_func_param_deps(struct effect_parser *ep,
 					 struct dstr *shader,
 					 struct ep_func *func,
-					 struct darray *used_params)
+					 dstr_array_t *used_params)
 {
 	size_t i;
 	for (i = 0; i < func->param_deps.num; i++) {
@@ -1654,12 +1655,12 @@
 }
 
 static void ep_write_func(struct effect_parser *ep, struct dstr *shader,
-			 struct ep_func *func, struct darray *used_params);
+			 struct ep_func *func, dstr_array_t *used_params);
 
 static inline void ep_write_func_func_deps(struct effect_parser *ep,
 					 struct dstr *shader,
 					 struct ep_func *func,
-					 struct darray *used_params)
+					 dstr_array_t *used_params)
 {
 	size_t i;
 	for (i = 0; i < func->func_deps.num; i++) {
@@ -1674,7 +1675,7 @@
 }
 
 static void ep_write_func(struct effect_parser *ep, struct dstr *shader,
-			 struct ep_func *func, struct darray *used_params)
+			 struct ep_func *func, dstr_array_t *used_params)
 {
 	size_t i;
 
@@ -1786,8 +1787,8 @@
 }
 
 static void ep_makeshaderstring(struct effect_parser *ep, struct dstr *shader,
-				struct darray *shader_call,
-				struct darray *used_params)
+				cf_token_array_t *shader_call,
+				dstr_array_t *used_params)
 {
 	struct cf_token *token = shader_call->array;
 	struct cf_token *func_name;
@@ -1828,19 +1829,16 @@
 	ep_reset_written(ep);
 }
 
-static void ep_compile_annotations(struct darray *ep_annotations,
-				 struct darray *gsp_annotations,
+static void ep_compile_annotations(ep_param_array_t *ep_annotations,
+				 gs_effect_param_array_t *gsp_annotations,
 				 struct effect_parser *ep)
 {
-	darray_resize(sizeof(struct gs_effect_param), gsp_annotations,
-		 ep_annotations->num);
+	da_resize(*gsp_annotations, ep_annotations->num);
 
 	size_t i;
 	for (i = 0; i < ep_annotations->num; i++) {
-		struct gs_effect_param *param =
-			((struct gs_effect_param *)gsp_annotations->array) + i;
-		struct ep_param *param_in =
-			((struct ep_param *)ep_annotations->array) + i;
+		struct gs_effect_param *param = gsp_annotations->array + i;
+		struct ep_param *param_in = ep_annotations->array + i;
 
 		param->name = bstrdup(param_in->name);
 		param->section = EFFECT_ANNOTATION;
@@ -1860,8 +1858,8 @@
 			 struct gs_effect_param *gs_effect_input,
 			 struct effect_parser *ep)
 {
-	ep_compile_annotations(&(ep_param_input->annotations.da),
-			 &(gs_effect_input->annotations.da), ep);
+	ep_compile_annotations(&(ep_param_input->annotations),
+			 &(gs_effect_input->annotations), ep);
 }
 
 static void ep_compile_param(struct effect_parser *ep, size_t idx)
@@ -1893,21 +1891,16 @@
 }
 
 static bool ep_compile_pass_shaderparams(struct effect_parser *ep,
-					 struct darray *pass_params,
-					 struct darray *used_params,
+					 pass_shaderparam_array_t *pass_params,
+					 dstr_array_t *used_params,
 					 gs_shader_t *shader)
 {
 	size_t i;
-	darray_resize(sizeof(struct pass_shaderparam), pass_params,
-		 used_params->num);
+	da_resize(*pass_params, used_params->num);
 
 	for (i = 0; i < pass_params->num; i++) {
-		struct dstr *param_name;
-		struct pass_shaderparam *param;
-
-		param_name = darray_item(sizeof(struct dstr), used_params, i);
-		param = darray_item(sizeof(struct pass_shaderparam),
-				 pass_params, i);
+		struct dstr *param_name = used_params->array + i;
+		struct pass_shaderparam *param = pass_params->array + i;
 
 		param->eparam = gs_effect_get_param_by_name(ep->effect,
 							 param_name->array);
@@ -1936,13 +1929,14 @@
 {
 	struct dstr shader_str;
 	struct dstr location;
-	struct darray used_params; /* struct dstr */
-	struct darray *pass_params = NULL; /* struct pass_shaderparam */
+	dstr_array_t used_params;
+	pass_shaderparam_array_t *pass_params = NULL;
 	gs_shader_t *shader = NULL;
 	bool success = true;
+	char *errors = NULL;
 
 	dstr_init(&shader_str);
-	darray_init(&used_params);
+	da_init(used_params);
 	dstr_init(&location);
 
 	dstr_copy(&location, ep->cfp.lex.file);
@@ -1958,25 +1952,30 @@
 		 (unsigned)pass_idx);
 
 	if (type == GS_SHADER_VERTEX) {
-		ep_makeshaderstring(ep, &shader_str,
-				 &pass_in->vertex_program.da, &used_params);
+		ep_makeshaderstring(ep, &shader_str, &pass_in->vertex_program,
+				 &used_params);
 
-		pass->vertshader = gs_vertexshader_create(shader_str.array,
-							 location.array, NULL);
+		pass->vertshader = gs_vertexshader_create(
+			shader_str.array, location.array, &errors);
 
 		shader = pass->vertshader;
-		pass_params = &pass->vertshader_params.da;
+		pass_params = &pass->vertshader_params;
 	} else if (type == GS_SHADER_PIXEL) {
-		ep_makeshaderstring(ep, &shader_str,
-				 &pass_in->fragment_program.da,
+		ep_makeshaderstring(ep, &shader_str, &pass_in->fragment_program,
 				 &used_params);
 
-		pass->pixelshader = gs_pixelshader_create(shader_str.array,
-							 location.array, NULL);
+		pass->pixelshader = gs_pixelshader_create(
+			shader_str.array, location.array, &errors);
 
 		shader = pass->pixelshader;
-		pass_params = &pass->pixelshader_params.da;
+		pass_params = &pass->pixelshader_params;
+	}
+
+	if (errors && strlen(errors)) {
+		cf_adderror(&ep->cfp, "Error creating shader: $1", LEX_ERROR,
+			 errors, NULL, NULL);
 	}
+	bfree(errors);
 
 #if defined(_DEBUG) && defined(_DEBUG_SHADERS)
 	blog(LOG_DEBUG, "\t\t\t%s Shader:",
@@ -1994,7 +1993,7 @@
 
 	dstr_free(&location);
 	dstr_array_free(used_params.array, used_params.num);
-	darray_free(&used_params);
+	da_free(used_params);
 	dstr_free(&shader_str);
 
 	return success;

obs-studio-29.1.3.tar.xz/libobs/graphics/effect-parser.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/effect-parser.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -28,6 +28,9 @@
 
 struct dstr;
 
+typedef DARRAY(struct ep_param) ep_param_array_t;
+typedef DARRAY(struct ep_var) ep_var_array_t;
+
 /*
 * The effect parser takes an effect file and converts it into individual
 * shaders for each technique's pass. It automatically writes all dependent
@@ -73,11 +76,9 @@
 	struct gs_effect_param *param;
 	bool is_const, is_property, is_uniform, is_texture, written;
 	int writeorder, array_count;
-	DARRAY(struct ep_param) annotations;
+	ep_param_array_t annotations;
 };
 
-extern void ep_param_writevar(struct dstr *dst, struct darray *use_params);
-
 static inline void ep_param_init(struct ep_param *epp, char *type, char *name,
 				 bool is_property, bool is_const,
 				 bool is_uniform)
@@ -113,7 +114,7 @@
 
 struct ep_struct {
 	char *name;
-	DARRAY(struct ep_var) vars; /* struct ep_var */
+	ep_var_array_t vars; /* struct ep_var */
 	bool written;
 };
 
@@ -175,8 +176,8 @@
 
 struct ep_pass {
 	char *name;
-	DARRAY(struct cf_token) vertex_program;
-	DARRAY(struct cf_token) fragment_program;
+	cf_token_array_t vertex_program;
+	cf_token_array_t fragment_program;
 	struct gs_effect_pass *pass;
 };
 
@@ -222,7 +223,7 @@
 struct ep_func {
 	char *name, *ret_type, *mapping;
 	struct dstr contents;
-	DARRAY(struct ep_var) param_vars;
+	ep_var_array_t param_vars;
 	DARRAY(char *) func_deps;
 	DARRAY(char *) struct_deps;
 	DARRAY(char *) param_deps;
@@ -259,7 +260,7 @@
 struct effect_parser {
 	gs_effect_t *effect;
 
-	DARRAY(struct ep_param) params;
+	ep_param_array_t params;
 	DARRAY(struct ep_struct) structs;
 	DARRAY(struct ep_func) funcs;
 	DARRAY(struct ep_sampler) samplers;
@@ -267,7 +268,7 @@
 
 	/* internal vars */
 	DARRAY(struct cf_lexer) files;
-	DARRAY(struct cf_token) tokens;
+	cf_token_array_t tokens;
 	struct gs_effect_pass *cur_pass;
 
 	struct cf_parser cfp;

obs-studio-29.1.3.tar.xz/libobs/graphics/effect.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/effect.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -136,7 +136,7 @@
 	}
 }
 
-static inline void reset_params(struct darray *shaderparams)
+static inline void reset_params(pass_shaderparam_array_t *shaderparams)
 {
 	struct pass_shaderparam *params = shaderparams->array;
 	size_t i;
@@ -145,7 +145,8 @@
 		paramsi.eparam->changed = false;
 }
 
-static void upload_shader_params(struct darray *pass_params, bool changed_only)
+static void upload_shader_params(pass_shaderparam_array_t *pass_params,
+				 bool changed_only)
 {
 	struct pass_shaderparam *params = pass_params->array;
 	size_t i;
@@ -177,13 +178,13 @@
 static inline void upload_parameters(struct gs_effect *effect,
 				 bool changed_only)
 {
-	struct darray *vshader_params, *pshader_params;
+	pass_shaderparam_array_t *vshader_params, *pshader_params;
 
 	if (!effect->cur_pass)
 		return;
 
-	vshader_params = &effect->cur_pass->vertshader_params.da;
-	pshader_params = &effect->cur_pass->pixelshader_params.da;
+	vshader_params = &effect->cur_pass->vertshader_params;
+	pshader_params = &effect->cur_pass->pixelshader_params;
 
 	upload_shader_params(vshader_params, changed_only);
 	upload_shader_params(pshader_params, changed_only);
@@ -232,7 +233,7 @@
 	return false;
 }
 
-static inline void clear_tex_params(struct darray *in_params)
+static inline void clear_tex_params(pass_shaderparam_array_t *in_params)
 {
 	struct pass_shaderparam *params = in_params->array;
 
@@ -255,8 +256,8 @@
 	if (!pass)
 		return;
 
-	clear_tex_params(&pass->vertshader_params.da);
-	clear_tex_params(&pass->pixelshader_params.da);
+	clear_tex_params(&pass->vertshader_params);
+	clear_tex_params(&pass->pixelshader_params);
 	tech->effect->cur_pass = NULL;
 }

obs-studio-29.1.3.tar.xz/libobs/graphics/effect.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/effect.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -24,6 +24,9 @@
 extern "C" {
 #endif
 
+typedef DARRAY(struct gs_effect_param) gs_effect_param_array_t;
+typedef DARRAY(struct pass_shaderparam) pass_shaderparam_array_t;
+
 /*
 * Effects introduce a means of bundling together shader text into one
 * file with shared functions and parameters. This is done because often
@@ -62,7 +65,7 @@
 
 	/*char *full_name;
 	float scroller_min, scroller_max, scroller_inc, scroller_mul;*/
-	DARRAY(struct gs_effect_param) annotations;
+	gs_effect_param_array_t annotations;
 };
 
 static inline void effect_param_init(struct gs_effect_param *param)
@@ -101,8 +104,8 @@
 
 	gs_shader_t *vertshader;
 	gs_shader_t *pixelshader;
-	DARRAY(struct pass_shaderparam) vertshader_params;
-	DARRAY(struct pass_shaderparam) pixelshader_params;
+	pass_shaderparam_array_t vertshader_params;
+	pass_shaderparam_array_t pixelshader_params;
 };
 
 static inline void effect_pass_init(struct gs_effect_pass *pass)
@@ -152,7 +155,7 @@
 	bool cached;
 	char *effect_path, *effect_dir;
 
-	DARRAY(struct gs_effect_param) params;
+	gs_effect_param_array_t params;
 	DARRAY(struct gs_effect_technique) techniques;
 
 	struct gs_effect_technique *cur_technique;
@@ -189,12 +192,6 @@
 	effect->effect_dir = NULL;
 }
 
-EXPORT void effect_upload_params(gs_effect_t *effect, bool changed_only);
-EXPORT void effect_upload_shader_params(gs_effect_t *effect,
-					gs_shader_t *shader,
-					struct darray *pass_params,
-					bool changed_only);
-
 #ifdef __cplusplus
 }
 #endif

obs-studio-29.1.3.tar.xz/libobs/graphics/graphics-ffmpeg.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/graphics-ffmpeg.c Changed

@@ -37,35 +37,23 @@
 	}
 
 	AVStream *const stream = fmt_ctx->streamsret;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 	AVCodecParameters *const codecpar = stream->codecpar;
 	const AVCodec *const decoder = avcodec_find_decoder(
 		codecpar->codec_id); // fix discarded-qualifiers
-#else
-	AVCodecContext *const decoder_ctx = stream->codec;
-	AVCodec *const decoder = avcodec_find_decoder(decoder_ctx->codec_id);
-#endif
+
 	if (!decoder) {
 		blog(LOG_WARNING, "Failed to find decoder for file '%s'",
 		 info->file);
 		return false;
 	}
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 	AVCodecContext *const decoder_ctx = avcodec_alloc_context3(decoder);
 	avcodec_parameters_to_context(decoder_ctx, codecpar);
-#endif
 
 	info->decoder_ctx = decoder_ctx;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 	info->cx = codecpar->width;
 	info->cy = codecpar->height;
 	info->format = codecpar->format;
-#else
-	info->cx = decoder_ctx->width;
-	info->cy = decoder_ctx->height;
-	info->format = decoder_ctx->pix_fmt;
-#endif
 
 	ret = avcodec_open2(decoder_ctx, decoder, NULL);
 	if (ret < 0) {
@@ -578,7 +566,6 @@
 	}
 
 	while (!got_frame) {
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
 		ret = avcodec_send_packet(info->decoder_ctx, &packet);
 		if (ret == 0)
 			ret = avcodec_receive_frame(info->decoder_ctx, frame);
@@ -587,10 +574,7 @@
 
 		if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
 			ret = 0;
-#else
-		ret = avcodec_decode_video2(info->decoder_ctx, frame,
-					 &got_frame, &packet);
-#endif
+
 		if (ret < 0) {
 			blog(LOG_WARNING, "Failed to decode frame for '%s': %s",
 			 info->file, av_err2str(ret));
@@ -606,12 +590,7 @@
 	return data;
 }
 
-void gs_init_image_deps(void)
-{
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	av_register_all();
-#endif
-}
+void gs_init_image_deps(void) {}
 
 void gs_free_image_deps(void) {}

obs-studio-29.1.3.tar.xz/libobs/graphics/graphics-imports.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/graphics-imports.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/graphics-internal.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/graphics-internal.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/graphics.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/graphics.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/graphics.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/graphics.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/half.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/half.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/image-file.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/image-file.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/image-file.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/image-file.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/input.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/input.h Changed

obs-studio-30.0.2.tar.xz/libobs/graphics/libnsgif/LICENSE.libnsgif Added

@@ -0,0 +1,33 @@
+libnsgif is licensed under the MIT license. The licensing statement
+and the full license are reproduced below.
+
+/*
+ * Copyright 2003 James Bursa <bursa@users.sourceforge.net>
+ * Copyright 2004 John Tytgat <John.Tytgat@aaug.net>
+ * Copyright 2004 Richard Wilson <richard.wilson@netsurf-browser.org>
+ * Copyright 2008 Sean Fox <dyntryx@gmail.com>
+ *
+ * This file is part of NetSurf's libnsgif, http://www.netsurf-browser.org/
+ * Licenced under the MIT License,
+ * http://www.opensource.org/licenses/mit-license.php
+ */
+
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

obs-studio-29.1.3.tar.xz/libobs/graphics/math-defs.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/math-defs.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/math-extra.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/math-extra.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/math-extra.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/math-extra.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/matrix3.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/matrix3.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/matrix3.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/matrix3.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/matrix4.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/matrix4.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/matrix4.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/matrix4.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/plane.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/plane.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/plane.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/plane.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/quat.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/quat.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/quat.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/quat.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/shader-parser.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/shader-parser.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/shader-parser.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/shader-parser.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/srgb.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/srgb.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/texture-render.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/texture-render.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/vec2.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/vec2.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/vec2.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/vec2.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/vec3.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/vec3.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/vec3.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/vec3.h Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/vec4.c -> obs-studio-30.0.2.tar.xz/libobs/graphics/vec4.c Changed

obs-studio-29.1.3.tar.xz/libobs/graphics/vec4.h -> obs-studio-30.0.2.tar.xz/libobs/graphics/vec4.h Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/audio-io.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/audio-io.c Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/audio-io.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/audio-io.h Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/audio-math.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/audio-math.h Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/audio-resampler-ffmpeg.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/audio-resampler-ffmpeg.c Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/audio-resampler.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/audio-resampler.h Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/format-conversion.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/format-conversion.c Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/format-conversion.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/format-conversion.h Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/media-io-defs.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/media-io-defs.h Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/media-remux.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/media-remux.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Ruwen Hahn <palana@stunned.de>
+ Copyright (C) 2023 by Ruwen Hahn <palana@stunned.de>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -28,12 +28,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if LIBAVCODEC_VERSION_MAJOR >= 58
-#define CODEC_FLAG_GLOBAL_H AV_CODEC_FLAG_GLOBAL_HEADER
-#else
-#define CODEC_FLAG_GLOBAL_H CODEC_FLAG_GLOBAL_HEADER
-#endif
-
 #ifndef FF_API_BUFFER_SIZE_T
 #define FF_API_BUFFER_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57)
 #endif
@@ -90,12 +84,7 @@
 
 	for (unsigned i = 0; i < job->ifmt_ctx->nb_streams; i++) {
 		AVStream *in_stream = job->ifmt_ctx->streamsi;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 		AVStream *out_stream = avformat_new_stream(job->ofmt_ctx, NULL);
-#else
-		AVStream *out_stream = avformat_new_stream(
-			job->ofmt_ctx, in_stream->codec->codec);
-#endif
 		if (!out_stream) {
 			blog(LOG_ERROR, "media_remux: Failed to allocate output"
 					" stream");
@@ -137,12 +126,8 @@
 			}
 		}
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 		ret = avcodec_parameters_copy(out_stream->codecpar,
 					 in_stream->codecpar);
-#else
-		ret = avcodec_copy_context(out_stream->codec, in_stream->codec);
-#endif
 
 		if (ret < 0) {
 			blog(LOG_ERROR,
@@ -152,7 +137,6 @@
 
 		av_dict_copy(&out_stream->metadata, in_stream->metadata, 0);
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 		if (in_stream->codecpar->codec_id == AV_CODEC_ID_HEVC &&
 		 job->ofmt_ctx->oformat->codec_tag &&
 		 av_codec_get_id(job->ofmt_ctx->oformat->codec_tag,
@@ -166,12 +150,6 @@
 			// Otherwise tag 0 to let FFmpeg automatically select the appropriate tag
 			out_stream->codecpar->codec_tag = 0;
 		}
-#else
-		out_stream->codec->codec_tag = 0;
-		out_stream->time_base = out_stream->codec->time_base;
-		if (job->ofmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
-			out_stream->codec->flags |= CODEC_FLAG_GLOBAL_H;
-#endif
 	}
 
 #ifndef NDEBUG
@@ -212,10 +190,6 @@
 
 	init_size(*job, in_filename);
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	av_register_all();
-#endif
-
 	if (!init_input(*job, in_filename))
 		goto fail;

obs-studio-29.1.3.tar.xz/libobs/media-io/video-frame.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/video-frame.c Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/video-frame.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/video-frame.h Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/video-io.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/video-io.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -46,6 +46,16 @@
 	struct video_frame frameMAX_CONVERT_BUFFERS;
 	int cur_frame;
 
+	// allow outputting at fractions of main composition FPS,
+	// e.g. 60 FPS with frame_rate_divisor = 1 turns into 30 FPS
+	//
+	// a separate counter is used in favor of using remainder calculations
+	// to allow "inputs" started at the same time to start on the same frame
+	// whereas with remainder calculation the frame alignment would depend on
+	// the total frame count at the time the encoder was started
+	uint32_t frame_rate_divisor;
+	uint32_t frame_rate_divisor_counter;
+
 	void (*callback)(void *param, struct video_data *frame);
 	void *param;
 };
@@ -77,6 +87,8 @@
 	size_t last_added;
 	struct cached_frame_info cacheMAX_CACHE_SIZE;
 
+	struct video_output *parent;
+
 	volatile bool raw_active;
 	volatile long gpu_refs;
 };
@@ -136,6 +148,17 @@
 		struct video_input *input = video->inputs.array + i;
 		struct video_data frame = frame_info->frame;
 
+		// an explicit counter is used instead of remainder calculation
+		// to allow multiple encoders started at the same time to start on
+		// the same frame
+		uint32_t skip = input->frame_rate_divisor_counter++;
+		if (input->frame_rate_divisor_counter ==
+		 input->frame_rate_divisor)
+			input->frame_rate_divisor_counter = 0;
+
+		if (skip)
+			continue;
+
 		if (scale_video_output(input, &frame))
 			input->callback(input->param, &frame);
 	}
@@ -306,7 +329,6 @@
 static enum video_colorspace collapse_space(enum video_colorspace cs)
 {
 	switch (cs) {
-	case VIDEO_CS_DEFAULT:
 	case VIDEO_CS_SRGB:
 		cs = VIDEO_CS_709;
 		break;
@@ -322,7 +344,8 @@
 
 static bool match_space(enum video_colorspace a, enum video_colorspace b)
 {
-	return collapse_space(a) == collapse_space(b);
+	return (a == VIDEO_CS_DEFAULT) || (b == VIDEO_CS_DEFAULT) ||
+	 (collapse_space(a) == collapse_space(b));
 }
 
 static inline bool video_input_init(struct video_input *input,
@@ -371,13 +394,37 @@
 	os_atomic_set_long(&video->total_frames, 0);
 }
 
+static const video_t *get_const_root(const video_t *video)
+{
+	while (video->parent)
+		video = video->parent;
+	return video;
+}
+
+static video_t *get_root(video_t *video)
+{
+	while (video->parent)
+		video = video->parent;
+	return video;
+}
+
 bool video_output_connect(
 	video_t *video, const struct video_scale_info *conversion,
 	void (*callback)(void *param, struct video_data *frame), void *param)
 {
+	return video_output_connect2(video, conversion, 1, callback, param);
+}
+
+bool video_output_connect2(
+	video_t *video, const struct video_scale_info *conversion,
+	uint32_t frame_rate_divisor,
+	void (*callback)(void *param, struct video_data *frame), void *param)
+{
 	bool success = false;
 
-	if (!video || !callback)
+	video = get_root(video);
+
+	if (!video || !callback || frame_rate_divisor == 0)
 		return false;
 
 	pthread_mutex_lock(&video->input_mutex);
@@ -389,6 +436,8 @@
 		input.callback = callback;
 		input.param = param;
 
+		input.frame_rate_divisor = frame_rate_divisor;
+
 		if (conversion) {
 			input.conversion = *conversion;
 		} else {
@@ -446,6 +495,8 @@
 	if (!video || !callback)
 		return;
 
+	video = get_root(video);
+
 	pthread_mutex_lock(&video->input_mutex);
 
 	size_t idx = video_get_input_idx(video, callback, param);
@@ -468,7 +519,7 @@
 {
 	if (!video)
 		return false;
-	return os_atomic_load_bool(&video->raw_active);
+	return os_atomic_load_bool(&get_const_root(video)->raw_active);
 }
 
 const struct video_output_info *video_output_get_info(const video_t *video)
@@ -485,6 +536,8 @@
 	if (!video)
 		return false;
 
+	video = get_root(video);
+
 	pthread_mutex_lock(&video->data_mutex);
 
 	if (video->available_frames == 0) {
@@ -518,6 +571,8 @@
 	if (!video)
 		return;
 
+	video = get_root(video);
+
 	pthread_mutex_lock(&video->data_mutex);
 
 	video->available_frames--;
@@ -538,6 +593,8 @@
 	if (!video)
 		return;
 
+	video = get_root(video);
+
 	if (!video->stop) {
 		video->stop = true;
 		os_sem_post(video->update_semaphore);
@@ -550,22 +607,22 @@
 	if (!video)
 		return true;
 
-	return video->stop;
+	return get_root(video)->stop;
 }
 
 enum video_format video_output_get_format(const video_t *video)
 {
-	return video ? video->info.format : VIDEO_FORMAT_NONE;
+	return video ? get_const_root(video)->info.format : VIDEO_FORMAT_NONE;
 }
 
 uint32_t video_output_get_width(const video_t *video)
 {
-	return video ? video->info.width : 0;
+	return video ? get_const_root(video)->info.width : 0;
 }
 
 uint32_t video_output_get_height(const video_t *video)
 {
-	return video ? video->info.height : 0;
+	return video ? get_const_root(video)->info.height : 0;
 }
 
 double video_output_get_frame_rate(const video_t *video)
@@ -573,17 +630,21 @@
 	if (!video)
 		return 0.0;
 
+	video = get_const_root(video);
+
 	return (double)video->info.fps_num / (double)video->info.fps_den;
 }
 
 uint32_t video_output_get_skipped_frames(const video_t *video)
 {
-	return (uint32_t)os_atomic_load_long(&video->skipped_frames);
+	return (uint32_t)os_atomic_load_long(
+		&get_const_root(video)->skipped_frames);
 }
 
 uint32_t video_output_get_total_frames(const video_t *video)
 {
-	return (uint32_t)os_atomic_load_long(&video->total_frames);
+	return (uint32_t)os_atomic_load_long(
+		&get_const_root(video)->total_frames);
 }
 
 /* Note: These four functions below are a very slight bit of a hack. If the
@@ -594,6 +655,8 @@
 
 void video_output_inc_texture_encoders(video_t *video)
 {
+	video = get_root(video);
+
 	if (os_atomic_inc_long(&video->gpu_refs) == 1 &&
 	 !os_atomic_load_bool(&video->raw_active)) {
 		reset_frames(video);
@@ -602,6 +665,8 @@
 
 void video_output_dec_texture_encoders(video_t *video)
 {
+	video = get_root(video);
+
 	if (os_atomic_dec_long(&video->gpu_refs) == 0 &&
 	 !os_atomic_load_bool(&video->raw_active)) {
 		log_skipped(video);
@@ -610,10 +675,32 @@
 
 void video_output_inc_texture_frames(video_t *video)
 {
-	os_atomic_inc_long(&video->total_frames);
+	os_atomic_inc_long(&get_root(video)->total_frames);
 }
 
 void video_output_inc_texture_skipped_frames(video_t *video)
 {
-	os_atomic_inc_long(&video->skipped_frames);
+	os_atomic_inc_long(&get_root(video)->skipped_frames);
+}
+
+video_t *video_output_create_with_frame_rate_divisor(video_t *video,
+						 uint32_t divisor)
+{
+	// `divisor == 1` would result in the same frame rate,
+	// resulting in an unnecessary additional video output
+	if (!video || divisor == 0 || divisor == 1)
+		return NULL;
+
+	video_t *new_video = bzalloc(sizeof(video_t));
+	memcpy(new_video, video, sizeof(*new_video));
+	new_video->parent = video;
+	new_video->info.fps_den *= divisor;
+
+	return new_video;
+}
+
+void video_output_free_frame_rate_divisor(video_t *video)
+{
+	if (video && video->parent)
+		bfree(video);
 }

obs-studio-29.1.3.tar.xz/libobs/media-io/video-io.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/video-io.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -91,6 +91,9 @@
 
 	/* packed 4:2:2 format, 10 bpp */
 	VIDEO_FORMAT_V210,
+
+	/* packed uncompressed 10-bit format */
+	VIDEO_FORMAT_R10L,
 };
 
 enum video_trc {
@@ -164,6 +167,7 @@
 	case VIDEO_FORMAT_BGRX:
 	case VIDEO_FORMAT_Y800:
 	case VIDEO_FORMAT_BGR3:
+	case VIDEO_FORMAT_R10L:
 		return false;
 	}
 
@@ -221,6 +225,8 @@
 		return "P416";
 	case VIDEO_FORMAT_V210:
 		return "v210";
+	case VIDEO_FORMAT_R10L:
+		return "R10l";
 	case VIDEO_FORMAT_NONE:;
 	}
 
@@ -302,6 +308,11 @@
 video_output_connect(video_t *video, const struct video_scale_info *conversion,
 		 void (*callback)(void *param, struct video_data *frame),
 		 void *param);
+EXPORT bool
+video_output_connect2(video_t *video, const struct video_scale_info *conversion,
+		 uint32_t frame_rate_divisor,
+		 void (*callback)(void *param, struct video_data *frame),
+		 void *param);
 EXPORT void video_output_disconnect(video_t *video,
 				 void (*callback)(void *param,
 						 struct video_data *frame),
@@ -331,6 +342,10 @@
 extern void video_output_inc_texture_frames(video_t *video);
 extern void video_output_inc_texture_skipped_frames(video_t *video);
 
+extern video_t *video_output_create_with_frame_rate_divisor(video_t *video,
+							 uint32_t divisor);
+extern void video_output_free_frame_rate_divisor(video_t *video);
+
 #ifdef __cplusplus
 }
 #endif

obs-studio-29.1.3.tar.xz/libobs/media-io/video-matrices.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/video-matrices.c Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/video-scaler-ffmpeg.c -> obs-studio-30.0.2.tar.xz/libobs/media-io/video-scaler-ffmpeg.c Changed

obs-studio-29.1.3.tar.xz/libobs/media-io/video-scaler.h -> obs-studio-30.0.2.tar.xz/libobs/media-io/video-scaler.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-audio.c -> obs-studio-30.0.2.tar.xz/libobs/obs-audio.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-avc.c -> obs-studio-30.0.2.tar.xz/libobs/obs-avc.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-avc.h -> obs-studio-30.0.2.tar.xz/libobs/obs-avc.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-cocoa.m -> obs-studio-30.0.2.tar.xz/libobs/obs-cocoa.m Changed

@@ -15,7 +15,6 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
-#include "util/platform.h"
 #include "util/dstr.h"
 #include "obs.h"
 #include "obs-internal.h"
@@ -32,870 +31,839 @@
 
 bool is_in_bundle()
 {
-	NSRunningApplication *app = NSRunningApplication currentApplication;
-	return app bundleIdentifier != nil;
+ NSRunningApplication *app = NSRunningApplication currentApplication;
+ return app bundleIdentifier != nil;
 }
 
 const char *get_module_extension(void)
 {
-	return "";
+ return "";
 }
 
 void add_default_module_paths(void)
 {
-	struct dstr plugin_path;
+ NSURL *pluginURL = NSBundle mainBundle builtInPlugInsURL;
+ NSString *pluginModulePath = pluginURL path stringByAppendingString:@"/%module%.plugin/Contents/MacOS/";
+ NSString *pluginDataPath = pluginURL path stringByAppendingString:@"/%module%.plugin/Contents/Resources/";
 
-	dstr_init_move_array(&plugin_path, os_get_executable_path_ptr(""));
-	dstr_cat(&plugin_path, "../PlugIns");
-	char *abs_plugin_path = os_get_abs_path_ptr(plugin_path.array);
-
-	if (abs_plugin_path != NULL) {
-		dstr_move_array(&plugin_path, abs_plugin_path);
-		struct dstr plugin_data;
-		dstr_init_copy_dstr(&plugin_data, &plugin_path);
-		dstr_cat(&plugin_path, "/%module%.plugin/Contents/MacOS/");
-		dstr_cat(&plugin_data, "/%module%.plugin/Contents/Resources/");
-
-		obs_add_module_path(plugin_path.array, plugin_data.array);
-
-		dstr_free(&plugin_data);
-	}
-
-	dstr_free(&plugin_path);
+ obs_add_module_path(pluginModulePath.UTF8String, pluginDataPath.UTF8String);
 }
 
 char *find_libobs_data_file(const char *file)
 {
-	struct dstr path;
+ NSBundle *frameworkBundle = NSBundle bundleWithIdentifier:@"com.obsproject.libobs";
+ NSString *libobsDataPath =
+ frameworkBundle bundleURL path stringByAppendingFormat:@"/%@/%s", @"Resources", file;
+ size_t path_length = strlen(libobsDataPath.UTF8String);
 
-	NSBundle *frameworkBundle =
-		NSBundle bundleWithIdentifier:@"com.obsproject.libobs";
-	NSURL *bundleURL = frameworkBundle bundleURL;
-	NSURL *libobsDataURL =
-		bundleURL URLByAppendingPathComponent:@"Resources/";
-	const char *libobsDataPath = libobsDataURL path
-		cStringUsingEncoding:NSUTF8StringEncoding;
-	dstr_init_copy(&path, libobsDataPath);
-	dstr_cat(&path, "/");
+ char *path = bmalloc(path_length + 1);
+ snprintf(path, (path_length + 1), "%s", libobsDataPath.UTF8String);
 
-	dstr_cat(&path, file);
-	return path.array;
+ return path;
 }
 
 static void log_processor_name(void)
 {
-	char *name = NULL;
-	size_t size;
-	int ret;
+ char *name = NULL;
+ size_t size;
+ int ret;
 
-	ret = sysctlbyname("machdep.cpu.brand_string", NULL, &size, NULL, 0);
-	if (ret != 0)
-		return;
+ ret = sysctlbyname("machdep.cpu.brand_string", NULL, &size, NULL, 0);
+ if (ret != 0)
+ return;
 
-	name = malloc(size);
+ name = malloc(size);
 
-	ret = sysctlbyname("machdep.cpu.brand_string", name, &size, NULL, 0);
-	if (ret == 0)
-		blog(LOG_INFO, "CPU Name: %s", name);
+ ret = sysctlbyname("machdep.cpu.brand_string", name, &size, NULL, 0);
+ if (ret == 0)
+ blog(LOG_INFO, "CPU Name: %s", name);
 
-	free(name);
+ free(name);
 }
 
 static void log_processor_speed(void)
 {
-	size_t size;
-	long long freq;
-	int ret;
+ size_t size;
+ long long freq;
+ int ret;
 
-	size = sizeof(freq);
-	ret = sysctlbyname("hw.cpufrequency", &freq, &size, NULL, 0);
-	if (ret == 0)
-		blog(LOG_INFO, "CPU Speed: %lldMHz", freq / 1000000);
+ size = sizeof(freq);
+ ret = sysctlbyname("hw.cpufrequency", &freq, &size, NULL, 0);
+ if (ret == 0)
+ blog(LOG_INFO, "CPU Speed: %lldMHz", freq / 1000000);
 }
 
 static void log_processor_cores(void)
 {
-	blog(LOG_INFO, "Physical Cores: %d, Logical Cores: %d",
-	 os_get_physical_cores(), os_get_logical_cores());
+ blog(LOG_INFO, "Physical Cores: %d, Logical Cores: %d", os_get_physical_cores(), os_get_logical_cores());
 }
 
 static void log_emulation_status(void)
 {
-	blog(LOG_INFO, "Rosetta translation used: %s",
-	 os_get_emulation_status() ? "true" : "false");
+ blog(LOG_INFO, "Rosetta translation used: %s", os_get_emulation_status() ? "true" : "false");
 }
 
 static void log_available_memory(void)
 {
-	size_t size;
-	long long memory_available;
-	int ret;
+ size_t size;
+ long long memory_available;
+ int ret;
 
-	size = sizeof(memory_available);
-	ret = sysctlbyname("hw.memsize", &memory_available, &size, NULL, 0);
-	if (ret == 0)
-		blog(LOG_INFO, "Physical Memory: %lldMB Total",
-		 memory_available / 1024 / 1024);
+ size = sizeof(memory_available);
+ ret = sysctlbyname("hw.memsize", &memory_available, &size, NULL, 0);
+ if (ret == 0)
+ blog(LOG_INFO, "Physical Memory: %lldMB Total", memory_available / 1024 / 1024);
 }
 
 static void log_os(void)
 {
-	NSProcessInfo *pi = NSProcessInfo processInfo;
-	blog(LOG_INFO, "OS Name: macOS");
-	blog(LOG_INFO, "OS Version: %s",
-	 pi operatingSystemVersionString UTF8String);
+ NSProcessInfo *pi = NSProcessInfo processInfo;
+ blog(LOG_INFO, "OS Name: macOS");
+ blog(LOG_INFO, "OS Version: %s", pi operatingSystemVersionString UTF8String);
 }
 
 static void log_kernel_version(void)
 {
-	char kernel_version1024;
-	size_t size = sizeof(kernel_version);
-	int ret;
+ char kernel_version1024;
+ size_t size = sizeof(kernel_version);
+ int ret;
 
-	ret = sysctlbyname("kern.osrelease", kernel_version, &size, NULL, 0);
-	if (ret == 0)
-		blog(LOG_INFO, "Kernel Version: %s", kernel_version);
+ ret = sysctlbyname("kern.osrelease", kernel_version, &size, NULL, 0);
+ if (ret == 0)
+ blog(LOG_INFO, "Kernel Version: %s", kernel_version);
 }
 
 void log_system_info(void)
 {
-	log_processor_name();
-	log_processor_speed();
-	log_processor_cores();
-	log_available_memory();
-	log_os();
-	log_emulation_status();
-	log_kernel_version();
+ log_processor_name();
+ log_processor_speed();
+ log_processor_cores();
+ log_available_memory();
+ log_os();
+ log_emulation_status();
+ log_kernel_version();
 }
 
 static bool dstr_from_cfstring(struct dstr *str, CFStringRef ref)
 {
-	CFIndex length = CFStringGetLength(ref);
-	CFIndex max_size = CFStringGetMaximumSizeForEncoding(
-		length, kCFStringEncodingUTF8);
-	dstr_reserve(str, max_size);
+ CFIndex length = CFStringGetLength(ref);
+ CFIndex max_size = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8);
+ dstr_reserve(str, max_size);
 
-	if (!CFStringGetCString(ref, str->array, max_size,
-				kCFStringEncodingUTF8))
-		return false;
+ if (!CFStringGetCString(ref, str->array, max_size, kCFStringEncodingUTF8))
+ return false;
 
-	str->len = strlen(str->array);
-	return true;
+ str->len = strlen(str->array);
+ return true;
 }
 
 struct obs_hotkeys_platform {
-	volatile long refs;
-	CFTypeRef monitor;
-	bool is_key_downOBS_KEY_LAST_VALUE;
-	TISInputSourceRef tis;
-	CFDataRef layout_data;
-	UCKeyboardLayout *layout;
+ volatile long refs;
+ CFTypeRef monitor;
+ CFTypeRef local_monitor;
+ bool is_key_downOBS_KEY_LAST_VALUE;
+ TISInputSourceRef tis;
+ CFDataRef layout_data;
+ UCKeyboardLayout *layout;
 };
 
 static void hotkeys_retain(struct obs_hotkeys_platform *plat)
 {
-	os_atomic_inc_long(&plat->refs);
+ os_atomic_inc_long(&plat->refs);
 }
 
 static inline void free_hotkeys_platform(obs_hotkeys_platform_t *plat);
+
 static void hotkeys_release(struct obs_hotkeys_platform *plat)
 {
-	if (os_atomic_dec_long(&plat->refs) == -1)
-		free_hotkeys_platform(plat);
+ if (os_atomic_dec_long(&plat->refs) == -1)
+ free_hotkeys_platform(plat);
 }
 
 #define INVALID_KEY 0xff
 
 #pragma GCC diagnostic ignored "-Winitializer-overrides"
 static const int virtual_keys = {
-	0 ... OBS_KEY_LAST_VALUE = INVALID_KEY,
-
-	OBS_KEY_A = kVK_ANSI_A,
-	OBS_KEY_B = kVK_ANSI_B,
-	OBS_KEY_C = kVK_ANSI_C,
-	OBS_KEY_D = kVK_ANSI_D,
-	OBS_KEY_E = kVK_ANSI_E,
-	OBS_KEY_F = kVK_ANSI_F,
-	OBS_KEY_G = kVK_ANSI_G,
-	OBS_KEY_H = kVK_ANSI_H,
-	OBS_KEY_I = kVK_ANSI_I,
-	OBS_KEY_J = kVK_ANSI_J,
-	OBS_KEY_K = kVK_ANSI_K,
-	OBS_KEY_L = kVK_ANSI_L,
-	OBS_KEY_M = kVK_ANSI_M,
-	OBS_KEY_N = kVK_ANSI_N,
-	OBS_KEY_O = kVK_ANSI_O,
-	OBS_KEY_P = kVK_ANSI_P,
-	OBS_KEY_Q = kVK_ANSI_Q,
-	OBS_KEY_R = kVK_ANSI_R,
-	OBS_KEY_S = kVK_ANSI_S,
-	OBS_KEY_T = kVK_ANSI_T,
-	OBS_KEY_U = kVK_ANSI_U,
-	OBS_KEY_V = kVK_ANSI_V,
-	OBS_KEY_W = kVK_ANSI_W,
-	OBS_KEY_X = kVK_ANSI_X,
-	OBS_KEY_Y = kVK_ANSI_Y,
-	OBS_KEY_Z = kVK_ANSI_Z,
-
-	OBS_KEY_1 = kVK_ANSI_1,
-	OBS_KEY_2 = kVK_ANSI_2,
-	OBS_KEY_3 = kVK_ANSI_3,
-	OBS_KEY_4 = kVK_ANSI_4,
-	OBS_KEY_5 = kVK_ANSI_5,
-	OBS_KEY_6 = kVK_ANSI_6,
-	OBS_KEY_7 = kVK_ANSI_7,
-	OBS_KEY_8 = kVK_ANSI_8,
-	OBS_KEY_9 = kVK_ANSI_9,
-	OBS_KEY_0 = kVK_ANSI_0,
-
-	OBS_KEY_RETURN = kVK_Return,
-	OBS_KEY_ESCAPE = kVK_Escape,
-	OBS_KEY_BACKSPACE = kVK_Delete,
-	OBS_KEY_TAB = kVK_Tab,
-	OBS_KEY_SPACE = kVK_Space,
-	OBS_KEY_MINUS = kVK_ANSI_Minus,
-	OBS_KEY_EQUAL = kVK_ANSI_Equal,
-	OBS_KEY_BRACKETLEFT = kVK_ANSI_LeftBracket,
-	OBS_KEY_BRACKETRIGHT = kVK_ANSI_RightBracket,
-	OBS_KEY_BACKSLASH = kVK_ANSI_Backslash,
-	OBS_KEY_SEMICOLON = kVK_ANSI_Semicolon,
-	OBS_KEY_QUOTE = kVK_ANSI_Quote,
-	OBS_KEY_DEAD_GRAVE = kVK_ANSI_Grave,
-	OBS_KEY_COMMA = kVK_ANSI_Comma,
-	OBS_KEY_PERIOD = kVK_ANSI_Period,
-	OBS_KEY_SLASH = kVK_ANSI_Slash,
-	OBS_KEY_CAPSLOCK = kVK_CapsLock,
-	OBS_KEY_SECTION = kVK_ISO_Section,
-
-	OBS_KEY_F1 = kVK_F1,
-	OBS_KEY_F2 = kVK_F2,
-	OBS_KEY_F3 = kVK_F3,
-	OBS_KEY_F4 = kVK_F4,
-	OBS_KEY_F5 = kVK_F5,
-	OBS_KEY_F6 = kVK_F6,
-	OBS_KEY_F7 = kVK_F7,
-	OBS_KEY_F8 = kVK_F8,
-	OBS_KEY_F9 = kVK_F9,
-	OBS_KEY_F10 = kVK_F10,
-	OBS_KEY_F11 = kVK_F11,
-	OBS_KEY_F12 = kVK_F12,
-
-	OBS_KEY_HELP = kVK_Help,
-	OBS_KEY_HOME = kVK_Home,
-	OBS_KEY_PAGEUP = kVK_PageUp,
-	OBS_KEY_DELETE = kVK_ForwardDelete,
-	OBS_KEY_END = kVK_End,
-	OBS_KEY_PAGEDOWN = kVK_PageDown,
-
-	OBS_KEY_RIGHT = kVK_RightArrow,
-	OBS_KEY_LEFT = kVK_LeftArrow,
-	OBS_KEY_DOWN = kVK_DownArrow,
-	OBS_KEY_UP = kVK_UpArrow,
-
-	OBS_KEY_CLEAR = kVK_ANSI_KeypadClear,
-	OBS_KEY_NUMSLASH = kVK_ANSI_KeypadDivide,
-	OBS_KEY_NUMASTERISK = kVK_ANSI_KeypadMultiply,
-	OBS_KEY_NUMMINUS = kVK_ANSI_KeypadMinus,
-	OBS_KEY_NUMPLUS = kVK_ANSI_KeypadPlus,
-	OBS_KEY_ENTER = kVK_ANSI_KeypadEnter,
-
-	OBS_KEY_NUM1 = kVK_ANSI_Keypad1,
-	OBS_KEY_NUM2 = kVK_ANSI_Keypad2,
-	OBS_KEY_NUM3 = kVK_ANSI_Keypad3,
-	OBS_KEY_NUM4 = kVK_ANSI_Keypad4,
-	OBS_KEY_NUM5 = kVK_ANSI_Keypad5,
-	OBS_KEY_NUM6 = kVK_ANSI_Keypad6,
-	OBS_KEY_NUM7 = kVK_ANSI_Keypad7,
-	OBS_KEY_NUM8 = kVK_ANSI_Keypad8,
-	OBS_KEY_NUM9 = kVK_ANSI_Keypad9,
-	OBS_KEY_NUM0 = kVK_ANSI_Keypad0,
-
-	OBS_KEY_NUMPERIOD = kVK_ANSI_KeypadDecimal,
-	OBS_KEY_NUMEQUAL = kVK_ANSI_KeypadEquals,
-
-	OBS_KEY_F13 = kVK_F13,
-	OBS_KEY_F14 = kVK_F14,
-	OBS_KEY_F15 = kVK_F15,
-	OBS_KEY_F16 = kVK_F16,
-	OBS_KEY_F17 = kVK_F17,
-	OBS_KEY_F18 = kVK_F18,
-	OBS_KEY_F19 = kVK_F19,
-	OBS_KEY_F20 = kVK_F20,
-
-	OBS_KEY_CONTROL = kVK_Control,
-	OBS_KEY_SHIFT = kVK_Shift,
-	OBS_KEY_ALT = kVK_Option,
-	OBS_KEY_META = kVK_Command,
-	OBS_KEY_CONTROL = kVK_RightControl,
+ 0 ... OBS_KEY_LAST_VALUE = INVALID_KEY,
+
+ OBS_KEY_A = kVK_ANSI_A,
+ OBS_KEY_B = kVK_ANSI_B,
+ OBS_KEY_C = kVK_ANSI_C,
+ OBS_KEY_D = kVK_ANSI_D,
+ OBS_KEY_E = kVK_ANSI_E,
+ OBS_KEY_F = kVK_ANSI_F,
+ OBS_KEY_G = kVK_ANSI_G,
+ OBS_KEY_H = kVK_ANSI_H,
+ OBS_KEY_I = kVK_ANSI_I,
+ OBS_KEY_J = kVK_ANSI_J,
+ OBS_KEY_K = kVK_ANSI_K,
+ OBS_KEY_L = kVK_ANSI_L,
+ OBS_KEY_M = kVK_ANSI_M,
+ OBS_KEY_N = kVK_ANSI_N,
+ OBS_KEY_O = kVK_ANSI_O,
+ OBS_KEY_P = kVK_ANSI_P,
+ OBS_KEY_Q = kVK_ANSI_Q,
+ OBS_KEY_R = kVK_ANSI_R,
+ OBS_KEY_S = kVK_ANSI_S,
+ OBS_KEY_T = kVK_ANSI_T,
+ OBS_KEY_U = kVK_ANSI_U,
+ OBS_KEY_V = kVK_ANSI_V,
+ OBS_KEY_W = kVK_ANSI_W,
+ OBS_KEY_X = kVK_ANSI_X,
+ OBS_KEY_Y = kVK_ANSI_Y,
+ OBS_KEY_Z = kVK_ANSI_Z,
+
+ OBS_KEY_1 = kVK_ANSI_1,
+ OBS_KEY_2 = kVK_ANSI_2,
+ OBS_KEY_3 = kVK_ANSI_3,
+ OBS_KEY_4 = kVK_ANSI_4,
+ OBS_KEY_5 = kVK_ANSI_5,
+ OBS_KEY_6 = kVK_ANSI_6,
+ OBS_KEY_7 = kVK_ANSI_7,
+ OBS_KEY_8 = kVK_ANSI_8,
+ OBS_KEY_9 = kVK_ANSI_9,
+ OBS_KEY_0 = kVK_ANSI_0,
+
+ OBS_KEY_RETURN = kVK_Return,
+ OBS_KEY_ESCAPE = kVK_Escape,
+ OBS_KEY_BACKSPACE = kVK_Delete,
+ OBS_KEY_TAB = kVK_Tab,
+ OBS_KEY_SPACE = kVK_Space,
+ OBS_KEY_MINUS = kVK_ANSI_Minus,
+ OBS_KEY_EQUAL = kVK_ANSI_Equal,
+ OBS_KEY_BRACKETLEFT = kVK_ANSI_LeftBracket,
+ OBS_KEY_BRACKETRIGHT = kVK_ANSI_RightBracket,
+ OBS_KEY_BACKSLASH = kVK_ANSI_Backslash,
+ OBS_KEY_SEMICOLON = kVK_ANSI_Semicolon,
+ OBS_KEY_QUOTE = kVK_ANSI_Quote,
+ OBS_KEY_DEAD_GRAVE = kVK_ANSI_Grave,
+ OBS_KEY_COMMA = kVK_ANSI_Comma,
+ OBS_KEY_PERIOD = kVK_ANSI_Period,
+ OBS_KEY_SLASH = kVK_ANSI_Slash,
+ OBS_KEY_CAPSLOCK = kVK_CapsLock,
+ OBS_KEY_SECTION = kVK_ISO_Section,
+
+ OBS_KEY_F1 = kVK_F1,
+ OBS_KEY_F2 = kVK_F2,
+ OBS_KEY_F3 = kVK_F3,
+ OBS_KEY_F4 = kVK_F4,
+ OBS_KEY_F5 = kVK_F5,
+ OBS_KEY_F6 = kVK_F6,
+ OBS_KEY_F7 = kVK_F7,
+ OBS_KEY_F8 = kVK_F8,
+ OBS_KEY_F9 = kVK_F9,
+ OBS_KEY_F10 = kVK_F10,
+ OBS_KEY_F11 = kVK_F11,
+ OBS_KEY_F12 = kVK_F12,
+
+ OBS_KEY_HELP = kVK_Help,
+ OBS_KEY_HOME = kVK_Home,
+ OBS_KEY_PAGEUP = kVK_PageUp,
+ OBS_KEY_DELETE = kVK_ForwardDelete,
+ OBS_KEY_END = kVK_End,
+ OBS_KEY_PAGEDOWN = kVK_PageDown,
+
+ OBS_KEY_RIGHT = kVK_RightArrow,
+ OBS_KEY_LEFT = kVK_LeftArrow,
+ OBS_KEY_DOWN = kVK_DownArrow,
+ OBS_KEY_UP = kVK_UpArrow,
+
+ OBS_KEY_CLEAR = kVK_ANSI_KeypadClear,
+ OBS_KEY_NUMSLASH = kVK_ANSI_KeypadDivide,
+ OBS_KEY_NUMASTERISK = kVK_ANSI_KeypadMultiply,
+ OBS_KEY_NUMMINUS = kVK_ANSI_KeypadMinus,
+ OBS_KEY_NUMPLUS = kVK_ANSI_KeypadPlus,
+ OBS_KEY_ENTER = kVK_ANSI_KeypadEnter,
+
+ OBS_KEY_NUM1 = kVK_ANSI_Keypad1,
+ OBS_KEY_NUM2 = kVK_ANSI_Keypad2,
+ OBS_KEY_NUM3 = kVK_ANSI_Keypad3,
+ OBS_KEY_NUM4 = kVK_ANSI_Keypad4,
+ OBS_KEY_NUM5 = kVK_ANSI_Keypad5,
+ OBS_KEY_NUM6 = kVK_ANSI_Keypad6,
+ OBS_KEY_NUM7 = kVK_ANSI_Keypad7,
+ OBS_KEY_NUM8 = kVK_ANSI_Keypad8,
+ OBS_KEY_NUM9 = kVK_ANSI_Keypad9,
+ OBS_KEY_NUM0 = kVK_ANSI_Keypad0,
+
+ OBS_KEY_NUMPERIOD = kVK_ANSI_KeypadDecimal,
+ OBS_KEY_NUMEQUAL = kVK_ANSI_KeypadEquals,
+
+ OBS_KEY_F13 = kVK_F13,
+ OBS_KEY_F14 = kVK_F14,
+ OBS_KEY_F15 = kVK_F15,
+ OBS_KEY_F16 = kVK_F16,
+ OBS_KEY_F17 = kVK_F17,
+ OBS_KEY_F18 = kVK_F18,
+ OBS_KEY_F19 = kVK_F19,
+ OBS_KEY_F20 = kVK_F20,
+
+ OBS_KEY_CONTROL = kVK_Control,
+ OBS_KEY_SHIFT = kVK_Shift,
+ OBS_KEY_ALT = kVK_Option,
+ OBS_KEY_META = kVK_Command,
+ OBS_KEY_CONTROL = kVK_RightControl,
 };
 
 int obs_key_to_virtual_key(obs_key_t code)
 {
-	return virtual_keyscode;
+ return virtual_keyscode;
 }
 
 obs_key_t obs_key_from_virtual_key(int code)
 {
-	if (code == kVK_RightShift)
-		return OBS_KEY_SHIFT;
-	if (code == kVK_RightOption)
-		return OBS_KEY_ALT;
-	if (code == kVK_RightCommand)
-		return OBS_KEY_META;
-	if (code == kVK_RightControl)
-		return OBS_KEY_META;
-	for (size_t i = 0; i < OBS_KEY_LAST_VALUE; i++) {
-		if (virtual_keysi == code) {
-			return i;
-		}
-	}
-	return OBS_KEY_NONE;
+ if (code == kVK_RightShift)
+ return OBS_KEY_SHIFT;
+ if (code == kVK_RightOption)
+ return OBS_KEY_ALT;
+ if (code == kVK_RightCommand)
+ return OBS_KEY_META;
+ if (code == kVK_RightControl)
+ return OBS_KEY_META;
+ for (size_t i = 0; i < OBS_KEY_LAST_VALUE; i++) {
+ if (virtual_keysi == code) {
+ return (obs_key_t) i;
+ }
+ }
+ return OBS_KEY_NONE;
 }
 
 static bool localized_key_to_str(obs_key_t key, struct dstr *str)
 {
-#define MAP_KEY(k, s) \
-	case k: \
-		dstr_copy(str, obs_get_hotkey_translation(k, s)); \
-		return true
-
-#define MAP_BUTTON(i) \
-	case OBS_KEY_MOUSE##i: \
-		dstr_copy(str, obs_get_hotkey_translation(key, "Mouse " #i)); \
-		return true
-
-	switch (key) {
-		MAP_KEY(OBS_KEY_SPACE, "Space");
-		MAP_KEY(OBS_KEY_NUMEQUAL, "= (Keypad)");
-		MAP_KEY(OBS_KEY_NUMASTERISK, "* (Keypad)");
-		MAP_KEY(OBS_KEY_NUMPLUS, "+ (Keypad)");
-		MAP_KEY(OBS_KEY_NUMMINUS, "- (Keypad)");
-		MAP_KEY(OBS_KEY_NUMPERIOD, ". (Keypad)");
-		MAP_KEY(OBS_KEY_NUMSLASH, "/ (Keypad)");
-		MAP_KEY(OBS_KEY_NUM0, "0 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM1, "1 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM2, "2 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM3, "3 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM4, "4 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM5, "5 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM6, "6 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM7, "7 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM8, "8 (Keypad)");
-		MAP_KEY(OBS_KEY_NUM9, "9 (Keypad)");
-
-		MAP_BUTTON(1);
-		MAP_BUTTON(2);
-		MAP_BUTTON(3);
-		MAP_BUTTON(4);
-		MAP_BUTTON(5);
-		MAP_BUTTON(6);
-		MAP_BUTTON(7);
-		MAP_BUTTON(8);
-		MAP_BUTTON(9);
-		MAP_BUTTON(10);
-		MAP_BUTTON(11);
-		MAP_BUTTON(12);
-		MAP_BUTTON(13);
-		MAP_BUTTON(14);
-		MAP_BUTTON(15);
-		MAP_BUTTON(16);
-		MAP_BUTTON(17);
-		MAP_BUTTON(18);
-		MAP_BUTTON(19);
-		MAP_BUTTON(20);
-		MAP_BUTTON(21);
-		MAP_BUTTON(22);
-		MAP_BUTTON(23);
-		MAP_BUTTON(24);
-		MAP_BUTTON(25);
-		MAP_BUTTON(26);
-		MAP_BUTTON(27);
-		MAP_BUTTON(28);
-		MAP_BUTTON(29);
-	default:
-		break;
-	}
+#define MAP_KEY(k, s) \
+ case k: \
+ dstr_copy(str, obs_get_hotkey_translation(k, s)); \
+ return true
+
+#define MAP_BUTTON(i) \
+ case OBS_KEY_MOUSE##i: \
+ dstr_copy(str, obs_get_hotkey_translation(key, "Mouse " #i)); \
+ return true
+
+ switch (key) {
+ MAP_KEY(OBS_KEY_SPACE, "Space");
+ MAP_KEY(OBS_KEY_NUMEQUAL, "= (Keypad)");
+ MAP_KEY(OBS_KEY_NUMASTERISK, "* (Keypad)");
+ MAP_KEY(OBS_KEY_NUMPLUS, "+ (Keypad)");
+ MAP_KEY(OBS_KEY_NUMMINUS, "- (Keypad)");
+ MAP_KEY(OBS_KEY_NUMPERIOD, ". (Keypad)");
+ MAP_KEY(OBS_KEY_NUMSLASH, "/ (Keypad)");
+ MAP_KEY(OBS_KEY_NUM0, "0 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM1, "1 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM2, "2 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM3, "3 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM4, "4 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM5, "5 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM6, "6 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM7, "7 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM8, "8 (Keypad)");
+ MAP_KEY(OBS_KEY_NUM9, "9 (Keypad)");
+
+ MAP_BUTTON(1);
+ MAP_BUTTON(2);
+ MAP_BUTTON(3);
+ MAP_BUTTON(4);
+ MAP_BUTTON(5);
+ MAP_BUTTON(6);
+ MAP_BUTTON(7);
+ MAP_BUTTON(8);
+ MAP_BUTTON(9);
+ MAP_BUTTON(10);
+ MAP_BUTTON(11);
+ MAP_BUTTON(12);
+ MAP_BUTTON(13);
+ MAP_BUTTON(14);
+ MAP_BUTTON(15);
+ MAP_BUTTON(16);
+ MAP_BUTTON(17);
+ MAP_BUTTON(18);
+ MAP_BUTTON(19);
+ MAP_BUTTON(20);
+ MAP_BUTTON(21);
+ MAP_BUTTON(22);
+ MAP_BUTTON(23);
+ MAP_BUTTON(24);
+ MAP_BUTTON(25);
+ MAP_BUTTON(26);
+ MAP_BUTTON(27);
+ MAP_BUTTON(28);
+ MAP_BUTTON(29);
+ default:
+ break;
+ }
 #undef MAP_BUTTON
 #undef MAP_KEY
 
-	return false;
+ return false;
 }
 
 static bool code_to_str(int code, struct dstr *str)
 {
-#define MAP_GLYPH(c, g) \
-	case c: \
-		dstr_from_wcs(str, (wchar_t){g, 0}); \
-		return true
-#define MAP_STR(c, s) \
-	case c: \
-		dstr_copy(str, s); \
-		return true
-	switch (code) {
-		MAP_GLYPH(kVK_Return, 0x21A9);
-		MAP_GLYPH(kVK_Escape, 0x238B);
-		MAP_GLYPH(kVK_Delete, 0x232B);
-		MAP_GLYPH(kVK_Tab, 0x21e5);
-		MAP_GLYPH(kVK_CapsLock, 0x21EA);
-		MAP_GLYPH(kVK_ANSI_KeypadClear, 0x2327);
-		MAP_GLYPH(kVK_ANSI_KeypadEnter, 0x2305);
-		MAP_GLYPH(kVK_Help, 0x003F);
-		MAP_GLYPH(kVK_Home, 0x2196);
-		MAP_GLYPH(kVK_PageUp, 0x21de);
-		MAP_GLYPH(kVK_ForwardDelete, 0x2326);
-		MAP_GLYPH(kVK_End, 0x2198);
-		MAP_GLYPH(kVK_PageDown, 0x21df);
-
-		MAP_GLYPH(kVK_RightArrow, 0x2192);
-		MAP_GLYPH(kVK_LeftArrow, 0x2190);
-		MAP_GLYPH(kVK_DownArrow, 0x2193);
-		MAP_GLYPH(kVK_UpArrow, 0x2191);
-
-		MAP_STR(kVK_F1, "F1");
-		MAP_STR(kVK_F2, "F2");
-		MAP_STR(kVK_F3, "F3");
-		MAP_STR(kVK_F4, "F4");
-		MAP_STR(kVK_F5, "F5");
-		MAP_STR(kVK_F6, "F6");
-		MAP_STR(kVK_F7, "F7");
-		MAP_STR(kVK_F8, "F8");
-		MAP_STR(kVK_F9, "F9");
-		MAP_STR(kVK_F10, "F10");
-		MAP_STR(kVK_F11, "F11");
-		MAP_STR(kVK_F12, "F12");
-		MAP_STR(kVK_F13, "F13");
-		MAP_STR(kVK_F14, "F14");
-		MAP_STR(kVK_F15, "F15");
-		MAP_STR(kVK_F16, "F16");
-		MAP_STR(kVK_F17, "F17");
-		MAP_STR(kVK_F18, "F18");
-		MAP_STR(kVK_F19, "F19");
-		MAP_STR(kVK_F20, "F20");
-		MAP_GLYPH(kVK_Control, kControlUnicode);
-		MAP_GLYPH(kVK_Shift, kShiftUnicode);
-		MAP_GLYPH(kVK_Option, kOptionUnicode);
-		MAP_GLYPH(kVK_Command, kCommandUnicode);
-		MAP_GLYPH(kVK_RightControl, kControlUnicode);
-		MAP_GLYPH(kVK_RightShift, kShiftUnicode);
-		MAP_GLYPH(kVK_RightOption, kOptionUnicode);
-	}
+#define MAP_GLYPH(c, g) \
+ case c: \
+ dstr_from_wcs(str, (wchar_t) {g, 0}); \
+ return true
+#define MAP_STR(c, s) \
+ case c: \
+ dstr_copy(str, s); \
+ return true
+ switch (code) {
+ MAP_GLYPH(kVK_Return, 0x21A9);
+ MAP_GLYPH(kVK_Escape, 0x238B);
+ MAP_GLYPH(kVK_Delete, 0x232B);
+ MAP_GLYPH(kVK_Tab, 0x21e5);
+ MAP_GLYPH(kVK_CapsLock, 0x21EA);
+ MAP_GLYPH(kVK_ANSI_KeypadClear, 0x2327);
+ MAP_GLYPH(kVK_ANSI_KeypadEnter, 0x2305);
+ MAP_GLYPH(kVK_Help, 0x003F);
+ MAP_GLYPH(kVK_Home, 0x2196);
+ MAP_GLYPH(kVK_PageUp, 0x21de);
+ MAP_GLYPH(kVK_ForwardDelete, 0x2326);
+ MAP_GLYPH(kVK_End, 0x2198);
+ MAP_GLYPH(kVK_PageDown, 0x21df);
+
+ MAP_GLYPH(kVK_RightArrow, 0x2192);
+ MAP_GLYPH(kVK_LeftArrow, 0x2190);
+ MAP_GLYPH(kVK_DownArrow, 0x2193);
+ MAP_GLYPH(kVK_UpArrow, 0x2191);
+
+ MAP_STR(kVK_F1, "F1");
+ MAP_STR(kVK_F2, "F2");
+ MAP_STR(kVK_F3, "F3");
+ MAP_STR(kVK_F4, "F4");
+ MAP_STR(kVK_F5, "F5");
+ MAP_STR(kVK_F6, "F6");
+ MAP_STR(kVK_F7, "F7");
+ MAP_STR(kVK_F8, "F8");
+ MAP_STR(kVK_F9, "F9");
+ MAP_STR(kVK_F10, "F10");
+ MAP_STR(kVK_F11, "F11");
+ MAP_STR(kVK_F12, "F12");
+ MAP_STR(kVK_F13, "F13");
+ MAP_STR(kVK_F14, "F14");
+ MAP_STR(kVK_F15, "F15");
+ MAP_STR(kVK_F16, "F16");
+ MAP_STR(kVK_F17, "F17");
+ MAP_STR(kVK_F18, "F18");
+ MAP_STR(kVK_F19, "F19");
+ MAP_STR(kVK_F20, "F20");
+ MAP_GLYPH(kVK_Control, kControlUnicode);
+ MAP_GLYPH(kVK_Shift, kShiftUnicode);
+ MAP_GLYPH(kVK_Option, kOptionUnicode);
+ MAP_GLYPH(kVK_Command, kCommandUnicode);
+ MAP_GLYPH(kVK_RightControl, kControlUnicode);
+ MAP_GLYPH(kVK_RightShift, kShiftUnicode);
+ MAP_GLYPH(kVK_RightOption, kOptionUnicode);
+ }
 #undef MAP_STR
 #undef MAP_GLYPH
 
-	return false;
+ return false;
 }
 
 void obs_key_to_str(obs_key_t key, struct dstr *str)
 {
-	const UniCharCount max_length = 16;
-	UniChar buffermax_length;
-
-	if (localized_key_to_str(key, str))
-		return;
-
-	int code = obs_key_to_virtual_key(key);
-	if (code_to_str(code, str))
-		return;
-
-	if (code == INVALID_KEY) {
-		blog(LOG_ERROR,
-		 "hotkey-cocoa: Got invalid key while "
-		 "translating key '%d' (%s)",
-		 key, obs_key_to_name(key));
-		goto err;
-	}
-
-	struct obs_hotkeys_platform *plat = NULL;
-
-	if (obs) {
-		pthread_mutex_lock(&obs->hotkeys.mutex);
-		plat = obs->hotkeys.platform_context;
-		hotkeys_retain(plat);
-		pthread_mutex_unlock(&obs->hotkeys.mutex);
-	}
-
-	if (!plat) {
-		blog(LOG_ERROR,
-		 "hotkey-cocoa: Could not get hotkey platform "
-		 "while translating key '%d' (%s)",
-		 key, obs_key_to_name(key));
-		goto err;
-	}
-
-	UInt32 dead_key_state = 0;
-	UniCharCount len = 0;
-
-	OSStatus err =
-		UCKeyTranslate(plat->layout, code, kUCKeyActionDown,
-			 0x104, //caps lock for upper case letters
-			 LMGetKbdType(), kUCKeyTranslateNoDeadKeysBit,
-			 &dead_key_state, max_length, &len, buffer);
-
-	if (err == noErr && len <= 0 && dead_key_state) {
-		err = UCKeyTranslate(plat->layout, kVK_Space, kUCKeyActionDown,
-				 0x104, LMGetKbdType(),
-				 kUCKeyTranslateNoDeadKeysBit,
-				 &dead_key_state, max_length, &len, buffer);
-	}
-
-	hotkeys_release(plat);
-
-	if (err != noErr) {
-		blog(LOG_ERROR,
-		 "hotkey-cocoa: Error while translating key '%d'"
-		 " (0x%x, %s) to string: %d",
-		 key, code, obs_key_to_name(key), err);
-		goto err;
-	}
-
-	if (len == 0) {
-		blog(LOG_ERROR,
-		 "hotkey-cocoa: Got 0 length string while "
-		 "translating '%d' (0x%x, %s) to string",
-		 key, code, obs_key_to_name(key));
-		goto err;
-	}
-
-	CFStringRef string = CFStringCreateWithCharactersNoCopy(
-		NULL, buffer, len, kCFAllocatorNull);
-	if (!string) {
-		blog(LOG_ERROR,
-		 "hotkey-cocoa: Could not create CFStringRef "
-		 "while translating '%d' (0x%x, %s) to string",
-		 key, code, obs_key_to_name(key));
-		goto err;
-	}
-
-	if (!dstr_from_cfstring(str, string)) {
-		blog(LOG_ERROR,
-		 "hotkey-cocoa: Could not translate CFStringRef "
-		 "to CString while translating '%d' (0x%x, %s)",
-		 key, code, obs_key_to_name(key));
-
-		goto release;
-	}
-
-	CFRelease(string);
-	return;
+ const UniCharCount max_length = 16;
+ UniChar buffer16;
+
+ if (localized_key_to_str(key, str))
+ return;
+
+ int code = obs_key_to_virtual_key(key);
+ if (code_to_str(code, str))
+ return;
+
+ if (code == INVALID_KEY) {
+ blog(LOG_ERROR,
+ "hotkey-cocoa: Got invalid key while "
+ "translating key '%d' (%s)",
+ key, obs_key_to_name(key));
+ goto err;
+ }
+
+ struct obs_hotkeys_platform *plat = NULL;
+
+ if (obs) {
+ pthread_mutex_lock(&obs->hotkeys.mutex);
+ plat = obs->hotkeys.platform_context;
+ hotkeys_retain(plat);
+ pthread_mutex_unlock(&obs->hotkeys.mutex);
+ }
+
+ if (!plat) {
+ blog(LOG_ERROR,
+ "hotkey-cocoa: Could not get hotkey platform "
+ "while translating key '%d' (%s)",
+ key, obs_key_to_name(key));
+ goto err;
+ }
+
+ UInt32 dead_key_state = 0;
+ UniCharCount len = 0;
+
+ OSStatus err = UCKeyTranslate(plat->layout, code, kUCKeyActionDown,
+ 0x104, //caps lock for upper case letters
+ LMGetKbdType(), kUCKeyTranslateNoDeadKeysBit, &dead_key_state, max_length, &len,
+ buffer);
+
+ if (err == noErr && len <= 0 && dead_key_state) {
+ err = UCKeyTranslate(plat->layout, kVK_Space, kUCKeyActionDown, 0x104, LMGetKbdType(),
+ kUCKeyTranslateNoDeadKeysBit, &dead_key_state, max_length, &len, buffer);
+ }
+
+ hotkeys_release(plat);
+
+ if (err != noErr) {
+ blog(LOG_ERROR,
+ "hotkey-cocoa: Error while translating key '%d'"
+ " (0x%x, %s) to string: %d",
+ key, code, obs_key_to_name(key), err);
+ goto err;
+ }
+
+ if (len == 0) {
+ blog(LOG_ERROR,
+ "hotkey-cocoa: Got 0 length string while "
+ "translating '%d' (0x%x, %s) to string",
+ key, code, obs_key_to_name(key));
+ goto err;
+ }
+
+ CFStringRef string = CFStringCreateWithCharactersNoCopy(NULL, buffer, len, kCFAllocatorNull);
+ if (!string) {
+ blog(LOG_ERROR,
+ "hotkey-cocoa: Could not create CFStringRef "
+ "while translating '%d' (0x%x, %s) to string",
+ key, code, obs_key_to_name(key));
+ goto err;
+ }
+
+ if (!dstr_from_cfstring(str, string)) {
+ blog(LOG_ERROR,
+ "hotkey-cocoa: Could not translate CFStringRef "
+ "to CString while translating '%d' (0x%x, %s)",
+ key, code, obs_key_to_name(key));
+
+ goto release;
+ }
+
+ CFRelease(string);
+ return;
 
 release:
-	CFRelease(string);
+ CFRelease(string);
 err:
-	dstr_copy(str, obs_key_to_name(key));
+ dstr_copy(str, obs_key_to_name(key));
 }
 
 #define OBS_COCOA_MODIFIER_SIZE 7
+
 static void unichar_to_utf8(const UniChar *c, char *buff)
 {
-	CFStringRef string = CFStringCreateWithCharactersNoCopy(
-		NULL, c, 2, kCFAllocatorNull);
-	if (!string) {
-		blog(LOG_ERROR, "hotkey-cocoa: Could not create CFStringRef "
-				"while populating modifier strings");
-		return;
-	}
+ CFStringRef string = CFStringCreateWithCharactersNoCopy(NULL, c, 2, kCFAllocatorNull);
+ if (!string) {
+ blog(LOG_ERROR, "hotkey-cocoa: Could not create CFStringRef "
+ "while populating modifier strings");
+ return;
+ }
 
-	if (!CFStringGetCString(string, buff, OBS_COCOA_MODIFIER_SIZE,
-				kCFStringEncodingUTF8))
-		blog(LOG_ERROR,
-		 "hotkey-cocoa: Error while populating "
-		 " modifier string with glyph %d (0x%x)",
-		 c0, c0);
+ if (!CFStringGetCString(string, buff, OBS_COCOA_MODIFIER_SIZE, kCFStringEncodingUTF8))
+ blog(LOG_ERROR,
+ "hotkey-cocoa: Error while populating "
+ " modifier string with glyph %d (0x%x)",
+ c0, c0);
 
-	CFRelease(string);
+ CFRelease(string);
 }
 
 static char ctrl_strOBS_COCOA_MODIFIER_SIZE;
 static char opt_strOBS_COCOA_MODIFIER_SIZE;
 static char shift_strOBS_COCOA_MODIFIER_SIZE;
 static char cmd_strOBS_COCOA_MODIFIER_SIZE;
+
 static void init_utf_8_strings(void)
 {
-	const UniChar ctrl_uni = {kControlUnicode, 0};
-	const UniChar opt_uni = {kOptionUnicode, 0};
-	const UniChar shift_uni = {kShiftUnicode, 0};
-	const UniChar cmd_uni = {kCommandUnicode, 0};
+ const UniChar ctrl_uni = {kControlUnicode, 0};
+ const UniChar opt_uni = {kOptionUnicode, 0};
+ const UniChar shift_uni = {kShiftUnicode, 0};
+ const UniChar cmd_uni = {kCommandUnicode, 0};
 
-	unichar_to_utf8(ctrl_uni, ctrl_str);
-	unichar_to_utf8(opt_uni, opt_str);
-	unichar_to_utf8(shift_uni, shift_str);
-	unichar_to_utf8(cmd_uni, cmd_str);
+ unichar_to_utf8(ctrl_uni, ctrl_str);
+ unichar_to_utf8(opt_uni, opt_str);
+ unichar_to_utf8(shift_uni, shift_str);
+ unichar_to_utf8(cmd_uni, cmd_str);
 }
 
 static pthread_once_t strings_token = PTHREAD_ONCE_INIT;
+
 void obs_key_combination_to_str(obs_key_combination_t key, struct dstr *str)
 {
-	struct dstr key_str = {0};
-	if (key.key != OBS_KEY_NONE)
-		obs_key_to_str(key.key, &key_str);
+ struct dstr key_str = {0};
+ if (key.key != OBS_KEY_NONE)
+ obs_key_to_str(key.key, &key_str);
 
-	int res = pthread_once(&strings_token, init_utf_8_strings);
-	if (res) {
-		blog(LOG_ERROR,
-		 "hotkeys-cocoa: Error while translating "
-		 "modifiers %d (0x%x)",
-		 res, res);
-		dstr_move(str, &key_str);
-		return;
-	}
+ int res = pthread_once(&strings_token, init_utf_8_strings);
+ if (res) {
+ blog(LOG_ERROR,
+ "hotkeys-cocoa: Error while translating "
+ "modifiers %d (0x%x)",
+ res, res);
+ dstr_move(str, &key_str);
+ return;
+ }
 
 #define CHECK_MODIFIER(mod, str) ((key.modifiers & mod) ? str : "")
-	dstr_printf(str, "%s%s%s%s%s",
-		 CHECK_MODIFIER(INTERACT_CONTROL_KEY, ctrl_str),
-		 CHECK_MODIFIER(INTERACT_ALT_KEY, opt_str),
-		 CHECK_MODIFIER(INTERACT_SHIFT_KEY, shift_str),
-		 CHECK_MODIFIER(INTERACT_COMMAND_KEY, cmd_str),
-		 key_str.len ? key_str.array : "");
+ dstr_printf(str, "%s%s%s%s%s", CHECK_MODIFIER(INTERACT_CONTROL_KEY, ctrl_str),
+ CHECK_MODIFIER(INTERACT_ALT_KEY, opt_str), CHECK_MODIFIER(INTERACT_SHIFT_KEY, shift_str),
+ CHECK_MODIFIER(INTERACT_COMMAND_KEY, cmd_str), key_str.len ? key_str.array : "");
 #undef CHECK_MODIFIER
 
-	dstr_free(&key_str);
+ dstr_free(&key_str);
 }
 
 static bool log_layout_name(TISInputSourceRef tis)
 {
-	struct dstr layout_name = {0};
-	CFStringRef sid = (CFStringRef)TISGetInputSourceProperty(
-		tis, kTISPropertyInputSourceID);
-	if (!sid) {
-		blog(LOG_ERROR, "hotkeys-cocoa: Failed getting InputSourceID");
-		return false;
-	}
+ struct dstr layout_name = {0};
+ CFStringRef sid = (CFStringRef) TISGetInputSourceProperty(tis, kTISPropertyInputSourceID);
+ if (!sid) {
+ blog(LOG_ERROR, "hotkeys-cocoa: Failed getting InputSourceID");
+ return false;
+ }
 
-	if (!dstr_from_cfstring(&layout_name, sid)) {
-		blog(LOG_ERROR, "hotkeys-cocoa: Could not convert InputSourceID"
-				" to CString");
-		goto fail;
-	}
+ if (!dstr_from_cfstring(&layout_name, sid)) {
+ blog(LOG_ERROR, "hotkeys-cocoa: Could not convert InputSourceID"
+ " to CString");
+ goto fail;
+ }
 
-	blog(LOG_INFO, "hotkeys-cocoa: Using layout '%s'", layout_name.array);
+ blog(LOG_INFO, "hotkeys-cocoa: Using layout '%s'", layout_name.array);
 
-	dstr_free(&layout_name);
-	return true;
+ dstr_free(&layout_name);
+ return true;
 
 fail:
-	dstr_free(&layout_name);
-	return false;
+ dstr_free(&layout_name);
+ return false;
 }
 
 static void handle_monitor_event(obs_hotkeys_platform_t *plat, NSEvent *event)
 {
-	if (event.type == NSEventTypeFlagsChanged) {
-		NSEventModifierFlags flags = event.modifierFlags;
-		plat->is_key_downOBS_KEY_CAPSLOCK =
-			!!(flags & NSEventModifierFlagCapsLock);
-		plat->is_key_downOBS_KEY_SHIFT =
-			!!(flags & NSEventModifierFlagShift);
-		plat->is_key_downOBS_KEY_ALT =
-			!!(flags & NSEventModifierFlagOption);
-		plat->is_key_downOBS_KEY_META =
-			!!(flags & NSEventModifierFlagCommand);
-		plat->is_key_downOBS_KEY_CONTROL =
-			!!(flags & NSEventModifierFlagControl);
-	} else if (event.type == NSEventTypeKeyDown ||
-		 event.type == NSEventTypeKeyUp) {
-		plat->is_key_downobs_key_from_virtual_key(event.keyCode) =
-			(event.type == NSEventTypeKeyDown);
-	}
+ if (event.type == NSEventTypeFlagsChanged) {
+ NSEventModifierFlags flags = event.modifierFlags;
+ plat->is_key_downOBS_KEY_CAPSLOCK = !!(flags & NSEventModifierFlagCapsLock);
+ plat->is_key_downOBS_KEY_SHIFT = !!(flags & NSEventModifierFlagShift);
+ plat->is_key_downOBS_KEY_ALT = !!(flags & NSEventModifierFlagOption);
+ plat->is_key_downOBS_KEY_META = !!(flags & NSEventModifierFlagCommand);
+ plat->is_key_downOBS_KEY_CONTROL = !!(flags & NSEventModifierFlagControl);
+ } else if (event.type == NSEventTypeKeyDown || event.type == NSEventTypeKeyUp) {
+ plat->is_key_downobs_key_from_virtual_key(event.keyCode) = (event.type == NSEventTypeKeyDown);
+ }
 }
 
 static bool init_hotkeys_platform(obs_hotkeys_platform_t **plat_)
 {
-	if (!plat_)
-		return false;
+ if (!plat_)
+ return false;
+
+ *plat_ = bzalloc(sizeof(obs_hotkeys_platform_t));
+ obs_hotkeys_platform_t *plat = *plat_;
+ if (!plat) {
+ *plat_ = NULL;
+ return false;
+ }
 
-	*plat_ = bzalloc(sizeof(obs_hotkeys_platform_t));
-	obs_hotkeys_platform_t *plat = *plat_;
-	if (!plat) {
-		*plat_ = NULL;
-		return false;
-	}
+ void (^handler)(NSEvent *) = ^(NSEvent *event) {
+ handle_monitor_event(plat, event);
+ };
+ plat->monitor = (__bridge CFTypeRef)
+ NSEvent addGlobalMonitorForEventsMatchingMask:NSEventMaskKeyDown | NSEventMaskKeyUp | NSEventMaskFlagsChanged
+ handler:handler;
 
-	void (^handler)(NSEvent *) = ^(NSEvent *event) {
-		handle_monitor_event(plat, event);
-	};
-	plat->monitor = (__bridge CFTypeRef)NSEvent
-		addGlobalMonitorForEventsMatchingMask:NSEventMaskKeyDown |
-						 NSEventMaskKeyUp |
-						 NSEventMaskFlagsChanged
-					 handler:handler;
+ NSEvent *_Nullable (^local_handler)(NSEvent *event) = ^NSEvent *_Nullable(NSEvent *event)
+ {
+ handle_monitor_event(plat, event);
 
-	plat->tis = TISCopyCurrentKeyboardLayoutInputSource();
-	plat->layout_data = (CFDataRef)TISGetInputSourceProperty(
-		plat->tis, kTISPropertyUnicodeKeyLayoutData);
+ return event;
+ };
+ plat->local_monitor = (__bridge CFTypeRef)
+ NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskKeyDown | NSEventMaskKeyUp | NSEventMaskFlagsChanged
+ handler:local_handler;
 
-	if (!plat->layout_data) {
-		blog(LOG_ERROR, "hotkeys-cocoa: Failed getting LayoutData");
-		goto fail;
-	}
+ plat->tis = TISCopyCurrentKeyboardLayoutInputSource();
+ plat->layout_data = (CFDataRef) TISGetInputSourceProperty(plat->tis, kTISPropertyUnicodeKeyLayoutData);
 
-	CFRetain(plat->layout_data);
-	plat->layout = (UCKeyboardLayout *)CFDataGetBytePtr(plat->layout_data);
+ if (!plat->layout_data) {
+ blog(LOG_ERROR, "hotkeys-cocoa: Failed getting LayoutData");
+ goto fail;
+ }
 
-	return true;
+ CFRetain(plat->layout_data);
+ plat->layout = (UCKeyboardLayout *) CFDataGetBytePtr(plat->layout_data);
+
+ return true;
 
 fail:
-	hotkeys_release(plat);
-	*plat_ = NULL;
-	return false;
+ hotkeys_release(plat);
+ *plat_ = NULL;
+ return false;
 }
 
 static inline void free_hotkeys_platform(obs_hotkeys_platform_t *plat)
 {
-	if (!plat)
-		return;
+ if (!plat)
+ return;
+
+ if (plat->monitor) {
+ NSEvent removeMonitor:(__bridge id _Nonnull)(plat->monitor);
+ plat->monitor = NULL;
+ }
 
-	if (plat->monitor) {
-		CFRelease(plat->monitor);
-		plat->monitor = NULL;
-	}
+ if (plat->local_monitor) {
+ NSEvent removeMonitor:(__bridge id _Nonnull)(plat->local_monitor);
+ plat->local_monitor = NULL;
+ }
 
-	if (plat->tis) {
-		CFRelease(plat->tis);
-		plat->tis = NULL;
-	}
+ if (plat->tis) {
+ CFRelease(plat->tis);
+ plat->tis = NULL;
+ }
 
-	if (plat->layout_data) {
-		CFRelease(plat->layout_data);
-		plat->layout_data = NULL;
-	}
+ if (plat->layout_data) {
+ CFRelease(plat->layout_data);
+ plat->layout_data = NULL;
+ }
 
-	bfree(plat);
+ bfree(plat);
 }
 
-static void input_method_changed(CFNotificationCenterRef nc, void *observer,
-				 CFStringRef name, const void *object,
-				 CFDictionaryRef user_info)
+static void input_method_changed(CFNotificationCenterRef nc, void *observer, CFStringRef name, const void *object,
+ CFDictionaryRef user_info)
 {
-	UNUSED_PARAMETER(nc);
-	UNUSED_PARAMETER(name);
-	UNUSED_PARAMETER(object);
-	UNUSED_PARAMETER(user_info);
+ UNUSED_PARAMETER(nc);
+ UNUSED_PARAMETER(name);
+ UNUSED_PARAMETER(object);
+ UNUSED_PARAMETER(user_info);
 
-	struct obs_core_hotkeys *hotkeys = observer;
-	obs_hotkeys_platform_t *new_plat;
+ struct obs_core_hotkeys *hotkeys = observer;
+ obs_hotkeys_platform_t *new_plat;
 
-	if (init_hotkeys_platform(&new_plat)) {
-		obs_hotkeys_platform_t *plat;
+ if (init_hotkeys_platform(&new_plat)) {
+ obs_hotkeys_platform_t *plat;
 
-		pthread_mutex_lock(&hotkeys->mutex);
-		plat = hotkeys->platform_context;
+ pthread_mutex_lock(&hotkeys->mutex);
+ plat = hotkeys->platform_context;
 
-		if (new_plat && plat &&
-		 new_plat->layout_data == plat->layout_data) {
-			pthread_mutex_unlock(&hotkeys->mutex);
-			hotkeys_release(new_plat);
-			return;
-		}
+ if (new_plat && plat && new_plat->layout_data == plat->layout_data) {
+ pthread_mutex_unlock(&hotkeys->mutex);
+ hotkeys_release(new_plat);
+ return;
+ }
 
-		hotkeys->platform_context = new_plat;
-		if (new_plat)
-			log_layout_name(new_plat->tis);
-		pthread_mutex_unlock(&hotkeys->mutex);
+ hotkeys->platform_context = new_plat;
+ if (new_plat)
+ log_layout_name(new_plat->tis);
+ pthread_mutex_unlock(&hotkeys->mutex);
 
-		calldata_t params = {0};
-		signal_handler_signal(hotkeys->signals, "hotkey_layout_change",
-				 &params);
-		if (plat)
-			hotkeys_release(plat);
-	}
+ calldata_t params = {0};
+ signal_handler_signal(hotkeys->signals, "hotkey_layout_change", &params);
+ if (plat)
+ hotkeys_release(plat);
+ }
 }
 
 bool obs_hotkeys_platform_init(struct obs_core_hotkeys *hotkeys)
 {
-	CFNotificationCenterAddObserver(
-		CFNotificationCenterGetDistributedCenter(), hotkeys,
-		input_method_changed,
-		kTISNotifySelectedKeyboardInputSourceChanged, NULL,
-		CFNotificationSuspensionBehaviorDeliverImmediately);
+ CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(), hotkeys, input_method_changed,
+ kTISNotifySelectedKeyboardInputSourceChanged, NULL,
+ CFNotificationSuspensionBehaviorDeliverImmediately);
 
-	input_method_changed(NULL, hotkeys, NULL, NULL, NULL);
-	return hotkeys->platform_context != NULL;
+ input_method_changed(NULL, hotkeys, NULL, NULL, NULL);
+ return hotkeys->platform_context != NULL;
 }
 
 void obs_hotkeys_platform_free(struct obs_core_hotkeys *hotkeys)
 {
-	CFNotificationCenterRemoveEveryObserver(
-		CFNotificationCenterGetDistributedCenter(), hotkeys);
+ CFNotificationCenterRemoveEveryObserver(CFNotificationCenterGetDistributedCenter(), hotkeys);
 
-	hotkeys_release(hotkeys->platform_context);
+ hotkeys_release(hotkeys->platform_context);
 }
 
 typedef unsigned long NSUInteger;
+
 static bool mouse_button_pressed(obs_key_t key, bool *pressed)
 {
-	int button = 0;
-	switch (key) {
-#define MAP_BUTTON(n) \
-	case OBS_KEY_MOUSE##n: \
-		button = n - 1; \
-		break
-		MAP_BUTTON(1);
-		MAP_BUTTON(2);
-		MAP_BUTTON(3);
-		MAP_BUTTON(4);
-		MAP_BUTTON(5);
-		MAP_BUTTON(6);
-		MAP_BUTTON(7);
-		MAP_BUTTON(8);
-		MAP_BUTTON(9);
-		MAP_BUTTON(10);
-		MAP_BUTTON(11);
-		MAP_BUTTON(12);
-		MAP_BUTTON(13);
-		MAP_BUTTON(14);
-		MAP_BUTTON(15);
-		MAP_BUTTON(16);
-		MAP_BUTTON(17);
-		MAP_BUTTON(18);
-		MAP_BUTTON(19);
-		MAP_BUTTON(20);
-		MAP_BUTTON(21);
-		MAP_BUTTON(22);
-		MAP_BUTTON(23);
-		MAP_BUTTON(24);
-		MAP_BUTTON(25);
-		MAP_BUTTON(26);
-		MAP_BUTTON(27);
-		MAP_BUTTON(28);
-		MAP_BUTTON(29);
-		break;
+ int button = 0;
+ switch (key) {
+#define MAP_BUTTON(n) \
+ case OBS_KEY_MOUSE##n: \
+ button = n - 1; \
+ break
+ MAP_BUTTON(1);
+ MAP_BUTTON(2);
+ MAP_BUTTON(3);
+ MAP_BUTTON(4);
+ MAP_BUTTON(5);
+ MAP_BUTTON(6);
+ MAP_BUTTON(7);
+ MAP_BUTTON(8);
+ MAP_BUTTON(9);
+ MAP_BUTTON(10);
+ MAP_BUTTON(11);
+ MAP_BUTTON(12);
+ MAP_BUTTON(13);
+ MAP_BUTTON(14);
+ MAP_BUTTON(15);
+ MAP_BUTTON(16);
+ MAP_BUTTON(17);
+ MAP_BUTTON(18);
+ MAP_BUTTON(19);
+ MAP_BUTTON(20);
+ MAP_BUTTON(21);
+ MAP_BUTTON(22);
+ MAP_BUTTON(23);
+ MAP_BUTTON(24);
+ MAP_BUTTON(25);
+ MAP_BUTTON(26);
+ MAP_BUTTON(27);
+ MAP_BUTTON(28);
+ MAP_BUTTON(29);
+ break;
 #undef MAP_BUTTON
 
-	default:
-		return false;
-	}
+ default:
+ return false;
+ }
 
-	NSUInteger buttons = NSEvent pressedMouseButtons;
-	*pressed = (buttons & (1 << button)) != 0;
-	return true;
+ NSUInteger buttons = NSEvent pressedMouseButtons;
+ *pressed = (buttons & (1 << button)) != 0;
+ return true;
 }
 
-bool obs_hotkeys_platform_is_pressed(obs_hotkeys_platform_t *plat,
-				 obs_key_t key)
+bool obs_hotkeys_platform_is_pressed(obs_hotkeys_platform_t *plat, obs_key_t key)
 {
-	bool mouse_pressed = false;
-	if (mouse_button_pressed(key, &mouse_pressed))
-		return mouse_pressed;
+ bool mouse_pressed = false;
+ if (mouse_button_pressed(key, &mouse_pressed))
+ return mouse_pressed;
 
-	if (!plat)
-		return false;
+ if (!plat)
+ return false;
 
-	if (key >= OBS_KEY_LAST_VALUE)
-		return false;
+ if (key >= OBS_KEY_LAST_VALUE)
+ return false;
 
-	return plat->is_key_downkey;
+ return plat->is_key_downkey;
 }
 
 void *obs_graphics_thread_autorelease(void *param)
 {
-	@autoreleasepool {
-		return obs_graphics_thread(param);
-	}
+ @autoreleasepool {
+ return obs_graphics_thread(param);
+ }
 }
 
 bool obs_graphics_thread_loop_autorelease(struct obs_graphics_context *context)
 {
-	@autoreleasepool {
-		return obs_graphics_thread_loop(context);
-	}
+ @autoreleasepool {
+ return obs_graphics_thread_loop(context);
+ }
 }

obs-studio-29.1.3.tar.xz/libobs/obs-config.h -> obs-studio-30.0.2.tar.xz/libobs/obs-config.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,21 +27,21 @@
 /*
 * Increment if major breaking API changes
 */
-#define LIBOBS_API_MAJOR_VER 29
+#define LIBOBS_API_MAJOR_VER 30
 
 /*
 * Increment if backward-compatible additions
 *
 * Reset to zero each major version
 */
-#define LIBOBS_API_MINOR_VER 1
+#define LIBOBS_API_MINOR_VER 0
 
 /*
 * Increment if backward-compatible bug fix
 *
 * Reset to zero each major or minor version
 */
-#define LIBOBS_API_PATCH_VER 3
+#define LIBOBS_API_PATCH_VER 2
 
 #define MAKE_SEMANTIC_VERSION(major, minor, patch) \
 	((major << 24) | (minor << 16) | patch)
@@ -58,15 +58,7 @@
 #define OBS_INSTALL_PREFIX ""
 #define OBS_PLUGIN_DESTINATION "obs-plugins"
 #define OBS_RELATIVE_PREFIX "../../"
-#define OBS_RELEASE_CANDIDATE_MAJOR 0
-#define OBS_RELEASE_CANDIDATE_MINOR 0
-#define OBS_RELEASE_CANDIDATE_PATCH 0
-#define OBS_RELEASE_CANDIDATE_VER 0
 #define OBS_RELEASE_CANDIDATE 0
-#define OBS_BETA_MAJOR 0
-#define OBS_BETA_MINOR 0
-#define OBS_BETA_PATCH 0
-#define OBS_BETA_VER 0
 #define OBS_BETA 0
 #endif

obs-studio-29.1.3.tar.xz/libobs/obs-data.c -> obs-studio-30.0.2.tar.xz/libobs/obs-data.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-data.h -> obs-studio-30.0.2.tar.xz/libobs/obs-data.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-defs.h -> obs-studio-30.0.2.tar.xz/libobs/obs-defs.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-display.c -> obs-studio-30.0.2.tar.xz/libobs/obs-display.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-encoder.c -> obs-studio-30.0.2.tar.xz/libobs/obs-encoder.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -25,6 +25,8 @@
 
 #define get_weak(encoder) ((obs_weak_encoder_t *)encoder->context.control)
 
+static void encoder_set_video(obs_encoder_t *encoder, video_t *video);
+
 struct obs_encoder_info *find_encoder(const char *id)
 {
 	for (size_t i = 0; i < obs->encoder_types.num; i++) {
@@ -112,6 +114,10 @@
 	obs_context_data_insert(&encoder->context, &obs->data.encoders_mutex,
 				&obs->data.first_encoder);
 
+	if (type == OBS_ENCODER_VIDEO) {
+		encoder->frame_rate_divisor = 1;
+	}
+
 	blog(LOG_DEBUG, "encoder '%s' (%s) created", name, id);
 	return encoder;
 }
@@ -184,6 +190,116 @@
 	 (video->using_p010_tex || video->using_nv12_tex);
 }
 
+/**
+ * GPU based rescaling is currently implemented via core video mixes,
+ * i.e. a core mix with matching width/height/format/colorspace/range
+ * will be created if it doesn't exist already to generate encoder
+ * input
+ */
+static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
+{
+	struct obs_core_video_mix *mix = NULL;
+	bool create_mix = true;
+	struct obs_video_info ovi;
+	const struct video_output_info *info;
+
+	if (!encoder->media)
+		return;
+
+	info = video_output_get_info(encoder->media);
+
+	if (encoder->gpu_scale_type == OBS_SCALE_DISABLE)
+		return;
+
+	if (!encoder->scaled_height && !encoder->scaled_width)
+		return;
+
+	pthread_mutex_lock(&obs->video.mixes_mutex);
+	for (size_t i = 0; i < obs->video.mixes.num; i++) {
+		struct obs_core_video_mix *current = obs->video.mixes.arrayi;
+		const struct video_output_info *voi =
+			video_output_get_info(current->video);
+		if (current->view != &obs->data.main_view)
+			continue;
+
+		if (voi->width != encoder->scaled_width ||
+		 voi->height != encoder->scaled_height)
+			continue;
+
+		if (voi->format != info->format ||
+		 voi->colorspace != info->colorspace ||
+		 voi->range != info->range)
+			continue;
+
+		current->encoder_refs += 1;
+		obs_encoder_set_video(encoder, current->video);
+		create_mix = false;
+		break;
+	}
+
+	if (!obs->video.main_mix) {
+		create_mix = false;
+	} else {
+		ovi = obs->video.main_mix->ovi;
+	}
+
+	pthread_mutex_unlock(&obs->video.mixes_mutex);
+
+	if (!create_mix)
+		return;
+
+	ovi.output_format = info->format;
+	ovi.colorspace = info->colorspace;
+	ovi.range = info->range;
+
+	ovi.output_height = encoder->scaled_height;
+	ovi.output_width = encoder->scaled_width;
+	ovi.scale_type = encoder->gpu_scale_type;
+
+	ovi.gpu_conversion = true;
+
+	mix = obs_create_video_mix(&ovi);
+	if (!mix)
+		return;
+
+	mix->encoder_only_mix = true;
+	mix->encoder_refs = 1;
+	mix->view = &obs->data.main_view;
+
+	pthread_mutex_lock(&obs->video.mixes_mutex);
+
+	// double check that nobody else added a matching mix while we've created our mix
+	for (size_t i = 0; i < obs->video.mixes.num; i++) {
+		struct obs_core_video_mix *current = obs->video.mixes.arrayi;
+		const struct video_output_info *voi =
+			video_output_get_info(current->video);
+		if (current->view != &obs->data.main_view)
+			continue;
+
+		if (voi->width != encoder->scaled_width ||
+		 voi->height != encoder->scaled_height)
+			continue;
+
+		if (voi->format != info->format ||
+		 voi->colorspace != info->colorspace ||
+		 voi->range != info->range)
+			continue;
+
+		obs_encoder_set_video(encoder, current->video);
+		create_mix = false;
+		break;
+	}
+
+	if (!create_mix) {
+		obs_free_video_mix(mix);
+	} else {
+		da_push_back(obs->video.mixes, &mix);
+		obs_encoder_set_video(encoder, mix->video);
+	}
+
+	pthread_mutex_unlock(&obs->video.mixes_mutex);
+}
+
 static void add_connection(struct obs_encoder *encoder)
 {
 	if (encoder->info.type == OBS_ENCODER_AUDIO) {
@@ -199,8 +315,9 @@
 		if (gpu_encode_available(encoder)) {
 			start_gpu_encode(encoder);
 		} else {
-			start_raw_video(encoder->media, &info, receive_video,
-					encoder);
+			start_raw_video(encoder->media, &info,
+					encoder->frame_rate_divisor,
+					receive_video, encoder);
 		}
 	}
 
@@ -269,6 +386,9 @@
 			bfree((void *)encoder->info.id);
 		if (encoder->last_error_message)
 			bfree(encoder->last_error_message);
+		if (encoder->fps_override)
+			video_output_free_frame_rate_divisor(
+				encoder->fps_override);
 		bfree(encoder);
 	}
 }
@@ -387,12 +507,24 @@
 
 	obs_data_apply(encoder->context.settings, settings);
 
-	// Note, we don't actually apply the changes to the encoder here
-	// as it may be active in another thread. Setting this to true
-	// makes the changes apply at the next possible moment in the
-	// encoder / GPU encoder thread.
-	if (encoder->info.update)
+	// Encoder isn't initialized yet, only apply changes to settings
+	if (!encoder->context.data)
+		return;
+
+	// Encoder doesn't support updates
+	if (!encoder->info.update)
+		return;
+
+	// If the encoder is active we defer the update as it may not be
+	// reentrant. Setting reconfigure_requested to true makes the changes
+	// apply at the next possible moment in the encoder / GPU encoder
+	// thread.
+	if (encoder_active(encoder)) {
 		encoder->reconfigure_requested = true;
+	} else {
+		encoder->info.update(encoder->context.data,
+				 encoder->context.settings);
+	}
 }
 
 bool obs_encoder_get_extra_data(const obs_encoder_t *encoder,
@@ -459,6 +591,8 @@
 
 	obs_encoder_shutdown(encoder);
 
+	maybe_set_up_gpu_rescale(encoder);
+
 	if (encoder->orig_info.create) {
 		can_reroute = true;
 		encoder->info = encoder->orig_info;
@@ -513,6 +647,31 @@
 	return success;
 }
 
+/**
+ * free video mix if it's an encoder only video mix
+ * see `maybe_set_up_gpu_rescale`
+ */
+static void maybe_clear_encoder_core_video_mix(obs_encoder_t *encoder)
+{
+	pthread_mutex_lock(&obs->video.mixes_mutex);
+	for (size_t i = 0; i < obs->video.mixes.num; i++) {
+		struct obs_core_video_mix *mix = obs->video.mixes.arrayi;
+		if (mix->video != encoder->media)
+			continue;
+
+		if (!mix->encoder_only_mix)
+			break;
+
+		encoder_set_video(encoder, obs_get_video());
+		mix->encoder_refs -= 1;
+		if (mix->encoder_refs == 0) {
+			da_erase(obs->video.mixes, i);
+			obs_free_video_mix(mix);
+		}
+	}
+	pthread_mutex_unlock(&obs->video.mixes_mutex);
+}
+
 void obs_encoder_shutdown(obs_encoder_t *encoder)
 {
 	pthread_mutex_lock(&encoder->init_mutex);
@@ -523,6 +682,8 @@
 		encoder->first_received = false;
 		encoder->offset_usec = 0;
 		encoder->start_ts = 0;
+		encoder->frame_rate_divisor_counter = 0;
+		maybe_clear_encoder_core_video_mix(encoder);
 	}
 	obs_encoder_set_last_error(encoder, NULL);
 	pthread_mutex_unlock(&encoder->init_mutex);
@@ -710,6 +871,75 @@
 	encoder->scaled_height = height;
 }
 
+void obs_encoder_set_gpu_scale_type(obs_encoder_t *encoder,
+				 enum obs_scale_type gpu_scale_type)
+{
+	if (!obs_encoder_valid(encoder, "obs_encoder_set_gpu_scale_type"))
+		return;
+	if (encoder->info.type != OBS_ENCODER_VIDEO) {
+		blog(LOG_WARNING,
+		 "obs_encoder_set_gpu_scale_type: "
+		 "encoder '%s' is not a video encoder",
+		 obs_encoder_get_name(encoder));
+		return;
+	}
+	if (encoder_active(encoder)) {
+		blog(LOG_WARNING,
+		 "encoder '%s': Cannot enable GPU scaling "
+		 "while the encoder is active",
+		 obs_encoder_get_name(encoder));
+		return;
+	}
+
+	encoder->gpu_scale_type = gpu_scale_type;
+}
+
+bool obs_encoder_set_frame_rate_divisor(obs_encoder_t *encoder,
+					uint32_t frame_rate_divisor)
+{
+	if (!obs_encoder_valid(encoder, "obs_encoder_set_frame_rate_divisor"))
+		return false;
+
+	if (encoder->info.type != OBS_ENCODER_VIDEO) {
+		blog(LOG_WARNING,
+		 "obs_encoder_set_frame_rate_divisor: "
+		 "encoder '%s' is not a video encoder",
+		 obs_encoder_get_name(encoder));
+		return false;
+	}
+
+	if (encoder_active(encoder)) {
+		blog(LOG_WARNING,
+		 "encoder '%s': Cannot set frame rate divisor "
+		 "while the encoder is active",
+		 obs_encoder_get_name(encoder));
+		return false;
+	}
+
+	if (frame_rate_divisor == 0) {
+		blog(LOG_WARNING,
+		 "encoder '%s': Cannot set frame "
+		 "rate divisor to 0",
+		 obs_encoder_get_name(encoder));
+		return false;
+	}
+
+	encoder->frame_rate_divisor = frame_rate_divisor;
+
+	if (encoder->fps_override) {
+		video_output_free_frame_rate_divisor(encoder->fps_override);
+		encoder->fps_override = NULL;
+	}
+
+	if (encoder->media) {
+		encoder->fps_override =
+			video_output_create_with_frame_rate_divisor(
+				encoder->media, encoder->frame_rate_divisor);
+	}
+
+	return true;
+}
+
 bool obs_encoder_scaling_enabled(const obs_encoder_t *encoder)
 {
 	if (!obs_encoder_valid(encoder, "obs_encoder_scaling_enabled"))
@@ -756,6 +986,52 @@
 		 : video_output_get_height(encoder->media);
 }
 
+bool obs_encoder_gpu_scaling_enabled(obs_encoder_t *encoder)
+{
+	if (!obs_encoder_valid(encoder, "obs_encoder_gpu_scaling_enabled"))
+		return 0;
+	if (encoder->info.type != OBS_ENCODER_VIDEO) {
+		blog(LOG_WARNING,
+		 "obs_encoder_gpu_scaling_enabled: "
+		 "encoder '%s' is not a video encoder",
+		 obs_encoder_get_name(encoder));
+		return 0;
+	}
+
+	return encoder->gpu_scale_type != OBS_SCALE_DISABLE;
+}
+
+enum obs_scale_type obs_encoder_get_scale_type(obs_encoder_t *encoder)
+{
+	if (!obs_encoder_valid(encoder, "obs_encoder_get_scale_type"))
+		return 0;
+	if (encoder->info.type != OBS_ENCODER_VIDEO) {
+		blog(LOG_WARNING,
+		 "obs_encoder_get_scale_type: "
+		 "encoder '%s' is not a video encoder",
+		 obs_encoder_get_name(encoder));
+		return 0;
+	}
+
+	return encoder->gpu_scale_type;
+}
+
+uint32_t obs_encoder_get_frame_rate_divisor(const obs_encoder_t *encoder)
+{
+	if (!obs_encoder_valid(encoder, "obs_encoder_set_frame_rate_divisor"))
+		return 0;
+
+	if (encoder->info.type != OBS_ENCODER_VIDEO) {
+		blog(LOG_WARNING,
+		 "obs_encoder_set_frame_rate_divisor: "
+		 "encoder '%s' is not a video encoder",
+		 obs_encoder_get_name(encoder));
+		return 0;
+	}
+
+	return encoder->frame_rate_divisor;
+}
+
 uint32_t obs_encoder_get_sample_rate(const obs_encoder_t *encoder)
 {
 	if (!obs_encoder_valid(encoder, "obs_encoder_get_sample_rate"))
@@ -792,7 +1068,6 @@
 
 void obs_encoder_set_video(obs_encoder_t *encoder, video_t *video)
 {
-	const struct video_output_info *voi;
 
 	if (!obs_encoder_valid(encoder, "obs_encoder_set_video"))
 		return;
@@ -811,11 +1086,29 @@
 		return;
 	}
 
+	encoder_set_video(encoder, video);
+}
+
+static void encoder_set_video(obs_encoder_t *encoder, video_t *video)
+{
+	const struct video_output_info *voi;
+
+	if (encoder->fps_override) {
+		video_output_free_frame_rate_divisor(encoder->fps_override);
+		encoder->fps_override = NULL;
+	}
+
 	if (video) {
 		voi = video_output_get_info(video);
 		encoder->media = video;
 		encoder->timebase_num = voi->fps_den;
 		encoder->timebase_den = voi->fps_num;
+
+		if (encoder->frame_rate_divisor) {
+			encoder->fps_override =
+				video_output_create_with_frame_rate_divisor(
+					video, encoder->frame_rate_divisor);
+		}
 	} else {
 		encoder->media = NULL;
 		encoder->timebase_num = 0;
@@ -865,7 +1158,7 @@
 		return NULL;
 	}
 
-	return encoder->media;
+	return encoder->fps_override ? encoder->fps_override : encoder->media;
 }
 
 audio_t *obs_encoder_audio(const obs_encoder_t *encoder)
@@ -1027,7 +1320,7 @@
 				 encoder->context.settings);
 	}
 
-	pkt.timebase_num = encoder->timebase_num;
+	pkt.timebase_num = encoder->timebase_num * encoder->frame_rate_divisor;
 	pkt.timebase_den = encoder->timebase_den;
 	pkt.encoder = encoder;
 
@@ -1105,7 +1398,8 @@
 	enc_frame.pts = encoder->cur_pts;
 
 	if (do_encode(encoder, &enc_frame))
-		encoder->cur_pts += encoder->timebase_num;
+		encoder->cur_pts +=
+			encoder->timebase_num * encoder->frame_rate_divisor;
 
 wait_for_audio:
 	profile_end(receive_video_name);

obs-studio-29.1.3.tar.xz/libobs/obs-encoder.h -> obs-studio-30.0.2.tar.xz/libobs/obs-encoder.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-ffmpeg-compat.h -> obs-studio-30.0.2.tar.xz/libobs/obs-ffmpeg-compat.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-hevc.c -> obs-studio-30.0.2.tar.xz/libobs/obs-hevc.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-hevc.h -> obs-studio-30.0.2.tar.xz/libobs/obs-hevc.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-interaction.h -> obs-studio-30.0.2.tar.xz/libobs/obs-interaction.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-internal.h -> obs-studio-30.0.2.tar.xz/libobs/obs-internal.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@
 
 #include "obs.h"
 
+#include <obsversion.h>
 #include <caption/caption.h>
 
 /* Custom helpers for the UUID hash table */
@@ -309,6 +310,9 @@
 	float conversion_height_i;
 
 	float color_matrix16;
+
+	bool encoder_only_mix;
+	long encoder_refs;
 };
 
 extern struct obs_core_video_mix *
@@ -457,14 +461,17 @@
 	char *sceneitem_hide;
 };
 
+typedef DARRAY(struct obs_source_info) obs_source_info_array_t;
+
 struct obs_core {
 	struct obs_module *first_module;
 	DARRAY(struct obs_module_path) module_paths;
+	DARRAY(char *) safe_modules;
 
-	DARRAY(struct obs_source_info) source_types;
-	DARRAY(struct obs_source_info) input_types;
-	DARRAY(struct obs_source_info) filter_types;
-	DARRAY(struct obs_source_info) transition_types;
+	obs_source_info_array_t source_types;
+	obs_source_info_array_t input_types;
+	obs_source_info_array_t filter_types;
+	obs_source_info_array_t transition_types;
 	DARRAY(struct obs_output_info) output_types;
 	DARRAY(struct obs_encoder_info) encoder_types;
 	DARRAY(struct obs_service_info) service_types;
@@ -520,6 +527,7 @@
 
 extern void
 start_raw_video(video_t *video, const struct video_scale_info *conversion,
+		uint32_t frame_rate_divisor,
 		void (*callback)(void *param, struct video_data *frame),
 		void *param);
 extern void stop_raw_video(video_t *video,
@@ -955,6 +963,7 @@
 		case VIDEO_FORMAT_P216:
 		case VIDEO_FORMAT_P416:
 		case VIDEO_FORMAT_V210:
+		case VIDEO_FORMAT_R10L:
 			return GS_RGBA16F;
 		default:
 			return GS_BGRX;
@@ -1065,14 +1074,14 @@
 	/* indicates ownership of the info.id buffer */
 	bool owns_info_id;
 
-	bool received_video;
+	bool received_videoMAX_OUTPUT_VIDEO_ENCODERS;
 	bool received_audio;
 	volatile bool data_active;
 	volatile bool end_data_capture_thread_active;
-	int64_t video_offset;
+	int64_t video_offsetsMAX_OUTPUT_VIDEO_ENCODERS;
 	int64_t audio_offsetsMAX_OUTPUT_AUDIO_ENCODERS;
 	int64_t highest_audio_ts;
-	int64_t highest_video_ts;
+	int64_t highest_video_tsMAX_OUTPUT_VIDEO_ENCODERS;
 	pthread_t end_data_capture_thread;
 	os_event_t *stopping_event;
 	pthread_mutex_t interleaved_mutex;
@@ -1091,7 +1100,6 @@
 
 	uint32_t starting_drawn_count;
 	uint32_t starting_lagged_count;
-	uint32_t starting_frame_count;
 
 	int total_frames;
 
@@ -1099,7 +1107,7 @@
 	volatile bool paused;
 	video_t *video;
 	audio_t *audio;
-	obs_encoder_t *video_encoder;
+	obs_encoder_t *video_encodersMAX_OUTPUT_VIDEO_ENCODERS;
 	obs_encoder_t *audio_encodersMAX_OUTPUT_AUDIO_ENCODERS;
 	obs_service_t *service;
 	size_t mixer_mask;
@@ -1205,6 +1213,9 @@
 
 	size_t mixer_idx;
 
+	/* OBS_SCALE_DISABLE indicates GPU scaling is disabled */
+	enum obs_scale_type gpu_scale_type;
+
 	uint32_t scaled_width;
 	uint32_t scaled_height;
 	enum video_format preferred_format;
@@ -1219,6 +1230,17 @@
 	uint32_t timebase_num;
 	uint32_t timebase_den;
 
+	// allow outputting at fractions of main composition FPS,
+	// e.g. 60 FPS with frame_rate_divisor = 1 turns into 30 FPS
+	//
+	// a separate counter is used in favor of using remainder calculations
+	// to allow "inputs" started at the same time to start on the same frame
+	// whereas with remainder calculation the frame alignment would depend on
+	// the total frame count at the time the encoder was started
+	uint32_t frame_rate_divisor;
+	uint32_t frame_rate_divisor_counter; // only used for GPU encoders
+	video_t *fps_override;
+
 	int64_t cur_pts;
 
 	struct circlebuf audio_input_bufferMAX_AV_PLANES;

obs-studio-29.1.3.tar.xz/libobs/obs-module.c -> obs-studio-30.0.2.tar.xz/libobs/obs-module.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -274,6 +274,15 @@
 	da_push_back(obs->module_paths, &omp);
 }
 
+void obs_add_safe_module(const char *name)
+{
+	if (!obs || !name)
+		return;
+
+	char *item = bstrdup(name);
+	da_push_back(obs->safe_modules, &item);
+}
+
 extern void get_plugin_info(const char *path, bool *is_obs_plugin,
 			 bool *can_load);
 
@@ -282,6 +291,19 @@
 	size_t fail_count;
 };
 
+static bool is_safe_module(const char *name)
+{
+	if (!obs->safe_modules.num)
+		return true;
+
+	for (size_t i = 0; i < obs->safe_modules.num; i++) {
+		if (strcmp(name, obs->safe_modules.arrayi) == 0)
+			return true;
+	}
+
+	return false;
+}
+
 static void load_all_callback(void *param, const struct obs_module_info2 *info)
 {
 	struct fail_info *fail_info = param;
@@ -298,6 +320,12 @@
 		return;
 	}
 
+	if (!is_safe_module(info->name)) {
+		blog(LOG_WARNING, "Skipping module '%s', not on safe list",
+		 info->name);
+		return;
+	}
+
 	if (!can_load_obs_plugin) {
 		blog(LOG_WARNING,
 		 "Skipping module '%s' due to possible "
@@ -716,14 +744,14 @@
 void obs_register_source_s(const struct obs_source_info *info, size_t size)
 {
 	struct obs_source_info data = {0};
-	struct darray *array = NULL;
+	obs_source_info_array_t *array = NULL;
 
 	if (info->type == OBS_SOURCE_TYPE_INPUT) {
-		array = &obs->input_types.da;
+		array = &obs->input_types;
 	} else if (info->type == OBS_SOURCE_TYPE_FILTER) {
-		array = &obs->filter_types.da;
+		array = &obs->filter_types;
 	} else if (info->type == OBS_SOURCE_TYPE_TRANSITION) {
-		array = &obs->transition_types.da;
+		array = &obs->transition_types;
 	} else if (info->type != OBS_SOURCE_TYPE_SCENE) {
 		source_warn("Tried to register unknown source type: %u",
 			 info->type);
@@ -811,7 +839,7 @@
 	}
 
 	if (array)
-		darray_push_back(sizeof(struct obs_source_info), array, &data);
+		da_push_back(*array, &data);
 	da_push_back(obs->source_types, &data);
 	return;

obs-studio-29.1.3.tar.xz/libobs/obs-module.h -> obs-studio-30.0.2.tar.xz/libobs/obs-module.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -73,16 +73,22 @@
 */
 
 /** Required: Declares a libobs module. */
-#define OBS_DECLARE_MODULE() \
-	static obs_module_t *obs_module_pointer; \
-	MODULE_EXPORT void obs_module_set_pointer(obs_module_t *module); \
-	void obs_module_set_pointer(obs_module_t *module) \
-	{ \
-		obs_module_pointer = module; \
-	} \
-	obs_module_t *obs_current_module(void) { return obs_module_pointer; } \
-	MODULE_EXPORT uint32_t obs_module_ver(void); \
-	uint32_t obs_module_ver(void) { return LIBOBS_API_VER; }
+#define OBS_DECLARE_MODULE() \
+	static obs_module_t *obs_module_pointer; \
+	MODULE_EXPORT void obs_module_set_pointer(obs_module_t *module); \
+	void obs_module_set_pointer(obs_module_t *module) \
+	{ \
+		obs_module_pointer = module; \
+	} \
+	obs_module_t *obs_current_module(void) \
+	{ \
+		return obs_module_pointer; \
+	} \
+	MODULE_EXPORT uint32_t obs_module_ver(void); \
+	uint32_t obs_module_ver(void) \
+	{ \
+		return LIBOBS_API_VER; \
+	}
 
 /**
 * Required: Called when the module is loaded. Use this function to load all
@@ -166,7 +172,10 @@
 */
 #define OBS_MODULE_AUTHOR(name) \
 	MODULE_EXPORT const char *obs_module_author(void); \
-	const char *obs_module_author(void) { return name; }
+	const char *obs_module_author(void) \
+	{ \
+		return name; \
+	}
 
 /** Optional: Returns the full name of the module */
 MODULE_EXPORT const char *obs_module_name(void);

obs-studio-29.1.3.tar.xz/libobs/obs-nal.c -> obs-studio-30.0.2.tar.xz/libobs/obs-nal.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-nal.h -> obs-studio-30.0.2.tar.xz/libobs/obs-nal.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-nix-platform.h -> obs-studio-30.0.2.tar.xz/libobs/obs-nix-platform.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-nix-x11.c -> obs-studio-30.0.2.tar.xz/libobs/obs-nix-x11.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-nix.c -> obs-studio-30.0.2.tar.xz/libobs/obs-nix.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-output-delay.c -> obs-studio-30.0.2.tar.xz/libobs/obs-output-delay.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2015 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -28,6 +28,22 @@
 	return os_atomic_load_bool(&output->delay_capturing);
 }
 
+static inline bool flag_encoded(const struct obs_output *output)
+{
+	return (output->info.flags & OBS_OUTPUT_ENCODED) != 0;
+}
+
+static inline bool log_flag_encoded(const struct obs_output *output,
+				 const char *func_name, bool inverse_log)
+{
+	const char *prefix = inverse_log ? "n encoded" : " raw";
+	bool ret = flag_encoded(output);
+	if ((!inverse_log && !ret) || (inverse_log && ret))
+		blog(LOG_WARNING, "Output '%s': Tried to use %s on a%s output",
+		 output->context.name, func_name, prefix);
+	return ret;
+}
+
 static inline void push_packet(struct obs_output *output,
 			 struct encoder_packet *packet, uint64_t t)
 {
@@ -186,14 +202,8 @@
 {
 	if (!obs_output_valid(output, "obs_output_set_delay"))
 		return;
-
-	if ((output->info.flags & OBS_OUTPUT_ENCODED) == 0) {
-		blog(LOG_WARNING,
-		 "Output '%s': Tried to set a delay "
-		 "value on a non-encoded output",
-		 output->context.name);
+	if (!log_flag_encoded(output, __FUNCTION__, false))
 		return;
-	}
 
 	output->delay_sec = delay_sec;
 	output->delay_flags = flags;

obs-studio-29.1.3.tar.xz/libobs/obs-output.c -> obs-studio-30.0.2.tar.xz/libobs/obs-output.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -60,6 +60,70 @@
 	return os_atomic_load_bool(&output->end_data_capture_thread_active);
 }
 
+static inline bool flag_encoded(const struct obs_output *output)
+{
+	return (output->info.flags & OBS_OUTPUT_ENCODED) != 0;
+}
+
+static inline bool log_flag_encoded(const struct obs_output *output,
+				 const char *func_name, bool inverse_log)
+{
+	const char *prefix = inverse_log ? "n encoded" : " raw";
+	bool ret = flag_encoded(output);
+	if ((!inverse_log && !ret) || (inverse_log && ret))
+		blog(LOG_WARNING, "Output '%s': Tried to use %s on a%s output",
+		 output->context.name, func_name, prefix);
+	return ret;
+}
+
+static inline bool flag_video(const struct obs_output *output)
+{
+	return (output->info.flags & OBS_OUTPUT_VIDEO) != 0;
+}
+
+static inline bool log_flag_video(const struct obs_output *output,
+				 const char *func_name)
+{
+	bool ret = flag_video(output);
+	if (!ret)
+		blog(LOG_WARNING,
+		 "Output '%s': Tried to use %s on a non-video output",
+		 output->context.name, func_name);
+	return ret;
+}
+
+static inline bool flag_audio(const struct obs_output *output)
+{
+	return (output->info.flags & OBS_OUTPUT_AUDIO) != 0;
+}
+
+static inline bool log_flag_audio(const struct obs_output *output,
+				 const char *func_name)
+{
+	bool ret = flag_audio(output);
+	if (!ret)
+		blog(LOG_WARNING,
+		 "Output '%s': Tried to use %s on a non-audio output",
+		 output->context.name, func_name);
+	return ret;
+}
+
+static inline bool flag_service(const struct obs_output *output)
+{
+	return (output->info.flags & OBS_OUTPUT_SERVICE) != 0;
+}
+
+static inline bool log_flag_service(const struct obs_output *output,
+				 const char *func_name)
+{
+	bool ret = flag_service(output);
+	if (!ret)
+		blog(LOG_WARNING,
+		 "Output '%s': Tried to use %s on a non-service output",
+		 output->context.name, func_name);
+	return ret;
+}
+
 const struct obs_output_info *find_output(const char *id)
 {
 	size_t i;
@@ -137,8 +201,10 @@
 	} else {
 		output->info = *info;
 	}
-	output->video = obs_get_video();
-	output->audio = obs_get_audio();
+	if (!flag_encoded(output)) {
+		output->video = obs_get_video();
+		output->audio = obs_get_audio();
+	}
 	if (output->info.get_defaults)
 		output->info.get_defaults(output->context.settings);
 
@@ -210,9 +276,11 @@
 
 		free_packets(output);
 
-		if (output->video_encoder) {
-			obs_encoder_remove_output(output->video_encoder,
-						 output);
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			if (output->video_encodersi) {
+				obs_encoder_remove_output(
+					output->video_encodersi, output);
+			}
 		}
 
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
@@ -262,9 +330,7 @@
 	if (output->context.data)
 		success = output->info.start(output->context.data);
 
-	if (success && output->video) {
-		output->starting_frame_count =
-			video_output_get_total_frames(output->video);
+	if (success) {
 		output->starting_drawn_count = obs->video.total_frames;
 		output->starting_lagged_count = obs->video.lagged_frames;
 	}
@@ -282,20 +348,17 @@
 
 bool obs_output_start(obs_output_t *output)
 {
-	bool encoded;
-	bool has_service;
 	if (!obs_output_valid(output, "obs_output_start"))
 		return false;
 	if (!output->context.data)
 		return false;
 
-	has_service = (output->info.flags & OBS_OUTPUT_SERVICE) != 0;
-	if (has_service && !(obs_service_can_try_to_connect(output->service) &&
-			 obs_service_initialize(output->service, output)))
+	if (flag_service(output) &&
+	 !(obs_service_can_try_to_connect(output->service) &&
+	 obs_service_initialize(output->service, output)))
 		return false;
 
-	encoded = (output->info.flags & OBS_OUTPUT_ENCODED) != 0;
-	if (encoded && output->delay_sec) {
+	if (output->delay_sec) {
 		return obs_output_delay_start(output);
 	} else {
 		if (obs_output_actual_start(output)) {
@@ -416,7 +479,6 @@
 
 void obs_output_stop(obs_output_t *output)
 {
-	bool encoded;
 	if (!obs_output_valid(output, "obs_output_stop"))
 		return;
 	if (!output->context.data)
@@ -428,11 +490,8 @@
 		return;
 	}
 
-	encoded = (output->info.flags & OBS_OUTPUT_ENCODED) != 0;
-
-	if (encoded && output->active_delay_ns) {
+	if (flag_encoded(output) && output->active_delay_ns) {
 		obs_output_delay_stop(output);
-
 	} else if (!stopping(output)) {
 		do_output_signal(output, "stopping");
 		obs_output_actual_stop(output, false, os_gettime_ns());
@@ -570,18 +629,55 @@
 	return !!pause->ts_start && !pause->ts_end;
 }
 
+static bool get_first_audio_encoder_index(const struct obs_output *output,
+					 size_t *index)
+{
+	if (!index)
+		return false;
+
+	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
+		if (output->audio_encodersi) {
+			*index = i;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+static bool get_first_video_encoder_index(const struct obs_output *output,
+					 size_t *index)
+{
+	if (!index)
+		return false;
+
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (output->video_encodersi) {
+			*index = i;
+			return true;
+		}
+	}
+
+	return false;
+}
+
 static bool obs_encoded_output_pause(obs_output_t *output, bool pause)
 {
-	obs_encoder_t *venc;
+	obs_encoder_t *vencMAX_OUTPUT_VIDEO_ENCODERS;
 	obs_encoder_t *aencMAX_OUTPUT_AUDIO_ENCODERS;
 	uint64_t closest_v_ts;
 	bool success = false;
 
-	venc = output->video_encoder;
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++)
+		venci = output->video_encodersi;
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++)
 		aenci = output->audio_encodersi;
 
-	pthread_mutex_lock(&venc->pause.mutex);
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (venci) {
+			pthread_mutex_lock(&venci->pause.mutex);
+		}
+	}
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 		if (aenci) {
 			pthread_mutex_lock(&aenci->pause.mutex);
@@ -590,11 +686,17 @@
 
 	/* ---------------------------- */
 
-	closest_v_ts = get_closest_v_ts(&venc->pause);
+	size_t first_venc_index;
+	if (!get_first_video_encoder_index(output, &first_venc_index))
+		goto fail;
+
+	closest_v_ts = get_closest_v_ts(&vencfirst_venc_index->pause);
 
 	if (pause) {
-		if (!pause_can_start(&venc->pause)) {
-			goto fail;
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			if (venci && !pause_can_start(&venci->pause)) {
+				goto fail;
+			}
 		}
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 			if (aenci && !pause_can_start(&aenci->pause)) {
@@ -602,9 +704,12 @@
 			}
 		}
 
-		os_atomic_set_bool(&venc->paused, true);
-		venc->pause.ts_start = closest_v_ts;
-
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			if (venci) {
+				os_atomic_set_bool(&venci->paused, true);
+				venci->pause.ts_start = closest_v_ts;
+			}
+		}
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 			if (aenci) {
 				os_atomic_set_bool(&aenci->paused, true);
@@ -612,8 +717,10 @@
 			}
 		}
 	} else {
-		if (!pause_can_stop(&venc->pause)) {
-			goto fail;
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			if (venci && !pause_can_stop(&venci->pause)) {
+				goto fail;
+			}
 		}
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 			if (aenci && !pause_can_stop(&aenci->pause)) {
@@ -621,9 +728,12 @@
 			}
 		}
 
-		os_atomic_set_bool(&venc->paused, false);
-		end_pause(&venc->pause, closest_v_ts);
-
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			if (venci) {
+				os_atomic_set_bool(&venci->paused, false);
+				end_pause(&venci->pause, closest_v_ts);
+			}
+		}
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 			if (aenci) {
 				os_atomic_set_bool(&aenci->paused, false);
@@ -642,7 +752,11 @@
 			pthread_mutex_unlock(&aenci - 1->pause.mutex);
 		}
 	}
-	pthread_mutex_unlock(&venc->pause.mutex);
+	for (size_t i = MAX_OUTPUT_VIDEO_ENCODERS; i > 0; i--) {
+		if (venci - 1) {
+			pthread_mutex_unlock(&venci - 1->pause.mutex);
+		}
+	}
 
 	return success;
 }
@@ -681,9 +795,8 @@
 	if (os_atomic_load_bool(&output->paused) == pause)
 		return true;
 
-	success = ((output->info.flags & OBS_OUTPUT_ENCODED) != 0)
-			 ? obs_encoded_output_pause(output, pause)
-			 : obs_raw_output_pause(output, pause);
+	success = flag_encoded(output) ? obs_encoded_output_pause(output, pause)
+				 : obs_raw_output_pause(output, pause);
 	if (success) {
 		os_atomic_set_bool(&output->paused, pause);
 		do_output_signal(output, pause ? "pause" : "unpause");
@@ -733,21 +846,41 @@
 {
 	if (!obs_output_valid(output, "obs_output_set_media"))
 		return;
+	if (log_flag_encoded(output, __FUNCTION__, true))
+		return;
 
-	output->video = video;
-	output->audio = audio;
+	if (flag_video(output))
+		output->video = video;
+	if (flag_audio(output))
+		output->audio = audio;
 }
 
 video_t *obs_output_video(const obs_output_t *output)
 {
-	return obs_output_valid(output, "obs_output_video") ? output->video
-							 : NULL;
+	if (!obs_output_valid(output, "obs_output_video"))
+		return NULL;
+
+	if (!flag_encoded(output))
+		return output->video;
+
+	obs_encoder_t *vencoder = obs_output_get_video_encoder(output);
+	return obs_encoder_video(vencoder);
 }
 
 audio_t *obs_output_audio(const obs_output_t *output)
 {
-	return obs_output_valid(output, "obs_output_audio") ? output->audio
-							 : NULL;
+	if (!obs_output_valid(output, "obs_output_audio"))
+		return NULL;
+
+	if (!flag_encoded(output))
+		return output->audio;
+
+	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
+		if (output->audio_encodersi)
+			return obs_encoder_audio(output->audio_encodersi);
+	}
+
+	return NULL;
 }
 
 static inline size_t get_first_mixer(const obs_output_t *output)
@@ -765,9 +898,12 @@
 {
 	if (!obs_output_valid(output, "obs_output_set_mixer"))
 		return;
+	if (log_flag_encoded(output, __FUNCTION__, true))
+		return;
+	if (active(output))
+		return;
 
-	if (!active(output))
-		output->mixer_mask = (size_t)1 << mixer_idx;
+	output->mixer_mask = (size_t)1 << mixer_idx;
 }
 
 size_t obs_output_get_mixer(const obs_output_t *output)
@@ -782,6 +918,10 @@
 {
 	if (!obs_output_valid(output, "obs_output_set_mixers"))
 		return;
+	if (log_flag_encoded(output, __FUNCTION__, true))
+		return;
+	if (active(output))
+		return;
 
 	output->mixer_mask = mixers;
 }
@@ -799,9 +939,13 @@
 	if (!obs_output_valid(output, "obs_output_remove_encoder_internal"))
 		return;
 
-	if (output->video_encoder == encoder) {
-		output->video_encoder = NULL;
-	} else {
+	if (encoder->info.type == OBS_ENCODER_VIDEO) {
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			obs_encoder_t *video = output->video_encodersi;
+			if (video == encoder)
+				output->video_encodersi = NULL;
+		}
+	} else if (encoder->info.type == OBS_ENCODER_AUDIO) {
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 			obs_encoder_t *audio = output->audio_encodersi;
 			if (audio == encoder)
@@ -815,16 +959,19 @@
 {
 	if (!obs_output_valid(output, "obs_output_remove_encoder"))
 		return;
-	if (active(output)) {
+	if (active(output))
 		return;
-	}
 
 	obs_output_remove_encoder_internal(output, encoder);
 }
 
-void obs_output_set_video_encoder(obs_output_t *output, obs_encoder_t *encoder)
+void obs_output_set_video_encoder2(obs_output_t *output, obs_encoder_t *encoder,
+				 size_t idx)
 {
-	if (!obs_output_valid(output, "obs_output_set_video_encoder"))
+	if (!obs_output_valid(output, "obs_output_set_video_encoder2"))
+		return;
+	if (!log_flag_encoded(output, __FUNCTION__, false) ||
+	 !log_flag_video(output, __FUNCTION__))
 		return;
 	if (encoder && encoder->info.type != OBS_ENCODER_VIDEO) {
 		blog(LOG_WARNING, "obs_output_set_video_encoder: "
@@ -839,18 +986,39 @@
 		return;
 	}
 
-	if (output->video_encoder == encoder)
+	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK_VIDEO) != 0) {
+		if (idx >= MAX_OUTPUT_VIDEO_ENCODERS) {
+			return;
+		}
+	} else {
+		if (idx > 0) {
+			return;
+		}
+	}
+
+	if (output->video_encodersidx == encoder)
 		return;
 
-	obs_encoder_remove_output(output->video_encoder, output);
+	obs_encoder_remove_output(output->video_encodersidx, output);
 	obs_encoder_add_output(encoder, output);
-	output->video_encoder = encoder;
+	output->video_encodersidx = encoder;
+
+	// Set preferred resolution on the default index to preserve old behavior
+	if (idx == 0) {
+		/* set the preferred resolution on the encoder */
+		if (output->scaled_width && output->scaled_height)
+			obs_encoder_set_scaled_size(output->video_encodersidx,
+						 output->scaled_width,
+						 output->scaled_height);
+	}
+}
+
+void obs_output_set_video_encoder(obs_output_t *output, obs_encoder_t *encoder)
+{
+	if (!obs_output_valid(output, "obs_output_set_video_encoder"))
+		return;
 
-	/* set the preferred resolution on the encoder */
-	if (output->scaled_width && output->scaled_height)
-		obs_encoder_set_scaled_size(output->video_encoder,
-					 output->scaled_width,
-					 output->scaled_height);
+	obs_output_set_video_encoder2(output, encoder, 0);
 }
 
 void obs_output_set_audio_encoder(obs_output_t *output, obs_encoder_t *encoder,
@@ -858,6 +1026,9 @@
 {
 	if (!obs_output_valid(output, "obs_output_set_audio_encoder"))
 		return;
+	if (!log_flag_encoded(output, __FUNCTION__, false) ||
+	 !log_flag_audio(output, __FUNCTION__))
+		return;
 	if (encoder && encoder->info.type != OBS_ENCODER_AUDIO) {
 		blog(LOG_WARNING, "obs_output_set_audio_encoder: "
 				 "encoder passed is not an audio encoder");
@@ -871,7 +1042,7 @@
 		return;
 	}
 
-	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK) != 0) {
+	if ((output->info.flags & OBS_OUTPUT_MULTI_TRACK_AUDIO) != 0) {
 		if (idx >= MAX_OUTPUT_AUDIO_ENCODERS) {
 			return;
 		}
@@ -889,11 +1060,28 @@
 	output->audio_encodersidx = encoder;
 }
 
+obs_encoder_t *obs_output_get_video_encoder2(const obs_output_t *output,
+					 size_t idx)
+{
+	if (!obs_output_valid(output, "obs_output_get_video_encoder2"))
+		return NULL;
+
+	if (idx >= MAX_OUTPUT_VIDEO_ENCODERS)
+		return NULL;
+
+	return output->video_encodersidx;
+}
+
 obs_encoder_t *obs_output_get_video_encoder(const obs_output_t *output)
 {
-	return obs_output_valid(output, "obs_output_get_video_encoder")
-		 ? output->video_encoder
-		 : NULL;
+	if (!obs_output_valid(output, "obs_output_get_video_encoder"))
+		return NULL;
+
+	size_t first_venc_idx;
+	if (get_first_video_encoder_index(output, &first_venc_idx))
+		return obs_output_get_video_encoder2(output, first_venc_idx);
+	else
+		return NULL;
 }
 
 obs_encoder_t *obs_output_get_audio_encoder(const obs_output_t *output,
@@ -912,7 +1100,8 @@
 {
 	if (!obs_output_valid(output, "obs_output_set_service"))
 		return;
-	if (active(output) || !service || service->active)
+	if (!log_flag_service(output, __FUNCTION__) || active(output) ||
+	 !service || service->active)
 		return;
 
 	if (service->output)
@@ -969,12 +1158,14 @@
 		 : 0;
 }
 
-void obs_output_set_preferred_size(obs_output_t *output, uint32_t width,
-				 uint32_t height)
+void obs_output_set_preferred_size2(obs_output_t *output, uint32_t width,
+				 uint32_t height, size_t idx)
 {
-	if (!obs_output_valid(output, "obs_output_set_preferred_size"))
+	if (!obs_output_valid(output, "obs_output_set_preferred_size2"))
+		return;
+	if (!log_flag_video(output, __FUNCTION__))
 		return;
-	if ((output->info.flags & OBS_OUTPUT_VIDEO) == 0)
+	if (idx >= MAX_OUTPUT_VIDEO_ENCODERS)
 		return;
 
 	if (active(output)) {
@@ -985,46 +1176,92 @@
 		return;
 	}
 
-	output->scaled_width = width;
-	output->scaled_height = height;
+	// Used for raw video output
+	if (idx == 0) {
+		output->scaled_width = width;
+		output->scaled_height = height;
+	}
 
-	if (output->info.flags & OBS_OUTPUT_ENCODED) {
-		if (output->video_encoder)
-			obs_encoder_set_scaled_size(output->video_encoder,
+	if (flag_encoded(output)) {
+		if (output->video_encodersidx)
+			obs_encoder_set_scaled_size(output->video_encodersidx,
 						 width, height);
 	}
 }
 
-uint32_t obs_output_get_width(const obs_output_t *output)
+void obs_output_set_preferred_size(obs_output_t *output, uint32_t width,
+				 uint32_t height)
 {
-	if (!obs_output_valid(output, "obs_output_get_width"))
+	if (!obs_output_valid(output, "obs_output_set_preferred_size"))
+		return;
+	if (!log_flag_video(output, __FUNCTION__))
+		return;
+
+	obs_output_set_preferred_size2(output, width, height, 0);
+}
+
+uint32_t obs_output_get_width2(const obs_output_t *output, size_t idx)
+{
+	if (!obs_output_valid(output, "obs_output_get_width2"))
+		return 0;
+	if (!log_flag_video(output, __FUNCTION__))
 		return 0;
-	if ((output->info.flags & OBS_OUTPUT_VIDEO) == 0)
+	if (idx >= MAX_OUTPUT_VIDEO_ENCODERS)
 		return 0;
 
-	if (output->info.flags & OBS_OUTPUT_ENCODED)
-		return obs_encoder_get_width(output->video_encoder);
-	else
+	if (flag_encoded(output)) {
+		if (output->video_encodersidx)
+			return obs_encoder_get_width(
+				output->video_encodersidx);
+		else
+			return 0;
+	} else
 		return output->scaled_width != 0
 			 ? output->scaled_width
 			 : video_output_get_width(output->video);
 }
 
-uint32_t obs_output_get_height(const obs_output_t *output)
+uint32_t obs_output_get_width(const obs_output_t *output)
 {
-	if (!obs_output_valid(output, "obs_output_get_height"))
+	if (!obs_output_valid(output, "obs_output_get_width"))
 		return 0;
-	if ((output->info.flags & OBS_OUTPUT_VIDEO) == 0)
+	if (!log_flag_video(output, __FUNCTION__))
 		return 0;
 
-	if (output->info.flags & OBS_OUTPUT_ENCODED)
-		return obs_encoder_get_height(output->video_encoder);
-	else
+	return obs_output_get_width2(output, 0);
+}
+
+uint32_t obs_output_get_height2(const obs_output_t *output, size_t idx)
+{
+	if (!obs_output_valid(output, "obs_output_get_height2"))
+		return 0;
+	if (!log_flag_video(output, __FUNCTION__))
+		return 0;
+	if (idx >= MAX_OUTPUT_VIDEO_ENCODERS)
+		return 0;
+
+	if (flag_encoded(output)) {
+		if (output->video_encodersidx)
+			return obs_encoder_get_height(
+				output->video_encodersidx);
+		else
+			return 0;
+	} else
 		return output->scaled_height != 0
 			 ? output->scaled_height
 			 : video_output_get_height(output->video);
 }
 
+uint32_t obs_output_get_height(const obs_output_t *output)
+{
+	if (!obs_output_valid(output, "obs_output_get_height"))
+		return 0;
+	if (!log_flag_video(output, __FUNCTION__))
+		return 0;
+
+	return obs_output_get_height2(output, 0);
+}
+
 void obs_output_set_video_conversion(obs_output_t *output,
 				 const struct video_scale_info *conversion)
 {
@@ -1032,6 +1269,9 @@
 		return;
 	if (!obs_ptr_valid(conversion, "obs_output_set_video_conversion"))
 		return;
+	if (log_flag_encoded(output, __FUNCTION__, true) ||
+	 !log_flag_video(output, __FUNCTION__))
+		return;
 
 	output->video_conversion = *conversion;
 	output->video_conversion_set = true;
@@ -1044,14 +1284,31 @@
 		return;
 	if (!obs_ptr_valid(conversion, "obs_output_set_audio_conversion"))
 		return;
+	if (log_flag_encoded(output, __FUNCTION__, true) ||
+	 !log_flag_audio(output, __FUNCTION__))
+		return;
 
 	output->audio_conversion = *conversion;
 	output->audio_conversion_set = true;
 }
 
-static inline bool audio_valid(const struct obs_output *output, bool encoded)
+static inline bool video_valid(const struct obs_output *output)
+{
+	if (flag_encoded(output)) {
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			if (output->video_encodersi) {
+				return true;
+			}
+		}
+		return false;
+	} else {
+		return output->video != NULL;
+	}
+}
+
+static inline bool audio_valid(const struct obs_output *output)
 {
-	if (encoded) {
+	if (flag_encoded(output)) {
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 			if (output->audio_encodersi) {
 				return true;
@@ -1063,27 +1320,15 @@
 	return output->audio != NULL;
 }
 
-static bool can_begin_data_capture(const struct obs_output *output,
-				 bool encoded, bool has_video, bool has_audio,
-				 bool has_service)
+static bool can_begin_data_capture(const struct obs_output *output)
 {
-	if (has_video) {
-		if (encoded) {
-			if (!output->video_encoder)
-				return false;
-		} else {
-			if (!output->video)
-				return false;
-		}
-	}
+	if (flag_video(output) && !video_valid(output))
+		return false;
 
-	if (has_audio) {
-		if (!audio_valid(output, encoded)) {
-			return false;
-		}
-	}
+	if (flag_audio(output) && !audio_valid(output))
+		return false;
 
-	if (has_service && !output->service)
+	if (flag_service(output) && !output->service)
 		return false;
 
 	return true;
@@ -1102,6 +1347,10 @@
 const struct video_scale_info *
 obs_output_get_video_conversion(struct obs_output *output)
 {
+	if (log_flag_encoded(output, __FUNCTION__, true) ||
+	 !log_flag_video(output, __FUNCTION__))
+		return NULL;
+
 	if (output->video_conversion_set) {
 		if (!output->video_conversion.width)
 			output->video_conversion.width =
@@ -1134,14 +1383,23 @@
 	return output->audio_conversion_set ? &output->audio_conversion : NULL;
 }
 
-static size_t get_track_index(const struct obs_output *output,
-			 struct encoder_packet *pkt)
+static size_t get_encoder_index(const struct obs_output *output,
+				struct encoder_packet *pkt)
 {
-	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
-		struct obs_encoder *encoder = output->audio_encodersi;
+	if (pkt->type == OBS_ENCODER_VIDEO) {
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			struct obs_encoder *encoder = output->video_encodersi;
 
-		if (encoder && pkt->encoder == encoder)
-			return i;
+			if (encoder && pkt->encoder == encoder)
+				return i;
+		}
+	} else if (pkt->type == OBS_ENCODER_AUDIO) {
+		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
+			struct obs_encoder *encoder = output->audio_encodersi;
+
+			if (encoder && pkt->encoder == encoder)
+				return i;
+		}
 	}
 
 	assert(false);
@@ -1152,8 +1410,8 @@
 				 struct encoder_packet *out)
 {
 	if (out->type == OBS_ENCODER_VIDEO) {
-		if (!output->received_video)
-			output->received_video = true;
+		if (!output->received_videoout->track_idx)
+			output->received_videoout->track_idx = true;
 	} else {
 		if (!output->received_audio)
 			output->received_audio = true;
@@ -1170,7 +1428,7 @@
 	 * current dts as offset and subtract that value from the dts/pts
 	 * of the output packet. */
 	offset = (out->type == OBS_ENCODER_VIDEO)
-			 ? output->video_offset
+			 ? output->video_offsetsout->track_idx
 			 : output->audio_offsetsout->track_idx;
 
 	out->dts -= offset;
@@ -1188,10 +1446,21 @@
 static inline bool has_higher_opposing_ts(struct obs_output *output,
 					 struct encoder_packet *packet)
 {
-	if (packet->type == OBS_ENCODER_VIDEO)
-		return output->highest_audio_ts > packet->dts_usec;
-	else
-		return output->highest_video_ts > packet->dts_usec;
+	bool has_higher = true;
+
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (!output->video_encodersi ||
+		 (packet->type == OBS_ENCODER_VIDEO &&
+		 i == packet->track_idx))
+			continue;
+		has_higher = has_higher &&
+			 output->highest_video_tsi > packet->dts_usec;
+	}
+
+	return packet->type == OBS_ENCODER_AUDIO
+		 ? has_higher
+		 : (has_higher &&
+			 output->highest_audio_ts > packet->dts_usec);
 }
 
 static const uint8_t nal_start4 = {0, 0, 0, 1};
@@ -1344,8 +1613,10 @@
 				 struct encoder_packet *packet)
 {
 	if (packet->type == OBS_ENCODER_VIDEO) {
-		if (output->highest_video_ts < packet->dts_usec)
-			output->highest_video_ts = packet->dts_usec;
+		if (output->highest_video_tspacket->track_idx <
+		 packet->dts_usec)
+			output->highest_video_tspacket->track_idx =
+				packet->dts_usec;
 	} else {
 		if (output->highest_audio_ts < packet->dts_usec)
 			output->highest_audio_ts = packet->dts_usec;
@@ -1406,10 +1677,8 @@
 	int audio_encoders = 0;
 
 	video_idx = find_first_packet_type_idx(output, OBS_ENCODER_VIDEO, 0);
-	if (video_idx == -1) {
-		output->received_video = false;
+	if (video_idx == -1)
 		return -1;
-	}
 
 	max_idx = video_idx;
 	video = &output->interleaved_packets.arrayvideo_idx;
@@ -1503,42 +1772,28 @@
 }
 
 static int find_first_packet_type_idx(struct obs_output *output,
-				 enum obs_encoder_type type,
-				 size_t audio_idx)
+				 enum obs_encoder_type type, size_t idx)
 {
 	for (size_t i = 0; i < output->interleaved_packets.num; i++) {
 		struct encoder_packet *packet =
 			&output->interleaved_packets.arrayi;
 
-		if (packet->type == type) {
-			if (type == OBS_ENCODER_AUDIO &&
-			 packet->track_idx != audio_idx) {
-				continue;
-			}
-
+		if (packet->type == type && packet->track_idx == idx)
 			return (int)i;
-		}
 	}
 
 	return -1;
 }
 
 static int find_last_packet_type_idx(struct obs_output *output,
-				 enum obs_encoder_type type,
-				 size_t audio_idx)
+				 enum obs_encoder_type type, size_t idx)
 {
 	for (size_t i = output->interleaved_packets.num; i > 0; i--) {
 		struct encoder_packet *packet =
 			&output->interleaved_packets.arrayi - 1;
 
-		if (packet->type == type) {
-			if (type == OBS_ENCODER_AUDIO &&
-			 packet->track_idx != audio_idx) {
-				continue;
-			}
-
+		if (packet->type == type && packet->track_idx == idx)
 			return (int)(i - 1);
-		}
 	}
 
 	return -1;
@@ -1564,9 +1819,19 @@
 					struct encoder_packet **video,
 					struct encoder_packet **audio)
 {
-	*video = find_first_packet_type(output, OBS_ENCODER_VIDEO, 0);
-	if (!*video)
-		output->received_video = false;
+	bool found_video = false;
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (output->video_encodersi) {
+			videoi = find_first_packet_type(output,
+							 OBS_ENCODER_VIDEO, i);
+			if (!videoi) {
+				output->received_videoi = false;
+				return false;
+			} else {
+				found_video = true;
+			}
+		}
+	}
 
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 		if (output->audio_encodersi) {
@@ -1579,41 +1844,24 @@
 		}
 	}
 
-	if (!*video) {
-		return false;
-	}
-
-	return true;
-}
-
-static bool get_first_audio_encoder_index(const struct obs_output *output,
-					 size_t *index)
-{
-	if (!index)
-		return false;
-
-	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
-		if (output->audio_encodersi) {
-			*index = i;
-			return true;
-		}
-	}
-
-	return false;
+	return found_video;
 }
 
 static bool initialize_interleaved_packets(struct obs_output *output)
 {
-	struct encoder_packet *video;
-	struct encoder_packet *audioMAX_OUTPUT_AUDIO_ENCODERS;
-	struct encoder_packet *last_audioMAX_OUTPUT_AUDIO_ENCODERS;
+	struct encoder_packet *videoMAX_OUTPUT_VIDEO_ENCODERS = {0};
+	struct encoder_packet *audioMAX_OUTPUT_AUDIO_ENCODERS = {0};
+	struct encoder_packet *last_audioMAX_OUTPUT_AUDIO_ENCODERS = {0};
 	size_t start_idx;
 	size_t first_audio_idx;
+	size_t first_video_idx;
 
 	if (!get_first_audio_encoder_index(output, &first_audio_idx))
 		return false;
+	if (!get_first_video_encoder_index(output, &first_video_idx))
+		return false;
 
-	if (!get_audio_and_video_packets(output, &video, audio))
+	if (!get_audio_and_video_packets(output, video, audio))
 		return false;
 
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
@@ -1626,7 +1874,8 @@
 	/* ensure that there is audio past the first video packet */
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 		if (output->audio_encodersi) {
-			if (last_audioi->dts_usec < video->dts_usec) {
+			if (last_audioi->dts_usec <
+			 videofirst_video_idx->dts_usec) {
 				output->received_audio = false;
 				return false;
 			}
@@ -1637,19 +1886,23 @@
 	start_idx = get_interleaved_start_idx(output);
 	if (start_idx) {
 		discard_to_idx(output, start_idx);
-		if (!get_audio_and_video_packets(output, &video, audio))
+		if (!get_audio_and_video_packets(output, video, audio))
 			return false;
 	}
 
 	/* get new offsets */
-	output->video_offset = video->pts;
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (output->video_encodersi) {
+			output->video_offsetsi = videoi->pts;
+		}
+	}
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
 		if (output->audio_encodersi) {
 			output->audio_offsetsi = audioi->dts;
 		}
 	}
 #if DEBUG_STARTING_PACKETS == 1
-	int64_t v = video->dts_usec;
+	int64_t v = videofirst_video_idx->dts_usec;
 	int64_t a = audiofirst_audio_idx->dts_usec;
 	int64_t diff = v - a;
 
@@ -1661,7 +1914,11 @@
 
 	/* subtract offsets from highest TS offset variables */
 	output->highest_audio_ts -= audiofirst_audio_idx->dts_usec;
-	output->highest_video_ts -= video->dts_usec;
+
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (videoi)
+			output->highest_video_tsi -= videoi->dts_usec;
+	}
 
 	/* apply new offsets to all existing packet DTS/PTS values */
 	for (size_t i = 0; i < output->interleaved_packets.num; i++) {
@@ -1681,6 +1938,15 @@
 		struct encoder_packet *cur_packet;
 		cur_packet = output->interleaved_packets.array + idx;
 
+		// sort video packets with same DTS by track index,
+		// to prevent the pruning logic from removing additional
+		// video tracks
+		if (out->dts_usec == cur_packet->dts_usec &&
+		 out->type == OBS_ENCODER_VIDEO &&
+		 cur_packet->type == OBS_ENCODER_VIDEO &&
+		 out->track_idx > cur_packet->track_idx)
+			continue;
+
 		if (out->dts_usec == cur_packet->dts_usec &&
 		 out->type == OBS_ENCODER_VIDEO) {
 			break;
@@ -1728,18 +1994,18 @@
 	struct obs_output *output = data;
 	struct encoder_packet out;
 	bool was_started;
+	bool received_video;
 
 	if (!active(output))
 		return;
 
-	if (packet->type == OBS_ENCODER_AUDIO)
-		packet->track_idx = get_track_index(output, packet);
+	packet->track_idx = get_encoder_index(output, packet);
 
 	pthread_mutex_lock(&output->interleaved_mutex);
 
 	/* if first video frame is not a keyframe, discard until received */
-	if (!output->received_video && packet->type == OBS_ENCODER_VIDEO &&
-	 !packet->keyframe) {
+	if (packet->type == OBS_ENCODER_VIDEO &&
+	 !output->received_videopacket->track_idx && !packet->keyframe) {
 		discard_unused_audio_packets(output, packet->dts_usec);
 		pthread_mutex_unlock(&output->interleaved_mutex);
 
@@ -1748,7 +2014,14 @@
 		return;
 	}
 
-	was_started = output->received_audio && output->received_video;
+	received_video = true;
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (output->video_encodersi)
+			received_video = received_video &&
+					 output->received_videoi;
+	}
+
+	was_started = output->received_audio && received_video;
 
 	if (output->active_delay_ns)
 		out = *packet;
@@ -1763,9 +2036,16 @@
 	insert_interleaved_packet(output, &out);
 	set_higher_ts(output, &out);
 
+	received_video = true;
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (output->video_encodersi)
+			received_video = received_video &&
+					 output->received_videoi;
+	}
+
 	/* when both video and audio have been received, we're ready
 	 * to start sending out packets (one at a time) */
-	if (output->received_audio && output->received_video) {
+	if (output->received_audio && received_video) {
 		if (!was_started) {
 			if (prune_interleaved_packets(output)) {
 				if (initialize_interleaved_packets(output)) {
@@ -1786,8 +2066,7 @@
 	struct obs_output *output = param;
 
 	if (data_active(output)) {
-		if (packet->type == OBS_ENCODER_AUDIO)
-			packet->track_idx = get_track_index(output, packet);
+		packet->track_idx = get_encoder_index(output, packet);
 
 		output->info.encoded_packet(output->context.data, packet);
 
@@ -1917,6 +2196,17 @@
 	}
 }
 
+static inline void start_video_encoders(struct obs_output *output,
+					encoded_callback_t encoded_callback)
+{
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		if (output->video_encodersi) {
+			obs_encoder_start(output->video_encodersi,
+					 encoded_callback, output);
+		}
+	}
+}
+
 static inline void start_raw_audio(obs_output_t *output)
 {
 	if (output->info.raw_audio2) {
@@ -1938,11 +2228,13 @@
 static void reset_packet_data(obs_output_t *output)
 {
 	output->received_audio = false;
-	output->received_video = false;
 	output->highest_audio_ts = 0;
-	output->highest_video_ts = 0;
-	output->video_offset = 0;
 
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		output->received_videoi = false;
+		output->video_offsetsi = 0;
+		output->highest_video_tsi = 0;
+	}
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++)
 		output->audio_offsetsi = 0;
 
@@ -1954,12 +2246,13 @@
 	return (output->delay_flags & OBS_OUTPUT_DELAY_PRESERVE) != 0;
 }
 
-static void hook_data_capture(struct obs_output *output, bool encoded,
-			 bool has_video, bool has_audio)
+static void hook_data_capture(struct obs_output *output)
 {
 	encoded_callback_t encoded_callback;
+	bool has_video = flag_video(output);
+	bool has_audio = flag_audio(output);
 
-	if (encoded) {
+	if (flag_encoded(output)) {
 		pthread_mutex_lock(&output->interleaved_mutex);
 		reset_packet_data(output);
 		pthread_mutex_unlock(&output->interleaved_mutex);
@@ -1986,13 +2279,12 @@
 		if (has_audio)
 			start_audio_encoders(output, encoded_callback);
 		if (has_video)
-			obs_encoder_start(output->video_encoder,
-					 encoded_callback, output);
+			start_video_encoders(output, encoded_callback);
 	} else {
 		if (has_video)
 			start_raw_video(output->video,
 					obs_output_get_video_conversion(output),
-					default_raw_video_callback, output);
+					1, default_raw_video_callback, output);
 		if (has_audio)
 			start_raw_audio(output);
 	}
@@ -2035,25 +2327,10 @@
 	calldata_free(&params);
 }
 
-static inline void convert_flags(const struct obs_output *output,
-				 uint32_t flags, bool *encoded, bool *has_video,
-				 bool *has_audio, bool *has_service)
-{
-	*encoded = (output->info.flags & OBS_OUTPUT_ENCODED) != 0;
-	if (!flags)
-		flags = output->info.flags;
-	else
-		flags &= output->info.flags;
-
-	*has_video = (flags & OBS_OUTPUT_VIDEO) != 0;
-	*has_audio = (flags & OBS_OUTPUT_AUDIO) != 0;
-	*has_service = (flags & OBS_OUTPUT_SERVICE) != 0;
-}
-
 bool obs_output_can_begin_data_capture(const obs_output_t *output,
 				 uint32_t flags)
 {
-	bool encoded, has_video, has_audio, has_service;
+	UNUSED_PARAMETER(flags);
 
 	if (!obs_output_valid(output, "obs_output_can_begin_data_capture"))
 		return false;
@@ -2066,11 +2343,7 @@
 	if (data_capture_ending(output))
 		pthread_join(output->end_data_capture_thread, NULL);
 
-	convert_flags(output, flags, &encoded, &has_video, &has_audio,
-		 &has_service);
-
-	return can_begin_data_capture(output, encoded, has_video, has_audio,
-				 has_service);
+	return can_begin_data_capture(output);
 }
 
 static inline bool initialize_audio_encoders(obs_output_t *output)
@@ -2088,6 +2361,21 @@
 	return true;
 }
 
+static inline bool initialize_video_encoders(obs_output_t *output)
+{
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		obs_encoder_t *video = output->video_encodersi;
+
+		if (video && !obs_encoder_initialize(video)) {
+			obs_output_set_last_error(
+				output, obs_encoder_get_last_error(video));
+			return false;
+		}
+	}
+
+	return true;
+}
+
 static inline obs_encoder_t *find_inactive_audio_encoder(obs_output_t *output)
 {
 	for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
@@ -2102,7 +2390,10 @@
 
 static inline void pair_encoders(obs_output_t *output)
 {
-	struct obs_encoder *video = output->video_encoder;
+	size_t first_venc_idx;
+	if (!get_first_video_encoder_index(output, &first_venc_idx))
+		return;
+	struct obs_encoder *video = output->video_encodersfirst_venc_idx;
 	struct obs_encoder *audio = find_inactive_audio_encoder(output);
 
 	if (video && audio) {
@@ -2124,26 +2415,18 @@
 
 bool obs_output_initialize_encoders(obs_output_t *output, uint32_t flags)
 {
-	bool encoded, has_video, has_audio, has_service;
+	UNUSED_PARAMETER(flags);
 
 	if (!obs_output_valid(output, "obs_output_initialize_encoders"))
 		return false;
-
+	if (!log_flag_encoded(output, __FUNCTION__, false))
+		return false;
 	if (active(output))
 		return delay_active(output);
 
-	convert_flags(output, flags, &encoded, &has_video, &has_audio,
-		 &has_service);
-
-	if (!encoded)
-		return false;
-	if (has_video && !obs_encoder_initialize(output->video_encoder)) {
-		obs_output_set_last_error(
-			output,
-			obs_encoder_get_last_error(output->video_encoder));
+	if (flag_video(output) && !initialize_video_encoders(output))
 		return false;
-	}
-	if (has_audio && !initialize_audio_encoders(output))
+	if (flag_audio(output) && !initialize_audio_encoders(output))
 		return false;
 
 	return true;
@@ -2207,7 +2490,7 @@
 
 bool obs_output_begin_data_capture(obs_output_t *output, uint32_t flags)
 {
-	bool encoded, has_video, has_audio, has_service;
+	UNUSED_PARAMETER(flags);
 
 	if (!obs_output_valid(output, "obs_output_begin_data_capture"))
 		return false;
@@ -2219,24 +2502,19 @@
 
 	output->total_frames = 0;
 
-	if ((output->info.flags & OBS_OUTPUT_ENCODED) == 0) {
+	if (!flag_encoded(output))
 		reset_raw_output(output);
-	}
 
-	convert_flags(output, flags, &encoded, &has_video, &has_audio,
-		 &has_service);
-
-	if (!can_begin_data_capture(output, encoded, has_video, has_audio,
-				 has_service))
+	if (!can_begin_data_capture(output))
 		return false;
 
-	if (has_video && has_audio)
+	if (flag_video(output) && flag_audio(output))
 		pair_encoders(output);
 
 	os_atomic_set_bool(&output->data_active, true);
-	hook_data_capture(output, encoded, has_video, has_audio);
+	hook_data_capture(output);
 
-	if (has_service)
+	if (flag_service(output))
 		obs_service_activate(output->service);
 
 	do_output_signal(output, "activate");
@@ -2266,6 +2544,16 @@
 	}
 }
 
+static inline void stop_video_encoders(obs_output_t *output,
+				 encoded_callback_t encoded_callback)
+{
+	for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+		obs_encoder_t *video = output->video_encodersi;
+		if (video)
+			obs_encoder_stop(video, encoded_callback, output);
+	}
+}
+
 static inline void stop_raw_audio(obs_output_t *output)
 {
 	if (output->info.raw_audio2) {
@@ -2284,14 +2572,12 @@
 
 static void *end_data_capture_thread(void *data)
 {
-	bool encoded, has_video, has_audio, has_service;
 	encoded_callback_t encoded_callback;
 	obs_output_t *output = data;
+	bool has_video = flag_video(output);
+	bool has_audio = flag_audio(output);
 
-	convert_flags(output, 0, &encoded, &has_video, &has_audio,
-		 &has_service);
-
-	if (encoded) {
+	if (flag_encoded(output)) {
 		if (output->active_delay_ns)
 			encoded_callback = process_delay;
 		else
@@ -2300,8 +2586,7 @@
 						 : default_encoded_callback;
 
 		if (has_video)
-			obs_encoder_stop(output->video_encoder,
-					 encoded_callback, output);
+			stop_video_encoders(output, encoded_callback);
 		if (has_audio)
 			stop_audio_encoders(output, encoded_callback);
 	} else {
@@ -2312,7 +2597,7 @@
 			stop_raw_audio(output);
 	}
 
-	if (has_service)
+	if (flag_service(output))
 		obs_service_deactivate(output->service, false);
 
 	if (output->active_delay_ns)
@@ -2356,7 +2641,7 @@
 
 	os_atomic_set_bool(&output->data_active, false);
 
-	if (output->video)
+	if (flag_video(output))
 		log_frame_info(output);
 
 	if (data_capture_ending(output))
@@ -2663,9 +2948,11 @@
 	if (output->last_error_message) {
 		return output->last_error_message;
 	} else {
-		obs_encoder_t *vencoder = output->video_encoder;
-		if (vencoder && vencoder->last_error_message) {
-			return vencoder->last_error_message;
+		for (size_t i = 0; i < MAX_OUTPUT_VIDEO_ENCODERS; i++) {
+			obs_encoder_t *vencoder = output->video_encodersi;
+			if (vencoder && vencoder->last_error_message) {
+				return vencoder->last_error_message;
+			}
 		}
 
 		for (size_t i = 0; i < MAX_OUTPUT_AUDIO_ENCODERS; i++) {
@@ -2720,9 +3007,7 @@
 	if (!obs_output_valid(output, "obs_output_get_protocols"))
 		return NULL;
 
-	return (output->info.flags & OBS_OUTPUT_SERVICE)
-		 ? output->info.protocols
-		 : NULL;
+	return flag_service(output) ? output->info.protocols : NULL;
 }
 
 void obs_enum_output_types_with_protocol(const char *protocol, void *data,

obs-studio-29.1.3.tar.xz/libobs/obs-output.h -> obs-studio-30.0.2.tar.xz/libobs/obs-output.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-properties.c -> obs-studio-30.0.2.tar.xz/libobs/obs-properties.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@
 		char *str;
 		long long ll;
 		double d;
+		bool b;
 	};
 };
 
@@ -359,22 +360,21 @@
 	}
 }
 
-void obs_properties_apply_settings_internal(obs_properties_t *props,
-					 obs_data_t *settings,
-					 obs_properties_t *realprops)
+typedef DARRAY(struct obs_property *) obs_property_da_t;
+
+void obs_properties_apply_settings_internal(
+	obs_properties_t *props, obs_property_da_t *properties_with_callback)
 {
 	struct obs_property *p = props->properties;
 
 	while (p) {
 		if (p->type == OBS_PROPERTY_GROUP) {
 			obs_properties_apply_settings_internal(
-				obs_property_group_content(p), settings,
-				realprops);
+				obs_property_group_content(p),
+				properties_with_callback);
 		}
-		if (p->modified)
-			p->modified(realprops, p, settings);
-		else if (p->modified2)
-			p->modified2(p->priv, realprops, p, settings);
+		if (p->modified || p->modified2)
+			da_push_back((*properties_with_callback), &p);
 
 		p = p->hh.next;
 	}
@@ -386,7 +386,23 @@
 	if (!props)
 		return;
 
-	obs_properties_apply_settings_internal(props, settings, props);
+	obs_property_da_t properties_with_callback;
+	da_init(properties_with_callback);
+
+	obs_properties_apply_settings_internal(props,
+					 &properties_with_callback);
+
+	while (properties_with_callback.num > 0) {
+		struct obs_property *p = *(struct obs_property **)da_end(
+			properties_with_callback);
+		if (p->modified)
+			p->modified(props, p, settings);
+		else if (p->modified2)
+			p->modified2(p->priv, props, p, settings);
+		da_pop_back(properties_with_callback);
+	}
+
+	da_free(properties_with_callback);
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1151,6 +1167,8 @@
 		item.ll = *(const long long *)val;
 	else if (data->format == OBS_COMBO_FORMAT_FLOAT)
 		item.d = *(const double *)val;
+	else if (data->format == OBS_COMBO_FORMAT_BOOL)
+		item.b = *(const bool *)val;
 	else
 		item.str = bstrdup(val);
 
@@ -1167,6 +1185,8 @@
 		item.ll = *(const long long *)val;
 	else if (data->format == OBS_COMBO_FORMAT_FLOAT)
 		item.d = *(const double *)val;
+	else if (data->format == OBS_COMBO_FORMAT_BOOL)
+		item.b = *(const bool *)val;
 	else
 		item.str = bstrdup(val);
 
@@ -1200,6 +1220,14 @@
 	return 0;
 }
 
+size_t obs_property_list_add_bool(obs_property_t *p, const char *name, bool val)
+{
+	struct list_data *data = get_list_data(p);
+	if (data && data->format == OBS_COMBO_FORMAT_BOOL)
+		return add_item(data, name, &val);
+	return 0;
+}
+
 void obs_property_list_insert_string(obs_property_t *p, size_t idx,
 				 const char *name, const char *val)
 {
@@ -1224,6 +1252,14 @@
 		insert_item(data, idx, name, &val);
 }
 
+void obs_property_list_insert_bool(obs_property_t *p, size_t idx,
+				 const char *name, bool val)
+{
+	struct list_data *data = get_list_data(p);
+	if (data && data->format == OBS_COMBO_FORMAT_BOOL)
+		insert_item(data, idx, name, &val);
+}
+
 void obs_property_list_item_remove(obs_property_t *p, size_t idx)
 {
 	struct list_data *data = get_list_data(p);
@@ -1281,6 +1317,13 @@
 	return (data && idx < data->items.num) ? data->items.arrayidx.d : 0.0;
 }
 
+bool obs_property_list_item_bool(obs_property_t *p, size_t idx)
+{
+	struct list_data *data = get_list_fmt_data(p, OBS_COMBO_FORMAT_BOOL);
+	return (data && idx < data->items.num) ? data->items.arrayidx.d
+					 : false;
+}
+
 enum obs_editable_list_type obs_property_editable_list_type(obs_property_t *p)
 {
 	struct editable_list_data *data =

obs-studio-29.1.3.tar.xz/libobs/obs-properties.h -> obs-studio-30.0.2.tar.xz/libobs/obs-properties.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -64,12 +64,14 @@
 	OBS_COMBO_FORMAT_INT,
 	OBS_COMBO_FORMAT_FLOAT,
 	OBS_COMBO_FORMAT_STRING,
+	OBS_COMBO_FORMAT_BOOL,
 };
 
 enum obs_combo_type {
 	OBS_COMBO_TYPE_INVALID,
 	OBS_COMBO_TYPE_EDITABLE,
 	OBS_COMBO_TYPE_LIST,
+	OBS_COMBO_TYPE_RADIO,
 };
 
 enum obs_editable_list_type {
@@ -364,6 +366,8 @@
 					long long val);
 EXPORT size_t obs_property_list_add_float(obs_property_t *p, const char *name,
 					 double val);
+EXPORT size_t obs_property_list_add_bool(obs_property_t *p, const char *name,
+					 bool val);
 
 EXPORT void obs_property_list_insert_string(obs_property_t *p, size_t idx,
 					 const char *name, const char *val);
@@ -371,6 +375,8 @@
 					 const char *name, long long val);
 EXPORT void obs_property_list_insert_float(obs_property_t *p, size_t idx,
 					 const char *name, double val);
+EXPORT void obs_property_list_insert_bool(obs_property_t *p, size_t idx,
+					 const char *name, bool val);
 
 EXPORT void obs_property_list_item_disable(obs_property_t *p, size_t idx,
 					 bool disabled);
@@ -383,6 +389,7 @@
 EXPORT const char *obs_property_list_item_string(obs_property_t *p, size_t idx);
 EXPORT long long obs_property_list_item_int(obs_property_t *p, size_t idx);
 EXPORT double obs_property_list_item_float(obs_property_t *p, size_t idx);
+EXPORT bool obs_property_list_item_bool(obs_property_t *p, size_t idx);
 
 EXPORT enum obs_editable_list_type
 obs_property_editable_list_type(obs_property_t *p);

obs-studio-29.1.3.tar.xz/libobs/obs-scene.c -> obs-studio-30.0.2.tar.xz/libobs/obs-scene.c Changed

@@ -1,6 +1,6 @@
 /******************************************************************************
- Copyright (C) 2013-2015 by Hugh Bailey <obs.jim@gmail.com>
- Philippe Groarke <philippe.groarke@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
+ Philippe Groarke <philippe.groarke@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -35,6 +35,8 @@
 static void init_hotkeys(obs_scene_t *scene, obs_sceneitem_t *item,
 			 const char *name);
 
+typedef DARRAY(struct obs_scene_item *) obs_scene_item_ptr_array_t;
+
 /* NOTE: For proper mutex lock order (preventing mutual cross-locks), never
 * lock the graphics mutex inside either of the scene mutexes.
 *
@@ -214,7 +216,7 @@
 static void remove_all_items(struct obs_scene *scene)
 {
 	struct obs_scene_item *item;
-	DARRAY(struct obs_scene_item *) items;
+	obs_scene_item_ptr_array_t items;
 
 	da_init(items);
 
@@ -393,19 +395,25 @@
 		vec2_mulf(scale, scale, item->bounds.y / height);
 
 	} else if (bounds_type == OBS_BOUNDS_STRETCH) {
-		scale->x = item->bounds.x / (float)(*cx);
-		scale->y = item->bounds.y / (float)(*cy);
+		scale->x = copysignf(item->bounds.x / (float)(*cx), scale->x);
+		scale->y = copysignf(item->bounds.y / (float)(*cy), scale->y);
 	}
 
 	width = (float)(*cx) * scale->x;
 	height = (float)(*cy) * scale->y;
-	width_diff = item->bounds.x - width;
-	height_diff = item->bounds.y - height;
+
+	/* Disregards flip when calculating size diff */
+	width_diff = item->bounds.x - fabsf(width);
+	height_diff = item->bounds.y - fabsf(height);
 	*cx = (uint32_t)item->bounds.x;
 	*cy = (uint32_t)item->bounds.y;
 
 	add_alignment(origin, item->bounds_align, (int)-width_diff,
 		 (int)-height_diff);
+
+	/* Makes the item stay in-place in the box if flipped */
+	origin->x += (width < 0.0f) ? width : 0.0f;
+	origin->y += (height < 0.0f) ? height : 0.0f;
 }
 
 static inline uint32_t calc_cx(const struct obs_scene_item *item,
@@ -852,7 +860,7 @@
 /* assumes video lock */
 static void
 update_transforms_and_prune_sources(obs_scene_t *scene,
-				 struct darray *remove_items,
+				 obs_scene_item_ptr_array_t *remove_items,
 				 obs_sceneitem_t *group_sceneitem)
 {
 	struct obs_scene_item *item = scene->first_item;
@@ -866,8 +874,7 @@
 			item = item->next;
 
 			remove_without_release(del_item);
-			darray_push_back(sizeof(struct obs_scene_item *),
-					 remove_items, &del_item);
+			da_push_back(*remove_items, &del_item);
 			rebuild_group = true;
 			continue;
 		}
@@ -897,7 +904,7 @@
 
 static void scene_video_render(void *data, gs_effect_t *effect)
 {
-	DARRAY(struct obs_scene_item *) remove_items;
+	obs_scene_item_ptr_array_t remove_items;
 	struct obs_scene *scene = data;
 	struct obs_scene_item *item;
 
@@ -906,8 +913,7 @@
 	video_lock(scene);
 
 	if (!scene->is_group) {
-		update_transforms_and_prune_sources(scene, &remove_items.da,
-						 NULL);
+		update_transforms_and_prune_sources(scene, &remove_items, NULL);
 	}
 
 	gs_blend_state_push();
@@ -954,7 +960,10 @@
 	pthread_mutex_unlock(&item->actions_mutex);
 }
 
-static void scene_load(void *data, obs_data_t *settings);
+static obs_sceneitem_t *obs_scene_add_internal(obs_scene_t *scene,
+					 obs_source_t *source,
+					 obs_sceneitem_t *insert_after,
+					 int64_t id);
 
 static void scene_load_item(struct obs_scene *scene, obs_data_t *item_data)
 {
@@ -965,6 +974,8 @@
 	const char *blend_method_str;
 	const char *blend_str;
 	struct obs_scene_item *item;
+	struct calldata params;
+	uint8_t stack128;
 	bool visible;
 	bool lock;
 
@@ -986,7 +997,8 @@
 		return;
 	}
 
-	item = obs_scene_add(scene, source);
+	item = obs_scene_add_internal(scene, source, NULL,
+				 obs_data_get_int(item_data, "id"));
 	if (!item) {
 		blog(LOG_WARNING,
 		 "scene_load_item Could not add source '%s' "
@@ -997,14 +1009,17 @@
 		return;
 	}
 
+	calldata_init_fixed(&params, stack, sizeof(stack));
+	calldata_set_ptr(&params, "scene", scene);
+	calldata_set_ptr(&params, "item", item);
+	signal_handler_signal(scene->source->context.signals, "item_add",
+			 &params);
+
 	item->is_group = strcmp(source->info.id, group_info.id) == 0;
 
 	obs_data_set_default_int(item_data, "align",
 				 OBS_ALIGN_TOP | OBS_ALIGN_LEFT);
 
-	if (obs_data_has_user_value(item_data, "id"))
-		item->id = obs_data_get_int(item_data, "id");
-
 	item->rot = (float)obs_data_get_double(item_data, "rot");
 	item->align = (uint32_t)obs_data_get_int(item_data, "align");
 	visible = obs_data_get_bool(item_data, "visible");
@@ -1106,6 +1121,9 @@
 		scene->custom_size = true;
 	}
 
+	if (obs_data_has_user_value(settings, "id_counter"))
+		scene->id_counter = obs_data_get_int(settings, "id_counter");
+
 	if (!items)
 		return;
 
@@ -1117,9 +1135,6 @@
 		obs_data_release(item_data);
 	}
 
-	if (obs_data_has_user_value(settings, "id_counter"))
-		scene->id_counter = obs_data_get_int(settings, "id_counter");
-
 	obs_data_array_release(items);
 }
 
@@ -1603,21 +1618,19 @@
 	return item ? item->source : NULL;
 }
 
-static inline obs_source_t *dup_child(struct darray *array, size_t idx,
-				 obs_scene_t *new_scene, bool private)
+static inline obs_source_t *dup_child(obs_scene_item_ptr_array_t *old_items,
+				 size_t idx, obs_scene_t *new_scene,
+				 bool private)
 {
-	DARRAY(struct obs_scene_item *) old_items;
 	obs_source_t *source;
 
-	old_items.da = *array;
-
-	source = old_items.arrayidx->source;
+	source = old_items->arrayidx->source;
 
 	/* if the old item is referenced more than once in the old scene,
 	 * make sure they're referenced similarly in the new scene to reduce
 	 * load times */
 	for (size_t i = 0; i < idx; i++) {
-		struct obs_scene_item *item = old_items.arrayi;
+		struct obs_scene_item *item = old_items->arrayi;
 		if (item->source == source) {
 			source = get_child_at_idx(new_scene, i);
 			return obs_source_get_ref(source);
@@ -1679,14 +1692,24 @@
 	dst->hide_transition_duration = src->hide_transition_duration;
 
 	if (duplicate_hotkeys && !dst_scene->source->context.private) {
+		struct dstr show = {0};
+		struct dstr hide = {0};
 		obs_data_array_t *data0 = NULL;
 		obs_data_array_t *data1 = NULL;
 
 		obs_hotkey_pair_save(src->toggle_visibility, &data0, &data1);
 		obs_hotkey_pair_load(dst->toggle_visibility, data0, data1);
 
+		/* Fix scene item ID */
+		dstr_printf(&show, "libobs.show_scene_item.%" PRIi64, dst->id);
+		dstr_printf(&hide, "libobs.hide_scene_item.%" PRIi64, dst->id);
+		obs_hotkey_pair_set_names(dst->toggle_visibility, show.array,
+					 hide.array);
+
 		obs_data_array_release(data0);
 		obs_data_array_release(data1);
+		dstr_free(&show);
+		dstr_free(&hide);
 	}
 
 	obs_sceneitem_set_crop(dst, &src->crop);
@@ -1704,7 +1727,7 @@
 {
 	bool make_unique = ((int)type & (1 << 0)) != 0;
 	bool make_private = ((int)type & (1 << 1)) != 0;
-	DARRAY(struct obs_scene_item *) items;
+	obs_scene_item_ptr_array_t items;
 	struct obs_scene *new_scene;
 	struct obs_scene_item *item;
 	struct obs_source *source;
@@ -1744,9 +1767,9 @@
 
 	for (size_t i = 0; i < items.num; i++) {
 		item = items.arrayi;
-		source = make_unique ? dup_child(&items.da, i, new_scene,
-						 make_private)
-				 : new_ref(item->source);
+		source = make_unique
+				 ? dup_child(&items, i, new_scene, make_private)
+				 : new_ref(item->source);
 
 		if (source) {
 			struct obs_scene_item *new_item =
@@ -1999,21 +2022,38 @@
 static void init_hotkeys(obs_scene_t *scene, obs_sceneitem_t *item,
 			 const char *name)
 {
+	struct obs_data_array *hotkey_array;
+	obs_data_t *hotkey_data = scene->source->context.hotkey_data;
+
 	struct dstr show = {0};
 	struct dstr hide = {0};
+	struct dstr legacy = {0};
 	struct dstr show_desc = {0};
 	struct dstr hide_desc = {0};
 
-	dstr_copy(&show, "libobs.show_scene_item.%1");
-	dstr_replace(&show, "%1", name);
-	dstr_copy(&hide, "libobs.hide_scene_item.%1");
-	dstr_replace(&hide, "%1", name);
+	dstr_printf(&show, "libobs.show_scene_item.%" PRIi64, item->id);
+	dstr_printf(&hide, "libobs.hide_scene_item.%" PRIi64, item->id);
 
 	dstr_copy(&show_desc, obs->hotkeys.sceneitem_show);
 	dstr_replace(&show_desc, "%1", name);
 	dstr_copy(&hide_desc, obs->hotkeys.sceneitem_hide);
 	dstr_replace(&hide_desc, "%1", name);
 
+	/* Check if legacy keys exists, migrate if necessary */
+	dstr_printf(&legacy, "libobs.show_scene_item.%s", name);
+	hotkey_array = obs_data_get_array(hotkey_data, legacy.array);
+	if (hotkey_array) {
+		obs_data_set_array(hotkey_data, show.array, hotkey_array);
+		obs_data_array_release(hotkey_array);
+	}
+
+	dstr_printf(&legacy, "libobs.hide_scene_item.%s", name);
+	hotkey_array = obs_data_get_array(hotkey_data, legacy.array);
+	if (hotkey_array) {
+		obs_data_set_array(hotkey_data, hide.array, hotkey_array);
+		obs_data_array_release(hotkey_array);
+	}
+
 	item->toggle_visibility = obs_hotkey_pair_register_source(
 		scene->source, show.array, show_desc.array, hide.array,
 		hide_desc.array, hotkey_show_sceneitem, hotkey_hide_sceneitem,
@@ -2021,6 +2061,7 @@
 
 	dstr_free(&show);
 	dstr_free(&hide);
+	dstr_free(&legacy);
 	dstr_free(&show_desc);
 	dstr_free(&hide_desc);
 }
@@ -2028,19 +2069,9 @@
 static void sceneitem_rename_hotkey(const obs_sceneitem_t *scene_item,
 				 const char *new_name)
 {
-	struct dstr show = {0};
-	struct dstr hide = {0};
 	struct dstr show_desc = {0};
 	struct dstr hide_desc = {0};
 
-	dstr_copy(&show, "libobs.show_scene_item.%1");
-	dstr_replace(&show, "%1", new_name);
-	dstr_copy(&hide, "libobs.hide_scene_item.%1");
-	dstr_replace(&hide, "%1", new_name);
-
-	obs_hotkey_pair_set_names(scene_item->toggle_visibility, show.array,
-				 hide.array);
-
 	dstr_copy(&show_desc, obs->hotkeys.sceneitem_show);
 	dstr_replace(&show_desc, "%1", new_name);
 	dstr_copy(&hide_desc, obs->hotkeys.sceneitem_hide);
@@ -2049,8 +2080,6 @@
 	obs_hotkey_pair_set_descriptions(scene_item->toggle_visibility,
 					 show_desc.array, hide_desc.array);
 
-	dstr_free(&show);
-	dstr_free(&hide);
 	dstr_free(&show_desc);
 	dstr_free(&hide_desc);
 }
@@ -2071,7 +2100,8 @@
 
 static obs_sceneitem_t *obs_scene_add_internal(obs_scene_t *scene,
 					 obs_source_t *source,
-					 obs_sceneitem_t *insert_after)
+					 obs_sceneitem_t *insert_after,
+					 int64_t id)
 {
 	struct obs_scene_item *last;
 	struct obs_scene_item *item;
@@ -2108,7 +2138,7 @@
 
 	item = bzalloc(sizeof(struct obs_scene_item));
 	item->source = source;
-	item->id = ++scene->id_counter;
+	item->id = id ? id : ++scene->id_counter;
 	item->parent = scene;
 	item->ref = 1;
 	item->align = OBS_ALIGN_TOP | OBS_ALIGN_LEFT;
@@ -2169,7 +2199,7 @@
 
 obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source)
 {
-	obs_sceneitem_t *item = obs_scene_add_internal(scene, source, NULL);
+	obs_sceneitem_t *item = obs_scene_add_internal(scene, source, NULL, 0);
 	struct calldata params;
 	uint8_t stack128;
 
@@ -2228,19 +2258,13 @@
 {
 	obs_scene_t *scene;
 
-	if (!item)
+	if (!item || item->removed)
 		return;
 
 	scene = item->parent;
 
 	full_lock(scene);
 
-	if (item->removed) {
-		if (scene)
-			full_unlock(scene);
-		return;
-	}
-
 	item->removed = true;
 
 	assert(scene != NULL);
@@ -2378,6 +2402,8 @@
 
 	obs_data_set_string(temp, "scene_name",
 			 obs_source_get_name(obs_scene_get_source(scene)));
+	obs_data_set_string(temp, "scene_uuid",
+			 obs_source_get_uuid(obs_scene_get_source(scene)));
 	obs_data_set_bool(temp, "is_group", false);
 
 	obs_scene_enum_items(scene, save_transform_states, (void *)&pass);
@@ -3299,7 +3325,7 @@
 	obs_sceneitem_t *last_item = items ? itemscount - 1 : NULL;
 
 	obs_sceneitem_t *item =
-		obs_scene_add_internal(scene, sub_scene->source, last_item);
+		obs_scene_add_internal(scene, sub_scene->source, last_item, 0);
 
 	if (!items || !count) {
 		obs_scene_release(sub_scene);
@@ -3422,7 +3448,8 @@
 		obs_sceneitem_t *dst;
 
 		remove_group_transform(item, last);
-		dst = obs_scene_add_internal(scene, last->source, insert_after);
+		dst = obs_scene_add_internal(scene, last->source, insert_after,
+					 0);
 		duplicate_item_data(dst, last, true, true);
 		apply_group_transform(last, item);
 
@@ -3598,6 +3625,22 @@
 	return NULL;
 }
 
+static void obs_sceneitem_move_hotkeys(obs_scene_t *parent,
+				 obs_sceneitem_t *item)
+{
+	obs_data_array_t *data0 = NULL;
+	obs_data_array_t *data1 = NULL;
+
+	obs_hotkey_pair_save(item->toggle_visibility, &data0, &data1);
+	obs_hotkey_pair_unregister(item->toggle_visibility);
+
+	init_hotkeys(parent, item, obs_source_get_name(item->source));
+	obs_hotkey_pair_load(item->toggle_visibility, data0, data1);
+
+	obs_data_array_release(data0);
+	obs_data_array_release(data1);
+}
+
 bool obs_scene_reorder_items2(obs_scene_t *scene,
 			 struct obs_sceneitem_order_info *item_order,
 			 size_t item_order_size)
@@ -3656,6 +3699,9 @@
 				if (!sub_scene->first_item)
 					sub_scene->first_item = sub_item;
 
+				/* Move hotkeys into group */
+				obs_sceneitem_move_hotkeys(sub_scene, sub_item);
+
 				sub_item->prev = sub_prev;
 				sub_item->next = NULL;
 				sub_item->parent = sub_scene;
@@ -3674,6 +3720,10 @@
 			obs_scene_release(sub_scene);
 		}
 
+		/* Move item hotkeys out of group */
+		if (item->parent && obs_scene_is_group(item->parent))
+			obs_sceneitem_move_hotkeys(scene, item);
+
 		item->prev = prev;
 		item->next = NULL;
 		item->parent = scene;
@@ -3953,11 +4003,11 @@
 
 void obs_scene_prune_sources(obs_scene_t *scene)
 {
-	DARRAY(struct obs_scene_item *) remove_items;
+	obs_scene_item_ptr_array_t remove_items;
 	da_init(remove_items);
 
 	video_lock(scene);
-	update_transforms_and_prune_sources(scene, &remove_items.da, NULL);
+	update_transforms_and_prune_sources(scene, &remove_items, NULL);
 	video_unlock(scene);
 
 	for (size_t i = 0; i < remove_items.num; i++)

obs-studio-29.1.3.tar.xz/libobs/obs-scene.h -> obs-studio-30.0.2.tar.xz/libobs/obs-scene.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-service.c -> obs-studio-30.0.2.tar.xz/libobs/obs-service.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-service.h -> obs-studio-30.0.2.tar.xz/libobs/obs-service.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-source-deinterlace.c -> obs-studio-30.0.2.tar.xz/libobs/obs-source-deinterlace.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-source-transition.c -> obs-studio-30.0.2.tar.xz/libobs/obs-source-transition.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-source.c -> obs-studio-30.0.2.tar.xz/libobs/obs-source.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -366,8 +366,7 @@
 		 *
 		 * XXX: Fix design flaws with filters */
 		if (info->type == OBS_SOURCE_TYPE_FILTER)
-		private
-		= true;
+		private = true;
 	}
 
 	source->mute_unmute_key = OBS_INVALID_HOTKEY_PAIR_ID;
@@ -1592,6 +1591,7 @@
 	CONVERT_I010,
 	CONVERT_P010,
 	CONVERT_V210,
+	CONVERT_R10L,
 };
 
 static inline enum convert_type get_convert_type(enum video_format format,
@@ -1652,6 +1652,9 @@
 	case VIDEO_FORMAT_V210:
 		return CONVERT_V210;
 
+	case VIDEO_FORMAT_R10L:
+		return CONVERT_R10L;
+
 	case VIDEO_FORMAT_P216:
 	case VIDEO_FORMAT_P416:
 		/* Unimplemented */
@@ -1959,6 +1962,16 @@
 	return true;
 }
 
+static inline bool set_r10l_sizes(struct obs_source *source,
+				 const struct obs_source_frame *frame)
+{
+	source->async_convert_width0 = frame->width;
+	source->async_convert_height0 = frame->height;
+	source->async_texture_formats0 = GS_BGRA_UNORM;
+	source->async_channel_count = 1;
+	return true;
+}
+
 static inline bool init_gpu_conversion(struct obs_source *source,
 				 const struct obs_source_frame *frame)
 {
@@ -2019,6 +2032,9 @@
 	case CONVERT_V210:
 		return set_v210_sizes(source, frame);
 
+	case CONVERT_R10L:
+		return set_r10l_sizes(source, frame);
+
 	case CONVERT_NONE:
 		assert(false && "No conversion requested");
 		break;
@@ -2112,6 +2128,7 @@
 	case CONVERT_I010:
 	case CONVERT_P010:
 	case CONVERT_V210:
+	case CONVERT_R10L:
 		for (size_t c = 0; c < MAX_AV_PLANES; c++) {
 			if (texc)
 				gs_texture_set_image(texc, frame->datac,
@@ -2245,6 +2262,20 @@
 		}
 	}
 
+	case VIDEO_FORMAT_R10L: {
+		switch (trc) {
+		case VIDEO_TRC_PQ:
+			return full_range ? "R10L_PQ_2020_709_Full_Reverse"
+					 : "R10L_PQ_2020_709_Limited_Reverse";
+		case VIDEO_TRC_HLG:
+			return full_range ? "R10L_HLG_2020_709_Full_Reverse"
+					 : "R10L_HLG_2020_709_Limited_Reverse";
+		default:
+			return full_range ? "R10L_SRGB_Full_Reverse"
+					 : "R10L_SRGB_Limited_Reverse";
+		}
+	}
+
 	case VIDEO_FORMAT_BGRA:
 	case VIDEO_FORMAT_BGRX:
 	case VIDEO_FORMAT_RGBA:
@@ -3132,6 +3163,10 @@
 
 	blog(LOG_DEBUG, "- filter '%s' (%s) added to source '%s'",
 	 filter->context.name, filter->info.id, source->context.name);
+
+	if (filter->info.filter_add)
+		filter->info.filter_add(filter->context.data,
+					filter->filter_parent);
 }
 
 static bool obs_source_filter_remove_refless(obs_source_t *source,
@@ -3225,6 +3260,19 @@
 		return find_prev_filter(source, filter, cur_idx - 1);
 }
 
+static void reorder_filter_targets(obs_source_t *source)
+{
+	/* reorder filter targets, not the nicest way of dealing with things */
+	for (size_t i = 0; i < source->filters.num; i++) {
+		obs_source_t *next_filter =
+			(i == source->filters.num - 1)
+				? source
+				: source->filters.arrayi + 1;
+
+		source->filters.arrayi->filter_target = next_filter;
+	}
+}
+
 /* moves filters above/below matching filter types */
 static bool move_filter_dir(obs_source_t *source, obs_source_t *filter,
 			 enum obs_order_movement movement)
@@ -3258,15 +3306,7 @@
 		da_move_item(source->filters, idx, 0);
 	}
 
-	/* reorder filter targets, not the nicest way of dealing with things */
-	for (size_t i = 0; i < source->filters.num; i++) {
-		obs_source_t *next_filter =
-			(i == source->filters.num - 1)
-				? source
-				: source->filters.arrayi + 1;
-
-		source->filters.arrayi->filter_target = next_filter;
-	}
+	reorder_filter_targets(source);
 
 	return true;
 }
@@ -3289,6 +3329,53 @@
 		obs_source_dosignal(source, NULL, "reorder_filters");
 }
 
+int obs_source_filter_get_index(obs_source_t *source, obs_source_t *filter)
+{
+	if (!obs_source_valid(source, "obs_source_filter_get_index"))
+		return -1;
+	if (!obs_ptr_valid(filter, "obs_source_filter_get_index"))
+		return -1;
+
+	size_t idx;
+
+	pthread_mutex_lock(&source->filter_mutex);
+	idx = da_find(source->filters, &filter, 0);
+	pthread_mutex_unlock(&source->filter_mutex);
+
+	return idx != DARRAY_INVALID ? (int)idx : -1;
+}
+
+static bool set_filter_index(obs_source_t *source, obs_source_t *filter,
+			 size_t index)
+{
+	size_t idx = da_find(source->filters, &filter, 0);
+	if (idx == DARRAY_INVALID)
+		return false;
+
+	da_move_item(source->filters, idx, index);
+	reorder_filter_targets(source);
+
+	return true;
+}
+
+void obs_source_filter_set_index(obs_source_t *source, obs_source_t *filter,
+				 size_t index)
+{
+	bool success;
+
+	if (!obs_source_valid(source, "obs_source_filter_set_index"))
+		return;
+	if (!obs_ptr_valid(filter, "obs_source_filter_set_index"))
+		return;
+
+	pthread_mutex_lock(&source->filter_mutex);
+	success = set_filter_index(source, filter, index);
+	pthread_mutex_unlock(&source->filter_mutex);
+
+	if (success)
+		obs_source_dosignal(source, NULL, "reorder_filters");
+}
+
 obs_data_t *obs_source_get_settings(const obs_source_t *source)
 {
 	if (!obs_source_valid(source, "obs_source_get_settings"))
@@ -3406,6 +3493,7 @@
 	case VIDEO_FORMAT_BGR3:
 	case VIDEO_FORMAT_AYUV:
 	case VIDEO_FORMAT_V210:
+	case VIDEO_FORMAT_R10L:
 		copy_frame_data_plane(dst, src, 0, dst->height);
 		break;
 
@@ -4168,7 +4256,8 @@
 		 * helps smooth out async rendering to frame boundaries. In
 		 * other words, tries to keep the framerate as smooth as
 		 * possible */
-		if ((source->last_frame_ts - next_frame->timestamp) < 2000000)
+		if (frame &&
+		 (source->last_frame_ts - next_frame->timestamp) < 2000000)
 			break;
 
 		if (frame)
@@ -5680,6 +5769,32 @@
 	}
 }
 
+void obs_source_add_audio_pause_callback(obs_source_t *source,
+					 signal_callback_t callback,
+					 void *param)
+{
+	if (!obs_source_valid(source, "obs_source_add_audio_pause_callback"))
+		return;
+
+	signal_handler_t *handler = obs_source_get_signal_handler(source);
+
+	signal_handler_connect(handler, "media_pause", callback, param);
+	signal_handler_connect(handler, "media_stopped", callback, param);
+}
+
+void obs_source_remove_audio_pause_callback(obs_source_t *source,
+					 signal_callback_t callback,
+					 void *param)
+{
+	if (!obs_source_valid(source, "obs_source_remove_audio_pause_callback"))
+		return;
+
+	signal_handler_t *handler = obs_source_get_signal_handler(source);
+
+	signal_handler_disconnect(handler, "media_pause", callback, param);
+	signal_handler_disconnect(handler, "media_stopped", callback, param);
+}
+
 void obs_source_add_audio_capture_callback(obs_source_t *source,
 					 obs_source_audio_capture_t callback,
 					 void *param)

obs-studio-29.1.3.tar.xz/libobs/obs-source.h -> obs-studio-30.0.2.tar.xz/libobs/obs-source.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -505,7 +505,7 @@
 
 	/**
 	 * Gets the default settings for this source
-	 * 
+	 *
 	 * If get_defaults is also defined both will be called, and the first
 	 * call will be to get_defaults, then to get_defaults2.
 	 *
@@ -552,6 +552,14 @@
 	enum gs_color_space (*video_get_color_space)(
 		void *data, size_t count,
 		const enum gs_color_space *preferred_spaces);
+
+	/**
+	 * Called when the filter is added to a source
+	 *
+	 * @param data Filter data
+	 * @param source Source that the filter is being added to
+	 */
+	void (*filter_add)(void *data, obs_source_t *source);
 };
 
 EXPORT void obs_register_source_s(const struct obs_source_info *info,

obs-studio-29.1.3.tar.xz/libobs/obs-ui.h -> obs-studio-30.0.2.tar.xz/libobs/obs-ui.h Changed

obs-studio-29.1.3.tar.xz/libobs/obs-video-gpu-encode.c -> obs-studio-30.0.2.tar.xz/libobs/obs-video-gpu-encode.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2018 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -70,11 +70,13 @@
 			struct encoder_packet pkt = {0};
 			bool received = false;
 			bool success;
+			uint32_t skip = 0;
 
 			obs_encoder_t *encoder = encoders.arrayi;
 			struct obs_encoder *pair = encoder->paired_encoder;
 
-			pkt.timebase_num = encoder->timebase_num;
+			pkt.timebase_num = encoder->timebase_num *
+					 encoder->frame_rate_divisor;
 			pkt.timebase_den = encoder->timebase_den;
 			pkt.encoder = encoder;
 
@@ -94,6 +96,16 @@
 						 encoder->context.settings);
 			}
 
+			// an explicit counter is used instead of remainder calculation
+			// to allow multiple encoders started at the same time to start on
+			// the same frame
+			skip = encoder->frame_rate_divisor_counter++;
+			if (encoder->frame_rate_divisor_counter ==
+			 encoder->frame_rate_divisor)
+				encoder->frame_rate_divisor_counter = 0;
+			if (skip)
+				continue;
+
 			if (!encoder->start_ts)
 				encoder->start_ts = timestamp;
 
@@ -111,7 +123,8 @@
 
 			lock_key = next_key;
 
-			encoder->cur_pts += encoder->timebase_num;
+			encoder->cur_pts += encoder->timebase_num *
+					 encoder->frame_rate_divisor;
 		}
 
 		/* -------------- */
@@ -175,8 +188,9 @@
 
 		uint32_t handle = gs_texture_get_shared_handle(tex);
 
-		struct obs_tex_frame frame = {
-			.tex = tex, .tex_uv = tex_uv, .handle = handle};
+		struct obs_tex_frame frame = {.tex = tex,
+					 .tex_uv = tex_uv,
+					 .handle = handle};
 
 		circlebuf_push_back(&video->gpu_encoder_avail_queue, &frame,
 				 sizeof(frame));

obs-studio-29.1.3.tar.xz/libobs/obs-video.c -> obs-studio-30.0.2.tar.xz/libobs/obs-video.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-view.c -> obs-studio-30.0.2.tar.xz/libobs/obs-view.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-win-crash-handler.c -> obs-studio-30.0.2.tar.xz/libobs/obs-win-crash-handler.c Changed

obs-studio-29.1.3.tar.xz/libobs/obs-windows.c -> obs-studio-30.0.2.tar.xz/libobs/obs-windows.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -34,15 +34,7 @@
 	return ".dll";
 }
 
-#ifdef _WIN64
-#define BIT_STRING "64bit"
-#else
-#define BIT_STRING "32bit"
-#endif
-
-static const char *module_bin = {
-	"../../obs-plugins/" BIT_STRING,
-};
+static const char *module_bin = {"../../obs-plugins/64bit"};
 
 static const char *module_data = {"../../data/obs-plugins/%module%"};
 
@@ -133,6 +125,31 @@
 	 (DWORD)(ms.ullAvailPhys / 1048576), note);
 }
 
+static void log_lenovo_vantage(void)
+{
+	SC_HANDLE manager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
+
+	if (!manager)
+		return;
+
+	SC_HANDLE service =
+		OpenService(manager, L"FBNetFilter", SERVICE_QUERY_STATUS);
+
+	if (service) {
+		blog(LOG_WARNING,
+		 "Lenovo Vantage / Legion Edge is installed. The \"Network Boost\" "
+		 "feature must be disabled when streaming with OBS.");
+		CloseServiceHandle(service);
+	}
+
+	CloseServiceHandle(manager);
+}
+
+static void log_conflicting_software(void)
+{
+	log_lenovo_vantage();
+}
+
 extern const char *get_win_release_id();
 
 static void log_windows_version(void)
@@ -382,6 +399,7 @@
 	log_admin_status();
 	log_gaming_features();
 	log_security_products();
+	log_conflicting_software();
 }
 
 struct obs_hotkeys_platform {
@@ -1197,18 +1215,21 @@
 
 		*path_end = 0;
 
-		for (size_t i = 0; i < paths.num; i++) {
-			const char *existing_path = paths.arrayi;
-			if (astrcmpi(path.array, existing_path) == 0) {
-				found = true;
-				break;
+		abspath = os_get_abs_path_ptr(path.array);
+		if (abspath) {
+			for (size_t i = 0; i < paths.num; i++) {
+				const char *existing_path = paths.arrayi;
+				if (astrcmpi(abspath, existing_path) == 0) {
+					found = true;
+					break;
+				}
 			}
-		}
 
-		if (!found) {
-			abspath = os_get_abs_path_ptr(path.array);
-			if (abspath)
+			if (!found) {
 				da_push_back(paths, &abspath);
+			} else {
+				bfree(abspath);
+			}
 		}
 
 		dstr_free(&path);

obs-studio-29.1.3.tar.xz/libobs/obs.c -> obs-studio-30.0.2.tar.xz/libobs/obs.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -540,6 +540,8 @@
 	return *effect;
 }
 
+static const char *shader_comp_name = "shader compilation";
+static const char *obs_init_graphics_name = "obs_init_graphics";
 static int obs_init_graphics(struct obs_video_info *ovi)
 {
 	struct obs_core_video *video = &obs->video;
@@ -549,9 +551,13 @@
 	bool success = true;
 	int errorcode;
 
+	profile_start(obs_init_graphics_name);
+
 	errorcode =
 		gs_create(&video->graphics, ovi->graphics_module, ovi->adapter);
 	if (errorcode != GS_SUCCESS) {
+		profile_end(obs_init_graphics_name);
+
 		switch (errorcode) {
 		case GS_ERROR_MODULE_NOT_FOUND:
 			return OBS_VIDEO_MODULE_NOT_FOUND;
@@ -562,6 +568,7 @@
 		}
 	}
 
+	profile_start(shader_comp_name);
 	gs_enter_context(video->graphics);
 
 	char *filename = obs_find_data_file("default.effect");
@@ -639,6 +646,9 @@
 		success = false;
 
 	gs_leave_context();
+	profile_end(shader_comp_name);
+	profile_end(obs_init_graphics_name);
+
 	return success ? OBS_VIDEO_SUCCESS : OBS_VIDEO_FAIL;
 }
 
@@ -1441,6 +1451,10 @@
 		free_module_path(obs->module_paths.array + i);
 	da_free(obs->module_paths);
 
+	for (size_t i = 0; i < obs->safe_modules.num; i++)
+		bfree(obs->safe_modules.arrayi);
+	da_free(obs->safe_modules);
+
 	if (obs->name_store_owned)
 		profiler_name_store_free(obs->name_store);
 
@@ -3132,13 +3146,15 @@
 }
 
 void start_raw_video(video_t *v, const struct video_scale_info *conversion,
+		 uint32_t frame_rate_divisor,
 		 void (*callback)(void *param, struct video_data *frame),
 		 void *param)
 {
 	struct obs_core_video_mix *video = get_mix_for_video(v);
 	if (video)
 		os_atomic_inc_long(&video->raw_active);
-	video_output_connect(v, conversion, callback, param);
+	video_output_connect2(v, conversion, frame_rate_divisor, callback,
+			 param);
 }
 
 void stop_raw_video(video_t *v,
@@ -3156,8 +3172,16 @@
 						 struct video_data *frame),
 				void *param)
 {
+	obs_add_raw_video_callback2(conversion, 1, callback, param);
+}
+
+void obs_add_raw_video_callback2(
+	const struct video_scale_info *conversion, uint32_t frame_rate_divisor,
+	void (*callback)(void *param, struct video_data *frame), void *param)
+{
 	struct obs_core_video_mix *video = obs->video.main_mix;
-	start_raw_video(video->video, conversion, callback, param);
+	start_raw_video(video->video, conversion, frame_rate_divisor, callback,
+			param);
 }
 
 void obs_remove_raw_video_callback(void (*callback)(void *param,

obs-studio-29.1.3.tar.xz/libobs/obs.h -> obs-studio-30.0.2.tar.xz/libobs/obs.h Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013-2014 by Hugh Bailey <jim@obsproject.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -517,6 +517,14 @@
 */
 EXPORT void obs_add_module_path(const char *bin, const char *data);
 
+/**
+ * Adds a module to the list of modules allowed to load in Safe Mode.
+ * If the list is empty, all modules are allowed.
+ *
+ * @param name Specifies the module's name (filename sans extension).
+ */
+EXPORT void obs_add_safe_module(const char *name);
+
 /** Automatically loads all modules from module paths (convenience function) */
 EXPORT void obs_load_all_modules(void);
 
@@ -849,6 +857,9 @@
 EXPORT void obs_add_raw_video_callback(
 	const struct video_scale_info *conversion,
 	void (*callback)(void *param, struct video_data *frame), void *param);
+EXPORT void obs_add_raw_video_callback2(
+	const struct video_scale_info *conversion, uint32_t frame_rate_divisor,
+	void (*callback)(void *param, struct video_data *frame), void *param);
 EXPORT void obs_remove_raw_video_callback(
 	void (*callback)(void *param, struct video_data *frame), void *param);
 
@@ -1130,6 +1141,14 @@
 					obs_source_t *filter,
 					enum obs_order_movement movement);
 
+/** Gets filter index */
+EXPORT int obs_source_filter_get_index(obs_source_t *source,
+				 obs_source_t *filter);
+
+/** Sets filter index */
+EXPORT void obs_source_filter_set_index(obs_source_t *source,
+					obs_source_t *filter, size_t index);
+
 /** Gets the settings string for a source */
 EXPORT obs_data_t *obs_source_get_settings(const obs_source_t *source);
 
@@ -1300,6 +1319,12 @@
 					 const struct audio_data *audio_data,
 					 bool muted);
 
+EXPORT void obs_source_add_audio_pause_callback(obs_source_t *source,
+						signal_callback_t callback,
+						void *param);
+EXPORT void obs_source_remove_audio_pause_callback(obs_source_t *source,
+						 signal_callback_t callback,
+						 void *param);
 EXPORT void obs_source_add_audio_capture_callback(
 	obs_source_t *source, obs_source_audio_capture_t callback, void *param);
 EXPORT void obs_source_remove_audio_capture_callback(
@@ -1811,7 +1836,7 @@
 EXPORT obs_source_t *obs_sceneitem_get_source(const obs_sceneitem_t *item);
 
 /* FIXME: The following functions should be deprecated and replaced with a way
- * to specify saveable private user data. -Jim */
+ * to specify saveable private user data. -Lain */
 EXPORT void obs_sceneitem_select(obs_sceneitem_t *item, bool select);
 EXPORT bool obs_sceneitem_selected(const obs_sceneitem_t *item);
 EXPORT bool obs_sceneitem_locked(const obs_sceneitem_t *item);
@@ -2133,6 +2158,17 @@
 					 obs_encoder_t *encoder);
 
 /**
+ * Sets the current video encoder associated with this output,
+ * required for encoded outputs.
+ *
+ * The idx parameter specifies the video encoder index.
+ * Only used with outputs that have multiple video outputs (FFmpeg typically),
+ * otherwise the parameter is ignored.
+ */
+EXPORT void obs_output_set_video_encoder2(obs_output_t *output,
+					 obs_encoder_t *encoder, size_t idx);
+
+/**
 * Sets the current audio encoder associated with this output,
 * required for encoded outputs.
 *
@@ -2147,6 +2183,16 @@
 EXPORT obs_encoder_t *obs_output_get_video_encoder(const obs_output_t *output);
 
 /**
+ * Returns the current video encoder associated with this output.
+ *
+ * The idx parameter specifies the video encoder index.
+ * Only used with outputs that have multiple video outputs (FFmpeg typically),
+ * otherwise specifying an idx > 0 returns a NULL.
+ * */
+EXPORT obs_encoder_t *obs_output_get_video_encoder2(const obs_output_t *output,
+						 size_t idx);
+
+/**
 * Returns the current audio encoder associated with this output
 *
 * The idx parameter specifies the audio encoder index. Only used with
@@ -2184,12 +2230,45 @@
 EXPORT void obs_output_set_preferred_size(obs_output_t *output, uint32_t width,
 					 uint32_t height);
 
+/**
+ * Sets the preferred scaled resolution for this output. Set width and height
+ * to 0 to disable scaling.
+ *
+ * If this output uses an encoder, it will call obs_encoder_set_scaled_size on
+ * the encoder before the stream is started. If the encoder is already active,
+ * then this function will trigger a warning and do nothing.
+ *
+ * The idx parameter specifies the video encoder index to apply the scaling to.
+ * Only used with outputs that have multiple video outputs (FFmpeg typically),
+ * otherwise the parameter is ignored.
+ */
+EXPORT void obs_output_set_preferred_size2(obs_output_t *output, uint32_t width,
+					 uint32_t height, size_t idx);
+
 /** For video outputs, returns the width of the encoded image */
 EXPORT uint32_t obs_output_get_width(const obs_output_t *output);
 
+/**
+ * For video outputs, returns the width of the encoded image.
+ *
+ * The idx parameter specifies the video encoder index.
+ * Only used with outputs that have multiple video outputs (FFmpeg typically),
+ * otherwise the parameter is ignored and returns 0.
+ */
+EXPORT uint32_t obs_output_get_width2(const obs_output_t *output, size_t idx);
+
 /** For video outputs, returns the height of the encoded image */
 EXPORT uint32_t obs_output_get_height(const obs_output_t *output);
 
+/**
+ * For video outputs, returns the height of the encoded image.
+ *
+ * The idx parameter specifies the video encoder index.
+ * Only used with outputs that have multiple video outputs (FFmpeg typically),
+ * otherwise the parameter is ignored and returns 0.
+ */
+EXPORT uint32_t obs_output_get_height2(const obs_output_t *output, size_t idx);
+
 EXPORT const char *obs_output_get_id(const obs_output_t *output);
 
 EXPORT void obs_output_caption(obs_output_t *output,
@@ -2249,7 +2328,7 @@
 obs_output_set_audio_conversion(obs_output_t *output,
 				const struct audio_convert_info *conversion);
 
-/** Returns whether data capture can begin with the specified flags */
+/** Returns whether data capture can begin */
 EXPORT bool obs_output_can_begin_data_capture(const obs_output_t *output,
 					 uint32_t flags);
 
@@ -2261,12 +2340,6 @@
 * Begins data capture from media/encoders.
 *
 * @param output Output context
- * @param flags Set this to 0 to use default output flags set in the
- * obs_output_info structure, otherwise set to a either
- * OBS_OUTPUT_VIDEO or OBS_OUTPUT_AUDIO to specify whether to
- * connect audio or video. This is useful for things like
- * ffmpeg which may or may not always want to use both audio
- * and video.
 * @return true if successful, false otherwise.
 */
 EXPORT bool obs_output_begin_data_capture(obs_output_t *output, uint32_t flags);
@@ -2355,6 +2428,25 @@
 EXPORT void obs_encoder_set_scaled_size(obs_encoder_t *encoder, uint32_t width,
 					uint32_t height);
 
+/**
+ * Enable/disable GPU based scaling for a video encoder.
+ * OBS_SCALE_DISABLE disables GPU based scaling (default),
+ * any other value enables GPU based scaling. If the encoder
+ * is active, this function will trigger a warning, and do nothing.
+ */
+EXPORT void obs_encoder_set_gpu_scale_type(obs_encoder_t *encoder,
+					 enum obs_scale_type gpu_scale_type);
+
+/**
+ * Set frame rate divisor for a video encoder. This allows recording at
+ * a partial frame rate compared to the base frame rate, e.g. 60 FPS with
+ * divisor = 2 will record at 30 FPS, with divisor = 3 at 20, etc.
+ *
+ * Can only be called on stopped encoders, changing this on the fly is not supported
+ */
+EXPORT bool obs_encoder_set_frame_rate_divisor(obs_encoder_t *encoder,
+					 uint32_t divisor);
+
 /** For video encoders, returns true if pre-encode scaling is enabled */
 EXPORT bool obs_encoder_scaling_enabled(const obs_encoder_t *encoder);
 
@@ -2364,6 +2456,15 @@
 /** For video encoders, returns the height of the encoded image */
 EXPORT uint32_t obs_encoder_get_height(const obs_encoder_t *encoder);
 
+/** For video encoders, returns whether GPU scaling is enabled */
+EXPORT bool obs_encoder_gpu_scaling_enabled(obs_encoder_t *encoder);
+
+/** For video encoders, returns GPU scaling type */
+EXPORT enum obs_scale_type obs_encoder_get_scale_type(obs_encoder_t *encoder);
+
+/** For video encoders, returns the frame rate divisor (default is 1) */
+EXPORT uint32_t obs_encoder_get_frame_rate_divisor(const obs_encoder_t *encoder);
+
 /** For audio encoders, returns the sample rate of the audio */
 EXPORT uint32_t obs_encoder_get_sample_rate(const obs_encoder_t *encoder);

obs-studio-29.1.3.tar.xz/libobs/obs.hpp -> obs-studio-30.0.2.tar.xz/libobs/obs.hpp Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -136,8 +136,7 @@
 		return *this;
 	}
 
-	struct TakeOwnership {
-	};
+	struct TakeOwnership {};
 	inline OBSRef(T val_, TakeOwnership)
 		: OBSRefAutoRelease<T, release>::OBSRefAutoRelease(val_)
 	{
@@ -180,8 +179,7 @@
 		return *this;
 	}
 
-	struct TakeOwnership {
-	};
+	struct TakeOwnership {};
 	inline OBSSafeRef(T val_, TakeOwnership)
 		: OBSRefAutoRelease<T, release>::OBSRefAutoRelease(val_)
 	{
@@ -310,6 +308,8 @@
 
 using OBSDisplay = OBSPtr<obs_display_t *, obs_display_destroy>;
 using OBSView = OBSPtr<obs_view_t *, obs_view_destroy>;
+using OBSFader = OBSPtr<obs_fader_t *, obs_fader_destroy>;
+using OBSVolMeter = OBSPtr<obs_volmeter_t *, obs_volmeter_destroy>;
 
 /* signal handler connection */
 class OBSSignal {

obs-studio-29.1.3.tar.xz/libobs/obsconfig.h.in -> obs-studio-30.0.2.tar.xz/libobs/obsconfig.h.in Changed

@@ -1,41 +1,13 @@
 #pragma once
 
-#define OBS_VERSION "@OBS_VERSION@"
-
-#cmakedefine OBS_VERSION_CANONICAL "@OBS_VERSION_CANONICAL@"
 #cmakedefine OBS_DATA_PATH "@OBS_DATA_PATH@"
 #cmakedefine OBS_PLUGIN_PATH "@OBS_PLUGIN_PATH@"
 #cmakedefine OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@"
 
-#cmakedefine OBS_COMMIT "@OBS_COMMIT@"
 #cmakedefine GIO_FOUND
 #cmakedefine PULSEAUDIO_FOUND
 #cmakedefine XCB_XINPUT_FOUND
 #cmakedefine ENABLE_WAYLAND
 
-/* NOTE: Release candidate version numbers internally are always the previous
- * main release number!  For example, if the current public release is 21.0 and
- * the build is 22.0 release candidate 1, internally the build number (defined
- * by LIBOBS_API_VER/etc) will always be 21.0, despite the OBS_VERSION string
- * saying "22.0 RC1".
- *
- * If the release candidate version number is 0.0.0 and the RC number is 0,
- * that means it's not a release candidate build. */
-#define OBS_RELEASE_CANDIDATE_MAJOR @OBS_RELEASE_CANDIDATE_MAJOR@
-#define OBS_RELEASE_CANDIDATE_MINOR @OBS_RELEASE_CANDIDATE_MINOR@
-#define OBS_RELEASE_CANDIDATE_PATCH @OBS_RELEASE_CANDIDATE_PATCH@
-#define OBS_RELEASE_CANDIDATE_VER \
-	MAKE_SEMANTIC_VERSION(OBS_RELEASE_CANDIDATE_MAJOR, \
-	                      OBS_RELEASE_CANDIDATE_MINOR, \
-	                      OBS_RELEASE_CANDIDATE_PATCH)
 #define OBS_RELEASE_CANDIDATE @OBS_RELEASE_CANDIDATE@
-
-/* Same thing for beta builds */
-#define OBS_BETA_MAJOR @OBS_BETA_MAJOR@
-#define OBS_BETA_MINOR @OBS_BETA_MINOR@
-#define OBS_BETA_PATCH @OBS_BETA_PATCH@
-#define OBS_BETA_VER \
-	MAKE_SEMANTIC_VERSION(OBS_BETA_MAJOR, \
-	                      OBS_BETA_MINOR, \
-	                      OBS_BETA_PATCH)
 #define OBS_BETA @OBS_BETA@

obs-studio-30.0.2.tar.xz/libobs/obsversion.c.in Added

obs-studio-30.0.2.tar.xz/libobs/obsversion.h Added

obs-studio-29.1.3.tar.xz/libobs/util/AlignedNew.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/AlignedNew.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/array-serializer.c -> obs-studio-30.0.2.tar.xz/libobs/util/array-serializer.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/array-serializer.h -> obs-studio-30.0.2.tar.xz/libobs/util/array-serializer.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/base.c -> obs-studio-30.0.2.tar.xz/libobs/util/base.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/base.h -> obs-studio-30.0.2.tar.xz/libobs/util/base.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/bmem.c -> obs-studio-30.0.2.tar.xz/libobs/util/bmem.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/bmem.h -> obs-studio-30.0.2.tar.xz/libobs/util/bmem.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/c99defs.h -> obs-studio-30.0.2.tar.xz/libobs/util/c99defs.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/cf-lexer.c -> obs-studio-30.0.2.tar.xz/libobs/util/cf-lexer.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -471,7 +471,7 @@
 
 struct macro_param {
 	struct cf_token name;
-	DARRAY(struct cf_token) tokens;
+	cf_token_array_t tokens;
 };
 
 static inline void macro_param_init(struct macro_param *param)
@@ -814,7 +814,7 @@
 static char space_filler2 = " ";
 
 static inline void append_space(struct cf_preprocessor *pp,
-				struct darray *tokens,
+				cf_token_array_t *tokens,
 				const struct cf_token *base)
 {
 	struct cf_token token;
@@ -829,14 +829,14 @@
 		strref_copy(&token.unmerged_str, &token.str);
 	}
 
-	darray_push_back(sizeof(struct cf_token), tokens, &token);
+	da_push_back(*tokens, &token);
 }
 
-static inline void append_end_token(struct darray *tokens)
+static inline void append_end_token(cf_token_array_t *tokens)
 {
 	struct cf_token end;
 	cf_token_clear(&end);
-	darray_push_back(sizeof(struct cf_token), tokens, &end);
+	da_push_back(*tokens, &end);
 }
 
 static void cf_preprocess_define(struct cf_preprocessor *pp,
@@ -859,7 +859,7 @@
 		goto exit;
 	}
 
-	append_space(pp, &def.tokens.da, NULL);
+	append_space(pp, &def.tokens, NULL);
 	cf_token_copy(&def.name, cur_token);
 
 	if (!next_token(&cur_token, true))
@@ -876,8 +876,8 @@
 		cf_def_addtoken(&def, cur_token++);
 
 complete:
-	append_end_token(&def.tokens.da);
-	append_space(pp, &def.tokens.da, NULL);
+	append_end_token(&def.tokens);
+	append_space(pp, &def.tokens, NULL);
 	da_push_back(pp->defines, &def);
 	goto exit;
 
@@ -1032,7 +1032,7 @@
 }
 
 static void cf_preprocess_addtoken(struct cf_preprocessor *pp,
-				 struct darray *dst, /* struct cf_token */
+				 cf_token_array_t *dst,
 				 struct cf_token **p_cur_token,
 				 const struct cf_token *base,
 				 const struct macro_params *params);
@@ -1052,7 +1052,7 @@
 	struct cf_token *cur_token = *p_cur_token;
 	int brace_count = 0;
 
-	append_space(pp, &param->tokens.da, base);
+	append_space(pp, &param->tokens, base);
 
 	while (cur_token->type != CFTOKEN_NONE) {
 		if (*cur_token->str.array == '(') {
@@ -1067,15 +1067,15 @@
 				break;
 		}
 
-		cf_preprocess_addtoken(pp, &param->tokens.da, &cur_token, base,
+		cf_preprocess_addtoken(pp, &param->tokens, &cur_token, base,
 				 cur_params);
 	}
 
 	if (cur_token->type == CFTOKEN_NONE)
 		cf_adderror_unexpected_eof(pp, cur_token);
 
-	append_space(pp, &param->tokens.da, base);
-	append_end_token(&param->tokens.da);
+	append_space(pp, &param->tokens, base);
+	append_end_token(&param->tokens);
 
 	*p_cur_token = cur_token;
 }
@@ -1153,10 +1153,11 @@
 	*p_cur_token = cur_token;
 }
 
-static inline void cf_preprocess_unwrap_param(
-	struct cf_preprocessor *pp, struct darray *dst, /* struct cf_token */
-	struct cf_token **p_cur_token, const struct cf_token *base,
-	const struct macro_param *param)
+static inline void cf_preprocess_unwrap_param(struct cf_preprocessor *pp,
+					 cf_token_array_t *dst,
+					 struct cf_token **p_cur_token,
+					 const struct cf_token *base,
+					 const struct macro_param *param)
 {
 	struct cf_token *cur_token = *p_cur_token;
 	struct cf_token *cur_param_token = param->tokens.array;
@@ -1169,7 +1170,7 @@
 }
 
 static inline void cf_preprocess_unwrap_define(
-	struct cf_preprocessor *pp, struct darray *dst, /* struct cf_token */
+	struct cf_preprocessor *pp, cf_token_array_t *dst,
 	struct cf_token **p_cur_token, const struct cf_token *base,
 	const struct cf_def *def, const struct macro_params *cur_params)
 {
@@ -1194,7 +1195,7 @@
 }
 
 static void cf_preprocess_addtoken(struct cf_preprocessor *pp,
-				 struct darray *dst, /* struct cf_token */
+				 cf_token_array_t *dst,
 				 struct cf_token **p_cur_token,
 				 const struct cf_token *base,
 				 const struct macro_params *params)
@@ -1226,7 +1227,7 @@
 		}
 	}
 
-	darray_push_back(sizeof(struct cf_token), dst, cur_token);
+	da_push_back(*dst, cur_token);
 
 ignore:
 	cur_token++;
@@ -1270,8 +1271,7 @@
 			break;
 		}
 
-		cf_preprocess_addtoken(pp, &pp->tokens.da, &cur_token, NULL,
-				 NULL);
+		cf_preprocess_addtoken(pp, &pp->tokens, &cur_token, NULL, NULL);
 	}
 
 	*p_cur_token = cur_token;

obs-studio-29.1.3.tar.xz/libobs/util/cf-lexer.h -> obs-studio-30.0.2.tar.xz/libobs/util/cf-lexer.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -51,6 +51,8 @@
 	enum cf_token_type type;
 };
 
+typedef DARRAY(struct cf_token) cf_token_array_t;
+
 static inline void cf_token_clear(struct cf_token *t)
 {
 	memset(t, 0, sizeof(struct cf_token));
@@ -86,7 +88,7 @@
 	char *file;
 	struct lexer base_lexer;
 	char *reformatted, *write_offset;
-	DARRAY(struct cf_token) tokens;
+	cf_token_array_t tokens;
 	bool unexpected_eof; /* unexpected multi-line comment eof */
 };
 
@@ -106,8 +108,8 @@
 
 struct cf_def {
 	struct cf_token name;
-	DARRAY(struct cf_token) params;
-	DARRAY(struct cf_token) tokens;
+	cf_token_array_t params;
+	cf_token_array_t tokens;
 	bool macro;
 };
 
@@ -156,14 +158,13 @@
 * Still left to implement (TODO):
 * + #if/#elif
 * + "defined" preprocessor keyword
- * + system includes 
+ * + system includes
 * + variadic macros
 * + custom callbacks (for things like pragma)
 * + option to exclude features such as #import, variadic macros, and other
 * features for certain language implementations
 * + macro parameter string operator #
 * + macro parameter token concatenation operator ##
- * + predefined macros
 * + restricted macros
 */
 
@@ -173,7 +174,7 @@
 	DARRAY(struct cf_def) defines;
 	DARRAY(char *) sys_include_dirs;
 	DARRAY(struct cf_lexer) dependencies;
-	DARRAY(struct cf_token) tokens;
+	cf_token_array_t tokens;
 	bool ignore_state;
 };

obs-studio-29.1.3.tar.xz/libobs/util/cf-parser.c -> obs-studio-30.0.2.tar.xz/libobs/util/cf-parser.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/cf-parser.h -> obs-studio-30.0.2.tar.xz/libobs/util/cf-parser.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/circlebuf.h -> obs-studio-30.0.2.tar.xz/libobs/util/circlebuf.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/config-file.c -> obs-studio-30.0.2.tar.xz/libobs/util/config-file.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/config-file.h -> obs-studio-30.0.2.tar.xz/libobs/util/config-file.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/crc32.c -> obs-studio-30.0.2.tar.xz/libobs/util/crc32.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/crc32.h -> obs-studio-30.0.2.tar.xz/libobs/util/crc32.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/curl/curl-helper.h -> obs-studio-30.0.2.tar.xz/libobs/util/curl/curl-helper.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/darray.h -> obs-studio-30.0.2.tar.xz/libobs/util/darray.h Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -479,70 +479,73 @@
 		}; \
 	}
 
-#define da_init(v) darray_init(&v.da)
+#define da_init(v) darray_init(&(v).da)
 
-#define da_free(v) darray_free(&v.da)
+#define da_free(v) darray_free(&(v).da)
 
-#define da_alloc_size(v) (sizeof(*v.array) * v.num)
+#define da_alloc_size(v) (sizeof(*(v).array) * (v).num)
 
-#define da_end(v) darray_end(sizeof(*v.array), &v.da)
+#define da_end(v) darray_end(sizeof(*(v).array), &(v).da)
 
 #define da_reserve(v, capacity) \
-	darray_reserve(sizeof(*v.array), &v.da, capacity)
+	darray_reserve(sizeof(*(v).array), &(v).da, capacity)
 
-#define da_resize(v, size) darray_resize(sizeof(*v.array), &v.da, size)
+#define da_resize(v, size) darray_resize(sizeof(*(v).array), &(v).da, size)
 
-#define da_clear(v) darray_clear(&v.da)
+#define da_clear(v) darray_clear(&(v).da)
 
-#define da_copy(dst, src) darray_copy(sizeof(*dst.array), &dst.da, &src.da)
+#define da_copy(dst, src) \
+	darray_copy(sizeof(*(dst).array), &(dst).da, &(src).da)
 
 #define da_copy_array(dst, src_array, n) \
-	darray_copy_array(sizeof(*dst.array), &dst.da, src_array, n)
+	darray_copy_array(sizeof(*(dst).array), &(dst).da, src_array, n)
 
-#define da_move(dst, src) darray_move(&dst.da, &src.da)
+#define da_move(dst, src) darray_move(&(dst).da, &(src).da)
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
 #ifdef __cplusplus
 #define da_type_test(v, item) \
 	({ \
 		if (false) { \
-			auto _t = v.array; \
+			auto _t = (v).array; \
 			_t = (item); \
 			(void)_t; \
 			*(v).array = *(item); \
 		} \
 	})
 #else
-#define da_type_test(v, item) \
-	({ \
-		if (false) { \
-			const typeof(*v.array) *_t; \
-			_t = (item); \
-			(void)_t; \
-			*(v).array = *(item); \
-		} \
+#define da_type_test(v, item) \
+	({ \
+		if (false) { \
+			const typeof(*(v).array) *_t; \
+			_t = (item); \
+			(void)_t; \
+			*(v).array = *(item); \
+		} \
 	})
 #endif
 #endif // ENABLE_DARRAY_TYPE_TEST
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_find(v, item, idx) \
-	({ \
-		da_type_test(v, item); \
-		darray_find(sizeof(*v.array), &v.da, item, idx); \
+#define da_find(v, item, idx) \
+	({ \
+		da_type_test(v, item); \
+		darray_find(sizeof(*(v).array), &(v).da, item, idx); \
 	})
 #else
-#define da_find(v, item, idx) darray_find(sizeof(*v.array), &v.da, item, idx)
+#define da_find(v, item, idx) \
+	darray_find(sizeof(*(v).array), &(v).da, item, idx)
 #endif
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_push_back(v, item) \
-	({ \
-		da_type_test(v, item); \
-		darray_push_back(sizeof(*v.array), &v.da, item); \
+#define da_push_back(v, item) \
+	({ \
+		da_type_test(v, item); \
+		darray_push_back(sizeof(*(v).array), &(v).da, item); \
 	})
 #else
-#define da_push_back(v, item) darray_push_back(sizeof(*v.array), &v.da, item)
+#define da_push_back(v, item) \
+	darray_push_back(sizeof(*(v).array), &(v).da, item)
 #endif
 
 #ifdef __GNUC__
@@ -557,96 +560,101 @@
 		&d->arrayd->num - 1; \
 	})
 #else
-#define da_push_back_new(v) darray_push_back_new(sizeof(*v.array), &v.da)
+#define da_push_back_new(v) darray_push_back_new(sizeof(*(v).array), &(v).da)
 #endif
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_push_back_array(dst, src_array, n) \
-	({ \
-		da_type_test(dst, src_array); \
-		darray_push_back_array(sizeof(*dst.array), &dst.da, src_array, \
-				 n); \
+#define da_push_back_array(dst, src_array, n) \
+	({ \
+		da_type_test(dst, src_array); \
+		darray_push_back_array(sizeof(*(dst).array), &(dst).da, \
+				 src_array, n); \
 	})
 #else
 #define da_push_back_array(dst, src_array, n) \
-	darray_push_back_array(sizeof(*dst.array), &dst.da, src_array, n)
+	darray_push_back_array(sizeof(*(dst).array), &(dst).da, src_array, n)
 #endif
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_push_back_da(dst, src) \
-	({ \
-		da_type_test(dst, src.array); \
-		darray_push_back_darray(sizeof(*dst.array), &dst.da, &src.da); \
+#define da_push_back_da(dst, src) \
+	({ \
+		da_type_test(dst, (src).array); \
+		darray_push_back_darray(sizeof(*(dst).array), &(dst).da, \
+					&(src).da); \
 	})
 #else
 #define da_push_back_da(dst, src) \
-	darray_push_back_darray(sizeof(*dst.array), &dst.da, &src.da)
+	darray_push_back_darray(sizeof(*(dst).array), &(dst).da, &(src).da)
 #endif
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_insert(v, idx, item) \
-	({ \
-		da_type_test(v, item); \
-		darray_insert(sizeof(*v.array), &v.da, idx, item); \
+#define da_insert(v, idx, item) \
+	({ \
+		da_type_test(v, item); \
+		darray_insert(sizeof(*(v).array), &(v).da, idx, item); \
 	})
 #else
 #define da_insert(v, idx, item) \
-	darray_insert(sizeof(*v.array), &v.da, idx, item)
+	darray_insert(sizeof(*(v).array), &(v).da, idx, item)
 #endif
 
-#define da_insert_new(v, idx) darray_insert_new(sizeof(*v.array), &v.da, idx)
+#define da_insert_new(v, idx) \
+	darray_insert_new(sizeof(*(v).array), &(v).da, idx)
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_insert_array(dst, idx, src_array, n) \
-	({ \
-		da_type_test(dst, src_array); \
-		darray_insert_array(sizeof(*dst.array), &dst.da, idx, \
-				 src_array, n); \
+#define da_insert_array(dst, idx, src_array, n) \
+	({ \
+		da_type_test(dst, src_array); \
+		darray_insert_array(sizeof(*(dst).array), &(dst).da, idx, \
+				 src_array, n); \
 	})
 #else
 #define da_insert_array(dst, idx, src_array, n) \
-	darray_insert_array(sizeof(*dst.array), &dst.da, idx, src_array, n)
+	darray_insert_array(sizeof(*(dst).array), &(dst).da, idx, src_array, n)
 #endif
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_insert_da(dst, idx, src) \
-	({ \
-		da_type_test(dst, src.array); \
-		darray_insert_darray(sizeof(*dst.array), &dst.da, idx, \
-				 &src.da); \
+#define da_insert_da(dst, idx, src) \
+	({ \
+		da_type_test(dst, (src).array); \
+		darray_insert_darray(sizeof(*(dst).array), &(dst).da, idx, \
+				 &(src).da); \
 	})
 #else
 #define da_insert_da(dst, idx, src) \
-	darray_insert_darray(sizeof(*dst.array), &dst.da, idx, &src.da)
+	darray_insert_darray(sizeof(*(dst).array), &(dst).da, idx, &(src).da)
 #endif
 
-#define da_erase(dst, idx) darray_erase(sizeof(*dst.array), &dst.da, idx)
+#define da_erase(dst, idx) darray_erase(sizeof(*(dst).array), &(dst).da, idx)
 
 #ifdef ENABLE_DARRAY_TYPE_TEST
-#define da_erase_item(dst, item) \
-	({ \
-		da_type_test(dst, item); \
-		darray_erase_item(sizeof(*dst.array), &dst.da, item); \
+#define da_erase_item(dst, item) \
+	({ \
+		da_type_test(dst, item); \
+		darray_erase_item(sizeof(*(dst).array), &(dst).da, item); \
 	})
 #else
 #define da_erase_item(dst, item) \
-	darray_erase_item(sizeof(*dst.array), &dst.da, item)
+	darray_erase_item(sizeof(*(dst).array), &(dst).da, item)
 #endif
 
 #define da_erase_range(dst, from, to) \
-	darray_erase_range(sizeof(*dst.array), &dst.da, from, to)
+	darray_erase_range(sizeof(*(dst).array), &(dst).da, from, to)
 
-#define da_pop_back(dst) darray_pop_back(sizeof(*dst.array), &dst.da);
+#define da_pop_back(dst) darray_pop_back(sizeof(*(dst).array), &(dst).da);
 
-#define da_join(dst, src) darray_join(sizeof(*dst.array), &dst.da, &src.da)
+#define da_join(dst, src) \
+	darray_join(sizeof(*(dst).array), &(dst).da, &(src).da)
 
-#define da_split(dst1, dst2, src, idx) \
-	darray_split(sizeof(*src.array), &dst1.da, &dst2.da, &src.da, idx)
+#define da_split(dst1, dst2, src, idx) \
+	darray_split(sizeof(*(src).array), &(dst1).da, &(dst2).da, &(src).da, \
+		 idx)
 
 #define da_move_item(v, from, to) \
-	darray_move_item(sizeof(*v.array), &v.da, from, to)
+	darray_move_item(sizeof(*(v).array), &(v).da, from, to)
 
-#define da_swap(v, idx1, idx2) darray_swap(sizeof(*v.array), &v.da, idx1, idx2)
+#define da_swap(v, idx1, idx2) \
+	darray_swap(sizeof(*(v).array), &(v).da, idx1, idx2)
 
 #ifdef __cplusplus
 }

obs-studio-29.1.3.tar.xz/libobs/util/dstr.c -> obs-studio-30.0.2.tar.xz/libobs/util/dstr.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/dstr.h -> obs-studio-30.0.2.tar.xz/libobs/util/dstr.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/dstr.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/dstr.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/file-serializer.c -> obs-studio-30.0.2.tar.xz/libobs/util/file-serializer.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/file-serializer.h -> obs-studio-30.0.2.tar.xz/libobs/util/file-serializer.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/lexer.c -> obs-studio-30.0.2.tar.xz/libobs/util/lexer.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/lexer.h -> obs-studio-30.0.2.tar.xz/libobs/util/lexer.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/pipe-posix.c -> obs-studio-30.0.2.tar.xz/libobs/util/pipe-posix.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/pipe-windows.c -> obs-studio-30.0.2.tar.xz/libobs/util/pipe-windows.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/pipe.h -> obs-studio-30.0.2.tar.xz/libobs/util/pipe.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/platform-cocoa.m -> obs-studio-30.0.2.tar.xz/libobs/util/platform-cocoa.m Changed

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2013-2018 Ruwen Hahn <palana@stunned.de>
- * Hugh "Jim" Bailey <obs.jim@gmail.com>
- * Marvin Scholz <epirat07@gmail.com>
+ * Copyright (c) 2023 Ruwen Hahn <palana@stunned.de>
+ * Lain Bailey <lain@obsproject.com>
+ * Marvin Scholz <epirat07@gmail.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -40,279 +40,255 @@
 
 uint64_t os_gettime_ns(void)
 {
-	return clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
+ return clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
 }
 
 /* gets the location domain mask/Library/Application Support/name */
-static int os_get_path_internal(char *dst, size_t size, const char *name,
-				NSSearchPathDomainMask domainMask)
+static int os_get_path_internal(char *dst, size_t size, const char *name, NSSearchPathDomainMask domainMask)
 {
-	NSArray *paths = NSSearchPathForDirectoriesInDomains(
-		NSApplicationSupportDirectory, domainMask, YES);
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, domainMask, YES);
 
-	if (paths count == 0)
-		bcrash("Could not get home directory (platform-cocoa)");
+ if (paths count == 0)
+ bcrash("Could not get home directory (platform-cocoa)");
 
-	NSString *application_support = paths0;
-	const char *base_path = application_support UTF8String;
+ NSString *application_support = paths0;
+ const char *base_path = application_support UTF8String;
 
-	if (!name || !*name)
-		return snprintf(dst, size, "%s", base_path);
-	else
-		return snprintf(dst, size, "%s/%s", base_path, name);
+ if (!name || !*name)
+ return snprintf(dst, size, "%s", base_path);
+ else
+ return snprintf(dst, size, "%s/%s", base_path, name);
 }
 
-static char *os_get_path_ptr_internal(const char *name,
-				 NSSearchPathDomainMask domainMask)
+static char *os_get_path_ptr_internal(const char *name, NSSearchPathDomainMask domainMask)
 {
-	NSArray *paths = NSSearchPathForDirectoriesInDomains(
-		NSApplicationSupportDirectory, domainMask, YES);
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, domainMask, YES);
 
-	if (paths count == 0)
-		bcrash("Could not get home directory (platform-cocoa)");
+ if (paths count == 0)
+ bcrash("Could not get home directory (platform-cocoa)");
 
-	NSString *application_support = paths0;
+ NSString *application_support = paths0;
 
-	NSUInteger len = application_support
-		lengthOfBytesUsingEncoding:NSUTF8StringEncoding;
+ NSUInteger len = application_support lengthOfBytesUsingEncoding:NSUTF8StringEncoding;
 
-	char *path_ptr = bmalloc(len + 1);
+ char *path_ptr = bmalloc(len + 1);
 
-	path_ptrlen = 0;
+ path_ptrlen = 0;
 
-	memcpy(path_ptr, application_support UTF8String, len);
+ memcpy(path_ptr, application_support UTF8String, len);
 
-	struct dstr path;
-	dstr_init_move_array(&path, path_ptr);
-	dstr_cat(&path, "/");
-	dstr_cat(&path, name);
-	return path.array;
+ struct dstr path;
+ dstr_init_move_array(&path, path_ptr);
+ dstr_cat(&path, "/");
+ dstr_cat(&path, name);
+ return path.array;
 }
 
 int os_get_config_path(char *dst, size_t size, const char *name)
 {
-	return os_get_path_internal(dst, size, name, NSUserDomainMask);
+ return os_get_path_internal(dst, size, name, NSUserDomainMask);
 }
 
 char *os_get_config_path_ptr(const char *name)
 {
-	return os_get_path_ptr_internal(name, NSUserDomainMask);
+ return os_get_path_ptr_internal(name, NSUserDomainMask);
 }
 
 int os_get_program_data_path(char *dst, size_t size, const char *name)
 {
-	return os_get_path_internal(dst, size, name, NSLocalDomainMask);
+ return os_get_path_internal(dst, size, name, NSLocalDomainMask);
 }
 
 char *os_get_program_data_path_ptr(const char *name)
 {
-	return os_get_path_ptr_internal(name, NSLocalDomainMask);
+ return os_get_path_ptr_internal(name, NSLocalDomainMask);
 }
 
 char *os_get_executable_path_ptr(const char *name)
 {
-	char exePATH_MAX;
-	char abs_pathPATH_MAX;
-	uint32_t size = sizeof(exe);
-	struct dstr path;
-	char *slash;
+ char exePATH_MAX;
+ char abs_pathPATH_MAX;
+ uint32_t size = sizeof(exe);
+ struct dstr path;
+ char *slash;
 
-	if (_NSGetExecutablePath(exe, &size) != 0) {
-		return NULL;
-	}
+ if (_NSGetExecutablePath(exe, &size) != 0) {
+ return NULL;
+ }
 
-	if (!realpath(exe, abs_path)) {
-		return NULL;
-	}
+ if (!realpath(exe, abs_path)) {
+ return NULL;
+ }
 
-	dstr_init_copy(&path, abs_path);
-	slash = strrchr(path.array, '/');
-	if (slash) {
-		size_t len = slash - path.array + 1;
-		dstr_resize(&path, len);
-	}
+ dstr_init_copy(&path, abs_path);
+ slash = strrchr(path.array, '/');
+ if (slash) {
+ size_t len = slash - path.array + 1;
+ dstr_resize(&path, len);
+ }
 
-	if (name && *name) {
-		dstr_cat(&path, name);
-	}
-	return path.array;
+ if (name && *name) {
+ dstr_cat(&path, name);
+ }
+ return path.array;
 }
 
 struct os_cpu_usage_info {
-	int64_t last_cpu_time;
-	int64_t last_sys_time;
-	int core_count;
+ int64_t last_cpu_time;
+ int64_t last_sys_time;
+ int core_count;
 };
 
-static inline void add_time_value(time_value_t *dst, time_value_t *a,
-				 time_value_t *b)
+static inline void add_time_value(time_value_t *dst, time_value_t *a, time_value_t *b)
 {
-	dst->microseconds = a->microseconds + b->microseconds;
-	dst->seconds = a->seconds + b->seconds;
+ dst->microseconds = a->microseconds + b->microseconds;
+ dst->seconds = a->seconds + b->seconds;
 
-	if (dst->microseconds >= 1000000) {
-		dst->seconds += dst->microseconds / 1000000;
-		dst->microseconds %= 1000000;
-	}
+ if (dst->microseconds >= 1000000) {
+ dst->seconds += dst->microseconds / 1000000;
+ dst->microseconds %= 1000000;
+ }
 }
 
 static bool get_time_info(int64_t *cpu_time, int64_t *sys_time)
 {
-	mach_port_t task = mach_task_self();
-	struct task_thread_times_info thread_data;
-	struct task_basic_info_64 task_data;
-	mach_msg_type_number_t count;
-	kern_return_t kern_ret;
-	time_value_t cur_time;
+ mach_port_t task = mach_task_self();
+ struct task_thread_times_info thread_data;
+ struct task_basic_info_64 task_data;
+ mach_msg_type_number_t count;
+ kern_return_t kern_ret;
+ time_value_t cur_time;
 
-	*cpu_time = 0;
-	*sys_time = 0;
+ *cpu_time = 0;
+ *sys_time = 0;
 
-	count = TASK_THREAD_TIMES_INFO_COUNT;
-	kern_ret = task_info(task, TASK_THREAD_TIMES_INFO,
-			 (task_info_t)&thread_data, &count);
-	if (kern_ret != KERN_SUCCESS)
-		return false;
+ count = TASK_THREAD_TIMES_INFO_COUNT;
+ kern_ret = task_info(task, TASK_THREAD_TIMES_INFO, (task_info_t) &thread_data, &count);
+ if (kern_ret != KERN_SUCCESS)
+ return false;
 
-	count = TASK_BASIC_INFO_64_COUNT;
-	kern_ret = task_info(task, TASK_BASIC_INFO_64, (task_info_t)&task_data,
-			 &count);
-	if (kern_ret != KERN_SUCCESS)
-		return false;
+ count = TASK_BASIC_INFO_64_COUNT;
+ kern_ret = task_info(task, TASK_BASIC_INFO_64, (task_info_t) &task_data, &count);
+ if (kern_ret != KERN_SUCCESS)
+ return false;
 
-	add_time_value(&cur_time, &thread_data.user_time,
-		 &thread_data.system_time);
-	add_time_value(&cur_time, &cur_time, &task_data.user_time);
-	add_time_value(&cur_time, &cur_time, &task_data.system_time);
+ add_time_value(&cur_time, &thread_data.user_time, &thread_data.system_time);
+ add_time_value(&cur_time, &cur_time, &task_data.user_time);
+ add_time_value(&cur_time, &cur_time, &task_data.system_time);
 
-	*cpu_time = os_gettime_ns() / 1000;
-	*sys_time = cur_time.seconds * 1000000 + cur_time.microseconds;
-	return true;
+ *cpu_time = os_gettime_ns() / 1000;
+ *sys_time = cur_time.seconds * 1000000 + cur_time.microseconds;
+ return true;
 }
 
 os_cpu_usage_info_t *os_cpu_usage_info_start(void)
 {
-	struct os_cpu_usage_info *info = bmalloc(sizeof(*info));
+ struct os_cpu_usage_info *info = bmalloc(sizeof(*info));
 
-	if (!get_time_info(&info->last_cpu_time, &info->last_sys_time)) {
-		bfree(info);
-		return NULL;
-	}
+ if (!get_time_info(&info->last_cpu_time, &info->last_sys_time)) {
+ bfree(info);
+ return NULL;
+ }
 
-	info->core_count = sysconf(_SC_NPROCESSORS_ONLN);
-	return info;
+ info->core_count = (int) sysconf(_SC_NPROCESSORS_ONLN);
+ return info;
 }
 
 double os_cpu_usage_info_query(os_cpu_usage_info_t *info)
 {
-	int64_t sys_time, cpu_time;
-	int64_t sys_time_delta, cpu_time_delta;
+ int64_t sys_time, cpu_time;
+ int64_t sys_time_delta, cpu_time_delta;
 
-	if (!info || !get_time_info(&cpu_time, &sys_time))
-		return 0.0;
+ if (!info || !get_time_info(&cpu_time, &sys_time))
+ return 0.0;
 
-	sys_time_delta = sys_time - info->last_sys_time;
-	cpu_time_delta = cpu_time - info->last_cpu_time;
+ sys_time_delta = sys_time - info->last_sys_time;
+ cpu_time_delta = cpu_time - info->last_cpu_time;
 
-	if (cpu_time_delta == 0)
-		return 0.0;
+ if (cpu_time_delta == 0)
+ return 0.0;
 
-	info->last_sys_time = sys_time;
-	info->last_cpu_time = cpu_time;
+ info->last_sys_time = sys_time;
+ info->last_cpu_time = cpu_time;
 
-	return (double)sys_time_delta * 100.0 / (double)cpu_time_delta /
-	 (double)info->core_count;
+ return (double) sys_time_delta * 100.0 / (double) cpu_time_delta / (double) info->core_count;
 }
 
 void os_cpu_usage_info_destroy(os_cpu_usage_info_t *info)
 {
-	if (info)
-		bfree(info);
+ if (info)
+ bfree(info);
 }
 
 os_performance_token_t *os_request_high_performance(const char *reason)
 {
-	@autoreleasepool {
-		NSProcessInfo *pi = NSProcessInfo processInfo;
-		SEL sel = @selector(beginActivityWithOptions:reason:);
-		if (!pi respondsToSelector:sel)
-			return nil;
+ @autoreleasepool {
+ NSProcessInfo *processInfo = NSProcessInfo.processInfo;
+ id activity = processInfo beginActivityWithOptions:NSActivityUserInitiated reason:@(reason ? reason : "");
 
-		//taken from http://stackoverflow.com/a/20100906
-		id activity = pi beginActivityWithOptions:0x00FFFFFF
-						 reason:@(reason);
-
-		return CFBridgingRetain(activity);
-	}
+ return CFBridgingRetain(activity);
+ }
 }
 
 void os_end_high_performance(os_performance_token_t *token)
 {
-	@autoreleasepool {
-		NSProcessInfo *pi = NSProcessInfo processInfo;
-		SEL sel = @selector(beginActivityWithOptions:reason:);
-		if (!pi respondsToSelector:sel)
-			return;
-
-		pi endActivity:CFBridgingRelease(token);
-	}
+ @autoreleasepool {
+ NSProcessInfo *processInfo = NSProcessInfo.processInfo;
+ processInfo endActivity:CFBridgingRelease(token);
+ }
 }
 
 struct os_inhibit_info {
-	CFStringRef reason;
-	IOPMAssertionID sleep_id;
-	IOPMAssertionID user_id;
-	bool active;
+ CFStringRef reason;
+ IOPMAssertionID sleep_id;
+ IOPMAssertionID user_id;
+ bool active;
 };
 
 os_inhibit_t *os_inhibit_sleep_create(const char *reason)
 {
-	struct os_inhibit_info *info = bzalloc(sizeof(*info));
-	if (!reason)
-		info->reason = CFStringCreateWithCString(
-			kCFAllocatorDefault, reason, kCFStringEncodingUTF8);
-	else
-		info->reason =
-			CFStringCreateCopy(kCFAllocatorDefault, CFSTR(""));
+ struct os_inhibit_info *info = bzalloc(sizeof(*info));
+ if (!reason)
+ info->reason = CFStringCreateWithCString(kCFAllocatorDefault, reason, kCFStringEncodingUTF8);
+ else
+ info->reason = CFStringCreateCopy(kCFAllocatorDefault, CFSTR(""));
 
-	return info;
+ return info;
 }
 
 bool os_inhibit_sleep_set_active(os_inhibit_t *info, bool active)
 {
-	IOReturn success;
+ IOReturn success;
 
-	if (!info)
-		return false;
-	if (info->active == active)
-		return false;
+ if (!info)
+ return false;
+ if (info->active == active)
+ return false;
 
-	if (active) {
-		IOPMAssertionDeclareUserActivity(
-			info->reason, kIOPMUserActiveLocal, &info->user_id);
-		success = IOPMAssertionCreateWithName(
-			kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn,
-			info->reason, &info->sleep_id);
+ if (active) {
+ IOPMAssertionDeclareUserActivity(info->reason, kIOPMUserActiveLocal, &info->user_id);
+ success = IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, info->reason,
+ &info->sleep_id);
 
-		if (success != kIOReturnSuccess) {
-			blog(LOG_WARNING, "Failed to disable sleep");
-			return false;
-		}
-	} else {
-		IOPMAssertionRelease(info->sleep_id);
-	}
+ if (success != kIOReturnSuccess) {
+ blog(LOG_WARNING, "Failed to disable sleep");
+ return false;
+ }
+ } else {
+ IOPMAssertionRelease(info->sleep_id);
+ }
 
-	info->active = active;
-	return true;
+ info->active = active;
+ return true;
 }
 
 void os_inhibit_sleep_destroy(os_inhibit_t *info)
 {
-	if (info) {
-		os_inhibit_sleep_set_active(info, false);
-		CFRelease(info->reason);
-		bfree(info);
-	}
+ if (info) {
+ os_inhibit_sleep_set_active(info, false);
+ CFRelease(info->reason);
+ bfree(info);
+ }
 }
 
 static int physical_cores = 0;
@@ -322,68 +298,89 @@
 bool os_get_emulation_status(void)
 {
 #ifdef __aarch64__
-	return false;
+ return false;
 #else
-	int rosettaTranslated = 0;
-	size_t size = sizeof(rosettaTranslated);
-	if (sysctlbyname("sysctl.proc_translated", &rosettaTranslated, &size,
-			 NULL, 0) == -1)
-		return false;
+ int rosettaTranslated = 0;
+ size_t size = sizeof(rosettaTranslated);
+ if (sysctlbyname("sysctl.proc_translated", &rosettaTranslated, &size, NULL, 0) == -1)
+ return false;
 
-	return rosettaTranslated == 1;
+ return rosettaTranslated == 1;
 #endif
 }
 
 static void os_get_cores_internal(void)
 {
-	if (core_count_initialized)
-		return;
+ if (core_count_initialized)
+ return;
 
-	core_count_initialized = true;
+ core_count_initialized = true;
 
-	size_t size;
-	int ret;
+ size_t size;
+ int ret;
 
-	size = sizeof(physical_cores);
-	ret = sysctlbyname("machdep.cpu.core_count", &physical_cores, &size,
-			 NULL, 0);
-	if (ret != 0)
-		return;
+ size = sizeof(physical_cores);
+ ret = sysctlbyname("machdep.cpu.core_count", &physical_cores, &size, NULL, 0);
+ if (ret != 0)
+ return;
 
-	ret = sysctlbyname("machdep.cpu.thread_count", &logical_cores, &size,
-			 NULL, 0);
+ ret = sysctlbyname("machdep.cpu.thread_count", &logical_cores, &size, NULL, 0);
 }
 
 int os_get_physical_cores(void)
 {
-	if (!core_count_initialized)
-		os_get_cores_internal();
-	return physical_cores;
+ if (!core_count_initialized)
+ os_get_cores_internal();
+ return physical_cores;
 }
 
 int os_get_logical_cores(void)
 {
-	if (!core_count_initialized)
-		os_get_cores_internal();
-	return logical_cores;
+ if (!core_count_initialized)
+ os_get_cores_internal();
+ return logical_cores;
 }
 
 static inline bool os_get_sys_memory_usage_internal(vm_statistics_t vmstat)
 {
-	mach_msg_type_number_t out_count = HOST_VM_INFO_COUNT;
-	if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)vmstat,
-			 &out_count) != KERN_SUCCESS)
-		return false;
-	return true;
+ mach_msg_type_number_t out_count = HOST_VM_INFO_COUNT;
+ if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t) vmstat, &out_count) != KERN_SUCCESS)
+ return false;
+ return true;
 }
 
 uint64_t os_get_sys_free_size(void)
 {
-	vm_statistics_data_t vmstat = {};
-	if (!os_get_sys_memory_usage_internal(&vmstat))
-		return 0;
+ vm_statistics_data_t vmstat = {};
+ if (!os_get_sys_memory_usage_internal(&vmstat))
+ return 0;
+
+ return vmstat.free_count * vm_page_size;
+}
+
+int64_t os_get_free_space(const char *path)
+{
+ if (path) {
+ NSURL *fileURL = NSURL fileURLWithPath:@(path);
+
+ NSDictionary *values = fileURL resourceValuesForKeys:@NSURLVolumeAvailableCapacityForOpportunisticUsageKey
+ error:nil;
+
+ NSNumber *availableSpace = valuesNSURLVolumeAvailableCapacityForOpportunisticUsageKey;
+
+ if (availableSpace) {
+ return availableSpace.longValue;
+ }
+ }
+
+ return 0;
+}
+
+uint64_t os_get_free_disk_space(const char *dir)
+{
+ int64_t free_space = os_get_free_space(dir);
 
-	return vmstat.free_count * vm_page_size;
+ return (uint64_t) free_space;
 }
 
 static uint64_t total_memory = 0;
@@ -391,68 +388,58 @@
 
 static void os_get_sys_total_size_internal()
 {
-	total_memory_initialized = true;
+ total_memory_initialized = true;
 
-	size_t size;
-	int ret;
+ size_t size;
+ int ret;
 
-	size = sizeof(total_memory);
-	ret = sysctlbyname("hw.memsize", &total_memory, &size, NULL, 0);
+ size = sizeof(total_memory);
+ ret = sysctlbyname("hw.memsize", &total_memory, &size, NULL, 0);
 }
 
 uint64_t os_get_sys_total_size(void)
 {
-	if (!total_memory_initialized)
-		os_get_sys_total_size_internal();
+ if (!total_memory_initialized)
+ os_get_sys_total_size_internal();
 
-	return total_memory;
+ return total_memory;
 }
 
-#ifndef MACH_TASK_BASIC_INFO
-typedef task_basic_info_data_t mach_task_basic_info_data_t;
-#endif
-
-static inline bool
-os_get_proc_memory_usage_internal(mach_task_basic_info_data_t *taskinfo)
+static inline bool os_get_proc_memory_usage_internal(mach_task_basic_info_data_t *taskinfo)
 {
-#ifdef MACH_TASK_BASIC_INFO
-	const task_flavor_t flavor = MACH_TASK_BASIC_INFO;
-	mach_msg_type_number_t out_count = MACH_TASK_BASIC_INFO_COUNT;
-#else
-	const task_flavor_t flavor = TASK_BASIC_INFO;
-	mach_msg_type_number_t out_count = TASK_BASIC_INFO_COUNT;
-#endif
-	if (task_info(mach_task_self(), flavor, (task_info_t)taskinfo,
-		 &out_count) != KERN_SUCCESS)
-		return false;
-	return true;
+ const task_flavor_t flavor = MACH_TASK_BASIC_INFO;
+ mach_msg_type_number_t out_count = MACH_TASK_BASIC_INFO_COUNT;
+
+ if (task_info(mach_task_self(), flavor, (task_info_t) taskinfo, &out_count) != KERN_SUCCESS)
+ return false;
+ return true;
 }
 
 bool os_get_proc_memory_usage(os_proc_memory_usage_t *usage)
 {
-	mach_task_basic_info_data_t taskinfo = {};
-	if (!os_get_proc_memory_usage_internal(&taskinfo))
-		return false;
+ mach_task_basic_info_data_t taskinfo = {};
+ if (!os_get_proc_memory_usage_internal(&taskinfo))
+ return false;
 
-	usage->resident_size = taskinfo.resident_size;
-	usage->virtual_size = taskinfo.virtual_size;
-	return true;
+ usage->resident_size = taskinfo.resident_size;
+ usage->virtual_size = taskinfo.virtual_size;
+ return true;
 }
 
 uint64_t os_get_proc_resident_size(void)
 {
-	mach_task_basic_info_data_t taskinfo = {};
-	if (!os_get_proc_memory_usage_internal(&taskinfo))
-		return 0;
-	return taskinfo.resident_size;
+ mach_task_basic_info_data_t taskinfo = {};
+ if (!os_get_proc_memory_usage_internal(&taskinfo))
+ return 0;
+ return taskinfo.resident_size;
 }
 
 uint64_t os_get_proc_virtual_size(void)
 {
-	mach_task_basic_info_data_t taskinfo = {};
-	if (!os_get_proc_memory_usage_internal(&taskinfo))
-		return 0;
-	return taskinfo.virtual_size;
+ mach_task_basic_info_data_t taskinfo = {};
+ if (!os_get_proc_memory_usage_internal(&taskinfo))
+ return 0;
+ return taskinfo.virtual_size;
 }
 
 /* Obtains a copy of the contents of a CFString in specified encoding.
@@ -460,84 +447,77 @@
 */
 char *cfstr_copy_cstr(CFStringRef cfstring, CFStringEncoding cfstring_encoding)
 {
-	if (!cfstring)
-		return NULL;
+ if (!cfstring)
+ return NULL;
 
-	// Try the quick way to obtain the buffer
-	const char *tmp_buffer =
-		CFStringGetCStringPtr(cfstring, cfstring_encoding);
+ // Try the quick way to obtain the buffer
+ const char *tmp_buffer = CFStringGetCStringPtr(cfstring, cfstring_encoding);
 
-	if (tmp_buffer != NULL)
-		return bstrdup(tmp_buffer);
+ if (tmp_buffer != NULL)
+ return bstrdup(tmp_buffer);
 
-	// The quick way did not work, try the more expensive one
-	CFIndex length = CFStringGetLength(cfstring);
-	CFIndex max_size =
-		CFStringGetMaximumSizeForEncoding(length, cfstring_encoding);
+ // The quick way did not work, try the more expensive one
+ CFIndex length = CFStringGetLength(cfstring);
+ CFIndex max_size = CFStringGetMaximumSizeForEncoding(length, cfstring_encoding);
 
-	// If result would exceed LONG_MAX, kCFNotFound is returned
-	if (max_size == kCFNotFound)
-		return NULL;
+ // If result would exceed LONG_MAX, kCFNotFound is returned
+ if (max_size == kCFNotFound)
+ return NULL;
 
-	// Account for the null terminator
-	max_size++;
+ // Account for the null terminator
+ max_size++;
 
-	char *buffer = bmalloc(max_size);
+ char *buffer = bmalloc(max_size);
 
-	if (buffer == NULL) {
-		return NULL;
-	}
+ if (buffer == NULL) {
+ return NULL;
+ }
 
-	// Copy CFString in requested encoding to buffer
-	Boolean success = CFStringGetCString(cfstring, buffer, max_size,
-					 cfstring_encoding);
+ // Copy CFString in requested encoding to buffer
+ Boolean success = CFStringGetCString(cfstring, buffer, max_size, cfstring_encoding);
 
-	if (!success) {
-		bfree(buffer);
-		buffer = NULL;
-	}
-	return buffer;
+ if (!success) {
+ bfree(buffer);
+ buffer = NULL;
+ }
+ return buffer;
 }
 
 /* Copies the contents of a CFString in specified encoding to a given dstr.
 * Returns true on success or false on failure.
 * In case of failure, the dstr capacity but not size is changed.
 */
-bool cfstr_copy_dstr(CFStringRef cfstring, CFStringEncoding cfstring_encoding,
-		 struct dstr *str)
+bool cfstr_copy_dstr(CFStringRef cfstring, CFStringEncoding cfstring_encoding, struct dstr *str)
 {
-	if (!cfstring)
-		return false;
+ if (!cfstring)
+ return false;
 
-	// Try the quick way to obtain the buffer
-	const char *tmp_buffer =
-		CFStringGetCStringPtr(cfstring, cfstring_encoding);
+ // Try the quick way to obtain the buffer
+ const char *tmp_buffer = CFStringGetCStringPtr(cfstring, cfstring_encoding);
 
-	if (tmp_buffer != NULL) {
-		dstr_copy(str, tmp_buffer);
-		return true;
-	}
+ if (tmp_buffer != NULL) {
+ dstr_copy(str, tmp_buffer);
+ return true;
+ }
 
-	// The quick way did not work, try the more expensive one
-	CFIndex length = CFStringGetLength(cfstring);
-	CFIndex max_size =
-		CFStringGetMaximumSizeForEncoding(length, cfstring_encoding);
+ // The quick way did not work, try the more expensive one
+ CFIndex length = CFStringGetLength(cfstring);
+ CFIndex max_size = CFStringGetMaximumSizeForEncoding(length, cfstring_encoding);
 
-	// If result would exceed LONG_MAX, kCFNotFound is returned
-	if (max_size == kCFNotFound)
-		return NULL;
+ // If result would exceed LONG_MAX, kCFNotFound is returned
+ if (max_size == kCFNotFound)
+ return NULL;
 
-	// Account for the null terminator
-	max_size++;
+ // Account for the null terminator
+ max_size++;
 
-	dstr_ensure_capacity(str, max_size);
+ dstr_ensure_capacity(str, max_size);
 
-	// Copy CFString in requested encoding to dstr buffer
-	Boolean success = CFStringGetCString(cfstring, str->array, max_size,
-					 cfstring_encoding);
+ // Copy CFString in requested encoding to dstr buffer
+ Boolean success = CFStringGetCString(cfstring, str->array, max_size, cfstring_encoding);
 
-	if (success)
-		dstr_resize(str, max_size);
+ if (success)
+ dstr_resize(str, max_size);
 
-	return (bool)success;
+ return (bool) success;
 }

obs-studio-29.1.3.tar.xz/libobs/util/platform-nix-dbus.c -> obs-studio-30.0.2.tar.xz/libobs/util/platform-nix-dbus.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/platform-nix-portal.c -> obs-studio-30.0.2.tar.xz/libobs/util/platform-nix-portal.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/platform-nix.c -> obs-studio-30.0.2.tar.xz/libobs/util/platform-nix.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +16,7 @@
 
 #include "obsconfig.h"
 
-#if !defined(__APPLE__) && OBS_QT_VERSION == 6
+#if !defined(__APPLE__)
 #define _GNU_SOURCE
 #include <link.h>
 #include <stdlib.h>
@@ -83,7 +83,13 @@
 		dstr_cat(&dylib_name, ".so");
 
 #ifdef __APPLE__
-	void *res = dlopen(dylib_name.array, RTLD_LAZY | RTLD_FIRST);
+	int dlopen_flags = RTLD_LAZY | RTLD_FIRST;
+	if (dstr_find(&dylib_name, "Python")) {
+		dlopen_flags = dlopen_flags | RTLD_GLOBAL;
+	} else {
+		dlopen_flags = dlopen_flags | RTLD_LOCAL;
+	}
+	void *res = dlopen(dylib_name.array, dlopen_flags);
 #else
 	void *res = dlopen(dylib_name.array, RTLD_LAZY);
 #endif
@@ -106,7 +112,7 @@
 		dlclose(module);
 }
 
-#if !defined(__APPLE__) && OBS_QT_VERSION == 6
+#if !defined(__APPLE__)
 int module_has_qt5_check(const char *path)
 {
 	void *mod = os_dlopen(path);
@@ -147,7 +153,7 @@
 {
 	*is_obs_plugin = true;
 	*can_load = true;
-#if !defined(__APPLE__) && OBS_QT_VERSION == 6
+#if !defined(__APPLE__)
 	*can_load = !has_qt5_dependency(path);
 #endif
 	UNUSED_PARAMETER(path);
@@ -565,6 +571,7 @@
 	}
 }
 
+#ifndef __APPLE__
 int64_t os_get_free_space(const char *path)
 {
 	struct statvfs info;
@@ -575,6 +582,7 @@
 
 	return ret;
 }
+#endif
 
 struct posix_glob_info {
 	struct os_glob_info base;
@@ -1130,6 +1138,7 @@
 }
 #endif
 
+#ifndef __APPLE__
 uint64_t os_get_free_disk_space(const char *dir)
 {
 	struct statvfs info;
@@ -1138,6 +1147,7 @@
 
 	return (uint64_t)info.f_frsize * (uint64_t)info.f_bavail;
 }
+#endif
 
 char *os_generate_uuid(void)
 {

obs-studio-29.1.3.tar.xz/libobs/util/platform-windows.c -> obs-studio-30.0.2.tar.xz/libobs/util/platform-windows.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/platform.c -> obs-studio-30.0.2.tar.xz/libobs/util/platform.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/platform.h -> obs-studio-30.0.2.tar.xz/libobs/util/platform.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/profiler.c -> obs-studio-30.0.2.tar.xz/libobs/util/profiler.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/profiler.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/profiler.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/serializer.h -> obs-studio-30.0.2.tar.xz/libobs/util/serializer.h Changed

obs-studio-30.0.2.tar.xz/libobs/util/simde/LICENSE.simde Added

@@ -0,0 +1,40 @@
+simde is licensed as a combination of MIT and CC0 code.
+
+License notices for both are reproduced below:
+
+/* SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Copyright:
+ * 2017-2020 Evan Nemerson <evan@nemerson.com>
+ */
+
+/* Portable Snippets - https://gitub.com/nemequ/portable-snippets
+ * Created by Evan Nemerson <evan@nemerson.com>
+ *
+ * To the extent possible under law, the authors have waived all
+ * copyright and related or neighboring rights to this code. For
+ * details, see the Creative Commons Zero 1.0 Universal license at
+ * https://creativecommons.org/publicdomain/zero/1.0/
+ *
+ * SPDX-License-Identifier: CC0-1.0
+ */

obs-studio-29.1.3.tar.xz/libobs/util/sse-intrin.h -> obs-studio-30.0.2.tar.xz/libobs/util/sse-intrin.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/text-lookup.c -> obs-studio-30.0.2.tar.xz/libobs/util/text-lookup.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/text-lookup.h -> obs-studio-30.0.2.tar.xz/libobs/util/text-lookup.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/threading-posix.c -> obs-studio-30.0.2.tar.xz/libobs/util/threading-posix.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/threading-posix.h -> obs-studio-30.0.2.tar.xz/libobs/util/threading-posix.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/threading-windows.c -> obs-studio-30.0.2.tar.xz/libobs/util/threading-windows.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/threading-windows.h -> obs-studio-30.0.2.tar.xz/libobs/util/threading-windows.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/threading.h -> obs-studio-30.0.2.tar.xz/libobs/util/threading.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/util.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/util.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/util_uint128.h -> obs-studio-30.0.2.tar.xz/libobs/util/util_uint128.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/CoTaskMemPtr.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/windows/CoTaskMemPtr.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/ComPtr.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/windows/ComPtr.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/HRError.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/windows/HRError.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/WinHandle.hpp -> obs-studio-30.0.2.tar.xz/libobs/util/windows/WinHandle.hpp Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/win-registry.h -> obs-studio-30.0.2.tar.xz/libobs/util/windows/win-registry.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/win-version.h -> obs-studio-30.0.2.tar.xz/libobs/util/windows/win-version.h Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/window-helpers.c -> obs-studio-30.0.2.tar.xz/libobs/util/windows/window-helpers.c Changed

obs-studio-29.1.3.tar.xz/libobs/util/windows/window-helpers.h -> obs-studio-30.0.2.tar.xz/libobs/util/windows/window-helpers.h Changed

obs-studio-29.1.3.tar.xz/plugins/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/CMakeLists.txt Changed

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.22...3.25)
 
 option(ENABLE_PLUGINS "Enable building OBS plugins" ON)
 
@@ -43,9 +43,6 @@
      OR OS_LINUX)
     add_subdirectory(decklink)
   endif()
-  if(OS_WINDOWS)
-    add_subdirectory(enc-amf)
-  endif()
   add_subdirectory(image-source)
   if(OS_LINUX)
     add_subdirectory(linux-alsa)
@@ -76,6 +73,7 @@
      OR OS_LINUX)
     add_subdirectory(obs-vst)
   endif()
+  add_subdirectory(obs-webrtc)
   check_obs_websocket()
   add_subdirectory(obs-x264)
   add_subdirectory(rtmp-services)
@@ -121,12 +119,6 @@
   add_subdirectory(vlc-video)
   add_subdirectory(obs-vst)
 
-  if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/enc-amf/CMakeLists.txt")
-    add_subdirectory(enc-amf)
-  else()
-    obs_status(WARNING "enc-amf plugin not found.")
-  endif()
-
   check_obs_browser()
 elseif(OS_MACOS)
   add_subdirectory(coreaudio-encoder)
@@ -152,6 +144,7 @@
   add_subdirectory(vlc-video)
   add_subdirectory(sndio)
   add_subdirectory(obs-vst)
+  add_subdirectory(obs-qsv11)
 
   check_obs_browser()
 elseif(OS_FREEBSD)
@@ -191,3 +184,4 @@
 add_subdirectory(rtmp-services)
 add_subdirectory(text-freetype2)
 add_subdirectory(aja)
+add_subdirectory(obs-webrtc)

obs-studio-29.1.3.tar.xz/plugins/aja/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/aja/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/aja/aja-card-manager.cpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-card-manager.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/aja/aja-card-manager.hpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-card-manager.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/aja/aja-common.cpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-common.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/aja/aja-common.hpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-common.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/aja/aja-presets.cpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-presets.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/aja/aja-presets.hpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-presets.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/aja/aja-routing.cpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-routing.cpp Changed

@@ -23,9 +23,9 @@
 	blog(LOG_DEBUG, "aja::Routing::ParseRouteString: Input string: %s",
 	 route.c_str());
 
-	std::string route_lower(route);
-	route_lower = aja::lower(route_lower);
-	const std::string &route_strip = aja::replace(route_lower, " ", "");
+	std::string route_strip(route);
+	aja::lower(route_strip);
+	aja::replace(route_strip, " ", "");
 
 	if (route_strip.empty()) {
 		blog(LOG_DEBUG,
@@ -274,7 +274,7 @@
 		for (const auto &name : fs_associated) {
 			std::string placeholder = std::string(
 				name + "{ch" + aja::to_string(c + 1) + "}");
-			route_string = aja::replace(
+			aja::replace(
 				route_string, placeholder,
 				name + "" +
 					aja::to_string(start_framestore_index) +
@@ -288,9 +288,8 @@
 	for (ULWord c = 0; c < NTV2_MAX_NUM_CHANNELS; c++) {
 		std::string channel_placeholder =
 			std::string("{ch" + aja::to_string(c + 1) + "}");
-		route_string =
-			aja::replace(route_string, channel_placeholder,
-				 aja::to_string(start_channel_index++));
+		aja::replace(route_string, channel_placeholder,
+			 aja::to_string(start_channel_index++));
 	}
 
 	if (!ParseRouteString(route_string, cnx))
@@ -421,7 +420,7 @@
 		for (const auto &name : fs_associated) {
 			std::string placeholder = std::string(
 				name + "{ch" + aja::to_string(c + 1) + "}");
-			route_string = aja::replace(
+			aja::replace(
 				route_string, placeholder,
 				name + "" +
 					aja::to_string(start_framestore_index) +
@@ -435,9 +434,8 @@
 	for (ULWord c = 0; c < NTV2_MAX_NUM_CHANNELS; c++) {
 		std::string channel_placeholder =
 			std::string("{ch" + aja::to_string(c + 1) + "}");
-		route_string =
-			aja::replace(route_string, channel_placeholder,
-				 aja::to_string(start_channel_index++));
+		aja::replace(route_string, channel_placeholder,
+			 aja::to_string(start_channel_index++));
 	}
 
 	if (!ParseRouteString(route_string, cnx))
@@ -610,4 +608,4 @@
 	}
 }
 
-} // aja
+} // namespace aja

obs-studio-29.1.3.tar.xz/plugins/aja/aja-routing.hpp -> obs-studio-30.0.2.tar.xz/plugins/aja/aja-routing.hpp Changed

obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/aja/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/el-GR.ini Changed

obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/aja/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/aja/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/aja/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/aja/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/pt-BR.ini Changed

@@ -1,15 +1,15 @@
 AJACapture.Device="Captura de dispositivo AJA I/O"
-AJAOutput.Device="Captura de dispositivo AJA I/O"
+AJAOutput.Device="Saída de dispositivo AJA I/O"
 Device="Dispositivo"
 Output="Saída"
 Input="Entrada"
 Mode="Modo"
 VideoFormat="Formato de vídeo"
-PixelFormat="Formato de Pixel"
+PixelFormat="Formato de pixel"
 AutoDetect="Detecção automática"
 Interlaced="Entrelaçado"
-AutoStart="Iniciar automaticamente ao abrir"
-Buffering="Utilizar Buffering"
+AutoStart="Iniciar automaticamente ao executar"
+Buffering="Usar buffering"
 DeactivateWhenNotShowing="Desativar quando não estiver visível"
 IOSelect="Selecionar..."
 SDITransport="Transporte SDI"
@@ -17,11 +17,11 @@
 Auto="Automático"
 ChannelFormat="Canal"
 ChannelFormat.None="Nenhum"
-ChannelFormat.2_0ch="2can"
-ChannelFormat.2_1ch="2.1can"
-ChannelFormat.4_0ch="4can"
-ChannelFormat.4_1ch="41can"
-ChannelFormat.5_1ch="5.1can"
-ChannelFormat.7_1ch="7.1can"
-SwapFC-LFE="Trocar FC e LFE"
-SwapFC-LFE.Tooltip="Alternar entre Canal Frontal Central e Canal LFE"
+ChannelFormat.2_0ch="2.0"
+ChannelFormat.2_1ch="2.1"
+ChannelFormat.4_0ch="4.0"
+ChannelFormat.4_1ch="4.1"
+ChannelFormat.5_1ch="5.1"
+ChannelFormat.7_1ch="7.1"
+SwapFC-LFE="Alternar FC e LFE"
+SwapFC-LFE.Tooltip="Alternar entre canal frontal central e canal LFE"

obs-studio-29.1.3.tar.xz/plugins/aja/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/aja/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/aja/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/coreaudio-encoder/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/coreaudio-encoder/CMakeLists.txt Changed

@@ -17,19 +17,16 @@
 target_link_libraries(coreaudio-encoder PRIVATE OBS::libobs)
 
 if(OS_WINDOWS)
- target_compile_definitions(coreaudio-encoder PRIVATE UNICODE _UNICODE)
-
 configure_file(cmake/windows/obs-module.rc.in coreaudio-encoder.rc)
-
 target_sources(coreaudio-encoder PRIVATE coreaudio-encoder.rc windows-imports.h)
 elseif(OS_MACOS)
- find_library(COREFOUNDATION CoreFoundation)
- find_library(COREAUDIO CoreAudio)
- find_library(AUDIOTOOLBOX AudioToolbox)
- mark_as_advanced(AUDIOTOOLBOX COREAUDIO COREFOUNDATION)
-
- target_link_libraries(coreaudio-encoder PRIVATE ${COREFOUNDATION} ${COREAUDIO} ${AUDIOTOOLBOX})
-
+ # cmake-format: off
+ target_link_libraries(
+ coreaudio-encoder
+ PRIVATE "$<LINK_LIBRARY:FRAMEWORK,CoreFoundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreAudio.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,AudioToolbox.framework>")
+ # cmake-format: on
 endif()
 
 set_target_properties_obs(coreaudio-encoder PROPERTIES FOLDER plugins PREFIX "")

obs-studio-30.0.2.tar.xz/plugins/coreaudio-encoder/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/coreaudio-encoder/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/coreaudio-encoder/data/locale/de-DE.ini Changed

obs-studio-30.0.2.tar.xz/plugins/coreaudio-encoder/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/coreaudio-encoder/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/coreaudio-encoder/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/coreaudio-encoder/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/coreaudio-encoder/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/coreaudio-encoder/encoder.cpp -> obs-studio-30.0.2.tar.xz/plugins/coreaudio-encoder/encoder.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/decklink/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/DecklinkInput.cpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/DecklinkInput.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/DecklinkOutput.cpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/DecklinkOutput.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/DecklinkOutput.hpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/DecklinkOutput.hpp Changed

obs-studio-30.0.2.tar.xz/plugins/decklink/LICENSE.decklink-sdk Added

@@ -0,0 +1,30 @@
+decklink-sdk is licensed under the Boost Software License 1.0 (BSL-1.0).
+
+The license text is reproduced in full below:
+
+/* -LICENSE-START-
+** Copyright (c) 2020 Blackmagic Design
+**
+** Permission is hereby granted, free of charge, to any person or organization
+** obtaining a copy of the software and accompanying documentation covered by
+** this license (the "Software") to use, reproduce, display, distribute,
+** execute, and transmit the Software, and to prepare derivative works of the
+** Software, and to permit third-parties to whom the Software is furnished to
+** do so, all subject to the following:
+**
+** The copyright notices in the Software and this entire statement, including
+** the above license grant, this restriction and the following disclaimer,
+** must be included in all copies of the Software, in whole or in part, and
+** all derivative works of the Software, unless such copies or derivative
+** works are solely in the form of machine-executable object code generated by
+** a source language processor.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+** SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+** FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+** -LICENSE-END-
+*/

obs-studio-29.1.3.tar.xz/plugins/decklink/OBSVideoFrame.cpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/OBSVideoFrame.cpp Changed

@@ -89,3 +89,152 @@
 	*buffer = this->data;
 	return S_OK;
 }
+
+#define CompareREFIID(iid1, iid2) (memcmp(&iid1, &iid2, sizeof(REFIID)) == 0)
+
+HDRVideoFrame::HDRVideoFrame(IDeckLinkMutableVideoFrame *frame)
+	: m_videoFrame(frame),
+	 m_refCount(1)
+{
+}
+
+HRESULT HDRVideoFrame::QueryInterface(REFIID iid, LPVOID *ppv)
+{
+	if (ppv == nullptr)
+		return E_INVALIDARG;
+
+	CFUUIDBytes unknown = CFUUIDGetUUIDBytes(IUnknownUUID);
+	if (CompareREFIID(iid, unknown))
+		*ppv = static_cast<IDeckLinkVideoFrame *>(this);
+	else if (CompareREFIID(iid, IID_IDeckLinkVideoFrame))
+		*ppv = static_cast<IDeckLinkVideoFrame *>(this);
+	else if (CompareREFIID(iid, IID_IDeckLinkVideoFrameMetadataExtensions))
+		*ppv = static_cast<IDeckLinkVideoFrameMetadataExtensions *>(
+			this);
+	else {
+		*ppv = nullptr;
+		return E_NOINTERFACE;
+	}
+
+	AddRef();
+	return S_OK;
+}
+
+ULONG HDRVideoFrame::AddRef(void)
+{
+	return ++m_refCount;
+}
+
+ULONG HDRVideoFrame::Release(void)
+{
+	ULONG newRefValue = --m_refCount;
+
+	if (newRefValue == 0)
+		delete this;
+
+	return newRefValue;
+}
+
+HRESULT HDRVideoFrame::GetInt(BMDDeckLinkFrameMetadataID metadataID,
+			 int64_t *value)
+{
+	HRESULT result = S_OK;
+
+	switch (metadataID) {
+	case bmdDeckLinkFrameMetadataHDRElectroOpticalTransferFunc:
+		*value = 2;
+		break;
+
+	case bmdDeckLinkFrameMetadataColorspace:
+		// Colorspace is fixed for this sample
+		*value = bmdColorspaceRec2020;
+		break;
+
+	default:
+		result = E_INVALIDARG;
+	}
+
+	return result;
+}
+
+HRESULT HDRVideoFrame::GetFloat(BMDDeckLinkFrameMetadataID metadataID,
+				double *value)
+{
+	HRESULT result = S_OK;
+
+	switch (metadataID) {
+	case bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedX:
+		*value = 0.708;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRDisplayPrimariesRedY:
+		*value = 0.292;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenX:
+		*value = 0.17;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRDisplayPrimariesGreenY:
+		*value = 0.797;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueX:
+		*value = 0.131;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRDisplayPrimariesBlueY:
+		*value = 0.046;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRWhitePointX:
+		*value = 0.3127;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRWhitePointY:
+		*value = 0.329;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRMaxDisplayMasteringLuminance:
+		*value = obs_get_video_hdr_nominal_peak_level();
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRMinDisplayMasteringLuminance:
+		*value = 0.00001;
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRMaximumContentLightLevel:
+		*value = obs_get_video_hdr_nominal_peak_level();
+		break;
+
+	case bmdDeckLinkFrameMetadataHDRMaximumFrameAverageLightLevel:
+		*value = obs_get_video_hdr_nominal_peak_level();
+		break;
+
+	default:
+		result = E_INVALIDARG;
+	}
+
+	return result;
+}
+
+HRESULT HDRVideoFrame::GetFlag(BMDDeckLinkFrameMetadataID, decklink_bool_t *)
+{
+	// Not expecting GetFlag
+	return E_INVALIDARG;
+}
+
+HRESULT HDRVideoFrame::GetString(BMDDeckLinkFrameMetadataID,
+				 decklink_string_t *)
+{
+	// Not expecting GetString
+	return E_INVALIDARG;
+}
+
+HRESULT HDRVideoFrame::GetBytes(BMDDeckLinkFrameMetadataID, void *,
+				uint32_t *bufferSize)
+{
+	*bufferSize = 0;
+	// Not expecting GetBytes
+	return E_INVALIDARG;
+}

obs-studio-29.1.3.tar.xz/plugins/decklink/OBSVideoFrame.h -> obs-studio-30.0.2.tar.xz/plugins/decklink/OBSVideoFrame.h Changed

@@ -2,6 +2,7 @@
 
 #include "platform.hpp"
 #include "obs.hpp"
+#include <atomic>
 
 class OBSVideoFrame : public IDeckLinkMutableVideoFrame {
 private:
@@ -75,3 +76,70 @@
 	virtual ULONG STDMETHODCALLTYPE AddRef() override { return 1; }
 	virtual ULONG STDMETHODCALLTYPE Release() override { return 1; }
 };
+
+class HDRVideoFrame : public IDeckLinkVideoFrame,
+		 public IDeckLinkVideoFrameMetadataExtensions {
+public:
+	HDRVideoFrame(IDeckLinkMutableVideoFrame *frame);
+	virtual ~HDRVideoFrame() {}
+
+	// IUnknown interface
+	virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
+							 LPVOID *ppv);
+	virtual ULONG STDMETHODCALLTYPE AddRef(void);
+	virtual ULONG STDMETHODCALLTYPE Release(void);
+
+	// IDeckLinkVideoFrame interface
+	virtual long STDMETHODCALLTYPE GetWidth(void)
+	{
+		return m_videoFrame->GetWidth();
+	}
+	virtual long STDMETHODCALLTYPE GetHeight(void)
+	{
+		return m_videoFrame->GetHeight();
+	}
+	virtual long STDMETHODCALLTYPE GetRowBytes(void)
+	{
+		return m_videoFrame->GetRowBytes();
+	}
+	virtual BMDPixelFormat STDMETHODCALLTYPE GetPixelFormat(void)
+	{
+		return m_videoFrame->GetPixelFormat();
+	}
+	virtual BMDFrameFlags STDMETHODCALLTYPE GetFlags(void)
+	{
+		return m_videoFrame->GetFlags() | bmdFrameContainsHDRMetadata;
+	}
+	virtual HRESULT STDMETHODCALLTYPE GetBytes(void **buffer)
+	{
+		return m_videoFrame->GetBytes(buffer);
+	}
+	virtual HRESULT STDMETHODCALLTYPE
+	GetTimecode(BMDTimecodeFormat format, IDeckLinkTimecode **timecode)
+	{
+		return m_videoFrame->GetTimecode(format, timecode);
+	}
+	virtual HRESULT STDMETHODCALLTYPE
+	GetAncillaryData(IDeckLinkVideoFrameAncillary **ancillary)
+	{
+		return m_videoFrame->GetAncillaryData(ancillary);
+	}
+
+	// IDeckLinkVideoFrameMetadataExtensions interface
+	virtual HRESULT STDMETHODCALLTYPE
+	GetInt(BMDDeckLinkFrameMetadataID metadataID, int64_t *value);
+	virtual HRESULT STDMETHODCALLTYPE
+	GetFloat(BMDDeckLinkFrameMetadataID metadataID, double *value);
+	virtual HRESULT STDMETHODCALLTYPE
+	GetFlag(BMDDeckLinkFrameMetadataID metadataID, decklink_bool_t *value);
+	virtual HRESULT STDMETHODCALLTYPE
+	GetString(BMDDeckLinkFrameMetadataID metadataID,
+		 decklink_string_t *value);
+	virtual HRESULT STDMETHODCALLTYPE
+	GetBytes(BMDDeckLinkFrameMetadataID metadataID, void *buffer,
+		 uint32_t *bufferSize);
+
+private:
+	ComPtr<IDeckLinkMutableVideoFrame> m_videoFrame;
+	std::atomic<ULONG> m_refCount;
+};

obs-studio-29.1.3.tar.xz/plugins/decklink/const.h -> obs-studio-30.0.2.tar.xz/plugins/decklink/const.h Changed

obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/an-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/an-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/decklink/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/decklink-device-instance.cpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/decklink-device-instance.cpp Changed

@@ -66,6 +66,8 @@
 	switch (format) {
 	case bmdFormat8BitBGRA:
 		return VIDEO_FORMAT_BGRX;
+	case bmdFormat10BitRGBXLE:
+		return VIDEO_FORMAT_R10L;
 	case bmdFormat10BitYUV:
 		return VIDEO_FORMAT_V210;
 	default:
@@ -408,12 +410,12 @@
 
 	BMDPixelFormat convertFormat;
 	switch (pixelFormat) {
-	case bmdFormat8BitBGRA:
 	case bmdFormat10BitYUV:
+	case bmdFormat8BitBGRA:
+	case bmdFormat10BitRGBXLE:
 		convertFormat = pixelFormat;
 		break;
 	default:
-	case bmdFormat8BitYUV:;
 		convertFormat = bmdFormat8BitYUV;
 		break;
 	}
@@ -624,13 +626,24 @@
 	}
 	activeBlob = nullptr;
 
+	struct obs_video_info ovi;
+	const enum video_colorspace colorspace =
+		obs_get_video_info(&ovi) ? ovi.colorspace : VIDEO_CS_DEFAULT;
+	const bool source_hdr = (colorspace == VIDEO_CS_2100_PQ) ||
+				(colorspace == VIDEO_CS_2100_HLG);
+	const bool enable_hdr =
+		source_hdr &&
+		(obs_output_get_video_conversion(decklinkOutput->GetOutput())
+			 ->colorspace == VIDEO_CS_2100_PQ);
+	BMDPixelFormat pixelFormat = enable_hdr ? bmdFormat10BitRGBXLE
+						: bmdFormat8BitBGRA;
 	const int64_t minimumPrerollFrames =
 		std::max(device->GetMinimumPrerollFrames(), INT64_C(3));
 	for (int64_t i = 0; i < minimumPrerollFrames; ++i) {
 		ComPtr<IDeckLinkMutableVideoFrame> decklinkOutputFrame;
 		HRESULT result = output_->CreateVideoFrame(
 			decklinkOutput->GetWidth(), decklinkOutput->GetHeight(),
-			rowSize, bmdFormat8BitBGRA, bmdFrameFlagDefault,
+			rowSize, pixelFormat, bmdFrameFlagDefault,
 			&decklinkOutputFrame);
 		if (result != S_OK) {
 			blog(LOG_ERROR, "failed to create video frame 0x%X",
@@ -638,7 +651,15 @@
 			return false;
 		}
 
-		result = output_->ScheduleVideoFrame(decklinkOutputFrame,
+		IDeckLinkVideoFrame *theFrame = decklinkOutputFrame.Get();
+		ComPtr<HDRVideoFrame> decklinkOutputHDRFrame;
+		if (enable_hdr) {
+			*decklinkOutputHDRFrame.Assign() =
+				new HDRVideoFrame(decklinkOutputFrame);
+			theFrame = decklinkOutputHDRFrame.Get();
+		}
+
+		result = output_->ScheduleVideoFrame(theFrame,
 						 i * frameDuration,
 						 frameDuration,
 						 frameTimescale);
@@ -773,27 +794,32 @@
 	BMDVideoInputFormatChangedEvents events, IDeckLinkDisplayMode *newMode,
 	BMDDetectedVideoInputFormatFlags detectedSignalFlags)
 {
+	bool formatChanged = false;
 	if (events & bmdVideoInputColorspaceChanged) {
+		constexpr BMDDetectedVideoInputFormatFlags highBitFlags =
+			(bmdDetectedVideoInput12BitDepth |
+			 bmdDetectedVideoInput10BitDepth);
 		if (detectedSignalFlags & bmdDetectedVideoInputRGB444) {
-			pixelFormat = bmdFormat8BitBGRA;
+			const BMDPixelFormat nextFormat =
+				((detectedSignalFlags & highBitFlags) &&
+				 allow10Bit)
+					? bmdFormat10BitRGBXLE
+					: bmdFormat8BitBGRA;
+			formatChanged = pixelFormat != nextFormat;
+			pixelFormat = nextFormat;
 		}
 		if (detectedSignalFlags & bmdDetectedVideoInputYCbCr422) {
-			if (detectedSignalFlags &
-			 bmdDetectedVideoInput10BitDepth) {
-				if (allow10Bit) {
-					pixelFormat = bmdFormat10BitYUV;
-				} else {
-					pixelFormat = bmdFormat8BitYUV;
-				}
-			}
-			if (detectedSignalFlags &
-			 bmdDetectedVideoInput8BitDepth) {
-				pixelFormat = bmdFormat8BitYUV;
-			}
+			const BMDPixelFormat nextFormat =
+				((detectedSignalFlags & highBitFlags) &&
+				 allow10Bit)
+					? bmdFormat10BitYUV
+					: bmdFormat8BitYUV;
+			formatChanged = pixelFormat != nextFormat;
+			pixelFormat = nextFormat;
 		}
 	}
 
-	if (events & bmdVideoInputDisplayModeChanged) {
+	if (formatChanged || (events & bmdVideoInputDisplayModeChanged)) {
 		input->PauseStreams();
 		mode->SetMode(newMode);
 		displayMode = mode->GetDisplayMode();

obs-studio-29.1.3.tar.xz/plugins/decklink/decklink-device-mode.cpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/decklink-device-mode.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/decklink-device.cpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/decklink-device.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/decklink-device.hpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/decklink-device.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/decklink/decklink-output.cpp -> obs-studio-30.0.2.tar.xz/plugins/decklink/decklink-output.cpp Changed

@@ -24,6 +24,7 @@
 	decklinkOutput->deviceHash = obs_data_get_string(settings, DEVICE_HASH);
 	decklinkOutput->modeID = obs_data_get_int(settings, MODE_ID);
 	decklinkOutput->keyerMode = (int)obs_data_get_int(settings, KEYER);
+	decklinkOutput->force_sdr = obs_data_get_bool(settings, FORCE_SDR);
 
 	ComPtr<DeckLinkDevice> device;
 	device.Set(deviceEnum->FindByHash(decklinkOutput->deviceHash));
@@ -36,9 +37,10 @@
 		to.width = mode->GetWidth();
 		to.height = mode->GetHeight();
 		to.range = VIDEO_RANGE_FULL;
-		struct obs_video_info ovi;
-		to.colorspace = obs_get_video_info(&ovi) ? ovi.colorspace
-							 : VIDEO_CS_DEFAULT;
+		to.colorspace = (device->GetSupportsHDRMetadata() &&
+				 !decklinkOutput->force_sdr)
+					? VIDEO_CS_2100_PQ
+					: VIDEO_CS_709;
 
 		obs_output_set_video_conversion(output, &to);
 	}
@@ -53,6 +55,7 @@
 	decklink->deviceHash = obs_data_get_string(settings, DEVICE_HASH);
 	decklink->modeID = obs_data_get_int(settings, MODE_ID);
 	decklink->keyerMode = (int)obs_data_get_int(settings, KEYER);
+	decklink->force_sdr = obs_data_get_bool(settings, FORCE_SDR);
 }
 
 static bool decklink_output_start(void *data)
@@ -272,6 +275,7 @@
 				OBS_COMBO_FORMAT_INT);
 
 	obs_properties_add_bool(props, AUTO_START, TEXT_AUTO_START);
+	obs_properties_add_bool(props, FORCE_SDR, TEXT_FORCE_SDR);
 
 	obs_properties_add_list(props, KEYER, TEXT_ENABLE_KEYER,
 				OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);

obs-studio-29.1.3.tar.xz/plugins/image-source/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/image-source/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/image-source/data/locale/af-ZA.ini Added

@@ -0,0 +1,29 @@
+ImageInput="Beeld"
+File="Beeldlêer"
+LinearAlpha="Pas alfa toe in lineêre ruimte"
+SlideShow.TransitionSpeed="Oorgangsnelheid"
+SlideShow.SlideTime="Tyd tussen dia’s"
+SlideShow.Files="Beeldlêers"
+SlideShow.CustomSize="Grensgrootte/Aspekverhouding"
+SlideShow.CustomSize.Auto="Outomaties"
+SlideShow.Loop="Herhaal"
+SlideShow.Transition="Oorgang"
+SlideShow.Transition.Cut="Knip"
+SlideShow.Transition.Fade="Vervaag"
+SlideShow.Transition.Swipe="Vee"
+SlideShow.Transition.Slide="Skuif"
+SlideShow.PlaybackBehavior="Sigbaarheidsgedrag"
+SlideShow.PlaybackBehavior.StopRestart="Stop wanneer nie sigbaar, herbegin wanneer sigbaar"
+SlideShow.PlaybackBehavior.PauseUnpause="Wag wanneer nie sigbaar, hervat wanneer sigbaar"
+SlideShow.PlaybackBehavior.AlwaysPlay="Speel altyd af, selfs wanneer nie sigbaar"
+SlideShow.SlideMode.Auto="Outomaties"
+SlideShow.SlideMode.Manual="Handmatig (gebruik sneltoetse om dia’s te bedien)"
+SlideShow.PlayPause="Afspeel/Wag"
+SlideShow.Restart="Herbegin"
+SlideShow.NextSlide="Volgende dia"
+SlideShow.PreviousSlide="Vorige dia"
+SlideShow.HideWhenDone="Versteek wanneer diavoorstelline klaar is"
+ColorSource="Kleurbron"
+ColorSource.Color="Kleur"
+ColorSource.Width="Breedte"
+ColorSource.Height="Hoogte"

obs-studio-29.1.3.tar.xz/plugins/image-source/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/image-source/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/image-source/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/image-source/data/locale/ru-RU.ini Changed

@@ -2,7 +2,7 @@
 File="Файл изображения"
 UnloadWhenNotShowing="Выгружать изображения, которые не показываются"
 LinearAlpha="Применить альфа канал в линейном пространстве"
-SlideShow="Слайд-шоу"
+SlideShow="Слайдшоу"
 SlideShow.TransitionSpeed="Скорость перехода"
 SlideShow.SlideTime="Время между слайдами"
 SlideShow.Files="Файлы изображений"
@@ -21,13 +21,13 @@
 SlideShow.PlaybackBehavior.AlwaysPlay="Всегда проигрывать, даже если не видимый"
 SlideShow.SlideMode="Режим перелистывания"
 SlideShow.SlideMode.Auto="Автоматический"
-SlideShow.SlideMode.Manual="Ручной (Используйте горячие клавиши для управления слайд-шоу)"
+SlideShow.SlideMode.Manual="Ручной (Используйте горячие клавиши для управления слайдшоу)"
 SlideShow.PlayPause="Воспроизвести/Пауза"
 SlideShow.Restart="Перезапустить"
 SlideShow.Stop="Остановить"
 SlideShow.NextSlide="Следующий слайд"
 SlideShow.PreviousSlide="Предыдущий слайд"
-SlideShow.HideWhenDone="Скрыть по завершении слайд-шоу"
+SlideShow.HideWhenDone="Скрыть по завершении слайдшоу"
 ColorSource="Фоновый цвет"
 ColorSource.Color="Цвет"
 ColorSource.Width="Ширина"

obs-studio-29.1.3.tar.xz/plugins/image-source/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/image-source/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/image-source/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/image-source/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/image-source/obs-slideshow.c -> obs-studio-30.0.2.tar.xz/plugins/image-source/obs-slideshow.c Changed

@@ -71,6 +71,8 @@
 	obs_source_t *source;
 };
 
+typedef DARRAY(struct image_file_data) image_file_array_t;
+
 enum behavior {
 	BEHAVIOR_STOP_RESTART,
 	BEHAVIOR_PAUSE_UNPAUSE,
@@ -104,7 +106,7 @@
 	uint64_t mem_usage;
 
 	pthread_mutex_t mutex;
-	DARRAY(struct image_file_data) files;
+	image_file_array_t files;
 
 	enum behavior behavior;
 
@@ -140,18 +142,15 @@
 	return tr;
 }
 
-static obs_source_t *get_source(struct darray *array, const char *path)
+static obs_source_t *get_source(image_file_array_t *files, const char *path)
 {
-	DARRAY(struct image_file_data) files;
 	obs_source_t *source = NULL;
 
-	files.da = *array;
-
-	for (size_t i = 0; i < files.num; i++) {
-		const char *cur_path = files.arrayi.path;
+	for (size_t i = 0; i < files->num; i++) {
+		const char *cur_path = files->arrayi.path;
 
 		if (strcmp(path, cur_path) == 0) {
-			source = obs_source_get_ref(files.arrayi.source);
+			source = obs_source_get_ref(files->arrayi.source);
 			break;
 		}
 	}
@@ -172,17 +171,14 @@
 	return source;
 }
 
-static void free_files(struct darray *array)
+static void free_files(image_file_array_t *files)
 {
-	DARRAY(struct image_file_data) files;
-	files.da = *array;
-
-	for (size_t i = 0; i < files.num; i++) {
-		bfree(files.arrayi.path);
-		obs_source_release(files.arrayi.source);
+	for (size_t i = 0; i < files->num; i++) {
+		bfree(files->arrayi.path);
+		obs_source_release(files->arrayi.source);
 	}
 
-	da_free(files);
+	da_free(*files);
 }
 
 static inline size_t random_file(struct slideshow *ss)
@@ -205,21 +201,18 @@
 	return obs_module_text("SlideShow");
 }
 
-static void add_file(struct slideshow *ss, struct darray *array,
+static void add_file(struct slideshow *ss, image_file_array_t *new_files,
 		 const char *path, uint32_t *cx, uint32_t *cy)
 {
-	DARRAY(struct image_file_data) new_files;
 	struct image_file_data data;
 	obs_source_t *new_source;
 
-	new_files.da = *array;
-
 	pthread_mutex_lock(&ss->mutex);
-	new_source = get_source(&ss->files.da, path);
+	new_source = get_source(&ss->files, path);
 	pthread_mutex_unlock(&ss->mutex);
 
 	if (!new_source)
-		new_source = get_source(&new_files.da, path);
+		new_source = get_source(new_files, path);
 	if (!new_source)
 		new_source = create_source_from_file(path);
 
@@ -229,7 +222,7 @@
 
 		data.path = bstrdup(path);
 		data.source = new_source;
-		da_push_back(new_files, &data);
+		da_push_back(*new_files, &data);
 
 		if (new_cx > *cx)
 			*cx = new_cx;
@@ -239,8 +232,6 @@
 		void *source_data = obs_obj_get_data(new_source);
 		ss->mem_usage += image_source_get_memory_usage(source_data);
 	}
-
-	*array = new_files.da;
 }
 
 static bool valid_extension(const char *ext)
@@ -295,8 +286,8 @@
 
 static void ss_update(void *data, obs_data_t *settings)
 {
-	DARRAY(struct image_file_data) new_files;
-	DARRAY(struct image_file_data) old_files;
+	image_file_array_t new_files;
+	image_file_array_t old_files;
 	obs_source_t *new_tr = NULL;
 	obs_source_t *old_tr = NULL;
 	struct slideshow *ss = data;
@@ -386,7 +377,7 @@
 				dstr_copy(&dir_path, path);
 				dstr_cat_ch(&dir_path, '/');
 				dstr_cat(&dir_path, ent->d_name);
-				add_file(ss, &new_files.da, dir_path.array, &cx,
+				add_file(ss, &new_files, dir_path.array, &cx,
 					 &cy);
 
 				if (ss->mem_usage >= MAX_MEM_USAGE)
@@ -396,7 +387,7 @@
 			dstr_free(&dir_path);
 			os_closedir(dir);
 		} else {
-			add_file(ss, &new_files.da, path, &cx, &cy);
+			add_file(ss, &new_files, path, &cx, &cy);
 		}
 
 		obs_data_release(item);
@@ -410,8 +401,8 @@
 
 	pthread_mutex_lock(&ss->mutex);
 
-	old_files.da = ss->files.da;
-	ss->files.da = new_files.da;
+	old_files = ss->files;
+	ss->files = new_files;
 	if (new_tr) {
 		old_tr = ss->transition;
 		ss->transition = new_tr;
@@ -438,7 +429,7 @@
 
 	if (old_tr)
 		obs_source_release(old_tr);
-	free_files(&old_files.da);
+	free_files(&old_files);
 
 	/* ------------------------- */
 
@@ -670,7 +661,7 @@
 	struct slideshow *ss = data;
 
 	obs_source_release(ss->transition);
-	free_files(&ss->files.da);
+	free_files(&ss->files);
 	pthread_mutex_destroy(&ss->mutex);
 	calldata_free(&ss->cd);
 	bfree(ss);
@@ -708,8 +699,10 @@
 		obs_module_text("SlideShow.PreviousSlide"),
 		previous_slide_hotkey, ss);
 
-	proc_handler_add(ph, "int current_index()", current_slide_proc, ss);
-	proc_handler_add(ph, "int total_files()", total_slides_proc, ss);
+	proc_handler_add(ph, "void current_index(out int current_index)",
+			 current_slide_proc, ss);
+	proc_handler_add(ph, "void total_files(out int total_files)",
+			 total_slides_proc, ss);
 
 	signal_handler_t *sh = obs_source_get_signal_handler(ss->source);
 	signal_handler_add(sh, "void slide_changed(int index, string path)");
@@ -817,9 +810,7 @@
 			float *out = audio_output->outputmix.datach;
 			float *in = child_audio.outputmix.datach;
 
-			memcpy(out, in,
-			 AUDIO_OUTPUT_FRAMES * MAX_AUDIO_CHANNELS *
-				 sizeof(float));
+			memcpy(out, in, AUDIO_OUTPUT_FRAMES * sizeof(float));
 		}
 	}

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/alsa-input.c -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/alsa-input.c Changed

obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/el-GR.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/fi-FI.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/fil-PH.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/id-ID.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-alsa/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-alsa/data/locale/zh-TW.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/az-AZ.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/az-AZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/be-BY.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/be-BY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/el-GR.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/szl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/szl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/tl-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/tl-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-capture/xcomposite-input.c -> obs-studio-30.0.2.tar.xz/plugins/linux-capture/xcomposite-input.c Changed

@@ -47,12 +47,12 @@
 	int crop_left;
 	int crop_right;
 	int crop_bot;
-	bool swapRedBlue;
 	bool include_border;
 	bool exclude_alpha;
 
 	float window_check_time;
 	bool window_changed;
+	bool window_hooked;
 
 	uint32_t width;
 	uint32_t height;
@@ -360,27 +360,6 @@
 	}
 }
 
-static enum gs_color_format gs_format_from_tex()
-{
-	GLint iformat = 0;
-	// consider GL_ARB_internalformat_query
-	glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT,
-				 &iformat);
-
-	// These formats are known to be wrong on Intel platforms. We intentionally
-	// use swapped internal formats here to preserve historic behavior which
-	// swapped colors accidentally and because D3D11 would not support a
-	// GS_RGBX format.
-	switch (iformat) {
-	case GL_RGB:
-		return GS_BGRX_UNORM;
-	case GL_RGBA:
-		return GS_RGBA_UNORM;
-	default:
-		return GS_RGBA_UNORM;
-	}
-}
-
 static int silence_x11_errors(Display *display, XErrorEvent *err)
 {
 	UNUSED_PARAMETER(display);
@@ -552,6 +531,27 @@
 	da_free(watcher_registry);
 }
 
+static void xcompcap_get_hooked(void *data, calldata_t *cd)
+{
+	struct xcompcap *s = data;
+	if (!s)
+		return;
+
+	calldata_set_bool(cd, "hooked", s->window_hooked);
+
+	if (s->window_hooked) {
+		struct dstr wname = xcomp_window_name(conn, disp, s->win);
+		struct dstr wcls = xcomp_window_class(conn, s->win);
+		calldata_set_string(cd, "name", wname.array);
+		calldata_set_string(cd, "class", wcls.array);
+		dstr_free(&wname);
+		dstr_free(&wcls);
+	} else {
+		calldata_set_string(cd, "name", "");
+		calldata_set_string(cd, "class", "");
+	}
+}
+
 static uint32_t xcompcap_get_width(void *data)
 {
 	struct xcompcap *s = (struct xcompcap *)data;
@@ -581,11 +581,23 @@
 	pthread_mutex_init(&s->lock, NULL);
 	s->show_cursor = true;
 	s->source = source;
+	s->window_hooked = false;
 
 	obs_enter_graphics();
 	s->cursor = xcb_xcursor_init(conn);
 	obs_leave_graphics();
 
+	signal_handler_t *sh = obs_source_get_signal_handler(source);
+	signal_handler_add(sh, "void unhooked(ptr source)");
+	signal_handler_add(
+		sh, "void hooked(ptr source, string name, string class)");
+
+	proc_handler_t *ph = obs_source_get_proc_handler(source);
+	proc_handler_add(
+		ph,
+		"void get_hooked(out bool hooked, out string name, out string class)",
+		xcompcap_get_hooked, s);
+
 	xcompcap_update(s, settings);
 	return s;
 }
@@ -624,6 +636,17 @@
 	while ((event = xcb_poll_for_queued_event(conn)))
 		watcher_process(event);
 
+	// Send an unhooked signal if the window isn't found anymore
+	if (s->window_hooked && !xcomp_window_exists(conn, s->win)) {
+		s->window_hooked = false;
+
+		signal_handler_t *sh = obs_source_get_signal_handler(s->source);
+		calldata_t data = {0};
+		calldata_set_ptr(&data, "source", s->source);
+		signal_handler_signal(sh, "unhooked", &data);
+		calldata_free(&data);
+	}
+
 	// Reacquire window after interval or immediately if reconfigured.
 	s->window_check_time += seconds;
 	bool window_lost = !xcomp_window_exists(conn, s->win) || !s->gltex;
@@ -635,6 +658,25 @@
 		s->window_check_time = 0.0;
 		s->win = xcomp_find_window(conn, disp, s->windowName);
 
+		// Send a hooked signal if a new window has been found
+		if (!s->window_hooked && xcomp_window_exists(conn, s->win)) {
+			s->window_hooked = true;
+
+			signal_handler_t *sh =
+				obs_source_get_signal_handler(s->source);
+			calldata_t data = {0};
+			calldata_set_ptr(&data, "source", s->source);
+			struct dstr wname =
+				xcomp_window_name(conn, disp, s->win);
+			struct dstr wcls = xcomp_window_class(conn, s->win);
+			calldata_set_string(&data, "name", wname.array);
+			calldata_set_string(&data, "class", wcls.array);
+			signal_handler_signal(sh, "hooked", &data);
+			dstr_free(&wname);
+			dstr_free(&wcls);
+			calldata_free(&data);
+		}
+
 		watcher_register(conn, s);
 		xcomp_cleanup_pixmap(disp, s);
 		// Avoid excessive logging. We expect this to fail while windows are
@@ -779,9 +821,6 @@
 		props, "cut_bot", obs_module_text("CropBottom"), 0, 4096, 1);
 	obs_property_int_set_suffix(prop, " px");
 
-	obs_properties_add_bool(props, "swap_redblue",
-				obs_module_text("SwapRedBlue"));
-
 	obs_properties_add_bool(props, "show_cursor",
 				obs_module_text("CaptureCursor"));
 
@@ -801,7 +840,6 @@
 	obs_data_set_default_int(settings, "cut_left", 0);
 	obs_data_set_default_int(settings, "cut_right", 0);
 	obs_data_set_default_int(settings, "cut_bot", 0);
-	obs_data_set_default_bool(settings, "swap_redblue", false);
 	obs_data_set_default_bool(settings, "show_cursor", true);
 	obs_data_set_default_bool(settings, "include_border", false);
 	obs_data_set_default_bool(settings, "exclude_alpha", false);
@@ -813,18 +851,45 @@
 
 	obs_enter_graphics();
 	pthread_mutex_lock(&s->lock);
+	char *prev_name = bstrdup(s->windowName);
 
 	s->crop_top = obs_data_get_int(settings, "cut_top");
 	s->crop_left = obs_data_get_int(settings, "cut_left");
 	s->crop_right = obs_data_get_int(settings, "cut_right");
 	s->crop_bot = obs_data_get_int(settings, "cut_bot");
-	s->swapRedBlue = obs_data_get_bool(settings, "swap_redblue");
 	s->show_cursor = obs_data_get_bool(settings, "show_cursor");
 	s->include_border = obs_data_get_bool(settings, "include_border");
 	s->exclude_alpha = obs_data_get_bool(settings, "exclude_alpha");
 
 	s->windowName = obs_data_get_string(settings, "capture_window");
+	if (s->window_hooked && strcmp(prev_name, s->windowName) != 0) {
+		s->window_hooked = false;
+
+		signal_handler_t *sh = obs_source_get_signal_handler(s->source);
+		calldata_t data = {0};
+		calldata_set_ptr(&data, "source", s->source);
+		signal_handler_signal(sh, "unhooked", &data);
+		calldata_free(&data);
+	}
+	bfree(prev_name);
+
 	s->win = xcomp_find_window(conn, disp, s->windowName);
+	if (!s->window_hooked && xcomp_window_exists(conn, s->win)) {
+		s->window_hooked = true;
+
+		signal_handler_t *sh = obs_source_get_signal_handler(s->source);
+		calldata_t data = {0};
+		calldata_set_ptr(&data, "source", s->source);
+		struct dstr wname = xcomp_window_name(conn, disp, s->win);
+		struct dstr wcls = xcomp_window_class(conn, s->win);
+		calldata_set_string(&data, "name", wname.array);
+		calldata_set_string(&data, "class", wcls.array);
+		signal_handler_signal(sh, "hooked", &data);
+		dstr_free(&wname);
+		dstr_free(&wcls);
+		calldata_free(&data);
+	}
+
 	if (s->win && s->windowName) {
 		struct dstr wname = xcomp_window_name(conn, disp, s->win);
 		struct dstr wcls = xcomp_window_class(conn, s->win);

obs-studio-30.0.2.tar.xz/plugins/linux-jack/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/linux-jack/data/locale/en-GB.ini Added

obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/data/locale/et-EE.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/data/locale/hr-HR.ini Added

obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/data/locale/nb-NO.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/linux-pipewire.c -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/linux-pipewire.c Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/pipewire.c -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/pipewire.c Changed

@@ -78,8 +78,6 @@
 struct _obs_pipewire {
 	int pipewire_fd;
 
-	gs_texture_t *texture;
-
 	struct pw_thread_loop *thread_loop;
 	struct pw_context *context;
 
@@ -89,6 +87,15 @@
 
 	struct obs_pw_version server_version;
 
+	GPtrArray *streams;
+};
+
+struct _obs_pipewire_stream {
+	obs_pipewire *obs_pw;
+	obs_source_t *source;
+
+	gs_texture_t *texture;
+
 	struct pw_stream *stream;
 	struct spa_hook stream_listener;
 	struct spa_source *reneg;
@@ -156,9 +163,6 @@
 		pw_thread_loop_stop(obs_pw->thread_loop);
 	}
 
-	if (obs_pw->stream)
-		pw_stream_disconnect(obs_pw->stream);
-	g_clear_pointer(&obs_pw->stream, pw_stream_destroy);
 	g_clear_pointer(&obs_pw->context, pw_context_destroy);
 	g_clear_pointer(&obs_pw->thread_loop, pw_thread_loop_destroy);
 
@@ -166,31 +170,23 @@
 		close(obs_pw->pipewire_fd);
 		obs_pw->pipewire_fd = 0;
 	}
-
-	obs_pw->negotiated = false;
-}
-
-static void destroy_session(obs_pipewire *obs_pw)
-{
-	obs_enter_graphics();
-	g_clear_pointer(&obs_pw->cursor.texture, gs_texture_destroy);
-	g_clear_pointer(&obs_pw->texture, gs_texture_destroy);
-	obs_leave_graphics();
 }
 
-static inline bool has_effective_crop(obs_pipewire *obs_pw)
+static inline bool has_effective_crop(obs_pipewire_stream *obs_pw_stream)
 {
-	return obs_pw->crop.valid &&
-	 (obs_pw->crop.x != 0 || obs_pw->crop.y != 0 ||
-		obs_pw->crop.width < obs_pw->format.info.raw.size.width ||
-		obs_pw->crop.height < obs_pw->format.info.raw.size.height);
+	return obs_pw_stream->crop.valid &&
+	 (obs_pw_stream->crop.x != 0 || obs_pw_stream->crop.y != 0 ||
+		obs_pw_stream->crop.width <
+			obs_pw_stream->format.info.raw.size.width ||
+		obs_pw_stream->crop.height <
+			obs_pw_stream->format.info.raw.size.height);
 }
 
-static int get_buffer_flip(obs_pipewire *obs_pw)
+static int get_buffer_flip(obs_pipewire_stream *obs_pw_stream)
 {
 	int flip = 0;
 
-	switch (obs_pw->transform) {
+	switch (obs_pw_stream->transform) {
 	case SPA_META_TRANSFORMATION_Flipped:
 	case SPA_META_TRANSFORMATION_Flipped180:
 		flip = GS_FLIP_U;
@@ -209,16 +205,16 @@
 	return flip;
 }
 
-static bool push_rotation(obs_pipewire *obs_pw)
+static bool push_rotation(obs_pipewire_stream *obs_pw_stream)
 {
 	double offset_x = 0;
 	double offset_y = 0;
 	double rotation = 0;
 	bool has_crop;
 
-	has_crop = has_effective_crop(obs_pw);
+	has_crop = has_effective_crop(obs_pw_stream);
 
-	switch (obs_pw->transform) {
+	switch (obs_pw_stream->transform) {
 	case SPA_META_TRANSFORMATION_Flipped:
 	case SPA_META_TRANSFORMATION_None:
 		rotation = 0;
@@ -227,22 +223,24 @@
 	case SPA_META_TRANSFORMATION_90:
 		rotation = 90;
 		offset_x = 0;
-		offset_y = has_crop ? obs_pw->crop.height
-				 : obs_pw->format.info.raw.size.height;
+		offset_y = has_crop
+				 ? obs_pw_stream->crop.height
+				 : obs_pw_stream->format.info.raw.size.height;
 		break;
 	case SPA_META_TRANSFORMATION_Flipped180:
 	case SPA_META_TRANSFORMATION_180:
 		rotation = 180;
-		offset_x = has_crop ? obs_pw->crop.width
-				 : obs_pw->format.info.raw.size.width;
-		offset_y = has_crop ? obs_pw->crop.height
-				 : obs_pw->format.info.raw.size.height;
+		offset_x = has_crop ? obs_pw_stream->crop.width
+				 : obs_pw_stream->format.info.raw.size.width;
+		offset_y = has_crop
+				 ? obs_pw_stream->crop.height
+				 : obs_pw_stream->format.info.raw.size.height;
 		break;
 	case SPA_META_TRANSFORMATION_Flipped270:
 	case SPA_META_TRANSFORMATION_270:
 		rotation = 270;
-		offset_x = has_crop ? obs_pw->crop.width
-				 : obs_pw->format.info.raw.size.width;
+		offset_x = has_crop ? obs_pw_stream->crop.width
+				 : obs_pw_stream->format.info.raw.size.width;
 		offset_y = 0;
 		break;
 	}
@@ -256,60 +254,119 @@
 	return rotation != 0;
 }
 
-static const struct {
+struct format_data {
 	uint32_t spa_format;
 	uint32_t drm_format;
 	enum gs_color_format gs_format;
+	enum video_format video_format;
 	bool swap_red_blue;
+	uint32_t bpp;
 	const char *pretty_name;
-} supported_formats = {
+};
+
+static const struct format_data supported_formats = {
 	{
 		SPA_VIDEO_FORMAT_BGRA,
 		DRM_FORMAT_ARGB8888,
 		GS_BGRA,
+		VIDEO_FORMAT_BGRA,
 		false,
+		4,
 		"ARGB8888",
 	},
 	{
 		SPA_VIDEO_FORMAT_RGBA,
 		DRM_FORMAT_ABGR8888,
 		GS_RGBA,
+		VIDEO_FORMAT_RGBA,
 		false,
+		4,
 		"ABGR8888",
 	},
 	{
 		SPA_VIDEO_FORMAT_BGRx,
 		DRM_FORMAT_XRGB8888,
 		GS_BGRX,
+		VIDEO_FORMAT_BGRX,
 		false,
+		4,
 		"XRGB8888",
 	},
 	{
 		SPA_VIDEO_FORMAT_RGBx,
 		DRM_FORMAT_XBGR8888,
 		GS_BGRX,
+		VIDEO_FORMAT_NONE,
 		true,
+		4,
 		"XBGR8888",
 	},
+	{
+		SPA_VIDEO_FORMAT_YUY2,
+		DRM_FORMAT_YUYV,
+		GS_UNKNOWN,
+		VIDEO_FORMAT_YUY2,
+		false,
+		2,
+		"YUYV422",
+	},
+#if PW_CHECK_VERSION(0, 3, 41)
+	{
+		SPA_VIDEO_FORMAT_ABGR_210LE,
+		DRM_FORMAT_ABGR2101010,
+		GS_R10G10B10A2,
+		VIDEO_FORMAT_NONE,
+		false,
+		10,
+		"ABGR2101010",
+
+	},
+	{
+		SPA_VIDEO_FORMAT_xBGR_210LE,
+		DRM_FORMAT_XBGR2101010,
+		GS_R10G10B10A2,
+		VIDEO_FORMAT_NONE,
+		false,
+		10,
+		"XBGR2101010",
+
+	},
+#endif
 };
 
 #define N_SUPPORTED_FORMATS \
 	(sizeof(supported_formats) / sizeof(supported_formats0))
 
-static bool lookup_format_info_from_spa_format(
-	uint32_t spa_format, uint32_t *out_drm_format,
-	enum gs_color_format *out_gs_format, bool *out_swap_red_blue)
+static const uint32_t supported_formats_async = {
+	SPA_VIDEO_FORMAT_RGBA,
+	SPA_VIDEO_FORMAT_YUY2,
+};
+
+#define N_SUPPORTED_FORMATS_ASYNC \
+	(sizeof(supported_formats_async) / sizeof(supported_formats_async0))
+
+static const uint32_t supported_formats_sync = {
+	SPA_VIDEO_FORMAT_BGRA, SPA_VIDEO_FORMAT_RGBA,
+	SPA_VIDEO_FORMAT_BGRx, SPA_VIDEO_FORMAT_RGBx,
+#if PW_CHECK_VERSION(0, 3, 41)
+	SPA_VIDEO_FORMAT_ABGR_210LE, SPA_VIDEO_FORMAT_xBGR_210LE,
+#endif
+};
+
+#define N_SUPPORTED_FORMATS_SYNC \
+	(sizeof(supported_formats_sync) / sizeof(supported_formats_sync0))
+
+static bool
+lookup_format_info_from_spa_format(uint32_t spa_format,
+				 struct format_data *out_format_data)
 {
 	for (size_t i = 0; i < N_SUPPORTED_FORMATS; i++) {
 		if (supported_formatsi.spa_format != spa_format)
 			continue;
 
-		if (out_drm_format)
-			*out_drm_format = supported_formatsi.drm_format;
-		if (out_gs_format)
-			*out_gs_format = supported_formatsi.gs_format;
-		if (out_swap_red_blue)
-			*out_swap_red_blue = supported_formatsi.swap_red_blue;
+		if (out_format_data)
+			*out_format_data = supported_formatsi;
+
 		return true;
 	}
 	return false;
@@ -384,16 +441,17 @@
 	return spa_pod_builder_pop(b, &format_frame);
 }
 
-static bool build_format_params(obs_pipewire *obs_pw,
+static bool build_format_params(obs_pipewire_stream *obs_pw_stream,
 				struct spa_pod_builder *pod_builder,
 				const struct spa_pod ***param_list,
 				uint32_t *n_params)
 {
+	obs_pipewire *obs_pw = obs_pw_stream->obs_pw;
 	uint32_t params_count = 0;
 
 	const struct spa_pod **params;
-	params =
-		bzalloc(2 * obs_pw->format_info.num * sizeof(struct spa_pod *));
+	params = bzalloc(2 * obs_pw_stream->format_info.num *
+			 sizeof(struct spa_pod *));
 
 	if (!params) {
 		blog(LOG_ERROR,
@@ -404,22 +462,23 @@
 	if (!check_pw_version(&obs_pw->server_version, 0, 3, 33))
 		goto build_shm;
 
-	for (size_t i = 0; i < obs_pw->format_info.num; i++) {
-		if (obs_pw->format_info.arrayi.modifiers.num == 0) {
+	for (size_t i = 0; i < obs_pw_stream->format_info.num; i++) {
+		if (obs_pw_stream->format_info.arrayi.modifiers.num == 0) {
 			continue;
 		}
 		paramsparams_count++ = build_format(
-			pod_builder, &obs_pw->video_info,
-			obs_pw->format_info.arrayi.spa_format,
-			obs_pw->format_info.arrayi.modifiers.array,
-			obs_pw->format_info.arrayi.modifiers.num);
+			pod_builder, &obs_pw_stream->video_info,
+			obs_pw_stream->format_info.arrayi.spa_format,
+			obs_pw_stream->format_info.arrayi.modifiers.array,
+			obs_pw_stream->format_info.arrayi.modifiers.num);
 	}
 
 build_shm:
-	for (size_t i = 0; i < obs_pw->format_info.num; i++) {
+	for (size_t i = 0; i < obs_pw_stream->format_info.num; i++) {
 		paramsparams_count++ = build_format(
-			pod_builder, &obs_pw->video_info,
-			obs_pw->format_info.arrayi.spa_format, NULL, 0);
+			pod_builder, &obs_pw_stream->video_info,
+			obs_pw_stream->format_info.arrayi.spa_format, NULL,
+			0);
 	}
 	*param_list = params;
 	*n_params = params_count;
@@ -437,37 +496,59 @@
 	return false;
 }
 
-static void init_format_info(obs_pipewire *obs_pw)
+static void init_format_info_async(obs_pipewire_stream *obs_pw_stream)
 {
-	da_init(obs_pw->format_info);
+	da_init(obs_pw_stream->format_info);
+
+	for (size_t i = 0; i < N_SUPPORTED_FORMATS_ASYNC; i++) {
+		struct format_data format_data;
+		struct format_info *info;
+		if (!lookup_format_info_from_spa_format(
+			 supported_formats_asynci, &format_data))
+			continue;
+
+		info = da_push_back_new(obs_pw_stream->format_info);
+		da_init(info->modifiers);
+		info->spa_format = format_data.spa_format;
+		info->drm_format = format_data.drm_format;
+	}
+}
+
+static void init_format_info_sync(obs_pipewire_stream *obs_pw_stream)
+{
+	da_init(obs_pw_stream->format_info);
 
 	obs_enter_graphics();
 
 	enum gs_dmabuf_flags dmabuf_flags;
 	uint32_t *drm_formats = NULL;
-	size_t n_drm_formats;
+	size_t n_drm_formats = 0;
 
 	bool capabilities_queried = gs_query_dmabuf_capabilities(
 		&dmabuf_flags, &drm_formats, &n_drm_formats);
 
-	for (size_t i = 0; i < N_SUPPORTED_FORMATS; i++) {
+	for (size_t i = 0; i < N_SUPPORTED_FORMATS_SYNC; i++) {
+		struct format_data format_data;
 		struct format_info *info;
+		if (!lookup_format_info_from_spa_format(
+			 supported_formats_synci, &format_data) ||
+		 format_data.gs_format == GS_UNKNOWN)
+			continue;
 
-		info = da_push_back_new(obs_pw->format_info);
+		info = da_push_back_new(obs_pw_stream->format_info);
 		da_init(info->modifiers);
-		info->spa_format = supported_formatsi.spa_format;
-		info->drm_format = supported_formatsi.drm_format;
+		info->spa_format = format_data.spa_format;
+		info->drm_format = format_data.drm_format;
 
 		if (!capabilities_queried ||
-		 !drm_format_available(supported_formatsi.drm_format,
-					 drm_formats, n_drm_formats))
+		 !drm_format_available(format_data.drm_format, drm_formats,
+					 n_drm_formats))
 			continue;
 
 		size_t n_modifiers;
 		uint64_t *modifiers = NULL;
 		if (gs_query_dmabuf_modifiers_for_format(
-			 supported_formatsi.drm_format, &modifiers,
-			 &n_modifiers)) {
+			 format_data.drm_format, &modifiers, &n_modifiers)) {
 			da_push_back_array(info->modifiers, modifiers,
 					 n_modifiers);
 		}
@@ -484,34 +565,56 @@
 	bfree(drm_formats);
 }
 
-static void clear_format_info(obs_pipewire *obs_pw)
+static void init_format_info(obs_pipewire_stream *obs_pw_stream)
+{
+	uint32_t output_flags;
+
+	output_flags = obs_source_get_output_flags(obs_pw_stream->source);
+
+	if (output_flags & OBS_SOURCE_VIDEO) {
+		if (output_flags & OBS_SOURCE_ASYNC)
+			init_format_info_async(obs_pw_stream);
+		else
+			init_format_info_sync(obs_pw_stream);
+	}
+}
+
+static void clear_format_info(obs_pipewire_stream *obs_pw_stream)
 {
-	for (size_t i = 0; i < obs_pw->format_info.num; i++) {
-		da_free(obs_pw->format_info.arrayi.modifiers);
+	for (size_t i = 0; i < obs_pw_stream->format_info.num; i++) {
+		da_free(obs_pw_stream->format_info.arrayi.modifiers);
 	}
-	da_free(obs_pw->format_info);
+	da_free(obs_pw_stream->format_info);
 }
 
-static void remove_modifier_from_format(obs_pipewire *obs_pw,
+static void remove_modifier_from_format(obs_pipewire_stream *obs_pw_stream,
 					uint32_t spa_format, uint64_t modifier)
 {
-	for (size_t i = 0; i < obs_pw->format_info.num; i++) {
-		if (obs_pw->format_info.arrayi.spa_format != spa_format)
+	obs_pipewire *obs_pw = obs_pw_stream->obs_pw;
+
+	for (size_t i = 0; i < obs_pw_stream->format_info.num; i++) {
+		if (obs_pw_stream->format_info.arrayi.spa_format !=
+		 spa_format)
 			continue;
 
 		if (!check_pw_version(&obs_pw->server_version, 0, 3, 40)) {
 			da_erase_range(
-				obs_pw->format_info.arrayi.modifiers, 0,
-				obs_pw->format_info.arrayi.modifiers.num - 1);
+				obs_pw_stream->format_info.arrayi.modifiers,
+				0,
+				obs_pw_stream->format_info.arrayi
+						.modifiers.num -
+					1);
 			continue;
 		}
 
-		int idx = da_find(obs_pw->format_info.arrayi.modifiers,
+		int idx = da_find(obs_pw_stream->format_info.arrayi.modifiers,
 				 &modifier, 0);
 		while (idx != -1) {
-			da_erase(obs_pw->format_info.arrayi.modifiers, idx);
-			idx = da_find(obs_pw->format_info.arrayi.modifiers,
-				 &modifier, 0);
+			da_erase(obs_pw_stream->format_info.arrayi.modifiers,
+				 idx);
+			idx = da_find(
+				obs_pw_stream->format_info.arrayi.modifiers,
+				&modifier, 0);
 		}
 	}
 }
@@ -519,55 +622,169 @@
 static void renegotiate_format(void *data, uint64_t expirations)
 {
 	UNUSED_PARAMETER(expirations);
-	obs_pipewire *obs_pw = (obs_pipewire *)data;
+	obs_pipewire_stream *obs_pw_stream = (obs_pipewire_stream *)data;
+	obs_pipewire *obs_pw = obs_pw_stream->obs_pw;
 	const struct spa_pod **params = NULL;
 
 	blog(LOG_INFO, "pipewire Renegotiating stream");
 
 	pw_thread_loop_lock(obs_pw->thread_loop);
 
-	uint8_t params_buffer2048;
+	uint8_t params_buffer4096;
 	struct spa_pod_builder pod_builder =
 		SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
 	uint32_t n_params;
-	if (!build_format_params(obs_pw, &pod_builder, &params, &n_params)) {
+	if (!build_format_params(obs_pw_stream, &pod_builder, &params,
+				 &n_params)) {
 		teardown_pipewire(obs_pw);
 		pw_thread_loop_unlock(obs_pw->thread_loop);
 		return;
 	}
 
-	pw_stream_update_params(obs_pw->stream, params, n_params);
+	pw_stream_update_params(obs_pw_stream->stream, params, n_params);
 	pw_thread_loop_unlock(obs_pw->thread_loop);
 	bfree(params);
 }
 
 /* ------------------------------------------------- */
 
-static void on_process_cb(void *user_data)
+static inline struct pw_buffer *find_latest_buffer(struct pw_stream *stream)
 {
-	obs_pipewire *obs_pw = user_data;
-	struct spa_meta_cursor *cursor;
-	uint32_t drm_format;
-	struct spa_meta_header *header;
-	struct spa_meta_region *region;
-	struct spa_meta_videotransform *video_transform;
-	struct spa_buffer *buffer;
 	struct pw_buffer *b;
-	bool swap_red_blue = false;
-	bool has_buffer = true;
 
 	/* Find the most recent buffer */
 	b = NULL;
 	while (true) {
-		struct pw_buffer *aux =
-			pw_stream_dequeue_buffer(obs_pw->stream);
+		struct pw_buffer *aux = pw_stream_dequeue_buffer(stream);
 		if (!aux)
 			break;
 		if (b)
-			pw_stream_queue_buffer(obs_pw->stream, b);
+			pw_stream_queue_buffer(stream, b);
 		b = aux;
 	}
 
+	return b;
+}
+
+static enum video_colorspace
+video_colorspace_from_spa_color_matrix(enum spa_video_color_matrix matrix)
+{
+	switch (matrix) {
+	case SPA_VIDEO_COLOR_MATRIX_RGB:
+		return VIDEO_CS_DEFAULT;
+	case SPA_VIDEO_COLOR_MATRIX_BT601:
+		return VIDEO_CS_601;
+	case SPA_VIDEO_COLOR_MATRIX_BT709:
+		return VIDEO_CS_709;
+	default:
+		return VIDEO_CS_DEFAULT;
+	}
+}
+
+static enum video_range_type
+video_color_range_from_spa_color_range(enum spa_video_color_range colorrange)
+{
+	switch (colorrange) {
+	case SPA_VIDEO_COLOR_RANGE_0_255:
+		return VIDEO_RANGE_FULL;
+	case SPA_VIDEO_COLOR_RANGE_16_235:
+		return VIDEO_RANGE_PARTIAL;
+	default:
+		return VIDEO_RANGE_DEFAULT;
+	}
+}
+
+static bool prepare_obs_frame(obs_pipewire_stream *obs_pw_stream,
+			 struct obs_source_frame *frame)
+{
+	struct format_data format_data;
+
+	frame->width = obs_pw_stream->format.info.raw.size.width;
+	frame->height = obs_pw_stream->format.info.raw.size.height;
+
+	video_format_get_parameters(
+		video_colorspace_from_spa_color_matrix(
+			obs_pw_stream->format.info.raw.color_matrix),
+		video_color_range_from_spa_color_range(
+			obs_pw_stream->format.info.raw.color_range),
+		frame->color_matrix, frame->color_range_min,
+		frame->color_range_max);
+
+	if (!lookup_format_info_from_spa_format(
+		 obs_pw_stream->format.info.raw.format, &format_data) ||
+	 format_data.video_format == VIDEO_FORMAT_NONE)
+		return false;
+
+	frame->format = format_data.video_format;
+	frame->linesize0 = SPA_ROUND_UP_N(frame->width * format_data.bpp, 4);
+	return true;
+}
+
+static void process_video_async(obs_pipewire_stream *obs_pw_stream)
+{
+	struct spa_buffer *buffer;
+	struct pw_buffer *b;
+	bool has_buffer;
+
+	b = find_latest_buffer(obs_pw_stream->stream);
+	if (!b) {
+		blog(LOG_DEBUG, "pipewire Out of buffers!");
+		return;
+	}
+
+	buffer = b->buffer;
+	has_buffer = buffer->datas0.chunk->size != 0;
+
+	if (!has_buffer)
+		goto done;
+
+#ifdef DEBUG_PIPEWIRE
+	blog(LOG_DEBUG, "pipewire Buffer has memory texture");
+#endif
+
+	struct obs_source_frame out = {0};
+	if (!prepare_obs_frame(obs_pw_stream, &out)) {
+		blog(LOG_ERROR, "pipewire Couldn't prepare frame");
+		goto done;
+	}
+
+	for (uint32_t i = 0; i < buffer->n_datas && i < MAX_AV_PLANES; i++) {
+		out.datai = buffer->datasi.data;
+		if (out.datai == NULL) {
+			blog(LOG_ERROR, "pipewire Failed to access data");
+			goto done;
+		}
+	}
+
+#ifdef DEBUG_PIPEWIRE
+	blog(LOG_DEBUG, "pipewire Frame info: Format: %s, Planes: %u",
+	 get_video_format_name(out.format), buffer->n_datas);
+	for (uint32_t i = 0; i < buffer->n_datas && i < MAX_AV_PLANES; i++) {
+		blog(LOG_DEBUG, "pipewire Plane %u: Dataptr:%p, Linesize:%d",
+		 i, out.datai, out.linesizei);
+	}
+#endif
+
+	obs_source_output_video(obs_pw_stream->source, &out);
+
+done:
+	pw_stream_queue_buffer(obs_pw_stream->stream, b);
+}
+
+static void process_video_sync(obs_pipewire_stream *obs_pw_stream)
+{
+	obs_pipewire *obs_pw = obs_pw_stream->obs_pw;
+	struct spa_meta_cursor *cursor;
+	uint32_t drm_format;
+	struct spa_meta_header *header;
+	struct spa_meta_region *region;
+	struct spa_meta_videotransform *video_transform;
+	struct format_data format_data;
+	struct spa_buffer *buffer;
+	struct pw_buffer *b;
+	bool has_buffer = true;
+
+	b = find_latest_buffer(obs_pw_stream->stream);
 	if (!b) {
 		blog(LOG_DEBUG, "pipewire Out of buffers!");
 		return;
@@ -578,7 +795,7 @@
 					 sizeof(*header));
 	if (header && (header->flags & SPA_META_HEADER_FLAG_CORRUPTED) > 0) {
 		blog(LOG_ERROR, "pipewire buffer is corrupt");
-		pw_stream_queue_buffer(obs_pw->stream, b);
+		pw_stream_queue_buffer(obs_pw_stream->stream, b);
 		return;
 	}
 
@@ -593,10 +810,10 @@
 
 	if (buffer->datas0.type == SPA_DATA_DmaBuf) {
 		uint32_t planes = buffer->n_datas;
-		uint32_t offsetsplanes;
-		uint32_t stridesplanes;
-		uint64_t modifiersplanes;
-		int fdsplanes;
+		uint32_t *offsets = alloca(sizeof(uint32_t) * planes);
+		uint32_t *strides = alloca(sizeof(uint32_t) * planes);
+		uint64_t *modifiers = alloca(sizeof(uint64_t) * planes);
+		int *fds = alloca(sizeof(int) * planes);
 		bool use_modifiers;
 		bool corrupt = false;
 
@@ -605,16 +822,17 @@
 		 "pipewire DMA-BUF info: fd:%ld, stride:%d, offset:%u, size:%dx%d",
 		 buffer->datas0.fd, buffer->datas0.chunk->stride,
 		 buffer->datas0.chunk->offset,
-		 obs_pw->format.info.raw.size.width,
-		 obs_pw->format.info.raw.size.height);
+		 obs_pw_stream->format.info.raw.size.width,
+		 obs_pw_stream->format.info.raw.size.height);
 #endif
 
 		if (!lookup_format_info_from_spa_format(
-			 obs_pw->format.info.raw.format, &drm_format, NULL,
-			 NULL)) {
+			 obs_pw_stream->format.info.raw.format,
+			 &format_data) ||
+		 format_data.gs_format == GS_UNKNOWN) {
 			blog(LOG_ERROR,
 			 "pipewire unsupported DMA buffer format: %d",
-			 obs_pw->format.info.raw.format);
+			 obs_pw_stream->format.info.raw.format);
 			goto read_metadata;
 		}
 
@@ -622,7 +840,8 @@
 			fdsplane = buffer->datasplane.fd;
 			offsetsplane = buffer->datasplane.chunk->offset;
 			stridesplane = buffer->datasplane.chunk->stride;
-			modifiersplane = obs_pw->format.info.raw.modifier;
+			modifiersplane =
+				obs_pw_stream->format.info.raw.modifier;
 			corrupt |= (buffer->datasplane.chunk->flags &
 				 SPA_CHUNK_FLAG_CORRUPTED) > 0;
 		}
@@ -633,34 +852,36 @@
 			goto read_metadata;
 		}
 
-		g_clear_pointer(&obs_pw->texture, gs_texture_destroy);
+		g_clear_pointer(&obs_pw_stream->texture, gs_texture_destroy);
 
-		use_modifiers = obs_pw->format.info.raw.modifier !=
+		use_modifiers = obs_pw_stream->format.info.raw.modifier !=
 				DRM_FORMAT_MOD_INVALID;
-		obs_pw->texture = gs_texture_create_from_dmabuf(
-			obs_pw->format.info.raw.size.width,
-			obs_pw->format.info.raw.size.height, drm_format,
-			GS_BGRX, planes, fds, strides, offsets,
-			use_modifiers ? modifiers : NULL);
+		obs_pw_stream->texture = gs_texture_create_from_dmabuf(
+			obs_pw_stream->format.info.raw.size.width,
+			obs_pw_stream->format.info.raw.size.height,
+			format_data.drm_format, GS_BGRX, planes, fds, strides,
+			offsets, use_modifiers ? modifiers : NULL);
 
-		if (obs_pw->texture == NULL) {
+		if (obs_pw_stream->texture == NULL) {
 			remove_modifier_from_format(
-				obs_pw, obs_pw->format.info.raw.format,
-				obs_pw->format.info.raw.modifier);
+				obs_pw_stream,
+				obs_pw_stream->format.info.raw.format,
+				obs_pw_stream->format.info.raw.modifier);
 			pw_loop_signal_event(
 				pw_thread_loop_get_loop(obs_pw->thread_loop),
-				obs_pw->reneg);
+				obs_pw_stream->reneg);
+			goto read_metadata;
 		}
 	} else {
 		blog(LOG_DEBUG, "pipewire Buffer has memory texture");
-		enum gs_color_format gs_format;
 
 		if (!lookup_format_info_from_spa_format(
-			 obs_pw->format.info.raw.format, NULL, &gs_format,
-			 &swap_red_blue)) {
+			 obs_pw_stream->format.info.raw.format,
+			 &format_data) ||
+		 format_data.gs_format == GS_UNKNOWN) {
 			blog(LOG_ERROR,
 			 "pipewire unsupported buffer format: %d",
-			 obs_pw->format.info.raw.format);
+			 obs_pw_stream->format.info.raw.format);
 			goto read_metadata;
 		}
 
@@ -677,15 +898,16 @@
 			goto read_metadata;
 		}
 
-		g_clear_pointer(&obs_pw->texture, gs_texture_destroy);
-		obs_pw->texture = gs_texture_create(
-			obs_pw->format.info.raw.size.width,
-			obs_pw->format.info.raw.size.height, gs_format, 1,
+		g_clear_pointer(&obs_pw_stream->texture, gs_texture_destroy);
+		obs_pw_stream->texture = gs_texture_create(
+			obs_pw_stream->format.info.raw.size.width,
+			obs_pw_stream->format.info.raw.size.height,
+			format_data.gs_format, 1,
 			(const uint8_t **)&buffer->datas0.data, GS_DYNAMIC);
 	}
 
-	if (swap_red_blue)
-		swap_texture_red_blue(obs_pw->texture);
+	if (format_data.swap_red_blue)
+		swap_texture_red_blue(obs_pw_stream->texture);
 
 	/* Video Crop */
 	region = spa_buffer_find_meta_data(buffer, SPA_META_VideoCrop,
@@ -698,123 +920,150 @@
 		 region->region.size.width, region->region.size.height);
 #endif
 
-		obs_pw->crop.x = region->region.position.x;
-		obs_pw->crop.y = region->region.position.y;
-		obs_pw->crop.width = region->region.size.width;
-		obs_pw->crop.height = region->region.size.height;
-		obs_pw->crop.valid = true;
+		obs_pw_stream->crop.x = region->region.position.x;
+		obs_pw_stream->crop.y = region->region.position.y;
+		obs_pw_stream->crop.width = region->region.size.width;
+		obs_pw_stream->crop.height = region->region.size.height;
+		obs_pw_stream->crop.valid = true;
 	} else {
-		obs_pw->crop.valid = false;
+		obs_pw_stream->crop.valid = false;
 	}
 
 	/* Video Transform */
 	video_transform = spa_buffer_find_meta_data(
 		buffer, SPA_META_VideoTransform, sizeof(*video_transform));
 	if (video_transform)
-		obs_pw->transform = video_transform->transform;
+		obs_pw_stream->transform = video_transform->transform;
 	else
-		obs_pw->transform = SPA_META_TRANSFORMATION_None;
+		obs_pw_stream->transform = SPA_META_TRANSFORMATION_None;
 
 read_metadata:
 
 	/* Cursor */
 	cursor = spa_buffer_find_meta_data(buffer, SPA_META_Cursor,
 					 sizeof(*cursor));
-	obs_pw->cursor.valid = cursor && spa_meta_cursor_is_valid(cursor);
-	if (obs_pw->cursor.visible && obs_pw->cursor.valid) {
+	obs_pw_stream->cursor.valid = cursor &&
+				 spa_meta_cursor_is_valid(cursor);
+	if (obs_pw_stream->cursor.visible && obs_pw_stream->cursor.valid) {
 		struct spa_meta_bitmap *bitmap = NULL;
-		enum gs_color_format gs_format;
 
 		if (cursor->bitmap_offset)
 			bitmap = SPA_MEMBER(cursor, cursor->bitmap_offset,
 					 struct spa_meta_bitmap);
 
 		if (bitmap)
-			g_clear_pointer(&obs_pw->cursor.texture,
+			g_clear_pointer(&obs_pw_stream->cursor.texture,
 					gs_texture_destroy);
 
 		if (bitmap && bitmap->size.width > 0 &&
 		 bitmap->size.height > 0 &&
-		 lookup_format_info_from_spa_format(
-			 bitmap->format, NULL, &gs_format, &swap_red_blue)) {
+		 lookup_format_info_from_spa_format(bitmap->format,
+						 &format_data) &&
+		 format_data.gs_format != GS_UNKNOWN) {
 			const uint8_t *bitmap_data;
 
 			bitmap_data =
 				SPA_MEMBER(bitmap, bitmap->offset, uint8_t);
-			obs_pw->cursor.hotspot_x = cursor->hotspot.x;
-			obs_pw->cursor.hotspot_y = cursor->hotspot.y;
-			obs_pw->cursor.width = bitmap->size.width;
-			obs_pw->cursor.height = bitmap->size.height;
-
-			assert(obs_pw->cursor.texture == NULL);
-			obs_pw->cursor.texture = gs_texture_create(
-				obs_pw->cursor.width, obs_pw->cursor.height,
-				gs_format, 1, &bitmap_data, GS_DYNAMIC);
-
-			if (swap_red_blue)
-				swap_texture_red_blue(obs_pw->cursor.texture);
+			obs_pw_stream->cursor.hotspot_x = cursor->hotspot.x;
+			obs_pw_stream->cursor.hotspot_y = cursor->hotspot.y;
+			obs_pw_stream->cursor.width = bitmap->size.width;
+			obs_pw_stream->cursor.height = bitmap->size.height;
+
+			assert(obs_pw_stream->cursor.texture == NULL);
+			obs_pw_stream->cursor.texture =
+				gs_texture_create(obs_pw_stream->cursor.width,
+						 obs_pw_stream->cursor.height,
+						 format_data.gs_format, 1,
+						 &bitmap_data, GS_DYNAMIC);
+
+			if (format_data.swap_red_blue)
+				swap_texture_red_blue(
+					obs_pw_stream->cursor.texture);
 		}
 
-		obs_pw->cursor.x = cursor->position.x;
-		obs_pw->cursor.y = cursor->position.y;
+		obs_pw_stream->cursor.x = cursor->position.x;
+		obs_pw_stream->cursor.y = cursor->position.y;
 	}
 
-	pw_stream_queue_buffer(obs_pw->stream, b);
+	pw_stream_queue_buffer(obs_pw_stream->stream, b);
 
 	obs_leave_graphics();
 }
 
+static void on_process_cb(void *user_data)
+{
+	obs_pipewire_stream *obs_pw_stream = user_data;
+	uint32_t output_flags;
+
+	output_flags = obs_source_get_output_flags(obs_pw_stream->source);
+
+	if (output_flags & OBS_SOURCE_VIDEO) {
+		if (output_flags & OBS_SOURCE_ASYNC)
+			process_video_async(obs_pw_stream);
+		else
+			process_video_sync(obs_pw_stream);
+	}
+}
+
 static void on_param_changed_cb(void *user_data, uint32_t id,
 				const struct spa_pod *param)
 {
-	obs_pipewire *obs_pw = user_data;
+	obs_pipewire_stream *obs_pw_stream = user_data;
+	obs_pipewire *obs_pw = obs_pw_stream->obs_pw;
 	struct spa_pod_builder pod_builder;
 	const struct spa_pod *params5;
+	const char *format_name;
 	uint32_t n_params = 0;
 	uint32_t buffer_types;
+	uint32_t output_flags;
 	uint8_t params_buffer1024;
 	int result;
 
 	if (!param || id != SPA_PARAM_Format)
 		return;
 
-	result = spa_format_parse(param, &obs_pw->format.media_type,
-				 &obs_pw->format.media_subtype);
+	result = spa_format_parse(param, &obs_pw_stream->format.media_type,
+				 &obs_pw_stream->format.media_subtype);
 	if (result < 0)
 		return;
 
-	if (obs_pw->format.media_type != SPA_MEDIA_TYPE_video ||
-	 obs_pw->format.media_subtype != SPA_MEDIA_SUBTYPE_raw)
+	if (obs_pw_stream->format.media_type != SPA_MEDIA_TYPE_video ||
+	 obs_pw_stream->format.media_subtype != SPA_MEDIA_SUBTYPE_raw)
 		return;
 
-	spa_format_video_raw_parse(param, &obs_pw->format.info.raw);
+	spa_format_video_raw_parse(param, &obs_pw_stream->format.info.raw);
+
+	output_flags = obs_source_get_output_flags(obs_pw_stream->source);
 
 	buffer_types = 1 << SPA_DATA_MemPtr;
 	bool has_modifier =
 		spa_pod_find_prop(param, NULL, SPA_FORMAT_VIDEO_modifier) !=
 		NULL;
-	if (has_modifier || check_pw_version(&obs_pw->server_version, 0, 3, 24))
+	if ((has_modifier ||
+	 check_pw_version(&obs_pw->server_version, 0, 3, 24)) &&
+	 (output_flags & OBS_SOURCE_ASYNC_VIDEO) != OBS_SOURCE_ASYNC_VIDEO)
 		buffer_types |= 1 << SPA_DATA_DmaBuf;
 
 	blog(LOG_INFO, "pipewire Negotiated format:");
 
+	format_name = spa_debug_type_find_name(
+		spa_type_video_format, obs_pw_stream->format.info.raw.format);
 	blog(LOG_INFO, "pipewire Format: %d (%s)",
-	 obs_pw->format.info.raw.format,
-	 spa_debug_type_find_name(spa_type_video_format,
-				 obs_pw->format.info.raw.format));
+	 obs_pw_stream->format.info.raw.format,
+	 format_name ? format_name : "unknown format");
 
 	if (has_modifier) {
 		blog(LOG_INFO, "pipewire Modifier: 0x%" PRIx64,
-		 obs_pw->format.info.raw.modifier);
+		 obs_pw_stream->format.info.raw.modifier);
 	}
 
 	blog(LOG_INFO, "pipewire Size: %dx%d",
-	 obs_pw->format.info.raw.size.width,
-	 obs_pw->format.info.raw.size.height);
+	 obs_pw_stream->format.info.raw.size.width,
+	 obs_pw_stream->format.info.raw.size.height);
 
 	blog(LOG_INFO, "pipewire Framerate: %d/%d",
-	 obs_pw->format.info.raw.framerate.num,
-	 obs_pw->format.info.raw.framerate.denom);
+	 obs_pw_stream->format.info.raw.framerate.num,
+	 obs_pw_stream->format.info.raw.framerate.denom);
 
 	/* Video crop */
 	pod_builder =
@@ -857,9 +1106,8 @@
 			SPA_POD_Int(sizeof(struct spa_meta_videotransform)));
 	}
 #endif
-	pw_stream_update_params(obs_pw->stream, params, n_params);
-
-	obs_pw->negotiated = true;
+	pw_stream_update_params(obs_pw_stream->stream, params, n_params);
+	obs_pw_stream->negotiated = true;
 }
 
 static void on_state_changed_cb(void *user_data, enum pw_stream_state old,
@@ -867,10 +1115,10 @@
 {
 	UNUSED_PARAMETER(old);
 
-	obs_pipewire *obs_pw = user_data;
+	obs_pipewire_stream *obs_pw_stream = user_data;
 
 	blog(LOG_INFO, "pipewire Stream %p state: \"%s\" (error: %s)",
-	 obs_pw->stream, pw_stream_state_as_string(state),
+	 obs_pw_stream->stream, pw_stream_state_as_string(state),
 	 error ? error : "none");
 }
 
@@ -922,9 +1170,6 @@
 
 	obs_pw = bzalloc(sizeof(obs_pipewire));
 	obs_pw->pipewire_fd = pipewire_fd;
-
-	init_format_info(obs_pw);
-
 	obs_pw->thread_loop = pw_thread_loop_new("PipeWire thread loop", NULL);
 	obs_pw->context = pw_context_new(
 		pw_thread_loop_get_loop(obs_pw->thread_loop), NULL, 0);
@@ -957,6 +1202,8 @@
 	pw_thread_loop_wait(obs_pw->thread_loop);
 	pw_thread_loop_unlock(obs_pw->thread_loop);
 
+	obs_pw->streams = g_ptr_array_new();
+
 	return obs_pw;
 }
 
@@ -965,138 +1212,162 @@
 	if (!obs_pw)
 		return;
 
+	while (obs_pw->streams->len > 0) {
+		obs_pipewire_stream *obs_pw_stream =
+			g_ptr_array_index(obs_pw->streams, 0);
+		obs_pipewire_stream_destroy(obs_pw_stream);
+	}
+	g_clear_pointer(&obs_pw->streams, g_ptr_array_unref);
 	teardown_pipewire(obs_pw);
-	destroy_session(obs_pw);
-
-	clear_format_info(obs_pw);
-
 	bfree(obs_pw);
 }
 
-void obs_pipewire_connect_stream(obs_pipewire *obs_pw, int pipewire_node,
-				 const char *stream_name,
-				 struct pw_properties *stream_properties)
+obs_pipewire_stream *
+obs_pipewire_connect_stream(obs_pipewire *obs_pw, obs_source_t *source,
+			 int pipewire_node, const char *stream_name,
+			 struct pw_properties *stream_properties)
 {
 	struct spa_pod_builder pod_builder;
 	const struct spa_pod **params = NULL;
+	obs_pipewire_stream *obs_pw_stream;
 	uint32_t n_params;
-	uint8_t params_buffer2048;
+	uint8_t params_buffer4096;
+
+	obs_pw_stream = bzalloc(sizeof(obs_pipewire_stream));
+	obs_pw_stream->obs_pw = obs_pw;
+	obs_pw_stream->source = source;
+
+	init_format_info(obs_pw_stream);
 
 	pw_thread_loop_lock(obs_pw->thread_loop);
 
 	/* Signal to renegotiate */
-	obs_pw->reneg =
+	obs_pw_stream->reneg =
 		pw_loop_add_event(pw_thread_loop_get_loop(obs_pw->thread_loop),
-				 renegotiate_format, obs_pw);
-	blog(LOG_DEBUG, "pipewire registered event %p", obs_pw->reneg);
+				 renegotiate_format, obs_pw_stream);
+	blog(LOG_DEBUG, "pipewire registered event %p", obs_pw_stream->reneg);
 
 	/* Stream */
-	obs_pw->stream =
+	obs_pw_stream->stream =
 		pw_stream_new(obs_pw->core, stream_name, stream_properties);
-	pw_stream_add_listener(obs_pw->stream, &obs_pw->stream_listener,
-			 &stream_events, obs_pw);
-	blog(LOG_INFO, "pipewire Created stream %p", obs_pw->stream);
+	pw_stream_add_listener(obs_pw_stream->stream,
+			 &obs_pw_stream->stream_listener, &stream_events,
+			 obs_pw_stream);
+	blog(LOG_INFO, "pipewire Created stream %p", obs_pw_stream->stream);
 
 	/* Stream parameters */
 	pod_builder =
 		SPA_POD_BUILDER_INIT(params_buffer, sizeof(params_buffer));
 
-	obs_get_video_info(&obs_pw->video_info);
+	obs_get_video_info(&obs_pw_stream->video_info);
 
-	if (!build_format_params(obs_pw, &pod_builder, &params, &n_params)) {
+	if (!build_format_params(obs_pw_stream, &pod_builder, &params,
+				 &n_params)) {
 		pw_thread_loop_unlock(obs_pw->thread_loop);
-		return;
+		bfree(obs_pw_stream);
+		return NULL;
 	}
 
-	pw_stream_connect(obs_pw->stream, PW_DIRECTION_INPUT, pipewire_node,
-			 PW_STREAM_FLAG_AUTOCONNECT |
-				 PW_STREAM_FLAG_MAP_BUFFERS,
-			 params, n_params);
+	pw_stream_connect(
+		obs_pw_stream->stream, PW_DIRECTION_INPUT, pipewire_node,
+		PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_MAP_BUFFERS, params,
+		n_params);
 
-	blog(LOG_INFO, "pipewire Playing stream %p", obs_pw->stream);
+	blog(LOG_INFO, "pipewire Playing stream %p", obs_pw_stream->stream);
 
 	pw_thread_loop_unlock(obs_pw->thread_loop);
 	bfree(params);
+
+	g_ptr_array_add(obs_pw->streams, obs_pw_stream);
+
+	return obs_pw_stream;
 }
 
-void obs_pipewire_show(obs_pipewire *obs_pw)
+void obs_pipewire_stream_show(obs_pipewire_stream *obs_pw_stream)
 {
-	if (obs_pw->stream)
-		pw_stream_set_active(obs_pw->stream, true);
+	if (obs_pw_stream->stream) {
+		pw_thread_loop_lock(obs_pw_stream->obs_pw->thread_loop);
+		pw_stream_set_active(obs_pw_stream->stream, true);
+		pw_thread_loop_unlock(obs_pw_stream->obs_pw->thread_loop);
+	}
 }
 
-void obs_pipewire_hide(obs_pipewire *obs_pw)
+void obs_pipewire_stream_hide(obs_pipewire_stream *obs_pw_stream)
 {
-	if (obs_pw->stream)
-		pw_stream_set_active(obs_pw->stream, false);
+	if (obs_pw_stream->stream) {
+		pw_thread_loop_lock(obs_pw_stream->obs_pw->thread_loop);
+		pw_stream_set_active(obs_pw_stream->stream, false);
+		pw_thread_loop_unlock(obs_pw_stream->obs_pw->thread_loop);
+	}
 }
 
-uint32_t obs_pipewire_get_width(obs_pipewire *obs_pw)
+uint32_t obs_pipewire_stream_get_width(obs_pipewire_stream *obs_pw_stream)
 {
 	bool has_crop;
 
-	if (!obs_pw->negotiated)
+	if (!obs_pw_stream->negotiated)
 		return 0;
 
-	has_crop = has_effective_crop(obs_pw);
+	has_crop = has_effective_crop(obs_pw_stream);
 
-	switch (obs_pw->transform) {
+	switch (obs_pw_stream->transform) {
 	case SPA_META_TRANSFORMATION_Flipped:
 	case SPA_META_TRANSFORMATION_None:
 	case SPA_META_TRANSFORMATION_Flipped180:
 	case SPA_META_TRANSFORMATION_180:
-		return has_crop ? obs_pw->crop.width
-				: obs_pw->format.info.raw.size.width;
+		return has_crop ? obs_pw_stream->crop.width
+				: obs_pw_stream->format.info.raw.size.width;
 	case SPA_META_TRANSFORMATION_Flipped90:
 	case SPA_META_TRANSFORMATION_90:
 	case SPA_META_TRANSFORMATION_Flipped270:
 	case SPA_META_TRANSFORMATION_270:
-		return has_crop ? obs_pw->crop.height
-				: obs_pw->format.info.raw.size.height;
+		return has_crop ? obs_pw_stream->crop.height
+				: obs_pw_stream->format.info.raw.size.height;
 	}
 }
 
-uint32_t obs_pipewire_get_height(obs_pipewire *obs_pw)
+uint32_t obs_pipewire_stream_get_height(obs_pipewire_stream *obs_pw_stream)
 {
 	bool has_crop;
 
-	if (!obs_pw->negotiated)
+	if (!obs_pw_stream->negotiated)
 		return 0;
 
-	has_crop = has_effective_crop(obs_pw);
+	has_crop = has_effective_crop(obs_pw_stream);
 
-	switch (obs_pw->transform) {
+	switch (obs_pw_stream->transform) {
 	case SPA_META_TRANSFORMATION_Flipped:
 	case SPA_META_TRANSFORMATION_None:
 	case SPA_META_TRANSFORMATION_Flipped180:
 	case SPA_META_TRANSFORMATION_180:
-		return has_crop ? obs_pw->crop.height
-				: obs_pw->format.info.raw.size.height;
+		return has_crop ? obs_pw_stream->crop.height
+				: obs_pw_stream->format.info.raw.size.height;
 	case SPA_META_TRANSFORMATION_Flipped90:
 	case SPA_META_TRANSFORMATION_90:
 	case SPA_META_TRANSFORMATION_Flipped270:
 	case SPA_META_TRANSFORMATION_270:
-		return has_crop ? obs_pw->crop.width
-				: obs_pw->format.info.raw.size.width;
+		return has_crop ? obs_pw_stream->crop.width
+				: obs_pw_stream->format.info.raw.size.width;
 	}
 }
 
-void obs_pipewire_video_render(obs_pipewire *obs_pw, gs_effect_t *effect)
+void obs_pipewire_stream_video_render(obs_pipewire_stream *obs_pw_stream,
+				 gs_effect_t *effect)
 {
 	bool rotated;
 	int flip = 0;
 
 	gs_eparam_t *image;
 
-	if (!obs_pw->texture)
+	if (!obs_pw_stream->texture)
 		return;
 
 	image = gs_effect_get_param_by_name(effect, "image");
-	gs_effect_set_texture(image, obs_pw->texture);
+	gs_effect_set_texture(image, obs_pw_stream->texture);
 
-	rotated = push_rotation(obs_pw);
+	rotated = push_rotation(obs_pw_stream);
 
-	flip = get_buffer_flip(obs_pw);
+	flip = get_buffer_flip(obs_pw_stream);
 
 	/* There is a SPA_VIDEO_FLAG_PREMULTIPLIED_ALPHA flag, but it does not
 	 * seem to be fully implemented nor ever set. Just assume premultiplied
@@ -1109,28 +1380,33 @@
 	gs_blend_state_push();
 	gs_blend_function(GS_BLEND_ONE, GS_BLEND_INVSRCALPHA);
 
-	if (has_effective_crop(obs_pw)) {
-		gs_draw_sprite_subregion(obs_pw->texture, flip, obs_pw->crop.x,
-					 obs_pw->crop.y, obs_pw->crop.width,
-					 obs_pw->crop.height);
+	if (has_effective_crop(obs_pw_stream)) {
+		gs_draw_sprite_subregion(obs_pw_stream->texture, flip,
+					 obs_pw_stream->crop.x,
+					 obs_pw_stream->crop.y,
+					 obs_pw_stream->crop.width,
+					 obs_pw_stream->crop.height);
 	} else {
-		gs_draw_sprite(obs_pw->texture, flip, 0, 0);
+		gs_draw_sprite(obs_pw_stream->texture, flip, 0, 0);
 	}
 
 	if (rotated)
 		gs_matrix_pop();
 
-	if (obs_pw->cursor.visible && obs_pw->cursor.valid &&
-	 obs_pw->cursor.texture) {
-		float cursor_x = obs_pw->cursor.x - obs_pw->cursor.hotspot_x;
-		float cursor_y = obs_pw->cursor.y - obs_pw->cursor.hotspot_y;
+	if (obs_pw_stream->cursor.visible && obs_pw_stream->cursor.valid &&
+	 obs_pw_stream->cursor.texture) {
+		float cursor_x = obs_pw_stream->cursor.x -
+				 obs_pw_stream->cursor.hotspot_x;
+		float cursor_y = obs_pw_stream->cursor.y -
+				 obs_pw_stream->cursor.hotspot_y;
 
 		gs_matrix_push();
 		gs_matrix_translate3f(cursor_x, cursor_y, 0.0f);
 
-		gs_effect_set_texture(image, obs_pw->cursor.texture);
-		gs_draw_sprite(obs_pw->texture, 0, obs_pw->cursor.width,
-			 obs_pw->cursor.height);
+		gs_effect_set_texture(image, obs_pw_stream->cursor.texture);
+		gs_draw_sprite(obs_pw_stream->texture, 0,
+			 obs_pw_stream->cursor.width,
+			 obs_pw_stream->cursor.height);
 
 		gs_matrix_pop();
 	}
@@ -1138,7 +1414,36 @@
 	gs_blend_state_pop();
 }
 
-void obs_pipewire_set_cursor_visible(obs_pipewire *obs_pw, bool cursor_visible)
+void obs_pipewire_stream_set_cursor_visible(obs_pipewire_stream *obs_pw_stream,
+					 bool cursor_visible)
+{
+	obs_pw_stream->cursor.visible = cursor_visible;
+}
+
+void obs_pipewire_stream_destroy(obs_pipewire_stream *obs_pw_stream)
 {
-	obs_pw->cursor.visible = cursor_visible;
+	uint32_t output_flags;
+
+	if (!obs_pw_stream)
+		return;
+
+	output_flags = obs_source_get_output_flags(obs_pw_stream->source);
+	if (output_flags & OBS_SOURCE_ASYNC_VIDEO)
+		obs_source_output_video(obs_pw_stream->source, NULL);
+
+	g_ptr_array_remove(obs_pw_stream->obs_pw->streams, obs_pw_stream);
+
+	obs_enter_graphics();
+	g_clear_pointer(&obs_pw_stream->cursor.texture, gs_texture_destroy);
+	g_clear_pointer(&obs_pw_stream->texture, gs_texture_destroy);
+	obs_leave_graphics();
+
+	pw_thread_loop_lock(obs_pw_stream->obs_pw->thread_loop);
+	if (obs_pw_stream->stream)
+		pw_stream_disconnect(obs_pw_stream->stream);
+	g_clear_pointer(&obs_pw_stream->stream, pw_stream_destroy);
+	pw_thread_loop_unlock(obs_pw_stream->obs_pw->thread_loop);
+
+	clear_format_info(obs_pw_stream);
+	bfree(obs_pw_stream);
 }

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/pipewire.h -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/pipewire.h Changed

@@ -26,18 +26,23 @@
 #include <pipewire/properties.h>
 
 typedef struct _obs_pipewire obs_pipewire;
+typedef struct _obs_pipewire_stream obs_pipewire_stream;
 
 obs_pipewire *obs_pipewire_create(int pipewire_fd);
 void obs_pipewire_destroy(obs_pipewire *obs_pw);
 
-void obs_pipewire_connect_stream(obs_pipewire *obs_pw, int pipewire_node,
-				 const char *stream_name,
-				 struct pw_properties *stream_properties);
-
-void obs_pipewire_show(obs_pipewire *obs_pw);
-void obs_pipewire_hide(obs_pipewire *obs_pw);
-uint32_t obs_pipewire_get_width(obs_pipewire *obs_pw);
-uint32_t obs_pipewire_get_height(obs_pipewire *obs_pw);
-void obs_pipewire_video_render(obs_pipewire *obs_pw, gs_effect_t *effect);
-
-void obs_pipewire_set_cursor_visible(obs_pipewire *obs_pw, bool cursor_visible);
+obs_pipewire_stream *
+obs_pipewire_connect_stream(obs_pipewire *obs_pw, obs_source_t *source,
+			 int pipewire_node, const char *stream_name,
+			 struct pw_properties *stream_properties);
+
+void obs_pipewire_stream_show(obs_pipewire_stream *obs_pw);
+void obs_pipewire_stream_hide(obs_pipewire_stream *obs_pw);
+uint32_t obs_pipewire_stream_get_width(obs_pipewire_stream *obs_pw);
+uint32_t obs_pipewire_stream_get_height(obs_pipewire_stream *obs_pw);
+void obs_pipewire_stream_video_render(obs_pipewire_stream *obs_pw,
+				 gs_effect_t *effect);
+
+void obs_pipewire_stream_set_cursor_visible(obs_pipewire_stream *obs_pw,
+					 bool cursor_visible);
+void obs_pipewire_stream_destroy(obs_pipewire_stream *obs_pw_stream);

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/portal.c -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/portal.c Changed

@@ -23,6 +23,15 @@
 
 #include <util/dstr.h>
 
+struct portal_signal_call {
+	GCancellable *cancellable;
+	portal_signal_callback callback;
+	gpointer user_data;
+	char *request_path;
+	guint signal_id;
+	gulong cancelled_id;
+};
+
 #define REQUEST_PATH "/org/freedesktop/portal/desktop/request/%s/obs%u"
 #define SESSION_PATH "/org/freedesktop/portal/desktop/session/%s/obs%u"
 
@@ -121,3 +130,77 @@
 		bfree(sender_name);
 	}
 }
+
+static void portal_signal_call_free(struct portal_signal_call *call)
+{
+	if (call->signal_id)
+		g_dbus_connection_signal_unsubscribe(
+			portal_get_dbus_connection(), call->signal_id);
+
+	if (call->cancelled_id > 0)
+		g_signal_handler_disconnect(call->cancellable,
+					 call->cancelled_id);
+
+	g_clear_pointer(&call->request_path, bfree);
+	bfree(call);
+}
+
+static void on_cancelled_cb(GCancellable *cancellable, void *data)
+{
+	UNUSED_PARAMETER(cancellable);
+
+	struct portal_signal_call *call = data;
+
+	blog(LOG_INFO, "portals Request cancelled");
+
+	g_dbus_connection_call(
+		portal_get_dbus_connection(), "org.freedesktop.portal.Desktop",
+		call->request_path, "org.freedesktop.portal.Request", "Close",
+		NULL, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
+
+	portal_signal_call_free(call);
+}
+
+static void on_response_received_cb(GDBusConnection *connection,
+				 const char *sender_name,
+				 const char *object_path,
+				 const char *interface_name,
+				 const char *signal_name,
+				 GVariant *parameters, void *user_data)
+{
+	UNUSED_PARAMETER(connection);
+	UNUSED_PARAMETER(sender_name);
+	UNUSED_PARAMETER(object_path);
+	UNUSED_PARAMETER(interface_name);
+	UNUSED_PARAMETER(signal_name);
+
+	struct portal_signal_call *call = user_data;
+
+	if (call->callback)
+		call->callback(parameters, call->user_data);
+
+	portal_signal_call_free(call);
+}
+
+void portal_signal_subscribe(const char *path, GCancellable *cancellable,
+			 portal_signal_callback callback,
+			 gpointer user_data)
+{
+	struct portal_signal_call *call;
+
+	call = bzalloc(sizeof(struct portal_signal_call));
+	call->request_path = bstrdup(path);
+	call->callback = callback;
+	call->user_data = user_data;
+	call->cancellable = cancellable ? g_object_ref(cancellable) : NULL;
+	call->cancelled_id =
+		cancellable
+			? g_signal_connect(cancellable, "cancelled",
+					 G_CALLBACK(on_cancelled_cb), call)
+			: 0;
+	call->signal_id = g_dbus_connection_signal_subscribe(
+		portal_get_dbus_connection(), "org.freedesktop.portal.Desktop",
+		"org.freedesktop.portal.Request", "Response",
+		call->request_path, NULL, G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE,
+		on_response_received_cb, call, NULL);
+}

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/portal.h -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/portal.h Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pipewire/screencast-portal.c -> obs-studio-30.0.2.tar.xz/plugins/linux-pipewire/screencast-portal.c Changed

@@ -50,6 +50,7 @@
 	bool cursor_visible;
 
 	obs_pipewire *obs_pw;
+	obs_pipewire_stream *obs_pw_stream;
 };
 
 /* ------------------------------------------------- */
@@ -138,13 +139,6 @@
 
 /* ------------------------------------------------- */
 
-struct dbus_call_data {
-	struct screencast_portal_capture *capture;
-	char *request_path;
-	guint signal_id;
-	gulong cancelled_id;
-};
-
 static const char *capture_type_to_string(enum portal_capture_type capture_type)
 {
 	switch (capture_type) {
@@ -159,58 +153,6 @@
 	return "unknown";
 }
 
-static void on_cancelled_cb(GCancellable *cancellable, void *data)
-{
-	UNUSED_PARAMETER(cancellable);
-
-	struct dbus_call_data *call = data;
-
-	blog(LOG_INFO, "pipewire Screencast session cancelled");
-
-	g_dbus_connection_call(
-		portal_get_dbus_connection(), "org.freedesktop.portal.Desktop",
-		call->request_path, "org.freedesktop.portal.Request", "Close",
-		NULL, NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
-}
-
-static struct dbus_call_data *
-subscribe_to_signal(struct screencast_portal_capture *capture, const char *path,
-		    GDBusSignalCallback callback)
-{
-	struct dbus_call_data *call;
-
-	call = bzalloc(sizeof(struct dbus_call_data));
-	call->capture = capture;
-	call->request_path = bstrdup(path);
-	call->cancelled_id = g_signal_connect(capture->cancellable, "cancelled",
-					      G_CALLBACK(on_cancelled_cb),
-					      call);
-	call->signal_id = g_dbus_connection_signal_subscribe(
-		portal_get_dbus_connection(), "org.freedesktop.portal.Desktop",
-		"org.freedesktop.portal.Request", "Response",
-		call->request_path, NULL, G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE,
-		callback, call, NULL);
-
-	return call;
-}
-
-static void dbus_call_data_free(struct dbus_call_data *call)
-{
-	if (!call)
-		return;
-
-	if (call->signal_id)
-		g_dbus_connection_signal_unsubscribe(
-			portal_get_dbus_connection(), call->signal_id);
-
-	if (call->cancelled_id > 0)
-		g_signal_handler_disconnect(call->capture->cancellable,
-					    call->cancelled_id);
-
-	g_clear_pointer(&call->request_path, bfree);
-	bfree(call);
-}
-
 /* ------------------------------------------------- */
 
 static void on_pipewire_remote_opened_cb(GObject *source, GAsyncResult *res,
@@ -250,13 +192,14 @@
 	if (!capture->obs_pw)
 		return;
 
-	obs_pipewire_connect_stream(
-		capture->obs_pw, capture->pipewire_node, "OBS Studio",
+	capture->obs_pw_stream = obs_pipewire_connect_stream(
+		capture->obs_pw, capture->source, capture->pipewire_node,
+		"OBS Studio",
 		pw_properties_new(PW_KEY_MEDIA_TYPE, "Video",
 				  PW_KEY_MEDIA_CATEGORY, "Capture",
 				  PW_KEY_MEDIA_ROLE, "Screen", NULL));
-	obs_pipewire_set_cursor_visible(capture->obs_pw,
-					capture->cursor_visible);
+	obs_pipewire_stream_set_cursor_visible(capture->obs_pw_stream,
+					       capture->cursor_visible);
 }
 
 static void open_pipewire_remote(struct screencast_portal_capture *capture)
@@ -274,31 +217,16 @@
 
 /* ------------------------------------------------- */
 
-static void on_start_response_received_cb(GDBusConnection *connection,
-					  const char *sender_name,
-					  const char *object_path,
-					  const char *interface_name,
-					  const char *signal_name,
-					  GVariant *parameters, void *user_data)
+static void on_start_response_received_cb(GVariant *parameters, void *user_data)
 {
-	UNUSED_PARAMETER(connection);
-	UNUSED_PARAMETER(sender_name);
-	UNUSED_PARAMETER(object_path);
-	UNUSED_PARAMETER(interface_name);
-	UNUSED_PARAMETER(signal_name);
-
-	struct screencast_portal_capture *capture;
+	struct screencast_portal_capture *capture = user_data;
 	g_autoptr(GVariant) stream_properties = NULL;
 	g_autoptr(GVariant) streams = NULL;
 	g_autoptr(GVariant) result = NULL;
-	struct dbus_call_data *call = user_data;
 	GVariantIter iter;
 	uint32_t response;
 	size_t n_streams;
 
-	capture = call->capture;
-	g_clear_pointer(&call, dbus_call_data_free);
-
 	g_variant_get(parameters, "(u@a{sv})", &response, &result);
 
 	if (response != 0) {
@@ -376,7 +304,6 @@
 static void start(struct screencast_portal_capture *capture)
 {
 	GVariantBuilder builder;
-	struct dbus_call_data *call;
 	char *request_token;
 	char *request_path;
 
@@ -385,8 +312,8 @@
 	blog(LOG_INFO, "pipewire Asking for %s",
 	     capture_type_to_string(capture->capture_type));
 
-	call = subscribe_to_signal(capture, request_path,
-				   on_start_response_received_cb);
+	portal_signal_subscribe(request_path, capture->cancellable,
+				on_start_response_received_cb, capture);
 
 	g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
 	g_variant_builder_add(&builder, "{sv}", "handle_token",
@@ -396,7 +323,7 @@
 			  g_variant_new("(osa{sv})", capture->session_handle,
 					"", &builder),
 			  G_DBUS_CALL_FLAGS_NONE, -1, capture->cancellable,
-			  on_started_cb, call);
+			  on_started_cb, NULL);
 
 	bfree(request_token);
 	bfree(request_path);
@@ -404,28 +331,15 @@
 
 /* ------------------------------------------------- */
 
-static void on_select_source_response_received_cb(
-	GDBusConnection *connection, const char *sender_name,
-	const char *object_path, const char *interface_name,
-	const char *signal_name, GVariant *parameters, void *user_data)
+static void on_select_source_response_received_cb(GVariant *parameters,
+						  void *user_data)
 {
-	UNUSED_PARAMETER(connection);
-	UNUSED_PARAMETER(sender_name);
-	UNUSED_PARAMETER(object_path);
-	UNUSED_PARAMETER(interface_name);
-	UNUSED_PARAMETER(signal_name);
-
-	struct screencast_portal_capture *capture;
+	struct screencast_portal_capture *capture = user_data;
 	g_autoptr(GVariant) ret = NULL;
-	struct dbus_call_data *call = user_data;
 	uint32_t response;
 
-	capture = call->capture;
-
 	blog(LOG_DEBUG, "pipewire Response to select source received");
 
-	g_clear_pointer(&call, dbus_call_data_free);
-
 	g_variant_get(parameters, "(u@a{sv})", &response, &ret);
 
 	if (response != 0) {
@@ -457,7 +371,6 @@
 
 static void select_source(struct screencast_portal_capture *capture)
 {
-	struct dbus_call_data *call;
 	GVariantBuilder builder;
 	uint32_t available_cursor_modes;
 	char *request_token;
@@ -465,8 +378,8 @@
 
 	portal_create_request_path(&request_path, &request_token);
 
-	call = subscribe_to_signal(capture, request_path,
-				   on_select_source_response_received_cb);
+	portal_signal_subscribe(request_path, capture->cancellable,
+				on_select_source_response_received_cb, capture);
 
 	g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
 	g_variant_builder_add(&builder, "{sv}", "types",
@@ -506,7 +419,7 @@
 			  g_variant_new("(oa{sv})", capture->session_handle,
 					&builder),
 			  G_DBUS_CALL_FLAGS_NONE, -1, capture->cancellable,
-			  on_source_selected_cb, call);
+			  on_source_selected_cb, NULL);
 
 	bfree(request_token);
 	bfree(request_path);
@@ -514,27 +427,14 @@
 
 /* ------------------------------------------------- */
 
-static void on_create_session_response_received_cb(
-	GDBusConnection *connection, const char *sender_name,
-	const char *object_path, const char *interface_name,
-	const char *signal_name, GVariant *parameters, void *user_data)
+static void on_create_session_response_received_cb(GVariant *parameters,
+						   void *user_data)
 {
-	UNUSED_PARAMETER(connection);
-	UNUSED_PARAMETER(sender_name);
-	UNUSED_PARAMETER(object_path);
-	UNUSED_PARAMETER(interface_name);
-	UNUSED_PARAMETER(signal_name);
-
-	struct screencast_portal_capture *capture;
+	struct screencast_portal_capture *capture = user_data;
 	g_autoptr(GVariant) session_handle_variant = NULL;
 	g_autoptr(GVariant) result = NULL;
-	struct dbus_call_data *call = user_data;
 	uint32_t response;
 
-	capture = call->capture;
-
-	g_clear_pointer(&call, dbus_call_data_free);
-
 	g_variant_get(parameters, "(u@a{sv})", &response, &result);
 
 	if (response != 0) {
@@ -573,7 +473,6 @@
 
 static void create_session(struct screencast_portal_capture *capture)
 {
-	struct dbus_call_data *call;
 	GVariantBuilder builder;
 	char *session_token;
 	char *request_token;
@@ -582,8 +481,9 @@
 	portal_create_request_path(&request_path, &request_token);
 	portal_create_session_path(NULL, &session_token);
 
-	call = subscribe_to_signal(capture, request_path,
-				   on_create_session_response_received_cb);
+	portal_signal_subscribe(request_path, capture->cancellable,
+				on_create_session_response_received_cb,
+				capture);
 
 	g_variant_builder_init(&builder, G_VARIANT_TYPE_VARDICT);
 	g_variant_builder_add(&builder, "{sv}", "handle_token",
@@ -594,7 +494,7 @@
 	g_dbus_proxy_call(get_screencast_portal_proxy(), "CreateSession",
 			  g_variant_new("(a{sv})", &builder),
 			  G_DBUS_CALL_FLAGS_NONE, -1, capture->cancellable,
-			  on_session_created_cb, call);
+			  on_session_created_cb, NULL);
 
 	bfree(session_token);
 	bfree(request_token);
@@ -633,6 +533,7 @@
 	struct screencast_portal_capture *capture = data;
 
 	g_clear_pointer(&capture->restore_token, bfree);
+	g_clear_pointer(&capture->obs_pw_stream, obs_pipewire_stream_destroy);
 	g_clear_pointer(&capture->obs_pw, obs_pipewire_destroy);
 
 	if (capture->session_handle) {
@@ -722,6 +623,7 @@
 
 	g_clear_pointer(&capture->restore_token, bfree);
 
+	g_clear_pointer(&capture->obs_pw_stream, obs_pipewire_stream_destroy);
 	obs_pipewire_destroy(capture->obs_pw);
 	g_cancellable_cancel(capture->cancellable);
 	g_clear_object(&capture->cancellable);
@@ -775,33 +677,33 @@
 
 	capture->cursor_visible = obs_data_get_bool(settings, "ShowCursor");
 
-	if (capture->obs_pw)
-		obs_pipewire_set_cursor_visible(capture->obs_pw,
-						capture->cursor_visible);
+	if (capture->obs_pw_stream)
+		obs_pipewire_stream_set_cursor_visible(capture->obs_pw_stream,
+						       capture->cursor_visible);
 }
 
 static void screencast_portal_capture_show(void *data)
 {
 	struct screencast_portal_capture *capture = data;
 
-	if (capture->obs_pw)
-		obs_pipewire_show(capture->obs_pw);
+	if (capture->obs_pw_stream)
+		obs_pipewire_stream_show(capture->obs_pw_stream);
 }
 
 static void screencast_portal_capture_hide(void *data)
 {
 	struct screencast_portal_capture *capture = data;
 
-	if (capture->obs_pw)
-		obs_pipewire_hide(capture->obs_pw);
+	if (capture->obs_pw_stream)
+		obs_pipewire_stream_hide(capture->obs_pw_stream);
 }
 
 static uint32_t screencast_portal_capture_get_width(void *data)
 {
 	struct screencast_portal_capture *capture = data;
 
-	if (capture->obs_pw)
-		return obs_pipewire_get_width(capture->obs_pw);
+	if (capture->obs_pw_stream)
+		return obs_pipewire_stream_get_width(capture->obs_pw_stream);
 	else
 		return 0;
 }
@@ -810,8 +712,8 @@
 {
 	struct screencast_portal_capture *capture = data;
 
-	if (capture->obs_pw)
-		return obs_pipewire_get_height(capture->obs_pw);
+	if (capture->obs_pw_stream)
+		return obs_pipewire_stream_get_height(capture->obs_pw_stream);
 	else
 		return 0;
 }
@@ -821,8 +723,9 @@
 {
 	struct screencast_portal_capture *capture = data;
 
-	if (capture->obs_pw)
-		obs_pipewire_video_render(capture->obs_pw, effect);
+	if (capture->obs_pw_stream)
+		obs_pipewire_stream_video_render(capture->obs_pw_stream,
+						 effect);
 }
 
 void screencast_portal_load(void)

obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/el-GR.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/fi-FI.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/fil-PH.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/id-ID.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-pulseaudio/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-pulseaudio/data/locale/zh-TW.ini Changed

obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/be-BY.ini Added

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/v4l2-decoder.c -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/v4l2-decoder.c Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/v4l2-helpers.c -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/v4l2-helpers.c Changed

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/v4l2-helpers.h -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/v4l2-helpers.h Changed

@@ -19,6 +19,7 @@
 
 #include <linux/videodev2.h>
 #include <libv4l2.h>
+#include <inttypes.h>
 
 #include <obs-module.h>
 #include <media-io/video-io.h>
@@ -27,6 +28,8 @@
 extern "C" {
 #endif
 
+#define PACK64(a, b) (((uint64_t)a << 32) | ((uint64_t)b & 0xffffffff))
+
 /**
 * Data structure for mapped buffers
 */
@@ -91,24 +94,24 @@
 * and the height in the low word.
 * The array is terminated with a zero.
 */
-static const int v4l2_framesizes = {
+static const int64_t v4l2_framesizes = {
 	/* 4:3 */
-	160 << 16 | 120, 320 << 16 | 240, 480 << 16 | 320, 640 << 16 | 480,
-	800 << 16 | 600, 1024 << 16 | 768, 1280 << 16 | 960, 1440 << 16 | 1050,
-	1440 << 16 | 1080, 1600 << 16 | 1200,
+	PACK64(160, 120), PACK64(320, 240), PACK64(480, 320), PACK64(640, 480),
+	PACK64(800, 600), PACK64(1024, 768), PACK64(1280, 960),
+	PACK64(1440, 1050), PACK64(1440, 1080), PACK64(1600, 1200),
 
 	/* 16:9 */
-	640 << 16 | 360, 960 << 16 | 540, 1280 << 16 | 720, 1600 << 16 | 900,
-	1920 << 16 | 1080, 1920 << 16 | 1200, 2560 << 16 | 1440,
-	3840 << 16 | 2160,
+	PACK64(640, 360), PACK64(960, 540), PACK64(1280, 720),
+	PACK64(1600, 900), PACK64(1920, 1080), PACK64(1920, 1200),
+	PACK64(2560, 1440), PACK64(3840, 2160),
 
 	/* 21:9 */
-	2560 << 16 | 1080, 3440 << 16 | 1440, 5120 << 16 | 2160,
+	PACK64(2560, 1080), PACK64(3440, 1440), PACK64(5120, 2160),
 
 	/* tv */
-	432 << 16 | 520, 480 << 16 | 320, 480 << 16 | 530, 486 << 16 | 440,
-	576 << 16 | 310, 576 << 16 | 520, 576 << 16 | 570, 720 << 16 | 576,
-	1024 << 16 | 576,
+	PACK64(432, 520), PACK64(480, 320), PACK64(480, 530), PACK64(486, 440),
+	PACK64(576, 310), PACK64(576, 520), PACK64(576, 570), PACK64(720, 576),
+	PACK64(1024, 576),
 
 	0};
 
@@ -119,16 +122,16 @@
 * word and the denominator in the low word.
 * The array is terminated with a zero.
 */
-static const int v4l2_framerates = {1 << 16 | 60,
-				 1 << 16 | 50,
-				 1 << 16 | 30,
-				 1 << 16 | 25,
-				 1 << 16 | 20,
-				 1 << 16 | 15,
-				 1 << 16 | 10,
-				 1 << 16 | 5,
+static const int64_t v4l2_framerates = {PACK64(1, 60),
+					 PACK64(1, 50),
+					 PACK64(1, 30),
+					 PACK64(1, 25),
+					 PACK64(1, 20),
+					 PACK64(1, 15),
+					 PACK64(1, 10),
+					 PACK64(1, 5),
 
-				 0};
+					 0};
 
 /**
 * Pack two integer values into one
@@ -142,9 +145,9 @@
 *
 * @return the packed integer
 */
-static inline int v4l2_pack_tuple(int a, int b)
+static inline int64_t v4l2_pack_tuple(int32_t a, int32_t b)
 {
-	return (a << 16) | (b & 0xffff);
+	return PACK64(a, b);
 }
 
 /**
@@ -156,10 +159,16 @@
 * @param b pointer to integer b
 * @param packed the packed integer
 */
-static void v4l2_unpack_tuple(int *a, int *b, int packed)
+static void v4l2_unpack_tuple(int32_t *a, int32_t *b, int64_t packed)
 {
-	*a = packed >> 16;
-	*b = packed & 0xffff;
+	// Since we changed from 32 to 64 bits, handle old values too.
+	if ((packed & 0xffffffff00000000) == 0) {
+		*a = (int32_t)(packed >> 16);
+		*b = (int32_t)(packed & 0xffff);
+	} else {
+		*a = (int32_t)(packed >> 32);
+		*b = (int32_t)(packed & 0xffffffff);
+	}
 }
 
 /**
@@ -269,7 +278,7 @@
 *
 * @return negative on failure
 */
-int_fast32_t v4l2_set_format(int_fast32_t dev, int *resolution,
+int_fast32_t v4l2_set_format(int_fast32_t dev, int64_t *resolution,
 			 int *pixelformat, int *bytesperline);
 
 /**
@@ -282,7 +291,7 @@
 *
 * @return negative on failure
 */
-int_fast32_t v4l2_set_framerate(int_fast32_t dev, int *framerate);
+int_fast32_t v4l2_set_framerate(int_fast32_t dev, int64_t *framerate);
 
 /**
 * Set a video standard on the device.

obs-studio-29.1.3.tar.xz/plugins/linux-v4l2/v4l2-input.c -> obs-studio-30.0.2.tar.xz/plugins/linux-v4l2/v4l2-input.c Changed

@@ -75,8 +75,8 @@
 	int pixfmt;
 	int standard;
 	int dv_timing;
-	int resolution;
-	int framerate;
+	int64_t resolution;
+	int64_t framerate;
 	int color_range;
 
 	/* internal data */
@@ -125,6 +125,7 @@
 
 	const enum video_format format = v4l2_to_obs_video_format(data->pixfmt);
 
+	frame->flags = OBS_SOURCE_FRAME_LINEAR_ALPHA;
 	frame->width = data->width;
 	frame->height = data->height;
 	frame->format = format;
@@ -591,7 +592,8 @@
 		blog(LOG_INFO, "Stepwise and Continuous framesizes "
 			       "are currently hardcoded");
 
-		for (const int *packed = v4l2_framesizes; *packed; ++packed) {
+		for (const int64_t *packed = v4l2_framesizes; *packed;
+		     ++packed) {
 			int width;
 			int height;
 			v4l2_unpack_tuple(&width, &height, *packed);
@@ -643,7 +645,8 @@
 		blog(LOG_INFO, "Stepwise and Continuous framerates "
 			       "are currently hardcoded");
 
-		for (const int *packed = v4l2_framerates; *packed; ++packed) {
+		for (const int64_t *packed = v4l2_framerates; *packed;
+		     ++packed) {
 			int num;
 			int denom;
 			v4l2_unpack_tuple(&num, &denom, *packed);

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/CMakeLists.txt Changed

@@ -1,14 +1,4 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
-legacy_check()
-
-find_library(AVFOUNDATION AVFoundation)
-find_library(COCOA Cocoa)
-find_library(COREFOUNDATION CoreFoundation)
-find_library(COREMEDIA CoreMedia)
-find_library(COREVIDEO CoreVideo)
-find_library(COREMEDIAIO CoreMediaIO)
-mark_as_advanced(AVFOUNDATION COCOA COREFOUNDATION COREMEDIA COREMEDIAIO COREVIDEO)
+cmake_minimum_required(VERSION 3.24...3.25)
 
 add_library(mac-avcapture MODULE)
 add_library(OBS::avcapture ALIAS mac-avcapture)
@@ -22,12 +12,12 @@
 target_link_libraries(
 mac-avcapture
 PRIVATE OBS::libobs
- ${AVFOUNDATION}
- ${COCOA}
- ${COREFOUNDATION}
- ${COREMEDIA}
- ${COREVIDEO}
- ${COREMEDIAIO})
+ "$<LINK_LIBRARY:FRAMEWORK,AVFoundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreFoundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreMedia.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreVideo.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreMediaIO.framework>")
 
 set_target_properties_obs(
 mac-avcapture

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/av-capture.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/av-capture.mm Changed

@@ -27,29 +27,35 @@
 
 namespace std {
 
-template<> struct default_delete<obs_data_t> {
-	void operator()(obs_data_t *data) { obs_data_release(data); }
-};
-
-template<> struct default_delete<obs_data_item_t> {
-	void operator()(obs_data_item_t *item) { obs_data_item_release(&item); }
-};
-
-}
-
-#define TEXT_AVCAPTURE obs_module_text("AVCapture")
-#define TEXT_DEVICE obs_module_text("Device")
-#define TEXT_USE_PRESET obs_module_text("UsePreset")
-#define TEXT_PRESET obs_module_text("Preset")
-#define TEXT_RESOLUTION obs_module_text("Resolution")
-#define TEXT_FRAME_RATE obs_module_text("FrameRate")
-#define TEXT_MATCH_OBS obs_module_text("MatchOBS")
-#define TEXT_INPUT_FORMAT obs_module_text("InputFormat")
-#define TEXT_COLOR_SPACE obs_module_text("ColorSpace")
-#define TEXT_VIDEO_RANGE obs_module_text("VideoRange")
+ template<> struct default_delete<obs_data_t> {
+ void operator()(obs_data_t *data)
+ {
+ obs_data_release(data);
+ }
+ };
+
+ template<> struct default_delete<obs_data_item_t> {
+ void operator()(obs_data_item_t *item)
+ {
+ obs_data_item_release(&item);
+ }
+ };
+
+} // namespace std
+
+#define TEXT_AVCAPTURE obs_module_text("AVCapture")
+#define TEXT_DEVICE obs_module_text("Device")
+#define TEXT_USE_PRESET obs_module_text("UsePreset")
+#define TEXT_PRESET obs_module_text("Preset")
+#define TEXT_RESOLUTION obs_module_text("Resolution")
+#define TEXT_FRAME_RATE obs_module_text("FrameRate")
+#define TEXT_MATCH_OBS obs_module_text("MatchOBS")
+#define TEXT_INPUT_FORMAT obs_module_text("InputFormat")
+#define TEXT_COLOR_SPACE obs_module_text("ColorSpace")
+#define TEXT_VIDEO_RANGE obs_module_text("VideoRange")
 #define TEXT_RANGE_PARTIAL obs_module_text("VideoRange.Partial")
-#define TEXT_RANGE_FULL obs_module_text("VideoRange.Full")
-#define TEXT_AUTO obs_module_text("Auto")
+#define TEXT_RANGE_FULL obs_module_text("VideoRange.Full")
+#define TEXT_AUTO obs_module_text("Auto")
 
 #define TEXT_COLOR_UNKNOWN_NAME "Unknown"
 #define TEXT_RANGE_UNKNOWN_NAME "Unknown"
@@ -60,843 +66,793 @@
 
 #define MILLI_TIMESCALE 1000
 #define MICRO_TIMESCALE (MILLI_TIMESCALE * 1000)
-#define NANO_TIMESCALE (MICRO_TIMESCALE * 1000)
+#define NANO_TIMESCALE (MICRO_TIMESCALE * 1000)
 
-#define AV_FOURCC_STR(code) \
-	(char5) \
-	{ \
-		static_cast<char>((code >> 24) & 0xFF), \
-			static_cast<char>((code >> 16) & 0xFF), \
-			static_cast<char>((code >> 8) & 0xFF), \
-			static_cast<char>(code & 0xFF), 0 \
-	}
+#define AV_FOURCC_STR(code) \
+ (char5) \
+ { \
+ static_cast<char>((code >> 24) & 0xFF), static_cast<char>((code >> 16) & 0xFF), \
+ static_cast<char>((code >> 8) & 0xFF), static_cast<char>(code & 0xFF), 0 \
+ }
 
 struct av_capture;
 
-#define AVLOG(level, format, ...) \
-	blog(level, "%s: " format, obs_source_get_name(capture->source), \
-	 ##__VA_ARGS__)
+#define AVLOG(level, format, ...) blog(level, "%s: " format, obs_source_get_name(capture->source), ##__VA_ARGS__)
 
 @interface OBSAVCaptureDelegate
-	: NSObject <AVCaptureVideoDataOutputSampleBufferDelegate,
-		 AVCaptureAudioDataOutputSampleBufferDelegate> {
-@public
-	struct av_capture *capture;
+ : NSObject <AVCaptureVideoDataOutputSampleBufferDelegate, AVCaptureAudioDataOutputSampleBufferDelegate> {
+ @public
+ struct av_capture *capture;
 }
 - (void)captureOutput:(AVCaptureOutput *)out
-	didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer
-	 fromConnection:(AVCaptureConnection *)connection;
+ didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer
+ fromConnection:(AVCaptureConnection *)connection;
 - (void)captureOutput:(AVCaptureOutput *)captureOutput
-	didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
-	 fromConnection:(AVCaptureConnection *)connection;
+ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
+ fromConnection:(AVCaptureConnection *)connection;
 @end
 
 namespace {
 
-static auto remove_observer = (id observer) {
-	NSNotificationCenter defaultCenter removeObserver:observer;
-};
+ static auto remove_observer = (id observer) {
+ NSNotificationCenter defaultCenter removeObserver:observer;
+ };
 
-struct observer_handle
-	: unique_ptr<remove_pointer<id>::type, decltype(remove_observer)> {
+ struct observer_handle : unique_ptr<remove_pointer<id>::type, decltype(remove_observer)> {
+ using base = unique_ptr<remove_pointer<id>::type, decltype(remove_observer)>;
 
-	using base =
-		unique_ptr<remove_pointer<id>::type, decltype(remove_observer)>;
+ explicit observer_handle(id observer = nullptr) : base(observer, remove_observer) {}
+ };
 
-	explicit observer_handle(id observer = nullptr)
-		: base(observer, remove_observer)
-	{
-	}
-};
+ struct av_video_info {
+ video_colorspace colorspace;
+ video_range_type video_range;
+ bool video_params_valid = false;
+ };
 
-struct av_video_info {
-	video_colorspace colorspace;
-	video_range_type video_range;
-	bool video_params_valid = false;
-};
-
-}
+} // namespace
 
 struct av_capture {
-	OBSAVCaptureDelegate *delegate;
-	dispatch_queue_t queue;
-	dispatch_queue_t audioQueue;
-	bool has_clock;
+ OBSAVCaptureDelegate *delegate;
+ dispatch_queue_t queue;
+ dispatch_queue_t audioQueue;
+ bool has_clock;
 
-	bool device_locked;
+ bool device_locked;
 
-	left_right::left_right<av_video_info> video_info;
+ left_right::left_right<av_video_info> video_info;
 
-	AVCaptureVideoDataOutput *out;
-	AVCaptureAudioDataOutput *audioOut;
-	AVCaptureDevice *device;
-	AVCaptureDeviceInput *device_input;
-	AVCaptureSession *session;
+ AVCaptureVideoDataOutput *out;
+ AVCaptureAudioDataOutput *audioOut;
+ AVCaptureDevice *device;
+ AVCaptureDeviceInput *device_input;
+ AVCaptureSession *session;
 
-	NSString *uid;
-	observer_handle connect_observer;
-	observer_handle disconnect_observer;
+ NSString *uid;
+ observer_handle connect_observer;
+ observer_handle disconnect_observer;
 
-	FourCharCode fourcc;
-	video_format video_format;
+ FourCharCode fourcc;
+ video_format video_format;
 
-	bool use_preset = false;
-	int requested_colorspace = COLOR_SPACE_AUTO;
-	int requested_video_range = VIDEO_RANGE_AUTO;
-	bool enable_audio;
+ bool use_preset = false;
+ int requested_colorspace = COLOR_SPACE_AUTO;
+ int requested_video_range = VIDEO_RANGE_AUTO;
+ bool enable_audio;
 
-	obs_source_t *source;
+ obs_source_t *source;
 
-	obs_source_frame frame;
-	obs_source_audio audio;
+ obs_source_frame frame;
+ obs_source_audio audio;
 };
 
 static NSString *get_string(obs_data_t *data, char const *name)
 {
-	return @(obs_data_get_string(data, name));
+ return @(obs_data_get_string(data, name));
 }
 
 static AVCaptureDevice *get_device(obs_data_t *settings)
 {
-	auto uid = get_string(settings, "device");
-	return AVCaptureDevice deviceWithUniqueID:uid;
+ auto uid = get_string(settings, "device");
+ return AVCaptureDevice deviceWithUniqueID:uid;
 }
 
 template<typename T, typename U>
-static void clamp(T &store, U val, T low = numeric_limits<T>::min(),
-		 T high = numeric_limits<T>::max())
+static void clamp(T &store, U val, T low = numeric_limits<T>::min(), T high = numeric_limits<T>::max())
 {
-	store = static_cast<intmax_t>(val) < static_cast<intmax_t>(low)
-			? low
-			: (static_cast<intmax_t>(val) >
-					 static_cast<intmax_t>(high)
-				 ? high
-				 : static_cast<T>(val));
+ store = static_cast<intmax_t>(val) < static_cast<intmax_t>(low)
+ ? low
+ : (static_cast<intmax_t>(val) > static_cast<intmax_t>(high) ? high : static_cast<T>(val));
 }
 
 static bool get_resolution(obs_data_t *settings, CMVideoDimensions &dims)
 {
-	using item_ptr = unique_ptr<obs_data_item_t>;
-	item_ptr item{obs_data_item_byname(settings, "resolution")};
-	if (!item)
-		return false;
+ using item_ptr = unique_ptr<obs_data_item_t>;
+ item_ptr item {obs_data_item_byname(settings, "resolution")};
+ if (!item)
+ return false;
 
-	auto res_str = obs_data_item_get_string(item.get());
-	unique_ptr<obs_data_t> res{obs_data_create_from_json(res_str)};
-	if (!res)
-		return false;
+ auto res_str = obs_data_item_get_string(item.get());
+ unique_ptr<obs_data_t> res {obs_data_create_from_json(res_str)};
+ if (!res)
+ return false;
 
-	item_ptr width{obs_data_item_byname(res.get(), "width")};
-	item_ptr height{obs_data_item_byname(res.get(), "height")};
+ item_ptr width {obs_data_item_byname(res.get(), "width")};
+ item_ptr height {obs_data_item_byname(res.get(), "height")};
 
-	if (!width || !height)
-		return false;
+ if (!width || !height)
+ return false;
 
-	clamp(dims.width, obs_data_item_get_int(width.get()), 0);
-	clamp(dims.height, obs_data_item_get_int(height.get()), 0);
+ clamp(dims.width, obs_data_item_get_int(width.get()), 0);
+ clamp(dims.height, obs_data_item_get_int(height.get()), 0);
 
-	if (!dims.width || !dims.height)
-		return false;
+ if (!dims.width || !dims.height)
+ return false;
 
-	return true;
+ return true;
 }
 
 static bool get_input_format(obs_data_t *settings, FourCharCode &fourcc)
 {
-	auto item = unique_ptr<obs_data_item_t>{
-		obs_data_item_byname(settings, "input_format")};
-	if (!item)
-		return false;
+ auto item = unique_ptr<obs_data_item_t> {obs_data_item_byname(settings, "input_format")};
+ if (!item)
+ return false;
 
-	fourcc = (FourCharCode)obs_data_item_get_int(item.get());
-	return true;
+ fourcc = (FourCharCode) obs_data_item_get_int(item.get());
+ return true;
 }
 
 namespace {
 
-struct config_helper {
-	obs_data_t *settings = nullptr;
+ struct config_helper {
+ obs_data_t *settings = nullptr;
 
-	AVCaptureDevice *dev_ = nullptr;
+ AVCaptureDevice *dev_ = nullptr;
 
-	bool dims_valid : 1;
-	bool fr_valid : 1;
-	bool fps_valid : 1;
-	bool if_valid : 1;
+ bool dims_valid : 1;
+ bool fr_valid : 1;
+ bool fps_valid : 1;
+ bool if_valid : 1;
 
-	CMVideoDimensions dims_{};
+ CMVideoDimensions dims_ {};
 
-	const char *frame_rate_ = nullptr;
-	media_frames_per_second fps_{};
+ const char *frame_rate_ = nullptr;
+ media_frames_per_second fps_ {};
 
-	FourCharCode input_format_ = INPUT_FORMAT_AUTO;
+ FourCharCode input_format_ = INPUT_FORMAT_AUTO;
 
-	explicit config_helper(obs_data_t *settings) : settings(settings)
-	{
-		dev_ = get_device(settings);
+ explicit config_helper(obs_data_t *settings) : settings(settings)
+ {
+ dev_ = get_device(settings);
 
-		dims_valid = get_resolution(settings, dims_);
+ dims_valid = get_resolution(settings, dims_);
 
-		fr_valid = obs_data_get_frames_per_second(
-			settings, "frame_rate", nullptr, &frame_rate_);
-		fps_valid = obs_data_get_frames_per_second(
-			settings, "frame_rate", &fps_, nullptr);
+ fr_valid = obs_data_get_frames_per_second(settings, "frame_rate", nullptr, &frame_rate_);
+ fps_valid = obs_data_get_frames_per_second(settings, "frame_rate", &fps_, nullptr);
 
-		if_valid = get_input_format(settings, input_format_);
-	}
+ if_valid = get_input_format(settings, input_format_);
+ }
 
-	AVCaptureDevice *dev() const { return dev_; }
+ AVCaptureDevice *dev() const
+ {
+ return dev_;
+ }
 
-	const CMVideoDimensions *dims() const
-	{
-		return dims_valid ? &dims_ : nullptr;
-	}
+ const CMVideoDimensions *dims() const
+ {
+ return dims_valid ? &dims_ : nullptr;
+ }
 
-	const char *frame_rate() const
-	{
-		return fr_valid ? frame_rate_ : nullptr;
-	}
+ const char *frame_rate() const
+ {
+ return fr_valid ? frame_rate_ : nullptr;
+ }
 
-	const media_frames_per_second *fps() const
-	{
-		return fps_valid ? &fps_ : nullptr;
-	}
+ const media_frames_per_second *fps() const
+ {
+ return fps_valid ? &fps_ : nullptr;
+ }
 
-	const FourCharCode *input_format() const
-	{
-		return if_valid ? &input_format_ : nullptr;
-	}
-};
+ const FourCharCode *input_format() const
+ {
+ return if_valid ? &input_format_ : nullptr;
+ }
+ };
 
-struct av_capture_ref {
-	av_capture *capture = nullptr;
-	OBSSource source;
+ struct av_capture_ref {
+ av_capture *capture = nullptr;
+ OBSSource source;
 
-	av_capture_ref() = default;
+ av_capture_ref() = default;
 
-	av_capture_ref(av_capture *capture_, obs_weak_source_t *weak_source)
-		: source(OBSGetStrongRef(weak_source))
-	{
-		if (!source)
-			return;
+ av_capture_ref(av_capture *capture_, obs_weak_source_t *weak_source) : source(OBSGetStrongRef(weak_source))
+ {
+ if (!source)
+ return;
 
-		capture = capture_;
-	}
+ capture = capture_;
+ }
 
-	operator av_capture *() { return capture; }
+ operator av_capture *()
+ {
+ return capture;
+ }
 
-	av_capture *operator->() { return capture; }
-};
+ av_capture *operator->()
+ {
+ return capture;
+ }
+ };
 
-struct properties_param {
-	av_capture *capture = nullptr;
-	OBSWeakSource weak_source;
+ struct properties_param {
+ av_capture *capture = nullptr;
+ OBSWeakSource weak_source;
 
-	properties_param(av_capture *capture) : capture(capture)
-	{
-		if (!capture)
-			return;
+ properties_param(av_capture *capture) : capture(capture)
+ {
+ if (!capture)
+ return;
 
-		weak_source = OBSGetWeakRef(capture->source);
-	}
+ weak_source = OBSGetWeakRef(capture->source);
+ }
 
-	av_capture_ref get_ref() { return {capture, weak_source}; }
-};
+ av_capture_ref get_ref()
+ {
+ return {capture, weak_source};
+ }
+ };
 
-}
+} // namespace
 
 static av_capture_ref get_ref(obs_properties_t *props)
 {
-	void *param = obs_properties_get_param(props);
-	if (!param)
-		return {};
+ void *param = obs_properties_get_param(props);
+ if (!param)
+ return {};
 
-	return static_cast<properties_param *>(param)->get_ref();
+ return static_cast<properties_param *>(param)->get_ref();
 }
 
 static inline video_format format_from_subtype(FourCharCode subtype)
 {
-	//TODO: uncomment VIDEO_FORMAT_NV12 and VIDEO_FORMAT_ARGB once libobs
-	// gains matching GPU conversions or a CPU fallback is implemented
-	switch (subtype) {
-	case kCVPixelFormatType_422YpCbCr8:
-		return VIDEO_FORMAT_UYVY;
-	case kCVPixelFormatType_422YpCbCr8_yuvs:
-		return VIDEO_FORMAT_YUY2;
-	/*case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
-	case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
-		return VIDEO_FORMAT_NV12;*/
-	/*case kCVPixelFormatType_32ARGB:
-		return VIDEO_FORMAT_ARGB;*/
-	case kCVPixelFormatType_32BGRA:
-		return VIDEO_FORMAT_BGRA;
-	default:
-		return VIDEO_FORMAT_NONE;
-	}
+ //TODO: uncomment VIDEO_FORMAT_NV12 and VIDEO_FORMAT_ARGB once libobs
+ // gains matching GPU conversions or a CPU fallback is implemented
+ switch (subtype) {
+ case kCVPixelFormatType_422YpCbCr8:
+ return VIDEO_FORMAT_UYVY;
+ case kCVPixelFormatType_422YpCbCr8_yuvs:
+ return VIDEO_FORMAT_YUY2;
+ /* case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
+ * case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
+		 * return VIDEO_FORMAT_NV12;
+ * case kCVPixelFormatType_32ARGB:
+		 * return VIDEO_FORMAT_ARGB;
+ */
+ case kCVPixelFormatType_32BGRA:
+ return VIDEO_FORMAT_BGRA;
+ default:
+ return VIDEO_FORMAT_NONE;
+ }
 }
 
 static const char *fourcc_subtype_name(FourCharCode fourcc);
 
-static const char *
-format_description_subtype_name(CMFormatDescriptionRef desc,
-				FourCharCode *fourcc_ = nullptr)
+static const char *format_description_subtype_name(CMFormatDescriptionRef desc, FourCharCode *fourcc_ = nullptr)
 {
-	FourCharCode fourcc = CMFormatDescriptionGetMediaSubType(desc);
-	if (fourcc_)
-		*fourcc_ = fourcc;
+ FourCharCode fourcc = CMFormatDescriptionGetMediaSubType(desc);
+ if (fourcc_)
+ *fourcc_ = fourcc;
 
-	return fourcc_subtype_name(fourcc);
+ return fourcc_subtype_name(fourcc);
 }
 
 static const char *fourcc_subtype_name(FourCharCode fourcc)
 {
-	switch (fourcc) {
-	case kCVPixelFormatType_422YpCbCr8:
-		return "UYVY - 422YpCbCr8"; //VIDEO_FORMAT_UYVY;
-	case kCVPixelFormatType_422YpCbCr8_yuvs:
-		return "YUY2 - 422YpCbCr8_yuvs"; //VIDEO_FORMAT_YUY2;
-	case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
-	case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
-		return "NV12 - 420YpCbCr8BiPlanar"; //VIDEO_FORMAT_NV12;
-	case kCVPixelFormatType_32ARGB:
-		return "ARGB - 32ARGB"; //VIDEO_FORMAT_ARGB;*/
-	case kCVPixelFormatType_32BGRA:
-		return "BGRA - 32BGRA"; //VIDEO_FORMAT_BGRA;
-
-	case kCMVideoCodecType_Animation:
-		return "Apple Animation";
-	case kCMVideoCodecType_Cinepak:
-		return "Cinepak";
-	case kCMVideoCodecType_JPEG:
-		return "JPEG";
-	case kCMVideoCodecType_JPEG_OpenDML:
-		return "MJPEG - JPEG OpenDML";
-	case kCMVideoCodecType_SorensonVideo:
-		return "Sorenson Video";
-	case kCMVideoCodecType_SorensonVideo3:
-		return "Sorenson Video 3";
-	case kCMVideoCodecType_H263:
-		return "H.263";
-	case kCMVideoCodecType_H264:
-		return "H.264";
-	case kCMVideoCodecType_MPEG4Video:
-		return "MPEG-4";
-	case kCMVideoCodecType_MPEG2Video:
-		return "MPEG-2";
-	case kCMVideoCodecType_MPEG1Video:
-		return "MPEG-1";
-
-	case kCMVideoCodecType_DVCNTSC:
-		return "DV NTSC";
-	case kCMVideoCodecType_DVCPAL:
-		return "DV PAL";
-	case kCMVideoCodecType_DVCProPAL:
-		return "Panasonic DVCPro PAL";
-	case kCMVideoCodecType_DVCPro50NTSC:
-		return "Panasonic DVCPro-50 NTSC";
-	case kCMVideoCodecType_DVCPro50PAL:
-		return "Panasonic DVCPro-50 PAL";
-	case kCMVideoCodecType_DVCPROHD720p60:
-		return "Panasonic DVCPro-HD 720p60";
-	case kCMVideoCodecType_DVCPROHD720p50:
-		return "Panasonic DVCPro-HD 720p50";
-	case kCMVideoCodecType_DVCPROHD1080i60:
-		return "Panasonic DVCPro-HD 1080i60";
-	case kCMVideoCodecType_DVCPROHD1080i50:
-		return "Panasonic DVCPro-HD 1080i50";
-	case kCMVideoCodecType_DVCPROHD1080p30:
-		return "Panasonic DVCPro-HD 1080p30";
-	case kCMVideoCodecType_DVCPROHD1080p25:
-		return "Panasonic DVCPro-HD 1080p25";
-
-	case kCMVideoCodecType_AppleProRes4444:
-		return "Apple ProRes 4444";
-	case kCMVideoCodecType_AppleProRes422HQ:
-		return "Apple ProRes 422 HQ";
-	case kCMVideoCodecType_AppleProRes422:
-		return "Apple ProRes 422";
-	case kCMVideoCodecType_AppleProRes422LT:
-		return "Apple ProRes 422 LT";
-	case kCMVideoCodecType_AppleProRes422Proxy:
-		return "Apple ProRes 422 Proxy";
-
-	default:
-		blog(LOG_INFO, "Unknown format %s", AV_FOURCC_STR(fourcc));
-		return "unknown";
-	}
+ switch (fourcc) {
+ case kCVPixelFormatType_422YpCbCr8:
+ return "UYVY - 422YpCbCr8"; //VIDEO_FORMAT_UYVY;
+ case kCVPixelFormatType_422YpCbCr8_yuvs:
+ return "YUY2 - 422YpCbCr8_yuvs"; //VIDEO_FORMAT_YUY2;
+ case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
+ case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
+ return "NV12 - 420YpCbCr8BiPlanar"; //VIDEO_FORMAT_NV12;
+ case kCVPixelFormatType_32ARGB:
+ return "ARGB - 32ARGB"; //VIDEO_FORMAT_ARGB;*/
+ case kCVPixelFormatType_32BGRA:
+ return "BGRA - 32BGRA"; //VIDEO_FORMAT_BGRA;
+
+ case kCMVideoCodecType_Animation:
+ return "Apple Animation";
+ case kCMVideoCodecType_Cinepak:
+ return "Cinepak";
+ case kCMVideoCodecType_JPEG:
+ return "JPEG";
+ case kCMVideoCodecType_JPEG_OpenDML:
+ return "MJPEG - JPEG OpenDML";
+ case kCMVideoCodecType_SorensonVideo:
+ return "Sorenson Video";
+ case kCMVideoCodecType_SorensonVideo3:
+ return "Sorenson Video 3";
+ case kCMVideoCodecType_H263:
+ return "H.263";
+ case kCMVideoCodecType_H264:
+ return "H.264";
+ case kCMVideoCodecType_MPEG4Video:
+ return "MPEG-4";
+ case kCMVideoCodecType_MPEG2Video:
+ return "MPEG-2";
+ case kCMVideoCodecType_MPEG1Video:
+ return "MPEG-1";
+
+ case kCMVideoCodecType_DVCNTSC:
+ return "DV NTSC";
+ case kCMVideoCodecType_DVCPAL:
+ return "DV PAL";
+ case kCMVideoCodecType_DVCProPAL:
+ return "Panasonic DVCPro PAL";
+ case kCMVideoCodecType_DVCPro50NTSC:
+ return "Panasonic DVCPro-50 NTSC";
+ case kCMVideoCodecType_DVCPro50PAL:
+ return "Panasonic DVCPro-50 PAL";
+ case kCMVideoCodecType_DVCPROHD720p60:
+ return "Panasonic DVCPro-HD 720p60";
+ case kCMVideoCodecType_DVCPROHD720p50:
+ return "Panasonic DVCPro-HD 720p50";
+ case kCMVideoCodecType_DVCPROHD1080i60:
+ return "Panasonic DVCPro-HD 1080i60";
+ case kCMVideoCodecType_DVCPROHD1080i50:
+ return "Panasonic DVCPro-HD 1080i50";
+ case kCMVideoCodecType_DVCPROHD1080p30:
+ return "Panasonic DVCPro-HD 1080p30";
+ case kCMVideoCodecType_DVCPROHD1080p25:
+ return "Panasonic DVCPro-HD 1080p25";
+
+ case kCMVideoCodecType_AppleProRes4444:
+ return "Apple ProRes 4444";
+ case kCMVideoCodecType_AppleProRes422HQ:
+ return "Apple ProRes 422 HQ";
+ case kCMVideoCodecType_AppleProRes422:
+ return "Apple ProRes 422";
+ case kCMVideoCodecType_AppleProRes422LT:
+ return "Apple ProRes 422 LT";
+ case kCMVideoCodecType_AppleProRes422Proxy:
+ return "Apple ProRes 422 Proxy";
+
+ default:
+ blog(LOG_INFO, "Unknown format %s", AV_FOURCC_STR(fourcc));
+ return "unknown";
+ }
 }
 
 static inline bool is_fullrange_yuv(FourCharCode pixel_format)
 {
-	switch (pixel_format) {
-	case kCVPixelFormatType_420YpCbCr8PlanarFullRange:
-	case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
-	case kCVPixelFormatType_422YpCbCr8FullRange:
-		return true;
+ switch (pixel_format) {
+ case kCVPixelFormatType_420YpCbCr8PlanarFullRange:
+ case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
+ case kCVPixelFormatType_422YpCbCr8FullRange:
+ return true;
 
-	default:
-		return false;
-	}
+ default:
+ return false;
+ }
 }
 
 static inline video_colorspace get_colorspace(CMFormatDescriptionRef desc)
 {
-	CFPropertyListRef matrix = CMFormatDescriptionGetExtension(
-		desc, kCMFormatDescriptionExtension_YCbCrMatrix);
-
-	if (!matrix)
-		return VIDEO_CS_DEFAULT;
-
-	if (CFStringCompare(static_cast<CFStringRef>(matrix),
-			 kCVImageBufferYCbCrMatrix_ITU_R_601_4,
-			 0) == kCFCompareEqualTo)
-		return VIDEO_CS_601;
-
-	return VIDEO_CS_709;
-}
-
-static inline bool update_colorspace(av_capture *capture,
-				 obs_source_frame *frame,
-				 CMFormatDescriptionRef desc,
-				 bool full_range, av_video_info &vi)
-{
-	auto cs_auto = capture->use_preset ||
-		 capture->requested_colorspace == COLOR_SPACE_AUTO;
-	auto vr_auto = capture->use_preset ||
-		 capture->requested_video_range == VIDEO_RANGE_AUTO;
-
-	video_colorspace colorspace = get_colorspace(desc);
-	video_range_type range = full_range ? VIDEO_RANGE_FULL
-					 : VIDEO_RANGE_PARTIAL;
-
-	bool cs_matches = false;
-	if (cs_auto) {
-		cs_matches = colorspace == vi.colorspace;
-	} else {
-		colorspace = static_cast<video_colorspace>(
-			capture->requested_colorspace);
-		cs_matches = colorspace == vi.colorspace;
-	}
-
-	bool vr_matches = false;
-	if (vr_auto) {
-		vr_matches = range == vi.video_range;
-	} else {
-		range = static_cast<video_range_type>(
-			capture->requested_video_range);
-		vr_matches = range == vi.video_range;
-		full_range = range == VIDEO_RANGE_FULL;
-	}
-
-	if (cs_matches && vr_matches) {
-		if (!vi.video_params_valid)
-			capture->video_info.update(&(av_video_info &vi_) {
-				vi_.video_params_valid = vi.video_params_valid =
-					true;
-			});
-		return true;
-	}
-
-	frame->full_range = full_range;
-
-	if (!video_format_get_parameters_for_format(
-		 colorspace, range, frame->format, frame->color_matrix,
-		 frame->color_range_min, frame->color_range_max)) {
-		AVLOG(LOG_ERROR,
-		 "Failed to get colorspace parameters for "
-		 "colorspace %u range %u",
-		 colorspace, range);
-
-		if (vi.video_params_valid)
-			capture->video_info.update(&(av_video_info &vi_) {
-				vi_.video_params_valid = vi.video_params_valid =
-					false;
-			});
-
-		return false;
-	}
-
-	capture->video_info.update(&(av_video_info &vi_) {
-		vi_.colorspace = colorspace;
-		vi_.video_range = range;
-		vi_.video_params_valid = vi.video_params_valid = true;
-	});
-
-	return true;
-}
-
-static inline bool update_frame(av_capture *capture, obs_source_frame *frame,
-				CMSampleBufferRef sample_buffer)
-{
-	CMFormatDescriptionRef desc =
-		CMSampleBufferGetFormatDescription(sample_buffer);
-
-	FourCharCode fourcc = CMFormatDescriptionGetMediaSubType(desc);
-	video_format format = format_from_subtype(fourcc);
-	CMVideoDimensions dims = CMVideoFormatDescriptionGetDimensions(desc);
-
-	CVImageBufferRef img = CMSampleBufferGetImageBuffer(sample_buffer);
-
-	auto vi = capture->video_info.read();
-
-	bool video_params_were_valid = vi.video_params_valid;
-	SCOPE_EXIT
-	{
-		if (video_params_were_valid != vi.video_params_valid)
-			obs_source_update_properties(capture->source);
-	};
-
-	if (format == VIDEO_FORMAT_NONE) {
-		if (capture->fourcc == fourcc)
-			return false;
-
-		capture->fourcc = fourcc;
-		AVLOG(LOG_ERROR, "Unhandled fourcc: %s (0x%x) (%zu planes)",
-		 AV_FOURCC_STR(fourcc), fourcc,
-		 CVPixelBufferGetPlaneCount(img));
-		return false;
-	}
-
-	if (frame->format != format)
-		AVLOG(LOG_DEBUG,
-		 "Switching fourcc: "
-		 "'%s' (0x%x) -> '%s' (0x%x)",
-		 AV_FOURCC_STR(capture->fourcc), capture->fourcc,
-		 AV_FOURCC_STR(fourcc), fourcc);
-
-	bool was_yuv = format_is_yuv(frame->format);
-
-	capture->fourcc = fourcc;
-	frame->format = format;
-	frame->width = dims.width;
-	frame->height = dims.height;
-
-	if (format_is_yuv(format) &&
-	 !update_colorspace(capture, frame, desc, is_fullrange_yuv(fourcc),
-			 vi)) {
-		return false;
-	} else if (was_yuv == format_is_yuv(format)) {
-		capture->video_info.update(&(av_video_info &vi_) {
-			vi_.video_params_valid = vi.video_params_valid = true;
-		});
-	}
-
-	CVPixelBufferLockBaseAddress(img, kCVPixelBufferLock_ReadOnly);
-
-	if (!CVPixelBufferIsPlanar(img)) {
-		frame->linesize0 = (uint32_t)CVPixelBufferGetBytesPerRow(img);
-		frame->data0 = static_cast<uint8_t *>(
-			CVPixelBufferGetBaseAddress(img));
-		return true;
-	}
-
-	size_t count = CVPixelBufferGetPlaneCount(img);
-	for (size_t i = 0; i < count; i++) {
-		frame->linesizei =
-			(uint32_t)CVPixelBufferGetBytesPerRowOfPlane(img, i);
-		frame->datai = static_cast<uint8_t *>(
-			CVPixelBufferGetBaseAddressOfPlane(img, i));
-	}
-	return true;
-}
-
-static inline bool update_audio(obs_source_audio *audio,
-				CMSampleBufferRef sample_buffer)
-{
-	size_t requiredSize;
-	OSStatus status = CMSampleBufferGetAudioBufferListWithRetainedBlockBuffer(
-		sample_buffer, &requiredSize, nullptr, 0, nullptr, nullptr,
-		kCMSampleBufferFlag_AudioBufferList_Assure16ByteAlignment,
-		nullptr);
-
-	if (status != noErr) {
-		blog(LOG_WARNING,
-		 "mac-avcapture: Error while getting size of sample buffer");
-		return false;
-	}
-
-	AudioBufferList *list = (AudioBufferList *)bmalloc(requiredSize);
-	CMBlockBufferRef buffer;
-
-	status = CMSampleBufferGetAudioBufferListWithRetainedBlockBuffer(
-		sample_buffer, nullptr, list, requiredSize, nullptr, nullptr,
-		kCMSampleBufferFlag_AudioBufferList_Assure16ByteAlignment,
-		&buffer);
-
-	if (status != noErr || !list) {
-		if (list)
-			bfree(list);
-
-		blog(LOG_WARNING,
-		 "mac-avcapture: Error while copying sample buffer to audio buffer list");
-		return false;
-	}
-
-	for (size_t i = 0; i < list->mNumberBuffers; i++)
-		audio->datai = (uint8_t *)list->mBuffersi.mData;
-
-	audio->frames = (uint32_t)CMSampleBufferGetNumSamples(sample_buffer);
-	CMFormatDescriptionRef desc =
-		CMSampleBufferGetFormatDescription(sample_buffer);
-	const AudioStreamBasicDescription *asbd =
-		CMAudioFormatDescriptionGetStreamBasicDescription(desc);
-	audio->samples_per_sec = (uint32_t)asbd->mSampleRate;
-	audio->speakers = (enum speaker_layout)asbd->mChannelsPerFrame;
-	switch (asbd->mBitsPerChannel) {
-	case 8:
-		audio->format = AUDIO_FORMAT_U8BIT;
-		break;
-	case 16:
-		audio->format = AUDIO_FORMAT_16BIT;
-		break;
-	case 32:
-		audio->format = AUDIO_FORMAT_32BIT;
-		break;
-	default:
-		audio->format = AUDIO_FORMAT_UNKNOWN;
-	}
-
-	if (buffer)
-		CFRelease(buffer);
-
-	bfree(list);
-
-	return true;
+ CFPropertyListRef matrix = CMFormatDescriptionGetExtension(desc, kCMFormatDescriptionExtension_YCbCrMatrix);
+
+ if (!matrix)
+ return VIDEO_CS_DEFAULT;
+
+ if (CFStringCompare(static_cast<CFStringRef>(matrix), kCVImageBufferYCbCrMatrix_ITU_R_601_4, 0) ==
+ kCFCompareEqualTo)
+ return VIDEO_CS_601;
+
+ return VIDEO_CS_709;
+}
+
+static inline bool update_colorspace(av_capture *capture, obs_source_frame *frame, CMFormatDescriptionRef desc,
+ bool full_range, av_video_info &vi)
+{
+ auto cs_auto = capture->use_preset || capture->requested_colorspace == COLOR_SPACE_AUTO;
+ auto vr_auto = capture->use_preset || capture->requested_video_range == VIDEO_RANGE_AUTO;
+
+ video_colorspace colorspace = get_colorspace(desc);
+ video_range_type range = full_range ? VIDEO_RANGE_FULL : VIDEO_RANGE_PARTIAL;
+
+ bool cs_matches = false;
+ if (cs_auto) {
+ cs_matches = colorspace == vi.colorspace;
+ } else {
+ colorspace = static_cast<video_colorspace>(capture->requested_colorspace);
+ cs_matches = colorspace == vi.colorspace;
+ }
+
+ bool vr_matches = false;
+ if (vr_auto) {
+ vr_matches = range == vi.video_range;
+ } else {
+ range = static_cast<video_range_type>(capture->requested_video_range);
+ vr_matches = range == vi.video_range;
+ full_range = range == VIDEO_RANGE_FULL;
+ }
+
+ if (cs_matches && vr_matches) {
+ if (!vi.video_params_valid)
+ capture->video_info.update(&(av_video_info &vi_) {
+ vi_.video_params_valid = vi.video_params_valid = true;
+ });
+ return true;
+ }
+
+ frame->full_range = full_range;
+
+ if (!video_format_get_parameters_for_format(colorspace, range, frame->format, frame->color_matrix,
+ frame->color_range_min, frame->color_range_max)) {
+ AVLOG(LOG_ERROR,
+ "Failed to get colorspace parameters for "
+ "colorspace %u range %u",
+ colorspace, range);
+
+ if (vi.video_params_valid)
+ capture->video_info.update(&(av_video_info &vi_) {
+ vi_.video_params_valid = vi.video_params_valid = false;
+ });
+
+ return false;
+ }
+
+ capture->video_info.update(&(av_video_info &vi_) {
+ vi_.colorspace = colorspace;
+ vi_.video_range = range;
+ vi_.video_params_valid = vi.video_params_valid = true;
+ });
+
+ return true;
+}
+
+static inline bool update_frame(av_capture *capture, obs_source_frame *frame, CMSampleBufferRef sample_buffer)
+{
+ CMFormatDescriptionRef desc = CMSampleBufferGetFormatDescription(sample_buffer);
+
+ FourCharCode fourcc = CMFormatDescriptionGetMediaSubType(desc);
+ video_format format = format_from_subtype(fourcc);
+ CMVideoDimensions dims = CMVideoFormatDescriptionGetDimensions(desc);
+
+ CVImageBufferRef img = CMSampleBufferGetImageBuffer(sample_buffer);
+
+ auto vi = capture->video_info.read();
+
+ bool video_params_were_valid = vi.video_params_valid;
+ SCOPE_EXIT
+ {
+ if (video_params_were_valid != vi.video_params_valid)
+ obs_source_update_properties(capture->source);
+ };
+
+ if (format == VIDEO_FORMAT_NONE) {
+ if (capture->fourcc == fourcc)
+ return false;
+
+ capture->fourcc = fourcc;
+ AVLOG(LOG_ERROR, "Unhandled fourcc: %s (0x%x) (%zu planes)", AV_FOURCC_STR(fourcc), fourcc,
+ CVPixelBufferGetPlaneCount(img));
+ return false;
+ }
+
+ if (frame->format != format)
+ AVLOG(LOG_DEBUG,
+ "Switching fourcc: "
+ "'%s' (0x%x) -> '%s' (0x%x)",
+ AV_FOURCC_STR(capture->fourcc), capture->fourcc, AV_FOURCC_STR(fourcc), fourcc);
+
+ bool was_yuv = format_is_yuv(frame->format);
+
+ capture->fourcc = fourcc;
+ frame->format = format;
+ frame->width = dims.width;
+ frame->height = dims.height;
+
+ if (format_is_yuv(format) && !update_colorspace(capture, frame, desc, is_fullrange_yuv(fourcc), vi)) {
+ return false;
+ } else if (was_yuv == format_is_yuv(format)) {
+ capture->video_info.update(&(av_video_info &vi_) {
+ vi_.video_params_valid = vi.video_params_valid = true;
+ });
+ }
+
+ CVPixelBufferLockBaseAddress(img, kCVPixelBufferLock_ReadOnly);
+
+ if (!CVPixelBufferIsPlanar(img)) {
+ frame->linesize0 = (uint32_t) CVPixelBufferGetBytesPerRow(img);
+ frame->data0 = static_cast<uint8_t *>(CVPixelBufferGetBaseAddress(img));
+ return true;
+ }
+
+ size_t count = CVPixelBufferGetPlaneCount(img);
+ for (size_t i = 0; i < count; i++) {
+ frame->linesizei = (uint32_t) CVPixelBufferGetBytesPerRowOfPlane(img, i);
+ frame->datai = static_cast<uint8_t *>(CVPixelBufferGetBaseAddressOfPlane(img, i));
+ }
+ return true;
+}
+
+static inline bool update_audio(obs_source_audio *audio, CMSampleBufferRef sample_buffer)
+{
+ size_t requiredSize;
+ OSStatus status = CMSampleBufferGetAudioBufferListWithRetainedBlockBuffer(
+ sample_buffer, &requiredSize, nullptr, 0, nullptr, nullptr,
+ kCMSampleBufferFlag_AudioBufferList_Assure16ByteAlignment, nullptr);
+
+ if (status != noErr) {
+ blog(LOG_WARNING, "mac-avcapture: Error while getting size of sample buffer");
+ return false;
+ }
+
+ AudioBufferList *list = (AudioBufferList *) bmalloc(requiredSize);
+ CMBlockBufferRef buffer;
+
+ status = CMSampleBufferGetAudioBufferListWithRetainedBlockBuffer(
+ sample_buffer, nullptr, list, requiredSize, nullptr, nullptr,
+ kCMSampleBufferFlag_AudioBufferList_Assure16ByteAlignment, &buffer);
+
+ if (status != noErr || !list) {
+ if (list)
+ bfree(list);
+
+ blog(LOG_WARNING, "mac-avcapture: Error while copying sample buffer to audio buffer list");
+ return false;
+ }
+
+ for (size_t i = 0; i < list->mNumberBuffers; i++)
+ audio->datai = (uint8_t *) list->mBuffersi.mData;
+
+ audio->frames = (uint32_t) CMSampleBufferGetNumSamples(sample_buffer);
+ CMFormatDescriptionRef desc = CMSampleBufferGetFormatDescription(sample_buffer);
+ const AudioStreamBasicDescription *asbd = CMAudioFormatDescriptionGetStreamBasicDescription(desc);
+ audio->samples_per_sec = (uint32_t) asbd->mSampleRate;
+ audio->speakers = (enum speaker_layout) asbd->mChannelsPerFrame;
+ switch (asbd->mBitsPerChannel) {
+ case 8:
+ audio->format = AUDIO_FORMAT_U8BIT;
+ break;
+ case 16:
+ audio->format = AUDIO_FORMAT_16BIT;
+ break;
+ case 32:
+ audio->format = AUDIO_FORMAT_32BIT;
+ break;
+ default:
+ audio->format = AUDIO_FORMAT_UNKNOWN;
+ }
+
+ if (buffer)
+ CFRelease(buffer);
+
+ bfree(list);
+
+ return true;
 }
 
 @implementation OBSAVCaptureDelegate
+
 - (void)captureOutput:(AVCaptureOutput *)out
-	didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer
-	 fromConnection:(AVCaptureConnection *)connection
+ didDropSampleBuffer:(CMSampleBufferRef)sampleBuffer
+ fromConnection:(AVCaptureConnection *)connection
 {
-	UNUSED_PARAMETER(out);
-	UNUSED_PARAMETER(sampleBuffer);
-	UNUSED_PARAMETER(connection);
+ UNUSED_PARAMETER(out);
+ UNUSED_PARAMETER(sampleBuffer);
+ UNUSED_PARAMETER(connection);
 }
 
 - (void)captureOutput:(AVCaptureOutput *)captureOutput
-	didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
-	 fromConnection:(AVCaptureConnection *)connection
-{
-	UNUSED_PARAMETER(captureOutput);
-	UNUSED_PARAMETER(connection);
-
-	CMItemCount count = CMSampleBufferGetNumSamples(sampleBuffer);
-	if (count < 1 || !capture)
-		return;
-
-	CMTime target_pts =
-		CMSampleBufferGetOutputPresentationTimeStamp(sampleBuffer);
-	CMTime target_pts_nano = CMTimeConvertScale(
-		target_pts, NANO_TIMESCALE, kCMTimeRoundingMethod_Default);
-
-	CMFormatDescriptionRef desc =
-		CMSampleBufferGetFormatDescription(sampleBuffer);
-	CMMediaType type = CMFormatDescriptionGetMediaType(desc);
-	if (type == kCMMediaType_Video) {
-		obs_source_frame *frame = &capture->frame;
-		frame->timestamp = target_pts_nano.value;
-
-		if (!update_frame(capture, frame, sampleBuffer)) {
-			obs_source_output_video(capture->source, nullptr);
-			return;
-		}
-
-		obs_source_output_video(capture->source, frame);
-
-		CVImageBufferRef img =
-			CMSampleBufferGetImageBuffer(sampleBuffer);
-		CVPixelBufferUnlockBaseAddress(img,
-					 kCVPixelBufferLock_ReadOnly);
-	} else if (type == kCMMediaType_Audio) {
-		if (!capture->enable_audio)
-			return;
-
-		obs_source_audio *audio = &capture->audio;
-		audio->timestamp = target_pts_nano.value;
-
-		if (!update_audio(audio, sampleBuffer)) {
-			obs_source_output_audio(capture->source, nullptr);
-			return;
-		}
-		obs_source_output_audio(capture->source, audio);
-	}
+ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
+ fromConnection:(AVCaptureConnection *)connection
+{
+ UNUSED_PARAMETER(captureOutput);
+ UNUSED_PARAMETER(connection);
+
+ CMItemCount count = CMSampleBufferGetNumSamples(sampleBuffer);
+ if (count < 1 || !capture)
+ return;
+
+ CMTime target_pts = CMSampleBufferGetOutputPresentationTimeStamp(sampleBuffer);
+ CMTime target_pts_nano = CMTimeConvertScale(target_pts, NANO_TIMESCALE, kCMTimeRoundingMethod_Default);
+
+ CMFormatDescriptionRef desc = CMSampleBufferGetFormatDescription(sampleBuffer);
+ CMMediaType type = CMFormatDescriptionGetMediaType(desc);
+ if (type == kCMMediaType_Video) {
+ obs_source_frame *frame = &capture->frame;
+ frame->timestamp = target_pts_nano.value;
+
+ if (!update_frame(capture, frame, sampleBuffer)) {
+ obs_source_output_video(capture->source, nullptr);
+ return;
+ }
+
+ obs_source_output_video(capture->source, frame);
+
+ CVImageBufferRef img = CMSampleBufferGetImageBuffer(sampleBuffer);
+ CVPixelBufferUnlockBaseAddress(img, kCVPixelBufferLock_ReadOnly);
+ } else if (type == kCMMediaType_Audio) {
+ if (!capture->enable_audio)
+ return;
+
+ obs_source_audio *audio = &capture->audio;
+ audio->timestamp = target_pts_nano.value;
+
+ if (!update_audio(audio, sampleBuffer)) {
+ obs_source_output_audio(capture->source, nullptr);
+ return;
+ }
+ obs_source_output_audio(capture->source, audio);
+ }
 }
+
 @end
 
 static void av_capture_enable_buffering(av_capture *capture, bool enabled)
 {
-	obs_source_set_async_unbuffered(capture->source, !enabled);
+ obs_source_set_async_unbuffered(capture->source, !enabled);
 }
 
 static const char *av_capture_getname(void *)
 {
-	return TEXT_AVCAPTURE;
+ return TEXT_AVCAPTURE;
 }
 
 static void unlock_device(av_capture *capture, AVCaptureDevice *dev = nullptr)
 {
-	if (!dev)
-		dev = capture->device;
+ if (!dev)
+ dev = capture->device;
 
-	if (dev && capture->device_locked)
-		dev unlockForConfiguration;
+ if (dev && capture->device_locked)
+ dev unlockForConfiguration;
 
-	capture->device_locked = false;
+ capture->device_locked = false;
 }
 
 static void start_capture(av_capture *capture)
 {
-	if (capture->session && !capture->session.running)
-		capture->session startRunning;
+ if (capture->session && !capture->session.running)
+ capture->session startRunning;
 }
 
 static void clear_capture(av_capture *capture)
 {
-	if (capture->session && capture->session.running)
-		capture->session stopRunning;
+ if (capture->session && capture->session.running)
+ capture->session stopRunning;
 
-	obs_source_output_video(capture->source, nullptr);
-	obs_source_output_audio(capture->source, nullptr);
+ obs_source_output_video(capture->source, nullptr);
+ obs_source_output_audio(capture->source, nullptr);
 }
 
 static void remove_device(av_capture *capture)
 {
-	clear_capture(capture);
+ clear_capture(capture);
 
-	capture->session removeInput:capture->device_input;
+ capture->session removeInput:capture->device_input;
 
-	unlock_device(capture);
+ unlock_device(capture);
 
-	capture->device_input = nullptr;
-	capture->device = nullptr;
+ capture->device_input = nullptr;
+ capture->device = nullptr;
 }
 
 static void av_capture_destroy(void *data)
 {
-	auto capture = static_cast<av_capture *>(data);
+ auto capture = static_cast<av_capture *>(data);
 
-	delete capture;
+ delete capture;
 }
 
 static bool init_session(av_capture *capture)
 {
-	auto session = AVCaptureSession alloc init;
-	if (!session) {
-		AVLOG(LOG_ERROR, "Could not create AVCaptureSession");
-		return false;
-	}
-
-	auto delegate = OBSAVCaptureDelegate alloc init;
-	if (!delegate) {
-		AVLOG(LOG_ERROR, "Could not create OBSAVCaptureDelegate");
-		return false;
-	}
-
-	delegate->capture = capture;
-
-	auto out = AVCaptureVideoDataOutput alloc init;
-	if (!out) {
-		AVLOG(LOG_ERROR, "Could not create AVCaptureVideoDataOutput");
-		return false;
-	}
-
-	auto audioOut = AVCaptureAudioDataOutput alloc init;
-	if (!audioOut) {
-		AVLOG(LOG_ERROR, "Could not create AVCaptureAudioDataOutput");
-		return false;
-	}
-
-	auto queue = dispatch_queue_create(NULL, NULL);
-	if (!queue) {
-		AVLOG(LOG_ERROR, "Could not create dispatch queue");
-		return false;
-	}
-
-	auto audioQueue = dispatch_queue_create(NULL, NULL);
-	if (!queue) {
-		AVLOG(LOG_ERROR, "Could not create dispatch queue for audio");
-		return false;
-	}
-
-	capture->session = session;
-	capture->delegate = delegate;
-	capture->out = out;
-	capture->audioOut = audioOut;
-	capture->queue = queue;
-	capture->audioQueue = audioQueue;
-
-	capture->session addOutput:capture->out;
-	capture->out setSampleBufferDelegate:capture->delegate
-					queue:capture->queue;
-	capture->session addOutput:capture->audioOut;
-	capture->audioOut setSampleBufferDelegate:capture->delegate
-					 queue:capture->audioQueue;
-
-	return true;
+ auto session = AVCaptureSession alloc init;
+ if (!session) {
+ AVLOG(LOG_ERROR, "Could not create AVCaptureSession");
+ return false;
+ }
+
+ auto delegate = OBSAVCaptureDelegate alloc init;
+ if (!delegate) {
+ AVLOG(LOG_ERROR, "Could not create OBSAVCaptureDelegate");
+ return false;
+ }
+
+ delegate->capture = capture;
+
+ auto out = AVCaptureVideoDataOutput alloc init;
+ if (!out) {
+ AVLOG(LOG_ERROR, "Could not create AVCaptureVideoDataOutput");
+ return false;
+ }
+
+ auto audioOut = AVCaptureAudioDataOutput alloc init;
+ if (!audioOut) {
+ AVLOG(LOG_ERROR, "Could not create AVCaptureAudioDataOutput");
+ return false;
+ }
+
+ auto queue = dispatch_queue_create(NULL, NULL);
+ if (!queue) {
+ AVLOG(LOG_ERROR, "Could not create dispatch queue");
+ return false;
+ }
+
+ auto audioQueue = dispatch_queue_create(NULL, NULL);
+ if (!queue) {
+ AVLOG(LOG_ERROR, "Could not create dispatch queue for audio");
+ return false;
+ }
+
+ capture->session = session;
+ capture->delegate = delegate;
+ capture->out = out;
+ capture->audioOut = audioOut;
+ capture->queue = queue;
+ capture->audioQueue = audioQueue;
+
+ capture->session addOutput:capture->out;
+ capture->out setSampleBufferDelegate:capture->delegate queue:capture->queue;
+ capture->session addOutput:capture->audioOut;
+ capture->audioOut setSampleBufferDelegate:capture->delegate queue:capture->audioQueue;
+
+ return true;
 }
 
 static bool init_format(av_capture *capture, AVCaptureDevice *dev);
 
 static bool init_device_input(av_capture *capture, AVCaptureDevice *dev)
 {
-	NSError *err = nil;
-	AVCaptureDeviceInput *device_input =
-		AVCaptureDeviceInput deviceInputWithDevice:dev error:&err;
-	if (!device_input) {
-		AVLOG(LOG_ERROR, "Error while initializing device input: %s",
-		 err.localizedFailureReason.UTF8String);
-		return false;
-	}
+ NSError *err = nil;
+ AVCaptureDeviceInput *device_input = AVCaptureDeviceInput deviceInputWithDevice:dev error:&err;
+ if (!device_input) {
+ AVLOG(LOG_ERROR, "Error while initializing device input: %s", err.localizedFailureReason.UTF8String);
+ return false;
+ }
 
-	capture->session addInput:device_input;
+ capture->session addInput:device_input;
 
-	if (!init_format(capture, dev)) {
-		capture->session removeInput:device_input;
-		return false;
-	}
+ if (!init_format(capture, dev)) {
+ capture->session removeInput:device_input;
+ return false;
+ }
 
-	capture->device_input = device_input;
+ capture->device_input = device_input;
 
-	return true;
+ return true;
 }
 
 static uint32_t uint_from_dict(NSDictionary *dict, CFStringRef key)
 {
-	return ((NSNumber *)dict(__bridge NSString *)key).unsignedIntValue;
+ return ((NSNumber *) dict(__bridge NSString *) key).unsignedIntValue;
 }
 
 static bool init_format(av_capture *capture, AVCaptureDevice *dev)
 {
-	AVCaptureDeviceFormat *format = dev.activeFormat;
-
-	CMMediaType mtype =
-		CMFormatDescriptionGetMediaType(format.formatDescription);
-	// TODO: support other media types
-	if (mtype != kCMMediaType_Video && mtype != kCMMediaType_Muxed) {
-		AVLOG(LOG_ERROR, "CMMediaType '%s' is unsupported",
-		 AV_FOURCC_STR(mtype));
-		return false;
-	}
-
-	capture->out.videoSettings = nil;
-	FourCharCode subtype = uint_from_dict(capture->out.videoSettings,
-					 kCVPixelBufferPixelFormatTypeKey);
-	if (format_from_subtype(subtype) != VIDEO_FORMAT_NONE) {
-		AVLOG(LOG_DEBUG, "Using native fourcc '%s'",
-		 AV_FOURCC_STR(subtype));
-		return true;
-	}
-
-	AVLOG(LOG_DEBUG, "Using fallback fourcc '%s' ('%s' 0x%08x unsupported)",
-	 AV_FOURCC_STR(kCVPixelFormatType_32BGRA), AV_FOURCC_STR(subtype),
-	 subtype);
-
-	capture->out.videoSettings = @{
-		(__bridge NSString *)
-		kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA)
-	};
-	return true;
+ AVCaptureDeviceFormat *format = dev.activeFormat;
+
+ CMMediaType mtype = CMFormatDescriptionGetMediaType(format.formatDescription);
+ // TODO: support other media types
+ if (mtype != kCMMediaType_Video && mtype != kCMMediaType_Muxed) {
+ AVLOG(LOG_ERROR, "CMMediaType '%s' is unsupported", AV_FOURCC_STR(mtype));
+ return false;
+ }
+
+ capture->out.videoSettings = nil;
+ FourCharCode subtype = uint_from_dict(capture->out.videoSettings, kCVPixelBufferPixelFormatTypeKey);
+ if (format_from_subtype(subtype) != VIDEO_FORMAT_NONE) {
+ AVLOG(LOG_DEBUG, "Using native fourcc '%s'", AV_FOURCC_STR(subtype));
+ return true;
+ }
+
+ AVLOG(LOG_DEBUG, "Using fallback fourcc '%s' ('%s' 0x%08x unsupported)", AV_FOURCC_STR(kCVPixelFormatType_32BGRA),
+ AV_FOURCC_STR(subtype), subtype);
+
+ capture->out.videoSettings =
+ @{(__bridge NSString *) kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32BGRA)};
+ return true;
 }
 
 static NSArray *presets(void);
@@ -904,1500 +860,1342 @@
 
 static NSString *select_preset(AVCaptureDevice *dev, NSString *cur_preset)
 {
-	NSString *new_preset = nil;
-	bool found_previous_preset = false;
-	for (NSString *preset in presets().reverseObjectEnumerator) {
-		if (!found_previous_preset)
-			found_previous_preset =
-				cur_preset isEqualToString:preset;
+ NSString *new_preset = nil;
+ bool found_previous_preset = false;
+ for (NSString *preset in presets().reverseObjectEnumerator) {
+ if (!found_previous_preset)
+ found_previous_preset = cur_preset isEqualToString:preset;
 
-		if (!dev supportsAVCaptureSessionPreset:preset)
-			continue;
+ if (!dev supportsAVCaptureSessionPreset:preset)
+ continue;
 
-		if (!new_preset || !found_previous_preset)
-			new_preset = preset;
-	}
+ if (!new_preset || !found_previous_preset)
+ new_preset = preset;
+ }
 
-	return new_preset;
+ return new_preset;
 }
 
-static bool init_preset(av_capture *capture, AVCaptureDevice *dev,
-			obs_data_t *settings)
+static bool init_preset(av_capture *capture, AVCaptureDevice *dev, obs_data_t *settings)
 {
-	clear_capture(capture);
+ clear_capture(capture);
 
-	unlock_device(capture, dev);
+ unlock_device(capture, dev);
 
-	NSString *preset = get_string(settings, "preset");
-	if (!dev supportsAVCaptureSessionPreset:preset) {
-		AVLOG(LOG_WARNING, "Preset %s not available",
-		 preset_names(preset).UTF8String);
-		preset = select_preset(dev, preset);
-	}
+ NSString *preset = get_string(settings, "preset");
+ if (!dev supportsAVCaptureSessionPreset:preset) {
+ AVLOG(LOG_WARNING, "Preset %s not available", preset_names(preset).UTF8String);
+ preset = select_preset(dev, preset);
+ }
 
-	if (!preset) {
-		AVLOG(LOG_WARNING, "Could not select a preset, "
-				 "initialization failed");
-		return false;
-	}
+ if (!preset) {
+ AVLOG(LOG_WARNING, "Could not select a preset, "
+ "initialization failed");
+ return false;
+ }
 
-	capture->session.sessionPreset = preset;
-	AVLOG(LOG_INFO, "Using preset %s", preset_names(preset).UTF8String);
+ capture->session.sessionPreset = preset;
+ AVLOG(LOG_INFO, "Using preset %s", preset_names(preset).UTF8String);
 
-	return true;
+ return true;
 }
 
 static bool operator==(const CMVideoDimensions &a, const CMVideoDimensions &b);
 static CMVideoDimensions get_dimensions(AVCaptureDeviceFormat *format);
 
-static AVCaptureDeviceFormat *find_format(AVCaptureDevice *dev,
-					 CMVideoDimensions dims)
-{
-	for (AVCaptureDeviceFormat *format in dev.formats) {
-		if (get_dimensions(format) == dims)
-			return format;
-	}
-
-	return nullptr;
-}
-
 static CMTime convert(media_frames_per_second fps)
 {
-	CMTime time{};
-	time.value = fps.denominator;
-	time.timescale = fps.numerator;
-	time.flags = 1;
-	return time;
+ CMTime time {};
+ time.value = fps.denominator;
+ time.timescale = fps.numerator;
+ time.flags = 1;
+ return time;
 }
 
 static bool lock_device(av_capture *capture, AVCaptureDevice *dev)
 {
-	if (!dev)
-		dev = capture->device;
+ if (!dev)
+ dev = capture->device;
 
-	NSError *err;
-	if (!dev lockForConfiguration:&err) {
-		AVLOG(LOG_WARNING,
-		 "Could not lock device for configuration: "
-		 "%s",
-		 err.localizedDescription.UTF8String);
-		return false;
-	}
+ NSError *err;
+ if (!dev lockForConfiguration:&err) {
+ AVLOG(LOG_WARNING,
+ "Could not lock device for configuration: "
+ "%s",
+ err.localizedDescription.UTF8String);
+ return false;
+ }
 
-	capture->device_locked = true;
-	return true;
+ capture->device_locked = true;
+ return true;
 }
 
 template<typename Func>
-static void find_formats(media_frames_per_second fps, AVCaptureDevice *dev,
-			 const CMVideoDimensions *dims, Func &&f)
+static void find_formats(media_frames_per_second fps, AVCaptureDevice *dev, const CMVideoDimensions *dims, Func &&f)
 {
-	auto time = convert(fps);
+ auto time = convert(fps);
 
-	for (AVCaptureDeviceFormat *format in dev.formats) {
-		if (!(get_dimensions(format) == *dims))
-			continue;
+ for (AVCaptureDeviceFormat *format in dev.formats) {
+ if (!(get_dimensions(format) == *dims))
+ continue;
 
-		for (AVFrameRateRange *range in format
-			 .videoSupportedFrameRateRanges) {
-			if (CMTimeCompare(range.maxFrameDuration, time) >= 0 &&
-			 CMTimeCompare(range.minFrameDuration, time) <= 0)
-				if (f(format))
-					return;
-		}
-	}
+ for (AVFrameRateRange *range in format.videoSupportedFrameRateRanges) {
+ if (CMTimeCompare(range.maxFrameDuration, time) >= 0 && CMTimeCompare(range.minFrameDuration, time) <= 0)
+ if (f(format))
+ return;
+ }
+ }
 }
 
 static bool color_space_valid(int color_space)
 {
-	switch (color_space) {
-	case COLOR_SPACE_AUTO:
-	case VIDEO_CS_DEFAULT:
-	case VIDEO_CS_601:
-	case VIDEO_CS_709:
-		return true;
-	}
+ switch (color_space) {
+ case COLOR_SPACE_AUTO:
+ case VIDEO_CS_DEFAULT:
+ case VIDEO_CS_601:
+ case VIDEO_CS_709:
+ return true;
+ }
 
-	return false;
+ return false;
 }
 
 static const char *color_space_name(int color_space)
 {
-	switch (color_space) {
-	case COLOR_SPACE_AUTO:
-		return "Auto";
-	case VIDEO_CS_DEFAULT:
-		return "Default";
-	case VIDEO_CS_601:
-		return "CS 601";
-	case VIDEO_CS_709:
-		return "CS 709";
-	}
+ switch (color_space) {
+ case COLOR_SPACE_AUTO:
+ return "Auto";
+ case VIDEO_CS_DEFAULT:
+ return "Default";
+ case VIDEO_CS_601:
+ return "CS 601";
+ case VIDEO_CS_709:
+ return "CS 709";
+ }
 
-	return "Unknown";
+ return "Unknown";
 }
 
 static bool video_range_valid(int video_range)
 {
-	switch (video_range) {
-	case VIDEO_RANGE_AUTO:
-	case VIDEO_RANGE_DEFAULT:
-	case VIDEO_RANGE_PARTIAL:
-	case VIDEO_RANGE_FULL:
-		return true;
-	}
+ switch (video_range) {
+ case VIDEO_RANGE_AUTO:
+ case VIDEO_RANGE_DEFAULT:
+ case VIDEO_RANGE_PARTIAL:
+ case VIDEO_RANGE_FULL:
+ return true;
+ }
 
-	return false;
+ return false;
 }
 
 static const char *video_range_name(int video_range)
 {
-	switch (video_range) {
-	case VIDEO_RANGE_AUTO:
-		return "Auto";
-	case VIDEO_RANGE_DEFAULT:
-		return "Default";
-	case VIDEO_RANGE_PARTIAL:
-		return "Partial";
-	case VIDEO_RANGE_FULL:
-		return "Full";
-	}
-
-	return "Unknown";
-}
-
-static bool init_manual(av_capture *capture, AVCaptureDevice *dev,
-			obs_data_t *settings)
-{
-	clear_capture(capture);
-
-	auto input_format = obs_data_get_int(settings, "input_format");
-	FourCharCode actual_format = (FourCharCode)input_format;
-
-	SCOPE_EXIT
-	{
-		bool refresh = false;
-		if (input_format != actual_format) {
-			refresh = obs_data_get_autoselect_int(settings,
-							 "input_format") !=
-				 actual_format;
-			obs_data_set_autoselect_int(settings, "input_format",
-						 actual_format);
-		} else {
-			refresh = obs_data_has_autoselect_value(settings,
-								"input_format");
-			obs_data_unset_autoselect_value(settings,
-							"input_format");
-		}
-
-		if (refresh)
-			obs_source_update_properties(capture->source);
-	};
-
-	capture->requested_colorspace =
-		(int)obs_data_get_int(settings, "color_space");
-	if (!color_space_valid(capture->requested_colorspace)) {
-		AVLOG(LOG_WARNING, "Unsupported color space: %d",
-		 capture->requested_colorspace);
-		return false;
-	}
-
-	capture->requested_video_range =
-		(int)obs_data_get_int(settings, "video_range");
-	if (!video_range_valid(capture->requested_video_range)) {
-		AVLOG(LOG_WARNING, "Unsupported color range: %d",
-		 capture->requested_video_range);
-		return false;
-	}
-
-	CMVideoDimensions dims{};
-	if (!get_resolution(settings, dims)) {
-		AVLOG(LOG_WARNING, "Could not load resolution");
-		return false;
-	}
-
-	media_frames_per_second fps{};
-	if (!obs_data_get_frames_per_second(settings, "frame_rate", &fps,
-					 nullptr)) {
-		AVLOG(LOG_WARNING, "Could not load frame rate");
-		return false;
-	}
-
-	AVCaptureDeviceFormat *format = nullptr;
-	find_formats(fps, dev, &dims, &(AVCaptureDeviceFormat *format_) {
-		auto desc = format_.formatDescription;
-		auto fourcc = CMFormatDescriptionGetMediaSubType(desc);
-		if (input_format != INPUT_FORMAT_AUTO && fourcc != input_format)
-			return false;
-
-		actual_format = fourcc;
-		format = format_;
-		return true;
-	});
-
-	if (!format) {
-		AVLOG(LOG_WARNING,
-		 "Frame rate is not supported: %g FPS "
-		 "(%u/%u)",
-		 media_frames_per_second_to_fps(fps), fps.numerator,
-		 fps.denominator);
-		return false;
-	}
-
-	if (!lock_device(capture, dev))
-		return false;
-
-	const char *if_name =
-		input_format == INPUT_FORMAT_AUTO
-			? "Auto"
-			: fourcc_subtype_name((FourCharCode)input_format);
+ switch (video_range) {
+ case VIDEO_RANGE_AUTO:
+ return "Auto";
+ case VIDEO_RANGE_DEFAULT:
+ return "Default";
+ case VIDEO_RANGE_PARTIAL:
+ return "Partial";
+ case VIDEO_RANGE_FULL:
+ return "Full";
+ }
+
+ return "Unknown";
+}
+
+static bool init_manual(av_capture *capture, AVCaptureDevice *dev, obs_data_t *settings)
+{
+ clear_capture(capture);
+
+ auto input_format = obs_data_get_int(settings, "input_format");
+ FourCharCode actual_format = (FourCharCode) input_format;
+
+ SCOPE_EXIT
+ {
+ bool refresh = false;
+ if (input_format != actual_format) {
+ refresh = obs_data_get_autoselect_int(settings, "input_format") != actual_format;
+ obs_data_set_autoselect_int(settings, "input_format", actual_format);
+ } else {
+ refresh = obs_data_has_autoselect_value(settings, "input_format");
+ obs_data_unset_autoselect_value(settings, "input_format");
+ }
+
+ if (refresh)
+ obs_source_update_properties(capture->source);
+ };
+
+ capture->requested_colorspace = (int) obs_data_get_int(settings, "color_space");
+ if (!color_space_valid(capture->requested_colorspace)) {
+ AVLOG(LOG_WARNING, "Unsupported color space: %d", capture->requested_colorspace);
+ return false;
+ }
+
+ capture->requested_video_range = (int) obs_data_get_int(settings, "video_range");
+ if (!video_range_valid(capture->requested_video_range)) {
+ AVLOG(LOG_WARNING, "Unsupported color range: %d", capture->requested_video_range);
+ return false;
+ }
+
+ CMVideoDimensions dims {};
+ if (!get_resolution(settings, dims)) {
+ AVLOG(LOG_WARNING, "Could not load resolution");
+ return false;
+ }
+
+ media_frames_per_second fps {};
+ if (!obs_data_get_frames_per_second(settings, "frame_rate", &fps, nullptr)) {
+ AVLOG(LOG_WARNING, "Could not load frame rate");
+ return false;
+ }
+
+ AVCaptureDeviceFormat *format = nullptr;
+ find_formats(fps, dev, &dims, &(AVCaptureDeviceFormat *format_) {
+ auto desc = format_.formatDescription;
+ auto fourcc = CMFormatDescriptionGetMediaSubType(desc);
+ if (input_format != INPUT_FORMAT_AUTO && fourcc != input_format)
+ return false;
+
+ actual_format = fourcc;
+ format = format_;
+ return true;
+ });
+
+ if (!format) {
+ AVLOG(LOG_WARNING,
+ "Frame rate is not supported: %g FPS "
+ "(%u/%u)",
+ media_frames_per_second_to_fps(fps), fps.numerator, fps.denominator);
+ return false;
+ }
+
+ if (!lock_device(capture, dev))
+ return false;
+
+ const char *if_name = input_format == INPUT_FORMAT_AUTO ? "Auto" : fourcc_subtype_name((FourCharCode) input_format);
 
 #define IF_AUTO(x) (input_format != INPUT_FORMAT_AUTO ? "" : x)
-	AVLOG(LOG_INFO,
-	 "Capturing '%s' (%s):\n"
-	 "	Resolution: %ux%u\n"
-	 "	FPS: %g (%" PRIu32 "/%" PRIu32 ")\n"
-	 "	Frame interval: %g" NBSP "s\n"
-	 "	Input format: %s%s%s (%s)%s\n"
-	 "	Requested color space: %s (%d)\n"
-	 "	Requested video range: %s (%d)\n"
-	 "	Using format: %s",
-	 dev.localizedName.UTF8String, dev.uniqueID.UTF8String, dims.width,
-	 dims.height, media_frames_per_second_to_fps(fps), fps.numerator,
-	 fps.denominator, media_frames_per_second_to_frame_interval(fps),
-	 if_name, IF_AUTO(" (actual: "),
-	 IF_AUTO(fourcc_subtype_name(actual_format)),
-	 AV_FOURCC_STR(actual_format), IF_AUTO(")"),
-	 color_space_name(capture->requested_colorspace),
-	 capture->requested_colorspace,
-	 video_range_name(capture->requested_video_range),
-	 capture->requested_video_range, format.description.UTF8String);
+ AVLOG(LOG_INFO,
+ "Capturing '%s' (%s):\n"
+ "	Resolution: %ux%u\n"
+ "	FPS: %g (%" PRIu32 "/%" PRIu32 ")\n"
+ "	Frame interval: %g" NBSP "s\n"
+ "	Input format: %s%s%s (%s)%s\n"
+ "	Requested color space: %s (%d)\n"
+ "	Requested video range: %s (%d)\n"
+ "	Using format: %s",
+ dev.localizedName.UTF8String, dev.uniqueID.UTF8String, dims.width, dims.height,
+ media_frames_per_second_to_fps(fps), fps.numerator, fps.denominator,
+ media_frames_per_second_to_frame_interval(fps), if_name, IF_AUTO(" (actual: "),
+ IF_AUTO(fourcc_subtype_name(actual_format)), AV_FOURCC_STR(actual_format), IF_AUTO(")"),
+ color_space_name(capture->requested_colorspace), capture->requested_colorspace,
+ video_range_name(capture->requested_video_range), capture->requested_video_range,
+ format.description.UTF8String);
 #undef IF_AUTO
 
-	dev.activeFormat = format;
-	dev.activeVideoMinFrameDuration = convert(fps);
-	dev.activeVideoMaxFrameDuration = convert(fps);
+ dev.activeFormat = format;
+ dev.activeVideoMinFrameDuration = convert(fps);
+ dev.activeVideoMaxFrameDuration = convert(fps);
 
-	capture->video_info.update(
-		&(av_video_info &vi) { vi.video_params_valid = false; });
+ capture->video_info.update(&(av_video_info &vi) {
+ vi.video_params_valid = false;
+ });
 
-	return true;
+ return true;
 }
 
 static inline void av_capture_set_audio_active(av_capture *capture, bool active)
 {
-	obs_source_set_audio_active(capture->source, active);
-	capture->enable_audio = active;
+ obs_source_set_audio_active(capture->source, active);
+ capture->enable_audio = active;
 }
 
-static void capture_device(av_capture *capture, AVCaptureDevice *dev,
-			 obs_data_t *settings)
+static void capture_device(av_capture *capture, AVCaptureDevice *dev, obs_data_t *settings)
 {
-	const char *name = dev.localizedName.UTF8String;
-	obs_data_set_string(settings, "device_name", name);
-	obs_data_set_string(settings, "device", dev.uniqueID.UTF8String);
-	AVLOG(LOG_INFO, "Selected device '%s'", name);
+ const char *name = dev.localizedName.UTF8String;
+ obs_data_set_string(settings, "device_name", name);
+ obs_data_set_string(settings, "device", dev.uniqueID.UTF8String);
+ AVLOG(LOG_INFO, "Selected device '%s'", name);
+ if (@available(macOS 12.0, *)) {
+ if (dev isPortraitEffectActive)
+ AVLOG(LOG_WARNING, "Portrait effect is active on selected device");
+ }
+ if (@available(macOS 12.3, *)) {
+ if (dev isCenterStageActive)
+ AVLOG(LOG_WARNING, "Center Stage effect is active on selected device");
+ }
+ if (@available(macOS 13.0, *)) {
+ if (dev isStudioLightActive)
+ AVLOG(LOG_WARNING, "Studio Light effect is active on selected device");
+ }
 
-	if ((capture->use_preset = obs_data_get_bool(settings, "use_preset"))) {
-		if (!init_preset(capture, dev, settings))
-			return;
+ if ((capture->use_preset = obs_data_get_bool(settings, "use_preset"))) {
+ if (!init_preset(capture, dev, settings))
+ return;
 
-	} else {
-		if (!init_manual(capture, dev, settings))
-			return;
-	}
+ } else {
+ if (!init_manual(capture, dev, settings))
+ return;
+ }
 
-	av_capture_set_audio_active(
-		capture, obs_data_get_bool(settings, "enable_audio") &&
-				 (dev hasMediaType:AVMediaTypeAudio ||
-				 dev hasMediaType:AVMediaTypeMuxed));
+ av_capture_set_audio_active(capture,
+ obs_data_get_bool(settings, "enable_audio") &&
+ (dev hasMediaType:AVMediaTypeAudio || dev hasMediaType:AVMediaTypeMuxed));
 
-	if (!init_device_input(capture, dev))
-		return;
+ if (!init_device_input(capture, dev))
+ return;
 
-	AVCaptureInputPort *port = capture->device_input.ports0;
-	capture->has_clock = port respondsToSelector:@selector(clock);
+ AVCaptureInputPort *port = capture->device_input.ports0;
+ capture->has_clock = port respondsToSelector:@selector(clock);
 
-	capture->device = dev;
-	start_capture(capture);
-	return;
+ capture->device = dev;
+ start_capture(capture);
+ return;
 }
 
-static inline void handle_disconnect_capture(av_capture *capture,
-					 AVCaptureDevice *dev)
+static inline void handle_disconnect_capture(av_capture *capture, AVCaptureDevice *dev)
 {
-	if (!dev.uniqueID isEqualTo:capture->uid)
-		return;
+ if (!dev.uniqueID isEqualTo:capture->uid)
+ return;
 
-	if (!capture->device) {
-		AVLOG(LOG_INFO, "Received disconnect for inactive device '%s'",
-		 capture->uid.UTF8String);
-		return;
-	}
+ if (!capture->device) {
+ AVLOG(LOG_INFO, "Received disconnect for inactive device '%s'", capture->uid.UTF8String);
+ return;
+ }
 
-	AVLOG(LOG_WARNING, "Device with unique ID '%s' disconnected",
-	 dev.uniqueID.UTF8String);
+ AVLOG(LOG_WARNING, "Device with unique ID '%s' disconnected", dev.uniqueID.UTF8String);
 
-	remove_device(capture);
+ remove_device(capture);
 }
 
 static inline void handle_disconnect(av_capture *capture, AVCaptureDevice *dev)
 {
-	if (!dev)
-		return;
+ if (!dev)
+ return;
 
-	handle_disconnect_capture(capture, dev);
-	obs_source_update_properties(capture->source);
+ handle_disconnect_capture(capture, dev);
+ obs_source_update_properties(capture->source);
 }
 
-static inline void handle_connect_capture(av_capture *capture,
-					 AVCaptureDevice *dev,
-					 obs_data_t *settings)
+static inline void handle_connect_capture(av_capture *capture, AVCaptureDevice *dev, obs_data_t *settings)
 {
-	if (!dev.uniqueID isEqualTo:capture->uid)
-		return;
+ if (!dev.uniqueID isEqualTo:capture->uid)
+ return;
 
-	if (capture->device) {
-		AVLOG(LOG_ERROR, "Received connect for in-use device '%s'",
-		 capture->uid.UTF8String);
-		return;
-	}
+ if (capture->device) {
+ AVLOG(LOG_ERROR, "Received connect for in-use device '%s'", capture->uid.UTF8String);
+ return;
+ }
 
-	AVLOG(LOG_INFO,
-	 "Device with unique ID '%s' connected, "
-	 "resuming capture",
-	 dev.uniqueID.UTF8String);
+ AVLOG(LOG_INFO,
+ "Device with unique ID '%s' connected, "
+ "resuming capture",
+ dev.uniqueID.UTF8String);
 
-	capture_device(capture, dev, settings);
+ capture_device(capture, dev, settings);
 }
 
-static inline void handle_connect(av_capture *capture, AVCaptureDevice *dev,
-				 obs_data_t *settings)
+static inline void handle_connect(av_capture *capture, AVCaptureDevice *dev, obs_data_t *settings)
 {
-	if (!dev)
-		return;
+ if (!dev)
+ return;
 
-	handle_connect_capture(capture, dev, settings);
-	obs_source_update_properties(capture->source);
+ handle_connect_capture(capture, dev, settings);
+ obs_source_update_properties(capture->source);
 }
 
 static bool av_capture_init(av_capture *capture, obs_data_t *settings)
 {
-	if (!init_session(capture))
-		return false;
+ if (!init_session(capture))
+ return false;
 
-	capture->uid = get_string(settings, "device");
+ capture->uid = get_string(settings, "device");
 
-	NSNotificationCenter *nc = NSNotificationCenter defaultCenter;
-	capture->disconnect_observer.reset(nc
-		addObserverForName:AVCaptureDeviceWasDisconnectedNotification
-			 object:nil
-			 queue:NSOperationQueue mainQueue
-			usingBlock:^(NSNotification *note) {
-				handle_disconnect(capture, note.object);
-			});
+ NSNotificationCenter *nc = NSNotificationCenter defaultCenter;
+ capture->disconnect_observer.reset(nc addObserverForName:AVCaptureDeviceWasDisconnectedNotification object:nil
+ queue:NSOperationQueue mainQueue
+ usingBlock:^(NSNotification *note) {
+ handle_disconnect(capture, note.object);
+ });
 
-	capture->connect_observer.reset(nc
-		addObserverForName:AVCaptureDeviceWasConnectedNotification
-			 object:nil
-			 queue:NSOperationQueue mainQueue
-			usingBlock:^(NSNotification *note) {
-				handle_connect(capture, note.object, settings);
-			});
+ capture->connect_observer.reset(nc addObserverForName:AVCaptureDeviceWasConnectedNotification object:nil
+ queue:NSOperationQueue mainQueue
+ usingBlock:^(NSNotification *note) {
+ handle_connect(capture, note.object, settings);
+ });
 
-	AVCaptureDevice *dev =
-		AVCaptureDevice deviceWithUniqueID:capture->uid;
+ AVCaptureDevice *dev = AVCaptureDevice deviceWithUniqueID:capture->uid;
 
-	if (!dev) {
-		if (capture->uid.length < 1)
-			AVLOG(LOG_INFO, "No device selected");
-		else
-			AVLOG(LOG_WARNING,
-			 "Could not initialize device "
-			 "with unique ID '%s'",
-			 capture->uid.UTF8String);
-		return true;
-	}
+ if (!dev) {
+ if (capture->uid.length < 1)
+ AVLOG(LOG_INFO, "No device selected");
+ else
+ AVLOG(LOG_WARNING,
+ "Could not initialize device "
+ "with unique ID '%s'",
+ capture->uid.UTF8String);
+ return true;
+ }
 
-	capture_device(capture, dev, settings);
+ capture_device(capture, dev, settings);
 
-	return true;
+ return true;
 }
 
 static void *av_capture_create(obs_data_t *settings, obs_source_t *source)
 {
-	unique_ptr<av_capture> capture;
+ unique_ptr<av_capture> capture;
 
-	try {
-		capture.reset(new av_capture());
-	} catch (...) {
-		return capture.release();
-	}
+ try {
+ capture.reset(new av_capture());
+ } catch (...) {
+ return capture.release();
+ }
 
-	capture->source = source;
+ capture->source = source;
 
-	if (!av_capture_init(capture.get(), settings)) {
-		AVLOG(LOG_ERROR, "av_capture_init failed");
-		return nullptr;
-	}
+ if (!av_capture_init(capture.get(), settings)) {
+ AVLOG(LOG_ERROR, "av_capture_init failed");
+ return nullptr;
+ }
 
-	av_capture_enable_buffering(capture.get(),
-				 obs_data_get_bool(settings, "buffering"));
+ av_capture_enable_buffering(capture.get(), obs_data_get_bool(settings, "buffering"));
 
-	return capture.release();
+ return capture.release();
 }
 
 static NSArray *presets(void)
 {
-	return @
-		//AVCaptureSessionPresetiFrame1280x720,
-		//AVCaptureSessionPresetiFrame960x540,
-		AVCaptureSessionPreset3840x2160,
-		AVCaptureSessionPreset1920x1080, AVCaptureSessionPreset1280x720,
-		AVCaptureSessionPreset960x540, AVCaptureSessionPreset640x480,
-		AVCaptureSessionPreset352x288, AVCaptureSessionPreset320x240,
-		AVCaptureSessionPresetHigh,
-		//AVCaptureSessionPresetMedium,
-		//AVCaptureSessionPresetLow,
-		//AVCaptureSessionPresetPhoto,
-	;
+ return @
+ //AVCaptureSessionPresetiFrame1280x720,
+ //AVCaptureSessionPresetiFrame960x540,
+ AVCaptureSessionPreset3840x2160, AVCaptureSessionPreset1920x1080, AVCaptureSessionPreset1280x720,
+ AVCaptureSessionPreset960x540, AVCaptureSessionPreset640x480, AVCaptureSessionPreset352x288,
+ AVCaptureSessionPreset320x240, AVCaptureSessionPresetHigh,
+ //AVCaptureSessionPresetMedium,
+ //AVCaptureSessionPresetLow,
+ //AVCaptureSessionPresetPhoto,
+ ;
 }
 
 static NSString *preset_names(NSString *preset)
 {
-	NSDictionary *preset_names = nil;
-	preset_names = @{
-		AVCaptureSessionPresetLow: @"Low",
-		AVCaptureSessionPresetMedium: @"Medium",
-		AVCaptureSessionPresetHigh: @"High",
-		AVCaptureSessionPreset320x240: @"320x240",
-		AVCaptureSessionPreset352x288: @"352x288",
-		AVCaptureSessionPreset640x480: @"640x480",
-		AVCaptureSessionPreset960x540: @"960x540",
-		AVCaptureSessionPreset1280x720: @"1280x720",
-		AVCaptureSessionPreset1920x1080: @"1920x1080",
-		AVCaptureSessionPreset3840x2160: @"3840x2160",
-		AVCaptureSessionPresetHigh: @"High",
-	};
-	NSString *name = preset_namespreset;
-	if (name)
-		return name;
-	return NSString stringWithFormat:@"Unknown (%@)", preset;
-}
-
-inline static void av_capture_defaults(obs_data_t *settings,
-				 bool enable_audio_and_high_preset)
-{
-	obs_data_set_default_string(settings, "uid", "");
-	obs_data_set_default_bool(settings, "use_preset", true);
-
-	obs_data_set_default_string(
-		settings, "preset",
-		enable_audio_and_high_preset
-			? AVCaptureSessionPresetHigh.UTF8String
-			: AVCaptureSessionPreset1280x720.UTF8String);
-
-	obs_data_set_default_int(settings, "input_format", INPUT_FORMAT_AUTO);
-	obs_data_set_default_int(settings, "color_space", COLOR_SPACE_AUTO);
-	obs_data_set_default_int(settings, "video_range", VIDEO_RANGE_AUTO);
-
-	obs_data_set_default_bool(settings, "enable_audio",
-				 enable_audio_and_high_preset);
+ NSDictionary *preset_names = nil;
+ preset_names = @ {
+ AVCaptureSessionPresetLow: @"Low",
+ AVCaptureSessionPresetMedium: @"Medium",
+ AVCaptureSessionPresetHigh: @"High",
+ AVCaptureSessionPreset320x240: @"320x240",
+ AVCaptureSessionPreset352x288: @"352x288",
+ AVCaptureSessionPreset640x480: @"640x480",
+ AVCaptureSessionPreset960x540: @"960x540",
+ AVCaptureSessionPreset1280x720: @"1280x720",
+ AVCaptureSessionPreset1920x1080: @"1920x1080",
+ AVCaptureSessionPreset3840x2160: @"3840x2160",
+ AVCaptureSessionPresetHigh: @"High",
+ };
+ NSString *name = preset_namespreset;
+ if (name)
+ return name;
+ return NSString stringWithFormat:@"Unknown (%@)", preset;
+}
+
+inline static void av_capture_defaults(obs_data_t *settings, bool enable_audio_and_high_preset)
+{
+ obs_data_set_default_string(settings, "uid", "");
+ obs_data_set_default_bool(settings, "use_preset", true);
+
+ obs_data_set_default_string(settings, "preset",
+ enable_audio_and_high_preset ? AVCaptureSessionPresetHigh.UTF8String
+ : AVCaptureSessionPreset1280x720.UTF8String);
+
+ obs_data_set_default_int(settings, "input_format", INPUT_FORMAT_AUTO);
+ obs_data_set_default_int(settings, "color_space", COLOR_SPACE_AUTO);
+ obs_data_set_default_int(settings, "video_range", VIDEO_RANGE_AUTO);
+
+ obs_data_set_default_bool(settings, "enable_audio", enable_audio_and_high_preset);
 }
 
 static void av_capture_defaults_v1(obs_data_t *settings)
 {
-	av_capture_defaults(settings, false);
+ av_capture_defaults(settings, false);
 }
 
 static void av_capture_defaults_v2(obs_data_t *settings)
 {
-	av_capture_defaults(settings, true);
+ av_capture_defaults(settings, true);
 }
 
-static bool update_device_list(obs_property_t *list, NSString *uid,
-			 NSString *name, bool disconnected)
+static bool update_device_list(obs_property_t *list, NSString *uid, NSString *name, bool disconnected)
 {
-	bool dev_found = false;
-	bool list_modified = false;
+ bool dev_found = false;
+ bool list_modified = false;
 
-	size_t size = obs_property_list_item_count(list);
-	for (size_t i = 0; i < size;) {
-		const char *uid_ = obs_property_list_item_string(list, i);
-		bool found = uid isEqualToString:@(uid_ ? uid_ : "");
-		bool disabled = obs_property_list_item_disabled(list, i);
-		if (!found && !disabled) {
-			i += 1;
-			continue;
-		}
+ size_t size = obs_property_list_item_count(list);
+ for (size_t i = 0; i < size;) {
+ const char *uid_ = obs_property_list_item_string(list, i);
+ bool found = uid isEqualToString:@(uid_ ? uid_ : "");
+ bool disabled = obs_property_list_item_disabled(list, i);
+ if (!found && !disabled) {
+ i += 1;
+ continue;
+ }
 
-		if (disabled && !found) {
-			list_modified = true;
-			obs_property_list_item_remove(list, i);
-			continue;
-		}
+ if (disabled && !found) {
+ list_modified = true;
+ obs_property_list_item_remove(list, i);
+ continue;
+ }
 
-		if (disabled != disconnected)
-			list_modified = true;
+ if (disabled != disconnected)
+ list_modified = true;
 
-		dev_found = true;
-		obs_property_list_item_disable(list, i, disconnected);
-		i += 1;
-	}
+ dev_found = true;
+ obs_property_list_item_disable(list, i, disconnected);
+ i += 1;
+ }
 
-	if (dev_found)
-		return list_modified;
+ if (dev_found)
+ return list_modified;
 
-	size_t idx = obs_property_list_add_string(list, name.UTF8String,
-						 uid.UTF8String);
-	obs_property_list_item_disable(list, idx, disconnected);
+ size_t idx = obs_property_list_add_string(list, name.UTF8String, uid.UTF8String);
+ obs_property_list_item_disable(list, idx, disconnected);
 
-	return true;
+ return true;
 }
 
-static void fill_presets(AVCaptureDevice *dev, obs_property_t *list,
-			 NSString *current_preset)
+static void fill_presets(AVCaptureDevice *dev, obs_property_t *list, NSString *current_preset)
 {
-	obs_property_list_clear(list);
+ obs_property_list_clear(list);
 
-	bool preset_found = false;
-	for (NSString *preset in presets()) {
-		bool is_current = preset isEqualToString:current_preset;
-		bool supported = dev &&
-				 dev supportsAVCaptureSessionPreset:preset;
+ bool preset_found = false;
+ for (NSString *preset in presets()) {
+ bool is_current = preset isEqualToString:current_preset;
+ bool supported = dev && dev supportsAVCaptureSessionPreset:preset;
 
-		if (is_current)
-			preset_found = true;
+ if (is_current)
+ preset_found = true;
 
-		if (!supported && !is_current)
-			continue;
+ if (!supported && !is_current)
+ continue;
 
-		size_t idx = obs_property_list_add_string(
-			list, preset_names(preset).UTF8String,
-			preset.UTF8String);
-		obs_property_list_item_disable(list, idx, !supported);
-	}
+ size_t idx = obs_property_list_add_string(list, preset_names(preset).UTF8String, preset.UTF8String);
+ obs_property_list_item_disable(list, idx, !supported);
+ }
 
-	if (preset_found)
-		return;
+ if (preset_found)
+ return;
 
-	size_t idx = obs_property_list_add_string(
-		list, preset_names(current_preset).UTF8String,
-		current_preset.UTF8String);
-	obs_property_list_item_disable(list, idx, true);
+ size_t idx = obs_property_list_add_string(list, preset_names(current_preset).UTF8String, current_preset.UTF8String);
+ obs_property_list_item_disable(list, idx, true);
 }
 
-static bool check_preset(AVCaptureDevice *dev, obs_property_t *list,
-			 obs_data_t *settings)
+static bool check_preset(AVCaptureDevice *dev, obs_property_t *list, obs_data_t *settings)
 {
-	NSString *current_preset = get_string(settings, "preset");
+ NSString *current_preset = get_string(settings, "preset");
 
-	size_t size = obs_property_list_item_count(list);
-	NSMutableSet *listed = NSMutableSet setWithCapacity:size;
+ size_t size = obs_property_list_item_count(list);
+ NSMutableSet *listed = NSMutableSet setWithCapacity:size;
 
-	for (size_t i = 0; i < size; i++)
-		listed addObject:@(obs_property_list_item_string(list, i));
+ for (size_t i = 0; i < size; i++)
+ listed addObject:@(obs_property_list_item_string(list, i));
 
-	bool presets_changed = false;
-	for (NSString *preset in presets()) {
-		bool is_listed = listed member:preset != nil;
-		bool supported = dev &&
-				 dev supportsAVCaptureSessionPreset:preset;
+ bool presets_changed = false;
+ for (NSString *preset in presets()) {
+ bool is_listed = listed member:preset != nil;
+ bool supported = dev && dev supportsAVCaptureSessionPreset:preset;
 
-		if (supported == is_listed)
-			continue;
+ if (supported == is_listed)
+ continue;
 
-		presets_changed = true;
-	}
+ presets_changed = true;
+ }
 
-	if (!presets_changed && listed member:current_preset != nil)
-		return false;
+ if (!presets_changed && listed member:current_preset != nil)
+ return false;
 
-	fill_presets(dev, list, current_preset);
-	return true;
+ fill_presets(dev, list, current_preset);
+ return true;
 }
 
 static bool autoselect_preset(AVCaptureDevice *dev, obs_data_t *settings)
 {
-	NSString *preset = get_string(settings, "preset");
-	if (!dev || dev supportsAVCaptureSessionPreset:preset) {
-		if (obs_data_has_autoselect_value(settings, "preset")) {
-			obs_data_unset_autoselect_value(settings, "preset");
-			return true;
-		}
+ NSString *preset = get_string(settings, "preset");
+ if (!dev || dev supportsAVCaptureSessionPreset:preset) {
+ if (obs_data_has_autoselect_value(settings, "preset")) {
+ obs_data_unset_autoselect_value(settings, "preset");
+ return true;
+ }
 
-	} else {
-		preset = select_preset(dev, preset);
-		const char *autoselect =
-			obs_data_get_autoselect_string(settings, "preset");
-		if (!preset isEqualToString:@(autoselect)) {
-			obs_data_set_autoselect_string(settings, "preset",
-						 preset.UTF8String);
-			return true;
-		}
-	}
+ } else {
+ preset = select_preset(dev, preset);
+ const char *autoselect = obs_data_get_autoselect_string(settings, "preset");
+ if (!preset isEqualToString:@(autoselect)) {
+ obs_data_set_autoselect_string(settings, "preset", preset.UTF8String);
+ return true;
+ }
+ }
 
-	return false;
+ return false;
 }
 
 static CMVideoDimensions get_dimensions(AVCaptureDeviceFormat *format)
 {
-	auto desc = format.formatDescription;
-	return CMVideoFormatDescriptionGetDimensions(desc);
+ auto desc = format.formatDescription;
+ return CMVideoFormatDescriptionGetDimensions(desc);
 }
 
 using resolutions_t = vector<CMVideoDimensions>;
 
 static resolutions_t enumerate_resolutions(AVCaptureDevice *dev)
 {
-	resolutions_t res;
+ resolutions_t res;
 
-	if (!dev)
-		return res;
+ if (!dev)
+ return res;
 
-	res.reserve(dev.formats.count + 1);
+ res.reserve(dev.formats.count + 1);
 
-	for (AVCaptureDeviceFormat *format in dev.formats) {
-		auto dims = get_dimensions(format);
+ for (AVCaptureDeviceFormat *format in dev.formats) {
+ auto dims = get_dimensions(format);
 
-		if (find(begin(res), end(res), dims) == end(res))
-			res.push_back(dims);
-	}
+ if (find(begin(res), end(res), dims) == end(res))
+ res.push_back(dims);
+ }
 
-	return res;
+ return res;
 }
 
 static void sort_resolutions(vector<CMVideoDimensions> &resolutions)
 {
-	auto cmp = (const CMVideoDimensions &a, const CMVideoDimensions &b) {
-		return a.width * a.height > b.width * b.height;
-	};
+ auto cmp = (const CMVideoDimensions &a, const CMVideoDimensions &b) {
+ return a.width * a.height > b.width * b.height;
+ };
 
-	sort(begin(resolutions), end(resolutions), cmp);
+ sort(begin(resolutions), end(resolutions), cmp);
 }
 
 static void data_set_resolution(obs_data_t *data, const CMVideoDimensions &dims)
 {
-	obs_data_set_int(data, "width", dims.width);
-	obs_data_set_int(data, "height", dims.height);
+ obs_data_set_int(data, "width", dims.width);
+ obs_data_set_int(data, "height", dims.height);
 }
 
-static void data_set_resolution(const unique_ptr<obs_data_t> &data,
-				const CMVideoDimensions &dims)
+static void data_set_resolution(const unique_ptr<obs_data_t> &data, const CMVideoDimensions &dims)
 {
-	data_set_resolution(data.get(), dims);
+ data_set_resolution(data.get(), dims);
 }
 
-static bool add_resolution_to_list(vector<CMVideoDimensions> &res,
-				 const CMVideoDimensions &dims)
+static bool add_resolution_to_list(vector<CMVideoDimensions> &res, const CMVideoDimensions &dims)
 {
-	if (find(begin(res), end(res), dims) != end(res))
-		return false;
+ if (find(begin(res), end(res), dims) != end(res))
+ return false;
 
-	res.push_back(dims);
-	return true;
+ res.push_back(dims);
+ return true;
 }
 
 static const char *obs_data_get_json(const unique_ptr<obs_data_t> &data)
 {
-	return obs_data_get_json(data.get());
+ return obs_data_get_json(data.get());
 }
 
 static bool operator==(const CMVideoDimensions &a, const CMVideoDimensions &b)
 {
-	return a.width == b.width && a.height == b.height;
+ return a.width == b.width && a.height == b.height;
 }
 
-static bool resolution_property_needs_update(obs_property_t *p,
-					 const resolutions_t &resolutions)
+static bool resolution_property_needs_update(obs_property_t *p, const resolutions_t &resolutions)
 {
-	vector<bool> res_found(resolutions.size());
+ vector<bool> res_found(resolutions.size());
 
-	auto num = obs_property_list_item_count(p);
-	for (size_t i = 1; i < num; i++) { // skip empty entry
-		const char *json = obs_property_list_item_string(p, i);
-		unique_ptr<obs_data_t> buffer{obs_data_create_from_json(json)};
+ auto num = obs_property_list_item_count(p);
+ for (size_t i = 1; i < num; i++) { // skip empty entry
+ const char *json = obs_property_list_item_string(p, i);
+ unique_ptr<obs_data_t> buffer {obs_data_create_from_json(json)};
 
-		CMVideoDimensions dims{};
-		if (!get_resolution(buffer.get(), dims))
-			return true;
+ CMVideoDimensions dims {};
+ if (!get_resolution(buffer.get(), dims))
+ return true;
 
-		auto pos = find(begin(resolutions), end(resolutions), dims);
-		if (pos == end(resolutions))
-			return true;
+ auto pos = find(begin(resolutions), end(resolutions), dims);
+ if (pos == end(resolutions))
+ return true;
 
-		res_foundpos - begin(resolutions) = true;
-	}
+ res_foundpos - begin(resolutions) = true;
+ }
 
-	return any_of(begin(res_found), end(res_found),
-		 (bool b) { return !b; });
+ return any_of(begin(res_found), end(res_found), (bool b) {
+ return !b;
+ });
 }
 
-static bool update_resolution_property(obs_properties_t *props,
-				 const config_helper &conf,
-				 obs_property_t *p = nullptr)
+static bool update_resolution_property(obs_properties_t *props, const config_helper &conf, obs_property_t *p = nullptr)
 {
-	if (!p)
-		p = obs_properties_get(props, "resolution");
+ if (!p)
+ p = obs_properties_get(props, "resolution");
 
-	if (!p)
-		return false;
+ if (!p)
+ return false;
 
-	auto valid_dims = conf.dims();
-	auto resolutions = enumerate_resolutions(conf.dev());
+ auto valid_dims = conf.dims();
+ auto resolutions = enumerate_resolutions(conf.dev());
 
-	bool unsupported = true;
-	if (valid_dims)
-		unsupported = add_resolution_to_list(resolutions, *valid_dims);
+ bool unsupported = true;
+ if (valid_dims)
+ unsupported = add_resolution_to_list(resolutions, *valid_dims);
 
-	bool was_enabled = obs_property_enabled(p);
-	obs_property_set_enabled(p, !!conf.dev());
+ bool was_enabled = obs_property_enabled(p);
+ obs_property_set_enabled(p, !!conf.dev());
 
-	if (!resolution_property_needs_update(p, resolutions))
-		return was_enabled != obs_property_enabled(p);
+ if (!resolution_property_needs_update(p, resolutions))
+ return was_enabled != obs_property_enabled(p);
 
-	sort_resolutions(resolutions);
+ sort_resolutions(resolutions);
 
-	obs_property_list_clear(p);
-	obs_property_list_add_string(p, "", "{}");
+ obs_property_list_clear(p);
+ obs_property_list_add_string(p, "", "{}");
 
-	DStr name;
-	unique_ptr<obs_data_t> buffer{obs_data_create()};
-	for (const CMVideoDimensions &dims : resolutions) {
-		data_set_resolution(buffer, dims);
-		auto json = obs_data_get_json(buffer);
-		dstr_printf(name, "%dx%d", dims.width, dims.height);
-		size_t idx = obs_property_list_add_string(p, name->array, json);
+ DStr name;
+ unique_ptr<obs_data_t> buffer {obs_data_create()};
+ for (const CMVideoDimensions &dims : resolutions) {
+ data_set_resolution(buffer, dims);
+ auto json = obs_data_get_json(buffer);
+ dstr_printf(name, "%dx%d", dims.width, dims.height);
+ size_t idx = obs_property_list_add_string(p, name->array, json);
 
-		if (unsupported && valid_dims && dims == *valid_dims)
-			obs_property_list_item_disable(p, idx, true);
-	}
+ if (unsupported && valid_dims && dims == *valid_dims)
+ obs_property_list_item_disable(p, idx, true);
+ }
 
-	return true;
+ return true;
 }
 
 static media_frames_per_second convert(CMTime time_)
 {
-	media_frames_per_second res{};
-	clamp(res.numerator, time_.timescale);
-	clamp(res.denominator, time_.value);
-	return res;
+ media_frames_per_second res {};
+ clamp(res.numerator, time_.timescale);
+ clamp(res.denominator, time_.value);
+ return res;
 }
 
-using frame_rates_t =
-	vector<pair<media_frames_per_second, media_frames_per_second>>;
-static frame_rates_t
-enumerate_frame_rates(AVCaptureDevice *dev,
-		 const CMVideoDimensions *dims = nullptr)
+using frame_rates_t = vector<pair<media_frames_per_second, media_frames_per_second>>;
+
+static frame_rates_t enumerate_frame_rates(AVCaptureDevice *dev, const CMVideoDimensions *dims = nullptr)
 {
-	frame_rates_t res;
+ frame_rates_t res;
 
-	if (!dev || !dims)
-		return res;
+ if (!dev || !dims)
+ return res;
 
-	auto add_unique_frame_rate_range = &(AVFrameRateRange *range) {
-		auto min = convert(range.maxFrameDuration);
-		auto max = convert(range.minFrameDuration);
+ auto add_unique_frame_rate_range = &(AVFrameRateRange *range) {
+ auto min = convert(range.maxFrameDuration);
+ auto max = convert(range.minFrameDuration);
 
-		auto pair = make_pair(min, max);
+ auto pair = make_pair(min, max);
 
-		if (find(begin(res), end(res), pair) != end(res))
-			return;
+ if (find(begin(res), end(res), pair) != end(res))
+ return;
 
-		res.push_back(pair);
-	};
+ res.push_back(pair);
+ };
 
-	for (AVCaptureDeviceFormat *format in dev.formats) {
-		if (!(get_dimensions(format) == *dims))
-			continue;
+ for (AVCaptureDeviceFormat *format in dev.formats) {
+ if (!(get_dimensions(format) == *dims))
+ continue;
 
-		for (AVFrameRateRange *range in format
-			 .videoSupportedFrameRateRanges) {
-			add_unique_frame_rate_range(range);
+ for (AVFrameRateRange *range in format.videoSupportedFrameRateRanges) {
+ add_unique_frame_rate_range(range);
 
-			if (CMTimeCompare(range.minFrameDuration,
-					 range.maxFrameDuration) != 0) {
-				blog(LOG_WARNING,
-				 "Got actual frame rate range:"
-				 " %g - %g "
-				 "({%lld, %d} - {%lld, %d})",
-				 range.minFrameRate, range.maxFrameRate,
-				 range.maxFrameDuration.value,
-				 range.maxFrameDuration.timescale,
-				 range.minFrameDuration.value,
-				 range.minFrameDuration.timescale);
-			}
-		}
-	}
+ if (CMTimeCompare(range.minFrameDuration, range.maxFrameDuration) != 0) {
+ blog(LOG_WARNING,
+ "Got actual frame rate range:"
+ " %g - %g "
+ "({%lld, %d} - {%lld, %d})",
+ range.minFrameRate, range.maxFrameRate, range.maxFrameDuration.value,
+ range.maxFrameDuration.timescale, range.minFrameDuration.value, range.minFrameDuration.timescale);
+ }
+ }
+ }
 
-	return res;
+ return res;
 }
 
-static bool operator==(const media_frames_per_second &a,
-		 const media_frames_per_second &b)
+static bool operator==(const media_frames_per_second &a, const media_frames_per_second &b)
 {
-	return a.numerator == b.numerator && a.denominator == b.denominator;
+ return a.numerator == b.numerator && a.denominator == b.denominator;
 }
 
-static bool operator!=(const media_frames_per_second &a,
-		 const media_frames_per_second &b)
+static bool operator!=(const media_frames_per_second &a, const media_frames_per_second &b)
 {
-	return !(a == b);
+ return !(a == b);
 }
 
-static bool frame_rate_property_needs_update(obs_property_t *p,
-					 const frame_rates_t &frame_rates)
+static bool frame_rate_property_needs_update(obs_property_t *p, const frame_rates_t &frame_rates)
 {
-	auto fps_num = frame_rates.size();
-	auto num = obs_property_frame_rate_fps_ranges_count(p);
-	if (fps_num != num)
-		return true;
+ auto fps_num = frame_rates.size();
+ auto num = obs_property_frame_rate_fps_ranges_count(p);
+ if (fps_num != num)
+ return true;
 
-	vector<bool> fps_found(fps_num);
-	for (size_t i = 0; i < num; i++) {
-		auto min_ = obs_property_frame_rate_fps_range_min(p, i);
-		auto max_ = obs_property_frame_rate_fps_range_max(p, i);
+ vector<bool> fps_found(fps_num);
+ for (size_t i = 0; i < num; i++) {
+ auto min_ = obs_property_frame_rate_fps_range_min(p, i);
+ auto max_ = obs_property_frame_rate_fps_range_max(p, i);
 
-		auto it = find(begin(frame_rates), end(frame_rates),
-			 make_pair(min_, max_));
-		if (it == end(frame_rates))
-			return true;
+ auto it = find(begin(frame_rates), end(frame_rates), make_pair(min_, max_));
+ if (it == end(frame_rates))
+ return true;
 
-		fps_foundit - begin(frame_rates) = true;
-	}
+ fps_foundit - begin(frame_rates) = true;
+ }
 
-	return any_of(begin(fps_found), end(fps_found),
-		 (bool b) { return !b; });
+ return any_of(begin(fps_found), end(fps_found), (bool b) {
+ return !b;
+ });
 }
 
-static bool update_frame_rate_property(obs_properties_t *props,
-				 const config_helper &conf,
-				 obs_property_t *p = nullptr)
+static bool update_frame_rate_property(obs_properties_t *props, const config_helper &conf, obs_property_t *p = nullptr)
 {
-	if (!p)
-		p = obs_properties_get(props, "frame_rate");
+ if (!p)
+ p = obs_properties_get(props, "frame_rate");
 
-	if (!p)
-		return false;
+ if (!p)
+ return false;
 
-	auto valid_dims = conf.dims();
-	auto frame_rates = enumerate_frame_rates(conf.dev(), valid_dims);
+ auto valid_dims = conf.dims();
+ auto frame_rates = enumerate_frame_rates(conf.dev(), valid_dims);
 
-	bool was_enabled = obs_property_enabled(p);
-	obs_property_set_enabled(p, !frame_rates.empty());
+ bool was_enabled = obs_property_enabled(p);
+ obs_property_set_enabled(p, !frame_rates.empty());
 
-	if (!frame_rate_property_needs_update(p, frame_rates))
-		return was_enabled != obs_property_enabled(p);
+ if (!frame_rate_property_needs_update(p, frame_rates))
+ return was_enabled != obs_property_enabled(p);
 
-	obs_property_frame_rate_fps_ranges_clear(p);
-	for (auto &pair : frame_rates)
-		obs_property_frame_rate_fps_range_add(p, pair.first,
-						 pair.second);
+ obs_property_frame_rate_fps_ranges_clear(p);
+ for (auto &pair : frame_rates)
+ obs_property_frame_rate_fps_range_add(p, pair.first, pair.second);
 
-	return true;
+ return true;
 }
 
-static vector<AVCaptureDeviceFormat *>
-enumerate_formats(AVCaptureDevice *dev, const CMVideoDimensions &dims,
-		 const media_frames_per_second &fps)
+static vector<AVCaptureDeviceFormat *> enumerate_formats(AVCaptureDevice *dev, const CMVideoDimensions &dims,
+ const media_frames_per_second &fps)
 {
-	vector<AVCaptureDeviceFormat *> result;
+ vector<AVCaptureDeviceFormat *> result;
 
-	find_formats(fps, dev, &dims, &(AVCaptureDeviceFormat *format) {
-		result.push_back(format);
-		return false;
-	});
+ find_formats(fps, dev, &dims, &(AVCaptureDeviceFormat *format) {
+ result.push_back(format);
+ return false;
+ });
 
-	return result;
+ return result;
 }
 
-static bool input_format_property_needs_update(
-	obs_property_t *p, const vector<AVCaptureDeviceFormat *> &formats,
-	const FourCharCode *fourcc_)
+static bool input_format_property_needs_update(obs_property_t *p, const vector<AVCaptureDeviceFormat *> &formats,
+ const FourCharCode *fourcc_)
 {
-	bool fourcc_found = !fourcc_;
-	vector<bool> if_found(formats.size());
+ bool fourcc_found = !fourcc_;
+ vector<bool> if_found(formats.size());
 
-	auto num = obs_property_list_item_count(p);
-	for (size_t i = 1; i < num; i++) { // skip auto entry
-		FourCharCode fourcc =
-			(FourCharCode)obs_property_list_item_int(p, i);
-		fourcc_found = fourcc_found || fourcc == *fourcc_;
+ auto num = obs_property_list_item_count(p);
+ for (size_t i = 1; i < num; i++) { // skip auto entry
+ FourCharCode fourcc = (FourCharCode) obs_property_list_item_int(p, i);
+ fourcc_found = fourcc_found || fourcc == *fourcc_;
 
-		auto pos = find_if(begin(formats), end(formats),
-				 &(AVCaptureDeviceFormat *format) {
-					 FourCharCode fourcc_ = 0;
-					 format_description_subtype_name(
-						 format.formatDescription,
-						 &fourcc_);
-					 return fourcc_ == fourcc;
-				 });
-		if (pos == end(formats))
-			return true;
+ auto pos = find_if(begin(formats), end(formats), &(AVCaptureDeviceFormat *format) {
+ FourCharCode fourcc_ = 0;
+ format_description_subtype_name(format.formatDescription, &fourcc_);
+ return fourcc_ == fourcc;
+ });
+ if (pos == end(formats))
+ return true;
 
-		if_foundpos - begin(formats) = true;
-	}
+ if_foundpos - begin(formats) = true;
+ }
 
-	return fourcc_found || any_of(begin(if_found), end(if_found),
-				 (bool b) { return !b; });
+ return fourcc_found || any_of(begin(if_found), end(if_found), (bool b) {
+ return !b;
+ });
 }
 
-static bool update_input_format_property(obs_properties_t *props,
-					 const config_helper &conf,
-					 obs_property_t *p = nullptr)
+static bool update_input_format_property(obs_properties_t *props, const config_helper &conf,
+ obs_property_t *p = nullptr)
 {
-	if (!p)
-		p = obs_properties_get(props, "input_format");
+ if (!p)
+ p = obs_properties_get(props, "input_format");
 
-	if (!p)
-		return false;
+ if (!p)
+ return false;
 
-	auto update_enabled = &(bool enabled) {
-		bool was_enabled = obs_property_enabled(p);
-		obs_property_set_enabled(p, enabled);
-		return was_enabled != enabled;
-	};
+ auto update_enabled = &(bool enabled) {
+ bool was_enabled = obs_property_enabled(p);
+ obs_property_set_enabled(p, enabled);
+ return was_enabled != enabled;
+ };
 
-	auto valid_dims = conf.dims();
-	auto valid_fps = conf.fps();
-	auto valid_if = conf.input_format();
+ auto valid_dims = conf.dims();
+ auto valid_fps = conf.fps();
+ auto valid_if = conf.input_format();
 
-	if (!valid_dims || !valid_fps)
-		return update_enabled(false);
+ if (!valid_dims || !valid_fps)
+ return update_enabled(false);
 
-	auto formats = enumerate_formats(conf.dev(), *valid_dims, *valid_fps);
-	if (!input_format_property_needs_update(p, formats, valid_if))
-		return update_enabled(!formats.empty());
+ auto formats = enumerate_formats(conf.dev(), *valid_dims, *valid_fps);
+ if (!input_format_property_needs_update(p, formats, valid_if))
+ return update_enabled(!formats.empty());
 
-	while (obs_property_list_item_count(p) > 1)
-		obs_property_list_item_remove(p, 1);
+ while (obs_property_list_item_count(p) > 1)
+ obs_property_list_item_remove(p, 1);
 
-	bool fourcc_found = !valid_if || *valid_if == INPUT_FORMAT_AUTO;
-	for (auto &format : formats) {
-		FourCharCode fourcc = 0;
-		const char *name = format_description_subtype_name(
-			format.formatDescription, &fourcc);
-		obs_property_list_add_int(p, name, fourcc);
-		fourcc_found = fourcc_found || fourcc == *valid_if;
-	}
+ bool fourcc_found = !valid_if || *valid_if == INPUT_FORMAT_AUTO;
+ for (auto &format : formats) {
+ FourCharCode fourcc = 0;
+ const char *name = format_description_subtype_name(format.formatDescription, &fourcc);
+ obs_property_list_add_int(p, name, fourcc);
+ fourcc_found = fourcc_found || fourcc == *valid_if;
+ }
 
-	if (!fourcc_found) {
-		const char *name = fourcc_subtype_name(*valid_if);
-		obs_property_list_add_int(p, name, *valid_if);
-	}
+ if (!fourcc_found) {
+ const char *name = fourcc_subtype_name(*valid_if);
+ obs_property_list_add_int(p, name, *valid_if);
+ }
 
-	return update_enabled(!formats.empty());
+ return update_enabled(!formats.empty());
 }
 
-static bool update_int_list_property(obs_property_t *p, const int *val,
-				 const size_t count,
-				 const char *localization_name)
+static bool update_int_list_property(obs_property_t *p, const int *val, const size_t count,
+ const char *localization_name)
 {
-	size_t num = obs_property_list_item_count(p);
-	if (num > count) {
-		if (!val || obs_property_list_item_int(p, count) != *val) {
-			obs_property_list_item_remove(p, count);
+ size_t num = obs_property_list_item_count(p);
+ if (num > count) {
+ if (!val || obs_property_list_item_int(p, count) != *val) {
+ obs_property_list_item_remove(p, count);
 
-			if (!val)
-				return true;
-		} else {
-			return false;
-		}
-	}
+ if (!val)
+ return true;
+ } else {
+ return false;
+ }
+ }
 
-	if (!val)
-		return false;
+ if (!val)
+ return false;
 
-	DStr buf, label;
-	dstr_printf(buf, "%d", *val);
-	dstr_init_copy(label, obs_module_text(localization_name));
-	dstr_replace(label, "%1", buf->array);
-	size_t idx = obs_property_list_add_int(p, label->array, *val);
-	obs_property_list_item_disable(p, idx, true);
+ DStr buf, label;
+ dstr_printf(buf, "%d", *val);
+ dstr_init_copy(label, obs_module_text(localization_name));
+ dstr_replace(label, "%1", buf->array);
+ size_t idx = obs_property_list_add_int(p, label->array, *val);
+ obs_property_list_item_disable(p, idx, true);
 
-	return true;
+ return true;
 }
 
 template<typename Func>
-static bool
-update_int_list_property(const char *prop_name, const char *localization_name,
-			 size_t count, int auto_val, bool (*valid_func)(int),
-			 obs_properties_t *props, const config_helper &conf,
-			 obs_property_t *p, Func get_val)
+static bool update_int_list_property(const char *prop_name, const char *localization_name, size_t count, int auto_val,
+ bool (*valid_func)(int), obs_properties_t *props, const config_helper &conf,
+ obs_property_t *p, Func get_val)
 {
-	auto ref = get_ref(props);
-	if (!p)
-		p = obs_properties_get(props, prop_name);
+ auto ref = get_ref(props);
+ if (!p)
+ p = obs_properties_get(props, prop_name);
 
-	int val = (int)obs_data_get_int(conf.settings, prop_name);
+ int val = (int) obs_data_get_int(conf.settings, prop_name);
 
-	av_video_info vi;
-	if (ref)
-		vi = ref->video_info.read();
+ av_video_info vi;
+ if (ref)
+ vi = ref->video_info.read();
 
-	bool params_valid = vi.video_params_valid;
-	bool enabled = obs_property_enabled(p);
-	bool should_enable = false;
-	bool has_autoselect =
-		obs_data_has_autoselect_value(conf.settings, prop_name);
+ bool params_valid = vi.video_params_valid;
+ bool enabled = obs_property_enabled(p);
+ bool should_enable = false;
+ bool has_autoselect = obs_data_has_autoselect_value(conf.settings, prop_name);
 
-	if ((params_valid && format_is_yuv(ref->frame.format)) ||
-	 !valid_func(val))
-		should_enable = true;
+ if ((params_valid && format_is_yuv(ref->frame.format)) || !valid_func(val))
+ should_enable = true;
 
-	obs_property_set_enabled(p, should_enable);
-	bool updated = enabled != should_enable;
+ obs_property_set_enabled(p, should_enable);
+ bool updated = enabled != should_enable;
 
-	updated = update_int_list_property(p, valid_func(val) ? nullptr : &val,
-					 count, localization_name) ||
-		 updated;
+ updated = update_int_list_property(p, valid_func(val) ? nullptr : &val, count, localization_name) || updated;
 
-	if (!should_enable) {
-		if (has_autoselect)
-			obs_data_unset_autoselect_value(conf.settings,
-							prop_name);
-		return updated || has_autoselect;
-	}
+ if (!should_enable) {
+ if (has_autoselect)
+ obs_data_unset_autoselect_value(conf.settings, prop_name);
+ return updated || has_autoselect;
+ }
 
-	bool use_autoselect = ref && val == auto_val;
-	if (!use_autoselect) {
-		if (has_autoselect)
-			obs_data_unset_autoselect_value(conf.settings,
-							prop_name);
-		return updated || has_autoselect;
-	}
+ bool use_autoselect = ref && val == auto_val;
+ if (!use_autoselect) {
+ if (has_autoselect)
+ obs_data_unset_autoselect_value(conf.settings, prop_name);
+ return updated || has_autoselect;
+ }
 
-	if (params_valid && get_val(vi) != obs_data_get_autoselect_int(
-						 conf.settings, prop_name)) {
-		obs_data_set_autoselect_int(conf.settings, prop_name,
-					 get_val(vi));
-		return true;
-	}
+ if (params_valid && get_val(vi) != obs_data_get_autoselect_int(conf.settings, prop_name)) {
+ obs_data_set_autoselect_int(conf.settings, prop_name, get_val(vi));
+ return true;
+ }
 
-	return updated;
+ return updated;
 }
 
-static bool update_color_space_property(obs_properties_t *props,
-					const config_helper &conf,
-					obs_property_t *p = nullptr)
+static bool update_color_space_property(obs_properties_t *props, const config_helper &conf, obs_property_t *p = nullptr)
 {
-	return update_int_list_property("color_space", TEXT_COLOR_UNKNOWN_NAME,
-					4, COLOR_SPACE_AUTO, color_space_valid,
-					props, conf, p, (av_video_info vi) {
-						return vi.colorspace;
-					});
+ return update_int_list_property("color_space", TEXT_COLOR_UNKNOWN_NAME, 4, COLOR_SPACE_AUTO, color_space_valid,
+ props, conf, p, (av_video_info vi) {
+ return vi.colorspace;
+ });
 }
 
-static bool update_video_range_property(obs_properties_t *props,
-					const config_helper &conf,
-					obs_property_t *p = nullptr)
+static bool update_video_range_property(obs_properties_t *props, const config_helper &conf, obs_property_t *p = nullptr)
 {
-	return update_int_list_property("video_range", TEXT_RANGE_UNKNOWN_NAME,
-					5, VIDEO_RANGE_AUTO, video_range_valid,
-					props, conf, p, (av_video_info vi) {
-						return vi.video_range;
-					});
+ return update_int_list_property("video_range", TEXT_RANGE_UNKNOWN_NAME, 5, VIDEO_RANGE_AUTO, video_range_valid,
+ props, conf, p, (av_video_info vi) {
+ return vi.video_range;
+ });
 }
 
-static bool properties_device_changed(obs_properties_t *props,
-				 obs_property_t *p, obs_data_t *settings)
+static bool properties_device_changed(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	NSString *uid = get_string(settings, "device");
-	AVCaptureDevice *dev = AVCaptureDevice deviceWithUniqueID:uid;
+ NSString *uid = get_string(settings, "device");
+ AVCaptureDevice *dev = AVCaptureDevice deviceWithUniqueID:uid;
 
-	NSString *name = get_string(settings, "device_name");
-	bool dev_list_updated =
-		update_device_list(p, uid, name, !dev && uid.length);
+ NSString *name = get_string(settings, "device_name");
+ bool dev_list_updated = update_device_list(p, uid, name, !dev && uid.length);
 
-	p = obs_properties_get(props, "preset");
-	bool preset_list_changed = check_preset(dev, p, settings);
-	bool autoselect_changed = autoselect_preset(dev, settings);
+ p = obs_properties_get(props, "preset");
+ bool preset_list_changed = check_preset(dev, p, settings);
+ bool autoselect_changed = autoselect_preset(dev, settings);
 
-	config_helper conf{settings};
-	bool res_changed = update_resolution_property(props, conf);
-	bool fps_changed = update_frame_rate_property(props, conf);
-	bool if_changed = update_input_format_property(props, conf);
+ config_helper conf {settings};
+ bool res_changed = update_resolution_property(props, conf);
+ bool fps_changed = update_frame_rate_property(props, conf);
+ bool if_changed = update_input_format_property(props, conf);
 
-	return preset_list_changed || autoselect_changed || dev_list_updated ||
-	 res_changed || fps_changed || if_changed;
+ return preset_list_changed || autoselect_changed || dev_list_updated || res_changed || fps_changed || if_changed;
 }
 
-static bool properties_use_preset_changed(obs_properties_t *props,
-					 obs_property_t *,
-					 obs_data_t *settings)
+static bool properties_use_preset_changed(obs_properties_t *props, obs_property_t *, obs_data_t *settings)
 {
-	auto use_preset = obs_data_get_bool(settings, "use_preset");
+ auto use_preset = obs_data_get_bool(settings, "use_preset");
 
-	config_helper conf{settings};
+ config_helper conf {settings};
 
-	bool updated = false;
-	bool visible = false;
-	obs_property_t *p = nullptr;
+ bool updated = false;
+ bool visible = false;
+ obs_property_t *p = nullptr;
 
-	auto noop = (obs_properties_t *, const config_helper &,
-		 obs_property_t *) { return false; };
+ auto noop = (obs_properties_t *, const config_helper &, obs_property_t *) {
+ return false;
+ };
 
-#define UPDATE_PROPERTY(prop, uses_preset, func) \
-	p = obs_properties_get(props, prop); \
-	visible = use_preset == uses_preset; \
-	updated = obs_property_visible(p) != visible || updated; \
-	obs_property_set_visible(p, visible); \
-	updated = func(props, conf, p) || updated;
+#define UPDATE_PROPERTY(prop, uses_preset, func) \
+ p = obs_properties_get(props, prop); \
+ visible = use_preset == uses_preset; \
+ updated = obs_property_visible(p) != visible || updated; \
+ obs_property_set_visible(p, visible); \
+ updated = func(props, conf, p) || updated;
 
-	UPDATE_PROPERTY("preset", true, noop);
-	UPDATE_PROPERTY("resolution", false, update_resolution_property);
-	UPDATE_PROPERTY("frame_rate", false, update_frame_rate_property);
-	UPDATE_PROPERTY("input_format", false, update_input_format_property);
-	UPDATE_PROPERTY("color_space", false, update_color_space_property);
-	UPDATE_PROPERTY("video_range", false, update_video_range_property);
+ UPDATE_PROPERTY("preset", true, noop);
+ UPDATE_PROPERTY("resolution", false, update_resolution_property);
+ UPDATE_PROPERTY("frame_rate", false, update_frame_rate_property);
+ UPDATE_PROPERTY("input_format", false, update_input_format_property);
+ UPDATE_PROPERTY("color_space", false, update_color_space_property);
+ UPDATE_PROPERTY("video_range", false, update_video_range_property);
 
-	return updated;
+ return updated;
 }
 
-static bool properties_preset_changed(obs_properties_t *, obs_property_t *p,
-				 obs_data_t *settings)
+static bool properties_preset_changed(obs_properties_t *, obs_property_t *p, obs_data_t *settings)
 {
-	NSString *uid = get_string(settings, "device");
-	AVCaptureDevice *dev = AVCaptureDevice deviceWithUniqueID:uid;
+ NSString *uid = get_string(settings, "device");
+ AVCaptureDevice *dev = AVCaptureDevice deviceWithUniqueID:uid;
 
-	bool preset_list_changed = check_preset(dev, p, settings);
-	bool autoselect_changed = autoselect_preset(dev, settings);
+ bool preset_list_changed = check_preset(dev, p, settings);
+ bool autoselect_changed = autoselect_preset(dev, settings);
 
-	return preset_list_changed || autoselect_changed;
+ return preset_list_changed || autoselect_changed;
 }
 
-static bool properties_resolution_changed(obs_properties_t *props,
-					 obs_property_t *p,
-					 obs_data_t *settings)
+static bool properties_resolution_changed(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	config_helper conf{settings};
+ config_helper conf {settings};
 
-	bool res_updated = update_resolution_property(props, conf, p);
-	bool fps_updated = update_frame_rate_property(props, conf);
-	bool if_updated = update_input_format_property(props, conf);
-	bool cs_updated = update_color_space_property(props, conf);
-	bool cr_updated = update_video_range_property(props, conf);
+ bool res_updated = update_resolution_property(props, conf, p);
+ bool fps_updated = update_frame_rate_property(props, conf);
+ bool if_updated = update_input_format_property(props, conf);
+ bool cs_updated = update_color_space_property(props, conf);
+ bool cr_updated = update_video_range_property(props, conf);
 
-	return res_updated || fps_updated || if_updated || cs_updated ||
-	 cr_updated;
+ return res_updated || fps_updated || if_updated || cs_updated || cr_updated;
 }
 
-static bool properties_frame_rate_changed(obs_properties_t *props,
-					 obs_property_t *p,
-					 obs_data_t *settings)
+static bool properties_frame_rate_changed(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	config_helper conf{settings};
+ config_helper conf {settings};
 
-	bool fps_updated = update_frame_rate_property(props, conf, p);
-	bool if_updated = update_input_format_property(props, conf);
-	bool cs_updated = update_color_space_property(props, conf);
-	bool cr_updated = update_video_range_property(props, conf);
+ bool fps_updated = update_frame_rate_property(props, conf, p);
+ bool if_updated = update_input_format_property(props, conf);
+ bool cs_updated = update_color_space_property(props, conf);
+ bool cr_updated = update_video_range_property(props, conf);
 
-	return fps_updated || if_updated || cs_updated || cr_updated;
+ return fps_updated || if_updated || cs_updated || cr_updated;
 }
 
-static bool properties_input_format_changed(obs_properties_t *props,
-					 obs_property_t *p,
-					 obs_data_t *settings)
+static bool properties_input_format_changed(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	config_helper conf{settings};
+ config_helper conf {settings};
 
-	bool if_updated = update_input_format_property(props, conf, p);
-	bool cs_updated = update_color_space_property(props, conf);
-	bool cr_updated = update_video_range_property(props, conf);
+ bool if_updated = update_input_format_property(props, conf, p);
+ bool cs_updated = update_color_space_property(props, conf);
+ bool cr_updated = update_video_range_property(props, conf);
 
-	return if_updated || cs_updated || cr_updated;
+ return if_updated || cs_updated || cr_updated;
 }
 
-static bool properties_color_space_changed(obs_properties_t *props,
-					 obs_property_t *p,
-					 obs_data_t *settings)
+static bool properties_color_space_changed(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	config_helper conf{settings};
+ config_helper conf {settings};
 
-	return update_color_space_property(props, conf, p);
+ return update_color_space_property(props, conf, p);
 }
 
-static bool properties_video_range_changed(obs_properties_t *props,
-					 obs_property_t *p,
-					 obs_data_t *settings)
+static bool properties_video_range_changed(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	config_helper conf{settings};
+ config_helper conf {settings};
 
-	return update_video_range_property(props, conf, p);
+ return update_video_range_property(props, conf, p);
 }
 
 static void add_properties_param(obs_properties_t *props, av_capture *capture)
 {
-	auto param =
-		unique_ptr<properties_param>(new properties_param(capture));
+ auto param = unique_ptr<properties_param>(new properties_param(capture));
 
-	obs_properties_set_param(props, param.release(), (void *param) {
-		delete static_cast<properties_param *>(param);
-	});
+ obs_properties_set_param(props, param.release(), (void *param) {
+ delete static_cast<properties_param *>(param);
+ });
 }
 
 static void add_preset_properties(obs_properties_t *props)
 {
-	obs_property_t *preset_list = obs_properties_add_list(
-		props, "preset", TEXT_PRESET, OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_STRING);
-	for (NSString *preset in presets())
-		obs_property_list_add_string(preset_list,
-					 preset_names(preset).UTF8String,
-					 preset.UTF8String);
+ obs_property_t *preset_list =
+ obs_properties_add_list(props, "preset", TEXT_PRESET, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+ for (NSString *preset in presets())
+ obs_property_list_add_string(preset_list, preset_names(preset).UTF8String, preset.UTF8String);
 
-	obs_property_set_modified_callback(preset_list,
-					 properties_preset_changed);
+ obs_property_set_modified_callback(preset_list, properties_preset_changed);
 }
 
 static void add_manual_properties(obs_properties_t *props)
 {
-	obs_property_t *resolutions = obs_properties_add_list(
-		props, "resolution", TEXT_RESOLUTION, OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_STRING);
-	obs_property_set_enabled(resolutions, false);
-	obs_property_set_modified_callback(resolutions,
-					 properties_resolution_changed);
+ obs_property_t *resolutions =
+ obs_properties_add_list(props, "resolution", TEXT_RESOLUTION, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+ obs_property_set_enabled(resolutions, false);
+ obs_property_set_modified_callback(resolutions, properties_resolution_changed);
 
-	obs_property_t *frame_rates = obs_properties_add_frame_rate(
-		props, "frame_rate", TEXT_FRAME_RATE);
-	/*obs_property_frame_rate_option_add(frame_rates, "match obs",
+ obs_property_t *frame_rates = obs_properties_add_frame_rate(props, "frame_rate", TEXT_FRAME_RATE);
+ /*obs_property_frame_rate_option_add(frame_rates, "match obs",
 			TEXT_MATCH_OBS);*/
-	obs_property_set_enabled(frame_rates, false);
-	obs_property_set_modified_callback(frame_rates,
-					 properties_frame_rate_changed);
-
-	obs_property_t *input_format = obs_properties_add_list(
-		props, "input_format", TEXT_INPUT_FORMAT, OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(input_format, TEXT_AUTO, INPUT_FORMAT_AUTO);
-	obs_property_set_enabled(input_format, false);
-	obs_property_set_modified_callback(input_format,
-					 properties_input_format_changed);
-
-	obs_property_t *color_space = obs_properties_add_list(
-		props, "color_space", TEXT_COLOR_SPACE, OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(color_space, TEXT_AUTO, COLOR_SPACE_AUTO);
-	obs_property_list_add_int(color_space, "Rec. 601", VIDEO_CS_601);
-	obs_property_list_add_int(color_space, "Rec. 709", VIDEO_CS_709);
-	obs_property_set_enabled(color_space, false);
-	obs_property_set_modified_callback(color_space,
-					 properties_color_space_changed);
+ obs_property_set_enabled(frame_rates, false);
+ obs_property_set_modified_callback(frame_rates, properties_frame_rate_changed);
+
+ obs_property_t *input_format =
+ obs_properties_add_list(props, "input_format", TEXT_INPUT_FORMAT, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+ obs_property_list_add_int(input_format, TEXT_AUTO, INPUT_FORMAT_AUTO);
+ obs_property_set_enabled(input_format, false);
+ obs_property_set_modified_callback(input_format, properties_input_format_changed);
+
+ obs_property_t *color_space =
+ obs_properties_add_list(props, "color_space", TEXT_COLOR_SPACE, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+ obs_property_list_add_int(color_space, TEXT_AUTO, COLOR_SPACE_AUTO);
+ obs_property_list_add_int(color_space, "Rec. 601", VIDEO_CS_601);
+ obs_property_list_add_int(color_space, "Rec. 709", VIDEO_CS_709);
+ obs_property_set_enabled(color_space, false);
+ obs_property_set_modified_callback(color_space, properties_color_space_changed);
 
 #define ADD_RANGE(x) obs_property_list_add_int(video_range, TEXT_##x, VIDEO_##x)
-	obs_property_t *video_range = obs_properties_add_list(
-		props, "video_range", TEXT_VIDEO_RANGE, OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_INT);
-	obs_property_list_add_int(video_range, TEXT_AUTO, VIDEO_RANGE_AUTO);
-	ADD_RANGE(RANGE_PARTIAL);
-	ADD_RANGE(RANGE_FULL);
-	obs_property_set_enabled(video_range, false);
-	obs_property_set_modified_callback(video_range,
-					 properties_video_range_changed);
+ obs_property_t *video_range =
+ obs_properties_add_list(props, "video_range", TEXT_VIDEO_RANGE, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+ obs_property_list_add_int(video_range, TEXT_AUTO, VIDEO_RANGE_AUTO);
+ ADD_RANGE(RANGE_PARTIAL);
+ ADD_RANGE(RANGE_FULL);
+ obs_property_set_enabled(video_range, false);
+ obs_property_set_modified_callback(video_range, properties_video_range_changed);
 #undef ADD_RANGE
 }
 
 static obs_properties_t *av_capture_properties(void *data)
 {
-	obs_properties_t *props = obs_properties_create();
-
-	obs_property_t *dev_list = obs_properties_add_list(
-		props, "device", TEXT_DEVICE, OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_STRING);
-	obs_property_list_add_string(dev_list, "", "");
-
-	NSMutableArray *device_types = NSMutableArray
-		arrayWithObjects:AVCaptureDeviceTypeBuiltInWideAngleCamera,
-				 AVCaptureDeviceTypeExternalUnknown, nil;
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
-	if (__builtin_available(macOS 13.0, *)) {
-		device_types addObject:AVCaptureDeviceTypeDeskViewCamera;
-	}
-#endif
-	AVCaptureDeviceDiscoverySession *video_discovery = AVCaptureDeviceDiscoverySession
-		discoverySessionWithDeviceTypes:device_types
-				 mediaType:AVMediaTypeVideo
-				 position:AVCaptureDevicePositionUnspecified;
-	for (AVCaptureDevice *dev in video_discovery devices) {
-		obs_property_list_add_string(dev_list,
-					 dev.localizedName.UTF8String,
-					 dev.uniqueID.UTF8String);
-	}
-
-	AVCaptureDeviceDiscoverySession *muxed_discovery = AVCaptureDeviceDiscoverySession
-		discoverySessionWithDeviceTypes:device_types
-				 mediaType:AVMediaTypeMuxed
-				 position:AVCaptureDevicePositionUnspecified;
-	for (AVCaptureDevice *dev in muxed_discovery devices) {
-		obs_property_list_add_string(dev_list,
-					 dev.localizedName.UTF8String,
-					 dev.uniqueID.UTF8String);
-	}
-
-	obs_property_set_modified_callback(dev_list, properties_device_changed);
-
-	obs_property_t *use_preset =
-		obs_properties_add_bool(props, "use_preset", TEXT_USE_PRESET);
-	obs_property_set_modified_callback(use_preset,
-					 properties_use_preset_changed);
-
-	add_preset_properties(props);
-
-	add_manual_properties(props);
-
-	obs_properties_add_bool(props, "buffering",
-				obs_module_text("Buffering"));
-
-	if (data) {
-		struct av_capture *capture = static_cast<av_capture *>(data);
-
-		add_properties_param(props, capture);
-
-		OBSDataAutoRelease current_settings =
-			obs_source_get_settings(capture->source);
-		if (!obs_data_get_bool(current_settings, "enable_audio")) {
-			auto cb = (obs_properties_t *, obs_property_t *prop,
-				 void *data) {
-				struct av_capture *capture =
-					static_cast<av_capture *>(data);
-				OBSDataAutoRelease settings = obs_data_create();
-				obs_data_set_bool(settings, "enable_audio",
-						 true);
-				obs_source_update(capture->source, settings);
-
-				// Enable all audio tracks
-				obs_source_set_audio_mixers(capture->source,
-							 0x3F);
-				obs_property_set_visible(prop, false);
-				return true;
-			};
-			obs_properties_add_button2(
-				props, "enable_audio_button",
-				obs_module_text("EnableAudio"), cb, capture);
-		}
-	}
-
-	return props;
-}
-
-static void switch_device(av_capture *capture, NSString *uid,
-			 obs_data_t *settings)
-{
-	if (!uid)
-		return;
-
-	if (capture->device)
-		remove_device(capture);
-
-	capture->uid = uid;
-
-	if (!uid.length) {
-		AVLOG(LOG_INFO, "No device selected, stopping capture");
-		return;
-	}
-
-	AVCaptureDevice *dev = AVCaptureDevice deviceWithUniqueID:uid;
-	if (!dev) {
-		AVLOG(LOG_WARNING, "Device with unique id '%s' not found",
-		 uid.UTF8String);
-		return;
-	}
-
-	capture_device(capture, dev, settings);
+ obs_properties_t *props = obs_properties_create();
+
+ obs_property_t *dev_list =
+ obs_properties_add_list(props, "device", TEXT_DEVICE, OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+ obs_property_list_add_string(dev_list, "", "");
+
+ NSMutableArray *device_types = NSMutableArray
+ arrayWithObjects:AVCaptureDeviceTypeBuiltInWideAngleCamera, AVCaptureDeviceTypeExternalUnknown, nil;
+ if (__builtin_available(macOS 13.0, *)) {
+ device_types addObject:AVCaptureDeviceTypeDeskViewCamera;
+ }
+ AVCaptureDeviceDiscoverySession *video_discovery =
+ AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:device_types mediaType:AVMediaTypeVideo
+ position:AVCaptureDevicePositionUnspecified;
+ for (AVCaptureDevice *dev in video_discovery devices) {
+ obs_property_list_add_string(dev_list, dev.localizedName.UTF8String, dev.uniqueID.UTF8String);
+ }
+
+ AVCaptureDeviceDiscoverySession *muxed_discovery =
+ AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:device_types mediaType:AVMediaTypeMuxed
+ position:AVCaptureDevicePositionUnspecified;
+ for (AVCaptureDevice *dev in muxed_discovery devices) {
+ obs_property_list_add_string(dev_list, dev.localizedName.UTF8String, dev.uniqueID.UTF8String);
+ }
+
+ obs_property_set_modified_callback(dev_list, properties_device_changed);
+
+ obs_property_t *use_preset = obs_properties_add_bool(props, "use_preset", TEXT_USE_PRESET);
+ obs_property_set_modified_callback(use_preset, properties_use_preset_changed);
+
+ add_preset_properties(props);
+
+ add_manual_properties(props);
+
+ obs_properties_add_bool(props, "buffering", obs_module_text("Buffering"));
+
+ if (data) {
+ struct av_capture *capture = static_cast<av_capture *>(data);
+
+ add_properties_param(props, capture);
+
+ OBSDataAutoRelease current_settings = obs_source_get_settings(capture->source);
+ if (!obs_data_get_bool(current_settings, "enable_audio")) {
+ auto cb = (obs_properties_t *, obs_property_t *prop, void *data) {
+ struct av_capture *capture = static_cast<av_capture *>(data);
+ OBSDataAutoRelease settings = obs_data_create();
+ obs_data_set_bool(settings, "enable_audio", true);
+ obs_source_update(capture->source, settings);
+
+ // Enable all audio tracks
+ obs_source_set_audio_mixers(capture->source, 0x3F);
+ obs_property_set_visible(prop, false);
+ return true;
+ };
+ obs_properties_add_button2(props, "enable_audio_button", obs_module_text("EnableAudio"), cb, capture);
+ }
+ }
+
+ return props;
+}
+
+static void switch_device(av_capture *capture, NSString *uid, obs_data_t *settings)
+{
+ if (!uid)
+ return;
+
+ if (capture->device)
+ remove_device(capture);
+
+ capture->uid = uid;
+
+ if (!uid.length) {
+ AVLOG(LOG_INFO, "No device selected, stopping capture");
+ return;
+ }
+
+ AVCaptureDevice *dev = AVCaptureDevice deviceWithUniqueID:uid;
+ if (!dev) {
+ AVLOG(LOG_WARNING, "Device with unique id '%s' not found", uid.UTF8String);
+ return;
+ }
+
+ capture_device(capture, dev, settings);
 }
 
 static void update_preset(av_capture *capture, obs_data_t *settings)
 {
-	unlock_device(capture);
+ unlock_device(capture);
 
-	NSString *preset = get_string(settings, "preset");
-	if (!capture->device supportsAVCaptureSessionPreset:preset) {
-		AVLOG(LOG_WARNING, "Preset %s not available",
-		 preset.UTF8String);
-		preset = select_preset(capture->device, preset);
-	}
+ NSString *preset = get_string(settings, "preset");
+ if (!capture->device supportsAVCaptureSessionPreset:preset) {
+ AVLOG(LOG_WARNING, "Preset %s not available", preset.UTF8String);
+ preset = select_preset(capture->device, preset);
+ }
 
-	capture->session.sessionPreset = preset;
-	AVLOG(LOG_INFO, "Selected preset %s", preset.UTF8String);
+ capture->session.sessionPreset = preset;
+ AVLOG(LOG_INFO, "Selected preset %s", preset.UTF8String);
 
-	start_capture(capture);
+ start_capture(capture);
 }
 
 static void update_manual(av_capture *capture, obs_data_t *settings)
 {
-	if (init_manual(capture, capture->device, settings))
-		start_capture(capture);
+ if (init_manual(capture, capture->device, settings))
+ start_capture(capture);
 }
 
 static void av_capture_update(void *data, obs_data_t *settings)
 {
-	auto capture = static_cast<av_capture *>(data);
+ auto capture = static_cast<av_capture *>(data);
 
-	NSString *uid = get_string(settings, "device");
+ NSString *uid = get_string(settings, "device");
 
-	if (!capture->device || !capture->device.uniqueID isEqualToString:uid)
-		return switch_device(capture, uid, settings);
+ if (!capture->device || !capture->device.uniqueID isEqualToString:uid)
+ return switch_device(capture, uid, settings);
 
-	if ((capture->use_preset = obs_data_get_bool(settings, "use_preset"))) {
-		update_preset(capture, settings);
-	} else {
-		update_manual(capture, settings);
-	}
+ if ((capture->use_preset = obs_data_get_bool(settings, "use_preset"))) {
+ update_preset(capture, settings);
+ } else {
+ update_manual(capture, settings);
+ }
 
-	av_capture_enable_buffering(capture,
-				 obs_data_get_bool(settings, "buffering"));
+ av_capture_enable_buffering(capture, obs_data_get_bool(settings, "buffering"));
 
-	av_capture_set_audio_active(
-		capture,
-		obs_data_get_bool(settings, "enable_audio") &&
-			(capture->device hasMediaType:AVMediaTypeAudio ||
-			 capture->device hasMediaType:AVMediaTypeMuxed));
+ av_capture_set_audio_active(capture, obs_data_get_bool(settings, "enable_audio") &&
+ (capture->device hasMediaType:AVMediaTypeAudio ||
+ capture->device hasMediaType:AVMediaTypeMuxed));
 }
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("mac-avcapture", "en-US")
+
 MODULE_EXPORT const char *obs_module_description(void)
 {
-	return "MacOS AVFoundation Capture source";
+ return "MacOS AVFoundation Capture source";
 }
 
 bool obs_module_load(void)
 {
-	// Enable iOS device to show up as AVCapture devices
-	// From WWDC video 2014 #508 at 5:34
-	// https://developer.apple.com/videos/wwdc/2014/#508
-	CMIOObjectPropertyAddress prop = {
-		kCMIOHardwarePropertyAllowScreenCaptureDevices,
-		kCMIOObjectPropertyScopeGlobal,
-		kCMIOObjectPropertyElementMaster};
-	UInt32 allow = 1;
-	CMIOObjectSetPropertyData(kCMIOObjectSystemObject, &prop, 0, NULL,
-				 sizeof(allow), &allow);
-
-	obs_source_info av_capture_info = {
-		.id = "av_capture_input",
-		.type = OBS_SOURCE_TYPE_INPUT,
-		.output_flags = OBS_SOURCE_ASYNC_VIDEO | OBS_SOURCE_AUDIO |
-				OBS_SOURCE_DO_NOT_DUPLICATE |
-				OBS_SOURCE_CAP_OBSOLETE,
-		.get_name = av_capture_getname,
-		.create = av_capture_create,
-		.destroy = av_capture_destroy,
-		.get_defaults = av_capture_defaults_v1,
-		.get_properties = av_capture_properties,
-		.update = av_capture_update,
-		.icon_type = OBS_ICON_TYPE_CAMERA,
-	};
-	obs_register_source(&av_capture_info);
-
-	av_capture_info.version = 2;
-	av_capture_info.output_flags = OBS_SOURCE_ASYNC_VIDEO |
-				 OBS_SOURCE_AUDIO |
-				 OBS_SOURCE_DO_NOT_DUPLICATE;
-	av_capture_info.get_defaults = av_capture_defaults_v2;
-
-	obs_register_source(&av_capture_info);
-	return true;
+ // Enable iOS device to show up as AVCapture devices
+ // From WWDC video 2014 #508 at 5:34
+ // https://developer.apple.com/videos/wwdc/2014/#508
+ CMIOObjectPropertyAddress prop = {kCMIOHardwarePropertyAllowScreenCaptureDevices, kCMIOObjectPropertyScopeGlobal,
+ kCMIOObjectPropertyElementMain};
+ UInt32 allow = 1;
+ CMIOObjectSetPropertyData(kCMIOObjectSystemObject, &prop, 0, NULL, sizeof(allow), &allow);
+
+ obs_source_info av_capture_info = {
+ .id = "av_capture_input",
+ .type = OBS_SOURCE_TYPE_INPUT,
+ .output_flags = OBS_SOURCE_ASYNC_VIDEO | OBS_SOURCE_AUDIO | OBS_SOURCE_DO_NOT_DUPLICATE |
+ OBS_SOURCE_CAP_OBSOLETE,
+ .get_name = av_capture_getname,
+ .create = av_capture_create,
+ .destroy = av_capture_destroy,
+ .get_defaults = av_capture_defaults_v1,
+ .get_properties = av_capture_properties,
+ .update = av_capture_update,
+ .icon_type = OBS_ICON_TYPE_CAMERA,
+ };
+ obs_register_source(&av_capture_info);
+
+ av_capture_info.version = 2;
+ av_capture_info.output_flags = OBS_SOURCE_ASYNC_VIDEO | OBS_SOURCE_AUDIO | OBS_SOURCE_DO_NOT_DUPLICATE;
+ av_capture_info.get_defaults = av_capture_defaults_v2;
+
+ obs_register_source(&av_capture_info);
+ return true;
 }

obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ar-SA.ini Changed

obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/be-BY.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/id-ID.ini Changed

obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/th-TH.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/th-TH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/left-right.hpp -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/left-right.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/mac-avcapture/scope-guard.hpp -> obs-studio-30.0.2.tar.xz/plugins/mac-avcapture/scope-guard.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/CGDisplayStream.h -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/CGDisplayStream.h Changed

@@ -35,8 +35,7 @@
  regions were merely copied from one place to another.   A routine is provided to merge two update refs together in cases
  where apps need to coalesce the values because they decided to skip processing for one or more frames.
 */
-typedef const struct CF_BRIDGED_TYPE(id)
-	CGDisplayStreamUpdate *CGDisplayStreamUpdateRef;
+typedef const struct CF_BRIDGED_TYPE(id) CGDisplayStreamUpdate *CGDisplayStreamUpdateRef;
 
 /*!
  @enum CGDisplayStreamUpdateRectType
@@ -47,10 +46,10 @@
  @const kCGDisplayStreamUpdateReducedDirtyRects A possibly simplified (but overstated) array of dirty rectangles
 */
 typedef CF_ENUM(int32_t, CGDisplayStreamUpdateRectType) {
-	kCGDisplayStreamUpdateRefreshedRects,
-	kCGDisplayStreamUpdateMovedRects,
-	kCGDisplayStreamUpdateDirtyRects,
-	kCGDisplayStreamUpdateReducedDirtyRects,
+    kCGDisplayStreamUpdateRefreshedRects,
+    kCGDisplayStreamUpdateMovedRects,
+    kCGDisplayStreamUpdateDirtyRects,
+    kCGDisplayStreamUpdateReducedDirtyRects,
 };
 
 /*!
@@ -62,10 +61,10 @@
  @const kCGDisplayStreamFrameStatusStopped The display stream has stopped and no more calls will be made to the handler until the stream is started.
 */
 typedef CF_ENUM(int32_t, CGDisplayStreamFrameStatus) {
-	kCGDisplayStreamFrameStatusFrameComplete,
-	kCGDisplayStreamFrameStatusFrameIdle,
-	kCGDisplayStreamFrameStatusFrameBlank,
-	kCGDisplayStreamFrameStatusStopped,
+    kCGDisplayStreamFrameStatusFrameComplete,
+    kCGDisplayStreamFrameStatusFrameIdle,
+    kCGDisplayStreamFrameStatusFrameBlank,
+    kCGDisplayStreamFrameStatusStopped,
 };
 
 /*
@@ -84,20 +83,18 @@
  of the handler, you must CFRetain() it, as it will be CFRelease()'d by the CGDisplayStream after the handler returns.   The updateRef will be NULL in cases
  when status is not kCGDisplayStreamFrameStatusFrameComplete.
  */
-typedef void (^CGDisplayStreamFrameAvailableHandler)(
-	CGDisplayStreamFrameStatus status, uint64_t displayTime,
-	IOSurfaceRef __nullable frameSurface,
-	CGDisplayStreamUpdateRef __nullable updateRef);
+typedef void (^CGDisplayStreamFrameAvailableHandler)(CGDisplayStreamFrameStatus status, uint64_t displayTime,
+                                                     IOSurfaceRef __nullable frameSurface,
+                                                     CGDisplayStreamUpdateRef __nullable updateRef);
 
 /*!
  @function CGDisplayStreamUpdateGetTypeID
  @abstract Returns the CF "class" ID for CGDisplayStreamUpdate
  @result The CFTypeID of the CGDisplayStreamUpdate class.
 */
-CG_EXTERN CFTypeID
-CGDisplayStreamUpdateGetTypeID(void) CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStreamOutputType instead");
+CG_EXTERN CFTypeID CGDisplayStreamUpdateGetTypeID(void) CG_AVAILABLE_BUT_DEPRECATED(
+    11.0, 14.0,
+    "There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStreamOutputType instead");
 
 /*!
  @function CGDisplayStreamUpdateGetRects
@@ -107,12 +104,11 @@
  @param rectCount A pointer to where the count of the number of rectangles in the array is to be returned. Must not be NULL.
  @result A pointer to the array of CGRectangles.  This array should not be freed by the caller.
 */
-CG_EXTERN const CGRect *__nullable CGDisplayStreamUpdateGetRects(
-	CGDisplayStreamUpdateRef __nullable updateRef,
-	CGDisplayStreamUpdateRectType rectType, size_t *rectCount)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"Please use ScreenCaptureKit API's SCStreamFrameInfo with SCStreamFrameInfoContentRect instead");
+CG_EXTERN const CGRect *__nullable CGDisplayStreamUpdateGetRects(CGDisplayStreamUpdateRef __nullable updateRef,
+                                                                 CGDisplayStreamUpdateRectType rectType,
+                                                                 size_t *rectCount)
+    CG_AVAILABLE_BUT_DEPRECATED(
+        11.0, 14.0, "Please use ScreenCaptureKit API's SCStreamFrameInfo with SCStreamFrameInfoContentRect instead");
 
 /*!
  @function CGDisplayStreamUpdateCreateMerged
@@ -126,13 +122,11 @@
  @param secondUpdate The second update (in a temporal sense)
  @result The new CGDisplayStreamUpdateRef
 */
-CG_EXTERN CGDisplayStreamUpdateRef __nullable
-CGDisplayStreamUpdateCreateMergedUpdate(
-	CGDisplayStreamUpdateRef __nullable firstUpdate,
-	CGDisplayStreamUpdateRef __nullable secondUpdate)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStreamFrameInfo to replace CGDisplayStreamUpdate");
+CG_EXTERN CGDisplayStreamUpdateRef __nullable CGDisplayStreamUpdateCreateMergedUpdate(
+    CGDisplayStreamUpdateRef __nullable firstUpdate, CGDisplayStreamUpdateRef __nullable secondUpdate)
+    CG_AVAILABLE_BUT_DEPRECATED(
+        11.0, 14.0,
+        "There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStreamFrameInfo to replace CGDisplayStreamUpdate");
 
 /*!
  @function CGDisplayStreamUpdateGetMovedRectsDelta
@@ -142,11 +136,10 @@
  @param dy A pointer to a CGFloat to store the y component of the movement delta
  @discussion The delta values describe the offset from the moved rectangles back to the source location.
 */
-CG_EXTERN void CGDisplayStreamUpdateGetMovedRectsDelta(
-	CGDisplayStreamUpdateRef __nullable updateRef, CGFloat *dx, CGFloat *dy)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"Please use ScreenCaptureKit API's SCStreamFrameInfo with SCStreamFrameInfoContentRect instead");
+CG_EXTERN void CGDisplayStreamUpdateGetMovedRectsDelta(CGDisplayStreamUpdateRef __nullable updateRef, CGFloat *dx,
+                                                       CGFloat *dy)
+    CG_AVAILABLE_BUT_DEPRECATED(
+        11.0, 14.0, "Please use ScreenCaptureKit API's SCStreamFrameInfo with SCStreamFrameInfoContentRect instead");
 
 /*!
  @function CGDisplayStreamGetDropCount
@@ -156,11 +149,9 @@
  @discussion This call is primarily useful for performance measurement to determine if the client is keeping up with
  all WindowServer updates.
 */
-CG_EXTERN size_t
-CGDisplayStreamUpdateGetDropCount(CGDisplayStreamUpdateRef __nullable updateRef)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStreamFrameInfo to replace CGDisplayStreamUpdate");
+CG_EXTERN size_t CGDisplayStreamUpdateGetDropCount(CGDisplayStreamUpdateRef __nullable updateRef) CG_AVAILABLE_BUT_DEPRECATED(
+    11.0, 14.0,
+    "There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStreamFrameInfo to replace CGDisplayStreamUpdate");
 
 /* Optional CGDisplayStream Properties */
 
@@ -172,8 +163,8 @@
  HiDPI displays.
 */
 CG_EXTERN const CFStringRef kCGDisplayStreamSourceRect CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration sourceRect property instead"); /* Source rectangle to capture - defaults to entire display */
+    11.0, 14.0,
+    "Please use ScreenCaptureKit API's SCStreamConfiguration sourceRect property instead"); /* Source rectangle to capture - defaults to entire display */
 
 /*!
  @const kCGDisplayStreamDestinationRect
@@ -183,8 +174,8 @@
  specified in terms of pixels.
  */
 CG_EXTERN const CFStringRef kCGDisplayStreamDestinationRect CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration destinationRect property instead"); /* Destination rectangle - defaults to entire buffer */
+    11.0, 14.0,
+    "Please use ScreenCaptureKit API's SCStreamConfiguration destinationRect property instead"); /* Destination rectangle - defaults to entire buffer */
 
 /*!
  @const kCGDisplayStreamPreserveAspectRatio
@@ -194,40 +185,40 @@
  in order to preserve the source aspect ratio.
  */
 CG_EXTERN const CFStringRef kCGDisplayStreamPreserveAspectRatio CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration preserveAspectRatio property instead"); /* CFBoolean - defaults to true */
+    11.0, 14.0,
+    "Please use ScreenCaptureKit API's SCStreamConfiguration preserveAspectRatio property instead"); /* CFBoolean - defaults to true */
 
 /*!
  @const kCGDisplayStreamColorSpace
  @discussion Set the desired CGColorSpace of the output frames.  By default the color space will be that of the display.
 */
 CG_EXTERN const CFStringRef kCGDisplayStreamColorSpace CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration colorSpaceName property instead"); /* Desired output color space (CGColorSpaceRef) - defaults to display color space */
+    11.0, 14.0,
+    "Please use ScreenCaptureKit API's SCStreamConfiguration colorSpaceName property instead"); /* Desired output color space (CGColorSpaceRef) - defaults to display color space */
 
 /*!
  @const kCGDisplayStreamMinimumFrameTime
  @discussion Request that the delta between frame updates be at least as much specified by this value.
 */
 CG_EXTERN const CFStringRef kCGDisplayStreamMinimumFrameTime CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration minimumFrameInterval property instead"); /* CFNumber in seconds, defaults to zero. */
+    11.0, 14.0,
+    "Please use ScreenCaptureKit API's SCStreamConfiguration minimumFrameInterval property instead"); /* CFNumber in seconds, defaults to zero. */
 
 /*!
  @const kCGDisplayStreamShowCursor
  @discussion Controls whether the cursor is embedded within the provided buffers or not.
 */
 CG_EXTERN const CFStringRef kCGDisplayStreamShowCursor CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration showsCursor property instead"); /* CFBoolean - defaults to false */
+    11.0, 14.0,
+    "Please use ScreenCaptureKit API's SCStreamConfiguration showsCursor property instead"); /* CFBoolean - defaults to false */
 
 /*!
  @const kCGDisplayStreamQueueDepth
  @discussion Controls how many frames deep the frame queue will be.  Defaults to N.
  */
 CG_EXTERN const CFStringRef kCGDisplayStreamQueueDepth CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration queueDepth property instead"); /* Queue depth in frames.  Defaults to 3. */
+    11.0, 14.0,
+    "Please use ScreenCaptureKit API's SCStreamConfiguration queueDepth property instead"); /* Queue depth in frames.  Defaults to 3. */
 
 /*!
  @const kCGDisplayStreamYCbCrMatrix
@@ -235,8 +226,7 @@
  The value should be one of the three kCGDisplayStreamYCbCrMatrix values specified below.
 */
 CG_EXTERN const CFStringRef kCGDisplayStreamYCbCrMatrix CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"Please use ScreenCaptureKit API's SCStreamConfiguration colorMatrix property");
+    11.0, 14.0, "Please use ScreenCaptureKit API's SCStreamConfiguration colorMatrix property");
 
 /* Supported YCbCr matrices. Note that these strings have identical values to the equivalent CoreVideo strings. */
 CG_EXTERN const CFStringRef kCGDisplayStreamYCbCrMatrix_ITU_R_709_2;
@@ -249,8 +239,8 @@
  @result The CFTypeID of the CGDisplayStream class.
 */
 CG_EXTERN CFTypeID CGDisplayStreamGetTypeID(void) CG_AVAILABLE_BUT_DEPRECATED(
-	11.0, 14.0,
-	"There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStream to replace CGDisplayStream");
+    11.0, 14.0,
+    "There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStream to replace CGDisplayStream");
 
 /*!
  @function CGDisplayStreamCreate
@@ -272,13 +262,12 @@
  @param handler A block that will be called for frame deliver.
  @result The new CGDisplayStream object.
 */
-CG_EXTERN CGDisplayStreamRef __nullable CGDisplayStreamCreate(
-	CGDirectDisplayID display, size_t outputWidth, size_t outputHeight,
-	int32_t pixelFormat, CFDictionaryRef __nullable properties,
-	CGDisplayStreamFrameAvailableHandler __nullable handler)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"Please use ScreenCaptureKit API's initWithFilter:configuration:delegate: instead");
+CG_EXTERN CGDisplayStreamRef __nullable CGDisplayStreamCreate(CGDirectDisplayID display, size_t outputWidth,
+                                                              size_t outputHeight, int32_t pixelFormat,
+                                                              CFDictionaryRef __nullable properties,
+                                                              CGDisplayStreamFrameAvailableHandler __nullable handler)
+    CG_AVAILABLE_BUT_DEPRECATED(11.0, 14.0,
+                                "Please use ScreenCaptureKit API's initWithFilter:configuration:delegate: instead");
 
 /*!
  @function CGDisplayStreamCreateWithDispatchQueue
@@ -295,13 +284,11 @@
  @result The new CGDisplayStream object.
 */
 CG_EXTERN CGDisplayStreamRef __nullable CGDisplayStreamCreateWithDispatchQueue(
-	CGDirectDisplayID display, size_t outputWidth, size_t outputHeight,
-	int32_t pixelFormat, CFDictionaryRef __nullable properties,
-	dispatch_queue_t queue,
-	CGDisplayStreamFrameAvailableHandler __nullable handler)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"Please use ScreenCaptureKit API's initWithFilter:configuration:delegate: instead");
+    CGDirectDisplayID display, size_t outputWidth, size_t outputHeight, int32_t pixelFormat,
+    CFDictionaryRef __nullable properties, dispatch_queue_t queue,
+    CGDisplayStreamFrameAvailableHandler __nullable handler)
+    CG_AVAILABLE_BUT_DEPRECATED(11.0, 14.0,
+                                "Please use ScreenCaptureKit API's initWithFilter:configuration:delegate: instead");
 
 /*!
  @function CGDisplayStreamStart
@@ -309,11 +296,8 @@
  @param displayStream to be started
  @result kCGErrorSuccess If the display stream was started, otherwise an error.
 */
-CG_EXTERN CGError
-CGDisplayStreamStart(CGDisplayStreamRef cg_nullable displayStream)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"Please use ScreenCaptureKit API's startCaptureWithCompletionHandler: to start a stream instead");
+CG_EXTERN CGError CGDisplayStreamStart(CGDisplayStreamRef cg_nullable displayStream) CG_AVAILABLE_BUT_DEPRECATED(
+    11.0, 14.0, "Please use ScreenCaptureKit API's startCaptureWithCompletionHandler: to start a stream instead");
 
 /*!
  @function CGDisplayStreamStop
@@ -324,11 +308,8 @@
  status of kCGDisplayStreamFrameStatusStopped.  After that point it is safe to release the CGDisplayStream.
  It is safe to call this function from within the handler block, but the previous caveat still applies.
 */
-CG_EXTERN CGError
-CGDisplayStreamStop(CGDisplayStreamRef cg_nullable displayStream)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"Please use ScreenCaptureKit API's stopCaptureWithCompletionHandler: to stop a stream instead");
+CG_EXTERN CGError CGDisplayStreamStop(CGDisplayStreamRef cg_nullable displayStream) CG_AVAILABLE_BUT_DEPRECATED(
+    11.0, 14.0, "Please use ScreenCaptureKit API's stopCaptureWithCompletionHandler: to stop a stream instead");
 
 /*!
  @function CGDisplayStreamGetRunLoopSource
@@ -337,11 +318,10 @@
  @result The CFRunLoopSource for this displayStream.  Note: This function will return NULL if the
  display stream was created via  CGDisplayStreamCreateWithDispatchQueue().
 */
-CG_EXTERN CFRunLoopSourceRef __nullable
-CGDisplayStreamGetRunLoopSource(CGDisplayStreamRef cg_nullable displayStream)
-	CG_AVAILABLE_BUT_DEPRECATED(
-		11.0, 14.0,
-		"There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStream to replace CGDisplayStream");
+CG_EXTERN CFRunLoopSourceRef __nullable CGDisplayStreamGetRunLoopSource(CGDisplayStreamRef cg_nullable displayStream)
+    CG_AVAILABLE_BUT_DEPRECATED(
+        11.0, 14.0,
+        "There is no direct replacement for this function. Please use ScreenCaptureKit API's SCStream to replace CGDisplayStream");
 
 #endif /* __BLOCKS__ */

obs-studio-29.1.3.tar.xz/plugins/mac-capture/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/CMakeLists.txt Changed

@@ -1,15 +1,4 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
-legacy_check()
-
-find_library(COREAUDIO CoreAudio)
-find_library(AUDIOUNIT AudioUnit)
-find_library(COREFOUNDATION CoreFoundation)
-find_library(IOSURF IOSurface)
-find_library(COCOA Cocoa)
-find_library(COREVIDEO CoreVideo)
-find_library(COREMEDIA CoreMedia)
-find_library(SCREENCAPTUREKIT ScreenCaptureKit)
+cmake_minimum_required(VERSION 3.24...3.25)
 
 add_library(mac-capture MODULE)
 add_library(OBS::capture ALIAS mac-capture)
@@ -22,18 +11,27 @@
 CGDisplayStream.h
 mac-audio.c
 mac-display-capture.m
- mac-screen-capture.m
+ mac-sck-audio-capture.m
+ mac-sck-common.h
+ mac-sck-common.m
+ mac-sck-video-capture.m
 mac-window-capture.m
 plugin-main.c
 window-utils.h
 window-utils.m)
 
-target_link_libraries(mac-capture PRIVATE OBS::libobs ${COREAUDIO} ${AUDIOUNIT} ${COREFOUNDATION} ${IOSURF} ${COCOA})
-
-if(SCREENCAPTUREKIT)
- target_link_libraries(mac-capture PRIVATE OBS::libobs ${COREVIDEO} ${COREMEDIA}
- "$<LINK_LIBRARY:WEAK_FRAMEWORK,${SCREENCAPTUREKIT}>")
-endif()
+# cmake-format: off
+target_link_libraries(
+ mac-capture
+ PRIVATE OBS::libobs
+ "$<LINK_LIBRARY:FRAMEWORK,AudioUnit.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreAudio.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreFoundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreMedia.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreVideo.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,IOSurface.framework>"
+ "$<LINK_LIBRARY:WEAK_FRAMEWORK,ScreenCaptureKit.framework>")
 
 set_target_properties_obs(
 mac-capture
@@ -41,6 +39,7 @@
 PREFIX ""
 XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION YES
 XCODE_ATTRIBUTE_GCC_WARN_SHADOW YES)
+# cmake-format: on
 
 if(CMAKE_VERSION VERSION_LESS_EQUAL 3.25.0)
 set_property(TARGET mac-capture PROPERTY XCODE_LINK_BUILD_PHASE_MODE BUILT_ONLY)

obs-studio-29.1.3.tar.xz/plugins/mac-capture/audio-device-enum.c -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/audio-device-enum.c Changed

obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/af-ZA.ini Added

@@ -0,0 +1,32 @@
+CoreAudio.InputCapture="Klanktoevoeropname"
+CoreAudio.OutputCapture="Klankafvoeropname"
+CoreAudio.Device="Toestel"
+CoreAudio.Device.Default="Verstek"
+ApplicationCapture="Toepassingopname"
+ApplicationAudioCapture="Toepassingklankopname"
+DesktopAudioCapture="Werkskermklankopname"
+DisplayCapture="Beeldskermopname"
+DisplayCapture.ShowCursor="Toon muiswyser"
+DisplayCapture.HideOBS="Versteek OBS van die opname"
+WindowCapture="Vensteropname"
+WindowCapture.ShowShadow="Toon vensterskaduwee"
+Application="Toepassing"
+WindowUtils.Window="Venster"
+WindowUtils.ShowEmptyNames="Toon vensters met leë name"
+WindowUtils.ShowHidden="Toon volskerm- en versteekte vensters / toepassings"
+CropMode="Snoei"
+CropMode.None="Geen"
+CropMode.Manual="Handmatig"
+CropMode.ToWindow="Na venster"
+CropMode.ToWindowAndManual="Na venster en handmatig"
+Crop.origin.x="Snoei links"
+Crop.origin.y="Snoei bo"
+Crop.size.width="Snoei regs"
+Crop.size.height="Snoei onder"
+SCK.Name="macOS skermopname"
+SCK.Name.Beta="macOS skermopname (BETA)"
+SCK.Audio.Name="macOS klankopname"
+SCK.AudioUnavailable="Klankopname vereis macOS 13 of nuwer."
+SCK.CaptureTypeUnavailable="Gekose opnametipe vereis macOS 13 of nuwer."
+SCK.Method="Metode"
+SCK.Restart="Begin opname van voor af"

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/el-GR.ini Changed

@@ -3,19 +3,30 @@
 CoreAudio.Device="Συσκευή"
 CoreAudio.Device.Default="Προεπιλογή"
 ApplicationCapture="Σύλληψη Εφαρμογής"
+DesktopAudioCapture="Καταγραφή Ήχου Επιφάνειας εργασίας"
 DisplayCapture="Σύλληψη Οθόνης"
 DisplayCapture.Display="Οθόνη"
 DisplayCapture.ShowCursor="Εμφάνιση δρομέα"
+DisplayCapture.HideOBS="Απόκρυψη OBS από καταγραφή"
 WindowCapture="Σύλληψη Παραθύρου"
+WindowCapture.ShowShadow="Εμφάνιση σκιάς παραθύρου"
 Application="Εφαρμογή"
 WindowUtils.Window="Παράθυρο"
+WindowUtils.ShowEmptyNames="Εμφάνιση παραθύρων με άδεια ονόματα"
+WindowUtils.ShowHidden="Εμφάνιση κρυμμένων και πλήρους οθόνης παραθύρων / εφαρμογών "
 CropMode="Περικοπή"
 CropMode.None="Κανένα"
 CropMode.Manual="Χειροκίνητο"
+CropMode.ToWindow="Σε παράθυρο"
+CropMode.ToWindowAndManual="Σε παράθυρο και χειροκίνητα"
 Crop.origin.x="Περικοπή αριστερά"
 Crop.origin.y="Περικοπή πάνω"
 Crop.size.width="Περικοπή δεξιά"
 Crop.size.height="Περικοπή κάτω"
 SCK.Name="Σύλληψη Οθόνης macOS"
 SCK.Name.Beta="Σύλληψη Οθόνης macOS (BETA)"
+SCK.Audio.Name="Καταγραφή ήχου macOS"
 SCK.AudioUnavailable="Η σύλληψη ήχου απαιτεί macOS 13 έκδοση ή νεότερη."
+SCK.CaptureTypeUnavailable="Η σύλληψη οθόνης απαιτεί macOS 13 έκδοση ή νεότερη."
+SCK.Method="Μέθοδος"
+SCK.Restart="Επανεκκίνηση καταγραφής"

obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/fr-FR.ini Changed

@@ -3,9 +3,12 @@
 CoreAudio.Device="Périphérique"
 CoreAudio.Device.Default="Défaut"
 ApplicationCapture="Capture de l'application"
+ApplicationAudioCapture="Capture audio d'application"
+DesktopAudioCapture="Capture audio du bureau"
 DisplayCapture="Capture d'écran"
 DisplayCapture.Display="Écran"
 DisplayCapture.ShowCursor="Afficher le curseur"
+DisplayCapture.HideOBS="Cacher OBS de la capture"
 WindowCapture="Capture de Fenêtre"
 WindowCapture.ShowShadow="Afficher l'ombre de la fenêtre"
 WindowUtils.Window="Fenêtre"
@@ -22,6 +25,8 @@
 Crop.size.height="Rogner en bas"
 SCK.Name="Capture d'écran macOS"
 SCK.Name.Beta="Capture d'écran macOS (BETA)"
-SCK.AudioUnavailable="L'enregistrement audio requiert macOS 13 ou plus."
-SCK.CaptureTypeUnavailable="Le type de capture sélectionné nécessite macOS 13 ou plus récent."
+SCK.Audio.Name="Capture audio macOS"
+SCK.AudioUnavailable="La capture audio nécessite macOS 13 ou une version ultérieure."
+SCK.CaptureTypeUnavailable="Le type de capture sélectionné nécessite macOS 13 ou une version ultérieure."
 SCK.Method="Méthode"
+SCK.Restart="Redémarrer la capture"

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/id-ID.ini Changed

obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/pt-BR.ini Changed

@@ -3,9 +3,12 @@
 CoreAudio.Device="Dispositivo"
 CoreAudio.Device.Default="Padrão"
 ApplicationCapture="Captura de Aplicação"
+ApplicationAudioCapture="Capturar áudio de aplicativo"
+DesktopAudioCapture="Captura de Áudio da Área de Trabalho"
 DisplayCapture="Captura de Exposição"
 DisplayCapture.Display="Exposição"
 DisplayCapture.ShowCursor="Mostrar cursor"
+DisplayCapture.HideOBS="Ocultar OBS da captura"
 WindowCapture="Captura de janela"
 WindowCapture.ShowShadow="Mostrar sombra da janela"
 Application="Aplicação"
@@ -20,8 +23,10 @@
 Crop.origin.y="Recortar para Cima"
 Crop.size.width="Recortar à Direita"
 Crop.size.height="Recordar para Baixo"
-SCK.Name="Captura de Tela macOS"
+SCK.Name="Captura de tela do macOS"
 SCK.Name.Beta="Captura de tela do macOS (BETA)"
+SCK.Audio.Name="Captura de áudio do macOS"
 SCK.AudioUnavailable="A captura de áudio requer o macOS 13 ou mais recente."
-SCK.CaptureTypeUnavailable="Tipo de captura selecionado requer macOS 13 ou mais novo."
+SCK.CaptureTypeUnavailable="O método selecionado de captura requer macOS 13 ou mais recente."
 SCK.Method="Método"
+SCK.Restart="Reiniciar captura"

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/ru-RU.ini Changed

@@ -3,15 +3,18 @@
 CoreAudio.Device="Устройство"
 CoreAudio.Device.Default="По умолчанию"
 ApplicationCapture="Захват приложения"
+ApplicationAudioCapture="Захват звука приложения"
+DesktopAudioCapture="Захват звука рабочего стола"
 DisplayCapture="Захват экрана"
 DisplayCapture.Display="Экран"
 DisplayCapture.ShowCursor="Показывать курсор"
+DisplayCapture.HideOBS="Скрыть OBS на записи"
 WindowCapture="Захват окна"
 WindowCapture.ShowShadow="Показывать тень окна"
 Application="Приложение"
 WindowUtils.Window="Окно"
 WindowUtils.ShowEmptyNames="Показывать окна с пустыми названиями"
-WindowUtils.ShowHidden="Показsdать полноэкранные и скрытые окна / приложения"
+WindowUtils.ShowHidden="Показывать полноэкранные и скрытые окна / приложения"
 CropMode="Обрезать"
 CropMode.None="Нет"
 CropMode.Manual="Вручную"
@@ -23,6 +26,8 @@
 Crop.size.height="Обрезка снизу"
 SCK.Name="Захват экрана macOS"
 SCK.Name.Beta="Захват экрана macOS (БЕТА)"
+SCK.Audio.Name="Захват звука macOS"
 SCK.AudioUnavailable="Захват звука требует macOS 13 или новее."
 SCK.CaptureTypeUnavailable="Выбранный тип захвата требует macOS 13 или новее."
 SCK.Method="Способ"
+SCK.Restart="Перезапустить захват"

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/si-LK.ini Changed

@@ -1,9 +1,18 @@
+CoreAudio.InputCapture="හඬ ආදානය ග්‍රහණය"
+CoreAudio.OutputCapture="හඬ ප්‍රතිදානය ග්‍රහණය"
 CoreAudio.Device="උපාංගය"
 CoreAudio.Device.Default="පෙරනිමි"
+ApplicationCapture="යෙදුමක් ග්‍රහණය"
+ApplicationAudioCapture="යෙදුමක හඬ ග්‍රහණය"
+DesktopAudioCapture="වැඩතලයේ හඬ ග්‍රහණය"
+DisplayCapture="දර්ශකය ග්‍රහණය"
 DisplayCapture.Display="දර්ශකය"
 DisplayCapture.ShowCursor="ඊතලය පෙන්වන්න"
+WindowCapture="කවුළුව ග්‍රහණය"
+WindowCapture.ShowShadow="කවුළුවෙහි සෙවණැල්ල පෙන්වන්න"
 Application="යෙදුම"
 WindowUtils.Window="කවුළුව"
+WindowUtils.ShowEmptyNames="හිස් නම් සහිතව කවුළු පෙන්වන්න"
 CropMode="කප්පාදුව"
 CropMode.None="කිසිත් නැත"
 CropMode.Manual="අතින්"
@@ -11,3 +20,10 @@
 Crop.origin.y="මුදුන කප්පාදුව"
 Crop.size.width="දකුණ කප්පාදුව"
 Crop.size.height="පතුළ කප්පාදුව"
+SCK.Name="මැක්ඕඑස් තිරය ග්‍රහණය"
+SCK.Name.Beta="මැක්ඕඑස් තිරය ග්‍රහණය (බීටා)"
+SCK.Audio.Name="මැක්ඕඑස් හඬ ග්‍රහණය"
+SCK.AudioUnavailable="හඬ ග්‍රහණයට මැක්ඕඑස් 13/+ වුවමනාය"
+SCK.CaptureTypeUnavailable="තේරූ ග්‍රහණ වර්ගයට මැක්ඕඑස් 13/+ වුවමනාය"
+SCK.Method="ක්‍රමය"
+SCK.Restart="ග්‍රහණය යළි අරඹන්න"

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/mac-audio.c -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/mac-audio.c Changed

@@ -82,7 +82,7 @@
 
 	AudioObjectPropertyAddress addr = {
 		.mScope = kAudioObjectPropertyScopeGlobal,
-		.mElement = kAudioObjectPropertyElementMaster};
+		.mElement = kAudioObjectPropertyElementMain};
 
 	if (!ca->device_uid)
 		ca->device_uid = bstrdup("default");
@@ -283,7 +283,7 @@
 	AudioObjectPropertyAddress addr = {
 		kAudioDevicePropertyStreamConfiguration,
 		kAudioDevicePropertyScopeInput,
-		kAudioObjectPropertyElementMaster};
+		kAudioObjectPropertyElementMain};
 
 	stat = AudioObjectGetPropertyDataSize(ca->device_id, &addr, 0, NULL,
 					      &buf_size);
@@ -431,7 +431,7 @@
 {
 	AudioObjectPropertyAddress addr = {property,
 					   kAudioObjectPropertyScopeGlobal,
-					   kAudioObjectPropertyElementMaster};
+					   kAudioObjectPropertyElementMain};
 
 	return AudioObjectAddPropertyListener(ca->device_id, &addr,
 					      notification_callback, ca);
@@ -457,7 +457,7 @@
 		AudioObjectPropertyAddress addr = {
 			PROPERTY_DEFAULT_DEVICE,
 			kAudioObjectPropertyScopeGlobal,
-			kAudioObjectPropertyElementMaster};
+			kAudioObjectPropertyElementMain};
 
 		stat = AudioObjectAddPropertyListener(kAudioObjectSystemObject,
 						      &addr,
@@ -484,7 +484,7 @@
 
 	AudioObjectPropertyAddress addr = {kAudioDevicePropertyDeviceIsAlive,
 					   kAudioObjectPropertyScopeGlobal,
-					   kAudioObjectPropertyElementMaster};
+					   kAudioObjectPropertyElementMain};
 
 	AudioObjectRemovePropertyListener(ca->device_id, &addr,
 					  notification_callback, ca);
@@ -513,7 +513,7 @@
 	const AudioObjectPropertyAddress addr = {
 		kAudioDevicePropertyDeviceNameCFString,
 		kAudioObjectPropertyScopeInput,
-		kAudioObjectPropertyElementMaster};
+		kAudioObjectPropertyElementMain};
 
 	OSStatus stat = AudioObjectGetPropertyData(ca->device_id, &addr, 0,
 						   NULL, &size, &cf_name);

obs-studio-29.1.3.tar.xz/plugins/mac-capture/mac-display-capture.m -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/mac-display-capture.m Changed

@@ -4,684 +4,682 @@
 #include <pthread.h>
 
 #import <AvailabilityMacros.h>
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
+#import <CoreGraphics/CGDisplayStream.h>
+#else
 #import "CGDisplayStream.h"
+#endif
+
 #import <Cocoa/Cocoa.h>
 
 #include "window-utils.h"
 
 enum crop_mode {
-	CROP_NONE,
-	CROP_MANUAL,
-	CROP_TO_WINDOW,
-	CROP_TO_WINDOW_AND_MANUAL,
-	CROP_INVALID
+ CROP_NONE,
+ CROP_MANUAL,
+ CROP_TO_WINDOW,
+ CROP_TO_WINDOW_AND_MANUAL,
+ CROP_INVALID
 };
 
 static inline bool requires_window(enum crop_mode mode)
 {
-	return mode == CROP_TO_WINDOW || mode == CROP_TO_WINDOW_AND_MANUAL;
+ return mode == CROP_TO_WINDOW || mode == CROP_TO_WINDOW_AND_MANUAL;
 }
 
 struct display_capture {
-	obs_source_t *source;
+ obs_source_t *source;
 
-	gs_samplerstate_t *sampler;
-	gs_effect_t *effect;
-	gs_texture_t *tex;
-	gs_vertbuffer_t *vertbuf;
+ gs_samplerstate_t *sampler;
+ gs_effect_t *effect;
+ gs_texture_t *tex;
+ gs_vertbuffer_t *vertbuf;
 
-	NSScreen *screen;
-	unsigned display;
-	NSRect frame;
-	bool hide_cursor;
+ NSScreen *screen;
+ unsigned display;
+ NSRect frame;
+ bool hide_cursor;
 
-	enum crop_mode crop;
-	CGRect crop_rect;
+ enum crop_mode crop;
+ CGRect crop_rect;
 
-	struct cocoa_window window;
-	CGRect window_rect;
-	bool on_screen;
-	bool hide_when_minimized;
+ struct cocoa_window window;
+ CGRect window_rect;
+ bool on_screen;
+ bool hide_when_minimized;
 
-	os_event_t *disp_finished;
-	CGDisplayStreamRef disp;
-	IOSurfaceRef current, prev;
+ os_event_t *disp_finished;
+ CGDisplayStreamRef disp;
+ IOSurfaceRef current, prev;
 
-	pthread_mutex_t mutex;
+ pthread_mutex_t mutex;
 };
 
 static inline bool crop_mode_valid(enum crop_mode mode)
 {
-	return CROP_NONE <= mode && mode < CROP_INVALID;
+ return CROP_NONE <= mode && mode < CROP_INVALID;
 }
 
 static void destroy_display_stream(struct display_capture *dc)
 {
-	if (dc->disp) {
-		CGDisplayStreamStop(dc->disp);
-		os_event_wait(dc->disp_finished);
-	}
-
-	if (dc->tex) {
-		gs_texture_destroy(dc->tex);
-		dc->tex = NULL;
-	}
-
-	if (dc->current) {
-		IOSurfaceDecrementUseCount(dc->current);
-		CFRelease(dc->current);
-		dc->current = NULL;
-	}
-
-	if (dc->prev) {
-		IOSurfaceDecrementUseCount(dc->prev);
-		CFRelease(dc->prev);
-		dc->prev = NULL;
-	}
-
-	if (dc->disp) {
-		CFRelease(dc->disp);
-		dc->disp = NULL;
-	}
-
-	if (dc->screen) {
-		dc->screen release;
-		dc->screen = nil;
-	}
-
-	os_event_destroy(dc->disp_finished);
+ if (dc->disp) {
+ CGDisplayStreamStop(dc->disp);
+ os_event_wait(dc->disp_finished);
+ }
+
+ if (dc->tex) {
+ gs_texture_destroy(dc->tex);
+ dc->tex = NULL;
+ }
+
+ if (dc->current) {
+ IOSurfaceDecrementUseCount(dc->current);
+ CFRelease(dc->current);
+ dc->current = NULL;
+ }
+
+ if (dc->prev) {
+ IOSurfaceDecrementUseCount(dc->prev);
+ CFRelease(dc->prev);
+ dc->prev = NULL;
+ }
+
+ if (dc->disp) {
+ CFRelease(dc->disp);
+ dc->disp = NULL;
+ }
+
+ if (dc->screen) {
+ dc->screen release;
+ dc->screen = nil;
+ }
+
+ os_event_destroy(dc->disp_finished);
 }
 
 static void display_capture_destroy(void *data)
 {
-	struct display_capture *dc = data;
+ struct display_capture *dc = data;
 
-	if (!dc)
-		return;
+ if (!dc)
+ return;
 
-	obs_enter_graphics();
+ obs_enter_graphics();
 
-	destroy_display_stream(dc);
+ destroy_display_stream(dc);
 
-	if (dc->sampler)
-		gs_samplerstate_destroy(dc->sampler);
-	if (dc->vertbuf)
-		gs_vertexbuffer_destroy(dc->vertbuf);
+ if (dc->sampler)
+ gs_samplerstate_destroy(dc->sampler);
+ if (dc->vertbuf)
+ gs_vertexbuffer_destroy(dc->vertbuf);
 
-	obs_leave_graphics();
+ obs_leave_graphics();
 
-	destroy_window(&dc->window);
+ destroy_window(&dc->window);
 
-	pthread_mutex_destroy(&dc->mutex);
-	bfree(dc);
+ pthread_mutex_destroy(&dc->mutex);
+ bfree(dc);
 }
 
 static inline void update_window_params(struct display_capture *dc)
 {
-	if (!requires_window(dc->crop))
-		return;
-
-	NSArray *arr = (NSArray *)CGWindowListCopyWindowInfo(
-		kCGWindowListOptionIncludingWindow, dc->window.window_id);
-
-	if (arr.count) {
-		NSDictionary *dict = arr0;
-		NSDictionary *ref = dict(NSString *)kCGWindowBounds;
-		CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)ref,
-						 &dc->window_rect);
-		dc->on_screen = dict(NSString *)kCGWindowIsOnscreen != nil;
-		dc->window_rect =
-			dc->screen convertRectToBacking:dc->window_rect;
-
-	} else {
-		if (find_window(&dc->window, NULL, false))
-			update_window_params(dc);
-		else
-			dc->on_screen = false;
-	}
-
-	arr release;
+ if (!requires_window(dc->crop))
+ return;
+
+ NSArray *arr = (NSArray *) CGWindowListCopyWindowInfo(kCGWindowListOptionIncludingWindow, dc->window.window_id);
+
+ if (arr.count) {
+ NSDictionary *dict = arr0;
+ NSDictionary *ref = dict(NSString *) kCGWindowBounds;
+ CGRectMakeWithDictionaryRepresentation((CFDictionaryRef) ref, &dc->window_rect);
+ dc->on_screen = dict(NSString *) kCGWindowIsOnscreen != nil;
+ dc->window_rect = dc->screen convertRectToBacking:dc->window_rect;
+
+ } else {
+ if (find_window(&dc->window, NULL, false))
+ update_window_params(dc);
+ else
+ dc->on_screen = false;
+ }
+
+ arr release;
 }
 
-static inline void display_stream_update(struct display_capture *dc,
-					 CGDisplayStreamFrameStatus status,
-					 uint64_t display_time,
-					 IOSurfaceRef frame_surface,
-					 CGDisplayStreamUpdateRef update_ref)
+static inline void display_stream_update(struct display_capture *dc, CGDisplayStreamFrameStatus status,
+ uint64_t display_time, IOSurfaceRef frame_surface,
+ CGDisplayStreamUpdateRef update_ref)
 {
-	UNUSED_PARAMETER(display_time);
+ UNUSED_PARAMETER(display_time);
 
-	if (status == kCGDisplayStreamFrameStatusStopped) {
-		os_event_signal(dc->disp_finished);
-		return;
-	}
+ if (status == kCGDisplayStreamFrameStatusStopped) {
+ os_event_signal(dc->disp_finished);
+ return;
+ }
 
-	IOSurfaceRef prev_current = NULL;
+ IOSurfaceRef prev_current = NULL;
 
-	if (frame_surface && !pthread_mutex_lock(&dc->mutex)) {
-		prev_current = dc->current;
-		dc->current = frame_surface;
-		CFRetain(dc->current);
-		IOSurfaceIncrementUseCount(dc->current);
+ if (frame_surface && !pthread_mutex_lock(&dc->mutex)) {
+ prev_current = dc->current;
+ dc->current = frame_surface;
+ CFRetain(dc->current);
+ IOSurfaceIncrementUseCount(dc->current);
 
-		update_window_params(dc);
+ update_window_params(dc);
 
-		pthread_mutex_unlock(&dc->mutex);
-	}
+ pthread_mutex_unlock(&dc->mutex);
+ }
 
-	if (prev_current) {
-		IOSurfaceDecrementUseCount(prev_current);
-		CFRelease(prev_current);
-	}
+ if (prev_current) {
+ IOSurfaceDecrementUseCount(prev_current);
+ CFRelease(prev_current);
+ }
 
-	size_t dropped_frames = CGDisplayStreamUpdateGetDropCount(update_ref);
-	if (dropped_frames > 0)
-		blog(LOG_INFO, "%s: Dropped %zu frames",
-		 obs_source_get_name(dc->source), dropped_frames);
+ size_t dropped_frames = CGDisplayStreamUpdateGetDropCount(update_ref);
+ if (dropped_frames > 0)
+ blog(LOG_INFO, "%s: Dropped %zu frames", obs_source_get_name(dc->source), dropped_frames);
 }
 
 static bool init_display_stream(struct display_capture *dc)
 {
-	if (dc->display >= NSScreen screens.count)
-		return false;
+ NSScreen screens enumerateObjectsUsingBlock:^(NSScreen *_Nonnull screen, NSUInteger index __unused,
+ BOOL *_Nonnull stop __unused) {
+ NSNumber *screenNumber = screen.deviceDescription@"NSScreenNumber";
+ CGDirectDisplayID display_id = (CGDirectDisplayID) screenNumber.intValue;
+
+ if (display_id == dc->display) {
+ dc->screen = screen retain;
+ *stop = YES;
+ }
+ };
 
-	dc->screen = NSScreen screensdc->display retain;
+ if (!dc->screen) {
+ return false;
+ }
 
-	dc->frame = dc->screen convertRectToBacking:dc->screen.frame;
+ dc->frame = dc->screen convertRectToBacking:dc->screen.frame;
 
-	NSNumber *screen_num = dc->screen.deviceDescription@"NSScreenNumber";
-	CGDirectDisplayID disp_id = screen_num.unsignedIntValue;
+ NSNumber *screen_num = dc->screen.deviceDescription@"NSScreenNumber";
+ CGDirectDisplayID disp_id = screen_num.unsignedIntValue;
 
-	NSDictionary *rect_dict =
-		CFBridgingRelease(CGRectCreateDictionaryRepresentation(
-			CGRectMake(0, 0, dc->screen.frame.size.width,
-				 dc->screen.frame.size.height)));
+ NSDictionary *rect_dict = CFBridgingRelease(CGRectCreateDictionaryRepresentation(
+ CGRectMake(0, 0, dc->screen.frame.size.width, dc->screen.frame.size.height)));
 
-	CFBooleanRef show_cursor_cf = dc->hide_cursor ? kCFBooleanFalse
-						 : kCFBooleanTrue;
+ CFBooleanRef show_cursor_cf = dc->hide_cursor ? kCFBooleanFalse : kCFBooleanTrue;
 
-	NSDictionary *dict = @{
-		(__bridge NSString *)kCGDisplayStreamSourceRect: rect_dict,
-		(__bridge NSString *)kCGDisplayStreamQueueDepth: @5,
-		(__bridge NSString *)
-		kCGDisplayStreamShowCursor: (id)show_cursor_cf,
-	};
+ NSDictionary *dict = @{
+ (__bridge NSString *) kCGDisplayStreamSourceRect: rect_dict,
+ (__bridge NSString *) kCGDisplayStreamQueueDepth: @5,
+ (__bridge NSString *) kCGDisplayStreamShowCursor: (id) show_cursor_cf,
+ };
 
-	os_event_init(&dc->disp_finished, OS_EVENT_TYPE_MANUAL);
+ os_event_init(&dc->disp_finished, OS_EVENT_TYPE_MANUAL);
 
-	FourCharCode bgra_code = 0;
-	bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
+ FourCharCode bgra_code = 0;
+ bgra_code = ('B' << 24) | ('G' << 16) | ('R' << 8) | 'A';
 
-	const CGSize *size = &dc->frame.size;
-	dc->disp = CGDisplayStreamCreateWithDispatchQueue(
-		disp_id, (size_t)size->width, (size_t)size->height, bgra_code,
-		(__bridge CFDictionaryRef)dict,
-		dispatch_queue_create(NULL, NULL),
-		^(CGDisplayStreamFrameStatus status, uint64_t displayTime,
-		 IOSurfaceRef frameSurface,
-		 CGDisplayStreamUpdateRef updateRef) {
-			display_stream_update(dc, status, displayTime,
-					 frameSurface, updateRef);
-		});
+ const CGSize *size = &dc->frame.size;
+ dc->disp = CGDisplayStreamCreateWithDispatchQueue(
+ disp_id, (size_t) size->width, (size_t) size->height, bgra_code, (__bridge CFDictionaryRef) dict,
+ dispatch_queue_create(NULL, NULL),
+ ^(CGDisplayStreamFrameStatus status, uint64_t displayTime, IOSurfaceRef frameSurface,
+ CGDisplayStreamUpdateRef updateRef) {
+ display_stream_update(dc, status, displayTime, frameSurface, updateRef);
+ });
 
-	return !CGDisplayStreamStart(dc->disp);
+ return !CGDisplayStreamStart(dc->disp);
 }
 
 bool init_vertbuf(struct display_capture *dc)
 {
-	struct gs_vb_data *vb_data = gs_vbdata_create();
-	vb_data->num = 4;
-	vb_data->points = bzalloc(sizeof(struct vec3) * 4);
-	if (!vb_data->points)
-		return false;
-
-	vb_data->num_tex = 1;
-	vb_data->tvarray = bzalloc(sizeof(struct gs_tvertarray));
-	if (!vb_data->tvarray)
-		return false;
-
-	vb_data->tvarray0.width = 2;
-	vb_data->tvarray0.array = bzalloc(sizeof(struct vec2) * 4);
-	if (!vb_data->tvarray0.array)
-		return false;
-
-	dc->vertbuf = gs_vertexbuffer_create(vb_data, GS_DYNAMIC);
-	return dc->vertbuf != NULL;
+ struct gs_vb_data *vb_data = gs_vbdata_create();
+ vb_data->num = 4;
+ vb_data->points = bzalloc(sizeof(struct vec3) * 4);
+ if (!vb_data->points)
+ return false;
+
+ vb_data->num_tex = 1;
+ vb_data->tvarray = bzalloc(sizeof(struct gs_tvertarray));
+ if (!vb_data->tvarray)
+ return false;
+
+ vb_data->tvarray0.width = 2;
+ vb_data->tvarray0.array = bzalloc(sizeof(struct vec2) * 4);
+ if (!vb_data->tvarray0.array)
+ return false;
+
+ dc->vertbuf = gs_vertexbuffer_create(vb_data, GS_DYNAMIC);
+ return dc->vertbuf != NULL;
 }
 
 void load_crop(struct display_capture *dc, obs_data_t *settings);
 
 static void *display_capture_create(obs_data_t *settings, obs_source_t *source)
 {
-	struct display_capture *dc = bzalloc(sizeof(struct display_capture));
+ struct display_capture *dc = bzalloc(sizeof(struct display_capture));
 
-	dc->source = source;
-	dc->hide_cursor = !obs_data_get_bool(settings, "show_cursor");
+ dc->source = source;
+ dc->hide_cursor = !obs_data_get_bool(settings, "show_cursor");
 
-	dc->effect = obs_get_base_effect(OBS_EFFECT_DEFAULT_RECT);
-	if (!dc->effect)
-		goto fail;
+ dc->effect = obs_get_base_effect(OBS_EFFECT_DEFAULT_RECT);
+ if (!dc->effect)
+ goto fail;
 
-	obs_enter_graphics();
+ obs_enter_graphics();
 
-	struct gs_sampler_info info = {
-		.filter = GS_FILTER_LINEAR,
-		.address_u = GS_ADDRESS_CLAMP,
-		.address_v = GS_ADDRESS_CLAMP,
-		.address_w = GS_ADDRESS_CLAMP,
-		.max_anisotropy = 1,
-	};
-	dc->sampler = gs_samplerstate_create(&info);
-	if (!dc->sampler)
-		goto fail;
+ struct gs_sampler_info info = {
+ .filter = GS_FILTER_LINEAR,
+ .address_u = GS_ADDRESS_CLAMP,
+ .address_v = GS_ADDRESS_CLAMP,
+ .address_w = GS_ADDRESS_CLAMP,
+ .max_anisotropy = 1,
+ };
+ dc->sampler = gs_samplerstate_create(&info);
+ if (!dc->sampler)
+ goto fail;
 
-	if (!init_vertbuf(dc))
-		goto fail;
+ if (!init_vertbuf(dc))
+ goto fail;
 
-	obs_leave_graphics();
+ obs_leave_graphics();
 
-	init_window(&dc->window, settings);
-	load_crop(dc, settings);
+ init_window(&dc->window, settings);
+ load_crop(dc, settings);
 
-	dc->display = (unsigned int)obs_data_get_int(settings, "display");
-	pthread_mutex_init(&dc->mutex, NULL);
+ dc->display = get_display_migrate_settings(settings);
 
-	if (!init_display_stream(dc))
-		goto fail;
+ pthread_mutex_init(&dc->mutex, NULL);
 
-	return dc;
+ if (!init_display_stream(dc))
+ goto fail;
+
+ return dc;
 
 fail:
-	obs_leave_graphics();
-	display_capture_destroy(dc);
-	return NULL;
+ obs_leave_graphics();
+ display_capture_destroy(dc);
+ return NULL;
 }
 
-static void build_sprite(struct gs_vb_data *data, float fcx, float fcy,
-			 float start_u, float end_u, float start_v, float end_v)
+static void build_sprite(struct gs_vb_data *data, float fcx, float fcy, float start_u, float end_u, float start_v,
+ float end_v)
 {
-	struct vec2 *tvarray = data->tvarray0.array;
-
-	vec3_set(data->points + 1, fcx, 0.0f, 0.0f);
-	vec3_set(data->points + 2, 0.0f, fcy, 0.0f);
-	vec3_set(data->points + 3, fcx, fcy, 0.0f);
-	vec2_set(tvarray, start_u, start_v);
-	vec2_set(tvarray + 1, end_u, start_v);
-	vec2_set(tvarray + 2, start_u, end_v);
-	vec2_set(tvarray + 3, end_u, end_v);
+ struct vec2 *tvarray = data->tvarray0.array;
+
+ vec3_set(data->points + 1, fcx, 0.0f, 0.0f);
+ vec3_set(data->points + 2, 0.0f, fcy, 0.0f);
+ vec3_set(data->points + 3, fcx, fcy, 0.0f);
+ vec2_set(tvarray, start_u, start_v);
+ vec2_set(tvarray + 1, end_u, start_v);
+ vec2_set(tvarray + 2, start_u, end_v);
+ vec2_set(tvarray + 3, end_u, end_v);
 }
 
-static inline void build_sprite_rect(struct gs_vb_data *data, float origin_x,
-				 float origin_y, float end_x, float end_y)
+static inline void build_sprite_rect(struct gs_vb_data *data, float origin_x, float origin_y, float end_x, float end_y)
 {
-	build_sprite(data, fabsf(end_x - origin_x), fabsf(end_y - origin_y),
-		 origin_x, end_x, origin_y, end_y);
+ build_sprite(data, fabsf(end_x - origin_x), fabsf(end_y - origin_y), origin_x, end_x, origin_y, end_y);
 }
 
 static void display_capture_video_tick(void *data, float seconds)
 {
-	UNUSED_PARAMETER(seconds);
-
-	struct display_capture *dc = data;
-
-	if (!dc->current)
-		return;
-	if (!obs_source_showing(dc->source))
-		return;
-
-	IOSurfaceRef prev_prev = dc->prev;
-	if (pthread_mutex_lock(&dc->mutex))
-		return;
-	dc->prev = dc->current;
-	dc->current = NULL;
-	pthread_mutex_unlock(&dc->mutex);
-
-	if (prev_prev == dc->prev)
-		return;
-
-	if (requires_window(dc->crop) && !dc->on_screen)
-		goto cleanup;
-
-	CGPoint origin = {0.f};
-	CGPoint end = {0.f};
-
-	switch (dc->crop) {
-		double x, y;
-	case CROP_INVALID:
-		break;
-
-	case CROP_MANUAL:
-		origin.x += dc->crop_rect.origin.x;
-		origin.y += dc->crop_rect.origin.y;
-		end.y -= dc->crop_rect.size.height;
-		end.x -= dc->crop_rect.size.width;
-	case CROP_NONE:
-		end.y += dc->frame.size.height;
-		end.x += dc->frame.size.width;
-		break;
-
-	case CROP_TO_WINDOW_AND_MANUAL:
-		origin.x += dc->crop_rect.origin.x;
-		origin.y += dc->crop_rect.origin.y;
-		end.y -= dc->crop_rect.size.height;
-		end.x -= dc->crop_rect.size.width;
-	case CROP_TO_WINDOW:
-		origin.x += x = dc->window_rect.origin.x - dc->frame.origin.x;
-		origin.y += y = dc->window_rect.origin.y - dc->frame.origin.y;
-		end.y += dc->window_rect.size.height + y;
-		end.x += dc->window_rect.size.width + x;
-		break;
-	}
-
-	obs_enter_graphics();
-	build_sprite_rect(gs_vertexbuffer_get_data(dc->vertbuf),
-			 (float)origin.x, (float)origin.y, (float)end.x,
-			 (float)end.y);
-
-	if (dc->tex)
-		gs_texture_rebind_iosurface(dc->tex, dc->prev);
-	else
-		dc->tex = gs_texture_create_from_iosurface(dc->prev);
-	obs_leave_graphics();
+ UNUSED_PARAMETER(seconds);
+
+ struct display_capture *dc = data;
+
+ if (!dc->current)
+ return;
+ if (!obs_source_showing(dc->source))
+ return;
+
+ IOSurfaceRef prev_prev = dc->prev;
+ if (pthread_mutex_lock(&dc->mutex))
+ return;
+ dc->prev = dc->current;
+ dc->current = NULL;
+ pthread_mutex_unlock(&dc->mutex);
+
+ if (prev_prev == dc->prev)
+ return;
+
+ if (requires_window(dc->crop) && !dc->on_screen)
+ goto cleanup;
+
+ CGPoint origin = {0.f};
+ CGPoint end = {0.f};
+
+ double x, y;
+ switch (dc->crop) {
+ case CROP_INVALID:
+ break;
+
+ case CROP_MANUAL:
+ origin.x += dc->crop_rect.origin.x;
+ origin.y += dc->crop_rect.origin.y;
+ end.y -= dc->crop_rect.size.height;
+ end.x -= dc->crop_rect.size.width;
+ case CROP_NONE:
+ end.y += dc->frame.size.height;
+ end.x += dc->frame.size.width;
+ break;
+
+ case CROP_TO_WINDOW_AND_MANUAL:
+ origin.x += dc->crop_rect.origin.x;
+ origin.y += dc->crop_rect.origin.y;
+ end.y -= dc->crop_rect.size.height;
+ end.x -= dc->crop_rect.size.width;
+ case CROP_TO_WINDOW:
+ origin.x += x = dc->window_rect.origin.x - dc->frame.origin.x;
+ origin.y += y = dc->window_rect.origin.y - dc->frame.origin.y;
+ end.y += dc->window_rect.size.height + y;
+ end.x += dc->window_rect.size.width + x;
+ break;
+ }
+
+ obs_enter_graphics();
+ build_sprite_rect(gs_vertexbuffer_get_data(dc->vertbuf), (float) origin.x, (float) origin.y, (float) end.x,
+ (float) end.y);
+
+ if (dc->tex)
+ gs_texture_rebind_iosurface(dc->tex, dc->prev);
+ else
+ dc->tex = gs_texture_create_from_iosurface(dc->prev);
+ obs_leave_graphics();
 
 cleanup:
-	if (prev_prev) {
-		IOSurfaceDecrementUseCount(prev_prev);
-		CFRelease(prev_prev);
-	}
+ if (prev_prev) {
+ IOSurfaceDecrementUseCount(prev_prev);
+ CFRelease(prev_prev);
+ }
 }
 
 static void display_capture_video_render(void *data, gs_effect_t *effect)
 {
-	UNUSED_PARAMETER(effect);
+ UNUSED_PARAMETER(effect);
 
-	struct display_capture *dc = data;
+ struct display_capture *dc = data;
 
-	if (!dc->tex || (requires_window(dc->crop) && !dc->on_screen))
-		return;
+ if (!dc->tex || (requires_window(dc->crop) && !dc->on_screen))
+ return;
 
-	const bool linear_srgb = gs_get_linear_srgb();
+ const bool linear_srgb = gs_get_linear_srgb();
 
-	const bool previous = gs_framebuffer_srgb_enabled();
-	gs_enable_framebuffer_srgb(linear_srgb);
+ const bool previous = gs_framebuffer_srgb_enabled();
+ gs_enable_framebuffer_srgb(linear_srgb);
 
-	gs_vertexbuffer_flush(dc->vertbuf);
-	gs_load_vertexbuffer(dc->vertbuf);
-	gs_load_indexbuffer(NULL);
-	gs_load_samplerstate(dc->sampler, 0);
-	gs_technique_t *tech = gs_effect_get_technique(dc->effect, "Draw");
-	gs_eparam_t *param = gs_effect_get_param_by_name(dc->effect, "image");
-	if (linear_srgb)
-		gs_effect_set_texture_srgb(param, dc->tex);
-	else
-		gs_effect_set_texture(param, dc->tex);
-	gs_technique_begin(tech);
-	gs_technique_begin_pass(tech, 0);
+ gs_vertexbuffer_flush(dc->vertbuf);
+ gs_load_vertexbuffer(dc->vertbuf);
+ gs_load_indexbuffer(NULL);
+ gs_load_samplerstate(dc->sampler, 0);
+ gs_technique_t *tech = gs_effect_get_technique(dc->effect, "Draw");
+ gs_eparam_t *param = gs_effect_get_param_by_name(dc->effect, "image");
+ if (linear_srgb)
+ gs_effect_set_texture_srgb(param, dc->tex);
+ else
+ gs_effect_set_texture(param, dc->tex);
+ gs_technique_begin(tech);
+ gs_technique_begin_pass(tech, 0);
 
-	gs_draw(GS_TRISTRIP, 0, 4);
+ gs_draw(GS_TRISTRIP, 0, 4);
 
-	gs_technique_end_pass(tech);
-	gs_technique_end(tech);
+ gs_technique_end_pass(tech);
+ gs_technique_end(tech);
 
-	gs_enable_framebuffer_srgb(previous);
+ gs_enable_framebuffer_srgb(previous);
 }
 
 static const char *display_capture_getname(void *unused)
 {
-	UNUSED_PARAMETER(unused);
-	return obs_module_text("DisplayCapture");
+ UNUSED_PARAMETER(unused);
+ return obs_module_text("DisplayCapture");
 }
 
 static uint32_t display_capture_getwidth(void *data)
 {
-	struct display_capture *dc = data;
+ struct display_capture *dc = data;
 
-	double crop = dc->crop_rect.origin.x + dc->crop_rect.size.width;
-	switch (dc->crop) {
-	case CROP_NONE:
-		return (uint32_t)dc->frame.size.width;
+ double crop = dc->crop_rect.origin.x + dc->crop_rect.size.width;
+ switch (dc->crop) {
+ case CROP_NONE:
+ return (uint32_t) dc->frame.size.width;
 
-	case CROP_MANUAL:
-		return (uint32_t)fabs(dc->frame.size.width - crop);
+ case CROP_MANUAL:
+ return (uint32_t) fabs(dc->frame.size.width - crop);
 
-	case CROP_TO_WINDOW:
-		return (uint32_t)dc->window_rect.size.width;
+ case CROP_TO_WINDOW:
+ return (uint32_t) dc->window_rect.size.width;
 
-	case CROP_TO_WINDOW_AND_MANUAL:
-		return (uint32_t)fabs(dc->window_rect.size.width - crop);
+ case CROP_TO_WINDOW_AND_MANUAL:
+ return (uint32_t) fabs(dc->window_rect.size.width - crop);
 
-	case CROP_INVALID:
-		break;
-	}
-	return 0;
+ case CROP_INVALID:
+ break;
+ }
+ return 0;
 }
 
 static uint32_t display_capture_getheight(void *data)
 {
-	struct display_capture *dc = data;
+ struct display_capture *dc = data;
 
-	double crop = dc->crop_rect.origin.y + dc->crop_rect.size.height;
-	switch (dc->crop) {
-	case CROP_NONE:
-		return (uint32_t)dc->frame.size.height;
+ double crop = dc->crop_rect.origin.y + dc->crop_rect.size.height;
+ switch (dc->crop) {
+ case CROP_NONE:
+ return (uint32_t) dc->frame.size.height;
 
-	case CROP_MANUAL:
-		return (uint32_t)fabs(dc->frame.size.height - crop);
+ case CROP_MANUAL:
+ return (uint32_t) fabs(dc->frame.size.height - crop);
 
-	case CROP_TO_WINDOW:
-		return (uint32_t)dc->window_rect.size.height;
+ case CROP_TO_WINDOW:
+ return (uint32_t) dc->window_rect.size.height;
 
-	case CROP_TO_WINDOW_AND_MANUAL:
-		return (uint32_t)fabs(dc->window_rect.size.height - crop);
+ case CROP_TO_WINDOW_AND_MANUAL:
+ return (uint32_t) fabs(dc->window_rect.size.height - crop);
 
-	case CROP_INVALID:
-		break;
-	}
-	return 0;
+ case CROP_INVALID:
+ break;
+ }
+ return 0;
 }
 
 static void display_capture_defaults(obs_data_t *settings)
 {
-	obs_data_set_default_int(settings, "display", 0);
-	obs_data_set_default_bool(settings, "show_cursor", true);
-	obs_data_set_default_int(settings, "crop_mode", CROP_NONE);
+ NSNumber *screen = NSScreen mainScreen deviceDescription@"NSScreenNumber";
+
+ CFUUIDRef display_uuid = CGDisplayCreateUUIDFromDisplayID((CGDirectDisplayID) screen.intValue);
+ CFStringRef uuid_string = CFUUIDCreateString(kCFAllocatorDefault, display_uuid);
+ obs_data_set_default_string(settings, "display_uuid", CFStringGetCStringPtr(uuid_string, kCFStringEncodingUTF8));
+ CFRelease(uuid_string);
+ CFRelease(display_uuid);
+ obs_data_set_default_bool(settings, "show_cursor", true);
+ obs_data_set_default_int(settings, "crop_mode", CROP_NONE);
 
-	window_defaults(settings);
+ window_defaults(settings);
 }
 
 void load_crop_mode(enum crop_mode *mode, obs_data_t *settings)
 {
-	*mode = (int)obs_data_get_int(settings, "crop_mode");
-	if (!crop_mode_valid(*mode))
-		*mode = CROP_NONE;
+ *mode = (int) obs_data_get_int(settings, "crop_mode");
+ if (!crop_mode_valid(*mode))
+ *mode = CROP_NONE;
 }
 
 void load_crop(struct display_capture *dc, obs_data_t *settings)
 {
-	load_crop_mode(&dc->crop, settings);
+ load_crop_mode(&dc->crop, settings);
 
 #define CROP_VAR_NAME(var, mode) (mode "." #var)
-#define LOAD_CROP_VAR(var, mode) \
-	dc->crop_rect.var = \
-		obs_data_get_double(settings, CROP_VAR_NAME(var, mode));
-	switch (dc->crop) {
-	case CROP_MANUAL:
-		LOAD_CROP_VAR(origin.x, "manual");
-		LOAD_CROP_VAR(origin.y, "manual");
-		LOAD_CROP_VAR(size.width, "manual");
-		LOAD_CROP_VAR(size.height, "manual");
-		break;
-
-	case CROP_TO_WINDOW_AND_MANUAL:
-		LOAD_CROP_VAR(origin.x, "window");
-		LOAD_CROP_VAR(origin.y, "window");
-		LOAD_CROP_VAR(size.width, "window");
-		LOAD_CROP_VAR(size.height, "window");
-		break;
-
-	case CROP_NONE:
-	case CROP_TO_WINDOW:
-	case CROP_INVALID:
-		break;
-	}
+#define LOAD_CROP_VAR(var, mode) dc->crop_rect.var = obs_data_get_double(settings, CROP_VAR_NAME(var, mode));
+ switch (dc->crop) {
+ case CROP_MANUAL:
+ LOAD_CROP_VAR(origin.x, "manual");
+ LOAD_CROP_VAR(origin.y, "manual");
+ LOAD_CROP_VAR(size.width, "manual");
+ LOAD_CROP_VAR(size.height, "manual");
+ break;
+
+ case CROP_TO_WINDOW_AND_MANUAL:
+ LOAD_CROP_VAR(origin.x, "window");
+ LOAD_CROP_VAR(origin.y, "window");
+ LOAD_CROP_VAR(size.width, "window");
+ LOAD_CROP_VAR(size.height, "window");
+ break;
+
+ case CROP_NONE:
+ case CROP_TO_WINDOW:
+ case CROP_INVALID:
+ break;
+ }
 #undef LOAD_CROP_VAR
 }
 
 static void display_capture_update(void *data, obs_data_t *settings)
 {
-	struct display_capture *dc = data;
+ struct display_capture *dc = data;
+
+ load_crop(dc, settings);
 
-	load_crop(dc, settings);
+ if (requires_window(dc->crop))
+ update_window(&dc->window, settings);
 
-	if (requires_window(dc->crop))
-		update_window(&dc->window, settings);
+ CGDirectDisplayID display = get_display_migrate_settings(settings);
 
-	unsigned display = (unsigned int)obs_data_get_int(settings, "display");
-	bool show_cursor = obs_data_get_bool(settings, "show_cursor");
-	if (dc->display == display && dc->hide_cursor != show_cursor)
-		return;
+ bool show_cursor = obs_data_get_bool(settings, "show_cursor");
+ if (dc->display == display && dc->hide_cursor != show_cursor)
+ return;
 
-	obs_enter_graphics();
+ obs_enter_graphics();
 
-	destroy_display_stream(dc);
-	dc->display = display;
-	dc->hide_cursor = !show_cursor;
-	init_display_stream(dc);
+ destroy_display_stream(dc);
+ dc->display = display;
+ dc->hide_cursor = !show_cursor;
+ init_display_stream(dc);
 
-	obs_leave_graphics();
+ obs_leave_graphics();
 }
 
-static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p,
-			 obs_data_t *settings)
+static bool switch_crop_mode(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	UNUSED_PARAMETER(p);
-
-	enum crop_mode crop;
-	load_crop_mode(&crop, settings);
-
-	const char *name;
-	bool visible;
-#define LOAD_CROP_VAR(var, mode) \
-	name = CROP_VAR_NAME(var, mode); \
-	obs_property_set_visible(obs_properties_get(props, name), visible);
-
-	visible = crop == CROP_MANUAL;
-	LOAD_CROP_VAR(origin.x, "manual");
-	LOAD_CROP_VAR(origin.y, "manual");
-	LOAD_CROP_VAR(size.width, "manual");
-	LOAD_CROP_VAR(size.height, "manual");
-
-	visible = crop == CROP_TO_WINDOW_AND_MANUAL;
-	LOAD_CROP_VAR(origin.x, "window");
-	LOAD_CROP_VAR(origin.y, "window");
-	LOAD_CROP_VAR(size.width, "window");
-	LOAD_CROP_VAR(size.height, "window");
+ UNUSED_PARAMETER(p);
+
+ enum crop_mode crop;
+ load_crop_mode(&crop, settings);
+
+ const char *name;
+ bool visible;
+#define LOAD_CROP_VAR(var, mode) \
+ name = CROP_VAR_NAME(var, mode); \
+ obs_property_set_visible(obs_properties_get(props, name), visible);
+
+ visible = crop == CROP_MANUAL;
+ LOAD_CROP_VAR(origin.x, "manual");
+ LOAD_CROP_VAR(origin.y, "manual");
+ LOAD_CROP_VAR(size.width, "manual");
+ LOAD_CROP_VAR(size.height, "manual");
+
+ visible = crop == CROP_TO_WINDOW_AND_MANUAL;
+ LOAD_CROP_VAR(origin.x, "window");
+ LOAD_CROP_VAR(origin.y, "window");
+ LOAD_CROP_VAR(size.width, "window");
+ LOAD_CROP_VAR(size.height, "window");
 #undef LOAD_CROP_VAR
 
-	show_window_properties(props, visible || crop == CROP_TO_WINDOW);
-	return true;
+ show_window_properties(props, visible || crop == CROP_TO_WINDOW);
+ return true;
 }
 
-static const char *crop_names = {"CropMode.None", "CropMode.Manual",
-				 "CropMode.ToWindow",
-				 "CropMode.ToWindowAndManual"};
+static const char *crop_names = {"CropMode.None", "CropMode.Manual", "CropMode.ToWindow",
+ "CropMode.ToWindowAndManual"};
 
 #ifndef COUNTOF
 #define COUNTOF(x) (sizeof(x) / sizeof(x0))
 #endif
 static obs_properties_t *display_capture_properties(void *unused)
 {
-	UNUSED_PARAMETER(unused);
-
-	obs_properties_t *props = obs_properties_create();
-
-	obs_property_t *list = obs_properties_add_list(
-		props, "display", obs_module_text("DisplayCapture.Display"),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-
-	NSScreen screens enumerateObjectsUsingBlock:^(
-				 NSScreen *_Nonnull screen, NSUInteger index,
-				 BOOL *_Nonnull stop
-				 __attribute__((unused))) {
-		char dimension_buffer412;
-		char name_buffer256;
-		snprintf(dimension_buffer0, sizeof(dimension_buffer0), "%u",
-			 (uint32_t)screen frame.size.width);
-		snprintf(dimension_buffer1, sizeof(dimension_buffer0), "%u",
-			 (uint32_t)screen frame.size.height);
-		snprintf(dimension_buffer2, sizeof(dimension_buffer0), "%d",
-			 (int32_t)screen frame.origin.x);
-		snprintf(dimension_buffer3, sizeof(dimension_buffer0), "%d",
-			 (int32_t)screen frame.origin.y);
-
-		snprintf(name_buffer, sizeof(name_buffer),
-			 "%.200s: %.12sx%.12s @ %.12s,%.12s",
-			 screen localizedName UTF8String,
-			 dimension_buffer0, dimension_buffer1,
-			 dimension_buffer2, dimension_buffer3);
-
-		obs_property_list_add_int(list, name_buffer, index);
-	};
-
-	obs_properties_add_bool(props, "show_cursor",
-				obs_module_text("DisplayCapture.ShowCursor"));
-
-	obs_property_t *crop = obs_properties_add_list(
-		props, "crop_mode", obs_module_text("CropMode"),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_modified_callback(crop, switch_crop_mode);
-
-	for (unsigned i = 0; i < COUNTOF(crop_names); i++) {
-		const char *name = obs_module_text(crop_namesi);
-		obs_property_list_add_int(crop, name, i);
-	}
-
-	add_window_properties(props);
-	show_window_properties(props, false);
-
-	obs_property_t *p;
-	const char *name;
-	float min;
-#define LOAD_CROP_VAR(var, mode) \
-	name = CROP_VAR_NAME(var, mode); \
-	p = obs_properties_add_float( \
-		props, name, obs_module_text("Crop." #var), min, 4096.f, .5f); \
-	obs_property_set_visible(p, false);
-
-	min = 0.f;
-	LOAD_CROP_VAR(origin.x, "manual");
-	LOAD_CROP_VAR(origin.y, "manual");
-	LOAD_CROP_VAR(size.width, "manual");
-	LOAD_CROP_VAR(size.height, "manual");
-
-	min = -4096.f;
-	LOAD_CROP_VAR(origin.x, "window");
-	LOAD_CROP_VAR(origin.y, "window");
-	LOAD_CROP_VAR(size.width, "window");
-	LOAD_CROP_VAR(size.height, "window");
+ UNUSED_PARAMETER(unused);
+
+ obs_properties_t *props = obs_properties_create();
+
+ obs_property_t *list = obs_properties_add_list(props, "display_uuid", obs_module_text("DisplayCapture.Display"),
+ OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+
+ NSScreen screens enumerateObjectsUsingBlock:^(NSScreen *_Nonnull screen, NSUInteger index __unused,
+ BOOL *_Nonnull stop __unused) {
+ char dimension_buffer412;
+ char name_buffer256;
+ snprintf(dimension_buffer0, sizeof(dimension_buffer0), "%u", (uint32_t)screen frame.size.width);
+ snprintf(dimension_buffer1, sizeof(dimension_buffer0), "%u", (uint32_t)screen frame.size.height);
+ snprintf(dimension_buffer2, sizeof(dimension_buffer0), "%d", (int32_t)screen frame.origin.x);
+ snprintf(dimension_buffer3, sizeof(dimension_buffer0), "%d", (int32_t)screen frame.origin.y);
+
+ snprintf(name_buffer, sizeof(name_buffer), "%.200s: %.12sx%.12s @ %.12s,%.12s",
+ screen localizedName UTF8String, dimension_buffer0, dimension_buffer1, dimension_buffer2,
+ dimension_buffer3);
+
+ NSNumber *screenNumber = screen.deviceDescription@"NSScreenNumber";
+
+ CGDirectDisplayID display_id = (CGDirectDisplayID) screenNumber.intValue;
+ CFUUIDRef display_uuid = CGDisplayCreateUUIDFromDisplayID(display_id);
+ CFStringRef uuid_string = CFUUIDCreateString(kCFAllocatorDefault, display_uuid);
+ obs_property_list_add_string(list, name_buffer, CFStringGetCStringPtr(uuid_string, kCFStringEncodingUTF8));
+ CFRelease(uuid_string);
+ CFRelease(display_uuid);
+ };
+
+ obs_properties_add_bool(props, "show_cursor", obs_module_text("DisplayCapture.ShowCursor"));
+
+ obs_property_t *crop = obs_properties_add_list(props, "crop_mode", obs_module_text("CropMode"), OBS_COMBO_TYPE_LIST,
+ OBS_COMBO_FORMAT_INT);
+ obs_property_set_modified_callback(crop, switch_crop_mode);
+
+ for (unsigned i = 0; i < COUNTOF(crop_names); i++) {
+ const char *name = obs_module_text(crop_namesi);
+ obs_property_list_add_int(crop, name, i);
+ }
+
+ add_window_properties(props);
+ show_window_properties(props, false);
+
+ obs_property_t *p;
+ const char *name;
+ float min;
+#define LOAD_CROP_VAR(var, mode) \
+ name = CROP_VAR_NAME(var, mode); \
+ p = obs_properties_add_float(props, name, obs_module_text("Crop." #var), min, 4096.f, .5f); \
+ obs_property_set_visible(p, false);
+
+ min = 0.f;
+ LOAD_CROP_VAR(origin.x, "manual");
+ LOAD_CROP_VAR(origin.y, "manual");
+ LOAD_CROP_VAR(size.width, "manual");
+ LOAD_CROP_VAR(size.height, "manual");
+
+ min = -4096.f;
+ LOAD_CROP_VAR(origin.x, "window");
+ LOAD_CROP_VAR(origin.y, "window");
+ LOAD_CROP_VAR(size.width, "window");
+ LOAD_CROP_VAR(size.height, "window");
 #undef LOAD_CROP_VAR
 
-	return props;
+ return props;
 }
 
 struct obs_source_info display_capture_info = {
-	.id = "display_capture",
-	.type = OBS_SOURCE_TYPE_INPUT,
-	.get_name = display_capture_getname,
+ .id = "display_capture",
+ .type = OBS_SOURCE_TYPE_INPUT,
+ .get_name = display_capture_getname,
 
-	.create = display_capture_create,
-	.destroy = display_capture_destroy,
+ .create = display_capture_create,
+ .destroy = display_capture_destroy,
 
-	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
-			OBS_SOURCE_DO_NOT_DUPLICATE | OBS_SOURCE_SRGB,
-	.video_tick = display_capture_video_tick,
-	.video_render = display_capture_video_render,
+ .output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_DO_NOT_DUPLICATE | OBS_SOURCE_SRGB,
+ .video_tick = display_capture_video_tick,
+ .video_render = display_capture_video_render,
 
-	.get_width = display_capture_getwidth,
-	.get_height = display_capture_getheight,
+ .get_width = display_capture_getwidth,
+ .get_height = display_capture_getheight,
 
-	.get_defaults = display_capture_defaults,
-	.get_properties = display_capture_properties,
-	.update = display_capture_update,
-	.icon_type = OBS_ICON_TYPE_DESKTOP_CAPTURE,
+ .get_defaults = display_capture_defaults,
+ .get_properties = display_capture_properties,
+ .update = display_capture_update,
+ .icon_type = OBS_ICON_TYPE_DESKTOP_CAPTURE,
 };

obs-studio-30.0.2.tar.xz/plugins/mac-capture/mac-sck-audio-capture.m Added

@@ -0,0 +1,318 @@
+#include "mac-sck-common.h"
+
+const char *sck_audio_capture_getname(void *unused __unused)
+{
+    return obs_module_text("SCK.Audio.Name");
+}
+
+static void destroy_audio_screen_stream(struct screen_capture *sc)
+{
+    if (sc->disp && !sc->capture_failed) {
+        sc->disp stopCaptureWithCompletionHandler:^(NSError *_Nullable error) {
+            if (error && error.code != SCStreamErrorAttemptToStopStreamState) {
+                MACCAP_ERR("destroy_audio_screen_stream: Failed to stop stream with error %s\n",
+                           error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+            }
+            os_event_signal(sc->disp_finished);
+        };
+        os_event_wait(sc->disp_finished);
+    }
+
+    if (sc->stream_properties) {
+        sc->stream_properties release;
+        sc->stream_properties = NULL;
+    }
+
+    if (sc->disp) {
+        sc->disp release;
+        sc->disp = NULL;
+    }
+
+    os_event_destroy(sc->disp_finished);
+    os_event_destroy(sc->stream_start_completed);
+}
+
+static void sck_audio_capture_destroy(void *data)
+{
+    struct screen_capture *sc = data;
+
+    if (!sc)
+        return;
+
+    destroy_audio_screen_stream(sc);
+
+    if (sc->shareable_content) {
+        os_sem_wait(sc->shareable_content_available);
+        sc->shareable_content release;
+        os_sem_destroy(sc->shareable_content_available);
+        sc->shareable_content_available = NULL;
+    }
+
+    if (sc->capture_delegate) {
+        sc->capture_delegate release;
+    }
+    sc->application_id release;
+
+    pthread_mutex_destroy(&sc->mutex);
+    bfree(sc);
+}
+
+static bool init_audio_screen_stream(struct screen_capture *sc)
+{
+    SCContentFilter *content_filter;
+    if (sc->capture_failed) {
+        sc->capture_failed = false;
+        obs_source_update_properties(sc->source);
+    }
+
+    sc->stream_properties = SCStreamConfiguration alloc init;
+    os_sem_wait(sc->shareable_content_available);
+
+    SCDisplay * (^get_target_display)(void) = ^SCDisplay *
+    {
+        for (SCDisplay *display in sc->shareable_content.displays) {
+            if (display.displayID == sc->display) {
+                return display;
+            }
+        }
+        return nil;
+    };
+
+    switch (sc->audio_capture_type) {
+        case ScreenCaptureAudioDesktopStream: {
+            SCDisplay *target_display = get_target_display();
+
+            NSArray *empty = NSArray alloc init;
+            content_filter = SCContentFilter alloc initWithDisplay:target_display excludingWindows:empty;
+            empty release;
+        } break;
+        case ScreenCaptureAudioApplicationStream: {
+            SCDisplay *target_display = get_target_display();
+            SCRunningApplication *target_application = nil;
+            for (SCRunningApplication *application in sc->shareable_content.applications) {
+                if (application.bundleIdentifier isEqualToString:sc->application_id) {
+                    target_application = application;
+                    break;
+                }
+            }
+            NSArray *target_application_array = NSArray alloc initWithObjects:target_application, nil;
+
+            NSArray *empty = NSArray alloc init;
+            content_filter = SCContentFilter alloc initWithDisplay:target_display
+                                                includingApplications:target_application_array
+                                                     exceptingWindows:empty;
+            target_application_array release;
+            empty release;
+        } break;
+    }
+    os_sem_post(sc->shareable_content_available);
+    sc->stream_properties setQueueDepth:8;
+
+    sc->stream_properties setCapturesAudio:TRUE;
+    sc->stream_properties setExcludesCurrentProcessAudio:TRUE;
+
+    struct obs_audio_info audio_info;
+    BOOL did_get_audio_info = obs_get_audio_info(&audio_info);
+    if (!did_get_audio_info) {
+        MACCAP_ERR("init_audio_screen_stream: No audio configured, returning %d\n", did_get_audio_info);
+        content_filter release;
+        return did_get_audio_info;
+    }
+    int channel_count = get_audio_channels(audio_info.speakers);
+    if (channel_count > 1) {
+        sc->stream_properties setChannelCount:2;
+    } else {
+        sc->stream_properties setChannelCount:channel_count;
+    }
+
+    sc->disp = SCStream alloc initWithFilter:content_filter configuration:sc->stream_properties
+                                       delegate:sc->capture_delegate;
+    content_filter release;
+
+    //add a dummy video stream output to silence errors from SCK. frames are dropped by the delegate
+    NSError *error = nil;
+    BOOL did_add_output = sc->disp addStreamOutput:sc->capture_delegate type:SCStreamOutputTypeScreen
+                                 sampleHandlerQueue:nil
+                                              error:&error;
+    if (!did_add_output) {
+        MACCAP_ERR("init_audio_screen_stream: Failed to add video stream output with error %s\n",
+                   error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+        error release;
+        sc->disp release;
+        sc->disp = NULL;
+        return !did_add_output;
+    }
+
+    did_add_output = sc->disp addStreamOutput:sc->capture_delegate type:SCStreamOutputTypeAudio sampleHandlerQueue:nil
+                                         error:&error;
+    if (!did_add_output) {
+        MACCAP_ERR("init_audio_screen_stream: Failed to add audio stream output with error %s\n",
+                   error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+        error release;
+        sc->disp release;
+        sc->disp = NULL;
+        return !did_add_output;
+    }
+    os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL);
+    os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL);
+
+    __block BOOL did_stream_start = false;
+    sc->disp startCaptureWithCompletionHandler:^(NSError *_Nullable error2) {
+        did_stream_start = (BOOL) (error2 == nil);
+        if (!did_stream_start) {
+            MACCAP_ERR("init_audio_screen_stream: Failed to start capture with error %s\n",
+                       error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+            // Clean up disp so it isn't stopped
+            sc->disp release;
+            sc->disp = NULL;
+        }
+        os_event_signal(sc->stream_start_completed);
+    };
+    os_event_wait(sc->stream_start_completed);
+
+    return did_stream_start;
+}
+
+static void sck_audio_capture_defaults(obs_data_t *settings)
+{
+    obs_data_set_default_string(settings, "application", NULL);
+    obs_data_set_default_int(settings, "type", ScreenCaptureAudioDesktopStream);
+}
+
+static void *sck_audio_capture_create(obs_data_t *settings, obs_source_t *source)
+{
+    struct screen_capture *sc = bzalloc(sizeof(struct screen_capture));
+
+    sc->source = source;
+    sc->audio_only = true;
+    sc->audio_capture_type = (unsigned int) obs_data_get_int(settings, "type");
+
+    os_sem_init(&sc->shareable_content_available, 1);
+    screen_capture_build_content_list(sc, sc->capture_type == ScreenCaptureAudioDesktopStream);
+
+    sc->capture_delegate = ScreenCaptureDelegate alloc init;
+    sc->capture_delegate.sc = sc;
+
+    sc->display = CGMainDisplayID();
+
+    sc->application_id = NSString alloc initWithUTF8String:obs_data_get_string(settings, "application");
+    pthread_mutex_init(&sc->mutex, NULL);
+
+    if (!init_audio_screen_stream(sc))
+        goto fail;
+
+    return sc;
+
+fail:
+    sck_audio_capture_destroy(sc);
+    return NULL;
+}
+
+#pragma mark - obs_properties
+
+static bool audio_capture_method_changed(void *data, obs_properties_t *props, obs_property_t *list __unused,
+                                         obs_data_t *settings)
+{
+    struct screen_capture *sc = data;
+
+    unsigned int capture_type_id = (unsigned int) obs_data_get_int(settings, "type");
+    obs_property_t *app_list = obs_properties_get(props, "application");
+
+    switch (capture_type_id) {
+        case ScreenCaptureAudioDesktopStream: {
+            obs_property_set_visible(app_list, false);
+            break;
+        }
+        case ScreenCaptureAudioApplicationStream: {
+            obs_property_set_visible(app_list, true);
+            screen_capture_build_content_list(sc, capture_type_id == ScreenCaptureAudioDesktopStream);
+            build_application_list(sc, props);
+            break;
+        }
+    }
+
+    return true;
+}
+
+static bool reactivate_capture(obs_properties_t *props __unused, obs_property_t *property, void *data)
+{
+    struct screen_capture *sc = data;
+    if (!sc->capture_failed) {
+        MACCAP_LOG(LOG_WARNING, "Tried to reactivate capture that hadn't failed.");
+        return false;
+    }
+
+    destroy_audio_screen_stream(sc);
+    sc->capture_failed = false;
+    init_audio_screen_stream(sc);
+    obs_property_set_enabled(property, false);
+    return true;
+}
+
+static obs_properties_t *sck_audio_capture_properties(void *data)
+{
+    struct screen_capture *sc = data;
+
+    obs_properties_t *props = obs_properties_create();
+
+    obs_property_t *capture_type = obs_properties_add_list(props, "type", obs_module_text("SCK.Method"),
+                                                           OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+
+    obs_property_list_add_int(capture_type, obs_module_text("DesktopAudioCapture"), 0);
+    obs_property_list_add_int(capture_type, obs_module_text("ApplicationAudioCapture"), 1);
+
+    obs_property_set_modified_callback2(capture_type, audio_capture_method_changed, data);
+
+    obs_property_t *app_list = obs_properties_add_list(props, "application", obs_module_text("Application"),
+                                                       OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+    obs_property_t *reactivate =
+        obs_properties_add_button2(props, "reactivate_capture", obs_module_text("SCK.Restart"), reactivate_capture, sc);
+    obs_property_set_enabled(reactivate, sc->capture_failed);
+
+    if (sc) {
+        switch (sc->audio_capture_type) {
+            case 0: {
+                obs_property_set_visible(app_list, false);
+                break;
+            }
+            case 1: {
+                obs_property_set_visible(app_list, true);
+                break;
+            }
+        }
+    }
+
+    return props;
+}
+
+static void sck_audio_capture_update(void *data, obs_data_t *settings)
+{
+    struct screen_capture *sc = data;
+
+    ScreenCaptureAudioStreamType capture_type = (ScreenCaptureAudioStreamType) obs_data_get_int(settings, "type");
+    NSString *application_id = NSString alloc initWithUTF8String:obs_data_get_string(settings, "application");
+
+    destroy_audio_screen_stream(sc);
+    sc->audio_capture_type = capture_type;
+    sc->application_id release;
+    sc->application_id = application_id;
+    init_audio_screen_stream(sc);
+}
+
+#pragma mark - obs_source_info
+
+struct obs_source_info sck_audio_capture_info = {
+    .id = "sck_audio_capture",
+    .type = OBS_SOURCE_TYPE_INPUT,
+    .get_name = sck_audio_capture_getname,
+
+    .create = sck_audio_capture_create,
+    .destroy = sck_audio_capture_destroy,
+
+    .output_flags = OBS_SOURCE_DO_NOT_DUPLICATE | OBS_SOURCE_AUDIO,
+
+    .get_defaults = sck_audio_capture_defaults,
+    .get_properties = sck_audio_capture_properties,
+    .update = sck_audio_capture_update,
+    .icon_type = OBS_ICON_TYPE_AUDIO_OUTPUT,
+};

obs-studio-30.0.2.tar.xz/plugins/mac-capture/mac-sck-common.h Added

@@ -0,0 +1,86 @@
+#include <AvailabilityMacros.h>
+#include <Cocoa/Cocoa.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+
+#include <stdlib.h>
+#include <obs-module.h>
+#include <util/threading.h>
+#include <pthread.h>
+
+#include <IOSurface/IOSurface.h>
+#include <ScreenCaptureKit/ScreenCaptureKit.h>
+#include <CoreMedia/CMSampleBuffer.h>
+#include <CoreVideo/CVPixelBuffer.h>
+
+#define MACCAP_LOG(level, msg, ...) blog(level, " mac-screencapture : " msg, ##__VA_ARGS__)
+#define MACCAP_ERR(msg, ...) MACCAP_LOG(LOG_ERROR, msg, ##__VA_ARGS__)
+
+typedef enum {
+ ScreenCaptureDisplayStream = 0,
+ ScreenCaptureWindowStream = 1,
+ ScreenCaptureApplicationStream = 2,
+} ScreenCaptureStreamType;
+
+typedef enum {
+ ScreenCaptureAudioDesktopStream = 0,
+ ScreenCaptureAudioApplicationStream = 1,
+} ScreenCaptureAudioStreamType;
+
+@interface ScreenCaptureDelegate : NSObject <SCStreamOutput, SCStreamDelegate>
+
+@property struct screen_capture *sc;
+
+@end
+
+struct screen_capture {
+ obs_source_t *source;
+
+ gs_effect_t *effect;
+ gs_texture_t *tex;
+
+ NSRect frame;
+ bool hide_cursor;
+ bool hide_obs;
+ bool show_hidden_windows;
+ bool show_empty_names;
+ bool audio_only;
+
+ SCStream *disp;
+ SCStreamConfiguration *stream_properties;
+ SCShareableContent *shareable_content;
+ ScreenCaptureDelegate *capture_delegate;
+
+ os_event_t *disp_finished;
+ os_event_t *stream_start_completed;
+ os_sem_t *shareable_content_available;
+ IOSurfaceRef current, prev;
+ bool capture_failed;
+
+ pthread_mutex_t mutex;
+
+ ScreenCaptureStreamType capture_type;
+ ScreenCaptureAudioStreamType audio_capture_type;
+ CGDirectDisplayID display;
+ CGWindowID window;
+ NSString *application_id;
+};
+
+bool is_screen_capture_available(void);
+
+void screen_capture_build_content_list(struct screen_capture *sc, bool display_capture);
+
+bool build_display_list(struct screen_capture *sc, obs_properties_t *props);
+
+bool build_window_list(struct screen_capture *sc, obs_properties_t *props);
+
+bool build_application_list(struct screen_capture *sc, obs_properties_t *props);
+
+static const char *screen_capture_getname(void *unused __unused);
+
+void screen_stream_video_update(struct screen_capture *sc, CMSampleBufferRef sample_buffer);
+
+void screen_stream_audio_update(struct screen_capture *sc, CMSampleBufferRef sample_buffer);
+
+#pragma clang diagnostic pop

obs-studio-30.0.2.tar.xz/plugins/mac-capture/mac-sck-common.m Added

@@ -0,0 +1,337 @@
+#include "mac-sck-common.h"
+
+bool is_screen_capture_available(void)
+{
+ if (@available(macOS 12.5, *)) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+#pragma mark - ScreenCaptureDelegate
+
+@implementation ScreenCaptureDelegate
+
+- (void)stream:(SCStream *)stream didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer ofType:(SCStreamOutputType)type
+{
+ if (self.sc != NULL) {
+ if (type == SCStreamOutputTypeScreen && !self.sc->audio_only) {
+ screen_stream_video_update(self.sc, sampleBuffer);
+ } else if (@available(macOS 13.0, *)) {
+ if (type == SCStreamOutputTypeAudio) {
+ screen_stream_audio_update(self.sc, sampleBuffer);
+ }
+ }
+ }
+}
+
+- (void)stream:(SCStream *)stream didStopWithError:(NSError *)error
+{
+ NSString *errorMessage;
+ switch (error.code) {
+ case SCStreamErrorUserStopped:
+ errorMessage = @"User stopped stream.";
+ break;
+ case SCStreamErrorNoCaptureSource:
+ errorMessage = @"Stream stopped as no capture source was not found.";
+ break;
+ default:
+ errorMessage = NSString stringWithFormat:@"Stream stopped with error %ld (\"%s\")", error.code,
+ error.localizedDescription.UTF8String;
+ break;
+ }
+
+ MACCAP_LOG(LOG_WARNING, "%s", errorMessage.UTF8String);
+
+ self.sc->capture_failed = true;
+ obs_source_update_properties(self.sc->source);
+}
+
+@end
+
+#pragma mark - obs_properties
+
+void screen_capture_build_content_list(struct screen_capture *sc, bool display_capture)
+{
+ typedef void (^shareable_content_callback)(SCShareableContent *, NSError *);
+ shareable_content_callback new_content_received = ^void(SCShareableContent *shareable_content, NSError *error) {
+ if (error == nil && sc->shareable_content_available != NULL) {
+ sc->shareable_content = shareable_content retain;
+ } else {
+#ifdef DEBUG
+ MACCAP_ERR("screen_capture_properties: Failed to get shareable content with error %s\n",
+ error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+#endif
+ MACCAP_LOG(LOG_WARNING, "Unable to get list of available applications or windows. "
+ "Please check if OBS has necessary screen capture permissions.");
+ }
+ os_sem_post(sc->shareable_content_available);
+ };
+
+ os_sem_wait(sc->shareable_content_available);
+ sc->shareable_content release;
+ BOOL onScreenWindowsOnly = (display_capture) ? NO : !sc->show_hidden_windows;
+ SCShareableContent getShareableContentExcludingDesktopWindows:YES onScreenWindowsOnly:onScreenWindowsOnly
+ completionHandler:new_content_received;
+}
+
+bool build_display_list(struct screen_capture *sc, obs_properties_t *props)
+{
+ os_sem_wait(sc->shareable_content_available);
+
+ obs_property_t *display_list = obs_properties_get(props, "display_uuid");
+ obs_property_list_clear(display_list);
+
+ for (SCDisplay *display in sc->shareable_content.displays) {
+ NSScreen *display_screen = nil;
+ for (NSScreen *screen in NSScreen.screens) {
+ NSNumber *screen_num = screen.deviceDescription@"NSScreenNumber";
+ CGDirectDisplayID screen_display_id = (CGDirectDisplayID) screen_num.intValue;
+ if (screen_display_id == display.displayID) {
+ display_screen = screen;
+ break;
+ }
+ }
+ if (!display_screen) {
+ continue;
+ }
+
+ char dimension_buffer412 = {};
+ char name_buffer256 = {};
+ snprintf(dimension_buffer0, sizeof(dimension_buffer0), "%u", (uint32_t) display_screen.frame.size.width);
+ snprintf(dimension_buffer1, sizeof(dimension_buffer0), "%u", (uint32_t) display_screen.frame.size.height);
+ snprintf(dimension_buffer2, sizeof(dimension_buffer0), "%d", (int32_t) display_screen.frame.origin.x);
+ snprintf(dimension_buffer3, sizeof(dimension_buffer0), "%d", (int32_t) display_screen.frame.origin.y);
+
+ snprintf(name_buffer, sizeof(name_buffer), "%.200s: %.12sx%.12s @ %.12s,%.12s",
+ display_screen.localizedName.UTF8String, dimension_buffer0, dimension_buffer1, dimension_buffer2,
+ dimension_buffer3);
+
+ CFUUIDRef display_uuid = CGDisplayCreateUUIDFromDisplayID(display.displayID);
+ CFStringRef uuid_string = CFUUIDCreateString(kCFAllocatorDefault, display_uuid);
+ obs_property_list_add_string(display_list, name_buffer,
+ CFStringGetCStringPtr(uuid_string, kCFStringEncodingUTF8));
+ CFRelease(uuid_string);
+ CFRelease(display_uuid);
+ }
+
+ os_sem_post(sc->shareable_content_available);
+ return true;
+}
+
+bool build_window_list(struct screen_capture *sc, obs_properties_t *props)
+{
+ os_sem_wait(sc->shareable_content_available);
+
+ obs_property_t *window_list = obs_properties_get(props, "window");
+ obs_property_list_clear(window_list);
+
+ NSPredicate *filteredWindowPredicate =
+ NSPredicate predicateWithBlock:^BOOL(SCWindow *window, NSDictionary *bindings __unused) {
+ NSString *app_name = window.owningApplication.applicationName;
+ NSString *title = window.title;
+ if (!sc->show_empty_names) {
+ return (app_name.length > 0) && (title.length > 0);
+ } else {
+ return YES;
+ }
+ };
+ NSArray<SCWindow *> *filteredWindows;
+ filteredWindows = sc->shareable_content.windows filteredArrayUsingPredicate:filteredWindowPredicate;
+
+ NSArray<SCWindow *> *sortedWindows;
+ sortedWindows = filteredWindows sortedArrayUsingComparator:^NSComparisonResult(SCWindow *window, SCWindow *other) {
+ NSComparisonResult appNameCmp = window.owningApplication.applicationName
+ compare:other.owningApplication.applicationName
+ options:NSCaseInsensitiveSearch;
+ if (appNameCmp == NSOrderedAscending) {
+ return NSOrderedAscending;
+ } else if (appNameCmp == NSOrderedSame) {
+ return window.title compare:other.title options:NSCaseInsensitiveSearch;
+ } else {
+ return NSOrderedDescending;
+ }
+ };
+
+ for (SCWindow *window in sortedWindows) {
+ NSString *app_name = window.owningApplication.applicationName;
+ NSString *title = window.title;
+
+ const char *list_text = NSString stringWithFormat:@"%@ %@", app_name, title UTF8String;
+ obs_property_list_add_int(window_list, list_text, window.windowID);
+ }
+
+ os_sem_post(sc->shareable_content_available);
+ return true;
+}
+
+bool build_application_list(struct screen_capture *sc, obs_properties_t *props)
+{
+ os_sem_wait(sc->shareable_content_available);
+
+ obs_property_t *application_list = obs_properties_get(props, "application");
+ obs_property_list_clear(application_list);
+
+ NSArray<SCRunningApplication *> *filteredApplications;
+ filteredApplications = sc->shareable_content.applications
+ filteredArrayUsingPredicate:NSPredicate predicateWithBlock:^BOOL(SCRunningApplication *app,
+ NSDictionary *bindings __unused) {
+ return app.applicationName.length > 0;
+ };
+
+ NSArray<SCRunningApplication *> *sortedApplications;
+ sortedApplications = filteredApplications
+ sortedArrayUsingComparator:^NSComparisonResult(SCRunningApplication *app, SCRunningApplication *other) {
+ return app.applicationName compare:other.applicationName options:NSCaseInsensitiveSearch;
+ };
+
+ for (SCRunningApplication *application in sortedApplications) {
+ const char *name = application.applicationName UTF8String;
+ const char *bundle_id = application.bundleIdentifier UTF8String;
+ obs_property_list_add_string(application_list, name, bundle_id);
+ }
+
+ os_sem_post(sc->shareable_content_available);
+ return true;
+}
+
+#pragma mark - audio/video
+
+void screen_stream_video_update(struct screen_capture *sc, CMSampleBufferRef sample_buffer)
+{
+ bool frame_detail_errored = false;
+ float scale_factor = 1.0f;
+ CGRect window_rect = {};
+
+ CFArrayRef attachments_array = CMSampleBufferGetSampleAttachmentsArray(sample_buffer, false);
+ if (sc->capture_type == ScreenCaptureWindowStream && attachments_array != NULL &&
+ CFArrayGetCount(attachments_array) > 0) {
+ CFDictionaryRef attachments_dict = CFArrayGetValueAtIndex(attachments_array, 0);
+ if (attachments_dict != NULL) {
+ CFTypeRef frame_scale_factor = CFDictionaryGetValue(attachments_dict, SCStreamFrameInfoScaleFactor);
+ if (frame_scale_factor != NULL) {
+ Boolean result = CFNumberGetValue((CFNumberRef) frame_scale_factor, kCFNumberFloatType, &scale_factor);
+ if (result == false) {
+ scale_factor = 1.0f;
+ frame_detail_errored = true;
+ }
+ }
+
+ CFTypeRef content_rect_dict = CFDictionaryGetValue(attachments_dict, SCStreamFrameInfoContentRect);
+ CFTypeRef content_scale_factor = CFDictionaryGetValue(attachments_dict, SCStreamFrameInfoContentScale);
+ if ((content_rect_dict != NULL) && (content_scale_factor != NULL)) {
+ CGRect content_rect = {};
+ float points_to_pixels = 0.0f;
+
+ Boolean result =
+ CGRectMakeWithDictionaryRepresentation((__bridge CFDictionaryRef) content_rect_dict, &content_rect);
+ if (result == false) {
+ content_rect = CGRectZero;
+ frame_detail_errored = true;
+ }
+ result = CFNumberGetValue((CFNumberRef) content_scale_factor, kCFNumberFloatType, &points_to_pixels);
+ if (result == false) {
+ points_to_pixels = 1.0f;
+ frame_detail_errored = true;
+ }
+
+ window_rect.origin = content_rect.origin;
+ window_rect.size.width = content_rect.size.width / points_to_pixels * scale_factor;
+ window_rect.size.height = content_rect.size.height / points_to_pixels * scale_factor;
+ }
+ }
+ }
+
+ CVImageBufferRef image_buffer = CMSampleBufferGetImageBuffer(sample_buffer);
+
+ CVPixelBufferLockBaseAddress(image_buffer, 0);
+ IOSurfaceRef frame_surface = CVPixelBufferGetIOSurface(image_buffer);
+ CVPixelBufferUnlockBaseAddress(image_buffer, 0);
+
+ IOSurfaceRef prev_current = NULL;
+
+ if (frame_surface && !pthread_mutex_lock(&sc->mutex)) {
+ bool needs_to_update_properties = false;
+
+ if (!frame_detail_errored) {
+ if (sc->capture_type == ScreenCaptureWindowStream) {
+ if ((sc->frame.size.width != window_rect.size.width) ||
+ (sc->frame.size.height != window_rect.size.height)) {
+ sc->frame.size.width = window_rect.size.width;
+ sc->frame.size.height = window_rect.size.height;
+ needs_to_update_properties = true;
+ }
+ } else {
+ size_t width = CVPixelBufferGetWidth(image_buffer);
+ size_t height = CVPixelBufferGetHeight(image_buffer);
+
+ if ((sc->frame.size.width != width) || (sc->frame.size.height != height)) {
+ sc->frame.size.width = width;
+ sc->frame.size.height = height;
+ needs_to_update_properties = true;
+ }
+ }
+ }
+
+ if (needs_to_update_properties) {
+ sc->stream_properties setWidth:(size_t) sc->frame.size.width;
+ sc->stream_properties setHeight:(size_t) sc->frame.size.height;
+
+ sc->disp updateConfiguration:sc->stream_properties completionHandler:^(NSError *_Nullable error) {
+ if (error) {
+ MACCAP_ERR("screen_stream_video_update: Failed to update stream properties with error %s\n",
+ error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+ }
+ };
+ }
+
+ prev_current = sc->current;
+ sc->current = frame_surface;
+ CFRetain(sc->current);
+ IOSurfaceIncrementUseCount(sc->current);
+
+ pthread_mutex_unlock(&sc->mutex);
+ }
+
+ if (prev_current) {
+ IOSurfaceDecrementUseCount(prev_current);
+ CFRelease(prev_current);
+ }
+}
+
+void screen_stream_audio_update(struct screen_capture *sc, CMSampleBufferRef sample_buffer)
+{
+ CMFormatDescriptionRef format_description = CMSampleBufferGetFormatDescription(sample_buffer);
+ const AudioStreamBasicDescription *audio_description =
+ CMAudioFormatDescriptionGetStreamBasicDescription(format_description);
+
+ if (audio_description->mChannelsPerFrame < 1) {
+ MACCAP_ERR(
+ "screen_stream_audio_update: Received sample buffer has less than 1 channel per frame (mChannelsPerFrame set to '%d')\n",
+ audio_description->mChannelsPerFrame);
+ return;
+ }
+
+ char *_Nullable bytes = NULL;
+ CMBlockBufferRef data_buffer = CMSampleBufferGetDataBuffer(sample_buffer);
+ size_t data_buffer_length = CMBlockBufferGetDataLength(data_buffer);
+ CMBlockBufferGetDataPointer(data_buffer, 0, &data_buffer_length, NULL, &bytes);
+
+ CMTime presentation_time = CMSampleBufferGetOutputPresentationTimeStamp(sample_buffer);
+
+ struct obs_source_audio audio_data = {};
+
+ for (uint32_t channel_idx = 0; channel_idx < audio_description->mChannelsPerFrame; ++channel_idx) {
+ uint32_t offset = (uint32_t) (data_buffer_length / audio_description->mChannelsPerFrame) * channel_idx;
+ audio_data.datachannel_idx = (uint8_t *) bytes + offset;
+ }
+
+ audio_data.frames =
+ (uint32_t) (data_buffer_length / audio_description->mBytesPerFrame / audio_description->mChannelsPerFrame);
+ audio_data.speakers = audio_description->mChannelsPerFrame;
+ audio_data.samples_per_sec = (uint32_t) audio_description->mSampleRate;
+ audio_data.timestamp = (uint64_t) (CMTimeGetSeconds(presentation_time) * NSEC_PER_SEC);
+ audio_data.format = AUDIO_FORMAT_FLOAT_PLANAR;
+ obs_source_output_audio(sc->source, &audio_data);
+}

obs-studio-30.0.2.tar.xz/plugins/mac-capture/mac-sck-video-capture.m Added

@@ -0,0 +1,694 @@
+#include "mac-sck-common.h"
+#include "window-utils.h"
+
+static void destroy_screen_stream(struct screen_capture *sc)
+{
+ if (sc->disp && !sc->capture_failed) {
+ sc->disp stopCaptureWithCompletionHandler:^(NSError *_Nullable error) {
+ if (error && error.code != SCStreamErrorAttemptToStopStreamState) {
+ MACCAP_ERR("destroy_screen_stream: Failed to stop stream with error %s\n",
+ error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+ }
+ os_event_signal(sc->disp_finished);
+ };
+ os_event_wait(sc->disp_finished);
+ }
+
+ if (sc->stream_properties) {
+ sc->stream_properties release;
+ sc->stream_properties = NULL;
+ }
+
+ if (sc->tex) {
+ gs_texture_destroy(sc->tex);
+ sc->tex = NULL;
+ }
+
+ if (sc->current) {
+ IOSurfaceDecrementUseCount(sc->current);
+ CFRelease(sc->current);
+ sc->current = NULL;
+ }
+
+ if (sc->prev) {
+ IOSurfaceDecrementUseCount(sc->prev);
+ CFRelease(sc->prev);
+ sc->prev = NULL;
+ }
+
+ if (sc->disp) {
+ sc->disp release;
+ sc->disp = NULL;
+ }
+
+ os_event_destroy(sc->disp_finished);
+ os_event_destroy(sc->stream_start_completed);
+}
+
+static void sck_video_capture_destroy(void *data)
+{
+ struct screen_capture *sc = data;
+
+ if (!sc)
+ return;
+
+ obs_enter_graphics();
+
+ destroy_screen_stream(sc);
+
+ obs_leave_graphics();
+
+ if (sc->shareable_content) {
+ os_sem_wait(sc->shareable_content_available);
+ sc->shareable_content release;
+ os_sem_destroy(sc->shareable_content_available);
+ sc->shareable_content_available = NULL;
+ }
+
+ if (sc->capture_delegate) {
+ sc->capture_delegate release;
+ }
+ sc->application_id release;
+
+ pthread_mutex_destroy(&sc->mutex);
+ bfree(sc);
+}
+
+static bool init_screen_stream(struct screen_capture *sc)
+{
+ SCContentFilter *content_filter;
+ if (sc->capture_failed) {
+ sc->capture_failed = false;
+ obs_source_update_properties(sc->source);
+ }
+
+ sc->frame = CGRectZero;
+ sc->stream_properties = SCStreamConfiguration alloc init;
+ os_sem_wait(sc->shareable_content_available);
+
+ SCDisplay * (^get_target_display)(void) = ^SCDisplay *
+ {
+ for (SCDisplay *display in sc->shareable_content.displays) {
+ if (display.displayID == sc->display) {
+ return display;
+ }
+ }
+ return nil;
+ };
+
+ void (^set_display_mode)(struct screen_capture *, SCDisplay *) =
+ ^void(struct screen_capture *capture_data, SCDisplay *target_display) {
+ CGDisplayModeRef display_mode = CGDisplayCopyDisplayMode(target_display.displayID);
+ capture_data->stream_properties setWidth:CGDisplayModeGetPixelWidth(display_mode);
+ capture_data->stream_properties setHeight:CGDisplayModeGetPixelHeight(display_mode);
+ CGDisplayModeRelease(display_mode);
+ };
+
+ switch (sc->capture_type) {
+ case ScreenCaptureDisplayStream: {
+ SCDisplay *target_display = get_target_display();
+
+ if (sc->hide_obs) {
+ SCRunningApplication *obsApp = nil;
+ NSString *mainBundleIdentifier = NSBundle mainBundle bundleIdentifier;
+ for (SCRunningApplication *app in sc->shareable_content.applications) {
+ if (app.bundleIdentifier isEqualToString:mainBundleIdentifier) {
+ obsApp = app;
+ break;
+ }
+ }
+ NSArray *exclusions = NSArray alloc initWithObjects:obsApp, nil;
+ NSArray *empty = NSArray alloc init;
+ content_filter = SCContentFilter alloc initWithDisplay:target_display
+ excludingApplications:exclusions
+ exceptingWindows:empty;
+ empty release;
+ exclusions release;
+ } else {
+ NSArray *empty = NSArray alloc init;
+ content_filter = SCContentFilter alloc initWithDisplay:target_display excludingWindows:empty;
+ empty release;
+ }
+
+ set_display_mode(sc, target_display);
+ } break;
+ case ScreenCaptureWindowStream: {
+ SCWindow *target_window = nil;
+ if (sc->window != kCGNullWindowID) {
+ for (SCWindow *window in sc->shareable_content.windows) {
+ if (window.windowID == sc->window) {
+ target_window = window;
+ break;
+ }
+ }
+ }
+ if (target_window == nil) {
+ os_sem_post(sc->shareable_content_available);
+ sc->disp = NULL;
+ os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL);
+ os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL);
+ return true;
+ } else {
+ content_filter = SCContentFilter alloc initWithDesktopIndependentWindow:target_window;
+
+ sc->stream_properties setWidth:(size_t) target_window.frame.size.width;
+ sc->stream_properties setHeight:(size_t) target_window.frame.size.height;
+ }
+ } break;
+ case ScreenCaptureApplicationStream: {
+ SCDisplay *target_display = get_target_display();
+ SCRunningApplication *target_application = nil;
+ for (SCRunningApplication *application in sc->shareable_content.applications) {
+ if (application.bundleIdentifier isEqualToString:sc->application_id) {
+ target_application = application;
+ break;
+ }
+ }
+ NSArray *target_application_array = NSArray alloc initWithObjects:target_application, nil;
+ NSArray *empty_array = NSArray alloc init;
+ content_filter = SCContentFilter alloc initWithDisplay:target_display
+ includingApplications:target_application_array
+ exceptingWindows:empty_array;
+ target_application_array release;
+ empty_array release;
+
+ set_display_mode(sc, target_display);
+ } break;
+ }
+ os_sem_post(sc->shareable_content_available);
+
+ CGColorRef background = CGColorGetConstantColor(kCGColorClear);
+ sc->stream_properties setQueueDepth:8;
+ sc->stream_properties setShowsCursor:!sc->hide_cursor;
+ sc->stream_properties setColorSpaceName:kCGColorSpaceDisplayP3;
+ sc->stream_properties setBackgroundColor:background;
+ FourCharCode l10r_type = 0;
+ l10r_type = ('l' << 24) | ('1' << 16) | ('0' << 8) | 'r';
+ sc->stream_properties setPixelFormat:l10r_type;
+
+ if (@available(macOS 13.0, *)) {
+ sc->stream_properties setCapturesAudio:YES;
+ sc->stream_properties setExcludesCurrentProcessAudio:YES;
+ sc->stream_properties setChannelCount:2;
+ } else {
+ if (sc->capture_type != ScreenCaptureWindowStream) {
+ sc->disp = NULL;
+ content_filter release;
+ os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL);
+ os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL);
+ return true;
+ }
+ }
+
+ sc->disp = SCStream alloc initWithFilter:content_filter configuration:sc->stream_properties
+ delegate:sc->capture_delegate;
+
+ content_filter release;
+
+ NSError *addStreamOutputError = nil;
+ BOOL did_add_output = sc->disp addStreamOutput:sc->capture_delegate type:SCStreamOutputTypeScreen
+ sampleHandlerQueue:nil
+ error:&addStreamOutputError;
+ if (!did_add_output) {
+ MACCAP_ERR("init_screen_stream: Failed to add stream output with error %s\n",
+ addStreamOutputError localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+ addStreamOutputError release;
+ return !did_add_output;
+ }
+
+ if (@available(macOS 13.0, *)) {
+ did_add_output = sc->disp addStreamOutput:sc->capture_delegate type:SCStreamOutputTypeAudio
+ sampleHandlerQueue:nil
+ error:&addStreamOutputError;
+ if (!did_add_output) {
+ MACCAP_ERR("init_screen_stream: Failed to add audio stream output with error %s\n",
+ addStreamOutputError localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+ addStreamOutputError release;
+ return !did_add_output;
+ }
+ }
+ os_event_init(&sc->disp_finished, OS_EVENT_TYPE_MANUAL);
+ os_event_init(&sc->stream_start_completed, OS_EVENT_TYPE_MANUAL);
+
+ __block BOOL did_stream_start = NO;
+ sc->disp startCaptureWithCompletionHandler:^(NSError *_Nullable error) {
+ did_stream_start = (BOOL) (error == nil);
+ if (!did_stream_start) {
+ MACCAP_ERR("init_screen_stream: Failed to start capture with error %s\n",
+ error localizedFailureReason cStringUsingEncoding:NSUTF8StringEncoding);
+ // Clean up disp so it isn't stopped
+ sc->disp release;
+ sc->disp = NULL;
+ }
+ os_event_signal(sc->stream_start_completed);
+ };
+ os_event_wait(sc->stream_start_completed);
+
+ return did_stream_start;
+}
+
+static void *sck_video_capture_create(obs_data_t *settings, obs_source_t *source)
+{
+ struct screen_capture *sc = bzalloc(sizeof(struct screen_capture));
+
+ sc->source = source;
+ sc->hide_cursor = !obs_data_get_bool(settings, "show_cursor");
+ sc->hide_obs = obs_data_get_bool(settings, "hide_obs");
+ sc->show_empty_names = obs_data_get_bool(settings, "show_empty_names");
+ sc->show_hidden_windows = obs_data_get_bool(settings, "show_hidden_windows");
+ sc->window = (CGWindowID) obs_data_get_int(settings, "window");
+ sc->capture_type = (unsigned int) obs_data_get_int(settings, "type");
+ sc->audio_only = false;
+
+ os_sem_init(&sc->shareable_content_available, 1);
+ screen_capture_build_content_list(sc, sc->capture_type == ScreenCaptureDisplayStream);
+
+ sc->capture_delegate = ScreenCaptureDelegate alloc init;
+ sc->capture_delegate.sc = sc;
+
+ sc->effect = obs_get_base_effect(OBS_EFFECT_DEFAULT_RECT);
+ if (!sc->effect)
+ goto fail;
+
+ sc->display = get_display_migrate_settings(settings);
+
+ sc->application_id = NSString alloc initWithUTF8String:obs_data_get_string(settings, "application");
+ pthread_mutex_init(&sc->mutex, NULL);
+
+ if (!init_screen_stream(sc))
+ goto fail;
+
+ return sc;
+
+fail:
+ obs_leave_graphics();
+ sck_video_capture_destroy(sc);
+ return NULL;
+}
+
+static void sck_video_capture_tick(void *data, float seconds __unused)
+{
+ struct screen_capture *sc = data;
+
+ if (!sc->current)
+ return;
+ if (!obs_source_showing(sc->source))
+ return;
+
+ IOSurfaceRef prev_prev = sc->prev;
+ if (pthread_mutex_lock(&sc->mutex))
+ return;
+ sc->prev = sc->current;
+ sc->current = NULL;
+ pthread_mutex_unlock(&sc->mutex);
+
+ if (prev_prev == sc->prev)
+ return;
+
+ obs_enter_graphics();
+ if (sc->tex)
+ gs_texture_rebind_iosurface(sc->tex, sc->prev);
+ else
+ sc->tex = gs_texture_create_from_iosurface(sc->prev);
+ obs_leave_graphics();
+
+ if (prev_prev) {
+ IOSurfaceDecrementUseCount(prev_prev);
+ CFRelease(prev_prev);
+ }
+}
+
+static void sck_video_capture_render(void *data, gs_effect_t *effect __unused)
+{
+ struct screen_capture *sc = data;
+
+ if (!sc->tex)
+ return;
+
+ const bool previous = gs_framebuffer_srgb_enabled();
+ gs_enable_framebuffer_srgb(true);
+
+ gs_eparam_t *param = gs_effect_get_param_by_name(sc->effect, "image");
+ gs_effect_set_texture(param, sc->tex);
+
+ while (gs_effect_loop(sc->effect, "DrawD65P3"))
+ gs_draw_sprite(sc->tex, 0, 0, 0);
+
+ gs_enable_framebuffer_srgb(previous);
+}
+
+static const char *sck_video_capture_getname(void *unused __unused)
+{
+ if (@available(macOS 13.0, *))
+ return obs_module_text("SCK.Name");
+ else
+ return obs_module_text("SCK.Name.Beta");
+}
+
+static uint32_t sck_video_capture_getwidth(void *data)
+{
+ struct screen_capture *sc = data;
+
+ return (uint32_t) sc->frame.size.width;
+}
+
+static uint32_t sck_video_capture_getheight(void *data)
+{
+ struct screen_capture *sc = data;
+
+ return (uint32_t) sc->frame.size.height;
+}
+
+static void sck_video_capture_defaults(obs_data_t *settings)
+{
+ CGDirectDisplayID initial_display = 0;
+ {
+ NSScreen *mainScreen = NSScreen mainScreen;
+ if (mainScreen) {
+ NSNumber *screen_num = mainScreen.deviceDescription@"NSScreenNumber";
+ if (screen_num) {
+ initial_display = (CGDirectDisplayID) (uintptr_t) screen_num.pointerValue;
+ }
+ }
+ }
+
+ CFUUIDRef display_uuid = CGDisplayCreateUUIDFromDisplayID(initial_display);
+ CFStringRef uuid_string = CFUUIDCreateString(kCFAllocatorDefault, display_uuid);
+ obs_data_set_default_string(settings, "display_uuid", CFStringGetCStringPtr(uuid_string, kCFStringEncodingUTF8));
+ CFRelease(uuid_string);
+ CFRelease(display_uuid);
+
+ obs_data_set_default_string(settings, "application", NULL);
+ obs_data_set_default_int(settings, "type", ScreenCaptureDisplayStream);
+ obs_data_set_default_int(settings, "window", kCGNullWindowID);
+ obs_data_set_default_bool(settings, "show_cursor", true);
+ obs_data_set_default_bool(settings, "hide_obs", false);
+ obs_data_set_default_bool(settings, "show_empty_names", false);
+ obs_data_set_default_bool(settings, "show_hidden_windows", false);
+}
+
+static void sck_video_capture_update(void *data, obs_data_t *settings)
+{
+ struct screen_capture *sc = data;
+
+ CGWindowID old_window_id = sc->window;
+ CGWindowID new_window_id = (CGWindowID) obs_data_get_int(settings, "window");
+
+ if (new_window_id > 0 && new_window_id != old_window_id)
+ sc->window = new_window_id;
+
+ ScreenCaptureStreamType capture_type = (ScreenCaptureStreamType) obs_data_get_int(settings, "type");
+
+ CGDirectDisplayID display = get_display_migrate_settings(settings);
+
+ NSString *application_id = NSString alloc initWithUTF8String:obs_data_get_string(settings, "application");
+ bool show_cursor = obs_data_get_bool(settings, "show_cursor");
+ bool hide_obs = obs_data_get_bool(settings, "hide_obs");
+ bool show_empty_names = obs_data_get_bool(settings, "show_empty_names");
+ bool show_hidden_windows = obs_data_get_bool(settings, "show_hidden_windows");
+
+ if (capture_type == sc->capture_type) {
+ switch (sc->capture_type) {
+ case ScreenCaptureDisplayStream: {
+ if (sc->display == display && sc->hide_cursor != show_cursor && sc->hide_obs == hide_obs) {
+ application_id release;
+ return;
+ }
+ } break;
+ case ScreenCaptureWindowStream: {
+ if (old_window_id == sc->window && sc->hide_cursor != show_cursor) {
+ application_id release;
+ return;
+ }
+ } break;
+ case ScreenCaptureApplicationStream: {
+ if (sc->display == display && application_id isEqualToString:sc->application_id &&
+ sc->hide_cursor != show_cursor) {
+ application_id release;
+ return;
+ }
+ } break;
+ }
+ }
+
+ obs_enter_graphics();
+
+ destroy_screen_stream(sc);
+ sc->capture_type = capture_type;
+ sc->display = display;
+ sc->application_id release;
+ sc->application_id = application_id;
+ sc->hide_cursor = !show_cursor;
+ sc->hide_obs = hide_obs;
+ sc->show_empty_names = show_empty_names;
+ sc->show_hidden_windows = show_hidden_windows;
+ init_screen_stream(sc);
+
+ obs_leave_graphics();
+}
+
+#pragma mark - obs_properties
+
+static bool content_settings_changed(void *data, obs_properties_t *props, obs_property_t *list __unused,
+ obs_data_t *settings)
+{
+ struct screen_capture *sc = data;
+
+ unsigned int capture_type_id = (unsigned int) obs_data_get_int(settings, "type");
+ obs_property_t *display_list = obs_properties_get(props, "display_uuid");
+ obs_property_t *window_list = obs_properties_get(props, "window");
+ obs_property_t *app_list = obs_properties_get(props, "application");
+ obs_property_t *empty = obs_properties_get(props, "show_empty_names");
+ obs_property_t *hidden = obs_properties_get(props, "show_hidden_windows");
+ obs_property_t *hide_obs = obs_properties_get(props, "hide_obs");
+
+ obs_property_t *capture_type_error = obs_properties_get(props, "capture_type_info");
+
+ if (sc->capture_type != capture_type_id) {
+ switch (capture_type_id) {
+ case 0: {
+ obs_property_set_visible(display_list, true);
+ obs_property_set_visible(window_list, false);
+ obs_property_set_visible(app_list, false);
+ obs_property_set_visible(empty, false);
+ obs_property_set_visible(hidden, false);
+ obs_property_set_visible(hide_obs, true);
+
+ if (capture_type_error) {
+ obs_property_set_visible(capture_type_error, true);
+ }
+ break;
+ }
+ case 1: {
+ obs_property_set_visible(display_list, false);
+ obs_property_set_visible(window_list, true);
+ obs_property_set_visible(app_list, false);
+ obs_property_set_visible(empty, true);
+ obs_property_set_visible(hidden, true);
+ obs_property_set_visible(hide_obs, false);
+
+ if (capture_type_error) {
+ obs_property_set_visible(capture_type_error, false);
+ }
+ break;
+ }
+ case 2: {
+ obs_property_set_visible(display_list, true);
+ obs_property_set_visible(app_list, true);
+ obs_property_set_visible(window_list, false);
+ obs_property_set_visible(empty, false);
+ obs_property_set_visible(hidden, true);
+ obs_property_set_visible(hide_obs, false);
+
+ if (capture_type_error) {
+ obs_property_set_visible(capture_type_error, true);
+ }
+ break;
+ }
+ }
+ }
+
+ sc->show_empty_names = obs_data_get_bool(settings, "show_empty_names");
+ sc->show_hidden_windows = obs_data_get_bool(settings, "show_hidden_windows");
+ sc->hide_obs = obs_data_get_bool(settings, "hide_obs");
+
+ screen_capture_build_content_list(sc, capture_type_id == ScreenCaptureDisplayStream);
+ build_display_list(sc, props);
+ build_window_list(sc, props);
+ build_application_list(sc, props);
+
+ return true;
+}
+
+static bool reactivate_capture(obs_properties_t *props __unused, obs_property_t *property, void *data)
+{
+ struct screen_capture *sc = data;
+ if (!sc->capture_failed) {
+ MACCAP_LOG(LOG_WARNING, "Tried to reactivate capture that hadn't failed.");
+ return false;
+ }
+
+ obs_enter_graphics();
+ destroy_screen_stream(sc);
+ sc->capture_failed = false;
+ init_screen_stream(sc);
+ obs_leave_graphics();
+ obs_property_set_enabled(property, false);
+ return true;
+}
+
+static obs_properties_t *sck_video_capture_properties(void *data)
+{
+ struct screen_capture *sc = data;
+
+ obs_properties_t *props = obs_properties_create();
+
+ obs_property_t *capture_type = obs_properties_add_list(props, "type", obs_module_text("SCK.Method"),
+ OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+
+ obs_property_list_add_int(capture_type, obs_module_text("DisplayCapture"), 0);
+ obs_property_list_add_int(capture_type, obs_module_text("WindowCapture"), 1);
+ obs_property_list_add_int(capture_type, obs_module_text("ApplicationCapture"), 2);
+
+ obs_property_t *display_list = obs_properties_add_list(
+ props, "display_uuid", obs_module_text("DisplayCapture.Display"), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+
+ obs_property_t *app_list = obs_properties_add_list(props, "application", obs_module_text("Application"),
+ OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+
+ obs_property_t *window_list = obs_properties_add_list(props, "window", obs_module_text("WindowUtils.Window"),
+ OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+
+ obs_property_t *empty =
+ obs_properties_add_bool(props, "show_empty_names", obs_module_text("WindowUtils.ShowEmptyNames"));
+
+ obs_property_t *hidden =
+ obs_properties_add_bool(props, "show_hidden_windows", obs_module_text("WindowUtils.ShowHidden"));
+
+ obs_properties_add_bool(props, "show_cursor", obs_module_text("DisplayCapture.ShowCursor"));
+
+ obs_property_t *hide_obs = obs_properties_add_bool(props, "hide_obs", obs_module_text("DisplayCapture.HideOBS"));
+ obs_property_t *reactivate =
+ obs_properties_add_button2(props, "reactivate_capture", obs_module_text("SCK.Restart"), reactivate_capture, sc);
+ obs_property_set_enabled(reactivate, sc->capture_failed);
+
+ if (sc) {
+ obs_property_set_modified_callback2(capture_type, content_settings_changed, sc);
+
+ obs_property_set_modified_callback2(hidden, content_settings_changed, sc);
+
+ switch (sc->capture_type) {
+ case 0: {
+ obs_property_set_visible(display_list, true);
+ obs_property_set_visible(window_list, false);
+ obs_property_set_visible(app_list, false);
+ obs_property_set_visible(empty, false);
+ obs_property_set_visible(hidden, false);
+ obs_property_set_visible(hide_obs, true);
+ break;
+ }
+ case 1: {
+ obs_property_set_visible(display_list, false);
+ obs_property_set_visible(window_list, true);
+ obs_property_set_visible(app_list, false);
+ obs_property_set_visible(empty, true);
+ obs_property_set_visible(hidden, true);
+ obs_property_set_visible(hide_obs, false);
+ break;
+ }
+ case 2: {
+ obs_property_set_visible(display_list, true);
+ obs_property_set_visible(app_list, true);
+ obs_property_set_visible(window_list, false);
+ obs_property_set_visible(empty, false);
+ obs_property_set_visible(hidden, true);
+ obs_property_set_visible(hide_obs, false);
+ break;
+ }
+ }
+
+ obs_property_set_modified_callback2(empty, content_settings_changed, sc);
+ }
+
+ if (@available(macOS 13.0, *))
+ ;
+ else {
+ obs_property_t *audio_warning =
+ obs_properties_add_text(props, "audio_info", obs_module_text("SCK.AudioUnavailable"), OBS_TEXT_INFO);
+ obs_property_text_set_info_type(audio_warning, OBS_TEXT_INFO_WARNING);
+
+ obs_property_t *capture_type_error = obs_properties_add_text(
+ props, "capture_type_info", obs_module_text("SCK.CaptureTypeUnavailable"), OBS_TEXT_INFO);
+
+ obs_property_text_set_info_type(capture_type_error, OBS_TEXT_INFO_ERROR);
+
+ if (sc) {
+ switch (sc->capture_type) {
+ case ScreenCaptureDisplayStream: {
+ obs_property_set_visible(capture_type_error, true);
+ break;
+ }
+ case ScreenCaptureWindowStream: {
+ obs_property_set_visible(capture_type_error, false);
+ break;
+ }
+ case ScreenCaptureApplicationStream: {
+ obs_property_set_visible(capture_type_error, true);
+ break;
+ }
+ }
+ } else {
+ obs_property_set_visible(capture_type_error, false);
+ }
+ }
+
+ return props;
+}
+
+enum gs_color_space sck_video_capture_get_color_space(void *data, size_t count,
+ const enum gs_color_space *preferred_spaces)
+{
+ UNUSED_PARAMETER(data);
+
+ for (size_t i = 0; i < count; ++i) {
+ if (preferred_spacesi == GS_CS_SRGB_16F)
+ return GS_CS_SRGB_16F;
+ }
+
+ for (size_t i = 0; i < count; ++i) {
+ if (preferred_spacesi == GS_CS_709_EXTENDED)
+ return GS_CS_709_EXTENDED;
+ }
+
+ for (size_t i = 0; i < count; ++i) {
+ if (preferred_spacesi == GS_CS_SRGB)
+ return GS_CS_SRGB;
+ }
+
+ return GS_CS_SRGB_16F;
+}
+
+#pragma mark - obs_source_info
+
+struct obs_source_info sck_video_capture_info = {
+ .id = "screen_capture",
+ .type = OBS_SOURCE_TYPE_INPUT,
+ .get_name = sck_video_capture_getname,
+
+ .create = sck_video_capture_create,
+ .destroy = sck_video_capture_destroy,
+
+ .output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_DO_NOT_DUPLICATE | OBS_SOURCE_SRGB |
+ OBS_SOURCE_AUDIO,
+ .video_tick = sck_video_capture_tick,
+ .video_render = sck_video_capture_render,
+
+ .get_width = sck_video_capture_getwidth,
+ .get_height = sck_video_capture_getheight,
+
+ .get_defaults = sck_video_capture_defaults,
+ .get_properties = sck_video_capture_properties,
+ .update = sck_video_capture_update,
+ .icon_type = OBS_ICON_TYPE_DESKTOP_CAPTURE,
+ .video_get_color_space = sck_video_capture_get_color_space,
+};

obs-studio-29.1.3.tar.xz/plugins/mac-capture/mac-window-capture.m -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/mac-window-capture.m Changed

@@ -9,226 +9,215 @@
 #include "window-utils.h"
 
 struct window_capture {
-	obs_source_t *source;
+    obs_source_t *source;
 
-	struct cocoa_window window;
+    struct cocoa_window window;
 
-	//CGRect              bounds;
-	//CGWindowListOption  window_option;
-	CGWindowImageOption image_option;
+    //CGRect              bounds;
+    //CGWindowListOption  window_option;
+    CGWindowImageOption image_option;
 
-	CGColorSpaceRef color_space;
+    CGColorSpaceRef color_space;
 
-	DARRAY(uint8_t) buffer;
+    DARRAY(uint8_t) buffer;
 
-	pthread_t capture_thread;
-	os_event_t *capture_event;
-	os_event_t *stop_event;
+    pthread_t capture_thread;
+    os_event_t *capture_event;
+    os_event_t *stop_event;
 };
 
 static CGImageRef get_image(struct window_capture *wc)
 {
-	NSArray *arr = (NSArray *)CGWindowListCreate(
-		kCGWindowListOptionIncludingWindow, wc->window.window_id);
-	arr autorelease;
+    NSArray *arr = (NSArray *) CGWindowListCreate(kCGWindowListOptionIncludingWindow, wc->window.window_id);
+    arr autorelease;
 
-	if (!arr.count && !find_window(&wc->window, NULL, false))
-		return NULL;
+    if (!arr.count && !find_window(&wc->window, NULL, false))
+        return NULL;
 
-	return CGWindowListCreateImage(CGRectNull,
-				       kCGWindowListOptionIncludingWindow,
-				       wc->window.window_id, wc->image_option);
+    return CGWindowListCreateImage(CGRectNull, kCGWindowListOptionIncludingWindow, wc->window.window_id,
+                                   wc->image_option);
 }
 
 static inline void capture_frame(struct window_capture *wc)
 {
-	uint64_t ts = os_gettime_ns();
-	CGImageRef img = get_image(wc);
-	if (!img)
-		return;
-
-	size_t width = CGImageGetWidth(img);
-	size_t height = CGImageGetHeight(img);
-
-	if (!width || !height || CGImageGetBitsPerPixel(img) != 32 ||
-	    CGImageGetBitsPerComponent(img) != 8) {
-		CGImageRelease(img);
-		return;
-	}
-
-	CGDataProviderRef provider = CGImageGetDataProvider(img);
-	CFDataRef data = CGDataProviderCopyData(provider);
-
-	struct obs_source_frame frame = {
-		.format = VIDEO_FORMAT_BGRA,
-		.width = (uint32_t)width,
-		.height = (uint32_t)height,
-		.data0 = (uint8_t *)CFDataGetBytePtr(data),
-		.linesize0 = (uint32_t)CGImageGetBytesPerRow(img),
-		.timestamp = ts,
-	};
-
-	obs_source_output_video(wc->source, &frame);
-
-	CGImageRelease(img);
-	CFRelease(data);
+    uint64_t ts = os_gettime_ns();
+    CGImageRef img = get_image(wc);
+    if (!img)
+        return;
+
+    size_t width = CGImageGetWidth(img);
+    size_t height = CGImageGetHeight(img);
+
+    if (!width || !height || CGImageGetBitsPerPixel(img) != 32 || CGImageGetBitsPerComponent(img) != 8) {
+        CGImageRelease(img);
+        return;
+    }
+
+    CGDataProviderRef provider = CGImageGetDataProvider(img);
+    CFDataRef data = CGDataProviderCopyData(provider);
+
+    struct obs_source_frame frame = {
+        .format = VIDEO_FORMAT_BGRA,
+        .width = (uint32_t) width,
+        .height = (uint32_t) height,
+        .data0 = (uint8_t *) CFDataGetBytePtr(data),
+        .linesize0 = (uint32_t) CGImageGetBytesPerRow(img),
+        .timestamp = ts,
+    };
+
+    obs_source_output_video(wc->source, &frame);
+
+    CGImageRelease(img);
+    CFRelease(data);
 }
 
 static void *capture_thread(void *data)
 {
-	struct window_capture *wc = data;
+    struct window_capture *wc = data;
 
-	for (;;) {
-		os_event_wait(wc->capture_event);
-		if (os_event_try(wc->stop_event) != EAGAIN)
-			break;
+    for (;;) {
+        os_event_wait(wc->capture_event);
+        if (os_event_try(wc->stop_event) != EAGAIN)
+            break;
 
-		@autoreleasepool {
-			capture_frame(wc);
-		}
-	}
+        @autoreleasepool {
+            capture_frame(wc);
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
-static inline void *window_capture_create_internal(obs_data_t *settings,
-						   obs_source_t *source)
+static inline void *window_capture_create_internal(obs_data_t *settings, obs_source_t *source)
 {
-	struct window_capture *wc = bzalloc(sizeof(struct window_capture));
+    struct window_capture *wc = bzalloc(sizeof(struct window_capture));
 
-	wc->source = source;
+    wc->source = source;
 
-	wc->color_space = CGColorSpaceCreateDeviceRGB();
+    wc->color_space = CGColorSpaceCreateDeviceRGB();
 
-	da_init(wc->buffer);
+    da_init(wc->buffer);
 
-	init_window(&wc->window, settings);
+    init_window(&wc->window, settings);
 
-	wc->image_option = obs_data_get_bool(settings, "show_shadow")
-				   ? kCGWindowImageDefault
-				   : kCGWindowImageBoundsIgnoreFraming;
+    wc->image_option = obs_data_get_bool(settings, "show_shadow") ? kCGWindowImageDefault
+                                                                  : kCGWindowImageBoundsIgnoreFraming;
 
-	os_event_init(&wc->capture_event, OS_EVENT_TYPE_AUTO);
-	os_event_init(&wc->stop_event, OS_EVENT_TYPE_MANUAL);
+    os_event_init(&wc->capture_event, OS_EVENT_TYPE_AUTO);
+    os_event_init(&wc->stop_event, OS_EVENT_TYPE_MANUAL);
 
-	pthread_create(&wc->capture_thread, NULL, capture_thread, wc);
+    pthread_create(&wc->capture_thread, NULL, capture_thread, wc);
 
-	return wc;
+    return wc;
 }
 
 static void *window_capture_create(obs_data_t *settings, obs_source_t *source)
 {
-	@autoreleasepool {
-		return window_capture_create_internal(settings, source);
-	}
+    @autoreleasepool {
+        return window_capture_create_internal(settings, source);
+    }
 }
 
 static void window_capture_destroy(void *data)
 {
-	struct window_capture *cap = data;
+    struct window_capture *cap = data;
 
-	os_event_signal(cap->stop_event);
-	os_event_signal(cap->capture_event);
+    os_event_signal(cap->stop_event);
+    os_event_signal(cap->capture_event);
 
-	pthread_join(cap->capture_thread, NULL);
+    pthread_join(cap->capture_thread, NULL);
 
-	CGColorSpaceRelease(cap->color_space);
+    CGColorSpaceRelease(cap->color_space);
 
-	da_free(cap->buffer);
+    da_free(cap->buffer);
 
-	os_event_destroy(cap->capture_event);
-	os_event_destroy(cap->stop_event);
+    os_event_destroy(cap->capture_event);
+    os_event_destroy(cap->stop_event);
 
-	destroy_window(&cap->window);
+    destroy_window(&cap->window);
 
-	bfree(cap);
+    bfree(cap);
 }
 
 static void window_capture_defaults(obs_data_t *settings)
 {
-	obs_data_set_default_bool(settings, "show_shadow", false);
-	window_defaults(settings);
+    obs_data_set_default_bool(settings, "show_shadow", false);
+    window_defaults(settings);
 }
 
 static obs_properties_t *window_capture_properties(void *unused)
 {
-	UNUSED_PARAMETER(unused);
+    UNUSED_PARAMETER(unused);
 
-	obs_properties_t *props = obs_properties_create();
+    obs_properties_t *props = obs_properties_create();
 
-	add_window_properties(props);
+    add_window_properties(props);
 
-	obs_properties_add_bool(props, "show_shadow",
-				obs_module_text("WindowCapture.ShowShadow"));
+    obs_properties_add_bool(props, "show_shadow", obs_module_text("WindowCapture.ShowShadow"));
 
-	return props;
+    return props;
 }
 
-static inline void window_capture_update_internal(struct window_capture *wc,
-						  obs_data_t *settings)
+static inline void window_capture_update_internal(struct window_capture *wc, obs_data_t *settings)
 {
-	wc->image_option = obs_data_get_bool(settings, "show_shadow")
-				   ? kCGWindowImageDefault
-				   : kCGWindowImageBoundsIgnoreFraming;
-
-	update_window(&wc->window, settings);
-
-	if (wc->window.window_name.length) {
-		blog(LOG_INFO,
-		     "window-capture: '%s' update settings:\n"
-		     "\twindow: %s\n"
-		     "\towner:  %s",
-		     obs_source_get_name(wc->source),
-		     wc->window.window_name UTF8String,
-		     wc->window.owner_name UTF8String);
-	}
+    wc->image_option = obs_data_get_bool(settings, "show_shadow") ? kCGWindowImageDefault
+                                                                  : kCGWindowImageBoundsIgnoreFraming;
+
+    update_window(&wc->window, settings);
+
+    if (wc->window.window_name.length) {
+        blog(LOG_INFO,
+             "window-capture: '%s' update settings:\n"
+             "\twindow: %s\n"
+             "\towner:  %s",
+             obs_source_get_name(wc->source), wc->window.window_name UTF8String, wc->window.owner_name UTF8String);
+    }
 }
 
 static void window_capture_update(void *data, obs_data_t *settings)
 {
-	@autoreleasepool {
-		return window_capture_update_internal(data, settings);
-	}
+    @autoreleasepool {
+        return window_capture_update_internal(data, settings);
+    }
 }
 
 static const char *window_capture_getname(void *unused)
 {
-	UNUSED_PARAMETER(unused);
-	return obs_module_text("WindowCapture");
+    UNUSED_PARAMETER(unused);
+    return obs_module_text("WindowCapture");
 }
 
-static inline void window_capture_tick_internal(struct window_capture *wc,
-						float seconds)
+static inline void window_capture_tick_internal(struct window_capture *wc, float seconds)
 {
-	UNUSED_PARAMETER(seconds);
-	os_event_signal(wc->capture_event);
+    UNUSED_PARAMETER(seconds);
+    os_event_signal(wc->capture_event);
 }
 
 static void window_capture_tick(void *data, float seconds)
 {
-	struct window_capture *wc = data;
+    struct window_capture *wc = data;
 
-	if (!obs_source_showing(wc->source))
-		return;
+    if (!obs_source_showing(wc->source))
+        return;
 
-	@autoreleasepool {
-		return window_capture_tick_internal(data, seconds);
-	}
+    @autoreleasepool {
+        return window_capture_tick_internal(data, seconds);
+    }
 }
 
 struct obs_source_info window_capture_info = {
-	.id = "window_capture",
-	.type = OBS_SOURCE_TYPE_INPUT,
-	.get_name = window_capture_getname,
+    .id = "window_capture",
+    .type = OBS_SOURCE_TYPE_INPUT,
+    .get_name = window_capture_getname,
 
-	.create = window_capture_create,
-	.destroy = window_capture_destroy,
+    .create = window_capture_create,
+    .destroy = window_capture_destroy,
 
-	.output_flags = OBS_SOURCE_ASYNC_VIDEO,
-	.video_tick = window_capture_tick,
+    .output_flags = OBS_SOURCE_ASYNC_VIDEO,
+    .video_tick = window_capture_tick,
 
-	.get_defaults = window_capture_defaults,
-	.get_properties = window_capture_properties,
-	.update = window_capture_update,
-	.icon_type = OBS_ICON_TYPE_WINDOW_CAPTURE,
+    .get_defaults = window_capture_defaults,
+    .get_properties = window_capture_properties,
+    .update = window_capture_update,
+    .icon_type = OBS_ICON_TYPE_WINDOW_CAPTURE,
 };

obs-studio-29.1.3.tar.xz/plugins/mac-capture/plugin-main.c -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/plugin-main.c Changed

@@ -16,21 +16,23 @@
 
 bool obs_module_load(void)
 {
-	obs_register_source(&coreaudio_input_capture_info);
-	obs_register_source(&coreaudio_output_capture_info);
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120300 // __MAC_12_3
 	if (is_screen_capture_available()) {
-		extern struct obs_source_info screen_capture_info;
-		obs_register_source(&screen_capture_info);
+		extern struct obs_source_info sck_video_capture_info;
+		obs_register_source(&sck_video_capture_info);
 		if (__builtin_available(macOS 13.0, *)) {
 			display_capture_info.output_flags |=
 				OBS_SOURCE_DEPRECATED;
 			window_capture_info.output_flags |=
 				OBS_SOURCE_DEPRECATED;
+			coreaudio_output_capture_info.output_flags |=
+				OBS_SOURCE_DEPRECATED;
+			extern struct obs_source_info sck_audio_capture_info;
+			obs_register_source(&sck_audio_capture_info);
 		}
 	}
-#endif
 	obs_register_source(&display_capture_info);
 	obs_register_source(&window_capture_info);
+	obs_register_source(&coreaudio_input_capture_info);
+	obs_register_source(&coreaudio_output_capture_info);
 	return true;
 }

obs-studio-29.1.3.tar.xz/plugins/mac-capture/window-utils.h -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/window-utils.h Changed

obs-studio-29.1.3.tar.xz/plugins/mac-capture/window-utils.m -> obs-studio-30.0.2.tar.xz/plugins/mac-capture/window-utils.m Changed

@@ -2,35 +2,34 @@
 
 #include <util/platform.h>
 
-#define WINDOW_NAME ((NSString *)kCGWindowName)
-#define WINDOW_NUMBER ((NSString *)kCGWindowNumber)
-#define OWNER_NAME ((NSString *)kCGWindowOwnerName)
-#define OWNER_PID ((NSNumber *)kCGWindowOwnerPID)
+#define WINDOW_NAME ((NSString *) kCGWindowName)
+#define WINDOW_NUMBER ((NSString *) kCGWindowNumber)
+#define OWNER_NAME ((NSString *) kCGWindowOwnerName)
+#define OWNER_PID ((NSString *) kCGWindowOwnerPID)
 
 static NSComparator win_info_cmp = ^(NSDictionary *o1, NSDictionary *o2) {
-	NSComparisonResult res = o1OWNER_NAME compare:o2OWNER_NAME;
-	if (res != NSOrderedSame)
-		return res;
+ NSComparisonResult res = o1OWNER_NAME compare:o2OWNER_NAME;
+ if (res != NSOrderedSame)
+ return res;
 
-	res = o1OWNER_PID compare:o2OWNER_PID;
-	if (res != NSOrderedSame)
-		return res;
+ res = o1OWNER_PID compare:o2OWNER_PID;
+ if (res != NSOrderedSame)
+ return res;
 
-	res = o1WINDOW_NAME compare:o2WINDOW_NAME;
-	if (res != NSOrderedSame)
-		return res;
+ res = o1WINDOW_NAME compare:o2WINDOW_NAME;
+ if (res != NSOrderedSame)
+ return res;
 
-	return o1WINDOW_NUMBER compare:o2WINDOW_NUMBER;
+ return o1WINDOW_NUMBER compare:o2WINDOW_NUMBER;
 };
 
 NSArray *enumerate_windows(void)
 {
-	NSArray *arr = (NSArray *)CGWindowListCopyWindowInfo(
-		kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
+ NSArray *arr = (NSArray *) CGWindowListCopyWindowInfo(kCGWindowListOptionOnScreenOnly, kCGNullWindowID);
 
-	arr autorelease;
+ arr autorelease;
 
-	return arr sortedArrayUsingComparator:win_info_cmp;
+ return arr sortedArrayUsingComparator:win_info_cmp;
 }
 
 #define WAIT_TIME_MS 500
@@ -39,227 +38,243 @@
 
 bool find_window(cocoa_window_t cw, obs_data_t *settings, bool force)
 {
-	if (!force && cw->next_search_time > os_gettime_ns())
-		return false;
+ if (!force && cw->next_search_time > os_gettime_ns())
+ return false;
 
-	cw->next_search_time = os_gettime_ns() + WAIT_TIME_NS;
+ cw->next_search_time = os_gettime_ns() + WAIT_TIME_NS;
 
-	pthread_mutex_lock(&cw->name_lock);
+ pthread_mutex_lock(&cw->name_lock);
 
-	if (!cw->window_name.length && !cw->owner_name.length)
-		goto invalid_name;
+ if (!cw->window_name.length && !cw->owner_name.length)
+ goto invalid_name;
 
-	for (NSDictionary *dict in enumerate_windows()) {
-		if (!cw->owner_name isEqualToString:dictOWNER_NAME)
-			continue;
+ for (NSDictionary *dict in enumerate_windows()) {
+ if (!cw->owner_name isEqualToString:dictOWNER_NAME)
+ continue;
 
-		if (!cw->window_name isEqualToString:dictWINDOW_NAME)
-			continue;
+ if (!cw->window_name isEqualToString:dictWINDOW_NAME)
+ continue;
 
-		pthread_mutex_unlock(&cw->name_lock);
+ pthread_mutex_unlock(&cw->name_lock);
 
-		NSNumber *window_id = (NSNumber *)dictWINDOW_NUMBER;
-		cw->window_id = window_id.intValue;
-		NSNumber *owner_pid = (NSNumber *)dictOWNER_PID;
-		cw->owner_pid = owner_pid.intValue;
+ NSNumber *window_id = (NSNumber *) dictWINDOW_NUMBER;
+ cw->window_id = window_id.intValue;
+ NSNumber *owner_pid = (NSNumber *) dictOWNER_PID;
+ cw->owner_pid = owner_pid.intValue;
 
-		obs_data_set_int(settings, "window", cw->window_id);
-		obs_data_set_int(settings, "owner_pid", cw->owner_pid);
-		return true;
-	}
+ obs_data_set_int(settings, "window", cw->window_id);
+ obs_data_set_int(settings, "owner_pid", cw->owner_pid);
+ return true;
+ }
 
 invalid_name:
-	pthread_mutex_unlock(&cw->name_lock);
-	return false;
+ pthread_mutex_unlock(&cw->name_lock);
+ return false;
 }
 
 void init_window(cocoa_window_t cw, obs_data_t *settings)
 {
-	pthread_mutex_init(&cw->name_lock, NULL);
-
-	cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
-	cw->window_name = @(obs_data_get_string(settings, "window_name"));
-	cw->owner_name retain;
-	cw->window_name retain;
-
-	// Find initial window.
-	pthread_mutex_lock(&cw->name_lock);
-
-	if (!cw->window_name.length && !cw->owner_name.length)
-		goto invalid_name;
-
-	NSNumber *owner_pid = @(obs_data_get_int(settings, "owner_pid"));
-	NSNumber *window_id = @(obs_data_get_int(settings, "window"));
-	for (NSDictionary *dict in enumerate_windows()) {
-		bool owner_names_match =
-			cw->owner_name isEqualToString:dictOWNER_NAME;
-		bool ids_match =
-			owner_pid isEqualToNumber:dictOWNER_PID &&
-			window_id isEqualToNumber:dictWINDOW_NUMBER;
-		bool window_names_match =
-			cw->window_name isEqualToString:dictWINDOW_NAME;
-
-		if (owner_names_match && (ids_match || window_names_match)) {
-			pthread_mutex_unlock(&cw->name_lock);
-
-			cw->window_id = dictWINDOW_NUMBER intValue;
-			cw->owner_pid = dictOWNER_PID intValue;
-
-			obs_data_set_int(settings, "window", cw->window_id);
-			obs_data_set_int(settings, "owner_pid", cw->owner_pid);
-			return;
-		}
-	}
+ pthread_mutex_init(&cw->name_lock, NULL);
+
+ cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
+ cw->window_name = @(obs_data_get_string(settings, "window_name"));
+ cw->owner_name retain;
+ cw->window_name retain;
+
+ // Find initial window.
+ pthread_mutex_lock(&cw->name_lock);
+
+ if (!cw->window_name.length && !cw->owner_name.length)
+ goto invalid_name;
+
+ NSNumber *owner_pid = @(obs_data_get_int(settings, "owner_pid"));
+ NSNumber *window_id = @(obs_data_get_int(settings, "window"));
+ for (NSDictionary *dict in enumerate_windows()) {
+ bool owner_names_match = cw->owner_name isEqualToString:dictOWNER_NAME;
+ bool ids_match = owner_pid isEqualToNumber:dictOWNER_PID && window_id isEqualToNumber:dictWINDOW_NUMBER;
+ bool window_names_match = cw->window_name isEqualToString:dictWINDOW_NAME;
+
+ if (owner_names_match && (ids_match || window_names_match)) {
+ pthread_mutex_unlock(&cw->name_lock);
+
+ cw->window_id = dictWINDOW_NUMBER intValue;
+ cw->owner_pid = dictOWNER_PID intValue;
+
+ obs_data_set_int(settings, "window", cw->window_id);
+ obs_data_set_int(settings, "owner_pid", cw->owner_pid);
+ return;
+ }
+ }
 
 invalid_name:
-	pthread_mutex_unlock(&cw->name_lock);
-	return;
+ pthread_mutex_unlock(&cw->name_lock);
+ return;
 }
 
 void destroy_window(cocoa_window_t cw)
 {
-	pthread_mutex_destroy(&cw->name_lock);
-	cw->owner_name release;
-	cw->window_name release;
+ pthread_mutex_destroy(&cw->name_lock);
+ cw->owner_name release;
+ cw->window_name release;
 }
 
 void update_window(cocoa_window_t cw, obs_data_t *settings)
 {
-	pthread_mutex_lock(&cw->name_lock);
-	cw->owner_name release;
-	cw->window_name release;
-	cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
-	cw->window_name = @(obs_data_get_string(settings, "window_name"));
-	cw->owner_name retain;
-	cw->window_name retain;
-	pthread_mutex_unlock(&cw->name_lock);
-
-	cw->owner_pid = (int)obs_data_get_int(settings, "owner_pid");
-	cw->window_id = (unsigned int)obs_data_get_int(settings, "window");
+ pthread_mutex_lock(&cw->name_lock);
+ cw->owner_name release;
+ cw->window_name release;
+ cw->owner_name = @(obs_data_get_string(settings, "owner_name"));
+ cw->window_name = @(obs_data_get_string(settings, "window_name"));
+ cw->owner_name retain;
+ cw->window_name retain;
+ pthread_mutex_unlock(&cw->name_lock);
+
+ cw->owner_pid = (int) obs_data_get_int(settings, "owner_pid");
+ cw->window_id = (unsigned int) obs_data_get_int(settings, "window");
 }
 
 static inline const char *make_name(NSString *owner, NSString *name)
 {
-	if (!owner.length)
-		return "";
+ if (!owner.length)
+ return "";
 
-	NSString *str = NSString stringWithFormat:@"%@ %@", owner, name;
-	return str.UTF8String;
+ NSString *str = NSString stringWithFormat:@"%@ %@", owner, name;
+ return str.UTF8String;
 }
 
 static inline NSDictionary *find_window_dict(NSArray *arr, int window_id)
 {
-	for (NSDictionary *dict in arr) {
-		NSNumber *wid = (NSNumber *)dictWINDOW_NUMBER;
-		if (wid.intValue == window_id)
-			return dict;
-	}
+ for (NSDictionary *dict in arr) {
+ NSNumber *wid = (NSNumber *) dictWINDOW_NUMBER;
+ if (wid.intValue == window_id)
+ return dict;
+ }
 
-	return nil;
+ return nil;
 }
 
-static inline bool window_changed_internal(obs_property_t *p,
-					 obs_data_t *settings)
+static inline bool window_changed_internal(obs_property_t *p, obs_data_t *settings)
 {
-	int window_id = (int)obs_data_get_int(settings, "window");
-	NSString *window_owner = @(obs_data_get_string(settings, "owner_name"));
-	NSString *window_name = @(obs_data_get_string(settings, "window_name"));
-
-	NSDictionary *win_info = @{
-		OWNER_NAME: window_owner,
-		WINDOW_NAME: window_name,
-	};
-
-	NSArray *arr = enumerate_windows();
-
-	bool show_empty_names = obs_data_get_bool(settings, "show_empty_names");
-
-	NSDictionary *cur = find_window_dict(arr, window_id);
-	bool window_found = cur != nil;
-	bool window_added = window_found;
-
-	obs_property_list_clear(p);
-	for (NSDictionary *dict in arr) {
-		NSString *owner = (NSString *)dictOWNER_NAME;
-		NSString *name = (NSString *)dictWINDOW_NAME;
-		NSNumber *wid = (NSNumber *)dictWINDOW_NUMBER;
-
-		if (!window_added &&
-		 win_info_cmp(win_info, dict) == NSOrderedAscending) {
-			window_added = true;
-			size_t idx = obs_property_list_add_int(
-				p, make_name(window_owner, window_name),
-				window_id);
-			obs_property_list_item_disable(p, idx, true);
-		}
-
-		if (!show_empty_names && !name.length &&
-		 window_id != wid.intValue)
-			continue;
-
-		obs_property_list_add_int(p, make_name(owner, name),
-					 wid.intValue);
-	}
-
-	if (!window_added) {
-		size_t idx = obs_property_list_add_int(
-			p, make_name(window_owner, window_name), window_id);
-		obs_property_list_item_disable(p, idx, true);
-	}
-
-	if (!window_found)
-		return true;
-
-	NSString *owner = (NSString *)curOWNER_NAME;
-	NSString *window = (NSString *)curWINDOW_NAME;
-
-	obs_data_set_string(settings, "owner_name", owner.UTF8String);
-	obs_data_set_string(settings, "window_name", window.UTF8String);
-
-	return true;
+ int window_id = (int) obs_data_get_int(settings, "window");
+ NSString *window_owner = @(obs_data_get_string(settings, "owner_name"));
+ NSString *window_name = @(obs_data_get_string(settings, "window_name"));
+
+ NSDictionary *win_info = @ {
+ OWNER_NAME: window_owner,
+ WINDOW_NAME: window_name,
+ };
+
+ NSArray *arr = enumerate_windows();
+
+ bool show_empty_names = obs_data_get_bool(settings, "show_empty_names");
+
+ NSDictionary *cur = find_window_dict(arr, window_id);
+ bool window_found = cur != nil;
+ bool window_added = window_found;
+
+ obs_property_list_clear(p);
+ for (NSDictionary *dict in arr) {
+ NSString *owner = (NSString *) dictOWNER_NAME;
+ NSString *name = (NSString *) dictWINDOW_NAME;
+ NSNumber *wid = (NSNumber *) dictWINDOW_NUMBER;
+
+ if (!window_added && win_info_cmp(win_info, dict) == NSOrderedAscending) {
+ window_added = true;
+ size_t idx = obs_property_list_add_int(p, make_name(window_owner, window_name), window_id);
+ obs_property_list_item_disable(p, idx, true);
+ }
+
+ if (!show_empty_names && !name.length && window_id != wid.intValue)
+ continue;
+
+ obs_property_list_add_int(p, make_name(owner, name), wid.intValue);
+ }
+
+ if (!window_added) {
+ size_t idx = obs_property_list_add_int(p, make_name(window_owner, window_name), window_id);
+ obs_property_list_item_disable(p, idx, true);
+ }
+
+ if (!window_found)
+ return true;
+
+ NSString *owner = (NSString *) curOWNER_NAME;
+ NSString *window = (NSString *) curWINDOW_NAME;
+
+ obs_data_set_string(settings, "owner_name", owner.UTF8String);
+ obs_data_set_string(settings, "window_name", window.UTF8String);
+
+ return true;
 }
 
-static bool window_changed(obs_properties_t *props, obs_property_t *p,
-			 obs_data_t *settings)
+static bool window_changed(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	UNUSED_PARAMETER(props);
+ UNUSED_PARAMETER(props);
 
-	@autoreleasepool {
-		return window_changed_internal(p, settings);
-	}
+ @autoreleasepool {
+ return window_changed_internal(p, settings);
+ }
 }
 
-static bool toggle_empty_names(obs_properties_t *props, obs_property_t *p,
-			 obs_data_t *settings)
+static bool toggle_empty_names(obs_properties_t *props, obs_property_t *p, obs_data_t *settings)
 {
-	UNUSED_PARAMETER(p);
+ UNUSED_PARAMETER(p);
 
-	return window_changed(props, obs_properties_get(props, "window"),
-			 settings);
+ return window_changed(props, obs_properties_get(props, "window"), settings);
 }
 
 void window_defaults(obs_data_t *settings)
 {
-	obs_data_set_default_int(settings, "window", kCGNullWindowID);
-	obs_data_set_default_bool(settings, "show_empty_names", false);
+ obs_data_set_default_int(settings, "window", kCGNullWindowID);
+ obs_data_set_default_bool(settings, "show_empty_names", false);
 }
 
 void add_window_properties(obs_properties_t *props)
 {
-	obs_property_t *window_list = obs_properties_add_list(
-		props, "window", obs_module_text("WindowUtils.Window"),
-		OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
-	obs_property_set_modified_callback(window_list, window_changed);
-
-	obs_property_t *empty = obs_properties_add_bool(
-		props, "show_empty_names",
-		obs_module_text("WindowUtils.ShowEmptyNames"));
-	obs_property_set_modified_callback(empty, toggle_empty_names);
+ obs_property_t *window_list = obs_properties_add_list(props, "window", obs_module_text("WindowUtils.Window"),
+ OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_INT);
+ obs_property_set_modified_callback(window_list, window_changed);
+
+ obs_property_t *empty =
+ obs_properties_add_bool(props, "show_empty_names", obs_module_text("WindowUtils.ShowEmptyNames"));
+ obs_property_set_modified_callback(empty, toggle_empty_names);
 }
 
 void show_window_properties(obs_properties_t *props, bool show)
 {
-	obs_property_set_visible(obs_properties_get(props, "window"), show);
-	obs_property_set_visible(obs_properties_get(props, "show_empty_names"),
-				 show);
+ obs_property_set_visible(obs_properties_get(props, "window"), show);
+ obs_property_set_visible(obs_properties_get(props, "show_empty_names"), show);
+}
+
+CGDirectDisplayID get_display_migrate_settings(obs_data_t *settings)
+{
+ bool legacy_display_id = obs_data_has_user_value(settings, "display");
+ bool new_display_id = obs_data_has_user_value(settings, "display_uuid");
+ if (legacy_display_id && !new_display_id) {
+ CGDirectDisplayID display_id = (CGDirectDisplayID) obs_data_get_int(settings, "display");
+ CFUUIDRef display_uuid = CGDisplayCreateUUIDFromDisplayID(display_id);
+ if (display_uuid) {
+ CFStringRef uuid_string = CFUUIDCreateString(kCFAllocatorDefault, display_uuid);
+ obs_data_set_string(settings, "display_uuid", CFStringGetCStringPtr(uuid_string, kCFStringEncodingUTF8));
+ obs_data_erase(settings, "display");
+ CFRelease(uuid_string);
+ CFRelease(display_uuid);
+ } else {
+ return 0;
+ }
+ } else if (legacy_display_id && new_display_id) {
+ obs_data_erase(settings, "display");
+ }
+
+ const char *display_uuid = obs_data_get_string(settings, "display_uuid");
+ if (display_uuid) {
+ CFStringRef uuid_string = CFStringCreateWithCString(kCFAllocatorDefault, display_uuid, kCFStringEncodingUTF8);
+ CFUUIDRef uuid_ref = CFUUIDCreateFromString(kCFAllocatorDefault, uuid_string);
+ CGDirectDisplayID display = CGDisplayGetDisplayIDFromUUID(uuid_ref);
+ CFRelease(uuid_string);
+ CFRelease(uuid_ref);
+ return display;
+ } else {
+ return 0;
+ }
 }

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/CMakeLists.txt Changed

@@ -1,6 +1,4 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
-legacy_check()
+cmake_minimum_required(VERSION 3.24...3.25)
 
 option(ENABLE_SYPHON "Enable Syphon sharing support" ON)
 if(NOT ENABLE_SYPHON)
@@ -11,76 +9,24 @@
 target_enable_feature(mac-syphon "Syphon sharing support")
 endif()
 
-find_library(COCOA Cocoa)
-find_library(IOSURF IOSurface)
-find_library(SCRIPTINGBRIDGE ScriptingBridge)
-mark_as_advanced(COCOA IOSURF SCRIPTINGBRIDGE)
-
-add_library(syphon-framework STATIC EXCLUDE_FROM_ALL )
-add_library(Syphon::Framework ALIAS syphon-framework)
-
-target_sources(
- syphon-framework
- PRIVATE syphon-framework/Syphon_Prefix.pch
- syphon-framework/Syphon.h
- syphon-framework/SyphonBuildMacros.h
- syphon-framework/SyphonCFMessageReceiver.m
- syphon-framework/SyphonCFMessageReceiver.h
- syphon-framework/SyphonCFMessageSender.h
- syphon-framework/SyphonCFMessageSender.m
- syphon-framework/SyphonClient.m
- syphon-framework/SyphonClient.h
- syphon-framework/SyphonClientConnectionManager.m
- syphon-framework/SyphonClientConnectionManager.h
- syphon-framework/SyphonDispatch.c
- syphon-framework/SyphonDispatch.h
- syphon-framework/SyphonIOSurfaceImage.m
- syphon-framework/SyphonIOSurfaceImage.h
- syphon-framework/SyphonImage.m
- syphon-framework/SyphonImage.h
- syphon-framework/SyphonMachMessageReceiver.m
- syphon-framework/SyphonMachMessageReceiver.h
- syphon-framework/SyphonMachMessageSender.m
- syphon-framework/SyphonMachMessageSender.h
- syphon-framework/SyphonMessageQueue.m
- syphon-framework/SyphonMessageQueue.h
- syphon-framework/SyphonMessageReceiver.m
- syphon-framework/SyphonMessageReceiver.h
- syphon-framework/SyphonMessageSender.m
- syphon-framework/SyphonMessageSender.h
- syphon-framework/SyphonMessaging.m
- syphon-framework/SyphonMessaging.h
- syphon-framework/SyphonOpenGLFunctions.c
- syphon-framework/SyphonOpenGLFunctions.h
- syphon-framework/SyphonPrivate.m
- syphon-framework/SyphonPrivate.h
- syphon-framework/SyphonServer.m
- syphon-framework/SyphonServer.h
- syphon-framework/SyphonServerConnectionManager.m
- syphon-framework/SyphonServerConnectionManager.h
- syphon-framework/SyphonServerDirectory.m
- syphon-framework/SyphonServerDirectory.h)
-
-target_compile_options(
- syphon-framework
- PRIVATE -include "${CMAKE_CURRENT_SOURCE_DIR}/syphon-framework/Syphon_Prefix.pch" -Wno-error=deprecated-declarations
- PUBLIC -Wno-error=newline-eof -Wno-error=deprecated-implementations)
-
-target_compile_definitions(syphon-framework PUBLIC "SYPHON_UNIQUE_CLASS_NAME_PREFIX=OBS_")
-
-target_link_libraries(syphon-framework PUBLIC OpenGL::GL ${COCOA} ${IOSURF})
-
-set_target_properties(syphon-framework PROPERTIES FOLDER "plugins/mac-syphon" PREFIX "")
+find_library(SYPHON Syphon)
+mark_as_advanced(SYPHON)
 
 add_library(mac-syphon MODULE)
 add_library(OBS::syphon ALIAS mac-syphon)
 
-target_sources(mac-syphon PRIVATE syphon.m plugin-main.c)
+target_sources(mac-syphon PRIVATE syphon.m plugin-main.c SyphonOBSClient.h SyphonOBSClient.m)
 
-target_compile_options(mac-syphon PRIVATE -include "${CMAKE_CURRENT_SOURCE_DIR}/syphon-framework/Syphon_Prefix.pch"
- -fobjc-arc)
+target_compile_options(mac-syphon PRIVATE -fobjc-arc)
 
-target_link_libraries(mac-syphon PRIVATE OBS::libobs Syphon::Framework ${SCRIPTINGBRIDGE})
+# cmake-format: off
+target_link_libraries(
+ mac-syphon
+ PRIVATE OBS::libobs
+ "$<LINK_LIBRARY:FRAMEWORK,AppKit.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,IOSurface.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,ScriptingBridge.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,${SYPHON}>")
 
 set_target_properties_obs(
 mac-syphon
@@ -88,3 +34,4 @@
 PREFIX ""
 XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION YES
 XCODE_ATTRIBUTE_GCC_WARN_SHADOW YES)
+# cmake-format: on

obs-studio-30.0.2.tar.xz/plugins/mac-syphon/SyphonOBSClient.h Added

obs-studio-30.0.2.tar.xz/plugins/mac-syphon/SyphonOBSClient.m Added

obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/az-AZ.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/az-AZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/be-BY.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/be-BY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/ta-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-syphon/syphon.m -> obs-studio-30.0.2.tar.xz/plugins/mac-syphon/syphon.m Changed

@@ -1,378 +1,349 @@
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
+#import <IOSurface/IOSurface.h>
 #import <ScriptingBridge/ScriptingBridge.h>
-#import "syphon-framework/Syphon.h"
-#include <obs-module.h>
-#include <AvailabilityMacros.h>
+#import <Syphon/Syphon.h>
 
-#define LOG(level, message, ...) \
-	blog(level, "%s: " message, obs_source_get_name(s->source), \
-	 ##__VA_ARGS__)
+#import <obs-module.h>
+#import <AvailabilityMacros.h>
+
+#import "SyphonOBSClient.h"
+
+#define LOG(level, message, ...) blog(level, "%s: " message, obs_source_get_name(s->source), ##__VA_ARGS__)
 
 struct syphon {
-	SYPHON_CLIENT_UNIQUE_CLASS_NAME *client;
-	IOSurfaceRef ref;
-
-	gs_samplerstate_t *sampler;
-	gs_effect_t *effect;
-	gs_vertbuffer_t *vertbuffer;
-	gs_texture_t *tex;
-	uint32_t width, height;
-	bool crop;
-	CGRect crop_rect;
-	bool allow_transparency;
-
-	obs_source_t *source;
-
-	bool active;
-	bool uuid_changed;
-	id new_server_listener;
-	id retire_listener;
-
-	NSString *app_name;
-	NSString *name;
-	NSString *uuid;
+ SyphonOBSClient *client;
+ IOSurfaceRef ref;
+
+ gs_samplerstate_t *sampler;
+ gs_effect_t *effect;
+ gs_vertbuffer_t *vertbuffer;
+ gs_texture_t *tex;
+ uint32_t width, height;
+ bool crop;
+ CGRect crop_rect;
+ bool allow_transparency;
+
+ obs_source_t *source;
+
+ bool active;
+ bool uuid_changed;
+ id new_server_listener;
+ id retire_listener;
+
+ NSString *app_name;
+ NSString *name;
+ NSString *uuid;
 };
 typedef struct syphon *syphon_t;
 
 static inline void update_properties(syphon_t s)
 {
-	obs_source_update_properties(s->source);
+ obs_source_update_properties(s->source);
 }
 
-@interface OBSSyphonKVObserver : NSObject
-- (void)observeValueForKeyPath:(NSString *)keyPath
-		 ofObject:(id)object
-			change:(NSDictionary *)change
-		 context:(void *)context;
-@end
-
-@implementation OBSSyphonKVObserver
-- (void)observeValueForKeyPath:(NSString *)keyPath
-		 ofObject:(id)object
-			change:(NSDictionary *)change
-		 context:(void *)context
-{
-	syphon_t s = context;
-	if (!s)
-		return;
-
-	if (!changeNSKeyValueChangeNewKey)
-		return;
-
-	update_properties(s);
-}
-@end
-
 static const char *syphon_get_name(void *unused __attribute((unused)))
 {
-	return obs_module_text("Syphon");
+ return obs_module_text("Syphon");
 }
 
 static void stop_client(syphon_t s)
 {
-	obs_enter_graphics();
+ obs_enter_graphics();
 
-	if (s->client) {
-		s->client stop;
-	}
+ if (s->client) {
+ s->client stop;
+ }
 
-	if (s->tex) {
-		gs_texture_destroy(s->tex);
-		s->tex = NULL;
-	}
+ if (s->tex) {
+ gs_texture_destroy(s->tex);
+ s->tex = NULL;
+ }
 
-	if (s->ref) {
-		IOSurfaceDecrementUseCount(s->ref);
-		CFRelease(s->ref);
-		s->ref = NULL;
-	}
+ if (s->ref) {
+ IOSurfaceDecrementUseCount(s->ref);
+ CFRelease(s->ref);
+ s->ref = NULL;
+ }
 
-	s->width = 0;
-	s->height = 0;
+ s->width = 0;
+ s->height = 0;
 
-	obs_leave_graphics();
+ obs_leave_graphics();
 }
 
 static inline NSDictionary *find_by_uuid(NSArray *arr, NSString *uuid)
 {
-	for (NSDictionary *dict in arr) {
-		if (dictSyphonServerDescriptionUUIDKey isEqual:uuid)
-			return dict;
-	}
+ for (NSDictionary *dict in arr) {
+ if (dictSyphonServerDescriptionUUIDKey isEqual:uuid)
+ return dict;
+ }
 
-	return nil;
+ return nil;
 }
 
+/* If you see this and think "surely these must be defined in some type of
+ * public header!": They don't. Or at least I couldnt't find anything. The
+ * definitions inside of Syphon are only in SyphonPrivate.h/m, and nowhere
+ * else. When we had Syphon as a submodule we abused this by using extern, but
+ * now that we use a prebuilt framework and as such no longer can acceess the
+ * private headers and sources directly, that's no longer possible. Other
+ * projects sometimes copy SyphonPrivate.h entirely (with the full definitions
+ * of everything), but for our purpose these strings are enough. */
+const NSString *SyphonServerDescriptionDictionaryVersionKey = @"SyphonServerDescriptionDictionaryVersionKey";
+const NSString *SyphonSurfaceType = @"SyphonSurfaceType";
+const NSString *SyphonSurfaceTypeIOSurface = @"SyphonSurfaceTypeIOSurface";
+const NSString *SyphonServerDescriptionSurfacesKey = @"SyphonServerDescriptionSurfacesKey";
+
 static inline void check_version(syphon_t s, NSDictionary *desc)
 {
-	extern const NSString *SyphonServerDescriptionDictionaryVersionKey;
+ NSNumber *version = descSyphonServerDescriptionDictionaryVersionKey;
+ if (!version)
+ return LOG(LOG_WARNING, "Server description does not contain "
+ "VersionKey");
 
-	NSNumber *version = descSyphonServerDescriptionDictionaryVersionKey;
-	if (!version)
-		return LOG(LOG_WARNING, "Server description does not contain "
-					"VersionKey");
-
-	if (version.unsignedIntValue > 0)
-		LOG(LOG_WARNING,
-		 "Got server description version %d, "
-		 "expected 0",
-		 version.unsignedIntValue);
+ if (version.unsignedIntValue > 0)
+ LOG(LOG_WARNING,
+ "Got server description version %d, "
+ "expected 0",
+ version.unsignedIntValue);
 }
 
 static inline void check_description(syphon_t s, NSDictionary *desc)
 {
-	extern const NSString *SyphonSurfaceType;
-	extern const NSString *SyphonSurfaceTypeIOSurface;
-	extern const NSString *SyphonServerDescriptionSurfacesKey;
-
-	NSArray *surfaces = descSyphonServerDescriptionSurfacesKey;
-	if (!surfaces)
-		return LOG(LOG_WARNING, "Server description does not contain "
-					"SyphonServerDescriptionSurfacesKey");
+ NSArray *surfaces = descSyphonServerDescriptionSurfacesKey;
+ if (!surfaces)
+ return LOG(LOG_WARNING, "Server description does not contain "
+ "SyphonServerDescriptionSurfacesKey");
 
-	if (!surfaces.count)
-		return LOG(LOG_WARNING, "Server description contains empty "
-					"SyphonServerDescriptionSurfacesKey");
+ if (!surfaces.count)
+ return LOG(LOG_WARNING, "Server description contains empty "
+ "SyphonServerDescriptionSurfacesKey");
 
-	for (NSDictionary *surface in surfaces) {
-		NSString *type = surfaceSyphonSurfaceType;
-		if (type && type isEqual:SyphonSurfaceTypeIOSurface)
-			return;
-	}
+ for (NSDictionary *surface in surfaces) {
+ NSString *type = surfaceSyphonSurfaceType;
+ if (type && type isEqual:SyphonSurfaceTypeIOSurface)
+ return;
+ }
 
-	NSString *surfaces_string = NSString stringWithFormat:@"%@", surfaces;
-	LOG(LOG_WARNING,
-	 "SyphonSurfaces does not contain"
-	 "'SyphonSurfaceTypeIOSurface': %s",
-	 surfaces_string.UTF8String);
+ NSString *surfaces_string = NSString stringWithFormat:@"%@", surfaces;
+ LOG(LOG_WARNING,
+ "SyphonSurfaces does not contain"
+ "'SyphonSurfaceTypeIOSurface': %s",
+ surfaces_string.UTF8String);
 }
 
-static inline void handle_new_frame(syphon_t s,
-				 SYPHON_CLIENT_UNIQUE_CLASS_NAME *client)
+static inline void handle_new_frame(syphon_t s, SyphonOBSClient *client)
 {
-	IOSurfaceRef ref = client IOSurface;
+ IOSurfaceRef ref = client newFrameImage;
 
-	if (!ref)
-		return;
+ if (!ref)
+ return;
 
-	if (ref == s->ref) {
-		CFRelease(ref);
-		return;
-	}
+ if (ref == s->ref) {
+ CFRelease(ref);
+ return;
+ }
 
-	IOSurfaceIncrementUseCount(ref);
+ IOSurfaceIncrementUseCount(ref);
 
-	obs_enter_graphics();
-	if (s->ref) {
-		gs_texture_destroy(s->tex);
-		IOSurfaceDecrementUseCount(s->ref);
-		CFRelease(s->ref);
-	}
+ obs_enter_graphics();
+ if (s->ref) {
+ gs_texture_destroy(s->tex);
+ IOSurfaceDecrementUseCount(s->ref);
+ CFRelease(s->ref);
+ }
 
-	s->ref = ref;
-	s->tex = gs_texture_create_from_iosurface(s->ref);
-	s->width = gs_texture_get_width(s->tex);
-	s->height = gs_texture_get_height(s->tex);
-	obs_leave_graphics();
+ s->ref = ref;
+ s->tex = gs_texture_create_from_iosurface(s->ref);
+ s->width = gs_texture_get_width(s->tex);
+ s->height = gs_texture_get_height(s->tex);
+ obs_leave_graphics();
 }
 
 static void create_client(syphon_t s)
 {
-	stop_client(s);
+ stop_client(s);
 
-	if (!s->app_name.length && !s->name.length && !s->uuid.length)
-		return;
+ if (!s->app_name.length && !s->name.length && !s->uuid.length)
+ return;
 
-	SyphonServerDirectory *ssd = SyphonServerDirectory sharedDirectory;
-	NSArray *servers = ssd serversMatchingName:s->name
-					 appName:s->app_name;
-	if (!servers.count)
-		return;
+ SyphonServerDirectory *ssd = SyphonServerDirectory sharedDirectory;
+ NSArray *servers = ssd serversMatchingName:s->name appName:s->app_name;
+ if (!servers.count)
+ return;
 
-	NSDictionary *desc = find_by_uuid(servers, s->uuid);
-	if (!desc) {
-		desc = servers0;
-		if (!s->uuid isEqualToString:
-				 descSyphonServerDescriptionUUIDKey) {
-			s->uuid_changed = true;
-		}
-	}
+ NSDictionary *desc = find_by_uuid(servers, s->uuid);
+ if (!desc) {
+ desc = servers0;
+ if (!s->uuid isEqualToString:descSyphonServerDescriptionUUIDKey) {
+ s->uuid_changed = true;
+ }
+ }
 
-	check_version(s, desc);
-	check_description(s, desc);
+ check_version(s, desc);
+ check_description(s, desc);
 
-	s->client = SYPHON_CLIENT_UNIQUE_CLASS_NAME alloc
-		initWithServerDescription:desc
-				 options:nil
-			 newFrameHandler:^(
-				 SYPHON_CLIENT_UNIQUE_CLASS_NAME *client) {
-				 handle_new_frame(s, client);
-			 };
+ s->client = SyphonOBSClient alloc initWithServerDescription:desc options:nil
+ newFrameHandler:^(SyphonOBSClient *client) {
+ handle_new_frame(s, client);
+ };
 
-	s->active = true;
+ s->active = true;
 }
 
 static inline bool load_syphon_settings(syphon_t s, obs_data_t *settings)
 {
-	NSString *app_name = @(obs_data_get_string(settings, "app_name"));
-	NSString *name = @(obs_data_get_string(settings, "name"));
-	bool equal_names = app_name isEqual:s->app_name &&
-			 name isEqual:s->name;
-	if (s->uuid_changed && equal_names)
-		return false;
+ NSString *app_name = @(obs_data_get_string(settings, "app_name"));
+ NSString *name = @(obs_data_get_string(settings, "name"));
+ bool equal_names = app_name isEqual:s->app_name && name isEqual:s->name;
+ if (s->uuid_changed && equal_names)
+ return false;
 
-	NSString *uuid = @(obs_data_get_string(settings, "uuid"));
-	if (uuid isEqual:s->uuid && equal_names)
-		return false;
+ NSString *uuid = @(obs_data_get_string(settings, "uuid"));
+ if (uuid isEqual:s->uuid && equal_names)
+ return false;
 
-	s->app_name = app_name;
-	s->name = name;
-	s->uuid = uuid;
-	s->uuid_changed = false;
-	return true;
+ s->app_name = app_name;
+ s->name = name;
+ s->uuid = uuid;
+ s->uuid_changed = false;
+ return true;
 }
 
 static inline void update_from_announce(syphon_t s, NSDictionary *info)
 {
-	if (s->active)
-		return;
+ if (s->active)
+ return;
 
-	if (!info)
-		return;
+ if (!info)
+ return;
 
-	NSString *app_name = infoSyphonServerDescriptionAppNameKey;
-	NSString *name = infoSyphonServerDescriptionNameKey;
-	NSString *uuid = infoSyphonServerDescriptionUUIDKey;
+ NSString *app_name = infoSyphonServerDescriptionAppNameKey;
+ NSString *name = infoSyphonServerDescriptionNameKey;
+ NSString *uuid = infoSyphonServerDescriptionUUIDKey;
 
-	if (!uuid isEqual:s->uuid &&
-	 !(app_name isEqual:s->app_name && name isEqual:s->name))
-		return;
+ if (!uuid isEqual:s->uuid && !(app_name isEqual:s->app_name && name isEqual:s->name))
+ return;
 
-	s->app_name = app_name;
-	s->name = name;
-	if (!s->uuid isEqualToString:uuid) {
-		s->uuid = uuid;
-		s->uuid_changed = true;
-	}
+ s->app_name = app_name;
+ s->name = name;
+ if (!s->uuid isEqualToString:uuid) {
+ s->uuid = uuid;
+ s->uuid_changed = true;
+ }
 
-	create_client(s);
+ create_client(s);
 }
 
 static inline void handle_announce(syphon_t s, NSNotification *note)
 {
-	if (!note)
-		return;
+ if (!note)
+ return;
 
-	update_from_announce(s, note.object);
-	update_properties(s);
+ update_from_announce(s, note.userInfo);
+ update_properties(s);
 }
 
 static inline void update_from_retire(syphon_t s, NSDictionary *info)
 {
-	if (!info)
-		return;
+ if (!info)
+ return;
 
-	NSString *uuid = infoSyphonServerDescriptionUUIDKey;
-	if (!uuid)
-		return;
+ NSString *uuid = infoSyphonServerDescriptionUUIDKey;
+ if (!uuid)
+ return;
 
-	if (!uuid isEqual:s->uuid)
-		return;
+ if (!uuid isEqual:s->uuid)
+ return;
 
-	s->active = false;
+ s->active = false;
 }
 
 static inline void handle_retire(syphon_t s, NSNotification *note)
 {
-	if (!note)
-		return;
+ if (!note)
+ return;
 
-	update_from_retire(s, note.object);
-	update_properties(s);
+ update_from_retire(s, note.userInfo);
+ update_properties(s);
 }
 
 static inline gs_vertbuffer_t *create_vertbuffer()
 {
-	struct gs_vb_data *vb_data = gs_vbdata_create();
-	vb_data->num = 4;
-	vb_data->points = bzalloc(sizeof(struct vec3) * 4);
-	if (!vb_data->points)
-		return NULL;
+ struct gs_vb_data *vb_data = gs_vbdata_create();
+ vb_data->num = 4;
+ vb_data->points = bzalloc(sizeof(struct vec3) * 4);
+ if (!vb_data->points)
+ return NULL;
 
-	vb_data->num_tex = 1;
-	vb_data->tvarray = bzalloc(sizeof(struct gs_tvertarray));
-	if (!vb_data->tvarray)
-		goto fail_tvarray;
+ vb_data->num_tex = 1;
+ vb_data->tvarray = bzalloc(sizeof(struct gs_tvertarray));
+ if (!vb_data->tvarray)
+ goto fail_tvarray;
 
-	vb_data->tvarray0.width = 2;
-	vb_data->tvarray0.array = bzalloc(sizeof(struct vec2) * 4);
-	if (!vb_data->tvarray0.array)
-		goto fail_array;
+ vb_data->tvarray0.width = 2;
+ vb_data->tvarray0.array = bzalloc(sizeof(struct vec2) * 4);
+ if (!vb_data->tvarray0.array)
+ goto fail_array;
 
-	gs_vertbuffer_t *vbuff = gs_vertexbuffer_create(vb_data, GS_DYNAMIC);
-	if (vbuff)
-		return vbuff;
+ gs_vertbuffer_t *vbuff = gs_vertexbuffer_create(vb_data, GS_DYNAMIC);
+ if (vbuff)
+ return vbuff;
 
-	bfree(vb_data->tvarray0.array);
+ bfree(vb_data->tvarray0.array);
 fail_array:
-	bfree(vb_data->tvarray);
+ bfree(vb_data->tvarray);
 fail_tvarray:
-	bfree(vb_data->points);
+ bfree(vb_data->points);
 
-	return NULL;
+ return NULL;
 }
 
 static inline bool init_obs_graphics_objects(syphon_t s)
 {
-	struct gs_sampler_info info = {
-		.filter = GS_FILTER_LINEAR,
-		.address_u = GS_ADDRESS_CLAMP,
-		.address_v = GS_ADDRESS_CLAMP,
-		.address_w = GS_ADDRESS_CLAMP,
-		.max_anisotropy = 1,
-	};
+ struct gs_sampler_info info = {
+ .filter = GS_FILTER_LINEAR,
+ .address_u = GS_ADDRESS_CLAMP,
+ .address_v = GS_ADDRESS_CLAMP,
+ .address_w = GS_ADDRESS_CLAMP,
+ .max_anisotropy = 1,
+ };
 
-	obs_enter_graphics();
-	s->sampler = gs_samplerstate_create(&info);
-	s->vertbuffer = create_vertbuffer();
-	obs_leave_graphics();
+ obs_enter_graphics();
+ s->sampler = gs_samplerstate_create(&info);
+ s->vertbuffer = create_vertbuffer();
+ obs_leave_graphics();
 
-	s->effect = obs_get_base_effect(OBS_EFFECT_DEFAULT_RECT);
+ s->effect = obs_get_base_effect(OBS_EFFECT_DEFAULT_RECT);
 
-	return s->sampler != NULL && s->vertbuffer != NULL && s->effect != NULL;
+ return s->sampler != NULL && s->vertbuffer != NULL && s->effect != NULL;
 }
 
 static inline bool create_syphon_listeners(syphon_t s)
 {
-	NSNotificationCenter *nc = NSNotificationCenter defaultCenter;
-	s->new_server_listener = nc
-		addObserverForName:SyphonServerAnnounceNotification
-			 object:nil
-			 queue:NSOperationQueue mainQueue
-			usingBlock:^(NSNotification *note) {
-				handle_announce(s, note);
-			};
+ NSNotificationCenter *nc = NSNotificationCenter defaultCenter;
+ s->new_server_listener = nc addObserverForName:SyphonServerAnnounceNotification object:nil
+ queue:NSOperationQueue mainQueue usingBlock:^(NSNotification *note) {
+ handle_announce(s, note);
+ };
 
-	s->retire_listener = nc
-		addObserverForName:SyphonServerRetireNotification
-			 object:nil
-			 queue:NSOperationQueue mainQueue
-			usingBlock:^(NSNotification *note) {
-				handle_retire(s, note);
-			};
+ s->retire_listener = nc addObserverForName:SyphonServerRetireNotification object:nil
+ queue:NSOperationQueue mainQueue usingBlock:^(NSNotification *note) {
+ handle_retire(s, note);
+ };
 
-	return s->new_server_listener != nil && s->retire_listener != nil;
+ return s->new_server_listener != nil && s->retire_listener != nil;
 }
 
 static inline void load_crop(syphon_t s, obs_data_t *settings)
 {
-	s->crop = obs_data_get_bool(settings, "crop");
+ s->crop = obs_data_get_bool(settings, "crop");
 
 #define LOAD_CROP(x) s->crop_rect.x = obs_data_get_double(settings, "crop." #x)
-	LOAD_CROP(origin.x);
-	LOAD_CROP(origin.y);
-	LOAD_CROP(size.width);
-	LOAD_CROP(size.height);
+ LOAD_CROP(origin.x);
+ LOAD_CROP(origin.y);
+ LOAD_CROP(size.width);
+ LOAD_CROP(size.height);
 #undef LOAD_CROP
 }
 
@@ -380,427 +351,382 @@
 
 static void *syphon_create_internal(obs_data_t *settings, obs_source_t *source)
 {
-	syphon_t s = bzalloc(sizeof(struct syphon));
-	if (!s)
-		return s;
+ syphon_t s = bzalloc(sizeof(struct syphon));
+ if (!s)
+ return s;
 
-	s->source = source;
+ s->source = source;
 
-	if (!init_obs_graphics_objects(s)) {
-		syphon_destroy_internal(s);
-		return NULL;
-	}
+ if (!init_obs_graphics_objects(s)) {
+ syphon_destroy_internal(s);
+ return NULL;
+ }
 
-	if (!load_syphon_settings(s, settings)) {
-		syphon_destroy_internal(s);
-		return NULL;
-	}
+ if (!load_syphon_settings(s, settings)) {
+ syphon_destroy_internal(s);
+ return NULL;
+ }
 
-	if (!create_syphon_listeners(s)) {
-		syphon_destroy_internal(s);
-		return NULL;
-	}
+ if (!create_syphon_listeners(s)) {
+ syphon_destroy_internal(s);
+ return NULL;
+ }
 
-	create_client(s);
+ create_client(s);
 
-	load_crop(s, settings);
+ load_crop(s, settings);
 
-	s->allow_transparency =
-		obs_data_get_bool(settings, "allow_transparency");
+ s->allow_transparency = obs_data_get_bool(settings, "allow_transparency");
 
-	return s;
+ return s;
 }
 
 static void *syphon_create(obs_data_t *settings, obs_source_t *source)
 {
-	@autoreleasepool {
-		return syphon_create_internal(settings, source);
-	}
+ @autoreleasepool {
+ return syphon_create_internal(settings, source);
+ }
 }
 
 static inline void stop_listener(id listener)
 {
-	if (!listener)
-		return;
+ if (!listener)
+ return;
 
-	NSNotificationCenter *nc = NSNotificationCenter defaultCenter;
-	nc removeObserver:listener;
+ NSNotificationCenter *nc = NSNotificationCenter defaultCenter;
+ nc removeObserver:listener;
 }
 
 static inline void syphon_destroy_internal(syphon_t s)
 {
-	stop_listener(s->new_server_listener);
-	stop_listener(s->retire_listener);
+ stop_listener(s->new_server_listener);
+ stop_listener(s->retire_listener);
 
-	obs_enter_graphics();
-	stop_client(s);
+ obs_enter_graphics();
+ stop_client(s);
 
-	if (s->sampler)
-		gs_samplerstate_destroy(s->sampler);
-	if (s->vertbuffer)
-		gs_vertexbuffer_destroy(s->vertbuffer);
-	obs_leave_graphics();
+ if (s->sampler)
+ gs_samplerstate_destroy(s->sampler);
+ if (s->vertbuffer)
+ gs_vertexbuffer_destroy(s->vertbuffer);
+ obs_leave_graphics();
 
-	bfree(s);
+ bfree(s);
 }
 
 static void syphon_destroy(void *data)
 {
-	@autoreleasepool {
-		syphon_destroy_internal(data);
-	}
+ @autoreleasepool {
+ syphon_destroy_internal(data);
+ }
 }
 
 static inline NSString *get_string(obs_data_t *settings, const char *name)
 {
-	if (!settings)
-		return nil;
+ if (!settings)
+ return nil;
 
-	return @(obs_data_get_string(settings, name));
+ return @(obs_data_get_string(settings, name));
 }
 
-static inline void update_strings_from_context(syphon_t s, obs_data_t *settings,
-					 NSString **app, NSString **name,
-					 NSString **uuid)
+static inline void update_strings_from_context(syphon_t s, obs_data_t *settings, NSString **app, NSString **name,
+ NSString **uuid)
 {
-	if (!s || !s->uuid_changed)
-		return;
+ if (!s || !s->uuid_changed)
+ return;
 
-	s->uuid_changed = false;
-	*app = s->app_name;
-	*name = s->name;
-	*uuid = s->uuid;
+ s->uuid_changed = false;
+ *app = s->app_name;
+ *name = s->name;
+ *uuid = s->uuid;
 
-	obs_data_set_string(settings, "app_name", s->app_name.UTF8String);
-	obs_data_set_string(settings, "name", s->name.UTF8String);
-	obs_data_set_string(settings, "uuid", s->uuid.UTF8String);
+ obs_data_set_string(settings, "app_name", s->app_name.UTF8String);
+ obs_data_set_string(settings, "name", s->name.UTF8String);
+ obs_data_set_string(settings, "uuid", s->uuid.UTF8String);
 }
 
-static inline void add_servers(syphon_t s, obs_property_t *list,
-			 obs_data_t *settings)
+static inline void add_servers(syphon_t s, obs_property_t *list, obs_data_t *settings)
 {
-	bool found_current = settings == NULL;
+ bool found_current = settings == NULL;
 
-	NSString *set_app = get_string(settings, "app_name");
-	NSString *set_name = get_string(settings, "name");
-	NSString *set_uuid = get_string(settings, "uuid");
+ NSString *set_app = get_string(settings, "app_name");
+ NSString *set_name = get_string(settings, "name");
+ NSString *set_uuid = get_string(settings, "uuid");
 
-	update_strings_from_context(s, settings, &set_app, &set_name,
-				 &set_uuid);
+ update_strings_from_context(s, settings, &set_app, &set_name, &set_uuid);
 
-	obs_property_list_add_string(list, "", "");
-	NSArray *arr = SyphonServerDirectory sharedDirectory servers;
-	for (NSDictionary *server in arr) {
-		NSString *app = serverSyphonServerDescriptionAppNameKey;
-		NSString *name = serverSyphonServerDescriptionNameKey;
-		NSString *uuid = serverSyphonServerDescriptionUUIDKey;
-		NSString *serv =
-			NSString stringWithFormat:@"%@ %@", app, name;
+ obs_property_list_add_string(list, "", "");
+ NSArray *arr = SyphonServerDirectory sharedDirectory servers;
+ for (NSDictionary *server in arr) {
+ NSString *app = serverSyphonServerDescriptionAppNameKey;
+ NSString *name = serverSyphonServerDescriptionNameKey;
+ NSString *uuid = serverSyphonServerDescriptionUUIDKey;
+ NSString *serv = NSString stringWithFormat:@"%@ %@", app, name;
 
-		obs_property_list_add_string(list, serv.UTF8String,
-					 uuid.UTF8String);
+ obs_property_list_add_string(list, serv.UTF8String, uuid.UTF8String);
 
-		if (!found_current)
-			found_current = uuid isEqual:set_uuid;
-	}
+ if (!found_current)
+ found_current = uuid isEqual:set_uuid;
+ }
 
-	if (found_current || !set_uuid.length || !set_app.length)
-		return;
+ if (found_current || !set_uuid.length || !set_app.length)
+ return;
 
-	NSString *serv =
-		NSString stringWithFormat:@"%@ %@", set_app, set_name;
-	size_t idx = obs_property_list_add_string(list, serv.UTF8String,
-						 set_uuid.UTF8String);
-	obs_property_list_item_disable(list, idx, true);
+ NSString *serv = NSString stringWithFormat:@"%@ %@", set_app, set_name;
+ size_t idx = obs_property_list_add_string(list, serv.UTF8String, set_uuid.UTF8String);
+ obs_property_list_item_disable(list, idx, true);
 }
 
-static bool servers_changed(obs_properties_t *props, obs_property_t *list,
-			 obs_data_t *settings)
+static bool servers_changed(obs_properties_t *props, obs_property_t *list, obs_data_t *settings)
 {
-	@autoreleasepool {
-		obs_property_list_clear(list);
-		add_servers(obs_properties_get_param(props), list, settings);
-		return true;
-	}
+ @autoreleasepool {
+ obs_property_list_clear(list);
+ add_servers(obs_properties_get_param(props), list, settings);
+ return true;
+ }
 }
 
-static bool update_crop(obs_properties_t *props, obs_property_t *prop,
-			obs_data_t *settings)
+static bool update_crop(obs_properties_t *props, obs_property_t *prop, obs_data_t *settings)
 {
-	bool enabled = obs_data_get_bool(settings, "crop");
+ bool enabled = obs_data_get_bool(settings, "crop");
 
-#define LOAD_CROP(x) \
-	prop = obs_properties_get(props, "crop." #x); \
-	obs_property_set_enabled(prop, enabled);
-	LOAD_CROP(origin.x);
-	LOAD_CROP(origin.y);
-	LOAD_CROP(size.width);
-	LOAD_CROP(size.height);
+#define LOAD_CROP(x) \
+ prop = obs_properties_get(props, "crop." #x); \
+ obs_property_set_enabled(prop, enabled);
+ LOAD_CROP(origin.x);
+ LOAD_CROP(origin.y);
+ LOAD_CROP(size.width);
+ LOAD_CROP(size.height);
 #undef LOAD_CROP
 
-	return true;
+ return true;
 }
 
 static void show_syphon_license_internal(void)
 {
-	char *path = obs_module_file("syphon_license.txt");
-	if (!path)
-		return;
-
-	NSWorkspace *ws = NSWorkspace sharedWorkspace;
-
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 110000
-	if (@available(macOS 11.0, *)) {
-		NSURL *url = NSURL
-			URLWithString:
-				@"file://"
-					stringByAppendingString:
-						NSString
-							stringWithCString:path
-								 encoding:NSUTF8StringEncoding;
-		ws openURL:url;
-	} else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-		ws openFile:@(path);
-#pragma clang diagnostic pop
-	}
-#else
-	ws openFile:@(path);
-#endif
-	bfree(path);
-}
-
-static bool show_syphon_license(obs_properties_t *props, obs_property_t *prop,
-				void *data)
-{
-	UNUSED_PARAMETER(props);
-	UNUSED_PARAMETER(prop);
-	UNUSED_PARAMETER(data);
-
-	@autoreleasepool {
-		show_syphon_license_internal();
-		return false;
-	}
+ char *path = obs_module_file("syphon_license.txt");
+ if (!path)
+ return;
+
+ NSWorkspace *ws = NSWorkspace sharedWorkspace;
+
+ NSURL *url =
+ NSURL URLWithString:@"file://" stringByAppendingString:NSString stringWithCString:path
+ encoding:NSUTF8StringEncoding;
+ ws openURL:url;
+ bfree(path);
+}
+
+static bool show_syphon_license(obs_properties_t *props, obs_property_t *prop, void *data)
+{
+ UNUSED_PARAMETER(props);
+ UNUSED_PARAMETER(prop);
+ UNUSED_PARAMETER(data);
+
+ @autoreleasepool {
+ show_syphon_license_internal();
+ return false;
+ }
 }
 
 static void syphon_release(void *param)
 {
-	if (!param)
-		return;
+ if (!param)
+ return;
 
-	obs_source_release(((syphon_t)param)->source);
+ obs_source_release(((syphon_t) param)->source);
 }
 
 static inline obs_properties_t *syphon_properties_internal(syphon_t s)
 {
-	if (s && obs_source_get_ref(s->source) == NULL) {
-		s = NULL;
-	}
-
-	obs_properties_t *props =
-		obs_properties_create_param(s, syphon_release);
-
-	obs_property_t *list = obs_properties_add_list(
-		props, "uuid", obs_module_text("Source"), OBS_COMBO_TYPE_LIST,
-		OBS_COMBO_FORMAT_STRING);
-	obs_property_set_modified_callback(list, servers_changed);
-
-	obs_properties_add_bool(props, "allow_transparency",
-				obs_module_text("AllowTransparency"));
-
-	obs_property_t *crop =
-		obs_properties_add_bool(props, "crop", obs_module_text("Crop"));
-	obs_property_set_modified_callback(crop, update_crop);
-
-#define LOAD_CROP(x) \
-	obs_properties_add_float(props, "crop." #x, \
-				 obs_module_text("Crop." #x), 0., 4096.f, \
-				 .5f);
-	LOAD_CROP(origin.x);
-	LOAD_CROP(origin.y);
-	LOAD_CROP(size.width);
-	LOAD_CROP(size.height);
+ if (s && obs_source_get_ref(s->source) == NULL) {
+ s = NULL;
+ }
+
+ obs_properties_t *props = obs_properties_create_param(s, syphon_release);
+
+ obs_property_t *list =
+ obs_properties_add_list(props, "uuid", obs_module_text("Source"), OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+ obs_property_set_modified_callback(list, servers_changed);
+
+ obs_properties_add_bool(props, "allow_transparency", obs_module_text("AllowTransparency"));
+
+ obs_property_t *crop = obs_properties_add_bool(props, "crop", obs_module_text("Crop"));
+ obs_property_set_modified_callback(crop, update_crop);
+
+#define LOAD_CROP(x) obs_properties_add_float(props, "crop." #x, obs_module_text("Crop." #x), 0., 4096.f, .5f);
+ LOAD_CROP(origin.x);
+ LOAD_CROP(origin.y);
+ LOAD_CROP(size.width);
+ LOAD_CROP(size.height);
 #undef LOAD_CROP
 
-	obs_properties_add_button(props, "syphon license",
-				 obs_module_text("SyphonLicense"),
-				 show_syphon_license);
+ obs_properties_add_button(props, "syphon license", obs_module_text("SyphonLicense"), show_syphon_license);
 
-	return props;
+ return props;
 }
 
 static obs_properties_t *syphon_properties(void *data)
 {
-	@autoreleasepool {
-		return syphon_properties_internal(data);
-	}
+ @autoreleasepool {
+ return syphon_properties_internal(data);
+ }
 }
 
 static inline void syphon_save_internal(syphon_t s, obs_data_t *settings)
 {
-	if (!s->uuid_changed)
-		return;
+ if (!s->uuid_changed)
+ return;
 
-	obs_data_set_string(settings, "app_name", s->app_name.UTF8String);
-	obs_data_set_string(settings, "name", s->name.UTF8String);
-	obs_data_set_string(settings, "uuid", s->uuid.UTF8String);
+ obs_data_set_string(settings, "app_name", s->app_name.UTF8String);
+ obs_data_set_string(settings, "name", s->name.UTF8String);
+ obs_data_set_string(settings, "uuid", s->uuid.UTF8String);
 }
 
 static void syphon_save(void *data, obs_data_t *settings)
 {
-	@autoreleasepool {
-		syphon_save_internal(data, settings);
-	}
+ @autoreleasepool {
+ syphon_save_internal(data, settings);
+ }
 }
 
-static inline void build_sprite(struct gs_vb_data *data, float fcx, float fcy,
-				float start_u, float end_u, float start_v,
-				float end_v)
+static inline void build_sprite(struct gs_vb_data *data, float fcx, float fcy, float start_u, float end_u,
+ float start_v, float end_v)
 {
-	struct vec2 *tvarray = data->tvarray0.array;
+ struct vec2 *tvarray = data->tvarray0.array;
 
-	vec3_set(data->points + 1, fcx, 0.0f, 0.0f);
-	vec3_set(data->points + 2, 0.0f, fcy, 0.0f);
-	vec3_set(data->points + 3, fcx, fcy, 0.0f);
-	vec2_set(tvarray, start_u, start_v);
-	vec2_set(tvarray + 1, end_u, start_v);
-	vec2_set(tvarray + 2, start_u, end_v);
-	vec2_set(tvarray + 3, end_u, end_v);
+ vec3_set(data->points + 1, fcx, 0.0f, 0.0f);
+ vec3_set(data->points + 2, 0.0f, fcy, 0.0f);
+ vec3_set(data->points + 3, fcx, fcy, 0.0f);
+ vec2_set(tvarray, start_u, start_v);
+ vec2_set(tvarray + 1, end_u, start_v);
+ vec2_set(tvarray + 2, start_u, end_v);
+ vec2_set(tvarray + 3, end_u, end_v);
 }
 
-static inline void build_sprite_rect(struct gs_vb_data *data, float origin_x,
-				 float origin_y, float end_x, float end_y)
+static inline void build_sprite_rect(struct gs_vb_data *data, float origin_x, float origin_y, float end_x, float end_y)
 {
-	build_sprite(data, fabsf(end_x - origin_x), fabsf(end_y - origin_y),
-		 origin_x, end_x, origin_y, end_y);
+ build_sprite(data, fabsf(end_x - origin_x), fabsf(end_y - origin_y), origin_x, end_x, origin_y, end_y);
 }
 
 static void syphon_video_tick(void *data, float seconds)
 {
-	UNUSED_PARAMETER(seconds);
+ UNUSED_PARAMETER(seconds);
 
-	syphon_t s = data;
+ syphon_t s = data;
 
-	if (!s->tex)
-		return;
+ if (!s->tex)
+ return;
 
-	static const CGRect null_crop = {{0.f}};
-	const CGRect *crop = &null_crop;
-	if (s->crop)
-		crop = &s->crop_rect;
+ static const CGRect null_crop = {{0.f}};
+ const CGRect *crop = &null_crop;
+ if (s->crop)
+ crop = &s->crop_rect;
 
-	obs_enter_graphics();
-	build_sprite_rect(gs_vertexbuffer_get_data(s->vertbuffer),
-			 (float)crop->origin.x,
-			 s->height - (float)crop->origin.y,
-			 s->width - (float)crop->size.width,
-			 (float)crop->size.height);
-	obs_leave_graphics();
+ obs_enter_graphics();
+ build_sprite_rect(gs_vertexbuffer_get_data(s->vertbuffer), (float) crop->origin.x,
+ s->height - (float) crop->origin.y, s->width - (float) crop->size.width,
+ (float) crop->size.height);
+ obs_leave_graphics();
 }
 
 static void syphon_video_render(void *data, gs_effect_t *effect)
 {
-	UNUSED_PARAMETER(effect);
+ UNUSED_PARAMETER(effect);
 
-	syphon_t s = data;
+ syphon_t s = data;
 
-	if (!s->tex)
-		return;
+ if (!s->tex)
+ return;
 
-	gs_vertexbuffer_flush(s->vertbuffer);
-	gs_load_vertexbuffer(s->vertbuffer);
-	gs_load_indexbuffer(NULL);
-	gs_load_samplerstate(s->sampler, 0);
-	const char *tech_name = s->allow_transparency ? "Draw" : "DrawOpaque";
-	gs_technique_t *tech = gs_effect_get_technique(s->effect, tech_name);
-	gs_effect_set_texture(gs_effect_get_param_by_name(s->effect, "image"),
-			 s->tex);
-	gs_technique_begin(tech);
-	gs_technique_begin_pass(tech, 0);
+ gs_vertexbuffer_flush(s->vertbuffer);
+ gs_load_vertexbuffer(s->vertbuffer);
+ gs_load_indexbuffer(NULL);
+ gs_load_samplerstate(s->sampler, 0);
+ const char *tech_name = s->allow_transparency ? "Draw" : "DrawOpaque";
+ gs_technique_t *tech = gs_effect_get_technique(s->effect, tech_name);
+ gs_effect_set_texture(gs_effect_get_param_by_name(s->effect, "image"), s->tex);
+ gs_technique_begin(tech);
+ gs_technique_begin_pass(tech, 0);
 
-	gs_draw(GS_TRISTRIP, 0, 4);
+ gs_draw(GS_TRISTRIP, 0, 4);
 
-	gs_technique_end_pass(tech);
-	gs_technique_end(tech);
+ gs_technique_end_pass(tech);
+ gs_technique_end(tech);
 }
 
 static uint32_t syphon_get_width(void *data)
 {
-	syphon_t s = (syphon_t)data;
-	if (!s->crop)
-		return s->width;
-	int32_t width = s->width - (int)s->crop_rect.origin.x -
-			(int)s->crop_rect.size.width;
-	return MAX(0, width);
+ syphon_t s = (syphon_t) data;
+ if (!s->crop)
+ return s->width;
+ int32_t width = s->width - (int) s->crop_rect.origin.x - (int) s->crop_rect.size.width;
+ return MAX(0, width);
 }
 
 static uint32_t syphon_get_height(void *data)
 {
-	syphon_t s = (syphon_t)data;
-	if (!s->crop)
-		return s->height;
-	int32_t height = s->height - (int)s->crop_rect.origin.y -
-			 (int)s->crop_rect.size.height;
-	return MAX(0, height);
+ syphon_t s = (syphon_t) data;
+ if (!s->crop)
+ return s->height;
+ int32_t height = s->height - (int) s->crop_rect.origin.y - (int) s->crop_rect.size.height;
+ return MAX(0, height);
 }
 
 static inline bool update_syphon(syphon_t s, obs_data_t *settings)
 {
-	NSArray *arr = SyphonServerDirectory sharedDirectory servers;
+ NSArray *arr = SyphonServerDirectory sharedDirectory servers;
 
-	if (!load_syphon_settings(s, settings))
-		return false;
+ if (!load_syphon_settings(s, settings))
+ return false;
 
-	NSDictionary *dict = find_by_uuid(arr, s->uuid);
-	if (dict) {
-		NSString *app = dictSyphonServerDescriptionAppNameKey;
-		NSString *name = dictSyphonServerDescriptionNameKey;
-		obs_data_set_string(settings, "app_name", app.UTF8String);
-		obs_data_set_string(settings, "name", name.UTF8String);
-		load_syphon_settings(s, settings);
+ NSDictionary *dict = find_by_uuid(arr, s->uuid);
+ if (dict) {
+ NSString *app = dictSyphonServerDescriptionAppNameKey;
+ NSString *name = dictSyphonServerDescriptionNameKey;
+ obs_data_set_string(settings, "app_name", app.UTF8String);
+ obs_data_set_string(settings, "name", name.UTF8String);
+ load_syphon_settings(s, settings);
 
-	} else if (!dict && !s->uuid.length) {
-		obs_data_set_string(settings, "app_name", "");
-		obs_data_set_string(settings, "name", "");
-		load_syphon_settings(s, settings);
-	}
+ } else if (!dict && !s->uuid.length) {
+ obs_data_set_string(settings, "app_name", "");
+ obs_data_set_string(settings, "name", "");
+ load_syphon_settings(s, settings);
+ }
 
-	return true;
+ return true;
 }
 
 static void syphon_update_internal(syphon_t s, obs_data_t *settings)
 {
-	s->allow_transparency =
-		obs_data_get_bool(settings, "allow_transparency");
+ s->allow_transparency = obs_data_get_bool(settings, "allow_transparency");
 
-	load_crop(s, settings);
+ load_crop(s, settings);
 
-	if (update_syphon(s, settings))
-		create_client(s);
+ if (update_syphon(s, settings))
+ create_client(s);
 }
 
 static void syphon_update(void *data, obs_data_t *settings)
 {
-	@autoreleasepool {
-		syphon_update_internal(data, settings);
-	}
+ @autoreleasepool {
+ syphon_update_internal(data, settings);
+ }
 }
 
 struct obs_source_info syphon_info = {
-	.id = "syphon-input",
-	.type = OBS_SOURCE_TYPE_INPUT,
-	.output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW |
-			OBS_SOURCE_DO_NOT_DUPLICATE,
-	.get_name = syphon_get_name,
-	.create = syphon_create,
-	.destroy = syphon_destroy,
-	.video_render = syphon_video_render,
-	.video_tick = syphon_video_tick,
-	.get_properties = syphon_properties,
-	.get_width = syphon_get_width,
-	.get_height = syphon_get_height,
-	.update = syphon_update,
-	.save = syphon_save,
-	.icon_type = OBS_ICON_TYPE_GAME_CAPTURE,
+ .id = "syphon-input",
+ .type = OBS_SOURCE_TYPE_INPUT,
+ .output_flags = OBS_SOURCE_VIDEO | OBS_SOURCE_CUSTOM_DRAW | OBS_SOURCE_DO_NOT_DUPLICATE,
+ .get_name = syphon_get_name,
+ .create = syphon_create,
+ .destroy = syphon_destroy,
+ .video_render = syphon_video_render,
+ .video_tick = syphon_video_tick,
+ .get_properties = syphon_properties,
+ .get_width = syphon_get_width,
+ .get_height = syphon_get_height,
+ .update = syphon_update,
+ .save = syphon_save,
+ .icon_type = OBS_ICON_TYPE_GAME_CAPTURE,
 };

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/CMakeLists.txt Changed

@@ -1,30 +1,20 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
-legacy_check()
-
-find_library(AVFOUNDATION AVFoundation)
-find_library(COCOA Cocoa)
-find_library(COREFOUNDATION CoreFoundation)
-find_library(COREVIDEO CoreVideo)
-find_library(VIDEOTOOLBOX VideoToolbox)
-find_library(COREMEDIA CoreMedia)
-
-mark_as_advanced(AVFOUNDATION COCOA COREFOUNDATION COREVIDEO VIDEOTOOLBOX COREMEDIA)
+cmake_minimum_required(VERSION 3.24...3.25)
 
 add_library(mac-videotoolbox MODULE)
 add_library(OBS::mac-videotoolbox ALIAS mac-videotoolbox)
 
 target_sources(mac-videotoolbox PRIVATE encoder.c)
 
+# cmake-format: off
 target_link_libraries(
 mac-videotoolbox
 PRIVATE OBS::libobs
- ${AVFOUNDATION}
- ${COCOA}
- ${COREFOUNDATION}
- ${COREVIDEO}
- ${VIDEOTOOLBOX}
- ${COREMEDIA})
+ "$<LINK_LIBRARY:FRAMEWORK,AVFoundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreFoundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreMedia.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreVideo.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,VideoToolbox.framework>")
 
 set_target_properties_obs(
 mac-videotoolbox
@@ -32,3 +22,4 @@
 PREFIX ""
 XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION YES
 XCODE_ATTRIBUTE_GCC_WARN_SHADOW YES)
+# cmake-format: on

obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/af-ZA.ini Added

@@ -0,0 +1,19 @@
+VTH264EncHW="Apple VT H264 Apparatuurenkodeerder"
+VTH264EncSW="Apple VT H264 Programmatuurenkodeerder"
+VTHEVCEncHW="Apple VT HEVC Apparatuurenkodeerder"
+VTHEVCEncT2="Apple VT HEVC T2 Apparatuurenkodeerder"
+VTHEVCEncSW="Apple VT HEVC Programmatuurenkodeerder"
+VTProResEncHW="Apple VT ProRes Apparatuurenkodeerder"
+VTProResEncSW="Apple VT ProRes Programmatuurenkodeerder"
+Bitrate="Bistempo"
+Quality="Kwaliteit"
+UseMaxBitrate="Beperk bistempo"
+MaxBitrate="Maksimum bistempo"
+MaxBitrateWindow="Maksimumbistempovenster"
+KeyframeIntervalSec="sleutelraaminterval (0=outomaties)"
+Profile="Profiel"
+UseBFrames="Gebruik B-rame"
+ColorFormatUnsupported="Die gekose kleurformaat word nie deur die gekose Apple VT-enkodeerder ondersteun nie. Kies ’n versoenbare kleurformaat in Instellings -> Gevorderd of gebruik ’n ander enkodeerder."
+FullRangeUnsupported="Volledige kleurbereik word nie deur 16-bis Apple VT-enkodeerders ondersteun nie. Kies beperkte kleurbereik in Instellings -> Gevorderd."
+ProResCodec="ProRes-kodek"
+ProRes422Proxy="ProRes 422 Proksie"

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/de-DE.ini Changed

@@ -5,7 +5,6 @@
 VTHEVCEncSW="Apple-VT-HEVC-Softwareencoder"
 VTProResEncHW="Apple-VT-ProRes-Hardwareencoder"
 VTProResEncSW="Apple-VT-ProRes-Softwareencoder"
-VTEncoder="VideoToolbox-Encoder"
 Quality="Qualität"
 UseMaxBitrate="Limitiere Bitrate"
 MaxBitrate="Max. Bitrate"
@@ -14,6 +13,6 @@
 Profile="Profil"
 UseBFrames="B-Frames verwenden"
 RateControl="Qualitätsregulierungsmethode"
-ColorFormatUnsupported="Das ausgewählte Farbformat wird durch den gewählten Apple-VT-Encoder nicht unterstützt. Unter Einstellungen -> Erweitert können Sie ein kompatibles Farbformat wählen oder einen anderen Encoder verwenden."
-FullRangeUnsupported="Voller Farbbereich wird nicht von den 16-Bit Apple-VT-Encodern unterstützt. Wählen Sie begrenzten Farbbereich in Einstellungen -> Erweitert."
+ColorFormatUnsupported="Das ausgewählte Farbformat wird durch den gewählten Apple-VT-Encoder nicht unterstützt. Unter „Einstellungen“ → „Erweitert“ können Sie ein kompatibles Farbformat wählen oder einen anderen Encoder verwenden."
+FullRangeUnsupported="Voller Farbbereich wird nicht von den 16-Bit Apple-VT-Encodern unterstützt. Wählen Sie begrenzten Farbbereich in „Einstellungen“ → „Erweitert“."
 ProResCodec="ProRes-Codec"

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/es-ES.ini Changed

@@ -5,7 +5,6 @@
 VTHEVCEncSW="Codificador por software Apple VT HEVC"
 VTProResEncHW="Codificador por hardware Apple VT ProRes"
 VTProResEncSW="Codificador por software Apple VT ProRes"
-VTEncoder="Codificador VideoToolbox"
 Bitrate="Tasa de bits"
 Quality="Calidad"
 UseMaxBitrate="Límite de bitrate"
@@ -16,6 +15,6 @@
 UseBFrames="Usar B-Frames"
 RateControl="Control de la frecuencia"
 ColorFormatUnsupported="El formato de color seleccionado no está soportado por el codificador Apple VT seleccionado. Seleccione un formato de color compatible en Ajustes -> Avanzado o utilice un codificador diferente."
-FullRangeUnsupported="El rango de color completo no está soportado por los codificadores Apple VT de 16 bits. Selecciona el rango de color limitado en Ajustes -> Avanzado."
+FullRangeUnsupported="La gama de color completa no está admitida por los codificadores Apple VT de 16 bits. Seleccione la gama de color limitada en Ajustes -> Avanzado."
 ProResCodec="Códec ProRes"
 ProRes422Proxy="Proxy ProRes 422"

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/fr-FR.ini Changed

@@ -5,7 +5,6 @@
 VTHEVCEncSW="Encodeur logiciel Apple VT HEVC"
 VTProResEncHW="Encodeur matériel Apple VT ProRes"
 VTProResEncSW="Encodeur logiciel Apple VT ProRes"
-VTEncoder="Encodeur VideoToolbox"
 Bitrate="Débit"
 Quality="Qualité"
 UseMaxBitrate="Limiter le débit"
@@ -16,7 +15,7 @@
 UseBFrames="Utiliser les B-Frames"
 RateControl="Contrôle du débit"
 ColorFormatUnsupported="Le format de couleur sélectionné n'est pas pris en charge par l'encodeur Apple VT. Sélectionnez un format de couleur compatible dans Paramètres -> Avancé ou utilisez un encodeur différent."
-FullRangeUnsupported="La couleur complète n'est pas prise en charge par les codeurs Apple VT 16 bits. Sélectionnez la couleur de la gamme limitée dans les paramètres."
+FullRangeUnsupported="La gamme de couleurs complète n'est pas prise en charge par les encodeurs Apple VT 16 bits. Sélectionnez la gamme de couleurs limitée dans Paramètres -> Avancé."
 ProResCodec="Codec ProRes"
 ProRes422Proxy="Proxy ProRes 422"
 ProRes422HQ="ProRes 422 QG"

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/pt-BR.ini Changed

@@ -1,11 +1,10 @@
-VTH264EncHW="Codificador de Hardware Apple VT H264"
-VTH264EncSW="Codificador de Software Apple VT H264"
+VTH264EncHW="Codificador Apple VT H264 em hardware"
+VTH264EncSW="Codificador Apple VT H264 em software"
 VTHEVCEncHW="Codificador em Hardware Apple VT HEVC"
 VTHEVCEncT2="Codificador em Hardware Apple VT HEVC T2"
 VTHEVCEncSW="Codificador em Software Apple VT HEVC"
 VTProResEncHW="Codificador em Hardware Apple VT ProRes"
 VTProResEncSW="Codificador em Software Apple VT ProRes"
-VTEncoder="Codificador VideoToolbox"
 Bitrate="Taxa de Bits"
 Quality="Qualidade"
 UseMaxBitrate="Limitar taxa de bits"
@@ -16,6 +15,6 @@
 UseBFrames="Usar B-Frames"
 RateControl="Controle da taxa de bits"
 ColorFormatUnsupported="O formato de cor selecionado não é suportado pelo codificador Apple VT selecionado. Selecione um formato de cor compatível em Configurações -> Avançado ou use um codificador diferente."
-FullRangeUnsupported="A Faixa de Cores Completa não é suportada pelos codificadores Apple VT 16-bit. Selecione Faixa de Cores Limitada em Configurações -> Avançado."
+FullRangeUnsupported="O intervalo completo de cores não é suportado por codificadores Apple VT 16-bit. Selecione um intervalo de cor limitado em Configurações -> Avançado"
 ProResCodec="Codificador ProRes"
 ProRes422Proxy="Proxy ProRes 422"

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/ru-RU.ini Changed

@@ -5,7 +5,6 @@
 VTHEVCEncSW="Программный кодировщик Apple VT HEVC"
 VTProResEncHW="Аппаратный кодировщик Apple VT ProRes"
 VTProResEncSW="Программный кодировщик Apple VT ProRes"
-VTEncoder="Кодировщик VideoToolbox"
 Bitrate="Битрейт"
 Quality="Качество"
 UseMaxBitrate="Ограничивать битрейт"
@@ -15,6 +14,6 @@
 Profile="Профиль"
 UseBFrames="Использовать B-кадры"
 RateControl="Управление битрейтом"
-ColorFormatUnsupported="Выбранный формат цвета не поддерживается выбранным кодером Apple VT. Выберите совместимый формат цвета в «Настройки -> Дополнительно» или используйте другой кодер."
-FullRangeUnsupported="Полный цветовой диапазон не поддерживается 16-битными кодерами Apple VT. Выберите ограниченный цветовой диапазон в Настройках -> Расширенные."
+ColorFormatUnsupported="Выбранный формат цвета не поддерживается выбранным кодером Apple VT. Выберите совместимый формат цвета в «Настройки -> Расширенные» или используйте другой кодер."
+FullRangeUnsupported="Полный цветовой диапазон не поддерживается 16-битными кодерами Apple VT. Выберите ограниченный цветовой диапазон в «Настройках -> Расширенные»."
 ProResCodec="Кодек ProRes"

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-videotoolbox/encoder.c -> obs-studio-30.0.2.tar.xz/plugins/mac-videotoolbox/encoder.c Changed

@@ -141,12 +141,10 @@
 		}
 		if (strcmp(profile, "main10") == 0)
 			return kVTProfileLevel_HEVC_Main10_AutoLevel;
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120300 // macOS 12.3
 		if (__builtin_available(macOS 12.3, *)) {
 			if (strcmp(profile, "main42210") == 0)
 				return kVTProfileLevel_HEVC_Main42210_AutoLevel;
 		}
-#endif // macOS 12.3
 		return kVTProfileLevel_HEVC_Main_AutoLevel;
 #else
 		(void)format;
@@ -300,7 +298,6 @@
 		can_limit_bitrate = true;
 
 		if (__builtin_available(macOS 13.0, *)) {
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 130000
 			if (is_apple_silicon) {
 				compressionPropertyKey =
 					kVTCompressionPropertyKey_ConstantBitRate;
@@ -310,11 +307,6 @@
 				 "CBR support for VideoToolbox encoder requires Apple Silicon. "
 				 "Will use ABR instead.");
 			}
-#else
-			VT_LOG(LOG_WARNING,
-			 "CBR support for VideoToolbox not available in this build of OBS. "
-			 "Will use ABR instead.");
-#endif
 		} else {
 			VT_LOG(LOG_WARNING,
 			 "CBR support for VideoToolbox encoder requires macOS 13 or newer. "
@@ -699,14 +691,6 @@
 	enc->session = s;
 
 	return true;
-
-fail:
-	if (encoder_spec != NULL)
-		CFRelease(encoder_spec);
-	if (pixbuf_spec != NULL)
-		CFRelease(pixbuf_spec);
-
-	return false;
 }
 
 static void vt_destroy(void *data)
@@ -1061,6 +1045,10 @@
 			format_desc, 0, NULL, NULL, &param_count,
 			&nal_length_bytes);
 #endif
+	} else {
+		log_osstatus(LOG_ERROR, enc, "invalid codec type",
+			 kCMFormatDescriptionError_ValueNotAvailable);
+		return false;
 	}
 	// it is not clear what errors this function can return
 	// so we check the two most reasonable
@@ -1592,40 +1580,10 @@
 	encoder_data->codec_type = codec_type;
 }
 
-static CFComparisonResult compare_encoder_list(const void *left_val,
-					 const void *right_val,
-					 void *context __unused)
-{
-	CFDictionaryRef left = (CFDictionaryRef)left_val;
-	CFDictionaryRef right = (CFDictionaryRef)right_val;
-
-	CFNumberRef left_codec_num =
-		CFDictionaryGetValue(left, kVTVideoEncoderList_CodecType);
-	CFNumberRef right_codec_num =
-		CFDictionaryGetValue(right, kVTVideoEncoderList_CodecType);
-	CFComparisonResult result =
-		CFNumberCompare(left_codec_num, right_codec_num, NULL);
-
-	if (result != kCFCompareEqualTo)
-		return result;
-
-	CFBooleanRef left_hardware_accel = CFDictionaryGetValue(
-		left, kVTVideoEncoderList_IsHardwareAccelerated);
-	CFBooleanRef right_hardware_accel = CFDictionaryGetValue(
-		right, kVTVideoEncoderList_IsHardwareAccelerated);
-
-	if (left_hardware_accel == right_hardware_accel)
-		return kCFCompareEqualTo;
-	else if (left_hardware_accel == kCFBooleanTrue)
-		return kCFCompareGreaterThan;
-	else
-		return kCFCompareLessThan;
-}
-
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("mac-videotoolbox", "en-US")
 dispatch_group_t encoder_list_dispatch_group;
-CFArrayRef encoder_list_const;
+CFArrayRef encoder_list;
 
 bool obs_module_load(void)
 {
@@ -1633,7 +1591,7 @@
 		dispatch_queue_create("Encoder list load queue", NULL);
 	encoder_list_dispatch_group = dispatch_group_create();
 	dispatch_group_async(encoder_list_dispatch_group, queue, ^{
-		VTCopyVideoEncoderList(NULL, &encoder_list_const);
+		VTCopyVideoEncoderList(NULL, &encoder_list);
 	});
 	// The group dispatch keeps a reference until it's finished
 	dispatch_release(queue);
@@ -1664,14 +1622,7 @@
 
 	dispatch_group_wait(encoder_list_dispatch_group, DISPATCH_TIME_FOREVER);
 	dispatch_release(encoder_list_dispatch_group);
-	CFIndex size = CFArrayGetCount(encoder_list_const);
-
-	CFMutableArrayRef encoder_list = CFArrayCreateMutableCopy(
-		kCFAllocatorDefault, size, encoder_list_const);
-	CFRelease(encoder_list_const);
-
-	CFArraySortValues(encoder_list, CFRangeMake(0, size),
-			 &compare_encoder_list, NULL);
+	CFIndex size = CFArrayGetCount(encoder_list);
 
 	for (CFIndex i = 0; i < size; i++) {
 		CFDictionaryRef encoder_dict =

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension Added

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/CMakeLists.txt Added

@@ -0,0 +1,56 @@
+foreach(_uuid IN ITEMS VIRTUALCAM_DEVICE_UUID VIRTUALCAM_SOURCE_UUID VIRTUALCAM_SINK_UUID)
+  set(VALID_UUID FALSE)
+  if(NOT ${_uuid})
+    message(AUTHOR_WARNING "macOS Camera Extension UUID '${_uuid}' is not set, but required for extension.")
+    return()
+  else()
+    check_uuid(${${_uuid}} VALID_UUID)
+
+    if(NOT VALID_UUID)
+      message(AUTHOR_WARNING "macos Camera Extension UUID '${_uuid}' is not a valid UUID.")
+      return()
+    endif()
+  endif()
+endforeach()
+
+project(mac-camera-extension LANGUAGES Swift)
+
+set(CMAKE_OSX_DEPLOYMENT_TARGET 13.0)
+
+add_executable(mac-camera-extension)
+add_executable(OBS:mac-camera-extension ALIAS mac-camera-extension)
+
+set(_placeholder_location "${CMAKE_CURRENT_SOURCE_DIR}/../common/data/placeholder.png")
+target_sources(
+  mac-camera-extension PRIVATE "${_placeholder_location}" main.swift OBSCameraDeviceSource.swift
+                               OBSCameraProviderSource.swift OBSCameraStreamSink.swift OBSCameraStreamSource.swift)
+
+set_property(SOURCE "${_placeholder_location}" PROPERTY MACOSX_PACKAGE_LOCATION "Resources")
+source_group("Resources" FILES "${_placeholder_location}")
+
+# cmake-format: off
+set_target_properties_obs(
+  mac-camera-extension
+  PROPERTIES FOLDER plugins
+             OUTPUT_NAME com.obsproject.obs-studio.mac-camera-extension
+             RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../"
+             MACOSX_BUNDLE ON
+             MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
+             BUNDLE_EXTENSION systemextension
+             XCODE_PRODUCT_TYPE com.apple.product-type.system-extension)
+
+string(TIMESTAMP CURRENT_YEAR "%Y")
+set_target_xcode_properties(
+  mac-camera-extension
+  PROPERTIES SWIFT_VERSION 5.0
+             MACOSX_DEPLOYMENT_TARGET 13.0
+             CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist"
+             PRODUCT_NAME com.obsproject.obs-studio.mac-camera-extension
+             PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-studio.mac-camera-extension
+             CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
+             MARKETING_VERSION ${OBS_VERSION_CANONICAL}
+             COPY_PHASE_STRIP NO
+             GENERATE_INFOPLIST_FILE YES
+             INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2022-${CURRENT_YEAR} Sebastian Beckmann, Patrick Heyer"
+             INFOPLIST_KEY_NSSystemExtensionUsageDescription "This Camera Extension enables virtual camera functionality in OBS Studio.")
+# cmake-format: on

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/OBSCameraDeviceSource.swift Added

@@ -0,0 +1,288 @@
+//
+// OBSCameraDeviceSource.swift
+// camera-extension
+//
+// Created by Sebastian Beckmann on 2022-09-30.
+// Changed by Patrick Heyer on 2022-10-16.
+//
+
+import AppKit
+import CoreMediaIO
+import Foundation
+import IOKit.audio
+import os.log
+
+let OBSCameraFrameRate: Int = 60
+
+class OBSCameraDeviceSource: NSObject, CMIOExtensionDeviceSource {
+ private(set) var device: CMIOExtensionDevice!
+
+ private var _streamSource: OBSCameraStreamSource!
+ private var _streamSink: OBSCameraStreamSink!
+
+ private var _streamingCounter: UInt32 = 0
+ private var _streamingSinkCounter: UInt32 = 0
+
+ private var _timer: DispatchSourceTimer?
+
+ private let _timerQueue = DispatchQueue(
+ label: "timerQueue",
+ qos: .userInteractive,
+ attributes: ,
+ autoreleaseFrequency: .workItem,
+ target: .global(qos: .userInteractive)
+ )
+
+ private var _videoDescription: CMFormatDescription!
+ private var _bufferPool: CVPixelBufferPool!
+ private var _bufferAuxAttributes: NSDictionary!
+
+ private var _placeholderImage: NSImage!
+
+ init(localizedName: String, deviceUUID: UUID, sourceUUID: UUID, sinkUUID: UUID) {
+ super.init()
+
+ self.device = CMIOExtensionDevice(
+ localizedName: localizedName,
+ deviceID: deviceUUID,
+ legacyDeviceID: nil,
+ source: self
+ )
+
+ let dimensions = CMVideoDimensions(width: 1920, height: 1080)
+ CMVideoFormatDescriptionCreate(
+ allocator: kCFAllocatorDefault,
+ codecType: kCVPixelFormatType_32BGRA,
+ width: dimensions.width,
+ height: dimensions.height,
+ extensions: nil,
+ formatDescriptionOut: &_videoDescription
+ )
+
+ let pixelBufferAttributes: NSDictionary = 
+ kCVPixelBufferWidthKey: dimensions.width,
+ kCVPixelBufferHeightKey: dimensions.height,
+ kCVPixelBufferPixelFormatTypeKey: _videoDescription.mediaSubType,
+ kCVPixelBufferIOSurfacePropertiesKey: CFString: CFTypeRef(),
+ 
+
+ CVPixelBufferPoolCreate(kCFAllocatorDefault, nil, pixelBufferAttributes, &_bufferPool)
+
+ let videoStreamFormat = CMIOExtensionStreamFormat.init(
+ formatDescription: _videoDescription,
+ maxFrameDuration: CMTime(value: 1, timescale: Int32(OBSCameraFrameRate)),
+ minFrameDuration: CMTime(value: 1, timescale: Int32(OBSCameraFrameRate)),
+ validFrameDurations: nil
+ )
+ _bufferAuxAttributes = kCVPixelBufferPoolAllocationThresholdKey: 5
+
+ _streamSource = OBSCameraStreamSource(
+ localizedName: "OBS Camera Extension Stream Source",
+ streamID: sourceUUID,
+ streamFormat: videoStreamFormat,
+ device: device
+ )
+
+ _streamSink = OBSCameraStreamSink(
+ localizedName: "OBS Camera Extension Stream Sink",
+ streamID: sinkUUID,
+ streamFormat: videoStreamFormat,
+ device: device
+ )
+
+ do {
+ try device.addStream(_streamSource.stream)
+ try device.addStream(_streamSink.stream)
+ } catch let error {
+ fatalError("Failed to add stream: \(error.localizedDescription)")
+ }
+
+ let placeholderURL = Bundle.main.url(forResource: "placeholder", withExtension: "png")
+ if let placeholderURL = placeholderURL {
+ if let image = NSImage(contentsOf: placeholderURL) {
+ _placeholderImage = image
+ } else {
+ fatalError("Unable to create NSImage from placeholder image in bundle resources")
+ }
+ } else {
+ fatalError("Unable to find placeholder image in bundle resources")
+ }
+ }
+
+ var availableProperties: Set<CMIOExtensionProperty> {
+ return .deviceTransportType, .deviceModel
+ }
+
+ func deviceProperties(forProperties properties: Set<CMIOExtensionProperty>) throws
+ -> CMIOExtensionDeviceProperties
+ {
+ let deviceProperties = CMIOExtensionDeviceProperties(dictionary: :)
+ if properties.contains(.deviceTransportType) {
+ deviceProperties.transportType = kIOAudioDeviceTransportTypeVirtual
+ }
+ if properties.contains(.deviceModel) {
+ deviceProperties.model = "OBS Camera Extension"
+ }
+
+ return deviceProperties
+ }
+
+ func setDeviceProperties(_ deviceProperties: CMIOExtensionDeviceProperties) throws {
+ }
+
+ func startStreaming() {
+ guard let _ = _bufferPool else {
+ return
+ }
+
+ _streamingCounter += 1
+
+ _timer = DispatchSource.makeTimerSource(flags: .strict, queue: _timerQueue)
+
+ _timer!.schedule(
+ deadline: .now(),
+ repeating: 1.0 / Double(OBSCameraFrameRate),
+ leeway: .seconds(0)
+ )
+
+ _timer!.setEventHandler {
+ if self.sinkStarted {
+ return
+ }
+
+ var error: CVReturn = noErr
+ var pixelBuffer: CVPixelBuffer?
+ error = CVPixelBufferPoolCreatePixelBufferWithAuxAttributes(
+ kCFAllocatorDefault,
+ self._bufferPool,
+ self._bufferAuxAttributes,
+ &pixelBuffer
+ )
+
+ if error == kCVReturnPoolAllocationFailed {
+ os_log(.error, "no available PixelBuffers in PixelBufferPool: \(error)")
+ }
+
+ if let pixelBuffer = pixelBuffer {
+ CVPixelBufferLockBaseAddress(pixelBuffer, )
+
+ let bufferPointer = CVPixelBufferGetBaseAddress(pixelBuffer)!
+
+ let width = CVPixelBufferGetWidth(pixelBuffer)
+ let height = CVPixelBufferGetHeight(pixelBuffer)
+ let rowBytes = CVPixelBufferGetBytesPerRow(pixelBuffer)
+
+ let cgContext = CGContext(
+ data: bufferPointer,
+ width: width,
+ height: height,
+ bitsPerComponent: 8,
+ bytesPerRow: rowBytes,
+ space: CGColorSpaceCreateDeviceRGB(),
+ bitmapInfo: CGImageAlphaInfo.noneSkipFirst.rawValue | CGBitmapInfo.byteOrder32Little.rawValue
+ )!
+ let graphicsContext = NSGraphicsContext(cgContext: cgContext, flipped: false)
+
+ NSGraphicsContext.saveGraphicsState()
+ NSGraphicsContext.current = graphicsContext
+ self._placeholderImage.draw(in: CGRect(x: 0, y: 0, width: width, height: height))
+ NSGraphicsContext.restoreGraphicsState()
+
+ CVPixelBufferUnlockBaseAddress(pixelBuffer, )
+
+ var sampleBuffer: CMSampleBuffer!
+ var timingInfo = CMSampleTimingInfo()
+
+ timingInfo.presentationTimeStamp = CMClockGetTime(CMClockGetHostTimeClock())
+
+ error = CMSampleBufferCreateForImageBuffer(
+ allocator: kCFAllocatorDefault,
+ imageBuffer: pixelBuffer,
+ dataReady: true,
+ makeDataReadyCallback: nil,
+ refcon: nil,
+ formatDescription: self._videoDescription,
+ sampleTiming: &timingInfo,
+ sampleBufferOut: &sampleBuffer
+ )
+
+ if error == noErr {
+ self._streamSource.stream.send(
+ sampleBuffer,
+ discontinuity: ,
+ hostTimeInNanoseconds: UInt64(
+ timingInfo.presentationTimeStamp.seconds * Double(NSEC_PER_SEC)
+ )
+ )
+ }
+ }
+ }
+ _timer!.setCancelHandler {}
+
+ _timer!.resume()
+ }
+
+ func stopStreaming() {
+ if _streamingCounter > 1 {
+ _streamingCounter -= 1
+ } else {
+ _streamingCounter = 0
+
+ if let timer = _timer {
+ timer.cancel()
+ _timer = nil
+ }
+ }
+ }
+
+ var sinkStarted = false
+ var lastTimingInfo = CMSampleTimingInfo()
+
+ func consumeBuffer(_ client: CMIOExtensionClient) {
+ if !sinkStarted {
+ return
+ }
+
+ self._streamSink.stream.consumeSampleBuffer(from: client) {
+ sampleBuffer, sequenceNumber, discontinuity, hasMoreSampleBuffers, error in
+ if sampleBuffer != nil {
+ self.lastTimingInfo.presentationTimeStamp = CMClockGetTime(
+ CMClockGetHostTimeClock())
+ let output: CMIOExtensionScheduledOutput = CMIOExtensionScheduledOutput(
+ sequenceNumber: sequenceNumber,
+ hostTimeInNanoseconds: UInt64(
+ self.lastTimingInfo.presentationTimeStamp.seconds * Double(NSEC_PER_SEC)
+ )
+ )
+
+ if self._streamingCounter > 0 {
+ self._streamSource.stream.send(
+ sampleBuffer!,
+ discontinuity: ,
+ hostTimeInNanoseconds: UInt64(
+ sampleBuffer!.presentationTimeStamp.seconds * Double(NSEC_PER_SEC)
+ )
+ )
+ }
+
+ self._streamSink.stream.notifyScheduledOutputChanged(output)
+ }
+ self.consumeBuffer(client)
+ }
+ }
+
+ func startStreamingSink(client: CMIOExtensionClient) {
+ _streamingSinkCounter += 1
+ self.sinkStarted = true
+ consumeBuffer(client)
+ }
+
+ func stopStreamingSink() {
+ self.sinkStarted = false
+ if _streamingCounter > 1 {
+ _streamingSinkCounter -= 1
+ } else {
+ _streamingSinkCounter = 0
+ }
+ }
+}

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/OBSCameraProviderSource.swift Added

@@ -0,0 +1,61 @@
+//
+// OBSCameraProviderSource.swift
+// camera-extension
+//
+// Created by Sebastian Beckmann on 2022-09-30.
+// Changed by Patrick Heyer on 2022-10-16.
+//
+
+import CoreMediaIO
+import Foundation
+
+class OBSCameraProviderSource: NSObject, CMIOExtensionProviderSource {
+ private(set) var provider: CMIOExtensionProvider!
+
+ private var deviceSource: OBSCameraDeviceSource!
+
+ init(clientQueue: DispatchQueue?, deviceUUID: UUID, sourceUUID: UUID, sinkUUID: UUID) {
+ super.init()
+
+ provider = CMIOExtensionProvider(source: self, clientQueue: clientQueue)
+ deviceSource = OBSCameraDeviceSource(
+ localizedName: "OBS Virtual Camera",
+ deviceUUID: deviceUUID,
+ sourceUUID: sourceUUID,
+ sinkUUID: sinkUUID)
+ do {
+ try provider.addDevice(deviceSource.device)
+ } catch let error {
+ fatalError("Failed to add device \(error.localizedDescription)")
+ }
+ }
+
+ func connect(to client: CMIOExtensionClient) throws {
+ }
+
+ func disconnect(from client: CMIOExtensionClient) {
+ }
+
+ var availableProperties: Set<CMIOExtensionProperty> {
+ return .providerName, .providerManufacturer
+ }
+
+ func providerProperties(forProperties properties: Set<CMIOExtensionProperty>) throws
+ -> CMIOExtensionProviderProperties
+ {
+ let providerProperties = CMIOExtensionProviderProperties(dictionary: :)
+
+ if properties.contains(.providerName) {
+ providerProperties.name = "OBS Camera Extension Provider"
+ }
+
+ if properties.contains(.providerManufacturer) {
+ providerProperties.manufacturer = "OBS Project"
+ }
+
+ return providerProperties
+ }
+
+ func setProviderProperties(_ providerProperties: CMIOExtensionProviderProperties) throws {
+ }
+}

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/OBSCameraStreamSink.swift Added

@@ -0,0 +1,111 @@
+//
+// OBSCameraStreamSink.swift
+// camera-extension
+//
+// Created by Sebastian Beckmann on 2022-09-30.
+// Changed by Patrick Heyer on 2022-10-16.
+//
+
+import CoreMediaIO
+import Foundation
+import os.log
+
+class OBSCameraStreamSink: NSObject, CMIOExtensionStreamSource {
+ private(set) var stream: CMIOExtensionStream!
+
+ let device: CMIOExtensionDevice
+
+ private let _streamFormat: CMIOExtensionStreamFormat
+
+ init(
+ localizedName: String, streamID: UUID, streamFormat: CMIOExtensionStreamFormat,
+ device: CMIOExtensionDevice
+ ) {
+ self.device = device
+ self._streamFormat = streamFormat
+ super.init()
+ self.stream = CMIOExtensionStream(
+ localizedName: localizedName,
+ streamID: streamID,
+ direction: .sink,
+ clockType: .hostTime,
+ source: self
+ )
+ }
+
+ var formats: CMIOExtensionStreamFormat {
+ return _streamFormat
+ }
+
+ var activeFormatIndex: Int = 0 {
+ didSet {
+ if activeFormatIndex >= 1 {
+ os_log(.error, "Invalid index")
+ }
+ }
+ }
+
+ var availableProperties: Set<CMIOExtensionProperty> {
+ return 
+ .streamActiveFormatIndex,
+ .streamFrameDuration,
+ .streamSinkBufferQueueSize,
+ .streamSinkBuffersRequiredForStartup,
+ .streamSinkBufferUnderrunCount,
+ .streamSinkEndOfData,
+ 
+ }
+
+ var client: CMIOExtensionClient?
+
+ func streamProperties(forProperties properties: Set<CMIOExtensionProperty>) throws
+ -> CMIOExtensionStreamProperties
+ {
+ let streamProperties = CMIOExtensionStreamProperties(dictionary: :)
+
+ if properties.contains(.streamActiveFormatIndex) {
+ streamProperties.activeFormatIndex = 0
+ }
+ if properties.contains(.streamFrameDuration) {
+ let frameDuration = CMTime(value: 1, timescale: Int32(OBSCameraFrameRate))
+ streamProperties.frameDuration = frameDuration
+ }
+ if properties.contains(.streamSinkBufferQueueSize) {
+ streamProperties.sinkBufferQueueSize = 1
+ }
+ if properties.contains(.streamSinkBuffersRequiredForStartup) {
+ streamProperties.sinkBuffersRequiredForStartup = 1
+ }
+
+ return streamProperties
+ }
+
+ func setStreamProperties(_ streamProperties: CMIOExtensionStreamProperties) throws {
+ if let activeFormatIndex = streamProperties.activeFormatIndex {
+ self.activeFormatIndex = activeFormatIndex
+ }
+ }
+
+ func authorizedToStartStream(for client: CMIOExtensionClient) -> Bool {
+ self.client = client
+ return true
+ }
+
+ func startStream() throws {
+ guard let deviceSource = device.source as? OBSCameraDeviceSource else {
+ fatalError("Unexpected source type \(String(describing: device.source))")
+ }
+
+ if let client = client {
+ deviceSource.startStreamingSink(client: client)
+ }
+ }
+
+ func stopStream() throws {
+ guard let deviceSource = device.source as? OBSCameraDeviceSource else {
+ fatalError("Unexpected source type \(String(describing: device.source))")
+ }
+
+ deviceSource.stopStreamingSink()
+ }
+}

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/OBSCameraStreamSource.swift Added

@@ -0,0 +1,92 @@
+//
+// OBSCameraStreamSource.swift
+// camera-extension
+//
+// Created by Sebastian Beckmann on 2022-09-30.
+// Changed by Patrick Heyer on 2022-10-16.
+//
+
+import CoreMediaIO
+import Foundation
+import os.log
+
+class OBSCameraStreamSource: NSObject, CMIOExtensionStreamSource {
+ private(set) var stream: CMIOExtensionStream!
+
+ let device: CMIOExtensionDevice
+
+ private let _streamFormat: CMIOExtensionStreamFormat
+
+ init(
+ localizedName: String, streamID: UUID, streamFormat: CMIOExtensionStreamFormat,
+ device: CMIOExtensionDevice
+ ) {
+ self.device = device
+ self._streamFormat = streamFormat
+ super.init()
+ self.stream = CMIOExtensionStream(
+ localizedName: localizedName,
+ streamID: streamID,
+ direction: .source,
+ clockType: .hostTime,
+ source: self
+ )
+ }
+
+ var formats: CMIOExtensionStreamFormat {
+ return _streamFormat
+ }
+
+ var activeFormatIndex: Int = 0 {
+ didSet {
+ if activeFormatIndex >= 1 {
+ os_log(.error, "Invalid index")
+ }
+ }
+ }
+
+ var availableProperties: Set<CMIOExtensionProperty> {
+ return .streamActiveFormatIndex, .streamFrameDuration
+ }
+
+ func streamProperties(forProperties properties: Set<CMIOExtensionProperty>) throws
+ -> CMIOExtensionStreamProperties
+ {
+ let streamProperties = CMIOExtensionStreamProperties(dictionary: :)
+
+ if properties.contains(.streamActiveFormatIndex) {
+ streamProperties.activeFormatIndex = 0
+ }
+ if properties.contains(.streamFrameDuration) {
+ let frameDuration = CMTime(value: 1, timescale: Int32(OBSCameraFrameRate))
+ streamProperties.frameDuration = frameDuration
+ }
+
+ return streamProperties
+ }
+
+ func setStreamProperties(_ streamProperties: CMIOExtensionStreamProperties) throws {
+ if let activeFormatIndex = streamProperties.activeFormatIndex {
+ self.activeFormatIndex = activeFormatIndex
+ }
+ }
+
+ func authorizedToStartStream(for client: CMIOExtensionClient) -> Bool {
+ return true
+ }
+
+ func startStream() throws {
+ guard let deviceSource = device.source as? OBSCameraDeviceSource else {
+ fatalError("Unexpected source type \(String(describing: device.source))")
+ }
+
+ deviceSource.startStreaming()
+ }
+
+ func stopStream() throws {
+ guard let deviceSource = device.source as? OBSCameraDeviceSource else {
+ fatalError("Unexpcted source type \(String(describing: device.source))")
+ }
+ deviceSource.stopStreaming()
+ }
+}

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/cmake Added

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/cmake/macos Added

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/cmake/macos/Info.plist.in Added

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/cmake/macos/entitlements.plist Added

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/camera-extension/main.swift Added

@@ -0,0 +1,32 @@
+//
+//  main.swift
+//  camera-extension
+//
+//  Created by Sebastian Beckmann on 2022-09-30.
+//  Changed by Patrick Heyer on 2022-10-16.
+//
+
+import CoreMediaIO
+import Foundation
+import os.log
+
+let OBSCameraDeviceUUID = Bundle.main.object(forInfoDictionaryKey: "OBSCameraDeviceUUID") as? String
+let OBSCameraSourceUUID = Bundle.main.object(forInfoDictionaryKey: "OBSCameraSourceUUID") as? String
+let OBSCameraSinkUUID = Bundle.main.object(forInfoDictionaryKey: "OBSCameraSinkUUID") as? String
+
+guard let OBSCameraDeviceUUID = OBSCameraDeviceUUID, let OBSCameraSourceUUID = OBSCameraSourceUUID,
+    let OBSCameraSinkUUID = OBSCameraSinkUUID
+else {
+    fatalError("Unable to retrieve Camera Extension UUIDs from Info.plist.")
+}
+
+guard let deviceUUID = UUID(uuidString: OBSCameraDeviceUUID), let sourceUUID = UUID(uuidString: OBSCameraSourceUUID),
+    let sinkUUID = UUID(uuidString: OBSCameraSinkUUID)
+else {
+    fatalError("Unable to generate Camera Extension UUIDs from Info.plist values.")
+}
+
+let providerSource = OBSCameraProviderSource(
+    clientQueue: nil, deviceUUID: deviceUUID, sourceUUID: sourceUUID, sinkUUID: sinkUUID)
+CMIOExtensionProvider.startService(provider: providerSource.provider)
+CFRunLoopRun()

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/CMSampleBufferUtils.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/CMSampleBufferUtils.mm Changed

@@ -7,22 +7,19 @@
 
 #import "CMSampleBufferUtils.h"
 
-CMSampleTimingInfo CMSampleTimingInfoForTimestamp(uint64_t timestampNanos,
-						  uint32_t fpsNumerator,
-						  uint32_t fpsDenominator)
+CMSampleTimingInfo CMSampleTimingInfoForTimestamp(uint64_t timestampNanos, uint32_t fpsNumerator,
+                                                  uint32_t fpsDenominator)
 {
-	// The timing here is quite important. For frames to be delivered correctly and successfully be recorded by apps
-	// like QuickTime Player, we need to be accurate in both our timestamps _and_ have a sensible scale. Using large
-	// timestamps and scales like clock_gettime_nsec_np() and NSEC_PER_SEC will work for display, but will error out
-	// when trying to record.
-	//
-	// 600 is a common default in Apple's docs https://developer.apple.com/documentation/avfoundation/avmutablemovie/1390622-timescale
-	CMTimeScale scale = 600;
-	CMSampleTimingInfo timing;
-	timing.duration =
-		CMTimeMake(fpsDenominator * scale, fpsNumerator * scale);
-	timing.presentationTimeStamp = CMTimeMakeWithSeconds(
-		timestampNanos / (double)NSEC_PER_SEC, scale);
-	timing.decodeTimeStamp = kCMTimeInvalid;
-	return timing;
+    // The timing here is quite important. For frames to be delivered correctly and successfully be recorded by apps
+    // like QuickTime Player, we need to be accurate in both our timestamps _and_ have a sensible scale. Using large
+    // timestamps and scales like clock_gettime_nsec_np() and NSEC_PER_SEC will work for display, but will error out
+    // when trying to record.
+    //
+    // 600 is a common default in Apple's docs https://developer.apple.com/documentation/avfoundation/avmutablemovie/1390622-timescale
+    CMTimeScale scale = 600;
+    CMSampleTimingInfo timing;
+    timing.duration = CMTimeMake(fpsDenominator * scale, fpsNumerator * scale);
+    timing.presentationTimeStamp = CMTimeMakeWithSeconds(timestampNanos / (double) NSEC_PER_SEC, scale);
+    timing.decodeTimeStamp = kCMTimeInvalid;
+    return timing;
 }

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt Changed

@@ -1,13 +1,4 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
-legacy_check()
-
-find_library(COCOA Cocoa)
-find_library(COREMEDIA CoreMedia)
-find_library(COREMEDIAIO CoreMediaIO)
-find_library(COREVIDEO CoreVideo)
-find_library(IOSURFACE IOSurface)
-mark_as_advanced(COCOA COREMEDIA COREMEDIAIO COREVIDEO IOSURFACE)
+cmake_minimum_required(VERSION 3.24...3.25)
 
 add_library(obs-dal-plugin MODULE)
 add_library(OBS::dal-plugin ALIAS obs-dal-plugin)
@@ -41,23 +32,38 @@
 set_property(SOURCE "${_placeholder_location}" PROPERTY MACOSX_PACKAGE_LOCATION "Resources")
 source_group("Resources" FILES "${_placeholder_location}")
 
-target_link_libraries(obs-dal-plugin PRIVATE OBS::mach-protocol ${COCOA} ${COREMEDIA} ${COREMEDIAIO} ${COREVIDEO}
- ${IOSURFACE})
+# cmake-format: off
+target_link_libraries(
+ obs-dal-plugin
+ PRIVATE OBS::mach-protocol
+ "$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreMedia.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreMediaIO.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,CoreVideo.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,IOSurface.framework>")
 
 set_target_properties_obs(
 obs-dal-plugin
 PROPERTIES OUTPUT_NAME obs-mac-virtualcam
 FOLDER plugins
- PREFIX "")
+ PREFIX ""
+ BUNDLE TRUE BUNDLE_EXTENSION plugin MACOSX_BUNDLE_INFO_PLIST
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
+ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../")
+
+set_property(TARGET obs-dal-plugin PROPERTY OSX_ARCHITECTURES x86_64 arm64)
 
-set_target_properties(
+string(TIMESTAMP CURRENT_YEAR "%Y")
+set_target_xcode_properties(
 obs-dal-plugin
- PROPERTIES BUNDLE ON
- BUNDLE_EXTENSION plugin
- OSX_ARCHITECTURES "x86_64;arm64;arm64e"
- LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../"
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
- XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
- XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-mac-virtualcam
- XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION YES
- XCODE_ATTRIBUTE_GCC_WARN_SHADOW YES)
+ PROPERTIES CLANG_ENABLE_OBJC_ARC YES
+ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION YES
+ GCC_WARN_SHADOW YES
+ PRODUCT_NAME obs-mac-virtualcam
+ PRODUCT_BUNDLE_IDENTIFIER com.obsproject.obs-mac-virtualcam
+ CURRENT_PROJECT_VERSION ${OBS_BUILD_NUMBER}
+ MARKETING_VERSION ${OBS_VERSION_CANONICAL}
+ GENERATE_INFOPLIST_FILE YES
+ INFOPLIST_KEY_CFBundleDisplayName obs-mac-virtualcam
+ INFOPLIST_KEY_NSHumanReadableCopyright "(c) 2020-${CURRENT_YEAR} John Boiles, Patrick Heyer, Sebastian Beckmann")
+# cmake-format: on

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/Defines.h -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/Defines.h Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/Logging.h -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/Logging.h Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALDevice.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALDevice.mm Changed

@@ -33,247 +33,240 @@
 
 // Note that the DAL's API calls HasProperty before calling GetPropertyDataSize. This means that it can be assumed that address is valid for the property involved.
 - (UInt32)getPropertyDataSizeWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-			 qualifierData:(nonnull const void *)qualifierData
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
 {
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ return sizeof(CFStringRef);
+ case kCMIOObjectPropertyManufacturer:
+ return sizeof(CFStringRef);
+ case kCMIOObjectPropertyElementCategoryName:
+ return sizeof(CFStringRef);
+ case kCMIOObjectPropertyElementNumberName:
+ return sizeof(CFStringRef);
+ case kCMIODevicePropertyPlugIn:
+ return sizeof(CMIOObjectID);
+ case kCMIODevicePropertyDeviceUID:
+ return sizeof(CFStringRef);
+ case kCMIODevicePropertyModelUID:
+ return sizeof(CFStringRef);
+ case kCMIODevicePropertyTransportType:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyDeviceIsAlive:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyDeviceHasChanged:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyDeviceIsRunning:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyDeviceIsRunningSomewhere:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyDeviceCanBeDefaultDevice:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyHogMode:
+ return sizeof(pid_t);
+ case kCMIODevicePropertyLatency:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyStreams:
+ // Only one stream
+ return sizeof(CMIOStreamID) * 1;
+ case kCMIODevicePropertyStreamConfiguration:
+ // Only one stream
+ return sizeof(UInt32) + (sizeof(UInt32) * 1);
+ case kCMIODevicePropertyExcludeNonDALAccess:
+ return sizeof(UInt32);
+ case kCMIODevicePropertyCanProcessAVCCommand:
+ return sizeof(Boolean);
+ case kCMIODevicePropertyCanProcessRS422Command:
+ return sizeof(Boolean);
+ case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
+ return sizeof(CFStringRef);
+ case kCMIODevicePropertyDeviceMaster:
+ return sizeof(pid_t);
+ default:
+ break;
+ };
 
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-		return sizeof(CFStringRef);
-	case kCMIOObjectPropertyManufacturer:
-		return sizeof(CFStringRef);
-	case kCMIOObjectPropertyElementCategoryName:
-		return sizeof(CFStringRef);
-	case kCMIOObjectPropertyElementNumberName:
-		return sizeof(CFStringRef);
-	case kCMIODevicePropertyPlugIn:
-		return sizeof(CMIOObjectID);
-	case kCMIODevicePropertyDeviceUID:
-		return sizeof(CFStringRef);
-	case kCMIODevicePropertyModelUID:
-		return sizeof(CFStringRef);
-	case kCMIODevicePropertyTransportType:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyDeviceIsAlive:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyDeviceHasChanged:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyDeviceIsRunning:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyDeviceIsRunningSomewhere:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyDeviceCanBeDefaultDevice:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyHogMode:
-		return sizeof(pid_t);
-	case kCMIODevicePropertyLatency:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyStreams:
-		// Only one stream
-		return sizeof(CMIOStreamID) * 1;
-	case kCMIODevicePropertyStreamConfiguration:
-		// Only one stream
-		return sizeof(UInt32) + (sizeof(UInt32) * 1);
-	case kCMIODevicePropertyExcludeNonDALAccess:
-		return sizeof(UInt32);
-	case kCMIODevicePropertyCanProcessAVCCommand:
-		return sizeof(Boolean);
-	case kCMIODevicePropertyCanProcessRS422Command:
-		return sizeof(Boolean);
-	case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
-		return sizeof(CFStringRef);
-	case kCMIODevicePropertyDeviceMaster:
-		return sizeof(pid_t);
-	default:
-		break;
-	};
-
-	return 0;
+ return 0;
 }
 
 // Note that the DAL's API calls HasProperty before calling GetPropertyData. This means that it can be assumed that address is valid for the property involved.
 - (void)getPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		 qualifierData:(nonnull const void *)qualifierData
-			 dataSize:(UInt32)dataSize
-			 dataUsed:(nonnull UInt32 *)dataUsed
-			 data:(nonnull void *)data
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
+ dataSize:(UInt32)dataSize
+ dataUsed:(nonnull UInt32 *)dataUsed
+ data:(nonnull void *)data
 {
-
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-		*static_cast<CFStringRef *>(data) = CFSTR("OBS Virtual Camera");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIOObjectPropertyManufacturer:
-		*static_cast<CFStringRef *>(data) = CFSTR("John Boiles");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIOObjectPropertyElementCategoryName:
-		*static_cast<CFStringRef *>(data) = CFSTR("Virtual Camera");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIOObjectPropertyElementNumberName:
-		*static_cast<CFStringRef *>(data) = CFSTR("0001");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIODevicePropertyPlugIn:
-		*static_cast<CMIOObjectID *>(data) = self.pluginId;
-		*dataUsed = sizeof(CMIOObjectID);
-		break;
-	case kCMIODevicePropertyDeviceUID:
-		*static_cast<CFStringRef *>(data) =
-			CFSTR("obs-virtual-cam-device");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIODevicePropertyModelUID:
-		*static_cast<CFStringRef *>(data) =
-			CFSTR("obs-virtual-cam-model");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIODevicePropertyTransportType:
-		*static_cast<UInt32 *>(data) =
-			kIOAudioDeviceTransportTypeBuiltIn;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyDeviceIsAlive:
-		*static_cast<UInt32 *>(data) = 1;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyDeviceHasChanged:
-		*static_cast<UInt32 *>(data) = 0;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyDeviceIsRunning:
-		*static_cast<UInt32 *>(data) = 1;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyDeviceIsRunningSomewhere:
-		*static_cast<UInt32 *>(data) = 1;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyDeviceCanBeDefaultDevice:
-		*static_cast<UInt32 *>(data) = 1;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyHogMode:
-		*static_cast<pid_t *>(data) = -1;
-		*dataUsed = sizeof(pid_t);
-		break;
-	case kCMIODevicePropertyLatency:
-		*static_cast<UInt32 *>(data) = 0;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyStreams:
-		*static_cast<CMIOObjectID *>(data) = self.streamId;
-		*dataUsed = sizeof(CMIOObjectID);
-		break;
-	case kCMIODevicePropertyStreamConfiguration:
-		DLog(@"TODO kCMIODevicePropertyStreamConfiguration");
-		break;
-	case kCMIODevicePropertyExcludeNonDALAccess:
-		*static_cast<UInt32 *>(data) = self.excludeNonDALAccess ? 1 : 0;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIODevicePropertyCanProcessAVCCommand:
-		*static_cast<Boolean *>(data) = false;
-		*dataUsed = sizeof(Boolean);
-		break;
-	case kCMIODevicePropertyCanProcessRS422Command:
-		*static_cast<Boolean *>(data) = false;
-		*dataUsed = sizeof(Boolean);
-		break;
-	case kCMIODevicePropertyDeviceMaster:
-		*static_cast<pid_t *>(data) = self.masterPid;
-		*dataUsed = sizeof(pid_t);
-		break;
-	default:
-		break;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ *static_cast<CFStringRef *>(data) = CFSTR("OBS Virtual Camera");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIOObjectPropertyManufacturer:
+ *static_cast<CFStringRef *>(data) = CFSTR("John Boiles");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIOObjectPropertyElementCategoryName:
+ *static_cast<CFStringRef *>(data) = CFSTR("Virtual Camera");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIOObjectPropertyElementNumberName:
+ *static_cast<CFStringRef *>(data) = CFSTR("0001");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIODevicePropertyPlugIn:
+ *static_cast<CMIOObjectID *>(data) = self.pluginId;
+ *dataUsed = sizeof(CMIOObjectID);
+ break;
+ case kCMIODevicePropertyDeviceUID:
+ *static_cast<CFStringRef *>(data) = CFSTR("obs-virtual-cam-device");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIODevicePropertyModelUID:
+ *static_cast<CFStringRef *>(data) = CFSTR("obs-virtual-cam-model");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIODevicePropertyTransportType:
+ *static_cast<UInt32 *>(data) = kIOAudioDeviceTransportTypeBuiltIn;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyDeviceIsAlive:
+ *static_cast<UInt32 *>(data) = 1;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyDeviceHasChanged:
+ *static_cast<UInt32 *>(data) = 0;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyDeviceIsRunning:
+ *static_cast<UInt32 *>(data) = 1;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyDeviceIsRunningSomewhere:
+ *static_cast<UInt32 *>(data) = 1;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyDeviceCanBeDefaultDevice:
+ *static_cast<UInt32 *>(data) = 1;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyHogMode:
+ *static_cast<pid_t *>(data) = -1;
+ *dataUsed = sizeof(pid_t);
+ break;
+ case kCMIODevicePropertyLatency:
+ *static_cast<UInt32 *>(data) = 0;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyStreams:
+ *static_cast<CMIOObjectID *>(data) = self.streamId;
+ *dataUsed = sizeof(CMIOObjectID);
+ break;
+ case kCMIODevicePropertyStreamConfiguration:
+ DLog(@"TODO kCMIODevicePropertyStreamConfiguration");
+ break;
+ case kCMIODevicePropertyExcludeNonDALAccess:
+ *static_cast<UInt32 *>(data) = self.excludeNonDALAccess ? 1 : 0;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIODevicePropertyCanProcessAVCCommand:
+ *static_cast<Boolean *>(data) = false;
+ *dataUsed = sizeof(Boolean);
+ break;
+ case kCMIODevicePropertyCanProcessRS422Command:
+ *static_cast<Boolean *>(data) = false;
+ *dataUsed = sizeof(Boolean);
+ break;
+ case kCMIODevicePropertyDeviceMaster:
+ *static_cast<pid_t *>(data) = self.masterPid;
+ *dataUsed = sizeof(pid_t);
+ break;
+ default:
+ break;
+ };
 }
 
 - (BOOL)hasPropertyWithAddress:(CMIOObjectPropertyAddress)address
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-	case kCMIOObjectPropertyManufacturer:
-	case kCMIOObjectPropertyElementCategoryName:
-	case kCMIOObjectPropertyElementNumberName:
-	case kCMIODevicePropertyPlugIn:
-	case kCMIODevicePropertyDeviceUID:
-	case kCMIODevicePropertyModelUID:
-	case kCMIODevicePropertyTransportType:
-	case kCMIODevicePropertyDeviceIsAlive:
-	case kCMIODevicePropertyDeviceHasChanged:
-	case kCMIODevicePropertyDeviceIsRunning:
-	case kCMIODevicePropertyDeviceIsRunningSomewhere:
-	case kCMIODevicePropertyDeviceCanBeDefaultDevice:
-	case kCMIODevicePropertyHogMode:
-	case kCMIODevicePropertyLatency:
-	case kCMIODevicePropertyStreams:
-	case kCMIODevicePropertyExcludeNonDALAccess:
-	case kCMIODevicePropertyCanProcessAVCCommand:
-	case kCMIODevicePropertyCanProcessRS422Command:
-	case kCMIODevicePropertyDeviceMaster:
-		return true;
-	case kCMIODevicePropertyStreamConfiguration:
-	case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
-		return false;
-	default:
-		return false;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ case kCMIOObjectPropertyManufacturer:
+ case kCMIOObjectPropertyElementCategoryName:
+ case kCMIOObjectPropertyElementNumberName:
+ case kCMIODevicePropertyPlugIn:
+ case kCMIODevicePropertyDeviceUID:
+ case kCMIODevicePropertyModelUID:
+ case kCMIODevicePropertyTransportType:
+ case kCMIODevicePropertyDeviceIsAlive:
+ case kCMIODevicePropertyDeviceHasChanged:
+ case kCMIODevicePropertyDeviceIsRunning:
+ case kCMIODevicePropertyDeviceIsRunningSomewhere:
+ case kCMIODevicePropertyDeviceCanBeDefaultDevice:
+ case kCMIODevicePropertyHogMode:
+ case kCMIODevicePropertyLatency:
+ case kCMIODevicePropertyStreams:
+ case kCMIODevicePropertyExcludeNonDALAccess:
+ case kCMIODevicePropertyCanProcessAVCCommand:
+ case kCMIODevicePropertyCanProcessRS422Command:
+ case kCMIODevicePropertyDeviceMaster:
+ return true;
+ case kCMIODevicePropertyStreamConfiguration:
+ case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
+ return false;
+ default:
+ return false;
+ };
 }
 
 - (BOOL)isPropertySettableWithAddress:(CMIOObjectPropertyAddress)address
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-	case kCMIOObjectPropertyManufacturer:
-	case kCMIOObjectPropertyElementCategoryName:
-	case kCMIOObjectPropertyElementNumberName:
-	case kCMIODevicePropertyPlugIn:
-	case kCMIODevicePropertyDeviceUID:
-	case kCMIODevicePropertyModelUID:
-	case kCMIODevicePropertyTransportType:
-	case kCMIODevicePropertyDeviceIsAlive:
-	case kCMIODevicePropertyDeviceHasChanged:
-	case kCMIODevicePropertyDeviceIsRunning:
-	case kCMIODevicePropertyDeviceIsRunningSomewhere:
-	case kCMIODevicePropertyDeviceCanBeDefaultDevice:
-	case kCMIODevicePropertyHogMode:
-	case kCMIODevicePropertyLatency:
-	case kCMIODevicePropertyStreams:
-	case kCMIODevicePropertyStreamConfiguration:
-	case kCMIODevicePropertyCanProcessAVCCommand:
-	case kCMIODevicePropertyCanProcessRS422Command:
-	case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
-		return false;
-	case kCMIODevicePropertyExcludeNonDALAccess:
-	case kCMIODevicePropertyDeviceMaster:
-		return true;
-	default:
-		return false;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ case kCMIOObjectPropertyManufacturer:
+ case kCMIOObjectPropertyElementCategoryName:
+ case kCMIOObjectPropertyElementNumberName:
+ case kCMIODevicePropertyPlugIn:
+ case kCMIODevicePropertyDeviceUID:
+ case kCMIODevicePropertyModelUID:
+ case kCMIODevicePropertyTransportType:
+ case kCMIODevicePropertyDeviceIsAlive:
+ case kCMIODevicePropertyDeviceHasChanged:
+ case kCMIODevicePropertyDeviceIsRunning:
+ case kCMIODevicePropertyDeviceIsRunningSomewhere:
+ case kCMIODevicePropertyDeviceCanBeDefaultDevice:
+ case kCMIODevicePropertyHogMode:
+ case kCMIODevicePropertyLatency:
+ case kCMIODevicePropertyStreams:
+ case kCMIODevicePropertyStreamConfiguration:
+ case kCMIODevicePropertyCanProcessAVCCommand:
+ case kCMIODevicePropertyCanProcessRS422Command:
+ case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
+ return false;
+ case kCMIODevicePropertyExcludeNonDALAccess:
+ case kCMIODevicePropertyDeviceMaster:
+ return true;
+ default:
+ return false;
+ };
 }
 
 - (void)setPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		 qualifierData:(nonnull const void *)qualifierData
-			 dataSize:(UInt32)dataSize
-			 data:(nonnull const void *)data
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
+ dataSize:(UInt32)dataSize
+ data:(nonnull const void *)data
 {
-
-	switch (address.mSelector) {
-	case kCMIODevicePropertyExcludeNonDALAccess:
-		self.excludeNonDALAccess =
-			(*static_cast<const UInt32 *>(data) != 0);
-		break;
-	case kCMIODevicePropertyDeviceMaster:
-		self.masterPid = *static_cast<const pid_t *>(data);
-		break;
-	default:
-		break;
-	};
+ switch (address.mSelector) {
+ case kCMIODevicePropertyExcludeNonDALAccess:
+ self.excludeNonDALAccess = (*static_cast<const UInt32 *>(data) != 0);
+ break;
+ case kCMIODevicePropertyDeviceMaster:
+ self.masterPid = *static_cast<const pid_t *>(data);
+ break;
+ default:
+ break;
+ };
 }
 
 @end

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALMachClient.h -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALMachClient.h Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALMachClient.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALMachClient.mm Changed

@@ -10,16 +10,17 @@
 #import "Logging.h"
 
 @interface OBSDALMachClient () <NSPortDelegate> {
-	NSPort *_receivePort;
+ NSPort *_receivePort;
 }
+
 @end
 
 @implementation OBSDALMachClient
 
 - (void)dealloc
 {
-	DLogFunc(@"");
-	_receivePort.delegate = nil;
+ DLogFunc(@"");
+ _receivePort.delegate = nil;
 }
 
 - (NSPort *)serverPort
@@ -27,154 +28,129 @@
 // See note in MachServer.mm and don't judge me
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-	return NSMachBootstrapServer sharedInstance
-		portForName:@MACH_SERVICE_NAME;
+ return NSMachBootstrapServer sharedInstance portForName:@MACH_SERVICE_NAME;
 #pragma clang diagnostic pop
 }
 
 - (BOOL)isServerAvailable
 {
-	return self serverPort != nil;
+ return self serverPort != nil;
 }
 
 - (NSPort *)receivePort
 {
-	if (_receivePort == nil) {
-		NSPort *receivePort = NSMachPort port;
-		_receivePort = receivePort;
-		_receivePort.delegate = self;
-		__weak __typeof(self) weakSelf = self;
-		dispatch_async(
-			dispatch_get_global_queue(
-				DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
-			^{
-				NSRunLoop *runLoop = NSRunLoop currentRunLoop;
-				runLoop addPort:receivePort
-					 forMode:NSDefaultRunLoopMode;
-				// weakSelf should become nil when this object gets destroyed
-				while (weakSelf) {
-					NSRunLoop currentRunLoop
-						runUntilDate:
-							NSDate dateWithTimeIntervalSinceNow:
-									0.1;
-				}
-				DLog(@"Shutting down receive run loop");
-			});
-		DLog(@"Initialized mach port %d for receiving",
-		 ((NSMachPort *)_receivePort).machPort);
-	}
-	return _receivePort;
+ if (_receivePort == nil) {
+ NSPort *receivePort = NSMachPort port;
+ _receivePort = receivePort;
+ _receivePort.delegate = self;
+ __weak __typeof(self) weakSelf = self;
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ NSRunLoop *runLoop = NSRunLoop currentRunLoop;
+ runLoop addPort:receivePort forMode:NSDefaultRunLoopMode;
+ // weakSelf should become nil when this object gets destroyed
+ while (weakSelf) {
+ NSRunLoop currentRunLoop runUntilDate:NSDate dateWithTimeIntervalSinceNow:0.1;
+ }
+ DLog(@"Shutting down receive run loop");
+ });
+ DLog(@"Initialized mach port %d for receiving", ((NSMachPort *) _receivePort).machPort);
+ }
+ return _receivePort;
 }
 
 - (BOOL)connectToServer
 {
-	DLogFunc(@"");
-
-	NSPort *sendPort = self serverPort;
-	if (sendPort == nil) {
-		ELog(@"Unable to connect to server port");
-		return NO;
-	}
-
-	NSPortMessage *message = NSPortMessage alloc
-		initWithSendPort:sendPort
-		 receivePort:self.receivePort
-		 components:nil;
-	message.msgid = MachMsgIdConnect;
-
-	NSDate *timeout = NSDate dateWithTimeIntervalSinceNow:5.0;
-	if (!message sendBeforeDate:timeout) {
-		ELog(@"sendBeforeDate failed");
-		return NO;
-	}
-
-	return YES;
+ DLogFunc(@"");
+
+ NSPort *sendPort = self serverPort;
+ if (sendPort == nil) {
+ ELog(@"Unable to connect to server port");
+ return NO;
+ }
+
+ NSPortMessage *message = NSPortMessage alloc initWithSendPort:sendPort receivePort:self.receivePort
+ components:nil;
+ message.msgid = MachMsgIdConnect;
+
+ NSDate *timeout = NSDate dateWithTimeIntervalSinceNow:5.0;
+ if (!message sendBeforeDate:timeout) {
+ ELog(@"sendBeforeDate failed");
+ return NO;
+ }
+
+ return YES;
 }
 
 - (void)handlePortMessage:(NSPortMessage *)message
 {
-	__strong id<MachClientDelegate> strongDelegate = self.delegate;
+ __strong id<MachClientDelegate> strongDelegate = self.delegate;
 
-	VLogFunc(@"");
-	NSArray *components = message.components;
-	switch (message.msgid) {
-	case MachMsgIdConnect:
-		DLog(@"Received connect response");
-		break;
-	case MachMsgIdFrame:
-		VLog(@"Received frame message");
+ VLogFunc(@"");
+ NSArray *components = message.components;
+ switch (message.msgid) {
+ case MachMsgIdConnect:
+ DLog(@"Received connect response");
+ break;
+ case MachMsgIdFrame:
+ VLog(@"Received frame message");
 
-		if (components.count < 4)
-			return;
+ if (components.count < 4)
+ return;
 
-		@autoreleasepool {
-			NSMachPort *framePort = (NSMachPort *)components0;
+ @autoreleasepool {
+ NSMachPort *framePort = (NSMachPort *) components0;
 
-			if (!framePort)
-				return;
+ if (!framePort)
+ return;
 
-			IOSurfaceRef surface = IOSurfaceLookupFromMachPort(
-				framePort machPort);
+ IOSurfaceRef surface = IOSurfaceLookupFromMachPort(framePort machPort);
 
-			if (surface) {
-				/*
+ if (surface) {
+ /*
 * IOSurfaceLocks are only necessary on non Apple Silicon devices, as those have
 * unified memory. On Intel machines, the lock ensures that the IOSurface is copied back
 * from GPU memory to CPU memory so we can process the pixel buffer.
 */
 #ifndef __aarch64__
-				IOSurfaceLock(surface, kIOSurfaceLockReadOnly,
-					 NULL);
+ IOSurfaceLock(surface, kIOSurfaceLockReadOnly, NULL);
 #endif
-				CVPixelBufferRef frame;
-				CVPixelBufferCreateWithIOSurface(
-					kCFAllocatorDefault, surface, NULL,
-					&frame);
+ CVPixelBufferRef frame;
+ CVPixelBufferCreateWithIOSurface(kCFAllocatorDefault, surface, NULL, &frame);
 #ifndef __aarch64__
-				IOSurfaceUnlock(surface, kIOSurfaceLockReadOnly,
-						NULL);
+ IOSurfaceUnlock(surface, kIOSurfaceLockReadOnly, NULL);
 #endif
-				CFRelease(surface);
-
-				uint64_t timestamp;
-				components1 getBytes:&timestamp
-						 length:sizeof(timestamp);
-
-				VLog(@"Received frame data: %zux%zu (%llu)",
-				 CVPixelBufferGetWidth(frame),
-				 CVPixelBufferGetHeight(frame), timestamp);
-
-				uint32_t fpsNumerator;
-				components2 getBytes:&fpsNumerator
-						 length:sizeof(fpsNumerator);
-				uint32_t fpsDenominator;
-				components3 getBytes:&fpsDenominator
-						 length:sizeof(fpsDenominator);
-
-				strongDelegate
-					receivedPixelBuffer:frame
-						 timestamp:timestamp
-					 fpsNumerator:fpsNumerator
-					 fpsDenominator:fpsDenominator;
-
-				CVPixelBufferRelease(frame);
-			} else {
-				ELog(@"Failed to obtain IOSurface from Mach port");
-			}
-			framePort invalidate;
-			mach_port_deallocate(mach_task_self(),
-					 framePort machPort);
-		}
-		break;
-	case MachMsgIdStop:
-		DLog(@"Received stop message");
-		strongDelegate receivedStop;
-		break;
-	default:
-		ELog(@"Received unexpected response msgid %u",
-		 (unsigned)message.msgid);
-		break;
-	}
+ CFRelease(surface);
+
+ uint64_t timestamp;
+ components1 getBytes:&timestamp length:sizeof(timestamp);
+
+ VLog(@"Received frame data: %zux%zu (%llu)", CVPixelBufferGetWidth(frame),
+ CVPixelBufferGetHeight(frame), timestamp);
+
+ uint32_t fpsNumerator;
+ components2 getBytes:&fpsNumerator length:sizeof(fpsNumerator);
+ uint32_t fpsDenominator;
+ components3 getBytes:&fpsDenominator length:sizeof(fpsDenominator);
+
+ strongDelegate receivedPixelBuffer:frame timestamp:timestamp fpsNumerator:fpsNumerator
+ fpsDenominator:fpsDenominator;
+
+ CVPixelBufferRelease(frame);
+ } else {
+ ELog(@"Failed to obtain IOSurface from Mach port");
+ }
+ framePort invalidate;
+ mach_port_deallocate(mach_task_self(), framePort machPort);
+ }
+ break;
+ case MachMsgIdStop:
+ DLog(@"Received stop message");
+ strongDelegate receivedStop;
+ break;
+ default:
+ ELog(@"Received unexpected response msgid %u", (unsigned) message.msgid);
+ break;
+ }
 }
 
 @end

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALObjectStore.h -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALObjectStore.h Changed

@@ -27,19 +27,19 @@
 - (BOOL)hasPropertyWithAddress:(CMIOObjectPropertyAddress)address;
 - (BOOL)isPropertySettableWithAddress:(CMIOObjectPropertyAddress)address;
 - (UInt32)getPropertyDataSizeWithAddress:(CMIOObjectPropertyAddress)address
-		       qualifierDataSize:(UInt32)qualifierDataSize
-			   qualifierData:(const void *)qualifierData;
+                       qualifierDataSize:(UInt32)qualifierDataSize
+                           qualifierData:(const void *)qualifierData;
 - (void)getPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		     qualifierData:(const void *)qualifierData
-			  dataSize:(UInt32)dataSize
-			  dataUsed:(UInt32 *)dataUsed
-			      data:(void *)data;
+                 qualifierDataSize:(UInt32)qualifierDataSize
+                     qualifierData:(const void *)qualifierData
+                          dataSize:(UInt32)dataSize
+                          dataUsed:(UInt32 *)dataUsed
+                              data:(void *)data;
 - (void)setPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		     qualifierData:(const void *)qualifierData
-			  dataSize:(UInt32)dataSize
-			      data:(const void *)data;
+                 qualifierDataSize:(UInt32)qualifierDataSize
+                     qualifierData:(const void *)qualifierData
+                          dataSize:(UInt32)dataSize
+                              data:(const void *)data;
 
 @end

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALObjectStore.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALObjectStore.mm Changed

@@ -28,254 +28,252 @@
 // 4-byte selectors to string for easy debugging
 + (NSString *)StringFromPropertySelector:(CMIOObjectPropertySelector)selector
 {
-	switch (selector) {
-	case kCMIODevicePropertyPlugIn:
-		return @"kCMIODevicePropertyPlugIn";
-	case kCMIODevicePropertyDeviceUID:
-		return @"kCMIODevicePropertyDeviceUID";
-	case kCMIODevicePropertyModelUID:
-		return @"kCMIODevicePropertyModelUID";
-	case kCMIODevicePropertyTransportType:
-		return @"kCMIODevicePropertyTransportType";
-	case kCMIODevicePropertyDeviceIsAlive:
-		return @"kCMIODevicePropertyDeviceIsAlive";
-	case kCMIODevicePropertyDeviceHasChanged:
-		return @"kCMIODevicePropertyDeviceHasChanged";
-	case kCMIODevicePropertyDeviceIsRunning:
-		return @"kCMIODevicePropertyDeviceIsRunning";
-	case kCMIODevicePropertyDeviceIsRunningSomewhere:
-		return @"kCMIODevicePropertyDeviceIsRunningSomewhere";
-	case kCMIODevicePropertyDeviceCanBeDefaultDevice:
-		return @"kCMIODevicePropertyDeviceCanBeDefaultDevice";
-	case kCMIODevicePropertyHogMode:
-		return @"kCMIODevicePropertyHogMode";
-	case kCMIODevicePropertyLatency:
-		return @"kCMIODevicePropertyLatency";
-	case kCMIODevicePropertyStreams:
-		return @"kCMIODevicePropertyStreams";
-	case kCMIODevicePropertyStreamConfiguration:
-		return @"kCMIODevicePropertyStreamConfiguration";
-	case kCMIODevicePropertyDeviceMaster:
-		return @"kCMIODevicePropertyDeviceMaster";
-	case kCMIODevicePropertyExcludeNonDALAccess:
-		return @"kCMIODevicePropertyExcludeNonDALAccess";
-	case kCMIODevicePropertyClientSyncDiscontinuity:
-		return @"kCMIODevicePropertyClientSyncDiscontinuity";
-	case kCMIODevicePropertySMPTETimeCallback:
-		return @"kCMIODevicePropertySMPTETimeCallback";
-	case kCMIODevicePropertyCanProcessAVCCommand:
-		return @"kCMIODevicePropertyCanProcessAVCCommand";
-	case kCMIODevicePropertyAVCDeviceType:
-		return @"kCMIODevicePropertyAVCDeviceType";
-	case kCMIODevicePropertyAVCDeviceSignalMode:
-		return @"kCMIODevicePropertyAVCDeviceSignalMode";
-	case kCMIODevicePropertyCanProcessRS422Command:
-		return @"kCMIODevicePropertyCanProcessRS422Command";
-	case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
-		return @"kCMIODevicePropertyLinkedCoreAudioDeviceUID";
-	case kCMIODevicePropertyVideoDigitizerComponents:
-		return @"kCMIODevicePropertyVideoDigitizerComponents";
-	case kCMIODevicePropertySuspendedByUser:
-		return @"kCMIODevicePropertySuspendedByUser";
-	case kCMIODevicePropertyLinkedAndSyncedCoreAudioDeviceUID:
-		return @"kCMIODevicePropertyLinkedAndSyncedCoreAudioDeviceUID";
-	case kCMIODevicePropertyIIDCInitialUnitSpace:
-		return @"kCMIODevicePropertyIIDCInitialUnitSpace";
-	case kCMIODevicePropertyIIDCCSRData:
-		return @"kCMIODevicePropertyIIDCCSRData";
-	case kCMIODevicePropertyCanSwitchFrameRatesWithoutFrameDrops:
-		return @"kCMIODevicePropertyCanSwitchFrameRatesWithoutFrameDrops";
-	case kCMIODevicePropertyLocation:
-		return @"kCMIODevicePropertyLocation";
-	case kCMIODevicePropertyDeviceHasStreamingError:
-		return @"kCMIODevicePropertyDeviceHasStreamingError";
-	case kCMIODevicePropertyScopeInput:
-		return @"kCMIODevicePropertyScopeInput";
-	case kCMIODevicePropertyScopeOutput:
-		return @"kCMIODevicePropertyScopeOutput";
-	case kCMIODevicePropertyScopePlayThrough:
-		return @"kCMIODevicePropertyScopePlayThrough";
-	case kCMIOObjectPropertyClass:
-		return @"kCMIOObjectPropertyClass";
-	case kCMIOObjectPropertyOwner:
-		return @"kCMIOObjectPropertyOwner";
-	case kCMIOObjectPropertyCreator:
-		return @"kCMIOObjectPropertyCreator";
-	case kCMIOObjectPropertyName:
-		return @"kCMIOObjectPropertyName";
-	case kCMIOObjectPropertyManufacturer:
-		return @"kCMIOObjectPropertyManufacturer";
-	case kCMIOObjectPropertyElementName:
-		return @"kCMIOObjectPropertyElementName";
-	case kCMIOObjectPropertyElementCategoryName:
-		return @"kCMIOObjectPropertyElementCategoryName";
-	case kCMIOObjectPropertyElementNumberName:
-		return @"kCMIOObjectPropertyElementNumberName";
-	case kCMIOObjectPropertyOwnedObjects:
-		return @"kCMIOObjectPropertyOwnedObjects";
-	case kCMIOObjectPropertyListenerAdded:
-		return @"kCMIOObjectPropertyListenerAdded";
-	case kCMIOObjectPropertyListenerRemoved:
-		return @"kCMIOObjectPropertyListenerRemoved";
-	case kCMIOStreamPropertyDirection:
-		return @"kCMIOStreamPropertyDirection";
-	case kCMIOStreamPropertyTerminalType:
-		return @"kCMIOStreamPropertyTerminalType";
-	case kCMIOStreamPropertyStartingChannel:
-		return @"kCMIOStreamPropertyStartingChannel";
-	// Same value as kCMIODevicePropertyLatency
-	// case kCMIOStreamPropertyLatency:
-	// return @"kCMIOStreamPropertyLatency";
-	case kCMIOStreamPropertyFormatDescription:
-		return @"kCMIOStreamPropertyFormatDescription";
-	case kCMIOStreamPropertyFormatDescriptions:
-		return @"kCMIOStreamPropertyFormatDescriptions";
-	case kCMIOStreamPropertyStillImage:
-		return @"kCMIOStreamPropertyStillImage";
-	case kCMIOStreamPropertyStillImageFormatDescriptions:
-		return @"kCMIOStreamPropertyStillImageFormatDescriptions";
-	case kCMIOStreamPropertyFrameRate:
-		return @"kCMIOStreamPropertyFrameRate";
-	case kCMIOStreamPropertyMinimumFrameRate:
-		return @"kCMIOStreamPropertyMinimumFrameRate";
-	case kCMIOStreamPropertyFrameRates:
-		return @"kCMIOStreamPropertyFrameRates";
-	case kCMIOStreamPropertyFrameRateRanges:
-		return @"kCMIOStreamPropertyFrameRateRanges";
-	case kCMIOStreamPropertyNoDataTimeoutInMSec:
-		return @"kCMIOStreamPropertyNoDataTimeoutInMSec";
-	case kCMIOStreamPropertyDeviceSyncTimeoutInMSec:
-		return @"kCMIOStreamPropertyDeviceSyncTimeoutInMSec";
-	case kCMIOStreamPropertyNoDataEventCount:
-		return @"kCMIOStreamPropertyNoDataEventCount";
-	case kCMIOStreamPropertyOutputBufferUnderrunCount:
-		return @"kCMIOStreamPropertyOutputBufferUnderrunCount";
-	case kCMIOStreamPropertyOutputBufferRepeatCount:
-		return @"kCMIOStreamPropertyOutputBufferRepeatCount";
-	case kCMIOStreamPropertyOutputBufferQueueSize:
-		return @"kCMIOStreamPropertyOutputBufferQueueSize";
-	case kCMIOStreamPropertyOutputBuffersRequiredForStartup:
-		return @"kCMIOStreamPropertyOutputBuffersRequiredForStartup";
-	case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
-		return @"kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback";
-	case kCMIOStreamPropertyFirstOutputPresentationTimeStamp:
-		return @"kCMIOStreamPropertyFirstOutputPresentationTimeStamp";
-	case kCMIOStreamPropertyEndOfData:
-		return @"kCMIOStreamPropertyEndOfData";
-	case kCMIOStreamPropertyClock:
-		return @"kCMIOStreamPropertyClock";
-	case kCMIOStreamPropertyCanProcessDeckCommand:
-		return @"kCMIOStreamPropertyCanProcessDeckCommand";
-	case kCMIOStreamPropertyDeck:
-		return @"kCMIOStreamPropertyDeck";
-	case kCMIOStreamPropertyDeckFrameNumber:
-		return @"kCMIOStreamPropertyDeckFrameNumber";
-	case kCMIOStreamPropertyDeckDropness:
-		return @"kCMIOStreamPropertyDeckDropness";
-	case kCMIOStreamPropertyDeckThreaded:
-		return @"kCMIOStreamPropertyDeckThreaded";
-	case kCMIOStreamPropertyDeckLocal:
-		return @"kCMIOStreamPropertyDeckLocal";
-	case kCMIOStreamPropertyDeckCueing:
-		return @"kCMIOStreamPropertyDeckCueing";
-	case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
-		return @"kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio";
-	case kCMIOStreamPropertyScheduledOutputNotificationProc:
-		return @"kCMIOStreamPropertyScheduledOutputNotificationProc";
-	case kCMIOStreamPropertyPreferredFormatDescription:
-		return @"kCMIOStreamPropertyPreferredFormatDescription";
-	case kCMIOStreamPropertyPreferredFrameRate:
-		return @"kCMIOStreamPropertyPreferredFrameRate";
-	case kCMIOControlPropertyScope:
-		return @"kCMIOControlPropertyScope";
-	case kCMIOControlPropertyElement:
-		return @"kCMIOControlPropertyElement";
-	case kCMIOControlPropertyVariant:
-		return @"kCMIOControlPropertyVariant";
-	case kCMIOHardwarePropertyProcessIsMaster:
-		return @"kCMIOHardwarePropertyProcessIsMaster";
-	case kCMIOHardwarePropertyIsInitingOrExiting:
-		return @"kCMIOHardwarePropertyIsInitingOrExiting";
-	case kCMIOHardwarePropertyDevices:
-		return @"kCMIOHardwarePropertyDevices";
-	case kCMIOHardwarePropertyDefaultInputDevice:
-		return @"kCMIOHardwarePropertyDefaultInputDevice";
-	case kCMIOHardwarePropertyDefaultOutputDevice:
-		return @"kCMIOHardwarePropertyDefaultOutputDevice";
-	case kCMIOHardwarePropertyDeviceForUID:
-		return @"kCMIOHardwarePropertyDeviceForUID";
-	case kCMIOHardwarePropertySleepingIsAllowed:
-		return @"kCMIOHardwarePropertySleepingIsAllowed";
-	case kCMIOHardwarePropertyUnloadingIsAllowed:
-		return @"kCMIOHardwarePropertyUnloadingIsAllowed";
-	case kCMIOHardwarePropertyPlugInForBundleID:
-		return @"kCMIOHardwarePropertyPlugInForBundleID";
-	case kCMIOHardwarePropertyUserSessionIsActiveOrHeadless:
-		return @"kCMIOHardwarePropertyUserSessionIsActiveOrHeadless";
-	case kCMIOHardwarePropertySuspendedBySystem:
-		return @"kCMIOHardwarePropertySuspendedBySystem";
-	case kCMIOHardwarePropertyAllowScreenCaptureDevices:
-		return @"kCMIOHardwarePropertyAllowScreenCaptureDevices";
-	case kCMIOHardwarePropertyAllowWirelessScreenCaptureDevices:
-		return @"kCMIOHardwarePropertyAllowWirelessScreenCaptureDevices";
-	default:
-		uint8_t *chars = (uint8_t *)&selector;
-		return NSString stringWithFormat:@"Unknown selector: %c%c%c%c",
-						 chars0, chars1, chars2,
-						 chars3;
-	}
+ switch (selector) {
+ case kCMIODevicePropertyPlugIn:
+ return @"kCMIODevicePropertyPlugIn";
+ case kCMIODevicePropertyDeviceUID:
+ return @"kCMIODevicePropertyDeviceUID";
+ case kCMIODevicePropertyModelUID:
+ return @"kCMIODevicePropertyModelUID";
+ case kCMIODevicePropertyTransportType:
+ return @"kCMIODevicePropertyTransportType";
+ case kCMIODevicePropertyDeviceIsAlive:
+ return @"kCMIODevicePropertyDeviceIsAlive";
+ case kCMIODevicePropertyDeviceHasChanged:
+ return @"kCMIODevicePropertyDeviceHasChanged";
+ case kCMIODevicePropertyDeviceIsRunning:
+ return @"kCMIODevicePropertyDeviceIsRunning";
+ case kCMIODevicePropertyDeviceIsRunningSomewhere:
+ return @"kCMIODevicePropertyDeviceIsRunningSomewhere";
+ case kCMIODevicePropertyDeviceCanBeDefaultDevice:
+ return @"kCMIODevicePropertyDeviceCanBeDefaultDevice";
+ case kCMIODevicePropertyHogMode:
+ return @"kCMIODevicePropertyHogMode";
+ case kCMIODevicePropertyLatency:
+ return @"kCMIODevicePropertyLatency";
+ case kCMIODevicePropertyStreams:
+ return @"kCMIODevicePropertyStreams";
+ case kCMIODevicePropertyStreamConfiguration:
+ return @"kCMIODevicePropertyStreamConfiguration";
+ case kCMIODevicePropertyDeviceMaster:
+ return @"kCMIODevicePropertyDeviceMaster";
+ case kCMIODevicePropertyExcludeNonDALAccess:
+ return @"kCMIODevicePropertyExcludeNonDALAccess";
+ case kCMIODevicePropertyClientSyncDiscontinuity:
+ return @"kCMIODevicePropertyClientSyncDiscontinuity";
+ case kCMIODevicePropertySMPTETimeCallback:
+ return @"kCMIODevicePropertySMPTETimeCallback";
+ case kCMIODevicePropertyCanProcessAVCCommand:
+ return @"kCMIODevicePropertyCanProcessAVCCommand";
+ case kCMIODevicePropertyAVCDeviceType:
+ return @"kCMIODevicePropertyAVCDeviceType";
+ case kCMIODevicePropertyAVCDeviceSignalMode:
+ return @"kCMIODevicePropertyAVCDeviceSignalMode";
+ case kCMIODevicePropertyCanProcessRS422Command:
+ return @"kCMIODevicePropertyCanProcessRS422Command";
+ case kCMIODevicePropertyLinkedCoreAudioDeviceUID:
+ return @"kCMIODevicePropertyLinkedCoreAudioDeviceUID";
+ case kCMIODevicePropertyVideoDigitizerComponents:
+ return @"kCMIODevicePropertyVideoDigitizerComponents";
+ case kCMIODevicePropertySuspendedByUser:
+ return @"kCMIODevicePropertySuspendedByUser";
+ case kCMIODevicePropertyLinkedAndSyncedCoreAudioDeviceUID:
+ return @"kCMIODevicePropertyLinkedAndSyncedCoreAudioDeviceUID";
+ case kCMIODevicePropertyIIDCInitialUnitSpace:
+ return @"kCMIODevicePropertyIIDCInitialUnitSpace";
+ case kCMIODevicePropertyIIDCCSRData:
+ return @"kCMIODevicePropertyIIDCCSRData";
+ case kCMIODevicePropertyCanSwitchFrameRatesWithoutFrameDrops:
+ return @"kCMIODevicePropertyCanSwitchFrameRatesWithoutFrameDrops";
+ case kCMIODevicePropertyLocation:
+ return @"kCMIODevicePropertyLocation";
+ case kCMIODevicePropertyDeviceHasStreamingError:
+ return @"kCMIODevicePropertyDeviceHasStreamingError";
+ case kCMIODevicePropertyScopeInput:
+ return @"kCMIODevicePropertyScopeInput";
+ case kCMIODevicePropertyScopeOutput:
+ return @"kCMIODevicePropertyScopeOutput";
+ case kCMIODevicePropertyScopePlayThrough:
+ return @"kCMIODevicePropertyScopePlayThrough";
+ case kCMIOObjectPropertyClass:
+ return @"kCMIOObjectPropertyClass";
+ case kCMIOObjectPropertyOwner:
+ return @"kCMIOObjectPropertyOwner";
+ case kCMIOObjectPropertyCreator:
+ return @"kCMIOObjectPropertyCreator";
+ case kCMIOObjectPropertyName:
+ return @"kCMIOObjectPropertyName";
+ case kCMIOObjectPropertyManufacturer:
+ return @"kCMIOObjectPropertyManufacturer";
+ case kCMIOObjectPropertyElementName:
+ return @"kCMIOObjectPropertyElementName";
+ case kCMIOObjectPropertyElementCategoryName:
+ return @"kCMIOObjectPropertyElementCategoryName";
+ case kCMIOObjectPropertyElementNumberName:
+ return @"kCMIOObjectPropertyElementNumberName";
+ case kCMIOObjectPropertyOwnedObjects:
+ return @"kCMIOObjectPropertyOwnedObjects";
+ case kCMIOObjectPropertyListenerAdded:
+ return @"kCMIOObjectPropertyListenerAdded";
+ case kCMIOObjectPropertyListenerRemoved:
+ return @"kCMIOObjectPropertyListenerRemoved";
+ case kCMIOStreamPropertyDirection:
+ return @"kCMIOStreamPropertyDirection";
+ case kCMIOStreamPropertyTerminalType:
+ return @"kCMIOStreamPropertyTerminalType";
+ case kCMIOStreamPropertyStartingChannel:
+ return @"kCMIOStreamPropertyStartingChannel";
+ // Same value as kCMIODevicePropertyLatency
+ // case kCMIOStreamPropertyLatency:
+ // return @"kCMIOStreamPropertyLatency";
+ case kCMIOStreamPropertyFormatDescription:
+ return @"kCMIOStreamPropertyFormatDescription";
+ case kCMIOStreamPropertyFormatDescriptions:
+ return @"kCMIOStreamPropertyFormatDescriptions";
+ case kCMIOStreamPropertyStillImage:
+ return @"kCMIOStreamPropertyStillImage";
+ case kCMIOStreamPropertyStillImageFormatDescriptions:
+ return @"kCMIOStreamPropertyStillImageFormatDescriptions";
+ case kCMIOStreamPropertyFrameRate:
+ return @"kCMIOStreamPropertyFrameRate";
+ case kCMIOStreamPropertyMinimumFrameRate:
+ return @"kCMIOStreamPropertyMinimumFrameRate";
+ case kCMIOStreamPropertyFrameRates:
+ return @"kCMIOStreamPropertyFrameRates";
+ case kCMIOStreamPropertyFrameRateRanges:
+ return @"kCMIOStreamPropertyFrameRateRanges";
+ case kCMIOStreamPropertyNoDataTimeoutInMSec:
+ return @"kCMIOStreamPropertyNoDataTimeoutInMSec";
+ case kCMIOStreamPropertyDeviceSyncTimeoutInMSec:
+ return @"kCMIOStreamPropertyDeviceSyncTimeoutInMSec";
+ case kCMIOStreamPropertyNoDataEventCount:
+ return @"kCMIOStreamPropertyNoDataEventCount";
+ case kCMIOStreamPropertyOutputBufferUnderrunCount:
+ return @"kCMIOStreamPropertyOutputBufferUnderrunCount";
+ case kCMIOStreamPropertyOutputBufferRepeatCount:
+ return @"kCMIOStreamPropertyOutputBufferRepeatCount";
+ case kCMIOStreamPropertyOutputBufferQueueSize:
+ return @"kCMIOStreamPropertyOutputBufferQueueSize";
+ case kCMIOStreamPropertyOutputBuffersRequiredForStartup:
+ return @"kCMIOStreamPropertyOutputBuffersRequiredForStartup";
+ case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
+ return @"kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback";
+ case kCMIOStreamPropertyFirstOutputPresentationTimeStamp:
+ return @"kCMIOStreamPropertyFirstOutputPresentationTimeStamp";
+ case kCMIOStreamPropertyEndOfData:
+ return @"kCMIOStreamPropertyEndOfData";
+ case kCMIOStreamPropertyClock:
+ return @"kCMIOStreamPropertyClock";
+ case kCMIOStreamPropertyCanProcessDeckCommand:
+ return @"kCMIOStreamPropertyCanProcessDeckCommand";
+ case kCMIOStreamPropertyDeck:
+ return @"kCMIOStreamPropertyDeck";
+ case kCMIOStreamPropertyDeckFrameNumber:
+ return @"kCMIOStreamPropertyDeckFrameNumber";
+ case kCMIOStreamPropertyDeckDropness:
+ return @"kCMIOStreamPropertyDeckDropness";
+ case kCMIOStreamPropertyDeckThreaded:
+ return @"kCMIOStreamPropertyDeckThreaded";
+ case kCMIOStreamPropertyDeckLocal:
+ return @"kCMIOStreamPropertyDeckLocal";
+ case kCMIOStreamPropertyDeckCueing:
+ return @"kCMIOStreamPropertyDeckCueing";
+ case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
+ return @"kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio";
+ case kCMIOStreamPropertyScheduledOutputNotificationProc:
+ return @"kCMIOStreamPropertyScheduledOutputNotificationProc";
+ case kCMIOStreamPropertyPreferredFormatDescription:
+ return @"kCMIOStreamPropertyPreferredFormatDescription";
+ case kCMIOStreamPropertyPreferredFrameRate:
+ return @"kCMIOStreamPropertyPreferredFrameRate";
+ case kCMIOControlPropertyScope:
+ return @"kCMIOControlPropertyScope";
+ case kCMIOControlPropertyElement:
+ return @"kCMIOControlPropertyElement";
+ case kCMIOControlPropertyVariant:
+ return @"kCMIOControlPropertyVariant";
+ case kCMIOHardwarePropertyProcessIsMaster:
+ return @"kCMIOHardwarePropertyProcessIsMaster";
+ case kCMIOHardwarePropertyIsInitingOrExiting:
+ return @"kCMIOHardwarePropertyIsInitingOrExiting";
+ case kCMIOHardwarePropertyDevices:
+ return @"kCMIOHardwarePropertyDevices";
+ case kCMIOHardwarePropertyDefaultInputDevice:
+ return @"kCMIOHardwarePropertyDefaultInputDevice";
+ case kCMIOHardwarePropertyDefaultOutputDevice:
+ return @"kCMIOHardwarePropertyDefaultOutputDevice";
+ case kCMIOHardwarePropertyDeviceForUID:
+ return @"kCMIOHardwarePropertyDeviceForUID";
+ case kCMIOHardwarePropertySleepingIsAllowed:
+ return @"kCMIOHardwarePropertySleepingIsAllowed";
+ case kCMIOHardwarePropertyUnloadingIsAllowed:
+ return @"kCMIOHardwarePropertyUnloadingIsAllowed";
+ case kCMIOHardwarePropertyPlugInForBundleID:
+ return @"kCMIOHardwarePropertyPlugInForBundleID";
+ case kCMIOHardwarePropertyUserSessionIsActiveOrHeadless:
+ return @"kCMIOHardwarePropertyUserSessionIsActiveOrHeadless";
+ case kCMIOHardwarePropertySuspendedBySystem:
+ return @"kCMIOHardwarePropertySuspendedBySystem";
+ case kCMIOHardwarePropertyAllowScreenCaptureDevices:
+ return @"kCMIOHardwarePropertyAllowScreenCaptureDevices";
+ case kCMIOHardwarePropertyAllowWirelessScreenCaptureDevices:
+ return @"kCMIOHardwarePropertyAllowWirelessScreenCaptureDevices";
+ default:
+ uint8_t *chars = (uint8_t *) &selector;
+ return NSString stringWithFormat:@"Unknown selector: %c%c%c%c", chars0, chars1, chars2, chars3;
+ }
 }
 
 + (BOOL)IsBridgedTypeForSelector:(CMIOObjectPropertySelector)selector
 {
-	switch (selector) {
-	case kCMIOObjectPropertyName:
-	case kCMIOObjectPropertyManufacturer:
-	case kCMIOObjectPropertyElementName:
-	case kCMIOObjectPropertyElementCategoryName:
-	case kCMIOObjectPropertyElementNumberName:
-	case kCMIODevicePropertyDeviceUID:
-	case kCMIODevicePropertyModelUID:
-	case kCMIOStreamPropertyFormatDescriptions:
-	case kCMIOStreamPropertyFormatDescription:
-	case kCMIOStreamPropertyClock:
-		return YES;
-	default:
-		return NO;
-	}
+ switch (selector) {
+ case kCMIOObjectPropertyName:
+ case kCMIOObjectPropertyManufacturer:
+ case kCMIOObjectPropertyElementName:
+ case kCMIOObjectPropertyElementCategoryName:
+ case kCMIOObjectPropertyElementNumberName:
+ case kCMIODevicePropertyDeviceUID:
+ case kCMIODevicePropertyModelUID:
+ case kCMIOStreamPropertyFormatDescriptions:
+ case kCMIOStreamPropertyFormatDescription:
+ case kCMIOStreamPropertyClock:
+ return YES;
+ default:
+ return NO;
+ }
 }
 
 + (OBSDALObjectStore *)SharedObjectStore
 {
-	static OBSDALObjectStore *sObjectStore = nil;
-	static dispatch_once_t sOnceToken;
-	dispatch_once(&sOnceToken, ^{
-		sObjectStore = self alloc init;
-	});
-	return sObjectStore;
+ static OBSDALObjectStore *sObjectStore = nil;
+ static dispatch_once_t sOnceToken;
+ dispatch_once(&sOnceToken, ^{
+ sObjectStore = self alloc init;
+ });
+ return sObjectStore;
 }
 
 + (NSObject<CMIOObject> *)GetObjectWithId:(CMIOObjectID)objectId
 {
-	return OBSDALObjectStore SharedObjectStore getObject:objectId;
+ return OBSDALObjectStore SharedObjectStore getObject:objectId;
 }
 
 - (id)init
 {
-	if (self = super init) {
-		self.objectMap = NSMutableDictionary alloc init;
-	}
-	return self;
+ if (self = super init) {
+ self.objectMap = NSMutableDictionary alloc init;
+ }
+ return self;
 }
 
 - (NSObject<CMIOObject> *)getObject:(CMIOObjectID)objectID
 {
-	return self.objectMap@(objectID);
+ return self.objectMap@(objectID);
 }
 
 - (void)setObject:(id<CMIOObject>)object forObjectId:(CMIOObjectID)objectId
 {
-	self.objectMap@(objectId) = object;
+ self.objectMap@(objectId) = object;
 }
 
 @end

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.h -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.h Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugIn.mm Changed

@@ -22,21 +22,22 @@
 #import "Logging.h"
 
 typedef enum {
-	PlugInStateNotStarted = 0,
-	PlugInStateWaitingForServer,
-	PlugInStateReceivingFrames,
+ PlugInStateNotStarted = 0,
+ PlugInStateWaitingForServer,
+ PlugInStateReceivingFrames,
 } OBSDALPlugInState;
 
 @interface OBSDALPlugin () <MachClientDelegate> {
-	//! Serial queue for all state changes that need to be concerned with thread safety
-	dispatch_queue_t _stateQueue;
+ //! Serial queue for all state changes that need to be concerned with thread safety
+ dispatch_queue_t _stateQueue;
 
-	//! Repeated timer for driving the mach server re-connection
-	dispatch_source_t _machConnectTimer;
+ //! Repeated timer for driving the mach server re-connection
+ dispatch_source_t _machConnectTimer;
 
-	//! Timeout timer when we haven't received frames for 5s
-	dispatch_source_t _timeoutTimer;
+ //! Timeout timer when we haven't received frames for 5s
+ dispatch_source_t _timeoutTimer;
 }
+
 @property OBSDALPlugInState state;
 @property OBSDALMachClient *machClient;
 
@@ -46,209 +47,186 @@
 
 + (OBSDALPlugin *)SharedPlugIn
 {
-	static OBSDALPlugin *sPlugIn = nil;
-	static dispatch_once_t sOnceToken;
-	dispatch_once(&sOnceToken, ^{
-		sPlugIn = self alloc init;
-	});
-	return sPlugIn;
+ static OBSDALPlugin *sPlugIn = nil;
+ static dispatch_once_t sOnceToken;
+ dispatch_once(&sOnceToken, ^{
+ sPlugIn = self alloc init;
+ });
+ return sPlugIn;
 }
 
 - (instancetype)init
 {
-	if (self = super init) {
-		_stateQueue = dispatch_queue_create(
-			"com.obsproject.obs-mac-virtualcam.dal.state",
-			DISPATCH_QUEUE_SERIAL);
-
-		_timeoutTimer = dispatch_source_create(
-			DISPATCH_SOURCE_TYPE_TIMER, 0, 0, _stateQueue);
-		__weak __typeof(self) weakSelf = self;
-		dispatch_source_set_event_handler(_timeoutTimer, ^{
-			if (weakSelf.state == PlugInStateReceivingFrames) {
-				DLog(@"No frames received for 5s, restarting connection");
-				self stopStream;
-				self startStream;
-			}
-		});
-
-		_machClient = OBSDALMachClient alloc init;
-		_machClient.delegate = self;
-
-		_machConnectTimer = dispatch_source_create(
-			DISPATCH_SOURCE_TYPE_TIMER, 0, 0, _stateQueue);
-		dispatch_time_t startTime = dispatch_time(DISPATCH_TIME_NOW, 0);
-		uint64_t intervalTime = (int64_t)(1 * NSEC_PER_SEC);
-		dispatch_source_set_timer(_machConnectTimer, startTime,
-					 intervalTime, 0);
-
-		dispatch_source_set_event_handler(_machConnectTimer, ^{
-			__strong __typeof(weakSelf) strongSelf = weakSelf;
-			if (!strongSelf machClient isServerAvailable) {
-				DLog(@"Server is not available");
-			} else if (strongSelf.state ==
-				 PlugInStateWaitingForServer) {
-				DLog(@"Attempting connection");
-				strongSelf machClient connectToServer;
-			}
-		});
-	}
-	return self;
+ if (self = super init) {
+ _stateQueue = dispatch_queue_create("com.obsproject.obs-mac-virtualcam.dal.state", DISPATCH_QUEUE_SERIAL);
+
+ _timeoutTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, _stateQueue);
+ __weak __typeof(self) weakSelf = self;
+ dispatch_source_set_event_handler(_timeoutTimer, ^{
+ if (weakSelf.state == PlugInStateReceivingFrames) {
+ DLog(@"No frames received for 5s, restarting connection");
+ self stopStream;
+ self startStream;
+ }
+ });
+
+ _machClient = OBSDALMachClient alloc init;
+ _machClient.delegate = self;
+
+ _machConnectTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, _stateQueue);
+ dispatch_time_t startTime = dispatch_time(DISPATCH_TIME_NOW, 0);
+ uint64_t intervalTime = (int64_t) (1 * NSEC_PER_SEC);
+ dispatch_source_set_timer(_machConnectTimer, startTime, intervalTime, 0);
+
+ dispatch_source_set_event_handler(_machConnectTimer, ^{
+ __strong __typeof(weakSelf) strongSelf = weakSelf;
+ if (!strongSelf machClient isServerAvailable) {
+ DLog(@"Server is not available");
+ } else if (strongSelf.state == PlugInStateWaitingForServer) {
+ DLog(@"Attempting connection");
+ strongSelf machClient connectToServer;
+ }
+ });
+ }
+ return self;
 }
 
 - (void)startStream
 {
-	dispatch_async(_stateQueue, ^{
-		if (_state == PlugInStateNotStarted) {
-			dispatch_resume(_machConnectTimer);
-			self.stream startServingDefaultFrames;
-			_state = PlugInStateWaitingForServer;
-		}
-	});
+ dispatch_async(_stateQueue, ^{
+ if (self->_state == PlugInStateNotStarted) {
+ dispatch_resume(self->_machConnectTimer);
+ self.stream startServingDefaultFrames;
+ self->_state = PlugInStateWaitingForServer;
+ }
+ });
 }
 
 - (void)stopStream
 {
-	dispatch_async(_stateQueue, ^{
-		if (_state == PlugInStateWaitingForServer) {
-			dispatch_suspend(_machConnectTimer);
-			self.stream stopServingDefaultFrames;
-		} else if (_state == PlugInStateReceivingFrames) {
-			// TODO: Disconnect from the mach server?
-			dispatch_suspend(_timeoutTimer);
-		}
-		_state = PlugInStateNotStarted;
-	});
+ dispatch_async(_stateQueue, ^{
+ if (self->_state == PlugInStateWaitingForServer) {
+ dispatch_suspend(self->_machConnectTimer);
+ self.stream stopServingDefaultFrames;
+ } else if (self->_state == PlugInStateReceivingFrames) {
+ // TODO: Disconnect from the mach server?
+ dispatch_suspend(self->_timeoutTimer);
+ }
+ self->_state = PlugInStateNotStarted;
+ });
 }
 
 - (void)initialize
-{
-}
+{}
 
 - (void)teardown
-{
-}
+{}
 
 #pragma mark - CMIOObject
 
 - (BOOL)hasPropertyWithAddress:(CMIOObjectPropertyAddress)address
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-		return true;
-	default:
-		DLog(@"PlugIn unhandled hasPropertyWithAddress for %@",
-		 OBSDALObjectStore
-			 StringFromPropertySelector:address.mSelector);
-		return false;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ return true;
+ default:
+ DLog(@"PlugIn unhandled hasPropertyWithAddress for %@",
+ OBSDALObjectStore StringFromPropertySelector:address.mSelector);
+ return false;
+ };
 }
 
 - (BOOL)isPropertySettableWithAddress:(CMIOObjectPropertyAddress)address
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-		return false;
-	default:
-		DLog(@"PlugIn unhandled isPropertySettableWithAddress for %@",
-		 OBSDALObjectStore
-			 StringFromPropertySelector:address.mSelector);
-		return false;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ return false;
+ default:
+ DLog(@"PlugIn unhandled isPropertySettableWithAddress for %@",
+ OBSDALObjectStore StringFromPropertySelector:address.mSelector);
+ return false;
+ };
 }
 
 - (UInt32)getPropertyDataSizeWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-			 qualifierData:(const void *)qualifierData
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(const void *)qualifierData
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-		return sizeof(CFStringRef);
-	default:
-		DLog(@"PlugIn unhandled getPropertyDataSizeWithAddress for %@",
-		 OBSDALObjectStore
-			 StringFromPropertySelector:address.mSelector);
-		return 0;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ return sizeof(CFStringRef);
+ default:
+ DLog(@"PlugIn unhandled getPropertyDataSizeWithAddress for %@",
+ OBSDALObjectStore StringFromPropertySelector:address.mSelector);
+ return 0;
+ };
 }
 
 - (void)getPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		 qualifierData:(nonnull const void *)qualifierData
-			 dataSize:(UInt32)dataSize
-			 dataUsed:(nonnull UInt32 *)dataUsed
-			 data:(nonnull void *)data
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
+ dataSize:(UInt32)dataSize
+ dataUsed:(nonnull UInt32 *)dataUsed
+ data:(nonnull void *)data
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-		*static_cast<CFStringRef *>(data) =
-			CFSTR("OBS Virtual Camera Plugin");
-		*dataUsed = sizeof(CFStringRef);
-		return;
-	default:
-		DLog(@"PlugIn unhandled getPropertyDataWithAddress for %@",
-		 OBSDALObjectStore
-			 StringFromPropertySelector:address.mSelector);
-		return;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ *static_cast<CFStringRef *>(data) = CFSTR("OBS Virtual Camera Plugin");
+ *dataUsed = sizeof(CFStringRef);
+ return;
+ default:
+ DLog(@"PlugIn unhandled getPropertyDataWithAddress for %@",
+ OBSDALObjectStore StringFromPropertySelector:address.mSelector);
+ return;
+ };
 }
 
 - (void)setPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		 qualifierData:(nonnull const void *)qualifierData
-			 dataSize:(UInt32)dataSize
-			 data:(nonnull const void *)data
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
+ dataSize:(UInt32)dataSize
+ data:(nonnull const void *)data
 {
-	DLog(@"PlugIn unhandled setPropertyDataWithAddress for %@",
-	 OBSDALObjectStore StringFromPropertySelector:address.mSelector);
+ DLog(@"PlugIn unhandled setPropertyDataWithAddress for %@",
+ OBSDALObjectStore StringFromPropertySelector:address.mSelector);
 }
 
 #pragma mark - MachClientDelegate
 
 - (void)receivedPixelBuffer:(CVPixelBufferRef)frame
-		 timestamp:(uint64_t)timestamp
-	 fpsNumerator:(uint32_t)fpsNumerator
-	 fpsDenominator:(uint32_t)fpsDenominator
+ timestamp:(uint64_t)timestamp
+ fpsNumerator:(uint32_t)fpsNumerator
+ fpsDenominator:(uint32_t)fpsDenominator
 {
-	size_t width = CVPixelBufferGetWidth(frame);
-	size_t height = CVPixelBufferGetHeight(frame);
-
-	dispatch_sync(_stateQueue, ^{
-		if (_state == PlugInStateWaitingForServer) {
-			NSUserDefaults *defaults =
-				NSUserDefaults standardUserDefaults;
-			defaults setInteger:(long)width
-				 forKey:kTestCardWidthKey;
-			defaults setInteger:(long)height
-				 forKey:kTestCardHeightKey;
-			defaults setDouble:(double)fpsNumerator /
-					 (double)fpsDenominator
-				 forKey:kTestCardFPSKey;
-
-			dispatch_suspend(_machConnectTimer);
-			self.stream stopServingDefaultFrames;
-			dispatch_resume(_timeoutTimer);
-			_state = PlugInStateReceivingFrames;
-		}
-	});
-
-	// Add 5 more seconds onto the timeout timer
-	dispatch_source_set_timer(
-		_timeoutTimer,
-		dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)),
-		(uint64_t)(5.0 * NSEC_PER_SEC), (1ull * NSEC_PER_SEC) / 10);
-
-	self.stream queuePixelBuffer:frame
-			 timestamp:timestamp
-			 fpsNumerator:fpsNumerator
-		 fpsDenominator:fpsDenominator;
+ size_t width = CVPixelBufferGetWidth(frame);
+ size_t height = CVPixelBufferGetHeight(frame);
+
+ dispatch_sync(_stateQueue, ^{
+ if (_state == PlugInStateWaitingForServer) {
+ NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
+ defaults setInteger:(long) width forKey:kTestCardWidthKey;
+ defaults setInteger:(long) height forKey:kTestCardHeightKey;
+ defaults setDouble:(double) fpsNumerator / (double) fpsDenominator forKey:kTestCardFPSKey;
+
+ dispatch_suspend(_machConnectTimer);
+ self.stream stopServingDefaultFrames;
+ dispatch_resume(_timeoutTimer);
+ _state = PlugInStateReceivingFrames;
+ }
+ });
+
+ // Add 5 more seconds onto the timeout timer
+ dispatch_source_set_timer(_timeoutTimer, dispatch_time(DISPATCH_TIME_NOW, (int64_t) (5.0 * NSEC_PER_SEC)),
+ (uint64_t) (5.0 * NSEC_PER_SEC), (1ull * NSEC_PER_SEC) / 10);
+
+ self.stream queuePixelBuffer:frame timestamp:timestamp fpsNumerator:fpsNumerator fpsDenominator:fpsDenominator;
 }
 
 - (void)receivedStop
 {
-	DLogFunc(@"Restarting connection");
-	self stopStream;
-	self startStream;
+ DLogFunc(@"Restarting connection");
+ self stopStream;
+ self startStream;
 }
 
 @end

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInInterface.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInInterface.mm Changed

@@ -32,399 +32,339 @@
 
 ULONG HardwarePlugIn_AddRef(CMIOHardwarePlugInRef)
 {
-	sRefCount += 1;
-	DLogFunc(@"sRefCount now = %d", sRefCount);
-	return sRefCount;
+ sRefCount += 1;
+ DLogFunc(@"sRefCount now = %d", sRefCount);
+ return sRefCount;
 }
 
 ULONG HardwarePlugIn_Release(CMIOHardwarePlugInRef)
 {
-	sRefCount -= 1;
-	DLogFunc(@"sRefCount now = %d", sRefCount);
-	return sRefCount;
+ sRefCount -= 1;
+ DLogFunc(@"sRefCount now = %d", sRefCount);
+ return sRefCount;
 }
 
-HRESULT HardwarePlugIn_QueryInterface(CMIOHardwarePlugInRef, REFIID uuid,
-				 LPVOID *interface)
+HRESULT HardwarePlugIn_QueryInterface(CMIOHardwarePlugInRef, REFIID uuid, LPVOID *interface)
 {
-	if (!interface) {
-		DLogFunc(@"Received an empty interface");
-		return E_POINTER;
-	}
-
-	// Set the returned interface to NULL in case the UUIDs don't match
-	*interface = NULL;
-
-	// Create a CoreFoundation UUIDRef for the requested interface.
-	CFUUIDRef cfUuid = CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, uuid);
-	CFStringRef uuidString = CFUUIDCreateString(NULL, cfUuid);
-	CFStringRef hardwarePluginUuid =
-		CFUUIDCreateString(NULL, kCMIOHardwarePlugInInterfaceID);
-	CFRelease(cfUuid);
-
-	if (CFEqual(uuidString, hardwarePluginUuid)) {
-		// Return the interface;
-		sRefCount += 1;
-		*interface = OBSDALPlugInRef();
-		CFRelease(hardwarePluginUuid);
-		CFRelease(uuidString);
-		return kCMIOHardwareNoError;
-	} else {
-		DLogFunc(@"ERR Queried for some weird UUID %@", uuidString);
-	}
-	CFRelease(hardwarePluginUuid);
-	CFRelease(uuidString);
-	return E_NOINTERFACE;
+ if (!interface) {
+ DLogFunc(@"Received an empty interface");
+ return E_POINTER;
+ }
+
+ // Set the returned interface to NULL in case the UUIDs don't match
+ *interface = NULL;
+
+ // Create a CoreFoundation UUIDRef for the requested interface.
+ CFUUIDRef cfUuid = CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, uuid);
+ CFStringRef uuidString = CFUUIDCreateString(NULL, cfUuid);
+ CFStringRef hardwarePluginUuid = CFUUIDCreateString(NULL, kCMIOHardwarePlugInInterfaceID);
+ CFRelease(cfUuid);
+
+ if (CFEqual(uuidString, hardwarePluginUuid)) {
+ // Return the interface;
+ sRefCount += 1;
+ *interface = OBSDALPlugInRef();
+ CFRelease(hardwarePluginUuid);
+ CFRelease(uuidString);
+ return kCMIOHardwareNoError;
+ } else {
+ DLogFunc(@"ERR Queried for some weird UUID %@", uuidString);
+ }
+ CFRelease(hardwarePluginUuid);
+ CFRelease(uuidString);
+ return E_NOINTERFACE;
 }
 
 // I think this is deprecated, seems that HardwarePlugIn_InitializeWithObjectID gets called instead
-OSStatus HardwarePlugIn_Initialize(CMIOHardwarePlugInRef self
-				 __attribute__((unused)))
+OSStatus HardwarePlugIn_Initialize(CMIOHardwarePlugInRef self __attribute__((unused)))
 {
-	DLogFunc(@"ERR self=%p", self);
-	return kCMIOHardwareUnspecifiedError;
+ DLogFunc(@"ERR self=%p", self);
+ return kCMIOHardwareUnspecifiedError;
 }
 
-OSStatus HardwarePlugIn_InitializeWithObjectID(CMIOHardwarePlugInRef self,
-					 CMIOObjectID objectID)
+OSStatus HardwarePlugIn_InitializeWithObjectID(CMIOHardwarePlugInRef self, CMIOObjectID objectID)
 {
-	DLogFunc(@"self=%p", self);
-
-	OSStatus error = kCMIOHardwareNoError;
-
-	OBSDALPlugin *plugIn = OBSDALPlugin SharedPlugIn;
-	plugIn.objectId = objectID;
-	OBSDALObjectStore SharedObjectStore setObject:plugIn
-					 forObjectId:objectID;
-
-	OBSDALDevice *device = OBSDALDevice alloc init;
-	CMIOObjectID deviceId;
-	error = CMIOObjectCreate(OBSDALPlugInRef(), kCMIOObjectSystemObject,
-				 kCMIODeviceClassID, &deviceId);
-	if (error != noErr) {
-		DLog(@"CMIOObjectCreate Error %d", error);
-		return error;
-	}
-	device.objectId = deviceId;
-	device.pluginId = objectID;
-	OBSDALObjectStore SharedObjectStore setObject:device
-					 forObjectId:deviceId;
-
-	OBSDALStream *stream = OBSDALStream alloc init;
-	CMIOObjectID streamId;
-	error = CMIOObjectCreate(OBSDALPlugInRef(), deviceId,
-				 kCMIOStreamClassID, &streamId);
-	if (error != noErr) {
-		DLog(@"CMIOObjectCreate Error %d", error);
-		return error;
-	}
-	stream.objectId = streamId;
-	OBSDALObjectStore SharedObjectStore setObject:stream
-					 forObjectId:streamId;
-	device.streamId = streamId;
-	plugIn.stream = stream;
-
-	// Tell the system about the Device
-	error = CMIOObjectsPublishedAndDied(
-		OBSDALPlugInRef(), kCMIOObjectSystemObject, 1, &deviceId, 0, 0);
-	if (error != kCMIOHardwareNoError) {
-		DLog(@"CMIOObjectsPublishedAndDied plugin/device Error %d",
-		 error);
-		return error;
-	}
-
-	// Tell the system about the Stream
-	error = CMIOObjectsPublishedAndDied(OBSDALPlugInRef(), deviceId, 1,
-					 &streamId, 0, 0);
-	if (error != kCMIOHardwareNoError) {
-		DLog(@"CMIOObjectsPublishedAndDied device/stream Error %d",
-		 error);
-		return error;
-	}
-
-	return error;
+ DLogFunc(@"self=%p", self);
+
+ OSStatus error = kCMIOHardwareNoError;
+
+ OBSDALPlugin *plugIn = OBSDALPlugin SharedPlugIn;
+ plugIn.objectId = objectID;
+ OBSDALObjectStore SharedObjectStore setObject:plugIn forObjectId:objectID;
+
+ OBSDALDevice *device = OBSDALDevice alloc init;
+ CMIOObjectID deviceId;
+ error = CMIOObjectCreate(OBSDALPlugInRef(), kCMIOObjectSystemObject, kCMIODeviceClassID, &deviceId);
+ if (error != noErr) {
+ DLog(@"CMIOObjectCreate Error %d", error);
+ return error;
+ }
+ device.objectId = deviceId;
+ device.pluginId = objectID;
+ OBSDALObjectStore SharedObjectStore setObject:device forObjectId:deviceId;
+
+ OBSDALStream *stream = OBSDALStream alloc init;
+ CMIOObjectID streamId;
+ error = CMIOObjectCreate(OBSDALPlugInRef(), deviceId, kCMIOStreamClassID, &streamId);
+ if (error != noErr) {
+ DLog(@"CMIOObjectCreate Error %d", error);
+ return error;
+ }
+ stream.objectId = streamId;
+ OBSDALObjectStore SharedObjectStore setObject:stream forObjectId:streamId;
+ device.streamId = streamId;
+ plugIn.stream = stream;
+
+ // Tell the system about the Device
+ error = CMIOObjectsPublishedAndDied(OBSDALPlugInRef(), kCMIOObjectSystemObject, 1, &deviceId, 0, 0);
+ if (error != kCMIOHardwareNoError) {
+ DLog(@"CMIOObjectsPublishedAndDied plugin/device Error %d", error);
+ return error;
+ }
+
+ // Tell the system about the Stream
+ error = CMIOObjectsPublishedAndDied(OBSDALPlugInRef(), deviceId, 1, &streamId, 0, 0);
+ if (error != kCMIOHardwareNoError) {
+ DLog(@"CMIOObjectsPublishedAndDied device/stream Error %d", error);
+ return error;
+ }
+
+ return error;
 }
 
 OSStatus HardwarePlugIn_Teardown(CMIOHardwarePlugInRef self)
 {
-	DLogFunc(@"self=%p", self);
+ DLogFunc(@"self=%p", self);
 
-	OSStatus error = kCMIOHardwareNoError;
+ OSStatus error = kCMIOHardwareNoError;
 
-	OBSDALPlugin *plugIn = OBSDALPlugin SharedPlugIn;
-	plugIn teardown;
+ OBSDALPlugin *plugIn = OBSDALPlugin SharedPlugIn;
+ plugIn teardown;
 
-	return error;
+ return error;
 }
 
 #pragma mark CMIOObject Operations
 
 void HardwarePlugIn_ObjectShow(CMIOHardwarePlugInRef self, CMIOObjectID)
 {
-	DLogFunc(@"self=%p", self);
+ DLogFunc(@"self=%p", self);
 }
 
-Boolean
-HardwarePlugIn_ObjectHasProperty(CMIOHardwarePlugInRef, CMIOObjectID objectID,
-				 const CMIOObjectPropertyAddress *address)
+Boolean HardwarePlugIn_ObjectHasProperty(CMIOHardwarePlugInRef, CMIOObjectID objectID,
+ const CMIOObjectPropertyAddress *address)
 {
-	NSObject<CMIOObject> *object =
-		OBSDALObjectStore GetObjectWithId:objectID;
+ NSObject<CMIOObject> *object = OBSDALObjectStore GetObjectWithId:objectID;
 
-	if (object == nil) {
-		DLogFunc(@"ERR nil object");
-		return false;
-	}
+ if (object == nil) {
+ DLogFunc(@"ERR nil object");
+ return false;
+ }
 
-	Boolean answer = object hasPropertyWithAddress:*address;
+ Boolean answer = object hasPropertyWithAddress:*address;
 
-	return answer;
+ return answer;
 }
 
-OSStatus HardwarePlugIn_ObjectIsPropertySettable(
-	CMIOHardwarePlugInRef self, CMIOObjectID objectID,
-	const CMIOObjectPropertyAddress *address, Boolean *isSettable)
+OSStatus HardwarePlugIn_ObjectIsPropertySettable(CMIOHardwarePlugInRef self, CMIOObjectID objectID,
+ const CMIOObjectPropertyAddress *address, Boolean *isSettable)
 {
+ NSObject<CMIOObject> *object = OBSDALObjectStore GetObjectWithId:objectID;
 
-	NSObject<CMIOObject> *object =
-		OBSDALObjectStore GetObjectWithId:objectID;
+ if (object == nil) {
+ DLogFunc(@"ERR nil object");
+ return kCMIOHardwareBadObjectError;
+ }
 
-	if (object == nil) {
-		DLogFunc(@"ERR nil object");
-		return kCMIOHardwareBadObjectError;
-	}
+ *isSettable = object isPropertySettableWithAddress:*address;
 
-	*isSettable = object isPropertySettableWithAddress:*address;
+ DLogFunc(@"%@(%d) %@ self=%p settable=%d", NSStringFromClass(object class), objectID,
+ OBSDALObjectStore StringFromPropertySelector:address->mSelector, self, *isSettable);
 
-	DLogFunc(@"%@(%d) %@ self=%p settable=%d",
-		 NSStringFromClass(object class), objectID,
-		 OBSDALObjectStore
-			 StringFromPropertySelector:address->mSelector,
-		 self, *isSettable);
-
-	return kCMIOHardwareNoError;
+ return kCMIOHardwareNoError;
 }
 
-OSStatus HardwarePlugIn_ObjectGetPropertyDataSize(
-	CMIOHardwarePlugInRef, CMIOObjectID objectID,
-	const CMIOObjectPropertyAddress *address, UInt32 qualifierDataSize,
-	const void *qualifierData, UInt32 *dataSize)
+OSStatus HardwarePlugIn_ObjectGetPropertyDataSize(CMIOHardwarePlugInRef, CMIOObjectID objectID,
+ const CMIOObjectPropertyAddress *address, UInt32 qualifierDataSize,
+ const void *qualifierData, UInt32 *dataSize)
 {
-	NSObject<CMIOObject> *object =
-		OBSDALObjectStore GetObjectWithId:objectID;
+ NSObject<CMIOObject> *object = OBSDALObjectStore GetObjectWithId:objectID;
 
-	if (object == nil) {
-		DLogFunc(@"ERR nil object");
-		return kCMIOHardwareBadObjectError;
-	}
+ if (object == nil) {
+ DLogFunc(@"ERR nil object");
+ return kCMIOHardwareBadObjectError;
+ }
 
-	*dataSize = object getPropertyDataSizeWithAddress:*address
-					 qualifierDataSize:qualifierDataSize
-					 qualifierData:qualifierData;
+ *dataSize = object getPropertyDataSizeWithAddress:*address qualifierDataSize:qualifierDataSize
+ qualifierData:qualifierData;
 
-	return kCMIOHardwareNoError;
+ return kCMIOHardwareNoError;
 }
 
-OSStatus HardwarePlugIn_ObjectGetPropertyData(
-	CMIOHardwarePlugInRef, CMIOObjectID objectID,
-	const CMIOObjectPropertyAddress *address, UInt32 qualifierDataSize,
-	const void *qualifierData, UInt32 dataSize, UInt32 *dataUsed,
-	void *data)
+OSStatus HardwarePlugIn_ObjectGetPropertyData(CMIOHardwarePlugInRef, CMIOObjectID objectID,
+ const CMIOObjectPropertyAddress *address, UInt32 qualifierDataSize,
+ const void *qualifierData, UInt32 dataSize, UInt32 *dataUsed, void *data)
 {
-	NSObject<CMIOObject> *object =
-		OBSDALObjectStore GetObjectWithId:objectID;
-
-	if (object == nil) {
-		DLogFunc(@"ERR nil object");
-		return kCMIOHardwareBadObjectError;
-	}
-
-	object getPropertyDataWithAddress:*address
-			 qualifierDataSize:qualifierDataSize
-			 qualifierData:qualifierData
-				 dataSize:dataSize
-				 dataUsed:dataUsed
-				 data:data;
-
-	return kCMIOHardwareNoError;
+ NSObject<CMIOObject> *object = OBSDALObjectStore GetObjectWithId:objectID;
+
+ if (object == nil) {
+ DLogFunc(@"ERR nil object");
+ return kCMIOHardwareBadObjectError;
+ }
+
+ object getPropertyDataWithAddress:*address qualifierDataSize:qualifierDataSize qualifierData:qualifierData
+ dataSize:dataSize
+ dataUsed:dataUsed
+ data:data;
+
+ return kCMIOHardwareNoError;
 }
 
-OSStatus HardwarePlugIn_ObjectSetPropertyData(
-	CMIOHardwarePlugInRef self, CMIOObjectID objectID,
-	const CMIOObjectPropertyAddress *address, UInt32 qualifierDataSize,
-	const void *qualifierData, UInt32 dataSize, const void *data)
+OSStatus HardwarePlugIn_ObjectSetPropertyData(CMIOHardwarePlugInRef self, CMIOObjectID objectID,
+ const CMIOObjectPropertyAddress *address, UInt32 qualifierDataSize,
+ const void *qualifierData, UInt32 dataSize, const void *data)
 {
+ NSObject<CMIOObject> *object = OBSDALObjectStore GetObjectWithId:objectID;
 
-	NSObject<CMIOObject> *object =
-		OBSDALObjectStore GetObjectWithId:objectID;
+ if (object == nil) {
+ DLogFunc(@"ERR nil object");
+ return kCMIOHardwareBadObjectError;
+ }
 
-	if (object == nil) {
-		DLogFunc(@"ERR nil object");
-		return kCMIOHardwareBadObjectError;
-	}
+ UInt32 *dataInt = (UInt32 *) data;
+ DLogFunc(@"%@(%d) %@ self=%p data(int)=%d", NSStringFromClass(object class), objectID,
+ OBSDALObjectStore StringFromPropertySelector:address->mSelector, self, *dataInt);
 
-	UInt32 *dataInt = (UInt32 *)data;
-	DLogFunc(@"%@(%d) %@ self=%p data(int)=%d",
-		 NSStringFromClass(object class), objectID,
-		 OBSDALObjectStore
-			 StringFromPropertySelector:address->mSelector,
-		 self, *dataInt);
+ object setPropertyDataWithAddress:*address qualifierDataSize:qualifierDataSize qualifierData:qualifierData
+ dataSize:dataSize
+ data:data;
 
-	object setPropertyDataWithAddress:*address
-			 qualifierDataSize:qualifierDataSize
-			 qualifierData:qualifierData
-				 dataSize:dataSize
-				 data:data;
-
-	return kCMIOHardwareNoError;
+ return kCMIOHardwareNoError;
 }
 
 #pragma mark CMIOStream Operations
-OSStatus HardwarePlugIn_StreamCopyBufferQueue(
-	CMIOHardwarePlugInRef self, CMIOStreamID streamID,
-	CMIODeviceStreamQueueAlteredProc queueAlteredProc,
-	void *queueAlteredRefCon, CMSimpleQueueRef *queue)
-{
 
-	OBSDALStream *stream =
-		(OBSDALStream *)OBSDALObjectStore GetObjectWithId:streamID;
+OSStatus HardwarePlugIn_StreamCopyBufferQueue(CMIOHardwarePlugInRef self, CMIOStreamID streamID,
+ CMIODeviceStreamQueueAlteredProc queueAlteredProc,
+ void *queueAlteredRefCon, CMSimpleQueueRef *queue)
+{
+ OBSDALStream *stream = (OBSDALStream *) OBSDALObjectStore GetObjectWithId:streamID;
 
-	if (stream == nil) {
-		DLogFunc(@"ERR nil object");
-		return kCMIOHardwareBadObjectError;
-	}
+ if (stream == nil) {
+ DLogFunc(@"ERR nil object");
+ return kCMIOHardwareBadObjectError;
+ }
 
-	*queue = stream copyBufferQueueWithAlteredProc:queueAlteredProc
-					 alteredRefCon:queueAlteredRefCon;
+ *queue = stream copyBufferQueueWithAlteredProc:queueAlteredProc alteredRefCon:queueAlteredRefCon;
 
-	DLogFunc(@"%@ (id=%d) self=%p queue=%@", stream, streamID, self,
-		 (__bridge NSObject *)*queue);
+ DLogFunc(@"%@ (id=%d) self=%p queue=%@", stream, streamID, self, (__bridge NSObject *) *queue);
 
-	return kCMIOHardwareNoError;
+ return kCMIOHardwareNoError;
 }
 
 #pragma mark CMIODevice Operations
-OSStatus HardwarePlugIn_DeviceStartStream(CMIOHardwarePlugInRef self,
-					 CMIODeviceID deviceID,
-					 CMIOStreamID streamID)
+
+OSStatus HardwarePlugIn_DeviceStartStream(CMIOHardwarePlugInRef self, CMIODeviceID deviceID, CMIOStreamID streamID)
 {
-	DLogFunc(@"self=%p device=%d stream=%d", self, deviceID, streamID);
+ DLogFunc(@"self=%p device=%d stream=%d", self, deviceID, streamID);
 
-	OBSDALStream *stream =
-		(OBSDALStream *)OBSDALObjectStore GetObjectWithId:streamID;
+ OBSDALStream *stream = (OBSDALStream *) OBSDALObjectStore GetObjectWithId:streamID;
 
-	if (stream == nil) {
-		DLogFunc(@"ERR nil object");
-		return kCMIOHardwareBadObjectError;
-	}
+ if (stream == nil) {
+ DLogFunc(@"ERR nil object");
+ return kCMIOHardwareBadObjectError;
+ }
 
-	OBSDALPlugin SharedPlugIn startStream;
+ OBSDALPlugin SharedPlugIn startStream;
 
-	return kCMIOHardwareNoError;
+ return kCMIOHardwareNoError;
 }
 
 OSStatus HardwarePlugIn_DeviceSuspend(CMIOHardwarePlugInRef self, CMIODeviceID)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareNoError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareNoError;
 }
 
 OSStatus HardwarePlugIn_DeviceResume(CMIOHardwarePlugInRef self, CMIODeviceID)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareNoError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareNoError;
 }
 
-OSStatus HardwarePlugIn_DeviceStopStream(CMIOHardwarePlugInRef self,
-					 CMIODeviceID deviceID,
-					 CMIOStreamID streamID)
+OSStatus HardwarePlugIn_DeviceStopStream(CMIOHardwarePlugInRef self, CMIODeviceID deviceID, CMIOStreamID streamID)
 {
-	DLogFunc(@"self=%p device=%d stream=%d", self, deviceID, streamID);
+ DLogFunc(@"self=%p device=%d stream=%d", self, deviceID, streamID);
 
-	OBSDALStream *stream =
-		(OBSDALStream *)OBSDALObjectStore GetObjectWithId:streamID;
+ OBSDALStream *stream = (OBSDALStream *) OBSDALObjectStore GetObjectWithId:streamID;
 
-	if (stream == nil) {
-		DLogFunc(@"ERR nil object");
-		return kCMIOHardwareBadObjectError;
-	}
+ if (stream == nil) {
+ DLogFunc(@"ERR nil object");
+ return kCMIOHardwareBadObjectError;
+ }
 
-	OBSDALPlugin SharedPlugIn stopStream;
+ OBSDALPlugin SharedPlugIn stopStream;
 
-	return kCMIOHardwareNoError;
+ return kCMIOHardwareNoError;
 }
 
-OSStatus HardwarePlugIn_DeviceProcessAVCCommand(CMIOHardwarePlugInRef self,
-						CMIODeviceID,
-						CMIODeviceAVCCommand *)
+OSStatus HardwarePlugIn_DeviceProcessAVCCommand(CMIOHardwarePlugInRef self, CMIODeviceID, CMIODeviceAVCCommand *)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareNoError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareNoError;
 }
 
-OSStatus HardwarePlugIn_DeviceProcessRS422Command(CMIOHardwarePlugInRef self,
-						 CMIODeviceID,
-						 CMIODeviceRS422Command *)
+OSStatus HardwarePlugIn_DeviceProcessRS422Command(CMIOHardwarePlugInRef self, CMIODeviceID, CMIODeviceRS422Command *)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareNoError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareNoError;
 }
 
 OSStatus HardwarePlugIn_StreamDeckPlay(CMIOHardwarePlugInRef self, CMIOStreamID)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareIllegalOperationError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareIllegalOperationError;
 }
 
 OSStatus HardwarePlugIn_StreamDeckStop(CMIOHardwarePlugInRef self, CMIOStreamID)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareIllegalOperationError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareIllegalOperationError;
 }
 
-OSStatus HardwarePlugIn_StreamDeckJog(CMIOHardwarePlugInRef self, CMIOStreamID,
-				 SInt32)
+OSStatus HardwarePlugIn_StreamDeckJog(CMIOHardwarePlugInRef self, CMIOStreamID, SInt32)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareIllegalOperationError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareIllegalOperationError;
 }
 
-OSStatus HardwarePlugIn_StreamDeckCueTo(CMIOHardwarePlugInRef self,
-					CMIOStreamID, Float64, Boolean)
+OSStatus HardwarePlugIn_StreamDeckCueTo(CMIOHardwarePlugInRef self, CMIOStreamID, Float64, Boolean)
 {
-	DLogFunc(@"self=%p", self);
-	return kCMIOHardwareIllegalOperationError;
+ DLogFunc(@"self=%p", self);
+ return kCMIOHardwareIllegalOperationError;
 }
 
 static CMIOHardwarePlugInInterface sInterface = {
-	// Padding for COM
-	NULL,
-
-	// IUnknown Routines
-	(HRESULT (*)(void *, CFUUIDBytes,
-		 void **))HardwarePlugIn_QueryInterface,
-	(ULONG(*)(void *))HardwarePlugIn_AddRef,
-	(ULONG(*)(void *))HardwarePlugIn_Release,
-
-	// DAL Plug-In Routines
-	HardwarePlugIn_Initialize, HardwarePlugIn_InitializeWithObjectID,
-	HardwarePlugIn_Teardown, HardwarePlugIn_ObjectShow,
-	HardwarePlugIn_ObjectHasProperty,
-	HardwarePlugIn_ObjectIsPropertySettable,
-	HardwarePlugIn_ObjectGetPropertyDataSize,
-	HardwarePlugIn_ObjectGetPropertyData,
-	HardwarePlugIn_ObjectSetPropertyData, HardwarePlugIn_DeviceSuspend,
-	HardwarePlugIn_DeviceResume, HardwarePlugIn_DeviceStartStream,
-	HardwarePlugIn_DeviceStopStream, HardwarePlugIn_DeviceProcessAVCCommand,
-	HardwarePlugIn_DeviceProcessRS422Command,
-	HardwarePlugIn_StreamCopyBufferQueue, HardwarePlugIn_StreamDeckPlay,
-	HardwarePlugIn_StreamDeckStop, HardwarePlugIn_StreamDeckJog,
-	HardwarePlugIn_StreamDeckCueTo};
+ // Padding for COM
+ NULL,
+
+ // IUnknown Routines
+ (HRESULT (*)(void *, CFUUIDBytes, void **)) HardwarePlugIn_QueryInterface, (ULONG(*)(void *)) HardwarePlugIn_AddRef,
+ (ULONG(*)(void *)) HardwarePlugIn_Release,
+
+ // DAL Plug-In Routines
+ HardwarePlugIn_Initialize, HardwarePlugIn_InitializeWithObjectID, HardwarePlugIn_Teardown,
+ HardwarePlugIn_ObjectShow, HardwarePlugIn_ObjectHasProperty, HardwarePlugIn_ObjectIsPropertySettable,
+ HardwarePlugIn_ObjectGetPropertyDataSize, HardwarePlugIn_ObjectGetPropertyData,
+ HardwarePlugIn_ObjectSetPropertyData, HardwarePlugIn_DeviceSuspend, HardwarePlugIn_DeviceResume,
+ HardwarePlugIn_DeviceStartStream, HardwarePlugIn_DeviceStopStream, HardwarePlugIn_DeviceProcessAVCCommand,
+ HardwarePlugIn_DeviceProcessRS422Command, HardwarePlugIn_StreamCopyBufferQueue, HardwarePlugIn_StreamDeckPlay,
+ HardwarePlugIn_StreamDeckStop, HardwarePlugIn_StreamDeckJog, HardwarePlugIn_StreamDeckCueTo};
 
 static CMIOHardwarePlugInInterface *sInterfacePtr = &sInterface;
 static CMIOHardwarePlugInRef sPlugInRef = &sInterfacePtr;
 
 CMIOHardwarePlugInRef OBSDALPlugInRef()
 {
-	return sPlugInRef;
+ return sPlugInRef;
 }

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInMain.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALPlugInMain.mm Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.h -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.h Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm Changed

@@ -27,12 +27,12 @@
 #import "OBSDALPlugIn.h"
 
 @interface OBSDALStream () {
-	CMSimpleQueueRef _queue;
-	CFTypeRef _clock;
-	NSImage *_testCardImage;
-	dispatch_source_t _frameDispatchSource;
-	NSSize _testCardSize;
-	Float64 _fps;
+ CMSimpleQueueRef _queue;
+ CFTypeRef _clock;
+ NSImage *_testCardImage;
+ dispatch_source_t _frameDispatchSource;
+ NSSize _testCardSize;
+ Float64 _fps;
 }
 
 @property CMIODeviceStreamQueueAlteredProc alteredProc;
@@ -48,555 +48,489 @@
 
 @implementation OBSDALStream
 
-#define DEFAULT_FPS 30.0
-#define DEFAULT_WIDTH 1280
+#define DEFAULT_FPS 30.0
+#define DEFAULT_WIDTH 1280
 #define DEFAULT_HEIGHT 720
 
 - (instancetype _Nonnull)init
 {
-	self = super init;
-	if (self) {
-		_frameDispatchSource = dispatch_source_create(
-			DISPATCH_SOURCE_TYPE_TIMER, 0, 0,
-			dispatch_get_global_queue(
-				DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
-		__weak __typeof(self) wself = self;
-		dispatch_source_set_event_handler(_frameDispatchSource, ^{
-			wself fillFrame;
-		});
-	}
-	return self;
+ self = super init;
+ if (self) {
+ _frameDispatchSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0,
+ dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
+ __weak __typeof(self) wself = self;
+ dispatch_source_set_event_handler(_frameDispatchSource, ^{
+ wself fillFrame;
+ });
+ }
+ return self;
 }
 
 - (void)dealloc
 {
-	DLog(@"Stream Dealloc");
-	CMIOStreamClockInvalidate(_clock);
-	CFRelease(_clock);
-	_clock = NULL;
-	CFRelease(_queue);
-	_queue = NULL;
-	dispatch_suspend(_frameDispatchSource);
+ DLog(@"Stream Dealloc");
+ CMIOStreamClockInvalidate(_clock);
+ CFRelease(_clock);
+ _clock = NULL;
+ CFRelease(_queue);
+ _queue = NULL;
+ dispatch_suspend(_frameDispatchSource);
 }
 
 - (void)startServingDefaultFrames
 {
-	DLogFunc(@"");
-	_testCardImage = nil;
-	_testCardSize = NSZeroSize;
-	_fps = 0;
-	dispatch_time_t startTime = dispatch_time(DISPATCH_TIME_NOW, 0);
-	uint64_t intervalTime = (int64_t)(NSEC_PER_SEC / self.fps);
-	dispatch_source_set_timer(_frameDispatchSource, startTime, intervalTime,
-				 0);
-	dispatch_resume(_frameDispatchSource);
+ DLogFunc(@"");
+ _testCardImage = nil;
+ _testCardSize = NSZeroSize;
+ _fps = 0;
+ dispatch_time_t startTime = dispatch_time(DISPATCH_TIME_NOW, 0);
+ uint64_t intervalTime = (int64_t) (NSEC_PER_SEC / self.fps);
+ dispatch_source_set_timer(_frameDispatchSource, startTime, intervalTime, 0);
+ dispatch_resume(_frameDispatchSource);
 }
 
 - (void)stopServingDefaultFrames
 {
-	DLogFunc(@"");
-	dispatch_suspend(_frameDispatchSource);
+ DLogFunc(@"");
+ dispatch_suspend(_frameDispatchSource);
 }
 
 - (CMSimpleQueueRef)queue
 {
-	if (_queue == NULL) {
-		// Allocate a one-second long queue, which we can use our FPS constant for.
-		OSStatus err = CMSimpleQueueCreate(kCFAllocatorDefault,
-						 (int32_t)self.fps, &_queue);
-		if (err != noErr) {
-			DLog(@"Err %d in CMSimpleQueueCreate", err);
-		}
-	}
-	return _queue;
+ if (_queue == NULL) {
+ // Allocate a one-second long queue, which we can use our FPS constant for.
+ OSStatus err = CMSimpleQueueCreate(kCFAllocatorDefault, (int32_t) self.fps, &_queue);
+ if (err != noErr) {
+ DLog(@"Err %d in CMSimpleQueueCreate", err);
+ }
+ }
+ return _queue;
 }
 
 - (CFTypeRef)clock
 {
-	if (_clock == NULL) {
-		OSStatus err = CMIOStreamClockCreate(
-			kCFAllocatorDefault,
-			CFSTR("obs-mac-virtualcam::Stream::clock"),
-			(__bridge void *)self, CMTimeMake(1, 10), 100, 10,
-			&_clock);
-		if (err != noErr) {
-			DLog(@"Error %d from CMIOStreamClockCreate", err);
-		}
-	}
-	return _clock;
+ if (_clock == NULL) {
+ OSStatus err = CMIOStreamClockCreate(kCFAllocatorDefault, CFSTR("obs-mac-virtualcam::Stream::clock"),
+ (__bridge void *) self, CMTimeMake(1, 10), 100, 10, &_clock);
+ if (err != noErr) {
+ DLog(@"Error %d from CMIOStreamClockCreate", err);
+ }
+ }
+ return _clock;
 }
 
 - (NSSize)testCardSize
 {
-	if (NSEqualSizes(_testCardSize, NSZeroSize)) {
-		NSUserDefaults *defaults =
-			NSUserDefaults standardUserDefaults;
-		NSInteger width = defaults objectForKey:kTestCardWidthKey
-			integerValue;
-		NSInteger height = defaults objectForKey:kTestCardHeightKey
-			integerValue;
-		if (width == 0 || height == 0) {
-			_testCardSize =
-				NSMakeSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
-		} else {
-			_testCardSize = NSMakeSize(width, height);
-		}
-	}
-	return _testCardSize;
+ if (NSEqualSizes(_testCardSize, NSZeroSize)) {
+ NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
+ NSInteger width = defaults objectForKey:kTestCardWidthKey integerValue;
+ NSInteger height = defaults objectForKey:kTestCardHeightKey integerValue;
+ if (width == 0 || height == 0) {
+ _testCardSize = NSMakeSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
+ } else {
+ _testCardSize = NSMakeSize(width, height);
+ }
+ }
+ return _testCardSize;
 }
 
 - (Float64)fps
 {
-	if (_fps == 0) {
-		NSUserDefaults *defaults =
-			NSUserDefaults standardUserDefaults;
-		double fps =
-			defaults objectForKey:kTestCardFPSKey doubleValue;
-		if (fps == 0) {
-			_fps = DEFAULT_FPS;
-		} else {
-			_fps = fps;
-		}
-	}
-	return _fps;
+ if (_fps == 0) {
+ NSUserDefaults *defaults = NSUserDefaults standardUserDefaults;
+ double fps = defaults objectForKey:kTestCardFPSKey doubleValue;
+ if (fps == 0) {
+ _fps = DEFAULT_FPS;
+ } else {
+ _fps = fps;
+ }
+ }
+ return _fps;
 }
 
 - (NSImage *)testCardImage
 {
-	if (_testCardImage == nil) {
-		NSString *bundlePath = NSBundle
-			bundleForClass:OBSDALStream class bundlePath;
-		NSString *placeHolderPath = bundlePath
-			stringByAppendingString:
-				@"/Contents/Resources/placeholder.png";
-		NSFileManager *fileManager = NSFileManager defaultManager;
-		NSURL *homeUrl = fileManager homeDirectoryForCurrentUser;
-		NSURL *customUrl = homeUrl
-			URLByAppendingPathComponent:
-				@"Library/Application Support/obs-studio/plugin_config/mac-virtualcam/placeholder.png";
-		NSString *customPlaceHolder = customUrl.path;
-		if (fileManager isReadableFileAtPath:customPlaceHolder)
-			placeHolderPath = customPlaceHolder;
-		DLog(@"PlaceHolder:%@", placeHolderPath);
-		NSImage *placeholderImage = NSImage alloc
-			initWithContentsOfFile:placeHolderPath;
-
-		NSBitmapImageRep *rep = NSBitmapImageRep alloc
-			initWithBitmapDataPlanes:NULL
-				 pixelsWide:(NSInteger)
-							 self.testCardSize.width
-				 pixelsHigh:(NSInteger)self.testCardSize
-							 .height
-				 bitsPerSample:8
-				 samplesPerPixel:4
-					hasAlpha:YES
-					isPlanar:NO
-				 colorSpaceName:NSCalibratedRGBColorSpace
-				 bytesPerRow:0
-				 bitsPerPixel:0;
-		rep.size = self.testCardSize;
-
-		double hScale =
-			placeholderImage.size.width / self.testCardSize.width;
-		double vScale =
-			placeholderImage.size.height / self.testCardSize.height;
-
-		double scaling = fmax(hScale, vScale);
-
-		double newWidth = placeholderImage.size.width / scaling;
-		double newHeight = placeholderImage.size.height / scaling;
-
-		double leftOffset = (self.testCardSize.width - newWidth) / 2;
-		double topOffset = (self.testCardSize.height - newHeight) / 2;
-
-		NSGraphicsContext saveGraphicsState;
-		NSGraphicsContext
-			setCurrentContext:
-				NSGraphicsContext
-					graphicsContextWithBitmapImageRep:rep;
-
-		NSColor *backgroundColor = NSColor blackColor;
-		backgroundColor set;
-		NSRectFill(NSMakeRect(0, 0, self.testCardSize.width,
-				 self.testCardSize.height));
-
-		placeholderImage drawInRect:NSMakeRect(leftOffset, topOffset,
-							newWidth, newHeight)
-				 fromRect:NSZeroRect
-				 operation:NSCompositingOperationCopy
-				 fraction:1.0;
-		NSGraphicsContext restoreGraphicsState;
-
-		NSImage *testCardImage =
-			NSImage alloc initWithSize:self.testCardSize;
-		testCardImage addRepresentation:rep;
-
-		_testCardImage = testCardImage;
-	}
-	return _testCardImage;
+ if (_testCardImage == nil) {
+ NSString *bundlePath = NSBundle bundleForClass:OBSDALStream class bundlePath;
+ NSString *placeHolderPath = bundlePath stringByAppendingString:@"/Contents/Resources/placeholder.png";
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ NSURL *homeUrl = fileManager homeDirectoryForCurrentUser;
+ NSURL *customUrl =
+ homeUrl URLByAppendingPathComponent:
+ @"Library/Application Support/obs-studio/plugin_config/mac-virtualcam/placeholder.png";
+ NSString *customPlaceHolder = customUrl.path;
+ if (fileManager isReadableFileAtPath:customPlaceHolder)
+ placeHolderPath = customPlaceHolder;
+ DLog(@"PlaceHolder:%@", placeHolderPath);
+ NSImage *placeholderImage = NSImage alloc initWithContentsOfFile:placeHolderPath;
+
+ NSBitmapImageRep *rep = NSBitmapImageRep alloc initWithBitmapDataPlanes:NULL
+ pixelsWide:(NSInteger) self.testCardSize.width
+ pixelsHigh:(NSInteger) self.testCardSize.height
+ bitsPerSample:8
+ samplesPerPixel:4
+ hasAlpha:YES
+ isPlanar:NO
+ colorSpaceName:NSCalibratedRGBColorSpace
+ bytesPerRow:0
+ bitsPerPixel:0;
+ rep.size = self.testCardSize;
+
+ double hScale = placeholderImage.size.width / self.testCardSize.width;
+ double vScale = placeholderImage.size.height / self.testCardSize.height;
+
+ double scaling = fmax(hScale, vScale);
+
+ double newWidth = placeholderImage.size.width / scaling;
+ double newHeight = placeholderImage.size.height / scaling;
+
+ double leftOffset = (self.testCardSize.width - newWidth) / 2;
+ double topOffset = (self.testCardSize.height - newHeight) / 2;
+
+ NSGraphicsContext saveGraphicsState;
+ NSGraphicsContext setCurrentContext:NSGraphicsContext graphicsContextWithBitmapImageRep:rep;
+
+ NSColor *backgroundColor = NSColor blackColor;
+ backgroundColor set;
+ NSRectFill(NSMakeRect(0, 0, self.testCardSize.width, self.testCardSize.height));
+
+ placeholderImage drawInRect:NSMakeRect(leftOffset, topOffset, newWidth, newHeight) fromRect:NSZeroRect
+ operation:NSCompositingOperationCopy
+ fraction:1.0;
+ NSGraphicsContext restoreGraphicsState;
+
+ NSImage *testCardImage = NSImage alloc initWithSize:self.testCardSize;
+ testCardImage addRepresentation:rep;
+
+ _testCardImage = testCardImage;
+ }
+ return _testCardImage;
 }
 
-- (CMSimpleQueueRef)copyBufferQueueWithAlteredProc:
-			 (CMIODeviceStreamQueueAlteredProc)alteredProc
-				 alteredRefCon:(void *)alteredRefCon
+- (CMSimpleQueueRef)copyBufferQueueWithAlteredProc:(CMIODeviceStreamQueueAlteredProc)alteredProc
+ alteredRefCon:(void *)alteredRefCon
 {
-	self.alteredProc = alteredProc;
-	self.alteredRefCon = alteredRefCon;
+ self.alteredProc = alteredProc;
+ self.alteredRefCon = alteredRefCon;
 
-	// Retain this since it's a copy operation
-	CFRetain(self.queue);
+ // Retain this since it's a copy operation
+ CFRetain(self.queue);
 
-	return self.queue;
+ return self.queue;
 }
 
 - (CVPixelBufferRef)createPixelBufferWithTestAnimation
 {
-	int width = (int)self.testCardSize.width;
-	int height = (int)self.testCardSize.height;
-
-	NSDictionary *options = NSDictionary
-		dictionaryWithObjectsAndKeys:
-			NSNumber numberWithBool:YES,
-			kCVPixelBufferCGImageCompatibilityKey,
-			NSNumber numberWithBool:YES,
-			kCVPixelBufferCGBitmapContextCompatibilityKey, nil;
-	CVPixelBufferRef pxbuffer = NULL;
-	CVReturn status = CVPixelBufferCreate(kCFAllocatorDefault, width,
-					 height, kCVPixelFormatType_32ARGB,
-					 (__bridge CFDictionaryRef)options,
-					 &pxbuffer);
-
-	NSParameterAssert(status == kCVReturnSuccess && pxbuffer != NULL);
-
-	CVPixelBufferLockBaseAddress(pxbuffer, 0);
-	void *pxdata = CVPixelBufferGetBaseAddressOfPlane(pxbuffer, 0);
-	NSParameterAssert(pxdata != NULL);
-
-	CGColorSpaceRef rgbColorSpace = CGColorSpaceCreateDeviceRGB();
-	CGContextRef context = CGBitmapContextCreate(
-		pxdata, width, height, 8,
-		CVPixelBufferGetBytesPerRowOfPlane(pxbuffer, 0), rgbColorSpace,
-		kCGImageAlphaPremultipliedFirst | kCGImageByteOrder32Big);
-	CFRelease(rgbColorSpace);
-	NSParameterAssert(context);
-
-	NSGraphicsContext *nsContext = NSGraphicsContext
-		graphicsContextWithCGContext:context
-				 flipped:NO;
-	NSGraphicsContext setCurrentContext:nsContext;
-
-	NSRect rect = NSMakeRect(0, 0, self.testCardImage.size.width,
-				 self.testCardImage.size.height);
-	CGImageRef image = self.testCardImage CGImageForProposedRect:&rect
-							 context:nsContext
-								hints:nil;
-	CGContextDrawImage(context,
-			 CGRectMake(0, 0, CGImageGetWidth(image),
-				 CGImageGetHeight(image)),
-			 image);
-
-	//	DrawDialWithFrame(
-	//		NSMakeRect(0, 0, width, height),
-	//		(int(self.fps) - self.sequenceNumber % int(self.fps)) * 360 /
-	//			int(self.fps));
-
-	CGContextRelease(context);
-
-	CVPixelBufferUnlockBaseAddress(pxbuffer, 0);
-
-	return pxbuffer;
+ int width = (int) self.testCardSize.width;
+ int height = (int) self.testCardSize.height;
+
+ NSDictionary *options = NSDictionary
+ dictionaryWithObjectsAndKeys:NSNumber numberWithBool:YES, kCVPixelBufferCGImageCompatibilityKey,
+ NSNumber numberWithBool:YES, kCVPixelBufferCGBitmapContextCompatibilityKey, nil;
+ CVPixelBufferRef pxbuffer = NULL;
+ CVReturn status = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_32ARGB,
+ (__bridge CFDictionaryRef) options, &pxbuffer);
+
+ NSParameterAssert(status == kCVReturnSuccess && pxbuffer != NULL);
+
+ CVPixelBufferLockBaseAddress(pxbuffer, 0);
+ void *pxdata = CVPixelBufferGetBaseAddressOfPlane(pxbuffer, 0);
+ NSParameterAssert(pxdata != NULL);
+
+ CGColorSpaceRef rgbColorSpace = CGColorSpaceCreateDeviceRGB();
+ CGContextRef context = CGBitmapContextCreate(pxdata, width, height, 8,
+ CVPixelBufferGetBytesPerRowOfPlane(pxbuffer, 0), rgbColorSpace,
+ kCGImageAlphaPremultipliedFirst | kCGImageByteOrder32Big);
+ CFRelease(rgbColorSpace);
+ NSParameterAssert(context);
+
+ NSGraphicsContext *nsContext = NSGraphicsContext graphicsContextWithCGContext:context flipped:NO;
+ NSGraphicsContext setCurrentContext:nsContext;
+
+ NSRect rect = NSMakeRect(0, 0, self.testCardImage.size.width, self.testCardImage.size.height);
+ CGImageRef image = self.testCardImage CGImageForProposedRect:&rect context:nsContext hints:nil;
+ CGContextDrawImage(context, CGRectMake(0, 0, CGImageGetWidth(image), CGImageGetHeight(image)), image);
+
+ //	DrawDialWithFrame(
+ //		NSMakeRect(0, 0, width, height),
+ //		(int(self.fps) - self.sequenceNumber % int(self.fps)) * 360 /
+ //			int(self.fps));
+
+ CGContextRelease(context);
+
+ CVPixelBufferUnlockBaseAddress(pxbuffer, 0);
+
+ return pxbuffer;
 }
 
 - (void)fillFrame
 {
-	if (CMSimpleQueueGetFullness(self.queue) >= 1.0) {
-		return;
-	}
-
-	CVPixelBufferRef pixelBuffer =
-		self createPixelBufferWithTestAnimation;
-
-	uint64_t hostTime = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
-	CMSampleTimingInfo timingInfo =
-		CMSampleTimingInfoForTimestamp(hostTime, (uint32_t)self.fps, 1);
-
-	OSStatus err = CMIOStreamClockPostTimingEvent(
-		timingInfo.presentationTimeStamp, hostTime, true, self.clock);
-	if (err != noErr) {
-		DLog(@"CMIOStreamClockPostTimingEvent err %d", err);
-	}
-
-	CMFormatDescriptionRef format;
-	CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault,
-						 pixelBuffer, &format);
-
-	self.sequenceNumber = CMIOGetNextSequenceNumber(self.sequenceNumber);
-
-	CMSampleBufferRef buffer;
-	err = CMIOSampleBufferCreateForImageBuffer(
-		kCFAllocatorDefault, pixelBuffer, format, &timingInfo,
-		self.sequenceNumber, kCMIOSampleBufferNoDiscontinuities,
-		&buffer);
-	CFRelease(pixelBuffer);
-	CFRelease(format);
-	if (err != noErr) {
-		DLog(@"CMIOSampleBufferCreateForImageBuffer err %d", err);
-	}
-
-	CMSimpleQueueEnqueue(self.queue, buffer);
-
-	// Inform the clients that the queue has been altered
-	if (self.alteredProc != NULL) {
-		(self.alteredProc)(self.objectId, buffer, self.alteredRefCon);
-	}
+ if (CMSimpleQueueGetFullness(self.queue) >= 1.0) {
+ return;
+ }
+
+ CVPixelBufferRef pixelBuffer = self createPixelBufferWithTestAnimation;
+
+ uint64_t hostTime = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
+ CMSampleTimingInfo timingInfo = CMSampleTimingInfoForTimestamp(hostTime, (uint32_t) self.fps, 1);
+
+ OSStatus err = CMIOStreamClockPostTimingEvent(timingInfo.presentationTimeStamp, hostTime, true, self.clock);
+ if (err != noErr) {
+ DLog(@"CMIOStreamClockPostTimingEvent err %d", err);
+ }
+
+ CMFormatDescriptionRef format;
+ CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, pixelBuffer, &format);
+
+ self.sequenceNumber = CMIOGetNextSequenceNumber(self.sequenceNumber);
+
+ CMSampleBufferRef buffer;
+ err = CMIOSampleBufferCreateForImageBuffer(kCFAllocatorDefault, pixelBuffer, format, &timingInfo,
+ self.sequenceNumber, kCMIOSampleBufferNoDiscontinuities, &buffer);
+ CFRelease(pixelBuffer);
+ CFRelease(format);
+ if (err != noErr) {
+ DLog(@"CMIOSampleBufferCreateForImageBuffer err %d", err);
+ }
+
+ CMSimpleQueueEnqueue(self.queue, buffer);
+
+ // Inform the clients that the queue has been altered
+ if (self.alteredProc != NULL) {
+ (self.alteredProc)(self.objectId, buffer, self.alteredRefCon);
+ }
 }
 
 - (void)queuePixelBuffer:(CVPixelBufferRef)frame
-	 timestamp:(uint64_t)timestamp
-	 fpsNumerator:(uint32_t)fpsNumerator
-	 fpsDenominator:(uint32_t)fpsDenominator
+ timestamp:(uint64_t)timestamp
+ fpsNumerator:(uint32_t)fpsNumerator
+ fpsDenominator:(uint32_t)fpsDenominator
 {
-	if (CMSimpleQueueGetFullness(self.queue) >= 1.0) {
-		DLog(@"Queue is full, bailing out");
-		return;
-	}
-	OSStatus err = noErr;
-
-	CMSampleTimingInfo timingInfo = CMSampleTimingInfoForTimestamp(
-		timestamp, fpsNumerator, fpsDenominator);
-
-	err = CMIOStreamClockPostTimingEvent(
-		timingInfo.presentationTimeStamp,
-		clock_gettime_nsec_np(CLOCK_UPTIME_RAW), true, self.clock);
-	if (err != noErr) {
-		DLog(@"CMIOStreamClockPostTimingEvent err %d", err);
-	}
-
-	self.sequenceNumber = CMIOGetNextSequenceNumber(self.sequenceNumber);
-
-	CMSampleBufferRef sampleBuffer;
-
-	// Generate the video format description from that pixel buffer
-	CMVideoFormatDescriptionRef format;
-	err = CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault,
-							 frame, &format);
-	if (err != noErr) {
-		DLog(@"CMVideoFormatDescriptionCreateForImageBuffer err %d",
-		 err);
-		return;
-	}
-
-	err = CMIOSampleBufferCreateForImageBuffer(
-		kCFAllocatorDefault, frame, format, &timingInfo,
-		self.sequenceNumber, kCMIOSampleBufferNoDiscontinuities,
-		&sampleBuffer);
-
-	CFRelease(format);
-
-	if (err != noErr) {
-		DLog(@"CMIOSampleBufferCreateForImageBuffer err %d", err);
-		return;
-	}
-
-	err = CMSimpleQueueEnqueue(self.queue, sampleBuffer);
-
-	if (err != noErr) {
-		CFRelease(sampleBuffer);
-
-		DLog(@"CMSimpleQueueEnqueue err %d", err);
-		return;
-	}
-
-	// Inform the clients that the queue has been altered
-	if (self.alteredProc != NULL) {
-		(self.alteredProc)(self.objectId, sampleBuffer,
-				 self.alteredRefCon);
-	}
+ if (CMSimpleQueueGetFullness(self.queue) >= 1.0) {
+ DLog(@"Queue is full, bailing out");
+ return;
+ }
+ OSStatus err = noErr;
+
+ CMSampleTimingInfo timingInfo = CMSampleTimingInfoForTimestamp(timestamp, fpsNumerator, fpsDenominator);
+
+ err = CMIOStreamClockPostTimingEvent(timingInfo.presentationTimeStamp, clock_gettime_nsec_np(CLOCK_UPTIME_RAW),
+ true, self.clock);
+ if (err != noErr) {
+ DLog(@"CMIOStreamClockPostTimingEvent err %d", err);
+ }
+
+ self.sequenceNumber = CMIOGetNextSequenceNumber(self.sequenceNumber);
+
+ CMSampleBufferRef sampleBuffer;
+
+ // Generate the video format description from that pixel buffer
+ CMVideoFormatDescriptionRef format;
+ err = CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, frame, &format);
+ if (err != noErr) {
+ DLog(@"CMVideoFormatDescriptionCreateForImageBuffer err %d", err);
+ return;
+ }
+
+ err = CMIOSampleBufferCreateForImageBuffer(kCFAllocatorDefault, frame, format, &timingInfo, self.sequenceNumber,
+ kCMIOSampleBufferNoDiscontinuities, &sampleBuffer);
+
+ CFRelease(format);
+
+ if (err != noErr) {
+ DLog(@"CMIOSampleBufferCreateForImageBuffer err %d", err);
+ return;
+ }
+
+ err = CMSimpleQueueEnqueue(self.queue, sampleBuffer);
+
+ if (err != noErr) {
+ CFRelease(sampleBuffer);
+
+ DLog(@"CMSimpleQueueEnqueue err %d", err);
+ return;
+ }
+
+ // Inform the clients that the queue has been altered
+ if (self.alteredProc != NULL) {
+ (self.alteredProc)(self.objectId, sampleBuffer, self.alteredRefCon);
+ }
 }
 
 - (CMVideoFormatDescriptionRef)getFormatDescription
 {
-	CMVideoFormatDescriptionRef formatDescription;
-	OSStatus err = CMVideoFormatDescriptionCreate(
-		kCFAllocatorDefault,
-		kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
-		(int32_t)self.testCardSize.width,
-		(int32_t)self.testCardSize.height, NULL, &formatDescription);
-	if (err != noErr) {
-		DLog(@"Error %d from CMVideoFormatDescriptionCreate", err);
-	}
-	return formatDescription;
+ CMVideoFormatDescriptionRef formatDescription;
+ OSStatus err = CMVideoFormatDescriptionCreate(kCFAllocatorDefault, kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
+ (int32_t) self.testCardSize.width, (int32_t) self.testCardSize.height,
+ NULL, &formatDescription);
+ if (err != noErr) {
+ DLog(@"Error %d from CMVideoFormatDescriptionCreate", err);
+ }
+ return formatDescription;
 }
 
 #pragma mark - CMIOObject
 
 - (UInt32)getPropertyDataSizeWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-			 qualifierData:(nonnull const void *)qualifierData
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
 {
-	switch (address.mSelector) {
-	case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
-		return sizeof(CMTime);
-	case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
-		return sizeof(UInt32);
-	case kCMIOObjectPropertyName:
-		return sizeof(CFStringRef);
-	case kCMIOObjectPropertyManufacturer:
-		return sizeof(CFStringRef);
-	case kCMIOObjectPropertyElementName:
-		return sizeof(CFStringRef);
-	case kCMIOObjectPropertyElementCategoryName:
-		return sizeof(CFStringRef);
-	case kCMIOObjectPropertyElementNumberName:
-		return sizeof(CFStringRef);
-	case kCMIOStreamPropertyDirection:
-		return sizeof(UInt32);
-	case kCMIOStreamPropertyTerminalType:
-		return sizeof(UInt32);
-	case kCMIOStreamPropertyStartingChannel:
-		return sizeof(UInt32);
-	case kCMIOStreamPropertyLatency:
-		return sizeof(UInt32);
-	case kCMIOStreamPropertyFormatDescriptions:
-		return sizeof(CFArrayRef);
-	case kCMIOStreamPropertyFormatDescription:
-		return sizeof(CMFormatDescriptionRef);
-	case kCMIOStreamPropertyFrameRateRanges:
-		return sizeof(AudioValueRange);
-	case kCMIOStreamPropertyFrameRate:
-	case kCMIOStreamPropertyFrameRates:
-		return sizeof(Float64);
-	case kCMIOStreamPropertyMinimumFrameRate:
-		return sizeof(Float64);
-	case kCMIOStreamPropertyClock:
-		return sizeof(CFTypeRef);
-	default:
-		return 0;
-	};
+ switch (address.mSelector) {
+ case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
+ return sizeof(CMTime);
+ case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
+ return sizeof(UInt32);
+ case kCMIOObjectPropertyName:
+ return sizeof(CFStringRef);
+ case kCMIOObjectPropertyManufacturer:
+ return sizeof(CFStringRef);
+ case kCMIOObjectPropertyElementName:
+ return sizeof(CFStringRef);
+ case kCMIOObjectPropertyElementCategoryName:
+ return sizeof(CFStringRef);
+ case kCMIOObjectPropertyElementNumberName:
+ return sizeof(CFStringRef);
+ case kCMIOStreamPropertyDirection:
+ return sizeof(UInt32);
+ case kCMIOStreamPropertyTerminalType:
+ return sizeof(UInt32);
+ case kCMIOStreamPropertyStartingChannel:
+ return sizeof(UInt32);
+ case kCMIOStreamPropertyLatency:
+ return sizeof(UInt32);
+ case kCMIOStreamPropertyFormatDescriptions:
+ return sizeof(CFArrayRef);
+ case kCMIOStreamPropertyFormatDescription:
+ return sizeof(CMFormatDescriptionRef);
+ case kCMIOStreamPropertyFrameRateRanges:
+ return sizeof(AudioValueRange);
+ case kCMIOStreamPropertyFrameRate:
+ case kCMIOStreamPropertyFrameRates:
+ return sizeof(Float64);
+ case kCMIOStreamPropertyMinimumFrameRate:
+ return sizeof(Float64);
+ case kCMIOStreamPropertyClock:
+ return sizeof(CFTypeRef);
+ default:
+ return 0;
+ };
 }
 
 - (void)getPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		 qualifierData:(nonnull const void *)qualifierData
-			 dataSize:(UInt32)dataSize
-			 dataUsed:(nonnull UInt32 *)dataUsed
-			 data:(nonnull void *)data
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
+ dataSize:(UInt32)dataSize
+ dataUsed:(nonnull UInt32 *)dataUsed
+ data:(nonnull void *)data
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-		*static_cast<CFStringRef *>(data) = CFSTR("OBS Virtual Camera");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIOObjectPropertyElementName:
-		*static_cast<CFStringRef *>(data) =
-			CFSTR("OBS Virtual Camera Stream Element");
-		*dataUsed = sizeof(CFStringRef);
-		break;
-	case kCMIOObjectPropertyManufacturer:
-	case kCMIOObjectPropertyElementCategoryName:
-	case kCMIOObjectPropertyElementNumberName:
-	case kCMIOStreamPropertyTerminalType:
-	case kCMIOStreamPropertyStartingChannel:
-	case kCMIOStreamPropertyLatency:
-	case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
-	case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
-		break;
-	case kCMIOStreamPropertyDirection:
-		*static_cast<UInt32 *>(data) = 1;
-		*dataUsed = sizeof(UInt32);
-		break;
-	case kCMIOStreamPropertyFormatDescriptions:
-		*static_cast<CFArrayRef *>(
-			data) = (__bridge_retained CFArrayRef)NSArray
-			arrayWithObject:(__bridge_transfer NSObject *)
-						self getFormatDescription;
-		*dataUsed = sizeof(CFArrayRef);
-		break;
-	case kCMIOStreamPropertyFormatDescription:
-		*static_cast<CMVideoFormatDescriptionRef *>(data) =
-			self getFormatDescription;
-		*dataUsed = sizeof(CMVideoFormatDescriptionRef);
-		break;
-	case kCMIOStreamPropertyFrameRateRanges:
-		AudioValueRange range;
-		range.mMinimum = self.fps;
-		range.mMaximum = self.fps;
-		*static_cast<AudioValueRange *>(data) = range;
-		*dataUsed = sizeof(AudioValueRange);
-		break;
-	case kCMIOStreamPropertyFrameRate:
-	case kCMIOStreamPropertyFrameRates:
-		*static_cast<Float64 *>(data) = self.fps;
-		*dataUsed = sizeof(Float64);
-		break;
-	case kCMIOStreamPropertyMinimumFrameRate:
-		*static_cast<Float64 *>(data) = self.fps;
-		*dataUsed = sizeof(Float64);
-		break;
-	case kCMIOStreamPropertyClock:
-		*static_cast<CFTypeRef *>(data) = self.clock;
-		// This one was incredibly tricky and cost me many hours to find. It seems that DAL expects
-		// the clock to be retained when returned. It's unclear why, and that seems inconsistent
-		// with other properties that don't have the same behavior. But this is what Apple's sample
-		// code does.
-		// https://github.com/lvsti/CoreMediaIO-DAL-Example/blob/0392cb/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/DP/Properties/CMIO_DP_Property_Clock.cpp#L75
-		CFRetain(*static_cast<CFTypeRef *>(data));
-		*dataUsed = sizeof(CFTypeRef);
-		break;
-	default:
-		*dataUsed = 0;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ *static_cast<CFStringRef *>(data) = CFSTR("OBS Virtual Camera");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIOObjectPropertyElementName:
+ *static_cast<CFStringRef *>(data) = CFSTR("OBS Virtual Camera Stream Element");
+ *dataUsed = sizeof(CFStringRef);
+ break;
+ case kCMIOObjectPropertyManufacturer:
+ case kCMIOObjectPropertyElementCategoryName:
+ case kCMIOObjectPropertyElementNumberName:
+ case kCMIOStreamPropertyTerminalType:
+ case kCMIOStreamPropertyStartingChannel:
+ case kCMIOStreamPropertyLatency:
+ case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
+ case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
+ break;
+ case kCMIOStreamPropertyDirection:
+ *static_cast<UInt32 *>(data) = 1;
+ *dataUsed = sizeof(UInt32);
+ break;
+ case kCMIOStreamPropertyFormatDescriptions:
+ *static_cast<CFArrayRef *>(data) = (__bridge_retained CFArrayRef)
+ NSArray arrayWithObject:(__bridge_transfer NSObject *) self getFormatDescription;
+ *dataUsed = sizeof(CFArrayRef);
+ break;
+ case kCMIOStreamPropertyFormatDescription:
+ *static_cast<CMVideoFormatDescriptionRef *>(data) = self getFormatDescription;
+ *dataUsed = sizeof(CMVideoFormatDescriptionRef);
+ break;
+ case kCMIOStreamPropertyFrameRateRanges:
+ AudioValueRange range;
+ range.mMinimum = self.fps;
+ range.mMaximum = self.fps;
+ *static_cast<AudioValueRange *>(data) = range;
+ *dataUsed = sizeof(AudioValueRange);
+ break;
+ case kCMIOStreamPropertyFrameRate:
+ case kCMIOStreamPropertyFrameRates:
+ *static_cast<Float64 *>(data) = self.fps;
+ *dataUsed = sizeof(Float64);
+ break;
+ case kCMIOStreamPropertyMinimumFrameRate:
+ *static_cast<Float64 *>(data) = self.fps;
+ *dataUsed = sizeof(Float64);
+ break;
+ case kCMIOStreamPropertyClock:
+ *static_cast<CFTypeRef *>(data) = self.clock;
+ // This one was incredibly tricky and cost me many hours to find. It seems that DAL expects
+ // the clock to be retained when returned. It's unclear why, and that seems inconsistent
+ // with other properties that don't have the same behavior. But this is what Apple's sample
+ // code does.
+ // https://github.com/lvsti/CoreMediaIO-DAL-Example/blob/0392cb/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/DP/Properties/CMIO_DP_Property_Clock.cpp#L75
+ CFRetain(*static_cast<CFTypeRef *>(data));
+ *dataUsed = sizeof(CFTypeRef);
+ break;
+ default:
+ *dataUsed = 0;
+ };
 }
 
 - (BOOL)hasPropertyWithAddress:(CMIOObjectPropertyAddress)address
 {
-	switch (address.mSelector) {
-	case kCMIOObjectPropertyName:
-	case kCMIOObjectPropertyElementName:
-	case kCMIOStreamPropertyFormatDescriptions:
-	case kCMIOStreamPropertyFormatDescription:
-	case kCMIOStreamPropertyFrameRateRanges:
-	case kCMIOStreamPropertyFrameRate:
-	case kCMIOStreamPropertyFrameRates:
-	case kCMIOStreamPropertyMinimumFrameRate:
-	case kCMIOStreamPropertyClock:
-		return true;
-	case kCMIOObjectPropertyManufacturer:
-	case kCMIOObjectPropertyElementCategoryName:
-	case kCMIOObjectPropertyElementNumberName:
-	case kCMIOStreamPropertyDirection:
-	case kCMIOStreamPropertyTerminalType:
-	case kCMIOStreamPropertyStartingChannel:
-	case kCMIOStreamPropertyLatency:
-	case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
-	case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
-		DLog(@"TODO: %@",
-		 OBSDALObjectStore
-			 StringFromPropertySelector:address.mSelector);
-		return false;
-	default:
-		return false;
-	};
+ switch (address.mSelector) {
+ case kCMIOObjectPropertyName:
+ case kCMIOObjectPropertyElementName:
+ case kCMIOStreamPropertyFormatDescriptions:
+ case kCMIOStreamPropertyFormatDescription:
+ case kCMIOStreamPropertyFrameRateRanges:
+ case kCMIOStreamPropertyFrameRate:
+ case kCMIOStreamPropertyFrameRates:
+ case kCMIOStreamPropertyMinimumFrameRate:
+ case kCMIOStreamPropertyClock:
+ return true;
+ case kCMIOObjectPropertyManufacturer:
+ case kCMIOObjectPropertyElementCategoryName:
+ case kCMIOObjectPropertyElementNumberName:
+ case kCMIOStreamPropertyDirection:
+ case kCMIOStreamPropertyTerminalType:
+ case kCMIOStreamPropertyStartingChannel:
+ case kCMIOStreamPropertyLatency:
+ case kCMIOStreamPropertyInitialPresentationTimeStampForLinkedAndSyncedAudio:
+ case kCMIOStreamPropertyOutputBuffersNeededForThrottledPlayback:
+ DLog(@"TODO: %@", OBSDALObjectStore StringFromPropertySelector:address.mSelector);
+ return false;
+ default:
+ return false;
+ };
 }
 
 - (BOOL)isPropertySettableWithAddress:(CMIOObjectPropertyAddress)address
 {
-	switch (address.mSelector) {
-	case kCMIOStreamPropertyFormatDescription:
-	case kCMIOStreamPropertyFrameRate:
-		// Suppress error logs complaining about the application not being able to set the desired format or frame rate.
-		return true;
-	default:
-		return false;
-	}
+ switch (address.mSelector) {
+ case kCMIOStreamPropertyFormatDescription:
+ case kCMIOStreamPropertyFrameRate:
+ // Suppress error logs complaining about the application not being able to set the desired format or frame rate.
+ return true;
+ default:
+ return false;
+ }
 }
 
 - (void)setPropertyDataWithAddress:(CMIOObjectPropertyAddress)address
-		 qualifierDataSize:(UInt32)qualifierDataSize
-		 qualifierData:(nonnull const void *)qualifierData
-			 dataSize:(UInt32)dataSize
-			 data:(nonnull const void *)data
-{
-}
+ qualifierDataSize:(UInt32)qualifierDataSize
+ qualifierData:(nonnull const void *)qualifierData
+ dataSize:(UInt32)dataSize
+ data:(nonnull const void *)data
+{}
 
 @end

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/dal-plugin/cmake/macos/Info.plist.in -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/dal-plugin/cmake/macos/Info.plist.in Changed

@@ -2,28 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleName</key>
-	<string>obs-mac-virtualcam</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.obs-mac-virtualcam</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleExecutable</key>
-	<string>obs-mac-virtualcam</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
 	<key>CFPlugInFactories</key>
 	<dict>
 		<key>7E950B8C-5E49-4B9E-B7D0-B3608A08E8F6</key>

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/CMakeLists.txt Changed

@@ -1,29 +1,27 @@
-cmake_minimum_required(VERSION 3.22...3.25)
-
-legacy_check()
-
-find_library(APPKIT AppKit)
-find_library(COREVIDEO CoreVideo)
-find_library(IOSURFACE IOSurface)
-mark_as_advanced(APPKIT COREVIDEO IOSURFACE)
+cmake_minimum_required(VERSION 3.24...3.25)
 
 add_library(mac-virtualcam MODULE)
 add_library(OBS::virtualcam ALIAS mac-virtualcam)
 
 target_sources(mac-virtualcam PRIVATE Defines.h plugin-main.mm OBSDALMachServer.mm OBSDALMachServer.h)
-target_compile_features(mac-virtualcam PRIVATE cxx_deleted_functions cxx_rvalue_references cxx_std_17)
+target_compile_options(mac-virtualcam PRIVATE -fmodules -fcxx-modules)
+
 if(NOT XCODE)
   target_compile_options(mac-virtualcam PRIVATE -fobjc-arc -fobjc-weak)
 endif()
 
-target_link_libraries(mac-virtualcam PRIVATE OBS::mach-protocol OBS::libobs OBS::frontend-api ${APPKIT} ${COREVIDEO}
-                                             ${IOSURFACE})
+target_link_libraries(mac-virtualcam PRIVATE OBS::mach-protocol OBS::libobs OBS::frontend-api)
 
+# cmake-format: off
 set_target_properties_obs(
   mac-virtualcam
   PROPERTIES FOLDER plugins
              PREFIX ""
+             MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/Info.plist.in"
              LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../"
              XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES
              XCODE_ATTRIBUTE_CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION YES
-             XCODE_ATTRIBUTE_GCC_WARN_SHADOW YES)
+             XCODE_ATTRIBUTE_GCC_WARN_SHADOW YES
+             XCODE_ATTRIBUTE_CLANG_ENABLE_MODULES YES
+             XCODE_ATTRIBUTE_CLANG_MODULES_AUTOLINK YES)
+# cmake-format: on

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.h -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.h Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/OBSDALMachServer.mm Changed

@@ -7,7 +7,6 @@
 
 #import "OBSDALMachServer.h"
 #include <obs-module.h>
-#include <CoreVideo/CoreVideo.h>
 #include "MachProtocol.h"
 #include "Defines.h"
 
@@ -21,26 +20,26 @@
 
 - (id)init
 {
-	if (self = super init) {
-		self.clientPorts = NSMutableSet alloc init;
-	}
-	return self;
+ if (self = super init) {
+ self.clientPorts = NSMutableSet alloc init;
+ }
+ return self;
 }
 
 - (void)dealloc
 {
-	blog(LOG_DEBUG, "tearing down MachServer");
-	self.runLoop removePort:self.port forMode:NSDefaultRunLoopMode;
-	self.port invalidate;
-	self.port.delegate = nil;
+ blog(LOG_DEBUG, "tearing down MachServer");
+ self.runLoop removePort:self.port forMode:NSDefaultRunLoopMode;
+ self.port invalidate;
+ self.port.delegate = nil;
 }
 
 - (void)run
 {
-	if (self.port != nil) {
-		blog(LOG_DEBUG, "mach server already running!");
-		return;
-	}
+ if (self.port != nil) {
+ blog(LOG_DEBUG, "mach server already running!");
+ return;
+ }
 
 // It's a bummer this is deprecated. The replacement, NSXPCConnection, seems to require
 // an assistant process that lives inside the .app bundle. This would be more modern, but adds
@@ -50,145 +49,119 @@
 // these APIs (which are, interestingly, not deprecated)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-	self.port = NSMachBootstrapServer sharedInstance
-		servicePortWithName:@MACH_SERVICE_NAME;
+ self.port = NSMachBootstrapServer sharedInstance servicePortWithName:@MACH_SERVICE_NAME;
 #pragma clang diagnostic pop
-	if (self.port == nil) {
-		// This probably means another instance is running.
-		blog(LOG_ERROR, "Unable to open mach server port.");
-		return;
-	}
+ if (self.port == nil) {
+ // This probably means another instance is running.
+ blog(LOG_ERROR, "Unable to open mach server port.");
+ return;
+ }
 
-	self.port.delegate = self;
+ self.port.delegate = self;
 
-	self.runLoop = NSRunLoop currentRunLoop;
-	self.runLoop addPort:self.port forMode:NSDefaultRunLoopMode;
+ self.runLoop = NSRunLoop currentRunLoop;
+ self.runLoop addPort:self.port forMode:NSDefaultRunLoopMode;
 
-	blog(LOG_DEBUG, "mach server running!");
+ blog(LOG_DEBUG, "mach server running!");
 }
 
 - (void)handlePortMessage:(NSPortMessage *)message
 {
-	switch (message.msgid) {
-	case MachMsgIdConnect:
-		if (message.sendPort != nil) {
-			blog(LOG_DEBUG,
-			 "mach server received connect message from port %d!",
-			 ((NSMachPort *)message.sendPort).machPort);
-			self.clientPorts addObject:message.sendPort;
-		}
-		break;
-	default:
-		blog(LOG_ERROR, "Unexpected mach message ID %u",
-		 (unsigned)message.msgid);
-		break;
-	}
+ switch (message.msgid) {
+ case MachMsgIdConnect:
+ if (message.sendPort != nil) {
+ blog(LOG_DEBUG, "mach server received connect message from port %d!",
+ ((NSMachPort *) message.sendPort).machPort);
+ self.clientPorts addObject:message.sendPort;
+ }
+ break;
+ default:
+ blog(LOG_ERROR, "Unexpected mach message ID %u", (unsigned) message.msgid);
+ break;
+ }
 }
 
-- (void)sendMessageToClientsWithMsgId:(uint32_t)msgId
-			 components:(nullable NSArray *)components
+- (void)sendMessageToClientsWithMsgId:(uint32_t)msgId components:(nullable NSArray *)components
 {
-	if (self.clientPorts count <= 0) {
-		return;
-	}
-
-	NSMutableSet *removedPorts = NSMutableSet set;
-
-	for (NSPort *port in self.clientPorts) {
-		@try {
-			NSPortMessage *message = NSPortMessage alloc
-				initWithSendPort:port
-				 receivePort:nil
-				 components:components;
-			message.msgid = msgId;
-			if (!port isValid ||
-			 !message
-				 sendBeforeDate:
-					 NSDate dateWithTimeIntervalSinceNow:
-							 1.0) {
-				blog(LOG_DEBUG,
-				 "failed to send message to %d, removing it from the clients!",
-				 ((NSMachPort *)port).machPort);
-
-				port invalidate;
-				removedPorts addObject:port;
-			}
-		} @catch (NSException *exception) {
-			blog(LOG_DEBUG,
-			 "failed to send message (exception) to %d, removing it from the clients!",
-			 ((NSMachPort *)port).machPort);
-
-			port invalidate;
-			removedPorts addObject:port;
-		}
-	}
-
-	// Remove dead ports if necessary
-	self.clientPorts minusSet:removedPorts;
+ if (self.clientPorts count <= 0) {
+ return;
+ }
+
+ NSMutableSet *removedPorts = NSMutableSet set;
+
+ for (NSPort *port in self.clientPorts) {
+ @try {
+ NSPortMessage *message = NSPortMessage alloc initWithSendPort:port receivePort:nil
+ components:components;
+ message.msgid = msgId;
+ if (!port isValid || !message sendBeforeDate:NSDate dateWithTimeIntervalSinceNow:1.0) {
+ blog(LOG_DEBUG, "failed to send message to %d, removing it from the clients!",
+ ((NSMachPort *) port).machPort);
+
+ port invalidate;
+ removedPorts addObject:port;
+ }
+ } @catch (NSException *exception) {
+ blog(LOG_DEBUG, "failed to send message (exception) to %d, removing it from the clients!",
+ ((NSMachPort *) port).machPort);
+
+ port invalidate;
+ removedPorts addObject:port;
+ }
+ }
+
+ // Remove dead ports if necessary
+ self.clientPorts minusSet:removedPorts;
 }
 
 - (void)sendPixelBuffer:(CVPixelBufferRef)frame
-	 timestamp:(uint64_t)timestamp
-	 fpsNumerator:(uint32_t)fpsNumerator
-	 fpsDenominator:(uint32_t)fpsDenominator
+ timestamp:(uint64_t)timestamp
+ fpsNumerator:(uint32_t)fpsNumerator
+ fpsDenominator:(uint32_t)fpsDenominator
 {
-	if (self.clientPorts count <= 0) {
-		return;
-	}
-
-	@autoreleasepool {
-		NSData *timestampData = NSData
-			dataWithBytes:&timestamp
-			 length:sizeof(timestamp);
-		NSData *fpsNumeratorData = NSData
-			dataWithBytes:&fpsNumerator
-			 length:sizeof(fpsNumerator);
-		NSData *fpsDenominatorData = NSData
-			dataWithBytes:&fpsDenominator
-			 length:sizeof(fpsDenominator);
-
-		IOSurfaceRef surface = CVPixelBufferGetIOSurface(frame);
+ if (self.clientPorts count <= 0) {
+ return;
+ }
+
+ @autoreleasepool {
+ NSData *timestampData = NSData dataWithBytes:&timestamp length:sizeof(timestamp);
+ NSData *fpsNumeratorData = NSData dataWithBytes:&fpsNumerator length:sizeof(fpsNumerator);
+ NSData *fpsDenominatorData = NSData dataWithBytes:&fpsDenominator length:sizeof(fpsDenominator);
+
+ IOSurfaceRef surface = CVPixelBufferGetIOSurface(frame);
 #ifndef __aarch64__
-		IOSurfaceLock(surface, 0, NULL);
+ IOSurfaceLock(surface, 0, NULL);
 #endif
 
-		if (!surface) {
-			blog(LOG_ERROR,
-			 "unable to access IOSurface associated with CVPixelBuffer");
-			return;
-		}
+ if (!surface) {
+ blog(LOG_ERROR, "unable to access IOSurface associated with CVPixelBuffer");
+ return;
+ }
 
-		mach_port_t framePort = IOSurfaceCreateMachPort(surface);
+ mach_port_t framePort = IOSurfaceCreateMachPort(surface);
 
-		if (!framePort) {
-			blog(LOG_ERROR,
-			 "unable to allocate mach port for IOSurface");
-			return;
-		}
+ if (!framePort) {
+ blog(LOG_ERROR, "unable to allocate mach port for IOSurface");
+ return;
+ }
 
-		self sendMessageToClientsWithMsgId:MachMsgIdFrame
-					 components:@
-						 NSMachPort
-							 portWithMachPort:framePort
-								 options:NSMachPortDeallocateNone,
-						 timestampData,
-						 fpsNumeratorData,
-						 fpsDenominatorData
-					 ;
+ self sendMessageToClientsWithMsgId:MachMsgIdFrame components:@
+ NSMachPort portWithMachPort:framePort options:NSMachPortDeallocateNone, timestampData, fpsNumeratorData,
+ fpsDenominatorData
+ ;
 
-		mach_port_deallocate(mach_task_self(), framePort);
+ mach_port_deallocate(mach_task_self(), framePort);
 
 #ifndef __aarch64__
-		IOSurfaceUnlock(surface, 0, NULL);
+ IOSurfaceUnlock(surface, 0, NULL);
 #endif
-	}
+ }
 }
 
 - (void)stop
 {
-	blog(LOG_DEBUG, "sending stop message to %lu clients",
-	 self.clientPorts.count);
-	self sendMessageToClientsWithMsgId:MachMsgIdStop components:nil;
+ blog(LOG_DEBUG, "sending stop message to %lu clients", self.clientPorts.count);
+ self sendMessageToClientsWithMsgId:MachMsgIdStop components:nil;
 }
 
 @end

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/cmake/macos/Info.plist.in -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/cmake/macos/Info.plist.in Changed

@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleName</key>
-	<string>mac-virtualcam</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.obsproject.mac-virtualcam</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleExecutable</key>
-	<string>mac-virtualcam</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>LSMinimumSystemVersion</key>
-	<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>(c) 2012-${CURRENT_YEAR} Hugh Bailey</string>
+ <key>OBSCameraDeviceUUID</key>
+ <string>${VIRTUALCAM_DEVICE_UUID}</string>
 </dict>
 </plist>

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/af-ZA.ini Added

@@ -0,0 +1,8 @@
+Plugin_Name="macOS virtuele webkamera"
+Error.SystemExtension.NotInstalled="Die virtuele kamera is nie geïnstalleer nie.\n\nLaat OBS toe om stelselprogrammatuur in Stelselinstellings → Privaatheid & Beveiliging → Beveiliging te installeer.\n\nU moet moontlik OBS weer laat loop indien hierdie boodskap daarna steeds verskyn."
+Error.SystemExtension.CameraUnavailable="Kon nie virtuele kamera vind nie.\n\nProbeer weer."
+Error.SystemExtension.CameraNotStarted="Kon nie virtuele kamera begin nie.\n\nProbeer weer."
+Error.SystemExtension.InstallationError="’n Fout het voorgekom met die installasie van die virtuele kamera:"
+Error.SystemExtension.WrongLocation="OBS kan nie die virtuele kamera installeer as dit nie in “/Toepassings” is nie. Skuif OBS na die “/Toepassings”-vouer."
+Error.DAL.NotInstalled="Die virtuele kamera kon nie geïnstalleer of bygewerk word nie.\n\nProbeer weer en voer die gebruikersnaam en wagwoord van ’n administrateur in wanneer gevra."
+Error.DAL.NotUninstalled="Die virtuele kamera kon nie verwyder word nie.\n\nProbeer weer en voer die gebruikersnaam en wagwoord van ’n administrateur in wanneer gevra."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/an-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/an-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ar-SA.ini Changed

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/bg-BG.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ca-ES.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Càmera web virtual del macOS"
+Error.SystemExtension.NotInstalled="La càmera virtual no està instal·lada.\n\nDeixeu que l'OBS instal·li programari a Opcions de Sistema -> Seguretat i Privadesa -> Seguretat.\n\nHaureu de reiniciar l'OBS si es continua mostrant aquest missatge."
+Error.SystemExtension.CameraUnavailable="No s'ha trobat la càmera virtual.\n\nTorneu a provar."
+Error.SystemExtension.CameraNotStarted="No s'ha pogut iniciar la càmera virtual.\n\nTorneu a provar."
+Error.SystemExtension.InstallationError="S'ha produït un error en instal·lar la càmera virtual:"
+Error.SystemExtension.WrongLocation="L'OBS no pot instal·lar la càmera virtual si no està a \"/Aplicacions\". Moveu l'OBS al directori \"/Aplicacions\"."
+Error.SystemExtension.CompleteAfterReboot="La instal·lació de la càmera virtual serà efectiva en reiniciar el sistema."
+Error.DAL.NotInstalled="La càmera virtual no s'ha pogut instal·lar o actualitzar.\n\nTorneu-ho a provar i introduïu el nom i contrasenya d'un administrador quan si us demani."
+Error.DAL.NotUninstalled="No s'ha pogut eliminar la càmera virtual heretada.\n\nTorneu-ho a provar i introduïu el nom i contrasenya d'un administrador quan si us demani."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/cs-CZ.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS virtuální webkamera"
+Error.SystemExtension.NotInstalled="Virtuální kamera není nainstalována.\n\nProsím, povolte OBS instalaci softwaru v Nastavení systému →Soukromí a zabezpečení → Zabezpečení.\n\nPokud se vám tato zpráva zobrazí i po změně, bude nutné restartovat OBS."
+Error.SystemExtension.CameraUnavailable="Nepodařilo se najít virtuální kameru.\n\nZkuste to prosím znovu."
+Error.SystemExtension.CameraNotStarted="Nepodařilo se spustit virtuální kameru.\n\nZkuste to prosím znovu."
+Error.SystemExtension.InstallationError="Při instalaci virtuální kamery došlo k chybě:"
+Error.SystemExtension.WrongLocation="OBS nemůže nainstalovat virtuální kameru, pokud není pod \"/Aplikace\". Prosím, přesuňte OBS do složky \"/Aplikace\"."
+Error.SystemExtension.CompleteAfterReboot="Instalace virtuální kamery bude dokončena po restartu systému."
+Error.DAL.NotInstalled="Virtuální kamera nemohla být nainstalována či aktualizována.\n\nProsím, zkuste to znovu a až budete vyzváni, zadejte jméno a heslo administrátora."
+Error.DAL.NotUninstalled="Nebylo možné odstranit starou virtuální kameru.\n\nProsím, zkuste to znovu a až budete vyzváni, zadejte jméno a heslo administrátora."

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/da-DK.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/de-DE.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Virtuelle Kamera für macOS"
+Error.SystemExtension.NotInstalled="Die virtuelle Kamera ist nicht installiert.\n\nBitte erlauben Sie OBS in den Systemeinstellungen → „Datenschutz & Sicherheit“ → „Sicherheit“, Systemsoftware zu installieren.\n\nMöglicherweise müssen Sie OBS neu starten, falls diese Benachrichtigung weiterhin erscheint."
+Error.SystemExtension.CameraUnavailable="Die virtuelle Kamera konnte nicht erkannt werden.\n\nBitte versuchen Sie es erneut."
+Error.SystemExtension.CameraNotStarted="Die virtuelle Kamera konnte nicht gestartet werden.\n\nBitte versuchen Sie es erneut."
+Error.SystemExtension.InstallationError="Ein Fehler ist während der Installation der virtuellen Kamera aufgetreten:"
+Error.SystemExtension.WrongLocation="Die virtuelle Kamera kann nicht installiert werden, wenn OBS sich nicht im „/Programme“-Ordner befindet. Bitte verschieben Sie OBS in diesen Ordner."
+Error.SystemExtension.CompleteAfterReboot="Die Installation der virtuellen Kamera wird nach einem Neustart des Systems abgeschlossen."
+Error.DAL.NotInstalled="Die virtuelle Kamera konnte nicht installiert oder aktualisiert werden.\n\nBitte versuchen Sie es erneut und geben Sie den Namen und das Passwort eines Administrators in der Aufforderung ein."
+Error.DAL.NotUninstalled="Die alte Version der virtuellen Kamera konnte nicht entfernt werden.\n\nBitte versuchen Sie es erneut und geben Sie den Namen und das Passwort eines Administrators in der Aufforderung ein."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/el-GR.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Εικονική κάμερα macOS"
+Error.SystemExtension.NotInstalled="Η εικονική κάμερα δεν είναι εγκατεστημένη.\n\nΠαρακαλώ επιτρέψτε στο OBS να εγκαταστήσει το λογισμικό συστήματος στις Ρυθμίσεις Συστήματος → Απόρρητο & Ασφάλεια → Ασφάλεια.\n\nΊσως χρειαστεί να επανεκκινήσετε το OBS εάν αυτό το μήνυμα εξακολουθεί να εμφανίζεται μετά."
+Error.SystemExtension.CameraUnavailable="Η εικονική κάμερα δεν μπόρεσε να βρεθεί.\n\nΠαρακαλώ δοκιμάστε ξανά."
+Error.SystemExtension.CameraNotStarted="Η εικονική κάμερα δεν μπόρεσε να ξεκινήσει.\n\nΠαρακαλώ δοκιμάστε ξανά."
+Error.SystemExtension.InstallationError="Παρουσιάστηκε σφάλμα κατά την εγκατάσταση της εικονικής κάμερας:"
+Error.SystemExtension.WrongLocation="Το OBS δεν μπορεί να εγκαταστήσει την εικονική κάμερα εάν δε βρίσκεται στο \"/Εφαρμογές\". Παρακαλώ μεταφέρετε το OBS στον φάκελο \"/Εφαρμογές\"."
+Error.SystemExtension.CompleteAfterReboot="Η εγκατάσταση της εικονικής κάμερας θα ολοκληρωθεί μετά από επανεκκίνηση του συστήματος."
+Error.DAL.NotInstalled="Η εικονική κάμερα δεν μπόρεσε να εγκατασταθεί ή να ενημερωθεί.\n\nΠαρακαλώ δοκιμάστε ξανά και εισάγετε το όνομα και κωδικό διαχειριστή όταν ζητηθεί."
+Error.DAL.NotUninstalled="Δεν μπόρεσε να αφαιρεθεί η legacy εικονική κάμερα.\n\nΠαρακαλώ δοκιμάστε ξανά και εισάγετε το όνομα και κωδικό διαχειριστή όταν ζητηθεί."

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/en-US.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS Virtual Webcam"
+Error.SystemExtension.NotInstalled="The virtual camera is not installed.\n\nPlease allow OBS to install system software in System Settings → Privacy & Security → Security.\n\nYou may need to restart OBS if this message still appears afterward."
+Error.SystemExtension.CameraUnavailable="Could not find virtual camera.\n\nPlease try again."
+Error.SystemExtension.CameraNotStarted="Unable to start virtual camera.\n\nPlease try again."
+Error.SystemExtension.InstallationError="An error has occured while installing the virtual camera:"
+Error.SystemExtension.WrongLocation="OBS cannot install the virtual camera if it's not in \"/Applications\". Please move OBS to the \"/Applications\" directory."
+Error.SystemExtension.CompleteAfterReboot="The installation of the virtual camera will complete after a system reboot."
+Error.DAL.NotInstalled="The virtual camera could not be installed or updated.\n\nPlease try again and enter the name and password of an administrator when prompted."
+Error.DAL.NotUninstalled="Could not remove the legacy virtual camera.\n\nPlease try again and enter the name and password of an administrator when prompted."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/es-ES.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Cámara Web Virtual macOS"
+Error.SystemExtension.NotInstalled="La cámara virtual no está instalada.\n\nPermite que OBS instale software del sistema en Configuración del sistema → Privacidad y seguridad → Seguridad.\n\nEs posible que tengas que reiniciar OBS si este mensaje continúa apareciendo."
+Error.SystemExtension.CameraUnavailable="No se pudo encontrar la cámara virtual.\n\nPor favor, inténtalo de nuevo."
+Error.SystemExtension.CameraNotStarted="No se puede iniciar la cámara virtual.\n\nPor favor, inténtalo de nuevo."
+Error.SystemExtension.InstallationError="Se ha producido un error al instalar la cámara virtual:"
+Error.SystemExtension.WrongLocation="OBS no puede instalar la cámara virtual si no está en \"/Aplicaciones\". Por favor, mueve OBS al directorio \"/Aplicaciones\"."
+Error.SystemExtension.CompleteAfterReboot="La instalación de la cámara virtual se completará tras reiniciar el sistema."
+Error.DAL.NotInstalled="La cámara virtual no se ha podido instalar o actualizar.\n\nPor favor, inténtalo de nuevo e introduce el nombre y contraseña de un administrador cuando se solicite."
+Error.DAL.NotUninstalled="No se ha podido eliminar la cámara virtual heredada.\n\nInténtalo de nuevo e introduce el nombre y la contraseña de un administrador cuando se solicite."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/fa-IR.ini Changed

@@ -1,1 +1,9 @@
-Plugin_Name="وبکم مجازی سیستم عامل مک"
+Plugin_Name="وبکم مجازی سیستم‌عامل مک"
+Error.SystemExtension.NotInstalled="دوربین مجازی، نصب نشده است.\n\nلطفا در تنظیمات سامانه ← امنیت و حریم شخصی ← امنیت، اجازه نصب نرم‌افزارهای سامانه را به OBS بدهید.\n\nچنانچه پس از این هم این پیام را همچنان مشاهده کردید ممکن است نیاز به بازراه‌اندازی OBS داشته باشید."
+Error.SystemExtension.CameraUnavailable="دوربین مجازی پیدا نشد.\n\nلطفا دوباره تلاش کنید."
+Error.SystemExtension.CameraNotStarted="ناتوانی در راه‌اندازی دوربین مجازی.\n\nلطفا دوباره تلاش کنید."
+Error.SystemExtension.InstallationError="در خلال نصب دوربین مجازی خطایی رخ داد:"
+Error.SystemExtension.WrongLocation="اگر OSB در پوشه \"/Applications\" نباشد نمی‌تواند دوربین مجازی را نصب کند. لطفا OBS را به پوشه \"/Applications\" منتقل کنید."
+Error.SystemExtension.CompleteAfterReboot="نصب دوربین مجازی پس از راه‌اندازی مجدد سیستم کامل می شود."
+Error.DAL.NotInstalled="دوربین مجازی نصب یا به‌روزرسانی نشد.\n\nلطفاً دوباره امتحان کنید و در صورت نیاز نام و رمز عبور سرپرست را وارد کنید."
+Error.DAL.NotUninstalled="دوربین مجازی قدیمی حذف نشد.\n\nلطفاً دوباره امتحان کنید و در صورت نیاز نام و رمز عبور سرپرست را وارد کنید."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/fi-FI.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS:n virtuaalinen web-kamera"
+Error.SystemExtension.NotInstalled="Virtuaalikameraa ei ole asennettuna.\n\nSalli OBS:n asentaa ohjelmisto kohdassa Järjestelmän asetukset → Tietosuoja ja suojaus → Suojaus.\n\nSinun on ehkä käynnistettävä OBS uudelleen, jos tämä viesti näkyy edelleen."
+Error.SystemExtension.CameraUnavailable="Virtuaalikameraa ei löydy.\n\nYritä uudelleen."
+Error.SystemExtension.CameraNotStarted="Virtuaalikameraa ei voi käynnistää.\n\nYritä uudelleen."
+Error.SystemExtension.InstallationError="Virtuaalikameraa asentaessa tapahtui virhe:"
+Error.SystemExtension.WrongLocation="OBS ei voi asentaa virtuaalikameraa, jos OBS ei ole hakemistossa \"/Applications\". Siirrä OBS hakemistoon \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="Virtuaalikameran asennus valmis tietokoneen käynnistyksen jälkeen."
+Error.DAL.NotInstalled="Virtuaalikameraa ei voitu asentaa tai päivittää.\n\nYritä uudelleen ja anna järjestelmänvalvojan nimi ja salasana pyydettäessä."
+Error.DAL.NotUninstalled="Virtuaalikameraa ei voitu poistaa.\n\nYritä uudelleen ja anna järjestelmänvalvojan nimi ja salasana pyydettäessä."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/fr-FR.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Webcam virtuelle macOS"
+Error.SystemExtension.NotInstalled="La caméra virtuelle n'est pas installée.\n\nVeuillez autoriser OBS à installer le logiciel système dans les Paramètres système → Confidentialité et sécurité → Sécurité.\n\nVous devrez peut-être redémarrer OBS si ce message apparaît toujours."
+Error.SystemExtension.CameraUnavailable="Impossible de trouver la caméra virtuelle.\n\nVeuillez réessayer."
+Error.SystemExtension.CameraNotStarted="Impossible de démarrer la caméra virtuelle.\n\nVeuillez réessayer."
+Error.SystemExtension.InstallationError="Une erreur s'est produite lors de l'installation de la caméra virtuelle :"
+Error.SystemExtension.WrongLocation="OBS ne peut pas installer la caméra virtuelle s'il n'est pas installé dans \"/Applications\". Veuillez déplacer OBS dans le dossier \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="L'installation de la caméra virtuelle se terminera après un redémarrage du système."
+Error.DAL.NotInstalled="La caméra virtuelle n'a pas pu être installée ou mise à jour.\n\nVeuillez réessayer et saisir le nom et le mot de passe d'un administrateur lorsque vous y êtes invité."
+Error.DAL.NotUninstalled="Impossible de supprimer l'ancienne caméra virtuelle.\n\nVeuillez réessayer et saisir le nom et le mot de passe d'un administrateur lorsque vous y êtes invité."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/he-IL.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="מצלמת רשת וירטואלית macOS"
+Error.SystemExtension.NotInstalled="המצלמה הווירטואלית לא מותקנת.\n\nנא לאפשר ל־OBS להתקין תוכנת מערכת דרך הגדרות המערכת ← פרטיות ואבטחה ← אבטחה.\n\nיכול להיות שצריך להפעיל את OBS מחדש אם ההודעה הזאת עדיין מופיעה לאחר מכן."
+Error.SystemExtension.CameraUnavailable="לא ניתן למצוא מצלמה וירטואלית.\n\nנא לנסות שוב."
+Error.SystemExtension.CameraNotStarted="לא ניתן להפעיל מצלמה וירטואלית.\n\nנא לנסות שוב."
+Error.SystemExtension.InstallationError="אירעה שגיאה בהתקנת המצלמה הווירטואלית:"
+Error.SystemExtension.WrongLocation="ל־OBS אין אפשרות להתקין את המצלמה הווירטואלית אם איננה תחת „‎/יישומים”. נא להעביר את OBS לתיקיית „‎/יישומים”."
+Error.SystemExtension.CompleteAfterReboot="התקנת המצלמה הווירטואלית תושלם לאחר הפעלה מחדש."
+Error.DAL.NotInstalled="לא ניתן להתקין או לעדכן את המצלמה הווירטואלית.\n\nנא לנסות שוב ולמלא את שם המשתמש ואת הסיסמה של חשבון ניהול בעת הצורך."
+Error.DAL.NotUninstalled="לא ניתן להסיר מצלמה וירטואלית מיושנת.\n\nנא לנסות שוב ולמלא את שם המשתמש ואת הסיסמה של חשבון ניהול בעת הצורך."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hi-IN.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS आभासी वेबकैम"
+Error.SystemExtension.NotInstalled="वर्चुअल कैमरा स्थापित नहीं है.\n\nकृपया OBS को सिस्टम सेटिंग्स → गोपनीयता और सुरक्षा → सुरक्षा में सिस्टम सॉफ़्टवेयर स्थापित करने की अनुमति दें.\n\nयदि यह संदेश बाद में भी दिखाई देता है तो आपको OBS को पुनरारंभ करने की आवश्यकता हो सकती है."
+Error.SystemExtension.CameraUnavailable="वर्चुअल कैमरा नहीं मिला.\n\nकृपया पुन: प्रयास करें."
+Error.SystemExtension.CameraNotStarted="वर्चुअल कैमरा प्रारंभ करने में असमर्थ.\n\nकृपया पुन: प्रयास करें."
+Error.SystemExtension.InstallationError="वर्चुअल कैमरा स्थापित करते समय एक त्रुटि हुई:"
+Error.SystemExtension.WrongLocation="OBS वर्चुअल कैमरा स्थापित नहीं कर सकता है यदि यह \"/ऐप्लिकेशन\" में नहीं है. कृपया OBS को \"/ऐप्लिकेशन\" डायरेक्टरी में ले जाएं."
+Error.SystemExtension.CompleteAfterReboot="सिस्टम रीबूट के बाद वर्चुअल कैमरे की स्थापना पूरी हो जाएगी."
+Error.DAL.NotInstalled="वर्चुअल कैमरा स्थापित या अपडेट नहीं किया जा सका.\n\nकृपया पुन: प्रयास करें और संकेत दिए जाने पर किसी व्यवस्थापक का नाम और पासवर्ड डालें."
+Error.DAL.NotUninstalled="पुराना वर्चुअल कैमरा नहीं हटाया जा सका.\n\nकृपया पुन: प्रयास करें और संकेत दिए जाने पर किसी  व्यवस्थापक का नाम और पासवर्ड डालें."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hr-HR.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS Virtualna web kamera"
+Error.SystemExtension.NotInstalled="Virtualna kamera nije instalirana.\n\nMolimo dopustite OBS-u da instalira sistemski softver u Postavke sustava → Privatnost i sigurnost → Sigurnost.\n\nMožda ćete morati ponovno pokrenuti OBS ako se ova poruka nastavi pojavljivati."
+Error.SystemExtension.CameraUnavailable="Virtualna kamera nije pronađena.\n\nMolimo pokušajte ponovno."
+Error.SystemExtension.CameraNotStarted="Neuspješno pokretanje virtualne kamere.\n\nMolimo pokušajte ponovno."
+Error.SystemExtension.InstallationError="Došlo je do greške pri instalaciji virtualne kamere:"
+Error.SystemExtension.WrongLocation="OBS ne može instalirati virtualnu kameru jer nije u direktoriju \"/Aplikacije\". Molimo premjestite OBS u taj direktorij."
+Error.SystemExtension.CompleteAfterReboot="Instalacija virtualne kamere bit će dovršena nakon ponovnog pokretanja sustava."
+Error.DAL.NotInstalled="Virtualna kamera ne može se instalirati ili ažurirati.\n\nMolimo pokušajte ponovno i unesite administratorsko ime i lozinku na upit."
+Error.DAL.NotUninstalled="Neuspješno uklanjanje stare virtualne kamere.\n\nMolimo pokušajte ponovno i unesite administratorsko ime i lozinku na upit."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hu-HU.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS virtuális webkamera"
+Error.SystemExtension.NotInstalled="A virtuális kamera nincs telepítve.\n\nEngedélyezze a Rendszerbeállítások → Adatvédelem és biztonság → Biztonság alatt, hogy az OBS rendszeralkalmazásokat telepíthessen.\n\nHa ez az üzenet továbbra is megjelenik, akkor lehet, hogy újra kell indítania az OBS-t."
+Error.SystemExtension.CameraUnavailable="Nem található virtuális kamera.\n\nPróbálja újra."
+Error.SystemExtension.CameraNotStarted="A virtuális kamera nem indítható el.\n\nPróbálja újra."
+Error.SystemExtension.InstallationError="Hiba történt a virtuális kamera telepítése során:"
+Error.SystemExtension.WrongLocation="Az OBS nem tudja telepíteni a virtuális kamerát, ha nem az „/Alkalmazások” alatt található. Helyezze át az OBS-t az „/Alkalmazások” könyvtárba."
+Error.SystemExtension.CompleteAfterReboot="A virtuális kamera telepítése a rendszer újraindítása után fog befejeződni."
+Error.DAL.NotInstalled="A virtuális kamera nem telepíthető vagy frissíthető.\n\nPróbálja újra, és kérésre adja meg egy rendszergazda nevét és jelszavát."
+Error.DAL.NotUninstalled="Az örökölt virtuális kamera eltávolítása sikertelen.\n\nPróbálja újra, és kérésre adja meg egy rendszergazda nevét és jelszavát."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/hy-AM.ini Changed

@@ -1,1 +1,8 @@
 Plugin_Name="macOS-ի վիրտուալ վեբ-տեսախցիկ"
+Error.SystemExtension.NotInstalled="Վիրտուալ տեսախցիկը տեղադրված չէ:\n\nԽնդրում ենք OBS-ին թույլ տալ համակարգային ծրագրակազմ տեղադրել Համակարգի կարգավորումներում → Գաղտնիություն և անվտանգություն → Անվտանգություն:\n\nՀնարավոր է անհրաժեշտ լինի վերագործարկել OBS-ը, եթե այս հաղորդագրությունը դեռ հայտնվում է:"
+Error.SystemExtension.CameraUnavailable="Չհաջողվեց գտնել վիրտուալ տեսախցիկը:\n\nԽնդրում ենք կրկին փորձել:"
+Error.SystemExtension.CameraNotStarted="Հնարավոր չէ գործարկել վիրտուալ տեսախցիկը:\n\nԽնդրում ենք կրկին փորձել:"
+Error.SystemExtension.InstallationError="Վիրտուալ տեսախցիկը տեղադրելիս սխալ է տեղի ունեցել."
+Error.SystemExtension.WrongLocation="OBS-ը չի կարող տեղադրել վիրտուալ տեսախցիկը, եթե այն «/Applications»-ում չէ: Խնդրում ենք OBS-ը տեղափոխել «/Applications» գրացուցակ:"
+Error.DAL.NotInstalled="Վիրտուալ տեսախցիկը չի կարող տեղադրվել կամ թարմացվել:\n\nԽնդրում ենք կրկին փորձել և մուտքագրել ադմինիստրատորի անունն ու գաղտնաբառը, երբ պահանջվի:"
+Error.DAL.NotUninstalled="Չհաջողվեց հեռացնել հին վիրտուալ տեսախցիկը:\n\nԽնդրում ենք կրկին փորձել և մուտքագրել ադմինիստրատորի անունն ու գաղտնաբառը, երբ պահանջվի:"

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/id-ID.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Kamera Virtual Web macOS"
+Error.SystemExtension.NotInstalled="Kamera virtual tidak terpasang.\n\nMohon izinkan OBS untuk memasang perangkat lunak sistem di Pengaturan Sistem → Privasi & Keamanan → Keamanan.\n\nAnda mungkin perlu mengaktifkan ulang OBS jika pesan ini masih muncul setelah Anda melakukan instruksi tersebut."
+Error.SystemExtension.CameraUnavailable="Tidak dapat menemukan kamera virtual.\n\nMohon coba lagi."
+Error.SystemExtension.CameraNotStarted="Tidak dapat memulai kamera virtual.\n\nMohon coba lagi."
+Error.SystemExtension.InstallationError="Sebuah galat terjadi saat pemasangan kamera virtual:"
+Error.SystemExtension.WrongLocation="OBS tidak dapat memasang kamera virtual jika tidak di dalam \"/Aplikasi\". Mohon pindahkan OBS ke direktori \"/Aplikasi\"."
+Error.SystemExtension.CompleteAfterReboot="Pemasangan kamera virtual akan diselesaikan setelah mengaktifkan ulang sistem."
+Error.DAL.NotInstalled="Kamera virtual tidak dapat bisa dipasang atau diperbarui.\n\nMohon coba lagi dan masukan nama dan kata sandi administarator ketika diminta."
+Error.DAL.NotUninstalled="Tidak dapat menghapus kamera virtual lama.\n\nMohon coba lagi dan masukan nama dan kata sandi administrator ketika diminta."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/it-IT.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Webcam Virtuale macOS"
+Error.SystemExtension.NotInstalled="La videocamera virtuale non è installata.\n\nConsenti a OBS di installare il software di sistema in Impostazioni sistema → Privacy e sicurezza → Sicurezza.\n\nSe in seguito questo messaggio viene ancora visualizzato potrebbe essere necessario riavviare OBS."
+Error.SystemExtension.CameraUnavailable="Impossibile trovare la fotocamera virtuale.\n\nRiprova."
+Error.SystemExtension.CameraNotStarted="Impossibile avviare la fotocamera virtuale.\n\nRiprova."
+Error.SystemExtension.InstallationError="Si è verificato un errore durante l'installazione della fotocamera virtuale:"
+Error.SystemExtension.WrongLocation="OBS non può installare la videocamera virtuale se non è in \"/Applicazioni\". Sposta OBS nella cartella \"/Applicazioni\"."
+Error.SystemExtension.CompleteAfterReboot="L'installazione della camera virtuale sarà completato dopo il riavvio di sistema."
+Error.DAL.NotInstalled="Impossibile installare o aggiornare la fotocamera virtuale.\n\nRiprova e inserisci quando richiesto la password di amministratore."
+Error.DAL.NotUninstalled="Impossibile rimuovere la fotocamera virtuale precedente.\n\nRiprova e inserisci quando richiesto il nome e la password di amministratore quando richiesti."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ka-GE.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS წარმოსახვითი კამერა"
+Error.SystemExtension.NotInstalled="წარმოსახვითი კამერა არაა დაყენებული.\n\nგთხოვთ მისცეთ OBS-ს სისტემური პროგრამების დაყენების ნებართვა სისტემის პარამეტრებში → პირადულობა და უსაფრთხოება → უსაფრთხოება.\n\nშესაძლოა, OBS-ის ახლიდან გაშვება დაგჭირდეთ, თუ ეს შეტყობინება შემდეგაც განმეორდა."
+Error.SystemExtension.CameraUnavailable="ვერ მოიძებნა წარმოსახვითი კამერა.\n\nგთხოვთ, კვლავ სცადოთ."
+Error.SystemExtension.CameraNotStarted="ვერ ეშვება წარმოსახვითი კამერა.\n\nგთხოვთ, კვლავ სცადოთ."
+Error.SystemExtension.InstallationError="წარმოიშვა შეცდომა წარმოსახვითი კამერის დაყენებისას:"
+Error.SystemExtension.WrongLocation="OBS ვერ დააყენებს წარმოსახვით კამერას, თუ მდებარეობად არ აქვს \"/Applications\". გთხოვთ გადაიტანოთ OBS საქაღალდეში „/Applications“."
+Error.SystemExtension.CompleteAfterReboot="წარმოსახვითი კამერის ჩაყენება დასრულდება სისტემის ხელახლა ჩართვისას."
+Error.DAL.NotInstalled="წარმოსახვითი კამერის დაყენება ან განახლება ვერ მოხერხდა.\n\nგთხოვთ, კვლავ სცადოთ და მოთხოვნისას მიუთითოთ ადმინისტრატორის სახელი და პაროლი."
+Error.DAL.NotUninstalled="ვერ ამოიშალა მოძველებული წარმოსახვითი კამერა.\n\nგთხოვთ, კვლავ სცადოთ და მოთხოვნისას მიუთითოთ ადმინისტრატორის სახელი და პაროლი."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ms-MY.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Kamera Sesawang Maya macOS"
+Error.SystemExtension.NotInstalled="Kamera maya tidak dipasang.\n\nBenarkan OSB memasang perisian sistem dalam Tetapan Sistem → Privasi & Keselamatan → Keselamatan.\n\nAnda perlu memulakan semula OBS jika mesej ini masih terpapar."
+Error.SystemExtension.CameraUnavailable="Tidak dapat mencari kamera maya.\n\nCuba sekali lagi."
+Error.SystemExtension.CameraNotStarted="Gagal memulakan kamera maya.\n\nCuba sekali lagi."
+Error.SystemExtension.InstallationError="Satu ralat telah berlaku ketika memasang kamera maya:"
+Error.SystemExtension.WrongLocation="OBS tidak dapat memasang kamera maya jika tiada dalam \"/Applications\". Sila alih OBS ke dalam direktori \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="Pemasangan kamera maya akan selesai setelah but semula sistem."
+Error.DAL.NotInstalled="Kamera maya tidak dapat dipasang atau dikemas kini.\n\nCuba sekali lagi dan masukkan nama dan kata laluan pentadbir apabila diminta."
+Error.DAL.NotUninstalled="Tidak dapat membuang kamera maya legasi.\n\nCuba sekali lagi dan masukkan kata laluan pentadbir anda apabila diminta."

obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/nl-NL.ini Added

@@ -0,0 +1,8 @@
+Error.SystemExtension.NotInstalled="De virtuele camera is niet geïnstalleerd.\n\nSta OBS toe om systeem software te installeren in Systeem Instellingen → Privacy & Beveiliging → Beveiliging.\n\nJe moet mogelijk OBS opnieuw opstarten als dit bericht daarna nog steeds verschijnt."
+Error.SystemExtension.CameraUnavailable="Virtuele camera kon niet gevonden worden.\n\nProbeer opnieuw."
+Error.SystemExtension.CameraNotStarted="Virtuele camera kon niet gestart worden.\n\nProbeer opnieuw."
+Error.SystemExtension.InstallationError="Er is een fout opgetreden tijdens het installeren van de virtuele camera:"
+Error.SystemExtension.WrongLocation="OBS kan niet de virtuele camera installeren als deze niet in \"/Apps\" is. Verplaats OBS naar de \"/Apps\" map."
+Error.SystemExtension.CompleteAfterReboot="De installatie van de virtuele camera wordt afgerond na opnieuw opstarten. "
+Error.DAL.NotInstalled="De virtuele camera kon niet geïnstalleerd of bijgewerkt worden.\n\nProbeer opnieuw en voer de gebruikersnaam en wachtwoord van een administrator in wanneer gevraagd."
+Error.DAL.NotUninstalled="Kon de verouderde virtuele camera niet verwijderen.\n\nProbeer opnieuw en voer de gebruikersnaam en wachtwoord van een administrator in wanneer gevraagd."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/pl-PL.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Wirtualna kamera macOS"
+Error.SystemExtension.NotInstalled="Wirtualna kamera nie jest zainstalowana.\n\nNależy umożliwić OBS Studio instalowanie oprogramowania w systemie operacyjnym w Ustawienia → Prywatność i Bezpieczeństwo → Bezpieczeństwo.\n\nJeżeli ten komunikat pojawi się ponownie po zmianie ustawień, należy zrestartować OBS Studio."
+Error.SystemExtension.CameraUnavailable="Nie można znaleźć kamery wirtualnej.\n\nProszę spróbować ponownie."
+Error.SystemExtension.CameraNotStarted="Nie można uruchomić kamery wirtualnej.\n\nProszę spróbować ponownie."
+Error.SystemExtension.InstallationError="Wystąpił błąd podczas instalacji kamery wirtualnej."
+Error.SystemExtension.WrongLocation="OBS nie może zainstalować kamery wirtualnej, jeżeli nie jest zainstalowany w \"/Applications\". Przenieś OBS do folderu \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="Instalacja wirtualnej kamery zakończy się po restarcie systemu."
+Error.DAL.NotInstalled="Nie można zainstalować lub zaktualizować kamery wirtualnej.\n\nProszę spróbuj ponownie i wpisz login i hasło administratora, gdy będzie to wymagane."
+Error.DAL.NotUninstalled="Nie można usunąć starszej wersji kamery wirtualnej.\n\nProszę spróbuj ponownie i wpisz login i hasło administratora, gdy będzie to wymagane."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/pt-BR.ini Changed

@@ -1,1 +1,9 @@
-Plugin_Name="Webcam Virtual do macOS"
+Plugin_Name="Câmera virtual do macOS"
+Error.SystemExtension.NotInstalled="A câmera virtual não está instalada.\n\nPor favor, permita que o OBS instale o software do sistema em Configurações do sistema → Privacidade & Segurança → Segurança.\n\nTalvez seja necessário reiniciar o OBS se esta mensagem ainda aparecer depois."
+Error.SystemExtension.CameraUnavailable="Não foi possível encontrar a câmera virtual.\n\nPor favor, tente novamente."
+Error.SystemExtension.CameraNotStarted="Não foi possível iniciar a câmera virtual.\n\nPor favor, tente novamente."
+Error.SystemExtension.InstallationError="Ocorreu um erro ao instalar a câmara virtual:"
+Error.SystemExtension.WrongLocation="OBS não pode instalar a câmera virtual se esta não estiver em \"/Aplicativos\". Mova o OBS para o diretório \"/Aplicativos\"."
+Error.SystemExtension.CompleteAfterReboot="A instalação da câmera virtual será finalizada após reiniciar o sistema."
+Error.DAL.NotInstalled="A câmera virtual não pôde ser instalada ou atualizada.\n\nPor favor, tente novamente e insira o nome e a senha de um administrador quando solicitado."
+Error.DAL.NotUninstalled="Não foi possível remover a câmera virtual herdada.\n\nPor favor, tente novamente e digite o nome e a senha de um administrador quando solicitado."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/pt-PT.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Webcam virtual do macOS"
+Error.SystemExtension.NotInstalled="A câmara virtual não está instalada.\n\nPor favor permita ao OBS instalar software no sistema em: Definições do Sistema → Privacidade e Segurança → Segurança.\n\nPoderá necessitar de reiniciar o OBS se esta mensagem ainda aparecer depois."
+Error.SystemExtension.CameraUnavailable="Não foi possível encontrar a câmera virtual.\n\nPor favor, tente novamente."
+Error.SystemExtension.CameraNotStarted="Não foi possível iniciar a câmera virtual.\n\nPor favor, tente novamente."
+Error.SystemExtension.InstallationError="Ocorreu um erro ao instalar a câmera virtual:"
+Error.SystemExtension.WrongLocation="O OBS não pode instalar a câmera virtual se não estiver na pasta \"/Applications\". Mova o OBS para a pasta \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="A instalação da câmera virtual será concluída após o reinício do sistema."
+Error.DAL.NotInstalled="Não foi possível instalar ou atualizar a câmara virtual.\n\nPor favor, tente de novo e introduza o nome e a senha de administrador, quando pedida."
+Error.DAL.NotUninstalled="Não foi possível remover a câmara virtual legada.\n\nPor favor, tente de novo e introduza o nome e a senha de administrador, quando pedida."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/ru-RU.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Виртуальная веб-камера macOS"
+Error.SystemExtension.NotInstalled="Виртуальная камера не установлена.\n\nПожалуйста, разрешите OBS установить системное программное обеспечение в «Системных настройках → Конфиденциальность и безопасность → Безопасность».\n\nВозможно, вам потребуется перезапустить OBS, если после этого это сообщение всё ещё появляется."
+Error.SystemExtension.CameraUnavailable="Не удалось найти виртуальную камеру.\n\nПожалуйста, повторите попытку."
+Error.SystemExtension.CameraNotStarted="Не удалось запустить виртуальную камеру.\n\nПожалуйста, повторите попытку."
+Error.SystemExtension.InstallationError="Произошла ошибка при установке виртуальной камеры:"
+Error.SystemExtension.WrongLocation="OBS не может установить виртуальную камеру, если его нет в «/Applications». Пожалуйста, поместите OBS в каталог «/Applications»."
+Error.SystemExtension.CompleteAfterReboot="Установка виртуальной камеры завершится после перезагрузки системы."
+Error.DAL.NotInstalled="Не удалось установить или обновить виртуальную камеру.\n\nПожалуйста, попробуйте ещё раз и введите имя и пароль администратора, когда появится запрос."
+Error.DAL.NotUninstalled="Не удалось удалить устаревшую виртуальную камеру.\n\nПожалуйста, повторите попытку и введите имя и пароль администратора, когда появится запрос."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/sk-SK.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS Virtuálna Webkamera"
+Error.SystemExtension.NotInstalled="Virtuálna kamera nie je nainštalovaná.\n\nProsím povoľte OBS inštalovať systémový softvér v Systémové nastavenia → Súkromie a bezpečnosť → Bezpečnosť.\n\nMožno budete musieť reštartovať OBS ak sa táto správa stále zobrazuje potom."
+Error.SystemExtension.CameraUnavailable="Nenašla sa virtuálna kamera.\n\nProsím skúste znova."
+Error.SystemExtension.CameraNotStarted="Nebolo možné spustiť virtuálnu kameru.\n\nProsím skúste znova."
+Error.SystemExtension.InstallationError="Nastala chyba pri inštalovaní virtuálnej kamery:"
+Error.SystemExtension.WrongLocation="OBS nemôže nainštalovať virtuálnu kameru ak nie je v \"/Aplikácie\". Prosím presuňte OBS do adresára \"/Aplikácie\"."
+Error.SystemExtension.CompleteAfterReboot="Inštalácia virtuálnej kamery sa dokončí po systémovom reštarte."
+Error.DAL.NotInstalled="Virtuálna kamera nemohla byť nainštalovaná alebo aktualizovaná.\n\nProsím skúste znova a zadajte meno a heslo administrátora po vyzvaní."
+Error.DAL.NotUninstalled="Nebolo možné odstrániť starú virtuálnu kameru.\n\nProsím skúste znova a zadajte meno a heslo administrátora po vyzvaní."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/sl-SI.ini Changed

@@ -1,1 +1,9 @@
-Plugin_Name="macOS virtualna spletna kamera"
+Plugin_Name="Virtualna spletna kamera macOS"
+Error.SystemExtension.NotInstalled="Virtualna spletna kamera ni nameščena.\n\nDovolite OBS, da namesti sistemsko programje z nastavitvami System Settings → Privacy & Security → Security.\n\nMorda boste morali ponovno zagnati OBS, če se to sporočilo znova pojavi."
+Error.SystemExtension.CameraUnavailable="Virtualne kamere ni mogoče najti.\n\nPoskusite znova."
+Error.SystemExtension.CameraNotStarted="Virtualne kamere ni možno zagnati.\n\nPoskusite znova."
+Error.SystemExtension.InstallationError="Prišlo je do napake pri nameščanju virtualne kamere:"
+Error.SystemExtension.WrongLocation="OBS ne more namestiti virtualne kamere, če se ne nahaja v \"/Applications\". Prestavite OBS v mapo \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="Namestitev virtualne kamere bo zaključena po ponovnem zagonu sistema."
+Error.DAL.NotInstalled="Virtualne kamere ni bilo mogoče namestiti ali posodobiti.\n\nProsimo, poskusite znova in po pozivu vnesite ime in geslo skrbnika."
+Error.DAL.NotUninstalled="Ni bilo mogoče odstraniti starejše virtualne kamere.\n\nProsimo, poskusite znova in ob pozivu vnesite ime in geslo skrbnika."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/sv-SE.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS virtuell webbkamera"
+Error.SystemExtension.NotInstalled="Den virtuella kameran är inte installerad.\n\nLåt OBS installera systemprogramvara i Systeminställningar → Integritet och säkerhet → Säkerhet.\n\nDu kanske behöver starta om OBS ifall detta meddelande fortfarande dyker upp efteråt."
+Error.SystemExtension.CameraUnavailable="Kunde inte hitta virtuell kamera.\n\nVar god försök igen."
+Error.SystemExtension.CameraNotStarted="Kunde inte start virtuell kamera.\n\nVar god försök igen."
+Error.SystemExtension.InstallationError="Ett fel uppstod när den virtuella kameran installerades:"
+Error.SystemExtension.WrongLocation="OBS kan inte installera den virtuella kameran om den inte finns i \"/Applications\". Var god flytta OBS till katalogen \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="Installationen av den virtuella kameran kommer att slutföras efter en omstart av systemet."
+Error.DAL.NotInstalled="Den virtuella kameran kunde inte installeras eller uppdateras.\n\nVar god försök igen och ange namn samt lösenord för en administratör när det efterfrågas."
+Error.DAL.NotUninstalled="Kunde inte ta bort den föråldrade virtuella kameran.\n\nFörsök igen och ange namn samt lösenord för en administratör när det efterfrågas."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/tr-TR.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="macOS Sanal Web Kamerası"
+Error.SystemExtension.NotInstalled="Sanal kamera kurulu değil.\n\nLütfen Sistem Ayarları → Gizlilik ve Güvenlik → Güvenlik'te OBS'nin sistem yazılımını kurmasına izin verin.\n\nDaha sonra bu mesaj hala görünüyorsa OBS'yi yeniden başlatmanız gerekebilir."
+Error.SystemExtension.CameraUnavailable="Sanal kamera bulunamadı.\n\nLütfen tekrar deneyin."
+Error.SystemExtension.CameraNotStarted="Sanal kamera başlatılamadı.\n\nLütfen tekrar deneyin."
+Error.SystemExtension.InstallationError="Sanal kamera yüklenirken bir hata oluştu:"
+Error.SystemExtension.WrongLocation="OBS, \"/Applications\" içinde değilse sanal kamerayı kuramaz. Lütfen OBS'i \"/Applications\" dizinine taşıyın."
+Error.SystemExtension.CompleteAfterReboot="Sanal kameranın kurulumu sistemin tamamen yeniden başlatılması ile tamamlanacak."
+Error.DAL.NotInstalled="Sanal kamera yüklenemedi veya güncellenemedi.\n\nLütfen tekrar deneyin ve istendiğinde bir yöneticinin adını ve şifresini girin."
+Error.DAL.NotUninstalled="Eski sanal kamera kaldırılamadı.\n\nLütfen tekrar deneyin ve istendiğinde bir yöneticinin adı ve şifresini girin."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/uk-UA.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Віртуальна вебкамера macOS"
+Error.SystemExtension.NotInstalled="Віртуальна камера не встановлена.\n\nДозвольте OBS встановлювати системні програми в Системних параметрах → Приватність і Безпека → Безпека.\n\nМожливо, буде потрібно перезапустити OBS, якщо це повідомлення з’явиться і після цього."
+Error.SystemExtension.CameraUnavailable="Не вдалося знайти віртуальну камеру.\n\nСпробуйте ще раз."
+Error.SystemExtension.CameraNotStarted="Не вдалося запустити віртуальну камеру.\n\nСпробуйте ще раз."
+Error.SystemExtension.InstallationError="Під час встановлення віртуальної камери сталася помилка:"
+Error.SystemExtension.WrongLocation="OBS не може встановити віртуальну камеру, якщо не знаходиться в каталозі «/Програми». Перемістіть OBS до каталогу «/Програми»."
+Error.SystemExtension.CompleteAfterReboot="Установлення віртуальної камери завершиться після перезапуску системи."
+Error.DAL.NotInstalled="Не вдалося встановити чи оновити віртуальну камеру.\n\nСпробуйте ще раз і введіть ім’я та пароль адміністратора за запитом."
+Error.DAL.NotUninstalled="Не вдалося видалити застарілу віртуальну камеру.\n\nСпробуйте ще раз і введіть ім’я та пароль адміністратора за запитом."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/vi-VN.ini Changed

@@ -1,1 +1,9 @@
 Plugin_Name="Webcam ảo macOS"
+Error.SystemExtension.NotInstalled="Máy ảnh ảo chưa được cài đặt.\n\nVui lòng cho phép OBS cài đặt phần mềm hệ thống trong Cài đặt hệ thống → Quyền riêng tư & Bảo mật → Bảo mật.\n\nBạn có thể phải khởi động lại OBS nếu thông báo này vẫn xuất hiện sau đó."
+Error.SystemExtension.CameraUnavailable="Không thể tìm thấy máy ảnh ảo.\n\nVui lòng thử lại."
+Error.SystemExtension.CameraNotStarted="Không thể khởi động máy ảnh ảo.\n\nVui lòng thử lại."
+Error.SystemExtension.InstallationError="Đã xảy ra lỗi khi cài đặt camera ảo:"
+Error.SystemExtension.WrongLocation="OBS không thể cài đặt camera ảo nếu nó không có trong \"/Applications\". Vui lòng di chuyển OBS đến thư mục \"/Applications\"."
+Error.SystemExtension.CompleteAfterReboot="Quá trình cài đặt camera ảo sẽ hoàn tất sau khi khởi động lại hệ thống."
+Error.DAL.NotInstalled="Không thể cài đặt hoặc cập nhật máy ảnh ảo.\n\nVui lòng thử lại và nhập tên cũng như mật khẩu của quản trị viên khi được nhắc."
+Error.DAL.NotUninstalled="Không thể xóa máy ảnh ảo cũ.\n\nVui lòng thử lại và nhập tên cũng như mật khẩu của quản trị viên khi được nhắc."

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm -> obs-studio-30.0.2.tar.xz/plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm Changed

@@ -1,339 +1,561 @@
+@import CoreMediaIO;
+@import SystemExtensions;
+
 #include <obs-module.h>
 #include "OBSDALMachServer.h"
 #include "Defines.h"
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("mac-virtualcam", "en-US")
+
 MODULE_EXPORT const char *obs_module_description(void)
 {
-	return "macOS virtual webcam output";
+ return "macOS virtual webcam output";
+}
+
+NSString *const OBSDalDestination = @"/Library/CoreMediaIO/Plug-Ins/DAL";
+
+static bool cmio_extension_supported()
+{
+ if (@available(macOS 13.0, *)) {
+ return true;
+ } else {
+ return false;
+ }
 }
 
 struct virtualcam_data {
-	obs_output_t *output;
-	obs_video_info videoInfo;
-	CVPixelBufferPoolRef pool;
-	OBSDALMachServer *machServer;
+ obs_output_t *output;
+ obs_video_info videoInfo;
+ CVPixelBufferPoolRef pool;
+
+ // CMIO Extension (available with macOS 13)
+ CMSimpleQueueRef queue;
+ CMIODeviceID deviceID;
+ CMIOStreamID streamID;
+ CMFormatDescriptionRef formatDescription;
+ id extensionDelegate;
+
+ // Legacy DAL (deprecated since macOS 12.3)
+ OBSDALMachServer *machServer;
 };
 
-static bool check_dal_plugin()
+@interface SystemExtensionActivationDelegate : NSObject <OSSystemExtensionRequestDelegate> {
+ @private
+ struct virtualcam_data *_vcam;
+}
+
+@property (getter=isInstalled) BOOL installed;
+@property NSString *lastErrorMessage;
+- (instancetype)init __unavailable;
+@end
+
+@implementation SystemExtensionActivationDelegate
+
+- (id)initWithVcam:(virtualcam_data *)vcam
+{
+ self = super init;
+
+ if (self) {
+ _vcam = vcam;
+ _installed = NO;
+ }
+
+ return self;
+}
+
+- (OSSystemExtensionReplacementAction)request:(nonnull OSSystemExtensionRequest *)request
+ actionForReplacingExtension:(nonnull OSSystemExtensionProperties *)existing
+ withExtension:(nonnull OSSystemExtensionProperties *)ext
+{
+ NSString *infoString = NSString
+ stringWithFormat:
+ @"mac-camera-extension: Replacement requested. Existing version: %@ (%@), new version: %@ (%@). Replacing...",
+ existing.bundleShortVersion, existing.bundleVersion, ext.bundleShortVersion, ext.bundleVersion;
+ blog(LOG_INFO, "%s", infoString.UTF8String);
+ return OSSystemExtensionReplacementActionReplace;
+}
+
+- (void)request:(nonnull OSSystemExtensionRequest *)request didFailWithError:(nonnull NSError *)error
+{
+ NSString *errorMessage;
+ int severity;
+
+ switch (error.code) {
+ case OSSystemExtensionErrorUnsupportedParentBundleLocation:
+ self.lastErrorMessage =
+ NSString stringWithUTF8String:obs_module_text("Error.SystemExtension.WrongLocation");
+ errorMessage = self.lastErrorMessage;
+ severity = LOG_WARNING;
+ break;
+ default:
+ self.lastErrorMessage = error.localizedDescription;
+ errorMessage = NSString stringWithFormat:@"OSSystemExtensionErrorCode %ld (\"%s\")", error.code,
+ error.localizedDescription.UTF8String;
+ severity = LOG_ERROR;
+ break;
+ }
+
+ blog(severity, "mac-camera-extension: %s", errorMessage.UTF8String);
+}
+
+- (void)request:(nonnull OSSystemExtensionRequest *)request didFinishWithResult:(OSSystemExtensionRequestResult)result
+{
+ switch (result) {
+ case OSSystemExtensionRequestCompleted:
+ self.installed = YES;
+ blog(LOG_INFO, "macOS Camera Extension activated successfully.");
+ break;
+ case OSSystemExtensionRequestWillCompleteAfterReboot:
+ self.lastErrorMessage =
+ NSString stringWithUTF8String:obs_module_text("Error.SystemExtension.CompleteAfterReboot");
+ blog(LOG_INFO, "macOS Camera Extension will activate after reboot.");
+ break;
+ }
+}
+
+- (void)requestNeedsUserApproval:(nonnull OSSystemExtensionRequest *)request
+{
+ self.installed = NO;
+ blog(LOG_INFO, "macOS Camera Extension user approval required.");
+}
+
+@end
+
+static void install_cmio_system_extension(struct virtualcam_data *vcam)
+{
+ OSSystemExtensionRequest *request = OSSystemExtensionRequest
+ activationRequestForExtension:@"com.obsproject.obs-studio.mac-camera-extension"
+ queue:dispatch_get_main_queue();
+ request.delegate = vcam->extensionDelegate;
+
+ OSSystemExtensionManager sharedManager submitRequest:request;
+}
+
+typedef enum {
+ OBSDalPluginNotInstalled,
+ OBSDalPluginInstalled,
+ OBSDalPluginNeedsUpdate
+} dal_plugin_status;
+
+static dal_plugin_status check_dal_plugin()
+{
+ NSFileManager *fileManager = NSFileManager defaultManager;
+
+ NSString *dalPluginFileName = OBSDalDestination stringByAppendingString:@"/obs-mac-virtualcam.plugin";
+
+ BOOL dalPluginInstalled = fileManager fileExistsAtPath:dalPluginFileName;
+
+ if (dalPluginInstalled) {
+ NSDictionary *dalPluginInfoPlist = NSDictionary
+ dictionaryWithContentsOfURL:
+ NSURL fileURLWithPath:OBSDalDestination
+ stringByAppendingString:@"/obs-mac-virtualcam.plugin/Contents/Info.plist";
+
+ NSString *dalPluginVersion = dalPluginInfoPlist valueForKey:@"CFBundleShortVersionString";
+ NSString *dalPluginBuild = dalPluginInfoPlist valueForKey:@"CFBundleVersion";
+
+ NSString *obsVersion = NSBundle mainBundle infoDictionary objectForKey:@"CFBundleShortVersionString";
+ NSString *obsBuild = NSBundle mainBundle infoDictionary objectForKey:(NSString *) kCFBundleVersionKey;
+ BOOL dalPluginUpdateNeeded =
+ !(dalPluginVersion isEqualToString:obsVersion && dalPluginBuild isEqualToString:obsBuild);
+
+ return dalPluginUpdateNeeded ? OBSDalPluginNeedsUpdate : OBSDalPluginInstalled;
+ }
+
+ return OBSDalPluginNotInstalled;
+}
+
+static bool install_dal_plugin(bool update)
+{
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ BOOL dalPluginDirExists = fileManager fileExistsAtPath:OBSDalDestination;
+
+ NSURL *bundleURL = NSBundle mainBundle bundleURL;
+ NSString *pluginPath = @"Contents/Resources/obs-mac-virtualcam.plugin";
+
+ NSURL *pluginUrl = bundleURL URLByAppendingPathComponent:pluginPath;
+ NSString *dalPluginSourcePath = pluginUrl path;
+
+ NSString *createPluginDirCmd =
+ (!dalPluginDirExists) ? NSString stringWithFormat:@"mkdir -p '%@' && ", OBSDalDestination : @"";
+ NSString *deleteOldPluginCmd = (update) ? NSString stringWithFormat:@"rm -rf '%@' && ", OBSDalDestination : @"";
+ NSString *copyPluginCmd = NSString stringWithFormat:@"cp -R '%@' '%@'", dalPluginSourcePath, OBSDalDestination;
+
+ if (fileManager fileExistsAtPath:dalPluginSourcePath) {
+ NSString *copyCmd = NSString stringWithFormat:@"do shell script \"%@%@%@\" with administrator privileges",
+ createPluginDirCmd, deleteOldPluginCmd, copyPluginCmd;
+
+ NSDictionary *errorDict;
+ NSAppleScript *scriptObject = NSAppleScript alloc initWithSource:copyCmd;
+ scriptObject executeAndReturnError:&errorDict;
+ if (errorDict != nil) {
+ const char *errorMessage = errorDict objectForKey:@"NSAppleScriptErrorMessage" UTF8String;
+
+ blog(LOG_INFO, "macOS VirtualCam DAL Plugin Installation status: %s", errorMessage);
+ return false;
+ } else {
+ return true;
+ }
+ } else {
+ blog(LOG_INFO, "macOS VirtualCam DAL Plugin not shipped with OBS");
+ return false;
+ }
+}
+
+static bool uninstall_dal_plugin()
 {
-	NSFileManager *fileManager = NSFileManager defaultManager;
-
-	NSString *dalPluginDestinationPath =
-		@"/Library/CoreMediaIO/Plug-Ins/DAL/";
-	NSString *dalPluginFileName =
-		@"/Library/CoreMediaIO/Plug-Ins/DAL/obs-mac-virtualcam.plugin";
-
-	BOOL dalPluginDirExists =
-		fileManager fileExistsAtPath:dalPluginDestinationPath;
-	BOOL dalPluginInstalled =
-		fileManager fileExistsAtPath:dalPluginFileName;
-	BOOL dalPluginUpdateNeeded = NO;
-
-	if (dalPluginInstalled) {
-		NSDictionary *dalPluginInfoPlist = NSDictionary
-			dictionaryWithContentsOfURL:
-				NSURL fileURLWithPath:
-						@"/Library/CoreMediaIO/Plug-Ins/DAL/obs-mac-virtualcam.plugin/Contents/Info.plist";
-		NSString *dalPluginVersion = dalPluginInfoPlist
-			valueForKey:@"CFBundleShortVersionString";
-		NSString *dalPluginBuild =
-			dalPluginInfoPlist valueForKey:@"CFBundleVersion";
-
-		NSString *obsVersion = NSBundle mainBundle infoDictionary
-			objectForKey:@"CFBundleShortVersionString";
-		NSString *obsBuild = NSBundle mainBundle infoDictionary
-			objectForKey:(NSString *)kCFBundleVersionKey;
-		dalPluginUpdateNeeded =
-			!(dalPluginVersion isEqualToString:obsVersion &&
-			 dalPluginBuild isEqualToString:obsBuild);
-	}
-
-	if (!dalPluginInstalled || dalPluginUpdateNeeded) {
-		NSString *dalPluginSourcePath;
-
-		NSURL *bundleURL = NSBundle mainBundle bundleURL;
-		NSString *pluginPath =
-			@"Contents/Resources/obs-mac-virtualcam.plugin";
-
-		NSURL *pluginUrl =
-			bundleURL URLByAppendingPathComponent:pluginPath;
-		dalPluginSourcePath = pluginUrl path;
-
-		NSString *createPluginDirCmd =
-			(!dalPluginDirExists)
-				? NSString stringWithFormat:
-						 @"mkdir -p '%@' && ",
-						 dalPluginDestinationPath
-				: @"";
-		NSString *deleteOldPluginCmd =
-			(dalPluginUpdateNeeded)
-				? NSString stringWithFormat:@"rm -rf '%@' && ",
-							 dalPluginFileName
-				: @"";
-		NSString *copyPluginCmd =
-			NSString stringWithFormat:@"cp -R '%@' '%@'",
-						 dalPluginSourcePath,
-						 dalPluginDestinationPath;
-		if (fileManager fileExistsAtPath:dalPluginSourcePath) {
-			NSString *copyCmd = NSString
-				stringWithFormat:
-					@"do shell script \"%@%@%@\" with administrator privileges",
-					createPluginDirCmd, deleteOldPluginCmd,
-					copyPluginCmd;
-
-			NSDictionary *errorDict;
-			NSAppleScript *scriptObject =
-				NSAppleScript alloc initWithSource:copyCmd;
-			scriptObject executeAndReturnError:&errorDict;
-			if (errorDict != nil) {
-				const char *errorMessage = errorDict
-					objectForKey:@"NSAppleScriptErrorMessage"
-					UTF8String;
-				blog(LOG_INFO,
-				 "macOS VirtualCam DAL Plugin Installation status: %s",
-				 errorMessage);
-				return false;
-			}
-		} else {
-			blog(LOG_INFO,
-			 "macOS VirtualCam DAL Plugin not shipped with OBS");
-			return false;
-		}
-	}
-	return true;
+ NSAppleScript *scriptObject = NSAppleScript alloc
+ initWithSource:NSString
+ stringWithFormat:
+ @"do shell script \"rm -rf %@/obs-mac-virtualcam.plugin\" with administrator privileges",
+ OBSDalDestination;
+
+ NSDictionary *errorDict;
+
+ scriptObject executeAndReturnError:&errorDict;
+ if (errorDict) {
+ blog(LOG_INFO, "macOS VirtualCam DAL Plugin could not be uninstalled: %s",
+ errorDict objectForKey:NSAppleScriptErrorMessage UTF8String);
+ return false;
+ } else {
+ return true;
+ }
 }
 
-FourCharCode convert_video_format_to_mac(enum video_format format,
-					 enum video_range_type range)
+FourCharCode convert_video_format_to_mac(enum video_format format, enum video_range_type range)
 {
-	switch (format) {
-	case VIDEO_FORMAT_I420:
-		return (range == VIDEO_RANGE_FULL)
-			 ? kCVPixelFormatType_420YpCbCr8PlanarFullRange
-			 : kCVPixelFormatType_420YpCbCr8Planar;
-	case VIDEO_FORMAT_NV12:
-		return (range == VIDEO_RANGE_FULL)
-			 ? kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
-			 : kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-	case VIDEO_FORMAT_UYVY:
-		return (range == VIDEO_RANGE_FULL)
-			 ? kCVPixelFormatType_422YpCbCr8FullRange
-			 : kCVPixelFormatType_422YpCbCr8;
-	case VIDEO_FORMAT_P010:
-		return (range == VIDEO_RANGE_FULL)
-			 ? kCVPixelFormatType_420YpCbCr10BiPlanarFullRange
-			 : kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
-	default:
-		// Zero indicates that the format is not supported on macOS
-		// Note that some formats do have an associated constant, but
-		// constructing such formats fails with kCVReturnInvalidPixelFormat.
-		return 0;
-	}
+ switch (format) {
+ case VIDEO_FORMAT_I420:
+ return (range == VIDEO_RANGE_FULL) ? kCVPixelFormatType_420YpCbCr8PlanarFullRange
+ : kCVPixelFormatType_420YpCbCr8Planar;
+ case VIDEO_FORMAT_NV12:
+ return (range == VIDEO_RANGE_FULL) ? kCVPixelFormatType_420YpCbCr8BiPlanarFullRange
+ : kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+ case VIDEO_FORMAT_UYVY:
+ return (range == VIDEO_RANGE_FULL) ? kCVPixelFormatType_422YpCbCr8FullRange : kCVPixelFormatType_422YpCbCr8;
+ case VIDEO_FORMAT_P010:
+ return (range == VIDEO_RANGE_FULL) ? kCVPixelFormatType_420YpCbCr10BiPlanarFullRange
+ : kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
+ default:
+ // Zero indicates that the format is not supported on macOS
+ // Note that some formats do have an associated constant, but
+ // constructing such formats fails with kCVReturnInvalidPixelFormat.
+ return 0;
+ }
 }
 
 static const char *virtualcam_output_get_name(void *type_data)
 {
-	(void)type_data;
-	return obs_module_text("Plugin_Name");
+ (void) type_data;
+ return obs_module_text("Plugin_Name");
 }
 
-static void *virtualcam_output_create(obs_data_t *settings,
-				 obs_output_t *output)
+static void *virtualcam_output_create(obs_data_t *settings, obs_output_t *output)
 {
-	UNUSED_PARAMETER(settings);
+ UNUSED_PARAMETER(settings);
 
-	struct virtualcam_data *vcam =
-		(struct virtualcam_data *)bzalloc(sizeof(*vcam));
+ struct virtualcam_data *vcam = (struct virtualcam_data *) bzalloc(sizeof(*vcam));
 
-	vcam->output = output;
-	vcam->machServer = OBSDALMachServer alloc init;
-	return vcam;
+ vcam->output = output;
+
+ if (cmio_extension_supported()) {
+ vcam->extensionDelegate = SystemExtensionActivationDelegate alloc initWithVcam:vcam;
+ install_cmio_system_extension(vcam);
+ } else {
+ vcam->machServer = OBSDALMachServer alloc init;
+ }
+
+ return vcam;
 }
 
 static void virtualcam_output_destroy(void *data)
 {
-	struct virtualcam_data *vcam = (struct virtualcam_data *)data;
+ struct virtualcam_data *vcam = (struct virtualcam_data *) data;
+
+ if (cmio_extension_supported()) {
+ vcam->extensionDelegate = nil;
+ } else {
+ vcam->machServer = nil;
+ }
 
-	vcam->machServer = nil;
-	bfree(vcam);
+ bfree(vcam);
 }
 
 static bool virtualcam_output_start(void *data)
 {
-	struct virtualcam_data *vcam = (struct virtualcam_data *)data;
-
-	bool hasDalPlugin = check_dal_plugin();
-
-	if (!hasDalPlugin) {
-		return false;
-	}
-
-	obs_get_video_info(&vcam->videoInfo);
-
-	FourCharCode video_format = convert_video_format_to_mac(
-		vcam->videoInfo.output_format, vcam->videoInfo.range);
-
-	struct video_scale_info conversion = {};
-	conversion.width = vcam->videoInfo.output_width;
-	conversion.height = vcam->videoInfo.output_height;
-	conversion.colorspace = vcam->videoInfo.colorspace;
-	conversion.range = vcam->videoInfo.range;
-
-	if (!video_format) {
-		// Selected output format is not supported natively by CoreVideo, CPU conversion necessary
-		blog(LOG_WARNING,
-		 "Selected output format (%s) not supported by CoreVideo, enabling CPU transcoding...",
-		 get_video_format_name(vcam->videoInfo.output_format));
-
-		conversion.format = VIDEO_FORMAT_NV12;
-		video_format = convert_video_format_to_mac(conversion.format,
-							 conversion.range);
-	} else {
-		conversion.format = vcam->videoInfo.output_format;
-	}
-	obs_output_set_video_conversion(vcam->output, &conversion);
-
-	NSDictionary *pAttr = @{};
-	NSDictionary *pbAttr = @{
-		(id)kCVPixelBufferPixelFormatTypeKey: @(video_format),
-		(id)kCVPixelBufferWidthKey: @(vcam->videoInfo.output_width),
-		(id)kCVPixelBufferHeightKey: @(vcam->videoInfo.output_height),
-		(id)kCVPixelBufferIOSurfacePropertiesKey: @{}
-	};
-	CVReturn status = CVPixelBufferPoolCreate(
-		kCFAllocatorDefault, (__bridge CFDictionaryRef)pAttr,
-		(__bridge CFDictionaryRef)pbAttr, &vcam->pool);
-	if (status != kCVReturnSuccess) {
-		blog(LOG_ERROR,
-		 "unable to allocate pixel buffer pool (error %d)", status);
-		return false;
-	}
-
-	vcam->machServer run;
-
-	if (!obs_output_begin_data_capture(vcam->output, 0)) {
-		return false;
-	}
-
-	return true;
+ struct virtualcam_data *vcam = (struct virtualcam_data *) data;
+
+ dal_plugin_status dal_status = check_dal_plugin();
+
+ if (cmio_extension_supported()) {
+ if (dal_status != OBSDalPluginNotInstalled) {
+ if (!uninstall_dal_plugin()) {
+ obs_output_set_last_error(vcam->output, obs_module_text("Error.DAL.NotUninstalled"));
+ return false;
+ }
+ }
+
+ SystemExtensionActivationDelegate *delegate = vcam->extensionDelegate;
+
+ if (!delegate.installed) {
+ if (delegate.lastErrorMessage) {
+ obs_output_set_last_error(
+ vcam->output,
+ NSString stringWithFormat:@"%s\n\n%@", obs_module_text("Error.SystemExtension.InstallationError"),
+ delegate.lastErrorMessage
+ .UTF8String);
+ } else {
+ obs_output_set_last_error(vcam->output, obs_module_text("Error.SystemExtension.NotInstalled"));
+ }
+
+ return false;
+ }
+ } else {
+ bool success = false;
+ if (dal_status == OBSDalPluginNotInstalled) {
+ success = install_dal_plugin(false);
+ } else if (dal_status == OBSDalPluginNeedsUpdate) {
+ success = install_dal_plugin(true);
+ } else {
+ success = true;
+ }
+
+ if (!success) {
+ obs_output_set_last_error(vcam->output, "Error.DAL.NotInstalled");
+ return false;
+ }
+ }
+
+ obs_get_video_info(&vcam->videoInfo);
+
+ FourCharCode video_format = convert_video_format_to_mac(vcam->videoInfo.output_format, vcam->videoInfo.range);
+
+ struct video_scale_info conversion = {};
+ conversion.width = vcam->videoInfo.output_width;
+ conversion.height = vcam->videoInfo.output_height;
+ conversion.colorspace = vcam->videoInfo.colorspace;
+ conversion.range = vcam->videoInfo.range;
+
+ if (!video_format) {
+ // Selected output format is not supported natively by CoreVideo, CPU conversion necessary
+ blog(LOG_WARNING, "Selected output format (%s) not supported by CoreVideo, enabling CPU transcoding...",
+ get_video_format_name(vcam->videoInfo.output_format));
+
+ conversion.format = VIDEO_FORMAT_NV12;
+ video_format = convert_video_format_to_mac(conversion.format, conversion.range);
+ } else {
+ conversion.format = vcam->videoInfo.output_format;
+ }
+ obs_output_set_video_conversion(vcam->output, &conversion);
+
+ NSDictionary *pAttr = @ {};
+ NSDictionary *pbAttr = @{
+ (id) kCVPixelBufferPixelFormatTypeKey: @(video_format),
+ (id) kCVPixelBufferWidthKey: @(vcam->videoInfo.output_width),
+ (id) kCVPixelBufferHeightKey: @(vcam->videoInfo.output_height),
+ (id) kCVPixelBufferIOSurfacePropertiesKey: @ {}
+ };
+ CVReturn status = CVPixelBufferPoolCreate(kCFAllocatorDefault, (__bridge CFDictionaryRef) pAttr,
+ (__bridge CFDictionaryRef) pbAttr, &vcam->pool);
+
+ if (status != kCVReturnSuccess) {
+ blog(LOG_ERROR, "unable to allocate pixel buffer pool (error %d)", status);
+ return false;
+ }
+
+ if (cmio_extension_supported()) {
+ UInt32 size;
+ UInt32 used;
+
+ CMIOObjectPropertyAddress address {.mSelector = kCMIOHardwarePropertyDevices,
+ .mScope = kCMIOObjectPropertyScopeGlobal,
+ .mElement = kCMIOObjectPropertyElementMain};
+ CMIOObjectGetPropertyDataSize(kCMIOObjectSystemObject, &address, 0, NULL, &size);
+ NSMutableData *cmioDevices = NSMutableData dataWithLength:size;
+ void *device_data = cmioDevices mutableBytes;
+ CMIOObjectGetPropertyData(kCMIOObjectSystemObject, &address, 0, NULL, size, &used, device_data);
+
+ vcam->deviceID = 0;
+ NSString *OBSVirtualCamUUID = NSBundle bundleWithIdentifier:@"com.obsproject.mac-virtualcam"
+ objectForInfoDictionaryKey:@"OBSCameraDeviceUUID";
+
+ size_t num_elements = size / sizeof(CMIOObjectID);
+ for (size_t i = 0; i < num_elements; i++) {
+ CMIOObjectID cmioDevice;
+ cmioDevices getBytes:&cmioDevice range:NSMakeRange(i * sizeof(CMIOObjectID), sizeof(CMIOObjectID));
+
+ address.mSelector = kCMIODevicePropertyDeviceUID;
+ UInt32 device_name_size;
+ CMIOObjectGetPropertyDataSize(cmioDevice, &address, 0, NULL, &device_name_size);
+ CFStringRef uid;
+ CMIOObjectGetPropertyData(cmioDevice, &address, 0, NULL, device_name_size, &used, &uid);
+ const char *uid_string = CFStringGetCStringPtr(uid, kCFStringEncodingUTF8);
+ if (uid_string && strcmp(uid_string, OBSVirtualCamUUID.UTF8String) == 0) {
+ vcam->deviceID = cmioDevice;
+ CFRelease(uid);
+ break;
+ } else {
+ CFRelease(uid);
+ }
+ }
+
+ if (!vcam->deviceID) {
+ obs_output_set_last_error(vcam->output, obs_module_text("Error.SystemExtension.CameraUnavailable"));
+ return false;
+ }
+
+ address.mSelector = kCMIODevicePropertyStreams;
+ CMIOObjectGetPropertyDataSize(vcam->deviceID, &address, 0, NULL, &size);
+ NSMutableData *streamIds = NSMutableData dataWithLength:size;
+ void *stream_data = streamIds mutableBytes;
+ CMIOObjectGetPropertyData(vcam->deviceID, &address, 0, NULL, size, &used, stream_data);
+
+ if (size < (2 * sizeof(CMIOStreamID))) {
+ obs_output_set_last_error(vcam->output, obs_module_text("Error.SystemExtension.CameraNotStarted"));
+ return false;
+ }
+ streamIds getBytes:&vcam->streamID range:NSMakeRange(sizeof(CMIOStreamID), sizeof(CMIOStreamID));
+
+ CMIOStreamCopyBufferQueue(
+ vcam->streamID, (CMIOStreamID, void *, void *) {
+ }, NULL, &vcam->queue);
+ CMVideoFormatDescriptionCreate(kCFAllocatorDefault, video_format, vcam->videoInfo.output_width,
+ vcam->videoInfo.output_height, NULL, &vcam->formatDescription);
+
+ OSStatus result = CMIODeviceStartStream(vcam->deviceID, vcam->streamID);
+
+ if (result != noErr) {
+ obs_output_set_last_error(vcam->output, obs_module_text("Error.SystemExtension.CameraNotStarted"));
+ return false;
+ }
+ } else {
+ vcam->machServer run;
+ }
+
+ if (!obs_output_begin_data_capture(vcam->output, 0)) {
+ return false;
+ }
+
+ return true;
 }
 
 static void virtualcam_output_stop(void *data, uint64_t ts)
 {
-	UNUSED_PARAMETER(ts);
-
-	struct virtualcam_data *vcam = (struct virtualcam_data *)data;
-
-	obs_output_end_data_capture(vcam->output);
-	vcam->machServer stop;
-
-	CVPixelBufferPoolRelease(vcam->pool);
+ UNUSED_PARAMETER(ts);
+
+ struct virtualcam_data *vcam = (struct virtualcam_data *) data;
+
+ obs_output_end_data_capture(vcam->output);
+ if (cmio_extension_supported()) {
+ CMIODeviceStopStream(vcam->deviceID, vcam->streamID);
+ CFRelease(vcam->formatDescription);
+ } else {
+ vcam->machServer stop;
+ }
+ CVPixelBufferPoolRelease(vcam->pool);
 }
 
 static void virtualcam_output_raw_video(void *data, struct video_data *frame)
 {
-	struct virtualcam_data *vcam = (struct virtualcam_data *)data;
-
-	CVPixelBufferRef frameRef = nil;
-	CVReturn status = CVPixelBufferPoolCreatePixelBuffer(
-		kCFAllocatorDefault, vcam->pool, &frameRef);
-
-	if (status != kCVReturnSuccess) {
-		blog(LOG_ERROR, "unable to allocate pixel buffer (error %d)",
-		 status);
-		return;
-	}
-
-	// Copy all planes into pixel buffer
-	size_t planeCount = CVPixelBufferGetPlaneCount(frameRef);
-	CVPixelBufferLockBaseAddress(frameRef, 0);
-
-	if (planeCount == 0) {
-		uint8_t *src = frame->data0;
-		uint8_t *dst = (uint8_t *)CVPixelBufferGetBaseAddress(frameRef);
-
-		size_t destBytesPerRow = CVPixelBufferGetBytesPerRow(frameRef);
-		size_t srcBytesPerRow = frame->linesize0;
-		size_t height = CVPixelBufferGetHeight(frameRef);
-
-		// Sometimes CVPixelBufferCreate will create a pixel buffer that's a different
-		// size than necessary to hold the frame (probably for some optimization reason).
-		// If that is the case this will do a row-by-row copy into the buffer.
-		if (destBytesPerRow == srcBytesPerRow) {
-			memcpy(dst, src, destBytesPerRow * height);
-		} else {
-			for (int line = 0; (size_t)line < height; line++) {
-				memcpy(dst, src, srcBytesPerRow);
-				src += srcBytesPerRow;
-				dst += destBytesPerRow;
-			}
-		}
-	} else {
-		for (size_t plane = 0; plane < planeCount; plane++) {
-			uint8_t *src = frame->dataplane;
-
-			if (!src) {
-				blog(LOG_WARNING,
-				 "Video data from OBS contains less planes than CVPixelBuffer");
-				break;
-			}
-
-			uint8_t *dst =
-				(uint8_t *)CVPixelBufferGetBaseAddressOfPlane(
-					frameRef, plane);
-
-			size_t destBytesPerRow =
-				CVPixelBufferGetBytesPerRowOfPlane(frameRef,
-								 plane);
-			size_t srcBytesPerRow = frame->linesizeplane;
-			size_t height =
-				CVPixelBufferGetHeightOfPlane(frameRef, plane);
-
-			if (destBytesPerRow == srcBytesPerRow) {
-				memcpy(dst, src, destBytesPerRow * height);
-			} else {
-				for (int line = 0; (size_t)line < height;
-				 line++) {
-					memcpy(dst, src, srcBytesPerRow);
-					src += srcBytesPerRow;
-					dst += destBytesPerRow;
-				}
-			}
-		}
-	}
-
-	CVPixelBufferUnlockBaseAddress(frameRef, 0);
-
-	// Share pixel buffer with clients
-	vcam->machServer sendPixelBuffer:frameRef
-				timestamp:frame->timestamp
-			 fpsNumerator:vcam->videoInfo.fps_num
-			 fpsDenominator:vcam->videoInfo.fps_den;
-
-	CVPixelBufferRelease(frameRef);
+ struct virtualcam_data *vcam = (struct virtualcam_data *) data;
+
+ CVPixelBufferRef frameRef = nil;
+ CVReturn status = CVPixelBufferPoolCreatePixelBuffer(kCFAllocatorDefault, vcam->pool, &frameRef);
+
+ if (status != kCVReturnSuccess) {
+ blog(LOG_ERROR, "unable to allocate pixel buffer (error %d)", status);
+ return;
+ }
+
+ // Copy all planes into pixel buffer
+ size_t planeCount = CVPixelBufferGetPlaneCount(frameRef);
+ CVPixelBufferLockBaseAddress(frameRef, 0);
+
+ if (planeCount == 0) {
+ uint8_t *src = frame->data0;
+ uint8_t *dst = (uint8_t *) CVPixelBufferGetBaseAddress(frameRef);
+
+ size_t destBytesPerRow = CVPixelBufferGetBytesPerRow(frameRef);
+ size_t srcBytesPerRow = frame->linesize0;
+ size_t height = CVPixelBufferGetHeight(frameRef);
+
+ // Sometimes CVPixelBufferCreate will create a pixel buffer that's a different
+ // size than necessary to hold the frame (probably for some optimization reason).
+ // If that is the case this will do a row-by-row copy into the buffer.
+ if (destBytesPerRow == srcBytesPerRow) {
+ memcpy(dst, src, destBytesPerRow * height);
+ } else {
+ for (int line = 0; (size_t) line < height; line++) {
+ memcpy(dst, src, srcBytesPerRow);
+ src += srcBytesPerRow;
+ dst += destBytesPerRow;
+ }
+ }
+ } else {
+ for (size_t plane = 0; plane < planeCount; plane++) {
+ uint8_t *src = frame->dataplane;
+
+ if (!src) {
+ blog(LOG_WARNING, "Video data from OBS contains less planes than CVPixelBuffer");
+ break;
+ }
+
+ uint8_t *dst = (uint8_t *) CVPixelBufferGetBaseAddressOfPlane(frameRef, plane);
+
+ size_t destBytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(frameRef, plane);
+ size_t srcBytesPerRow = frame->linesizeplane;
+ size_t height = CVPixelBufferGetHeightOfPlane(frameRef, plane);
+
+ if (destBytesPerRow == srcBytesPerRow) {
+ memcpy(dst, src, destBytesPerRow * height);
+ } else {
+ for (int line = 0; (size_t) line < height; line++) {
+ memcpy(dst, src, srcBytesPerRow);
+ src += srcBytesPerRow;
+ dst += destBytesPerRow;
+ }
+ }
+ }
+ }
+
+ CVPixelBufferUnlockBaseAddress(frameRef, 0);
+
+ if (cmio_extension_supported()) {
+ CMSampleBufferRef sampleBuffer;
+ CMSampleTimingInfo timingInfo {.presentationTimeStamp = CMTimeMake(frame->timestamp, NSEC_PER_SEC)};
+
+ CMSampleBufferCreateForImageBuffer(kCFAllocatorDefault, frameRef, true, NULL, NULL, vcam->formatDescription,
+ &timingInfo, &sampleBuffer);
+ CMSimpleQueueEnqueue(vcam->queue, sampleBuffer);
+ } else {
+ // Share pixel buffer with clients
+ vcam->machServer sendPixelBuffer:frameRef timestamp:frame->timestamp fpsNumerator:vcam->videoInfo.fps_num
+ fpsDenominator:vcam->videoInfo.fps_den;
+ }
+
+ CVPixelBufferRelease(frameRef);
 }
 
 struct obs_output_info virtualcam_output_info = {
-	.id = "virtualcam_output",
-	.flags = OBS_OUTPUT_VIDEO,
-	.get_name = virtualcam_output_get_name,
-	.create = virtualcam_output_create,
-	.destroy = virtualcam_output_destroy,
-	.start = virtualcam_output_start,
-	.stop = virtualcam_output_stop,
-	.raw_video = virtualcam_output_raw_video,
+ .id = "virtualcam_output",
+ .flags = OBS_OUTPUT_VIDEO,
+ .get_name = virtualcam_output_get_name,
+ .create = virtualcam_output_create,
+ .destroy = virtualcam_output_destroy,
+ .start = virtualcam_output_start,
+ .stop = virtualcam_output_stop,
+ .raw_video = virtualcam_output_raw_video,
 };
 
 bool obs_module_load(void)
 {
-	obs_register_output(&virtualcam_output_info);
+ obs_register_output(&virtualcam_output_info);
 
-	obs_data_t *obs_settings = obs_data_create();
-	obs_data_set_bool(obs_settings, "vcamEnabled", true);
-	obs_apply_private_data(obs_settings);
-	obs_data_release(obs_settings);
+ obs_data_t *obs_settings = obs_data_create();
+ obs_data_set_bool(obs_settings, "vcamEnabled", true);
+ obs_apply_private_data(obs_settings);
+ obs_data_release(obs_settings);
 
-	return true;
+ return true;
 }

obs-studio-29.1.3.tar.xz/plugins/obs-browser/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/browser-app.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/browser-app.cpp Changed

@@ -1,6 +1,6 @@
 /******************************************************************************
 Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
- Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 
 #include "browser-app.hpp"
 #include "browser-version.h"
-#include <json11/json11.hpp>
+#include <nlohmann/json.hpp>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -38,8 +38,6 @@
 	}
 #endif
 
-using namespace json11;
-
 CefRefPtr<CefRenderProcessHandler> BrowserApp::GetRenderProcessHandler()
 {
 	return this;
@@ -85,10 +83,12 @@
 		std::string disableFeatures =
 			command_line->GetSwitchValue("disable-features");
 		disableFeatures += ",HardwareMediaKeyHandling";
+		disableFeatures += ",WebBluetooth";
 		command_line->AppendSwitchWithValue("disable-features",
 						 disableFeatures);
 	} else {
 		command_line->AppendSwitchWithValue("disable-features",
+						 "WebBluetooth,"
 						 "HardwareMediaKeyHandling");
 	}
 
@@ -144,19 +144,25 @@
 				 const char *functionName,
 				 CefV8ValueList arguments)
 {
-	CefRefPtr<CefV8Context> context =
-		browser->GetMainFrame()->GetV8Context();
+	std::vector<CefString> names;
+	browser->GetFrameNames(names);
+	for (auto &name : names) {
+		CefRefPtr<CefFrame> frame = browser->GetFrame(name);
+		CefRefPtr<CefV8Context> context = frame->GetV8Context();
 
-	context->Enter();
+		context->Enter();
 
-	CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
-	CefRefPtr<CefV8Value> obsStudioObj = globalObj->GetValue("obsstudio");
-	CefRefPtr<CefV8Value> jsFunction = obsStudioObj->GetValue(functionName);
+		CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
+		CefRefPtr<CefV8Value> obsStudioObj =
+			globalObj->GetValue("obsstudio");
+		CefRefPtr<CefV8Value> jsFunction =
+			obsStudioObj->GetValue(functionName);
 
-	if (jsFunction && jsFunction->IsFunction())
-		jsFunction->ExecuteFunction(nullptr, arguments);
+		if (jsFunction && jsFunction->IsFunction())
+			jsFunction->ExecuteFunction(nullptr, arguments);
 
-	context->Exit();
+		context->Exit();
+	}
 }
 
 #if !ENABLE_WASHIDDEN
@@ -245,6 +251,56 @@
 }
 #endif
 
+CefRefPtr<CefV8Value> CefValueToCefV8Value(CefRefPtr<CefValue> value)
+{
+	CefRefPtr<CefV8Value> result;
+	switch (value->GetType()) {
+	case VTYPE_INVALID:
+		result = CefV8Value::CreateNull();
+		break;
+	case VTYPE_NULL:
+		result = CefV8Value::CreateNull();
+		break;
+	case VTYPE_BOOL:
+		result = CefV8Value::CreateBool(value->GetBool());
+		break;
+	case VTYPE_INT:
+		result = CefV8Value::CreateInt(value->GetInt());
+		break;
+	case VTYPE_DOUBLE:
+		result = CefV8Value::CreateDouble(value->GetDouble());
+		break;
+	case VTYPE_STRING:
+		result = CefV8Value::CreateString(value->GetString());
+		break;
+	case VTYPE_BINARY:
+		result = CefV8Value::CreateNull();
+		break;
+	case VTYPE_DICTIONARY: {
+		result = CefV8Value::CreateObject(nullptr, nullptr);
+		CefRefPtr<CefDictionaryValue> dict = value->GetDictionary();
+		CefDictionaryValue::KeyList keys;
+		dict->GetKeys(keys);
+		for (unsigned int i = 0; i < keys.size(); i++) {
+			CefString key = keysi;
+			result->SetValue(
+				key, CefValueToCefV8Value(dict->GetValue(key)),
+				V8_PROPERTY_ATTRIBUTE_NONE);
+		}
+	} break;
+	case VTYPE_LIST: {
+		CefRefPtr<CefListValue> list = value->GetList();
+		size_t size = list->GetSize();
+		result = CefV8Value::CreateArray((int)size);
+		for (size_t i = 0; i < size; i++) {
+			result->SetValue((int)i, CefValueToCefV8Value(
+							 list->GetValue(i)));
+		}
+	} break;
+	}
+	return result;
+}
+
 bool BrowserApp::OnProcessMessageReceived(CefRefPtr<CefBrowser> browser,
 					 CefRefPtr<CefFrame> frame,
 					 CefProcessId source_process,
@@ -272,21 +328,13 @@
 		ExecuteJSFunction(browser, "onActiveChange", arguments);
 
 	} else if (message->GetName() == "DispatchJSEvent") {
-		CefRefPtr<CefV8Context> context =
-			browser->GetMainFrame()->GetV8Context();
-
-		context->Enter();
+		nlohmann::json payloadJson = nlohmann::json::parse(
+			args->GetString(1).ToString(), nullptr, false);
 
-		CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
-
-		std::string err;
-		auto payloadJson =
-			Json::parse(args->GetString(1).ToString(), err);
-
-		Json::object wrapperJson;
+		nlohmann::json wrapperJson;
 		if (args->GetSize() > 1)
 			wrapperJson"detail" = payloadJson;
-		std::string wrapperJsonString = Json(wrapperJson).dump();
+		std::string wrapperJsonString = wrapperJson.dump();
 		std::string script;
 
 		script += "new CustomEvent('";
@@ -295,28 +343,37 @@
 		script += wrapperJsonString;
 		script += ");";
 
-		CefRefPtr<CefV8Value> returnValue;
-		CefRefPtr<CefV8Exception> exception;
+		std::vector<CefString> names;
+		browser->GetFrameNames(names);
+		for (auto &name : names) {
+			CefRefPtr<CefFrame> frame = browser->GetFrame(name);
+			CefRefPtr<CefV8Context> context = frame->GetV8Context();
 
-		/* Create the CustomEvent object
-		 * We have to use eval to invoke the new operator */
-		context->Eval(script, browser->GetMainFrame()->GetURL(), 0,
-			 returnValue, exception);
+			context->Enter();
 
-		CefV8ValueList arguments;
-		arguments.push_back(returnValue);
+			CefRefPtr<CefV8Value> globalObj = context->GetGlobal();
 
-		CefRefPtr<CefV8Value> dispatchEvent =
-			globalObj->GetValue("dispatchEvent");
-		dispatchEvent->ExecuteFunction(nullptr, arguments);
+			CefRefPtr<CefV8Value> returnValue;
+			CefRefPtr<CefV8Exception> exception;
 
-		context->Exit();
+			/* Create the CustomEvent object
+			* We have to use eval to invoke the new operator */
+			context->Eval(script, browser->GetMainFrame()->GetURL(),
+				 0, returnValue, exception);
+
+			CefV8ValueList arguments;
+			arguments.push_back(returnValue);
+
+			CefRefPtr<CefV8Value> dispatchEvent =
+				globalObj->GetValue("dispatchEvent");
+			dispatchEvent->ExecuteFunction(nullptr, arguments);
+
+			context->Exit();
+		}
 
 	} else if (message->GetName() == "executeCallback") {
 		CefRefPtr<CefV8Context> context =
 			browser->GetMainFrame()->GetV8Context();
-		CefRefPtr<CefV8Value> retval;
-		CefRefPtr<CefV8Exception> exception;
 
 		context->Enter();
 
@@ -324,16 +381,13 @@
 		int callbackID = arguments->GetInt(0);
 		CefString jsonString = arguments->GetString(1);
 
-		std::string script;
-		script += "JSON.parse('";
-		script += arguments->GetString(1).ToString();
-		script += "');";
+		CefRefPtr<CefValue> json =
+			CefParseJSON(arguments->GetString(1).ToString(), {});
 
 		CefRefPtr<CefV8Value> callback = callbackMapcallbackID;
 		CefV8ValueList args;
 
-		context->Eval(script, browser->GetMainFrame()->GetURL(), 0,
-			 retval, exception);
+		CefRefPtr<CefV8Value> retval = CefValueToCefV8Value(json);
 
 		args.push_back(retval);

obs-studio-29.1.3.tar.xz/plugins/obs-browser/browser-app.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/browser-app.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/browser-client.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/browser-client.cpp Changed

@@ -1,6 +1,6 @@
 /******************************************************************************
 Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
- Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #include "browser-client.hpp"
 #include "obs-browser-source.hpp"
 #include "base64/base64.hpp"
-#include "json11/json11.hpp"
+#include <nlohmann/json.hpp>
 #include <obs-frontend-api.h>
 #include <obs.hpp>
 #include <util/platform.h>
@@ -30,8 +30,6 @@
 #include <IOSurface/IOSurface.h>
 #endif
 
-using namespace json11;
-
 inline bool BrowserClient::valid() const
 {
 	return !!bs && !bs->destroying;
@@ -119,7 +117,7 @@
 {
 	const std::string &name = message->GetName();
 	CefRefPtr<CefListValue> input_args = message->GetArgumentList();
-	Json json;
+	nlohmann::json json;
 
 	if (!valid()) {
 		return false;
@@ -206,7 +204,7 @@
 		if (name == "getScenes") {
 			struct obs_frontend_source_list list = {};
 			obs_frontend_get_scenes(&list);
-			std::vector<const char *> scenes_vector;
+			std::vector<nlohmann::json> scenes_vector;
 			for (size_t i = 0; i < list.sources.num; i++) {
 				obs_source_t *source = list.sources.arrayi;
 				scenes_vector.push_back(
@@ -225,16 +223,14 @@
 			if (!name)
 				return false;
 
-			json = Json::object{
-				{"name", name},
-				{"width",
-				 (int)obs_source_get_width(current_scene)},
+			json = {{"name", name},
+				{"width", obs_source_get_width(current_scene)},
 				{"height",
-				 (int)obs_source_get_height(current_scene)}};
+				 obs_source_get_height(current_scene)}};
 		} else if (name == "getTransitions") {
 			struct obs_frontend_source_list list = {};
 			obs_frontend_get_transitions(&list);
-			std::vector<const char *> transitions_vector;
+			std::vector<nlohmann::json> transitions_vector;
 			for (size_t i = 0; i < list.sources.num; i++) {
 				obs_source_t *source = list.sources.arrayi;
 				transitions_vector.push_back(
@@ -250,8 +246,7 @@
 		fallthrough;
 	case ControlLevel::ReadObs:
 		if (name == "getStatus") {
-			json = Json::object{
-				{"recording", obs_frontend_recording_active()},
+			json = {{"recording", obs_frontend_recording_active()},
 				{"streaming", obs_frontend_streaming_active()},
 				{"recordingPaused",
 				 obs_frontend_recording_paused()},
@@ -292,17 +287,12 @@
 
 bool BrowserClient::OnTooltip(CefRefPtr<CefBrowser>, CefString &text)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 	std::string str_text = text;
 	QMetaObject::invokeMethod(
 		QCoreApplication::instance()->thread(), str_text() {
 			QToolTip::showText(QCursor::pos(), str_text.c_str());
 		});
 	return true;
-#else
-	UNUSED_PARAMETER(text);
-	return false;
-#endif
 }
 
 void BrowserClient::OnPaint(CefRefPtr<CefBrowser>, PaintElementType type,

obs-studio-29.1.3.tar.xz/plugins/obs-browser/browser-client.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/browser-client.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/browser-scheme.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/browser-scheme.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/browser-scheme.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/browser-scheme.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/cef-headers.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/cef-headers.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/cmake/legacy.cmake Changed

@@ -32,6 +32,8 @@
     FATAL_ERROR "OBS:    -        Unable to find CEF Libraries - set CEF_ROOT_DIR or configure with ENABLE_BROWSER=OFF")
 endif()
 
+find_package(nlohmann_json REQUIRED)
+
 add_library(obs-browser MODULE)
 add_library(OBS::browser ALIAS obs-browser)
 
@@ -63,8 +65,6 @@
           browser-scheme.hpp
           browser-version.h
           cef-headers.hpp
-          deps/json11/json11.cpp
-          deps/json11/json11.hpp
           deps/base64/base64.cpp
           deps/base64/base64.hpp
           deps/wide-string.cpp
@@ -76,7 +76,7 @@
 
 target_include_directories(obs-browser PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/deps ${CMAKE_BINARY_DIR}/config)
 
-target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api)
+target_link_libraries(obs-browser PRIVATE OBS::libobs OBS::frontend-api nlohmann_json::nlohmann_json)
 
 target_compile_features(obs-browser PRIVATE cxx_std_17)
 
@@ -96,9 +96,9 @@
   add_executable(obs-browser-page)
 
   target_sources(obs-browser-page PRIVATE cef-headers.hpp obs-browser-page/obs-browser-page-main.cpp browser-app.cpp
-                                          browser-app.hpp deps/json11/json11.cpp deps/json11/json11.hpp)
+                                          browser-app.hpp)
 
-  target_link_libraries(obs-browser-page PRIVATE CEF::Library)
+  target_link_libraries(obs-browser-page PRIVATE CEF::Library nlohmann_json::nlohmann_json)
 
   target_include_directories(obs-browser-page PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/deps
                                                       ${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page)
@@ -194,9 +194,9 @@
     add_executable(${_HELPER_TARGET} MACOSX_BUNDLE)
     add_executable(OBS::browser-helper${_TARGET_SUFFIX} ALIAS ${_HELPER_TARGET})
     target_sources(${_HELPER_TARGET} PRIVATE browser-app.cpp browser-app.hpp obs-browser-page/obs-browser-page-main.cpp
-                                             cef-headers.hpp deps/json11/json11.cpp deps/json11/json11.hpp)
+                                             cef-headers.hpp)
 
-    target_link_libraries(${_HELPER_TARGET} PRIVATE CEF::Wrapper)
+    target_link_libraries(${_HELPER_TARGET} PRIVATE CEF::Wrapper nlohmann_json::nlohmann_json)
 
     target_include_directories(${_HELPER_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/deps
                                                          ${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page)

obs-studio-29.1.3.tar.xz/plugins/obs-browser/cmake/macos/Info-helper.plist.in -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/cmake/macos/Info-helper.plist.in Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/cmake/macos/Info.plist.in -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/cmake/macos/Info.plist.in Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/cmake/os-macos.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/cmake/os-macos.cmake Changed

@@ -32,7 +32,7 @@
   add_executable(OBS::${target_name} ALIAS ${target_name})
 
   target_sources(${target_name} PRIVATE browser-app.cpp browser-app.hpp obs-browser-page/obs-browser-page-main.cpp
-                                        cef-headers.hpp deps/json11/json11.cpp deps/json11/json11.hpp)
+                                        cef-headers.hpp)
   target_compile_definitions(${target_name} PRIVATE ENABLE_BROWSER_SHARED_TEXTURE)
   if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 14.0.3)
     target_compile_options(${target_name} PRIVATE -Wno-error=unqualified-std-cast-call)
@@ -41,7 +41,7 @@
   target_include_directories(${target_name} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/deps"
                                                     "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser-page")
 
-  target_link_libraries(${target_name} PRIVATE CEF::Wrapper)
+  target_link_libraries(${target_name} PRIVATE CEF::Wrapper nlohmann_json::nlohmann_json)
 
   set_target_properties(
     ${target_name}

obs-studio-29.1.3.tar.xz/plugins/obs-browser/cmake/os-windows.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/cmake/os-windows.cmake Changed

obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/af-ZA.ini Added

@@ -0,0 +1,40 @@
+LocalFile="Lokale lêer"
+Width="Breedte"
+Height="Hoogte"
+FPS="RPS"
+CSS="Pasgemaakte CSS"
+BrowserSource="Blaaier"
+CustomFrameRate="Gebruik pasgemaakte beeldduur"
+RerouteAudio="Beheer oudio d.m.v. OBS"
+Inspect="Inspekteer"
+DevTools="Inspekteer blaaierdok ‘%1’"
+CopyUrl="Kopieer huidige adres"
+WebpageControlLevel="Bladtoestemmings"
+WebpageControlLevel.Level.None="Geen toegang tot OBS"
+WebpageControlLevel.Level.ReadObs="Leestoegang tot OBS-statusinligting"
+WebpageControlLevel.Level.ReadUser="Leestoegang tot gebruikerinligting (huidige toneelversameling, oorgange)"
+WebpageControlLevel.Level.Basic="Basiese toegang tot OBS (bewaar terugspeelbuffer, ens.)"
+WebpageControlLevel.Level.Advanced="Gevorderde toegang tot OBS (Verander tonele, Begin/stop herhaalbuffer, ens.)"
+WebpageControlLevel.Level.All="Volle toegang tot OBS (begin/stop stroming sonder waarskuwing, ens.)"
+Dialog.Alert="JavaScript-waarskuwing"
+Dialog.Confirm="JavaScript-bevestiging"
+Dialog.Prompt="JavaScript-melding"
+Dialog.BrowserDock="Blaaierdok"
+Dialog.ReceivedFrom="Ontvang van ‘%1’"
+Error.Title="Kon nie daardie blad laai nie!"
+Error.Description="Maak seker die adres is korrek en dat die werf nie probleme ervaar nie."
+Error.Retry="Klik hier om weer te probeer"
+Error.Code="Fout: %1"
+Zoom.Reset="Herstel zoem"
+Zoom.Out="Zoem uit"
+Zoom.In="Zoem in"
+ErrorCode.ERR_CONNECTION_REFUSED="Bediener het die koppeling geweier"
+ErrorCode.ERR_NAME_NOT_RESOLVED="Bediener se IP-adres nie gevind nie"
+ErrorCode.ERR_CONNECTION_TIMED_OUT="Verbinding het uitgetel"
+ErrorCode.ERR_TIMED_OUT="Bewerking het uitgetel"
+ErrorCode.ERR_FILE_NOT_FOUND="Lêer nie gevind nie"
+ErrorCode.ERR_FAILED="Kon nie koppel nie"
+ErrorCode.ERR_NETWORK_CHANGED="Netwerk het verander"
+ErrorCode.ERR_SSL_VERSION_INTERFERENCE="SSL-weergawekoppelvlak. TLS 1.3 is dalk versper of gewysig."
+ErrorCode.ERR_SSL_PROTOCOL_ERROR="SSL-protokolfout. Kon nie ’n beveiligde verbinding maak nie."
+ErrorCode.ERR_CERT_DATE_INVALID="Bediener se SSL-sertifikaat is verouderd of u rekenaar se tyd is verkeerd."

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/az-AZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/az-AZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/bg-BG.ini Changed

@@ -7,20 +7,29 @@
 ShutdownSourceNotVisible="Изключване на източника, когато не е видим"
 RefreshBrowserActive="Опресняване на браузъра, когато сцената стане активна"
 RefreshNoCache="Опресняване на кеша на текущата страница"
-RestartCEF="Рестартиране на CEF"
 BrowserSource="Браузър"
 CustomFrameRate="Използване на настроена кадрова честота"
 RerouteAudio="Управление на звука чрез OBS"
+Inspect="Погледни"
+CopyUrl="Копирай текущия адрес"
 WebpageControlLevel="Позволения на страницата"
 WebpageControlLevel.Level.None="Няма достъп до OBS"
 WebpageControlLevel.Level.ReadObs="Прочети достъп до OBS статус информация"
 WebpageControlLevel.Level.ReadUser="Прочети достъп до информация за потребителя (текуща Сценна Колекция, Транзиция)"
+WebpageControlLevel.Level.All="Пълен достъп към OBS (Стартиране/Спиране на стрийма без предупреждение и др.)"
+Dialog.ReceivedFrom="Получено от '%1'"
 Error.Title="Страницата не би могла да се зареди!"
 Error.Description="Уверете се в правилността на адреса и че сайтът няма проблеми."
 Error.Retry="Щракнете тук за нов опит"
 Error.Code="Грешка: %1"
 Error.URL="URL адрес: %2"
+ErrorCode.ERR_CONNECTION_REFUSED="Сървърът отказа свързването"
+ErrorCode.ERR_NAME_NOT_RESOLVED="IP адреса на сървъра не можа да бъде намерен"
+ErrorCode.ERR_CONNECTION_TIMED_OUT="Времето за изчакване изтече"
+ErrorCode.ERR_TIMED_OUT="Операцията изтече"
 ErrorCode.ERR_FILE_NOT_FOUND="Файлът не е намерен"
 ErrorCode.ERR_FAILED="Неуспех при свързването"
 ErrorCode.ERR_NETWORK_CHANGED="Променена мрежа"
+ErrorCode.ERR_SSL_VERSION_INTERFERENCE="SSL интерфейс версия. TLS 1.3 може би е блокиран или променен"
 ErrorCode.ERR_SSL_PROTOCOL_ERROR="Грешка на протокол SSL. Не би могло да се осъществи сигурно свързване."
+ErrorCode.ERR_CERT_DATE_INVALID="SSL сертификата на сървъра е стар или времето на вашия компютър е грешен."

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/de-DE.ini Changed

@@ -5,7 +5,6 @@
 ShutdownSourceNotVisible="Deaktivieren, wenn Quelle nicht sichtbar ist"
 RefreshBrowserActive="Browser bei Szenenaktivierung aktualisieren"
 RefreshNoCache="Cache der aktuellen Seite aktualisieren"
-RestartCEF="CEF neu starten"
 CustomFrameRate="Benutzerdefinierte FPS verwenden"
 RerouteAudio="Audio über OBS steuern"
 Inspect="Untersuchen"
@@ -28,14 +27,14 @@
 Error.Retry="Hier klicken, um es erneut zu versuchen"
 Error.Code="Fehler: %1"
 Zoom.Reset="Zoom zurücksetzen"
-Zoom.Out="Rauszoomen"
+Zoom.Out="Herauszoomen"
 Zoom.In="Hineinzoomen"
 ErrorCode.ERR_CONNECTION_REFUSED="Server hat die Verbindung abgelehnt"
 ErrorCode.ERR_NAME_NOT_RESOLVED="IP-Adresse des Servers nicht gefunden"
 ErrorCode.ERR_CONNECTION_TIMED_OUT="Zeitüberschreitung bei Verbindung"
 ErrorCode.ERR_TIMED_OUT="Zeitüberschreitung der Operation"
 ErrorCode.ERR_FILE_NOT_FOUND="Datei nicht gefunden"
-ErrorCode.ERR_FAILED="Verbindung fehlgeschalgen"
+ErrorCode.ERR_FAILED="Verbindung fehlgeschlagen"
 ErrorCode.ERR_NETWORK_CHANGED="Netzwerk geändert"
 ErrorCode.ERR_SSL_VERSION_INTERFERENCE="SSL-Versionsinterferenz. TLS 1.3 ist möglicherweise blockiert oder verändert."
 ErrorCode.ERR_SSL_PROTOCOL_ERROR="SSL-Protokollfehler. Es konnte keine sichere Verbindung hergestellt werden."

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/el-GR.ini Changed

@@ -7,10 +7,10 @@
 ShutdownSourceNotVisible="Τερματισμος λειτουργίας πηγής, όταν δεν είναι ορατή"
 RefreshBrowserActive="Ανανέωση του προγράμματος περιήγησης, όταν η σκηνή γίνεται ενεργή"
 RefreshNoCache="Ανανέωση της μνήμης cache της τρέχουσας σελίδας"
-RestartCEF="Επανεκκίνηση του CEF"
 BrowserSource="Πρόγραμμα περιήγησης"
 CustomFrameRate="Χρήση προσαρμοσμένου ρυθμού καρέ"
 RerouteAudio="Έλεγχος ήχου μέσω OBS"
+CopyUrl="Αντιγραφή τρέχουσας διεύθυνσης"
 WebpageControlLevel="Δικαιώματα σελίδας"
 WebpageControlLevel.Level.None="Καμία πρόσβαση στο OBS"
 WebpageControlLevel.Level.ReadObs="Πρόσβαση στις πληροφορίες κατάστασης του OBS"
@@ -28,6 +28,9 @@
 Error.Retry="Κάντε κλικ εδώ, για να προσπαθήσετε ξανά"
 Error.Code="Σφάλμα: %1"
 Error.URL="Σύνδεσμος: %2"
+Zoom.Reset="Επαναφορά Κλίμακας"
+Zoom.Out="Σμίκρυνση"
+Zoom.In="Μεγέθυνση"
 ErrorCode.ERR_CONNECTION_REFUSED="Ο διακομιστής αρνήθηκε τη σύνδεση"
 ErrorCode.ERR_NAME_NOT_RESOLVED="Η διεύθυνση IP του διακομιστή δεν βρέθηκε"
 ErrorCode.ERR_CONNECTION_TIMED_OUT="Λήξη χρονικού ορίου σύνδεσης"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/eu-ES.ini Changed

@@ -5,10 +5,12 @@
 ShutdownSourceNotVisible="Itzali iturburua ikusgai ez dagoenean"
 RefreshBrowserActive="Freskatu nabigatzailea eszena aktibatzen denean"
 RefreshNoCache="Freskatu uneko orriaren cachea"
-RestartCEF="Berrabiarazi CEF"
 BrowserSource="Nabigatzailea"
 CustomFrameRate="Erabili fotograma-emari pertsonalizatua"
 RerouteAudio="Kontrolatu audioa OBS bidez"
+Inspect="Ikuskatu"
+DevTools="Ikuskatu nabigatzailearen '%1' panela"
+CopyUrl="Kopiatu uneko helbidea"
 WebpageControlLevel="Orrialde baimenak"
 WebpageControlLevel.Level.None="Ez dago sarbiderik OBSra"
 WebpageControlLevel.Level.ReadObs="Irakurri OBSrako sarbidearen informazio maila"
@@ -25,6 +27,9 @@
 Error.Description="Ziurtatu helbidea zuzena dela, eta ez lekua ez daukala arazorik."
 Error.Retry="Egin klik hemen berriro saiatzeko"
 Error.Code="Errorea: %1"
+Zoom.Reset="Berrezarri zooma"
+Zoom.Out="Txikiagotu"
+Zoom.In="Handiagotu"
 ErrorCode.ERR_CONNECTION_REFUSED="Zerbitzariak konexioa errefuxatu du"
 ErrorCode.ERR_NAME_NOT_RESOLVED="Zerbitzariaren IP helbidea ez da aurkitu"
 ErrorCode.ERR_CONNECTION_TIMED_OUT="Konexioaren denbora bukatu da"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/hy-AM.ini Changed

@@ -7,12 +7,12 @@
 ShutdownSourceNotVisible="Անջատել, երբ տեսանելի չէ"
 RefreshBrowserActive="Թարմացրեք դիտարկիչը, երբ տեսարանը ակտիվանա"
 RefreshNoCache="Թարմացրեք ընթացիկ էջի քեշը"
-RestartCEF="Վերագործարկել CEF-ը"
 BrowserSource="Բրաուզեր"
 CustomFrameRate="Օգտագործեք հատուկ շրջանակի արագություն"
 RerouteAudio="Աուդիո կառավարում OBS-ի միջոցով"
 Inspect="Ստուգել"
 DevTools="Ստուգել դիտարկչի դոկը '%1'"
+CopyUrl="Պատճենել ընթացիկ հասցեն"
 WebpageControlLevel="Էջի լուծում"
 WebpageControlLevel.Level.None="OBS մուտք չկա"
 WebpageControlLevel.Level.ReadObs="OBS կարգավիճակի մասին տեղեկությունները կարդալու հասանելիություն"
@@ -30,6 +30,9 @@
 Error.Retry="Սեղմեք այստեղ՝ կրկին փորձելու համար"
 Error.Code="Սխալ: %1"
 Error.URL="URL-հասցե: %2"
+Zoom.Reset="Վերականգնել սանդղակը"
+Zoom.Out="Փոքրացնել"
+Zoom.In="Մեծացնել"
 ErrorCode.ERR_CONNECTION_REFUSED="Սերվերը մերժել է կապը"
 ErrorCode.ERR_NAME_NOT_RESOLVED="Սերվերի IP հասցեն չի գտնվել"
 ErrorCode.ERR_CONNECTION_TIMED_OUT="Միացման ժամանակը սպառվել է"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/lt-LT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/lt-LT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/mn-MN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/mn-MN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/nb-NO.ini Changed

@@ -8,18 +8,25 @@
 BrowserSource="Nettleser"
 CustomFrameRate="Bruk tilpasset bildefrekvens"
 RerouteAudio="Kontroller lyden gjennom OBS"
+Inspect="Inspiser"
+CopyUrl="Kopier nåværende adresse"
 WebpageControlLevel="Side tillatelser"
 WebpageControlLevel.Level.None="Ingen tilgang til OBS"
 WebpageControlLevel.Level.Basic="Basistilgang til OBS (Lagre omspillingsbuffer, osv.)"
 WebpageControlLevel.Level.Advanced="Avansert tilgang til OBS (endre sener, start/stopp omspillingsbuffer, osv.)"
 WebpageControlLevel.Level.All="Full tilgang til OBS (Start/stopp kringkasting uten advarsel, osv.)"
+Dialog.ReceivedFrom="Mottatt fra «%1»"
 Error.Title="Kunne ikke laste inn den siden!"
 Error.Description="Kontroller at adressen er riktig, og at nettstedet ikke har problemer."
 Error.Retry="Klikk her for å prøve igjen."
 Error.Code="Feil: %1"
+Zoom.Reset="Tilbakestill forstørring"
+Zoom.Out="Forminsk"
+Zoom.In="Forstørr"
 ErrorCode.ERR_CONNECTION_REFUSED="Serveren nektet tilkoblingen"
 ErrorCode.ERR_NAME_NOT_RESOLVED="Serverens IP-adresse ble ikke funnet"
 ErrorCode.ERR_CONNECTION_TIMED_OUT="Tilkoblingen ble tidsavbrutt"
+ErrorCode.ERR_TIMED_OUT="Handlingen ble tidsavbrutt"
 ErrorCode.ERR_FILE_NOT_FOUND="Fant ikke filen"
 ErrorCode.ERR_FAILED="Tilkobling mislyktes"
 ErrorCode.ERR_NETWORK_CHANGED="Nettverk er endret"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/pt-BR.ini Changed

@@ -5,12 +5,11 @@
 ShutdownSourceNotVisible="Desativar fonte quando invisível"
 RefreshBrowserActive="Atualizar o navegador quando a cena se tornar ativa"
 RefreshNoCache="Atualizar o cache da página atual"
-RestartCEF="Reiniciar o CEF"
 BrowserSource="Navegador"
 CustomFrameRate="Usar taxa de quadros personalizada"
 RerouteAudio="Controlar áudio via OBS"
 Inspect="Inspecionar"
-DevTools="Inspecionar painel de navegador '%1'"
+DevTools="Inspecionar painel personalizado '%1'"
 CopyUrl="Copiar endereço atual"
 WebpageControlLevel="Permissões da página"
 WebpageControlLevel.Level.None="Sem acesso ao OBS"
@@ -28,9 +27,9 @@
 Error.Description="Verifique se o endereço está correto e se o site não está com problemas."
 Error.Retry="Tentar novamente"
 Error.Code="Erro: %1"
-Zoom.Reset="Redefinir Zoom"
-Zoom.Out="Diminuir ampliação"
-Zoom.In="Aumentar ampliação"
+Zoom.Reset="Redefinir zoom"
+Zoom.Out="Diminuir zoom"
+Zoom.In="Aumentar zoom"
 ErrorCode.ERR_CONNECTION_REFUSED="Conexão recusada pelo servidor"
 ErrorCode.ERR_NAME_NOT_RESOLVED="Endereço IP do servidor não encontrado"
 ErrorCode.ERR_CONNECTION_TIMED_OUT="Conexão expirada"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ro-RO.ini Changed

@@ -5,11 +5,10 @@
 ShutdownSourceNotVisible="Închide sursa când nu este vizibilă"
 RefreshBrowserActive="Reîmprospătează browserul când scena devine activă"
 RefreshNoCache="Reîmprospătează memoria cache a paginii actuale"
-RestartCEF="Repornește CEF"
 CustomFrameRate="Folosește o frecvență de cadre personalizată"
 RerouteAudio="Controlează sistemul audio prin OBS"
 Inspect="Inspectează"
-DevTools="Inspectează andocarea browser-ului '%1'"
+DevTools="Inspectează andocarea de browser '%1'"
 CopyUrl="Copiază adresa actuală"
 WebpageControlLevel="Permisiunile paginii"
 WebpageControlLevel.Level.None="Fără acces la OBS"
@@ -17,11 +16,11 @@
 WebpageControlLevel.Level.ReadUser="Acces de citire a informațiilor utilizatorului (colecția de scene actuală, tranziții)"
 WebpageControlLevel.Level.Basic="Acces de bază la OBS (salvarea bufferului de reluări etc.)"
 WebpageControlLevel.Level.Advanced="Acces avansat la OBS (schimbarea scenelor, pornirea/oprirea bufferului de reluări etc.)"
-WebpageControlLevel.Level.All="Acces complet la OBS (pornirea/oprirea transmisiunii fără avertisment etc.)"
+WebpageControlLevel.Level.All="Acces complet la OBS (pornirea/oprirea streamingului fără avertisment etc.)"
 Dialog.Alert="Alertă JavaScript"
 Dialog.Confirm="Confirmare JavaScript"
 Dialog.Prompt="Prompt JavaScript"
-Dialog.BrowserDock="Andocare browser"
+Dialog.BrowserDock="Andocare de browser"
 Dialog.ReceivedFrom="Primit de la '%1'"
 Error.Title="Nu s-a putut încărca acea pagină!"
 Error.Description="Asigurați-vă că adresa este corectă și că site-ul nu are probleme."

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ru-RU.ini Changed

@@ -6,7 +6,6 @@
 ShutdownSourceNotVisible="Отключать, когда не видим"
 RefreshBrowserActive="Обновить браузер, когда сцена становится активной"
 RefreshNoCache="Обновить кэш текущей страницы"
-RestartCEF="Перезапустить CEF"
 BrowserSource="Браузер"
 CustomFrameRate="Использовать настраиваемую частоту кадров"
 RerouteAudio="Управление аудио через OBS"
@@ -18,7 +17,7 @@
 WebpageControlLevel.Level.ReadObs="Доступ чтения информации о состоянии OBS"
 WebpageControlLevel.Level.ReadUser="Доступ чтения пользовательской информации (текущая коллекция сцен, переходы)"
 WebpageControlLevel.Level.Basic="Базовый доступ к OBS (Сохранение буфер видео и т.д.)"
-WebpageControlLevel.Level.Advanced="Продвинутый доступ к OBS (Изменение сцен, Запуск/Остановка буфера записи и пр.)"
+WebpageControlLevel.Level.Advanced="Продвинутый доступ к OBS (Изменение сцен, запуск/остановка буфера записи и пр.)"
 WebpageControlLevel.Level.All="Полный доступ к OBS (Запуск/Остановка прямого эфира без предупреждения и пр.)"
 Dialog.Alert="Предупреждение JavaScript"
 Dialog.Confirm="Подтверждение JavaScript"
@@ -41,5 +40,5 @@
 ErrorCode.ERR_FAILED="Не удалось подключиться"
 ErrorCode.ERR_NETWORK_CHANGED="Сеть изменена"
 ErrorCode.ERR_SSL_VERSION_INTERFERENCE="Вмешательство в версию SSL. Возможно TLS 1.3 заблокирован или модифицирован."
-ErrorCode.ERR_SSL_PROTOCOL_ERROR="Ошибка протокола SSL. Не удалось установить защищенное соединение."
+ErrorCode.ERR_SSL_PROTOCOL_ERROR="Ошибка протокола SSL. Не удалось установить защищённое соединение."
 ErrorCode.ERR_CERT_DATE_INVALID="SSL-сертификат сервера устарел, или на вашем компьютере неверно указано время."

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/si-LK.ini Changed

@@ -2,13 +2,18 @@
 URL="ඒ.ස.නි."
 Width="පළල"
 Height="උස"
+FPS="රාමු/ත."
 CSS="අභිරුචි සීඑස්එස්"
-RestartCEF="CEF යළි අරඹන්න"
+ShutdownSourceNotVisible="නොපෙනෙන විට මූලාශ්‍රය වසන්න"
+RefreshBrowserActive="සිද්ධිය සක්‍රිය වූ විට අතිරික්සුව නැවුම් කරන්න"
+RefreshNoCache="වත්මන් පිටුවේ නිහිතය නැවුම් කරන්න"
 BrowserSource="අතිරික්සුව"
 CustomFrameRate="අභිරුචි රාමු අනුපා. භාවිතය"
 RerouteAudio="ඕබීඑස් මගින් හඬ පාලනය"
+CopyUrl="වත්මන් ලිපිනයේ පිටපතක්"
 WebpageControlLevel="පිටුවේ අවසර"
 WebpageControlLevel.Level.None="ඕබීඑස් වෙත ප්‍රවේශය නැත"
+WebpageControlLevel.Level.ReadObs="ඕබීඑස් තත්‍ව තොරතුරු වෙත කියවීමේ ප්‍රවේශය"
 Dialog.Alert="ජාවාස්ක්‍රිප්ට් ඇඟවීම"
 Dialog.Confirm="ජාවාස්ක්‍රිප්ට් තහවුරුව"
 Dialog.BrowserDock="අතිරික්සු තටාකය"
@@ -17,7 +22,13 @@
 Error.Retry="යළි උත්සාහයට ඔබන්න"
 Error.Code="දෝෂය: %1"
 Error.URL="ඒ.ස.නි.: %2"
+Zoom.Reset="විශාලනය යළි සකසන්න"
+Zoom.Out="කුඩාලනය"
+Zoom.In="විශාලනය"
+ErrorCode.ERR_CONNECTION_REFUSED="සේවාදායකය සම්බන්ධතාවය අහක දමා ඇත"
 ErrorCode.ERR_NAME_NOT_RESOLVED="සේවාදායකයේ අ.ජා.කෙ. හමු නොවිණි"
+ErrorCode.ERR_CONNECTION_TIMED_OUT="සම්බන්ධතාවය ඉකුත් විය"
+ErrorCode.ERR_TIMED_OUT="මෙහෙයුම ඉකුත් විය"
 ErrorCode.ERR_FILE_NOT_FOUND="ගොනුව හමු නොවිණි"
 ErrorCode.ERR_FAILED="සම්බන්ධ වීමට අසමත් විය"
 ErrorCode.ERR_NETWORK_CHANGED="ජාලය වෙනස් විණි"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/sk-SK.ini Changed

@@ -1,12 +1,10 @@
 LocalFile="Lokálny súbor"
-URL="URL adresa"
 Width="Šírka"
 Height="Výška"
 CSS="Vlastné CSS"
 ShutdownSourceNotVisible="Vypnúť zdroj, keď nie je viditeľný"
 RefreshBrowserActive="Obnoviť prehliadač, keď sa scéna stane aktívna"
-RefreshNoCache="Vyčistiť medzi-pamäť aktuálnej stránky"
-RestartCEF="Reštartovať CEF"
+RefreshNoCache="Vyčistiť cache aktuálnej stránky"
 BrowserSource="Prehliadač"
 CustomFrameRate="Použiť vlastnú snímkovú rýchlosť"
 RerouteAudio="Ovládať zvuk cez OBS"
@@ -16,10 +14,10 @@
 WebpageControlLevel="Oprávnenia stránky"
 WebpageControlLevel.Level.None="Žiaden prístup k OBS"
 WebpageControlLevel.Level.ReadObs="Povolenie čítať informácie o stave OBS"
-WebpageControlLevel.Level.ReadUser="Povolenie čítať uživateľské informácie (aktuálna kolekcia scén, prechody)"
+WebpageControlLevel.Level.ReadUser="Povolenie čítať použivateľské informácie (aktuálna sada scén, prechody)"
 WebpageControlLevel.Level.Basic="Základný prístup k OBS (Uložiť záznam do pamäte, atď.)"
-WebpageControlLevel.Level.Advanced="Pokročilý prístup k OBS (Zmeniť scény, Začať/Zastaviť záznam do pamäte, atď.)"
-WebpageControlLevel.Level.All="Plný prístup k OBS (Začať/Zastaviť streamovanie bez varovania, atď.)"
+WebpageControlLevel.Level.Advanced="Pokročilý prístup k OBS (Meniť scény, Spustiť/Zastaviť záznam do pamäte, atď.)"
+WebpageControlLevel.Level.All="Plný prístup k OBS (Spustiť/Zastaviť streamovanie bez upozornenia, atď.)"
 Dialog.Alert="JavaScript Výstraha"
 Dialog.Confirm="JavaScript Potvrdenie"
 Dialog.Prompt="Javascript Výzva"
@@ -29,7 +27,7 @@
 Error.Description="Uistite sa, že adresa je správna a že stránka nemá problémy."
 Error.Retry="Ak to chcete skúsiť znova, kliknite sem"
 Error.Code="Chyba: %1"
-Zoom.Reset="Resetovať priblíženie"
+Zoom.Reset="Obnoviť priblíženie"
 Zoom.Out="Oddialiť"
 Zoom.In="Priblížiť"
 ErrorCode.ERR_CONNECTION_REFUSED="Server odmietol pripojenie"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/szl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/szl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ta-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/th-TH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/th-TH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/ur-PK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/ur-PK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/zh-CN.ini Changed

@@ -1,21 +1,21 @@
 LocalFile="本地文件"
 Width="宽度"
 Height="高度"
+FPS="帧率"
 CSS="自定义 CSS"
-ShutdownSourceNotVisible="不可见时关闭源"
-RefreshBrowserActive="场景变为活动状态时，刷新浏览器"
+ShutdownSourceNotVisible="当不可见时关闭源"
+RefreshBrowserActive="当场景变为活动状态时，刷新浏览器"
 RefreshNoCache="刷新当前页面缓存"
-RestartCEF="重启 CEF"
 BrowserSource="浏览器"
 CustomFrameRate="使用自定义帧率"
-RerouteAudio="通过 OBS 控制音频"
+RerouteAudio="通过OBS控制音频"
 Inspect="检查"
-DevTools="检查浏览器停靠“'%1”"
+DevTools="检查浏览器停靠窗口“'%1”"
 CopyUrl="复制当前地址"
 WebpageControlLevel="页面权限"
-WebpageControlLevel.Level.None="没有访问 OBS 的权限"
+WebpageControlLevel.Level.None="没有对OBS的访问权限"
 WebpageControlLevel.Level.ReadObs="OBS 状态信息的读取权限"
-WebpageControlLevel.Level.ReadUser="用户信息的读取权限（当前场景集合、转场）"
+WebpageControlLevel.Level.ReadUser="用户信息的读取权限（当前场景集合、转场动画）"
 WebpageControlLevel.Level.Basic="OBS 的基本访问权限（保存回放缓冲等）"
 WebpageControlLevel.Level.Advanced="OBS 的高级访问权限（更改场景，启动或停止播放缓冲等）"
 WebpageControlLevel.Level.All="OBS 的完全访问权限（启动或停止串流时不显示警告等）"
@@ -28,6 +28,7 @@
 Error.Description="请确保地址正确，且网站没有问题。"
 Error.Retry="点此重试"
 Error.Code="错误：%1"
+Error.URL="网址: %2"
 Zoom.Reset="重置缩放"
 Zoom.Out="缩小"
 Zoom.In="放大"

obs-studio-29.1.3.tar.xz/plugins/obs-browser/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/deps/wide-string.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/deps/wide-string.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/deps/wide-string.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/deps/wide-string.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/helper-info.plist -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/helper-info.plist Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/obs-browser-page/obs-browser-page-main.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/obs-browser-page/obs-browser-page-main.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp Changed

@@ -1,6 +1,6 @@
 /******************************************************************************
 Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
- Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -27,13 +27,13 @@
 #include <sstream>
 #include <thread>
 #include <mutex>
+#include <nlohmann/json.hpp>
 
 #include "obs-browser-source.hpp"
 #include "browser-scheme.hpp"
 #include "browser-app.hpp"
 #include "browser-version.h"
 
-#include "json11/json11.hpp"
 #include "obs-websocket-api/obs-websocket-api.h"
 #include "cef-headers.hpp"
 
@@ -59,7 +59,6 @@
 }
 
 using namespace std;
-using namespace json11;
 
 static thread manager_thread;
 static bool manager_initialized = false;
@@ -550,55 +549,55 @@
 {
 	switch (event) {
 	case OBS_FRONTEND_EVENT_STREAMING_STARTING:
-		DispatchJSEvent("obsStreamingStarting", "");
+		DispatchJSEvent("obsStreamingStarting", "null");
 		break;
 	case OBS_FRONTEND_EVENT_STREAMING_STARTED:
-		DispatchJSEvent("obsStreamingStarted", "");
+		DispatchJSEvent("obsStreamingStarted", "null");
 		break;
 	case OBS_FRONTEND_EVENT_STREAMING_STOPPING:
-		DispatchJSEvent("obsStreamingStopping", "");
+		DispatchJSEvent("obsStreamingStopping", "null");
 		break;
 	case OBS_FRONTEND_EVENT_STREAMING_STOPPED:
-		DispatchJSEvent("obsStreamingStopped", "");
+		DispatchJSEvent("obsStreamingStopped", "null");
 		break;
 	case OBS_FRONTEND_EVENT_RECORDING_STARTING:
-		DispatchJSEvent("obsRecordingStarting", "");
+		DispatchJSEvent("obsRecordingStarting", "null");
 		break;
 	case OBS_FRONTEND_EVENT_RECORDING_STARTED:
-		DispatchJSEvent("obsRecordingStarted", "");
+		DispatchJSEvent("obsRecordingStarted", "null");
 		break;
 	case OBS_FRONTEND_EVENT_RECORDING_PAUSED:
-		DispatchJSEvent("obsRecordingPaused", "");
+		DispatchJSEvent("obsRecordingPaused", "null");
 		break;
 	case OBS_FRONTEND_EVENT_RECORDING_UNPAUSED:
-		DispatchJSEvent("obsRecordingUnpaused", "");
+		DispatchJSEvent("obsRecordingUnpaused", "null");
 		break;
 	case OBS_FRONTEND_EVENT_RECORDING_STOPPING:
-		DispatchJSEvent("obsRecordingStopping", "");
+		DispatchJSEvent("obsRecordingStopping", "null");
 		break;
 	case OBS_FRONTEND_EVENT_RECORDING_STOPPED:
-		DispatchJSEvent("obsRecordingStopped", "");
+		DispatchJSEvent("obsRecordingStopped", "null");
 		break;
 	case OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTING:
-		DispatchJSEvent("obsReplaybufferStarting", "");
+		DispatchJSEvent("obsReplaybufferStarting", "null");
 		break;
 	case OBS_FRONTEND_EVENT_REPLAY_BUFFER_STARTED:
-		DispatchJSEvent("obsReplaybufferStarted", "");
+		DispatchJSEvent("obsReplaybufferStarted", "null");
 		break;
 	case OBS_FRONTEND_EVENT_REPLAY_BUFFER_SAVED:
-		DispatchJSEvent("obsReplaybufferSaved", "");
+		DispatchJSEvent("obsReplaybufferSaved", "null");
 		break;
 	case OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPING:
-		DispatchJSEvent("obsReplaybufferStopping", "");
+		DispatchJSEvent("obsReplaybufferStopping", "null");
 		break;
 	case OBS_FRONTEND_EVENT_REPLAY_BUFFER_STOPPED:
-		DispatchJSEvent("obsReplaybufferStopped", "");
+		DispatchJSEvent("obsReplaybufferStopped", "null");
 		break;
 	case OBS_FRONTEND_EVENT_VIRTUALCAM_STARTED:
-		DispatchJSEvent("obsVirtualcamStarted", "");
+		DispatchJSEvent("obsVirtualcamStarted", "null");
 		break;
 	case OBS_FRONTEND_EVENT_VIRTUALCAM_STOPPED:
-		DispatchJSEvent("obsVirtualcamStopped", "");
+		DispatchJSEvent("obsVirtualcamStopped", "null");
 		break;
 	case OBS_FRONTEND_EVENT_SCENE_CHANGED: {
 		OBSSourceAutoRelease source = obs_frontend_get_current_scene();
@@ -610,16 +609,16 @@
 		if (!name)
 			break;
 
-		Json json = Json::object{
-			{"name", name},
-			{"width", (int)obs_source_get_width(source)},
-			{"height", (int)obs_source_get_height(source)}};
+		nlohmann::json json = {{"name", name},
+				 {"width", obs_source_get_width(source)},
+				 {"height",
+					obs_source_get_height(source)}};
 
 		DispatchJSEvent("obsSceneChanged", json.dump());
 		break;
 	}
 	case OBS_FRONTEND_EVENT_EXIT:
-		DispatchJSEvent("obsExit", "");
+		DispatchJSEvent("obsExit", "null");
 		break;
 	default:;
 	}

obs-studio-29.1.3.tar.xz/plugins/obs-browser/obs-browser-source-audio.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/obs-browser-source-audio.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/obs-browser-source.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/obs-browser-source.cpp Changed

@@ -1,6 +1,6 @@
 /******************************************************************************
 Copyright (C) 2014 by John R. Bradley <jrb@turrettech.com>
- Copyright (C) 2018 by Hugh Bailey ("Jim") <jim@obsproject.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include "browser-client.hpp"
 #include "browser-scheme.hpp"
 #include "wide-string.hpp"
-#include "json11/json11.hpp"
+#include <nlohmann/json.hpp>
 #include <util/threading.h>
 #include <QApplication>
 #include <util/dstr.h>
@@ -38,7 +38,6 @@
 #endif
 
 using namespace std;
-using namespace json11;
 
 extern bool QueueCEFTask(std::function<void()> task);
 
@@ -427,7 +426,8 @@
 							 PID_RENDERER, msg);
 			},
 			true);
-		Json json = Json::object{{"visible", showing}};
+		nlohmann::json json;
+		json"visible" = showing;
 		DispatchJSEvent("obsSourceVisibleChanged", json.dump(), this);
 #if defined(BROWSER_EXTERNAL_BEGIN_FRAME_ENABLED) && \
 	defined(ENABLE_BROWSER_SHARED_TEXTURE)
@@ -463,7 +463,8 @@
 						 msg);
 		},
 		true);
-	Json json = Json::object{{"active", active}};
+	nlohmann::json json;
+	json"active" = active;
 	DispatchJSEvent("obsSourceActiveChanged", json.dump(), this);
 }

obs-studio-29.1.3.tar.xz/plugins/obs-browser/obs-browser-source.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/obs-browser-source.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/panel/browser-panel-client.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/panel/browser-panel-client.cpp Changed

@@ -398,8 +398,19 @@
 void QCefBrowserClient::OnLoadEnd(CefRefPtr<CefBrowser>,
 				 CefRefPtr<CefFrame> frame, int)
 {
-	if (frame->IsMain() && !script.empty())
+	if (!frame->IsMain())
+		return;
+
+	if (widget && !widget->script.empty())
+		frame->ExecuteJavaScript(widget->script, CefString(), 0);
+	else if (!script.empty())
 		frame->ExecuteJavaScript(script, CefString(), 0);
+
+	std::string script2 = "window.close = () => ";
+	script2 += "console.log(";
+	script2 += "'OBS browser docks cannot be closed using JavaScript.'";
+	script2 += ");";
+	frame->ExecuteJavaScript(script2, "", 0);
 }
 
 bool QCefBrowserClient::OnJSDialog(CefRefPtr<CefBrowser>, const CefString &,
@@ -409,7 +420,6 @@
 				 CefRefPtr<CefJSDialogCallback> callback,
 				 bool &)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 	QString parentTitle = widget->parentWidget()->windowTitle();
 	std::string default_value = default_prompt_text;
 	QString msg_raw(message_text.ToString().c_str());
@@ -484,13 +494,6 @@
 	QMetaObject::invokeMethod(QCoreApplication::instance()->thread(),
 				 msgbox);
 	return true;
-#else
-	UNUSED_PARAMETER(dialog_type);
-	UNUSED_PARAMETER(message_text);
-	UNUSED_PARAMETER(default_prompt_text);
-	UNUSED_PARAMETER(callback);
-	return false;
-#endif
 }
 
 bool QCefBrowserClient::OnPreKeyEvent(CefRefPtr<CefBrowser> browser,

obs-studio-29.1.3.tar.xz/plugins/obs-browser/panel/browser-panel-internal.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/panel/browser-panel-internal.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/panel/browser-panel.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/panel/browser-panel.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-browser/panel/browser-panel.hpp -> obs-studio-30.0.2.tar.xz/plugins/obs-browser/panel/browser-panel.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/CMakeLists.txt Changed

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.22...3.25)
 
 legacy_check()
 
@@ -30,19 +30,22 @@
 
 target_sources(
 obs-ffmpeg
- PRIVATE obs-ffmpeg.c
- obs-ffmpeg-video-encoders.c
+ PRIVATE # cmake-format: sortable
+ $<$<BOOL:${ENABLE_FFMPEG_LOGGING}>:obs-ffmpeg-logging.c>
 obs-ffmpeg-audio-encoders.c
 obs-ffmpeg-av1.c
- obs-ffmpeg-nvenc.c
- obs-ffmpeg-output.c
+ obs-ffmpeg-compat.h
+ obs-ffmpeg-formats.h
+ obs-ffmpeg-hls-mux.c
 obs-ffmpeg-mux.c
 obs-ffmpeg-mux.h
- obs-ffmpeg-hls-mux.c
+ obs-ffmpeg-nvenc.c
+ obs-ffmpeg-output.c
 obs-ffmpeg-source.c
- obs-ffmpeg-compat.h
- obs-ffmpeg-formats.h
- $<$<BOOL:${ENABLE_FFMPEG_LOGGING}>:obs-ffmpeg-logging.c>)
+ obs-ffmpeg-video-encoders.c
+ obs-ffmpeg.c)
+
+target_compile_options(obs-ffmpeg PRIVATE $<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-shorten-64-to-32>)
 target_compile_definitions(obs-ffmpeg PRIVATE $<$<BOOL:${ENABLE_FFMPEG_LOGGING}>:ENABLE_FFMPEG_LOGGING>)
 
 target_link_libraries(
@@ -83,30 +86,22 @@
 
 if(OS_WINDOWS)
 find_package(AMF 1.4.29 REQUIRED)
+ find_package(FFnvcodec 12 REQUIRED)
 
- add_library(nvenc-headers INTERFACE)
- add_library(OBS::nvenc-headers ALIAS nvenc-headers)
-
- target_sources(nvenc-headers INTERFACE external/nvEncodeAPI.h jim-nvenc-ver.h)
-
- target_include_directories(nvenc-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}"
- "${CMAKE_CURRENT_SOURCE_DIR}/external")
+ add_library(obs-nvenc-version INTERFACE)
+ add_library(OBS::obs-nvenc-version ALIAS obs-nvenc-version)
+ target_sources(obs-nvenc-version INTERFACE obs-nvenc-ver.h)
+ target_include_directories(obs-nvenc-version INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_subdirectory(obs-amf-test)
 add_subdirectory(obs-nvenc-test)
 
- target_link_libraries(obs-ffmpeg PRIVATE OBS::w32-pthreads AMF::AMF ws2_32)
+ target_link_libraries(obs-ffmpeg PRIVATE OBS::obs-nvenc-version OBS::w32-pthreads AMF::AMF FFnvcodec::FFnvcodec
+ ws2_32)
 
 configure_file(cmake/windows/obs-module.rc.in obs-ffmpeg.rc)
- target_sources(
- obs-ffmpeg
- PRIVATE texture-amf.cpp
- texture-amf-opts.hpp
- jim-nvenc.c
- jim-nvenc.h
- jim-nvenc-helpers.c
- jim-nvenc-ver.h
- obs-ffmpeg.rc)
+ target_sources(obs-ffmpeg PRIVATE obs-nvenc-helpers.c obs-nvenc.c obs-nvenc.h obs-ffmpeg.rc texture-amf-opts.hpp
+ texture-amf.cpp)
 elseif(OS_LINUX OR OS_FREEBSD)
 find_package(Libva REQUIRED)
 find_package(Libpci REQUIRED)
@@ -115,4 +110,6 @@
 target_link_libraries(obs-ffmpeg PRIVATE Libva::va Libva::drm Libpci::pci)
 endif()
 
+# cmake-format: off
 set_target_properties_obs(obs-ffmpeg PROPERTIES FOLDER plugins/obs-ffmpeg PREFIX "")
+# cmake-format: on

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/cmake/legacy.cmake Changed

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/af-ZA.ini Added

@@ -0,0 +1,73 @@
+FFmpegOutput="FFmpeg-afvoer"
+FFmpegMuxer="FFmpeg Mukser"
+FFmpegHlsMuxer="FFmpeg HLS Mukser"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS Mukser"
+FFmpegALAC="FFmpeg ALAC (24-bis)"
+FFmpegFLAC="FFmpeg FLAC (16-bis)"
+FFmpegPCM16Bit="FFmpeg PCM (16-bis)"
+FFmpegPCM24Bit="FFmpeg PCM (24-bis)"
+FFmpegPCM32BitFloat="FFmpeg PCM (32-bis float)"
+FFmpegOpts="FFmpeg-opsies"
+FFmpegOpts.ToolTip.Source="Hiermee kan u FFmpeg opsies instel. Dit aanvaar slegs opsies in die formaat opsie=waarde.\nU kan meerdere opsies instel deur dit met ’n spatie te skei.\nVoorbeeld: rtsp_transport=tcp rtsp_flags=prefer_tcp"
+Bitrate="Bistempo"
+MaxBitrate="Maksimum bistempo"
+Preset="Voorinstelling"
+Profile="Profiel"
+KeyframeIntervalSec="sleutelraaminterval (0=outomaties)"
+Lossless="Verliesloos"
+Level="Vlak"
+FilePath="Lêerpad"
+AMFOpts="AMF/FFmpeg-opsies"
+AMFOpts.ToolTip="Gebruik om pasgemaakte AMF- of FFmpeg-opsies op te gee. Bv. “level=5.2 profile=main”. Gaan die AMF-enkodeerderdokumente na vir meer details."
+BFrames="Max B-rame"
+VAAPI.Device="VAAPI-toestel"
+NVENC.10bitUnsupported="Kan nie 10-bisenkodering op hierdie enkodeerder uitvoer nie."
+NVENC.16bitUnsupported="Kan nie 16-bisenkodering op hierdie enkodeerder uitvoer nie."
+NVENC.Preset2.p1="P1: Vinnigste (laagste kwaliteit)"
+NVENC.Preset2.p2="P2: Vinniger (laer kwaliteit)"
+NVENC.Preset2.p3="P3: Vinnig (lae kwaliteit)"
+NVENC.Preset2.p4="P4: Gemiddeld (gemiddelde kwaliteit)"
+NVENC.Preset2.p5="P5: Stadig (goeie kwaliteit)"
+NVENC.Preset2.p6="P6: Stadiger (beter kwaliteit)"
+NVENC.Preset2.p7="P7: Stadigste (beste kwaliteit)"
+NVENC.Tuning.hq="Hoë kwaliteit"
+NVENC.Tuning.ll="Lae wagtyd"
+NVENC.Tuning.ull="Uiters lae wagtyd"
+NVENC.Multipass.qres="Twee deurgange (kwartbeeldskerpte)"
+NVENC.Multipass.fullres="Twee deurgange (volle beeldskerpte)"
+AMF.Preset.speed="Snelheid"
+AMF.Preset.balanced="Gebalanseer"
+AMF.Preset.quality="Kwaliteit"
+AMF.Preset.highQuality="Hoë kwaliteit"
+FFmpegSource="Mediabron"
+LocalFile="Lokale lêer"
+Looping="Herhaal"
+BufferingMB="Netwerkbufferwerking"
+HardwareDecode="Gebruik apparatuurdekodering wanneer moontlik"
+CloseFileWhenInactive="Sluit lêer wanneer onaktief"
+CloseFileWhenInactive.ToolTip="Die lêer word gesluit wanneer die bron nie op die stroom of opname getoon\nword nie. Hierdeur kan die lêer gewysig word wanneer die bron onaktief is, \nmaar daar kan ’n laaivertraging wees wanneer die bron geheraktiveer word."
+ColorRange="YUV-kleurbereik"
+ColorRange.Auto="Outo"
+ColorRange.Partial="Beperk"
+ColorRange.Full="Volledig"
+LinearAlpha="Pas alfa toe in lineêre ruimte"
+RestartMedia="Herbegin"
+SpeedPercentage="Snelheid"
+Seekable="Soekbaar"
+Play="Speel af"
+Pause="Wag"
+MediaFileFilter.AllMediaFiles="Alle medialêers"
+MediaFileFilter.VideoFiles="Videolêers"
+MediaFileFilter.AudioFiles="Oudiolêers"
+MediaFileFilter.AllFiles="Alle lêers"
+ReplayBuffer="Kykweerbuffer"
+ReplayBuffer.Save="Bewaar kykweer"
+HelperProcessFailed="Kan nie die opnamehulpproses begin nie. Gaan na dat OBS-lêers nie versper of deur enige derdeparty-antivirus / sekuriteitsprogrammatuur verwyder is nie."
+UnableToWritePath="Kan nie na %1 skryf nie. Gaan na of u ’n opnamepad gebruik waar u gebruikersrekening na kan skryf, en dat daar voldoende skyfspasie beskikbaar is."
+WarnWindowsDefender="Indien Windows 10 Ransomware Protection geaktiveer is, kan dit ook die fout veroorsaak. Probeer beheerde vouertoegang in Windows Security / Virus & Threat Protection se instellings deaktiveer."
+Encoder.Error="Kon nie %1 open nie: %2"
+Encoder.Timeout="Enkodeerder %1 neem te lank om te enkodeer (uittelling: %2 sekondes)"
+NVENC.Error="Kon nie NVENC-kodek open nie: %1"
+NVENC.GenericError="Probeer die nuutste <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDEA-drywer</a> installeer en om ander opnameprogrammatuur wat moontlik NVENC gebruik, soos NVIDEA ShadowPlay of Windows Game DVR, te sluit."
+NVENC.OutdatedDriver="De geïnstalleerde NVIDIA-drywer ondersteun nie hierdie NVENC-weergawe nie, probeer <a href=\"https://obsproject.com/go/nvidia-drivers\">die drywer bywerk</a>."
+NVENC.UnsupportedDevice="NVENC-fout: Onondersteunde toestel. Maak seker u grafiese kaart <a href=\"https://obsproject.com/go/nvenc-matrix\">ondersteun NVENC</a> en probeer <a href=\"https://obsproject.com/go/nvidia-drivers\">die drywer bywerk</a>."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ar-SA.ini Changed

@@ -1,4 +1,12 @@
 FFmpegOutput="مخرج FFmpeg"
+FFmpegMuxer="مكسر FFmpeg"
+FFmpegHlsMuxer="مكسر HLS FFmpeg"
+FFmpegMpegtsMuxer="مكسر FFmpeg MPEG-TS "
+FFmpegALAC="FFmpeg ALAC (24-بت)"
+FFmpegFLAC="FFmpeg FLAC (16-بت)"
+FFmpegPCM16Bit="FFmpeg PCM (16-بت)"
+FFmpegPCM24Bit="FFmpeg PCM (24-بت)"
+FFmpegPCM32BitFloat="FFmpeg PCM (32-بت يطفو)"
 FFmpegOpts="خيارات FFmpeg"
 FFmpegOpts.ToolTip.Source="يسمح لك بتعيين خيارات FFmpeg. هذا يقبل فقط الخيارات في تنسيق الخيار =القيمة.\nيمكن تعيين خيارات متعددة عن طريق فصلها مع مسافة.\nمثال: rtsp_transport=tcp rtsp_flags=prefer_tcp"
 Bitrate="معدل النقل"
@@ -10,9 +18,10 @@
 KeyframeIntervalSec="الفاصل الزمني للإطار المفتاح (0=تلقائي)"
 Lossless="خسارة"
 Level="المستوى"
+FilePath="مسار الملف"
 AMFOpts="خيارات AMF/FFmpeg"
 AMFOpts.ToolTip="استخدم لتحديد خيارات AMF أو FFmpeg المخصصة. على سبيل المثال، \"level=5.2 profile=main\". تحقق من مستندات الترميز AMF للحصول على مزيد من التفاصيل."
-VAAPI.Codec="شفرة VAAPI"
+GPU="كرت الشاشة"
 VAAPI.Device="جهاز VAAPI"
 NVENC.LookAhead="نظرة المستقبل"
 NVENC.LookAhead.ToolTip="تمكين أطر B-frams.\n\nإذا تم تعطيلها، الترميز سوف يستخدم دائما عدد الأطر B-frames المحددة في إعدادات 'max B-frames'.\n\nإذا تم تفعيله، فإنه سيزيد من جودة البصر عن طريق استخدام العديد من الأطر B-framework ضرورية, حتى الحد الأقصى،\nعلى حساب زيادة استخدام وحدة البيانات العالمية."
@@ -22,7 +31,8 @@
 NVENC.8bitUnsupportedHdr="لا يدعم OBS إخراج 8 بت من Rec. 2100."
 NVENC.I010Unsupported="NVENC لا يدعم I010. استخدم P010 بدلاً من ذلك."
 NVENC.10bitUnsupported="لا يمكن إجراء الترميز 10-بت على هذا الترميز."
-NVENC.TooManyBFrames="اعداد الاطارات الاقصى (B-frames (%d) هو اكثر من دعم الترميز (%d)."
+NVENC.16bitUnsupported="لا يمكن تنفيذ تشفير 16 بت على جهاز التشفير هذا."
+NVENC.NoAV1FallbackPossible="لا يتوفر ترميز AV1 مع الإعدادات الحالية. حاول تعطيل أي إعادة تحجيم أو خيارات كرت الشاشة التي قد يتم تعيينها. تحقق من السجل لمزيد من التفاصيل."
 NVENC.Preset2.p1="الأسرع (جودة متدنية)"
 NVENC.Preset2.p2="أسرع (جودة منخفضة)"
 NVENC.Preset2.p3="أسرع (جودة منخفضة)"
@@ -49,7 +59,6 @@
 BufferingMB="تخزين الشبكة"
 HardwareDecode="استخدام فك ترميز الأجهزة عندما تكون متاحة"
 ClearOnMediaEnd="عدم إظهار شيء عند انتهاء التشغيل"
-Advanced="متقدم"
 RestartWhenActivated="إعادة تشغيل عندما يصبح المصدر نشطاً"
 CloseFileWhenInactive="إغلاق الملف عندما يكون غير نشط"
 CloseFileWhenInactive.ToolTip="يغلق الملف عندما لا يتم عرض المصدر على البث أو\nالتسجيل. هذا يسمح بتغيير الملف عندما لا يكون المصدر نشطاً،\nولكن قد يكون هناك بعض التأخير عند إعادة تنشيط المصدر."
@@ -75,10 +84,15 @@
 WarnWindowsDefender="إذا تم تمكين Windows 10 حماية البرنامج الرانسومي فإنه يمكن أيضا أن يسبب هذا الخطأ. حاول إيقاف الوصول إلى المجلد المتحكم به في إعدادات الحماية من التهديدات لنظام التشغيل Windows Security / Virus."
 Encoder.Error="فشل في فتح %1: %2"
 Encoder.Timeout="الترميز %1 يستغرق وقتاً طويلاً جداً لترميز (المهلة: %2 ثانية)"
-AMF.Error="فشل في فتح الترميز AMF: %1"
 AMF.8bitUnsupportedHdr="لا يدعم OBS إخراج 8 بت من Rec. 2100."
 AMF.10bitUnsupportedAvc="لا يمكن تنفيذ تشفير 10 بت على وحدة تشفير AMD H.264."
+AMF.16bitUnsupported="لا يمكن تنفيذ تشفير 16 بت على جهاز التشفير هذا."
 NVENC.Error="فشل في فتح ترميز NVENC: %1"
+NVENC.GenericError="جرب تنزيل آخر <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA driver</a> و أغلق أنظمة التصوير الأخرى الذي من الممكن أن يستعملوا NVENC مثل NVIDIA ShadowPlay أو Windows Game DVR. "
 NVENC.BadGPUIndex="لقد قمت بتحديد GPU %1 في إعدادات الترميز الخاص بك. قم بتعيين هذا إلى 0 ثم حاول مرة أخرى."
+NVENC.OutdatedDriver="برنامج تشغيل NVIDIA المثبت لا يدعم إصدار NVENC هذا,جرب <a href=\"https://obsproject.com/go/nvidia-drivers\">تحديث برنامج التشغيل </a>."
+NVENC.UnsupportedDevice="خطأ NVENC:جهاز غير مدعوم. تأكد أن كرت الشاشة الخاص بك <a href=\"https://obsproject.com/go/nvenc-matrix\">يدعم</a> وجرب <a href=\"https://obsproject.com/go/nvidia-drivers\">تحديث برنامج التشغيل</a>."
+NVENC.TooManySessions=" (خطأ NVENC): عدد كبير جدًا من الجلسات المتزامنة. حاول إغلاق برامج التسجيل الأخرى التي قد تستخدم NVENC مثل NVIDIA ShadowPlay أو Windows Game DVR."
+NVENC.CheckDrivers="جرب تنزيل آخر <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA driver</a>."
 AV1.8bitUnsupportedHdr="لا يدعم OBS إخراج 8 بت من Rec. 2100."
 ReconnectDelayTime="إعادة الاتصال بالتأخر"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/bg-BG.ini Changed

@@ -8,16 +8,25 @@
 KeyframeIntervalSec="Интервал между ключови кадри (0=автоматично)"
 Lossless="Без загуба на качество"
 Level="Ниво"
+FilePath="Път до файла"
 BFrames="Макс. кол-во Б-кадри"
-VAAPI.Codec="Кодек VAAPI"
 VAAPI.Device="Устройство VAAPI"
 NVENC.LookAhead="Предопределяне"
 NVENC.LookAhead.ToolTip="Включва динамичните Б-кадри.\n\nКогато е изключено, енкодерът винаги ще използва количеството Б-кадри, указани в параметъра 'Макс. кол-во Б-кадри'.\n\nАко е включено, ще подобри качеството на картината, като използва нужното количество Б-кадри, до максимума,\nна цената на повишеното използване на видеокартата."
 NVENC.PsychoVisualTuning="Психовизуално коригиране"
 NVENC.PsychoVisualTuning.ToolTip="Включва настройките на енкодера, които оптимизират използването на битрейта за увеличено възприятие на визуалното качество.,\nнай-вече при ситуации с интензивни движения, на цената на повишеното използване на видеокартата."
 NVENC.CQLevel="Ниво CQ"
+NVENC.8bitUnsupportedHdr="OBS не поддържа използването на x264 с Rec. 2100."
+NVENC.I010Unsupported="NVENC не поддържа I010. Използвай P010."
 NVENC.10bitUnsupported="Невъзможно изпъляване на 10-битово кодиране на този кодировчик."
-NVENC.TooManyBFrames="Настройката на максималното количество B-кадри (%d) надвишава стойността, поддържана от кодировчика (%d)."
+NVENC.16bitUnsupported="Невъзможно изпъляване на 16-битово кодиране на този кодировчик."
+NVENC.Tuning.hq="Високо качество"
+NVENC.Tuning.ll="Ниска латентност"
+NVENC.Tuning.ull="Много ниска латентност"
+AMF.Preset.speed="Скорост"
+AMF.Preset.balanced="Балансирано"
+AMF.Preset.quality="Качество"
+AMF.Preset.highQuality="Високо качество"
 FFmpegSource="Източник на медията"
 LocalFile="Локален файл"
 Looping="Преповтаряне"
@@ -26,12 +35,12 @@
 BufferingMB="Мрежова буферизация"
 HardwareDecode="Използване на хардуерно декодиране, ако е налично"
 ClearOnMediaEnd="Не показвай нищо след приключване на възпроизвеждането"
-Advanced="Разширено"
 RestartWhenActivated="Възобновява възпроизвеждането когато източникът е активен"
 CloseFileWhenInactive="Затваряне на файла при неактивност"
 CloseFileWhenInactive.ToolTip="Затваря файла, когато източникът не се показва на излъчването или записването. Това позволява файлът да бъде променян, когато източникът не е активен,\nно може да забави пускането при повторна активация на източника."
 ColorRange="Цветови диапазон YUV"
 ColorRange.Auto="Автоматично"
+ColorRange.Partial="Ограничено"
 ColorRange.Full="Пълно"
 LinearAlpha="Приложи алфа канал в линейното пространство"
 RestartMedia="Рестартиране"
@@ -53,3 +62,6 @@
 Encoder.Timeout="Енкодер %1 се изпълнява твърде дълго (повече от: %2 секунди)"
 NVENC.Error="Неуспешно отваряне на кодек NVENC: %1"
 NVENC.BadGPUIndex="Избрахте видеокарта под номер %1 в настройките на енкодера. Върнете стойността на 0 и опитайте пак."
+NVENC.OutdatedDriver="Инсталираният NVIDIA драйвер не поддържа тази NVENC версия, пробвайте <a href=\"https://obsproject.com/go/nvidia-drivers\">да актуализирате драйверът</a>."
+NVENC.CheckDrivers="Опитай да инсталираш последния <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA драйвър</a>."
+AV1.8bitUnsupportedHdr="OBS не поддържа използването на 8-bit с Rec. 2100."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/bn-BD.ini Changed

@@ -7,7 +7,6 @@
 Lossless="হ্রাসহীন"
 Level="শ্রেনী"
 BFrames="সর্বোচ্চ বি-ফ্রেম"
-VAAPI.Codec="VAAPI কোডেক"
 VAAPI.Device="VAAPI ডিভাইস"
 NVENC.LookAhead="লুক-আহেড"
 NVENC.LookAhead.ToolTip="গতিশীল বি-ফ্রেম সক্ষম করে।\n\nযদি সচল থাকে তবে এনকোডার সর্বদা 'সর্বোচ্চ বি-ফ্রেম' সেটিংসে উল্লিখিত বি-ফ্রেমের সংখ্যা ব্যবহার করবে।\n\nসক্ষম করা থাকলে, এটি কেবলমাত্র ব্যবহার করে চাক্ষুষ মানের বৃদ্ধি করবে তবে অনেক বি-ফ্রেম প্রয়োজনীয়, সর্বাধিক পর্যন্ত,\nজিপিইউর বর্ধিত ব্যবহারের ব্যয়ে।"
@@ -22,7 +21,6 @@
 BufferingMB="নেটওয়ার্ক বাফারিং"
 HardwareDecode="উপলব্ধ হলে হার্ডওয়্যার ডিকোডিং ব্যবহার করুন"
 ClearOnMediaEnd="প্লেব্যাক শেষ হয়ে গেলে কিছুই দেখাবেন না"
-Advanced="অ্যাডভান্সড"
 RestartWhenActivated="উৎস সক্রিয় হয়ে উঠলে প্লেব্যাক পুনরায় চালু করুন"
 CloseFileWhenInactive="নিষ্ক্রিয় হলে ফাইল বন্ধ করুন"
 CloseFileWhenInactive.ToolTip="সোর্সটি স্ট্রিম বা\nরেকর্ডিংয়ে প্রদর্শিত না হলে তখন ফাইলটি বন্ধ করে দেয়। উৎসটি সক্রিয় না হলে এটি ফাইলটি পরিবর্তিত হতে দেয়,\nতবে উৎসটি সক্রিয় হলে শুরুতে কিছুটা বিলম্ব হতে পারে।"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ca-ES.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Sortida FFmpeg"
+FFmpegMuxer="Multiplexor FFmpeg"
+FFmpegHlsMuxer="Multiplexor FFmpeg HLS"
+FFmpegMpegtsMuxer="Multiplexor FFmpeg MPEG-TS"
 FFmpegALAC="FFmpeg ALAC (24 bits)"
 FFmpegFLAC="FFmpeg FLAC (16 bits)"
 FFmpegPCM16Bit="FFmpeg PCM (16 bits)"
@@ -15,10 +18,10 @@
 KeyframeIntervalSec="Interval de fotogrames clau (0=auto)"
 Lossless="Sense pèrdues"
 Level="Nivell"
+FilePath="Camí del fitxer"
 AMFOpts="Opcions AMF/FFmpeg"
 AMFOpts.ToolTip="Utilitzeu-lo per especificar opcions AMF o FFmpeg personalitzades. Per exemple, \"level=5.2 profile=main\". Consulteu la documentació del codificador AMF per obtenir més detalls."
 BFrames="Fotogrames-B màxims"
-VAAPI.Codec="Còdec VAAPI"
 VAAPI.Device="Dispositiu VAAPI"
 NVENC.LookAhead="Previsió"
 NVENC.LookAhead.ToolTip="Habilita els Fotogrames-B dinàmics.\n\nEn inhabilitar-ho, el codificador utilitzarà sempre el nombre de Fotogrames-B indicat a l'opció «Fotogrames-B màxims».\n\nEn habilitar-ho, augmentarà la qualitat visual només utilitzant els Fotogrames-B necessaris,\nfins el màxim permès per l'ús de la GPU."
@@ -29,7 +32,7 @@
 NVENC.I010Unsupported="NVENC no admet l'ús d'I010. Utilitzeu P010."
 NVENC.10bitUnsupported="No es pot realitzar la codificació de 10 bits amb aquest codificador."
 NVENC.16bitUnsupported="No es pot realitzar la codificació de 16 bits amb aquest codificador."
-NVENC.TooManyBFrames="La configuració màxima de fotogrames B (%d) és superior a la que admet el codificador (%d)."
+NVENC.NoAV1FallbackPossible="La codificació AV1 no està disponible amb els paràmetres actuals. Desactiveu qualsevol canvi d'escala o opcions que hàgiu configurat a la GPU. Veieu el registre per a més informació."
 NVENC.Preset2.p1="P1: El més ràpid (qualitat ínfima)"
 NVENC.Preset2.p2="P2: Més ràpid (qualitat més baixa)"
 NVENC.Preset2.p3="P3: Ràpid (qualitat baixa)"
@@ -56,7 +59,6 @@
 BufferingMB="Memòria intermèdia de xarxa"
 HardwareDecode="Usa la descodificació per maquinari si és disponible"
 ClearOnMediaEnd="No mostris res quan acabi la reproducció"
-Advanced="Avançat"
 RestartWhenActivated="Reinicia la reproducció quan la font estigui activa"
 CloseFileWhenInactive="Tanca el fitxer quan estigui inactiu"
 CloseFileWhenInactive.ToolTip="Tanca el fitxer quan l'origen no està sent mostrada en el directe o en l'enregistrament.\nAixò permet que el fitxer pugui ser canviat quan l'origen no està actiu,\nperò pot haver-hi una espera en l'inici quan es reactivi l'origen."
@@ -82,8 +84,6 @@
 WarnWindowsDefender="Si la protecció contra Ransomware del Windows 10 està activada, també pot causar aquest error. Proveu inhabilitant la protecció contra amenaces del Windows a la configuració de seguretat/virus i protecció."
 Encoder.Error="No s'ha pogut obrir %1: %2"
 Encoder.Timeout="El codificador %1 està trigant massa a codificar (temps d'espera: %2 segons)"
-AMF.Error="No s'ha pogut obrir el còdec AMF: %1"
-AMF.GenericError="Proveu d'instal·lar el <a href=\"https://obsproject.com/go/amd-drivers\">controlador AMD</a> més recent i tanqueu un altre programari de gravació que pugui utilitzar el codificador AMD, com ara el programari Radeon o el Windows Game DVR."
 AMF.8bitUnsupportedHdr="L'OBS no admet la sortida de 8 bits de Rec. 2100."
 AMF.10bitUnsupportedAvc="No es pot realitzar la codificació de 10 bits al codificador AMD H.264."
 AMF.16bitUnsupported="No es pot realitzar la codificació de 16 bits amb aquest codificador."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/cs-CZ.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg výstup"
+FFmpegMuxer="FFmpeg převaděč"
+FFmpegHlsMuxer="FFmpeg HLS převaděč"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS převaděč"
 FFmpegALAC="FFmpeg ALAC (24-bitový)"
 FFmpegFLAC="FFmpeg FLAC (16-bitový)"
 FFmpegPCM16Bit="FFmpeg PCM (16-bitový)"
@@ -14,10 +17,10 @@
 KeyframeIntervalSec="Interval klíč. snímků (0=auto)"
 Lossless="Bezztrátový"
 Level="Úrověň"
+FilePath="Cesta k souboru"
 AMFOpts="Možnosti AMF/FFmpeg"
 AMFOpts.ToolTip="Použijte k určení vlastních nastavení AMF nebo FFmpeg. Například \"level=5.2 profile=main\". Více informací najdete v dokumentaci AMF enkodéru."
 BFrames="Maximum B-snímků"
-VAAPI.Codec="Kodek VAAPI"
 VAAPI.Device="Zařízení VAAPI"
 NVENC.LookAhead.ToolTip="Zapne dynamické B-snímky.\n\nPokud vypnuto, enkodér vždy použije číslo uvedené v nastavení 'Maximum B-snímků'.\n\nPokud zapnuto, zvýší se vizuální kvalita použitím tolika B-smínků, jak je potřeba, až do maxima,\nale za cenu zvýšení využití GPU."
 NVENC.PsychoVisualTuning.ToolTip="Povolí nastavení enkodéru, které optimalizuje využití bitratu pro zvýšení vnímané vizuální kvality,\npředevším v situacích s velkým množstvím pohybu, ale za cenu zvýšení využití GPU."
@@ -25,7 +28,8 @@
 NVENC.8bitUnsupportedHdr="OBS nepodporuje 8bitový výstup Rec. 2100."
 NVENC.I010Unsupported="NVENC nepodporuje I010. Použijte P010."
 NVENC.10bitUnsupported="Nelze provést 10-bitové enkódování na tomto enkodéru."
-NVENC.TooManyBFrames="Hodnota nastavení Maximum B-snímků (%d) je vyšší než kolik enkodér podporuje (%d)."
+NVENC.16bitUnsupported="Nelze provést 16bitové enkódování na tomto enkodéru."
+NVENC.NoAV1FallbackPossible="Kódování AV1 není při aktuálním nastavení k dispozici. Zkuste vypnout nastavení přeškálování nebo některá nastavení GPU. Další podrobnosti najdete v souboru záznamu."
 NVENC.Preset2.p1="P1: Nejrychlejší (nejnižší kvalita)"
 NVENC.Preset2.p2="P2: Rychlejší (nižší kvalita)"
 NVENC.Preset2.p3="P3: Rychlý (nízká kvalita)"
@@ -52,7 +56,6 @@
 BufferingMB="Vyrovnávací paměť pro síť"
 HardwareDecode="Použít hardwarové dekódování, pokud je k dispozici"
 ClearOnMediaEnd="Po skončení přehrávání nezobrazovat nic"
-Advanced="Pokročilé"
 RestartWhenActivated="Restartovat přehrávání poté, co je zdroj aktivován"
 CloseFileWhenInactive="Zavřít soubor při neaktivitě"
 CloseFileWhenInactive.ToolTip="Uzavře soubor poté, co již není zdroj zobrazen ve vysílání či\nnahrávání. Toto umožňuje, aby byl tento soubor změněn, když není zdroj aktivní,\nale může dojít ke prodlení při znovu aktivaci zdroje."
@@ -78,10 +81,9 @@
 WarnWindowsDefender="Pokud je zapnuta ochrana proti ransomwaru (Windows 10), může to také způsobit tuto chybu. Zkuste vypnout funkci kontrolovaných složek v nastavení Zabezpečení Windows / Ochrana proti virům."
 Encoder.Error="Nezdařilo se otevřít %1: %2"
 Encoder.Timeout="Enkodéru %1 trvá příliš dlouho enkódování (timeout: %2 sekundy)"
-AMF.Error="Nezdařilo se otevřít AMF kodek: %1"
-AMF.GenericError="Zkuste nainstalovat nejnovější verzi <a href=\"https://obsproject.com/go/amd-drivers\">ovladače AMD</a> a zavřít ostatní nahrávací programy, které mohou používat AMD enkodér, například Radeon Software nebo Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS nepodporuje 8bitový výstup Rec. 2100."
 AMF.10bitUnsupportedAvc="Nelze provést 10bitové enkódování pomocí AMD H.264 enkodéru."
+AMF.16bitUnsupported="Nelze provést 16bitové enkódování na tomto enkodéru."
 NVENC.Error="Nezdařilo se otevřít NVENC kodek: %1"
 NVENC.GenericError="Zkuste nainstalovat nejnovější verzi <a href=\"https://obsproject.com/go/nvidia-drivers\">ovladače NVIDIA</a> a zavřít ostatní nahrávací programy, které mohou používat NVENC, například NVIDIA ShadowPlay nebo Windows Game DVR."
 NVENC.BadGPUIndex="V nastavení výstupního kódování jste vybrali GPU %1. Nastavte jej zpět na 0 a zkuste to znovu."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/da-DK.ini Changed

@@ -10,7 +10,6 @@
 Level="Niveau"
 AMFOpts="AMF/FFmpeg-indstillinger"
 BFrames="Maks. B-billeder"
-VAAPI.Codec="VAAPI-codec"
 VAAPI.Device="VAAPI-enhed"
 NVENC.LookAhead.ToolTip="Aktiverer dynamiske B-frames.\n\nHvis deaktiveret, benytter encoderen altid antallet af B-frames angivet i indstillingen 'Maks. B-frames'.\n\nHvis aktiveret, forøges den visuelle kvalitet ved kun at benytte det nødvendige antal B-frames op til maksimum\npå bekostning af forøget GPU-forbrug."
 NVENC.PsychoVisualTuning="Psychovisuel tuning"
@@ -19,7 +18,6 @@
 NVENC.8bitUnsupportedHdr="OBS understøtter ikke 8-bit output fra Rec. 2100."
 NVENC.I010Unsupported="NVENC understøtter ikke I010. Brug i stedet P010."
 NVENC.10bitUnsupported="Kan ikke udføre 10-bit encoding med denne encoder."
-NVENC.TooManyBFrames="Maks. B-frames-indstillingen (%d) er mere end encoderen understøtter (%d)."
 NVENC.Preset2.p1="P1: Hurtigste (Laveste Kvalitet)"
 NVENC.Preset2.p2="P2: Hurtigere (lavere kvalitet)"
 NVENC.Preset2.p3="P3: Hurtig (Lav Kvalitet)"
@@ -44,7 +42,6 @@
 BufferingMB="Netværksbuffering"
 HardwareDecode="Benyt hardwareafkodning, når tilgængelig"
 ClearOnMediaEnd="Vis intet, når afspilning afsluttes"
-Advanced="Avanceret"
 RestartWhenActivated="Genstart afspilning, når kilde bliver aktiv"
 CloseFileWhenInactive="Luk fil, når inaktiv"
 CloseFileWhenInactive.ToolTip="Lukker filen, når kilden ikke vises i streamen ellerr\noptagelsen. Dette muliggør at filen kan ændres, når kilden er ikke aktiv,\nmen nogen opstartsforsinkelse kan forekomme, når kilden genaktiveres."
@@ -67,7 +64,6 @@
 WarnWindowsDefender="Er Windows 10 Ransomware-beskyttelse aktiveret, kan dette også medføre denne fejl. Prøv at deaktivere kontrolleret mappeadgang i Windows-indstillingen Sikkerhed/Virus- og Trusselsbeskyttelse."
 Encoder.Error="Kunne ikke åbne %1: %2"
 Encoder.Timeout="Indkodningstid for encoder %1 er for lang (timeout: %2 sekunder)"
-AMF.Error="Mislykkedes at åbne AMF-codec: %1"
 AMF.8bitUnsupportedHdr="OBS understøtter ikke 8-bit output fra Rec. 2100."
 AMF.10bitUnsupportedAvc="Kan ikke udføre 10-bit kode på AMD H.264-koder."
 NVENC.Error="Mislykkedes at åbne NVENC-codec: %1"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/de-DE.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg-Ausgabe"
+FFmpegMuxer="FFmpeg-Muxer"
+FFmpegHlsMuxer="FFmpeg-HLS-Muxer"
+FFmpegMpegtsMuxer="FFmpeg-MPEG-TS-Muxer"
 FFmpegALAC="FFmpeg ALAC (24 Bit)"
 FFmpegFLAC="FFmpeg FLAC (16 Bit)"
 FFmpegPCM16Bit="FFmpeg PCM (16 Bit)"
@@ -12,10 +15,10 @@
 RateControl="Qualitätsregulierungsmethode"
 KeyframeIntervalSec="Keyframeintervall (0 = automatisch)"
 Lossless="Verlustfrei"
+FilePath="Dateipfad"
 AMFOpts="AMF-/FFmpeg-Optionen"
-AMFOpts.ToolTip="Geben Sie benutzerdefinierte AMF- oder FFmpeg-Optionen an, zum Beispiel: „level=5.2 profile=main“. Genauere Informationen finden Sie in der Dokumentation für den AMF-Encoder."
+AMFOpts.ToolTip="Geben Sie benutzerdefinierte AMF- oder FFmpeg-Optionen an, zum Beispiel: „level=5.2 profile=main“. Genauere Informationen finden Sie in der Dokumentation des AMF-Encoders."
 BFrames="Max. B-Frames"
-VAAPI.Codec="VAAPI-Codec"
 VAAPI.Device="VAAPI-Gerät"
 NVENC.LookAhead="Lookahead"
 NVENC.LookAhead.ToolTip="Aktiviert dynamische B-Frames.\n\nWenn deaktiviert, wird der Encoder die Anzahl der B-Frames der Option „Max. B-Frames“ entnehmen.\n\nWenn aktiviert, wird auf Kosten erhöhter GPU-Nutzung die visuelle Qualität erhöht,\nindem nur so viele B-Frames bis zum Maximum verwendet werden, wie nötig sind."
@@ -25,21 +28,21 @@
 NVENC.I010Unsupported="NVENC unterstützt kein I010. Verwenden Sie stattdessen P010."
 NVENC.10bitUnsupported="Mit diesem Encoder kann kein 10-Bit encodet werden."
 NVENC.16bitUnsupported="Mit diesem Encoder kann kein 16-Bit encodet werden."
-NVENC.TooManyBFrames="Die maximalen B-Frames sind höher eingestellt (%d) als vom Encoder unterstützt (%d) wird."
-NVENC.Preset2.p1="P1: Am schnellsten (niedrigste Qualität)"
-NVENC.Preset2.p2="P2: Schneller (niedrigere Qualität)"
-NVENC.Preset2.p3="P3: Schnell (niedrige Qualität)"
-NVENC.Preset2.p4="P4: Mittel (mittlere Qualität)"
-NVENC.Preset2.p5="P5: Langsam (gute Qualität)"
-NVENC.Preset2.p6="P6: Langsamer (bessere Qualität)"
-NVENC.Preset2.p7="P7: Am langsamsten (beste Qualität)"
+NVENC.NoAV1FallbackPossible="AV1-Codierung ist mit den aktuellen Einstellungen nicht verfügbar. Versuchen Sie, eventuell eingestellte Wiederskalierungs- oder GPU-Optionen zu deaktivieren. Überprüfen Sie das Log für mehr Details."
+NVENC.Preset2.p1="P1: Am schnellsten (Niedrigste Qualität)"
+NVENC.Preset2.p2="P2: Schneller (Niedrigere Qualität)"
+NVENC.Preset2.p3="P3: Schnell (Niedrige Qualität)"
+NVENC.Preset2.p4="P4: Mittel (Mittlere Qualität)"
+NVENC.Preset2.p5="P5: Langsam (Gute Qualität)"
+NVENC.Preset2.p6="P6: Langsamer (Bessere Qualität)"
+NVENC.Preset2.p7="P7: Am langsamsten (Beste Qualität)"
 NVENC.Tuning.hq="Hohe Qualität"
 NVENC.Tuning.ll="Niedrige Latenz"
 NVENC.Tuning.ull="Extrem niedrige Latenz"
 NVENC.Multipass="Mehrere Durchgänge"
 NVENC.Multipass.disabled="Ein Durchgang"
-NVENC.Multipass.qres="Zwei Durchgänge (geviertelte Auflösung)"
-NVENC.Multipass.fullres="Zwei Durchgänge (vollständige Auflösung)"
+NVENC.Multipass.qres="Zwei Durchgänge (Geviertelte Auflösung)"
+NVENC.Multipass.fullres="Zwei Durchgänge (Vollständige Auflösung)"
 AMF.Preset.speed="Geschwindigkeit"
 AMF.Preset.balanced="Ausgeglichen"
 AMF.Preset.quality="Qualität"
@@ -52,7 +55,6 @@
 BufferingMB="Netzwerkpufferung"
 HardwareDecode="Hardwaredecodierung verwenden, falls verfügbar"
 ClearOnMediaEnd="Nichts anzeigen, wenn Wiedergabe endet"
-Advanced="Erweitert"
 RestartWhenActivated="Wiedergabe bei Quellenaktivierung erneut starten"
 CloseFileWhenInactive="Datei schließen, wenn inaktiv"
 CloseFileWhenInactive.ToolTip="Schließt die Datei, wenn die Quelle im Stream oder in der Aufnahme nicht angezeigt wird.\nDies ermöglicht Änderungen an der Datei vorzunehmen,\nwas aber zu Verzögerungen bei der Reaktivierung führen kann."
@@ -76,19 +78,17 @@
 HelperProcessFailed="Der Aufnahme-Helfer-Prozess kann nicht gestartet werden. Überprüfen Sie, ob OBS-Dateien nicht von einer Drittanbieter-Antiviren-/Sicherheitssoftware blockiert oder entfernt werden."
 UnableToWritePath="Es kann nicht zu %1 geschrieben werden. Stellen Sie sicher, dass Sie einen Aufnahmepfad verwenden, für den Ihr Konto Schreibrechte hat und genügend Speicherplatz zur Verfügung steht."
 WarnWindowsDefender="Der Fehler kann auch durch den Windows-10-Ransomware-Schutz verursacht werden, falls dieser aktiviert ist. Versuchen Sie, den überwachten Ordnerzugriff in „Windows-Sicherheit“ → „Viren- & Bedrohungsschutz“ auszuschalten."
-Encoder.Error="Fehler beim Öffnen von %1: %2"
+Encoder.Error="Öffnen von %1 fehlgeschlagen: %2"
 Encoder.Timeout="Der Encoder %1 braucht zu lange zum Encoden (Zeitüberschreitung: %2 Sekunden)"
-AMF.Error="Fehler beim Öffnen des AMF-Codecs: %1"
-AMF.GenericError="Versuchen Sie, den neusten <a href=\"https://obsproject.com/go/amd-drivers\">AMD-Treiber</a> zu installieren und andere Aufnahmeprogramme wie Radeon Software oder Windows Game DVR zu schließen, welche den AMD-Encoder möglicherweise verwenden."
 AMF.8bitUnsupportedHdr="Die Ausgabe von 8-Bit von Rec. 2100 wird nicht unterstützt."
 AMF.10bitUnsupportedAvc="Mit dem AMD-H.264-Encoder kann kein 10-Bit encodet werden."
 AMF.16bitUnsupported="Mit diesem Encoder kann kein 16-Bit encodet werden."
-NVENC.Error="Fehler beim Öffnen des NVENC-Codecs: %1"
+NVENC.Error="Öffnen des NVENC-Codecs fehlgeschlagen: %1"
 NVENC.GenericError="Versuchen Sie, den neusten <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA-Treiber</a> zu installieren und andere Aufnahmeprogramme wie NVIDIA ShadowPlay oder Windows Game DVR zu schließen, welche NVENC möglicherweise verwenden."
 NVENC.BadGPUIndex="Sie haben die GPU %1 in Ihren Ausgabeencodereinstellungen ausgewählt. Setzen Sie diesen Wert wieder auf 0 und versuchen Sie es erneut."
 NVENC.OutdatedDriver="Der installierte NVIDIA-Treiber unterstützt diese NVENC-Version nicht. <a href=\"https://obsproject.com/go/nvidia-drivers\">Versuchen Sie, ihn zu aktualisieren</a>."
-NVENC.UnsupportedDevice="NVENC-Fehler: Nicht unterstütztes Gerät. Überprüfen Sie, <a href=\"https://obsproject.com/go/nvenc-matrix\">ob Ihre Grafikkarte NVENC unterstützt</a> und versuchen Sie, <a href=\"https://obsproject.com/go/nvidia-drivers\">den Treiber zu aktualisieren</a>."
-NVENC.TooManySessions="NVENC-Fehler: Zu viele gleichzeitige Sitzungen. Versuchen Sie, andere Aufnahmeprogramme wie NVIDIA ShadowPlay oder Windows Game DVR zu schließen, welche NVENC möglicherweise verwenden."
+NVENC.UnsupportedDevice="NVENC-Fehler: Gerät nicht unterstützt. Überprüfen Sie, <a href=\"https://obsproject.com/go/nvenc-matrix\">ob Ihre Grafikkarte NVENC unterstützt</a> und versuchen Sie, <a href=\"https://obsproject.com/go/nvidia-drivers\">den Treiber zu aktualisieren</a>."
+NVENC.TooManySessions="NVENC-Fehler: Zu viele gleichzeitige Sitzungen. Probieren Sie, andere Aufnahmeprogramme wie NVIDIA ShadowPlay oder Windows Game DVR zu schließen, welche NVENC möglicherweise verwenden."
 NVENC.CheckDrivers="Versuchen Sie, den neusten <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA-Treiber</a> zu installieren."
 AV1.8bitUnsupportedHdr="Die Ausgabe von 8-Bit von Rec. 2100 wird nicht unterstützt."
 ReconnectDelayTime="Wiederverbindungsverzögerung"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/el-GR.ini Changed

@@ -10,21 +10,34 @@
 KeyframeIntervalSec="Διάστημα Πλαισίου Αναφοράς (0=αυτόματο)"
 Lossless="Χωρίς απώλειες"
 Level="Επίπεδο"
+FilePath="Διαδρομή Αρχείου"
+AMFOpts="Επιλογές AMF/FFmpeg"
+AMFOpts.ToolTip="Χρησιμοποιήστε για να ορίσετε προσαρμοσμένες ρυθμίσεις για AMF ή FFmpeg. Για παράδειγμα, \"level=5.2 profile=main\". Ελέγξτε την τεκμηρίωση του κωδικοποιητή AMF για περισσότερες λεπτομέρειες."
 BFrames="Μέγιστα B-frames"
-VAAPI.Codec="Κωδικός VAAPI"
 VAAPI.Device="Συσκευή VAAPI"
 NVENC.LookAhead="Δες-Απεναντι"
 NVENC.LookAhead.ToolTip="Ενεργοποιεί δυναμικά πλαίσια Β.\n\nΑν απενεργοποιηθεί, ο κωδικοποιητής θα χρησιμοποιεί πάντα τον αριθμό των πλαισίων Β που καθορίζονται στη ρύθμιση 'Max B-frames'.\n\nΑν ενεργοποιηθεί, θα αυξήσει την οπτική ποιότητα χρησιμοποιώντας μόνο όσα πλαίσια Β είναι απαραίτητα, μέχρι το μέγιστο,\nμε το κόστος της αύξησης της χρήσης GPU."
 NVENC.PsychoVisualTuning.ToolTip="Επιτρέπει τις ρυθμίσεις κωδικοποιητή που βελτιστοποιούν τη χρήση του ρυθμού bit για αυξημένη αντιληπτή οπτική ποιότητα,\nειδικά σε καταστάσεις με υψηλή κίνηση, με κόστος την αυξημένη χρήση GPU."
 NVENC.CQLevel="Επίπεδο CQ"
+NVENC.8bitUnsupportedHdr="Το OBS δεν υποστηρίζει την έξοδο 8-bit του Rec. 2100."
 NVENC.I010Unsupported="Το NVENC δεν υποστηρίζει I010. Χρησιμοποιήστε το P010."
 NVENC.10bitUnsupported="Αδυναμία εκτέλεσης 10-bit κωδικοποίησης σε αυτόν τον κωδικοποιητή."
+NVENC.16bitUnsupported="Αδυναμία εκτέλεσης 16-bit κωδικοποίησης σε αυτόν τον κωδικοποιητή."
+NVENC.NoAV1FallbackPossible="Η κωδικοποίηση AV1 δεν είναι διαθέσιμη με τις τρέχουσες ρυθμίσεις. Δοκιμάστε να απενεργοποιήσετε τυχόν επιλογές αλλαγής κλίμακας ή GPU που ενδέχεται να έχουν οριστεί. Ελέγξτε το αρχείο καταγραφής για περισσότερες λεπτομέρειες."
+NVENC.Preset2.p1="P1: Γρηγορότατη (Χαμηλότατη Ποιότητα)"
+NVENC.Preset2.p2="P2: Γρηγορότερη (Χαμηλότερη Ποιότητα)"
+NVENC.Preset2.p3="P3: Γρήγορη (Χαμηλή Ποιότητα)"
+NVENC.Preset2.p4="P4: Μέτρια (Μέτρια Ποιότητα)"
+NVENC.Preset2.p5="P5: Αργή (Καλή Ποιότητα)"
+NVENC.Preset2.p6="P6: Αργότερη (Καλύτερη Ποιότητα)"
+NVENC.Preset2.p7="P7: Αργότατη (Υψηλή Ποιότητα)"
 NVENC.Tuning.hq="Υψηλή Ποιότητα"
 NVENC.Tuning.ll="Χαμηλός Χρόνος Ανταπόκρισης"
 NVENC.Tuning.ull="Εξαιρετικά Χαμηλός Χρόνος Ανταπόκρισης"
 AMF.Preset.speed="Ταχύτητα"
 AMF.Preset.balanced="Ισορροπημένο"
 AMF.Preset.quality="Ποιότητα"
+AMF.Preset.highQuality="Υψηλή Ποιότητα"
 FFmpegSource="Πηγή Πολυμέσων"
 LocalFile="Τοπικό αρχείο"
 Looping="Επανάληψη"
@@ -33,12 +46,12 @@
 BufferingMB="Μέγεθος προσωρινης αποθήκευσης Δικτύου (MB)"
 HardwareDecode="Χρήση αποκωδικοποίησης υλικού όταν είναι διαθέσιμη"
 ClearOnMediaEnd="Μη δείχνεις τίποτα όταν τελειώνει η αναπαραγωγή"
-Advanced="Σύνθετες επιλογές"
 RestartWhenActivated="Επανεκκίνηση της αναπαραγωγής όταν η πηγή γίνεται ξανά ενεργή"
 CloseFileWhenInactive="Κλείσιμο του αρχείου όταν η πηγή είναι ανενεργή"
 CloseFileWhenInactive.ToolTip="Κλείνει το αρχείο όταν η πηγή δεν προβάλεται στο stream ή\nκαταγράφεται. Αυτό επιτρέπει την αλλαγή του αρχείου όταν η πηγή δεν είναι ενεργή,\nαλλά μπορεί να προκαλέσει καθυστέρηση εκκίνησης όταν η πηγή επανενεργοποιηθεί."
 ColorRange="Χώρος Χρωμάτων YUV"
 ColorRange.Auto="Αυτόματο"
+ColorRange.Partial="Περιορισμένη"
 ColorRange.Full="Πλήρης"
 LinearAlpha="Εφαρμογή άλφα σε γραμμικό χώρο"
 RestartMedia="Επανέναρξη"
@@ -57,6 +70,16 @@
 UnableToWritePath="Αδυναμία εγγραφής %1. Βεβαιωθείτε ότι χρησιμοποιείτε μια διαδρομή εγγραφής που επιτρέπεται για εγγραφή τού λογαριασμού χρήστη και ότι υπάρχει επαρκής χώρος στον σκληρό δίσκο."
 WarnWindowsDefender="Εάν είναι ενεργοποιημένη η Προστασία Ransomware των Windows 10 μπορεί επίσης να προκαλέσει αυτό το σφάλμα. Δοκιμάστε να απενεργοποιήσετε την ελεγχόμενη πρόσβαση φακέλου στις ρυθμίσεις ασφαλείας των Windows / ιών και προστασίας από απειλή."
 Encoder.Error="Αποτυχία ανοίγματος %1: %2"
+Encoder.Timeout="Ο κωδικοποιητής %1 παίρνει πάρα πολύ για να κωδικοποιήσει (χρονικό όριο: %2 δευτερόλεπτα)"
+AMF.8bitUnsupportedHdr="Το OBS δεν υποστηρίζει την έξοδο 8-bit του Rec. 2100."
+AMF.10bitUnsupportedAvc="Αδυναμία εκτέλεσης 10-bit κωδικοποίησης στον κωδικοποιητή AMD H.264."
+AMF.16bitUnsupported="Αδυναμία εκτέλεσης 16-bit κωδικοποίησης σε αυτόν τον κωδικοποιητή."
 NVENC.Error="Αποτυχία ανοίγματος του κωδικοποιητή NVENC: %1"
+NVENC.GenericError="Δοκιμάστε να εγκαταστήσετε τον τελευταίο <a href=\"https://obsproject.com/go/nvidia-drivers\">οδηγό NVIDIA</a> και να κλείσετε άλλη εφαρμογή καταγραφής που μπορεί να χρησιμοποιεί το NVENC όπως το NVIDIA ShadowPlay ή το Windows Game DVR."
 NVENC.BadGPUIndex="'Έχετε επιλέξει τη συσκευή GPU %1 στις ρυθμίσεις του αποκωδικοποιητή εξόδου. Αλλάξτε τη ρύθμιση στο 0 και ξαναδοκιμάστε."
+NVENC.OutdatedDriver="Ο εγκατεστημένος οδηγός NVIDIA δεν υποστηρίζει αυτή την έκδοση NVENC, δοκιμάστε να <a href=\"https://obsproject.com/go/nvidia-drivers\">ενημερώσετε τον οδηγό</a>."
+NVENC.UnsupportedDevice="Σφάλμα NVENC: Μη υποστηριζόμενη συσκευή. Ελέγξτε ότι η κάρτα γραφικών σας <a href=\"https://obsproject.com/go/nvenc-matrix\">υποστηρίζει NVENC</a> και δοκιμάστε <a href=\"https://obsproject.com/go/nvidia-drivers\">να ενημερώσετε τον οδηγό</a>."
+NVENC.TooManySessions="Σφάλμα NVENC: Πάρα πολλές ταυτόχρονες χρήσεις. Δοκιμάστε να κλείσετε άλλα λογισμικά βιντεοσκόπησης που μπορεί να χρησιμοποιούν το λογισμικό NVENC όπως το NVIDIA ShadowPlay ή το Windows Game DVR."
+NVENC.CheckDrivers="Δοκιμάστε να εγκαταστήσετε τον τελευταίο <a href=\"https://obsproject.com/go/nvidia-drivers\">οδηγό NVIDIA</a>."
+AV1.8bitUnsupportedHdr="Το OBS δεν υποστηρίζει την έξοδο 8-bit του Rec. 2100."
 ReconnectDelayTime="Επανασύνδεση Καθυστέρησης"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/en-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/en-GB.ini Changed

@@ -2,7 +2,6 @@
 NVENC.LookAhead.ToolTip="Enables dynamic B-frames.\n\nIf disabled, the encoder will always use the number of B-frames specified in the 'Max B-frames' setting.\n\nIf enabled, it will increase visual quality by only using however many B-frames are necessary, up to the maximum,\nat the cost of increased GPU utilisation."
 NVENC.PsychoVisualTuning.ToolTip="Enables encoder settings that optimise the use of bitrate for increased perceived visual quality,\nespecially in situations with high motion, at the cost of increased GPU utilisation."
 ColorRange="YUV Colour Range"
-AMF.GenericError="Try installing the latest <a href=\"https://obsproject.com/go/amd-drivers\">AMD driver</a> and closing other recording software that might be using the AMD encoder such as the Radeon Software or Windows Game DVR."
 NVENC.GenericError="Try installing the latest <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA driver</a> and closing other recording software that might be using NVENC such as NVIDIA ShadowPlay or Windows Game DVR."
 NVENC.OutdatedDriver="The installed NVIDIA driver does not support this NVENC version, try <a href=\"https://obsproject.com/go/nvidia-drivers\">updating the driver</a>."
 NVENC.UnsupportedDevice="NVENC Error: Unsupported device. Check that your video card <a href=\"https://obsproject.com/go/nvenc-matrix\">supports NVENC</a> and try <a href=\"https://obsproject.com/go/nvidia-drivers\">updating the driver</a>."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/es-ES.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Salida de FFmpeg"
+FFmpegMuxer="Multiplexador FFmpeg"
+FFmpegHlsMuxer="Multiplexador FFmpeg HLS"
+FFmpegMpegtsMuxer="Multiplexador FFmpeg MPEG-TS"
 FFmpegPCM32BitFloat="FFmpeg PCM (32-bit flotante)"
 FFmpegOpts="Opciones FFmpeg"
 FFmpegOpts.ToolTip.Source="Permite establecer opciones FFmpeg. Solo acepta opciones en formato opción=valor.\nSe pueden establecer múltiples opciones separándolas con un espacio.\nEjemplo: rtsp_transport=tcp rtsp_flags=prefer_tcp"
@@ -11,10 +14,10 @@
 KeyframeIntervalSec="Intervalo de fotogramas clave (0=auto)"
 Lossless="Sin pérdidas"
 Level="Nivel"
+FilePath="Ruta del archivo"
 AMFOpts="Opciones AMF/FFmpeg"
 AMFOpts.ToolTip="Utilice para especificar opciones personalizadas de AMF o FFmpeg. Por ejemplo, \"level=5.2 profile=main\". Revise los documentos del codificador AMF para más detalles."
 BFrames="Máximos B-frames"
-VAAPI.Codec="Codec VAAPI"
 VAAPI.Device="Dispositivo VAAPI"
 NVENC.LookAhead="\"Look-Ahead\""
 NVENC.LookAhead.ToolTip="Habilita B-frames dinámicos.\n\nSi se deshabilita, el codificador siempre usará el número de B-frames especificado en el ajuste 'B-frames máximos'.\n\nSi se habilita, incrementará la calidad visual haciendo uso solo de la cantidad de B-frames necesaria, hasta el máximo,\na costa de incrementar el uso de la GPU."
@@ -23,7 +26,8 @@
 NVENC.8bitUnsupportedHdr="OBS no soporta salida de 8 bits de Rec. 2100."
 NVENC.I010Unsupported="NVENC no soporta I010. Utilice P010 en su lugar."
 NVENC.10bitUnsupported="No se puede realizar codificación de 10 bits en este codificador."
-NVENC.TooManyBFrames="El ajuste máximo de B-frames (%d) es mayor de lo que soporta el codificador (%d)."
+NVENC.16bitUnsupported="No se puede realizar codificación de 16 bits en este codificador."
+NVENC.NoAV1FallbackPossible="La codificación AV1 no está disponible con la configuración actual. Intenta desactivar cualquier opción de reescalado o GPU que pueda estar configurada. Revisa los registros para obtener más detalles."
 NVENC.Preset2.p1="P1: El más rápido (calidad mínima)"
 NVENC.Preset2.p2="P2: Más rápido (calidad más baja)"
 NVENC.Preset2.p3="P3: Rápido (calidad baja)"
@@ -50,7 +54,6 @@
 BufferingMB="Buffering de la red"
 HardwareDecode="Utilizar la decodificación por hardware cuando esté disponible"
 ClearOnMediaEnd="No mostrar nada al terminar la reproducción"
-Advanced="Avanzado"
 RestartWhenActivated="Reiniciar la reproducción cuando la fuente esté activa"
 CloseFileWhenInactive="Cerrar archivo cuando esté inactivo"
 CloseFileWhenInactive.ToolTip="Cierra el archivo cuando la fuente no esta siendo mostrada en el directo o en la grabación.\nEsto permite que el archivo pueda ser cambiado cuando la fuente no esta activa,\npero puede haber una espera en el inicio cuando se reactive la fuente."
@@ -76,10 +79,9 @@
 WarnWindowsDefender="Si la protección del Ransomware de Windows 10 está activada, también puede causar este error. Intenta desactivar el acceso controlado a la carpeta en la configuración de protección de virus y virus de Windows."
 Encoder.Error="Error al abrir %1: %2"
 Encoder.Timeout="El codificador %1 está tardando demasiado tiempo en codificar (tiempo de espera: %2 segundos)"
-AMF.Error="No se pudo abrir el códec AMF: %1"
-AMF.GenericError="Prueba instalando el último <a href=\"https://obsproject.com/go/amd-drivers\">controlador de AMD</a> y cierra otro software de grabación que pueda estar usando el codificador de AMD como el software de Radeon o el Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS no soporta salida de 8 bits de Rec. 2100."
 AMF.10bitUnsupportedAvc="No se puede realizar codificación de 10 bits en el codificador AMD H.264."
+AMF.16bitUnsupported="No se puede realizar codificación de 16 bits en este codificador."
 NVENC.Error="No se pudo abrir el códec NVENC: %1"
 NVENC.GenericError="Prueba instalando el último <a href=\"https://obsproject.com/go/nvidia-drivers\">controlador de NVIDIA</a> y cierra otro software de grabación que pueda estar usando el codificador NVENC como el NVIDIA ShadowPlay o el Windows Game DVR."
 NVENC.BadGPUIndex="Has seleccionado GPU %1 en la configuración de su codificador de salida. Establézcalo de nuevo a 0 y vuelva a intentarlo."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/et-EE.ini Changed

@@ -10,14 +10,12 @@
 AMFOpts="AMF/FFmpeg valikud"
 AMFOpts.ToolTip="Kasuta kohandatud AMF või FFmpeg sätete määramiseks. Näiteks \"level=5.2 profile=main\". Vaata AMF-kodeerija dokumentatsiooni täpsemate üksikasjade saamiseks."
 BFrames="Maksimum B-kaadrid"
-VAAPI.Codec="VAAPI kodeerija"
 VAAPI.Device="VAAPI seade"
 NVENC.LookAhead.ToolTip="Võimaldab dünaamilised B-kaadrid.\n\nKui see on välja lülitatud, kasutab kodeerija alati B-kaadrite arvu, mis on määratud seadistuses \"Maksimum B-kaadrid\".\n\nKui see on sisse lülitatud, suurendab see visuaalset kvaliteeti, kasutades ainult nii palju B-kaadreid, kui on vaja, kuni maksimumini,\naga GPU suurema kasutuse arvelt."
 NVENC.PsychoVisualTuning.ToolTip="Võimaldab kodeerija seadeid, mis optimeerivad bitikiiruse kasutamist, et suurendada tajutavat visuaalset kvaliteeti,\neriti suure liikumisega olukordades, kuid seda GPU suurema kasutamise arvelt."
 NVENC.8bitUnsupportedHdr="OBS ei toeta Rec. 2100 8-bitist väljundit."
 NVENC.I010Unsupported="NVENC ei toeta I010. Kasutsa selle asemel P010."
 NVENC.10bitUnsupported="Selle kodeerijaga ei saa teha 10-bitist kodeerimist."
-NVENC.TooManyBFrames="Maksimaalne B-kaadrite seadistus (%d) on suurem kui kodeerija toetab (%d)."
 NVENC.Preset2.p1="P1: Kiireim (madalaim kvaliteet)"
 NVENC.Preset2.p2="P2: Kiirem (madal kvaliteet)"
 NVENC.Preset2.p3="P3: Kiire (madal kvaliteet)"
@@ -41,7 +39,6 @@
 Input="Sisend"
 InputFormat="Sisestus formaat"
 HardwareDecode="Kasuta riistvara dekodeerimist, kui see on saadaval"
-Advanced="Täpsemad"
 RestartWhenActivated="Taaskäivita taasesitus, kui allikas muutub aktiivseks"
 CloseFileWhenInactive.ToolTip="Sulgeb faili, kui allikat ei kuvata voogedastuse või \nsalvestuse ajal. See võimaldab faili muuta, kui allikas ei ole aktiivne,\n kuid võib tekkida mõningane viivitus käivitamisel, kui allikas uuesti aktiveerub."
 ColorRange="YUV värviruumi vahemik"
@@ -59,7 +56,6 @@
 MediaFileFilter.AllFiles="Kõik failid"
 ReplayBuffer="Taasesituse puhver"
 ReplayBuffer.Save="Salvesta Taasesitus"
-AMF.Error="AMF kodeerija avamine ebaõnnestus: %1"
 AMF.8bitUnsupportedHdr="OBS ei toeta Rec. 2100 8-bitist väljundit."
 AMF.10bitUnsupportedAvc="AMD H.264 kodeerijal ei ole võimalik 10-bitist kodeerimist teostada."
 NVENC.BadGPUIndex="Oled valinud GPU %1 oma väljundkodeerija seadetes. Sea see tagasi 0-le ja proovi uuesti."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/eu-ES.ini Changed

@@ -1,4 +1,5 @@
 FFmpegOutput="FFmpeg irteera"
+FFmpegPCM32BitFloat="FFmpeg PCM (32-bit flotea)"
 FFmpegOpts="FFmpeg Opzioak"
 FFmpegOpts.ToolTip.Source="FFmpeg-ren aukerak ezartzeko aukera ematen du. Honek aukera=balioa formatua bakarrik onartzen ditu aukerak.\nHainbat aukera ezar daitezke zuriune batekin bereiziz. \nAdibidez: rtsp_transport=tcp rtsp_flag=prefer_tcp"
 Bitrate="Bit-emaria"
@@ -10,9 +11,10 @@
 KeyframeIntervalSec="Gako-fotogramen tartea (0=automatikoa)"
 Lossless="Galerarik gabe"
 Level="Maila"
+FilePath="Fitxategiaren bidea"
 AMFOpts="AMF/FFmpeg Aukerak"
+AMFOpts.ToolTip="Erabili AMF edo FFmpeg aukera pertsonalizatuak zehazteko. Adibidez, \"maila=5.2 profila=nagusia\". Xehetasun gehiago lortzeko, begiratu AMF kodetzailearen dokumentuak."
 BFrames="B-fotogramen maximoa"
-VAAPI.Codec="VAAPI kodea"
 VAAPI.Device="VAAPI gailua"
 NVENC.LookAhead="Aurrera begira"
 NVENC.LookAhead.ToolTip="Gaitu B-fotograma dinamikoak.\n\nGalerazita badaude, kodetzaileak beti erabiliko du 'Max B-fotogramak' ezarpenetan zehazten den B-fotogramen kopurua.\n\nGaituta badaude, ikusmen kalitatea hobetuko du beharrezkoak diren B-fotogramen kopurua erabiliz, maximora iritsi arte\nordainez GPUren erabilera handituko bada ere."
@@ -21,7 +23,8 @@
 NVENC.8bitUnsupportedHdr="OBSk ez du 8 biteko irteera onartzen Rec. 2100-rekin."
 NVENC.I010Unsupported="NVENC-k ez du I010 onartzen. P010 Erabili ordez."
 NVENC.10bitUnsupported="Kodetzaile honekin ezin da 10 biteko kodeketarik egin."
-NVENC.TooManyBFrames="Gehienezko B-frame konfigurazioa (%d) kodetzaileak onartzen duen gehienezkoa baino handiagoa da (%d)."
+NVENC.16bitUnsupported="Ezin da 16 biteko kodeketa egin kodetzaile honetan."
+NVENC.NoAV1FallbackPossible="AV1 kodeketa ez dago erabilgarri uneko ezarpenekin. Saiatu desgaitzen ezarrita egon daitezkeen bir-eskalatzeak edo GPU aukerak . Begiratu erregistroa xehetasun gehiago lortzeko."
 NVENC.Preset2.p1="P1: Azkarrena (Kalitate txarrena)"
 NVENC.Preset2.p2="P2: Azkarragoa (Kalitate txikiagoa)"
 NVENC.Preset2.p3="P3: Azkarra (Kalitate txikia)"
@@ -39,6 +42,7 @@
 AMF.Preset.speed="Abiadura"
 AMF.Preset.balanced="Orekatua"
 AMF.Preset.quality="Kalitatea"
+AMF.Preset.highQuality="Kalitate handia"
 FFmpegSource="Multimedia iturburua"
 LocalFile="Tokiko fitxategia"
 Looping="Begizta"
@@ -47,7 +51,6 @@
 BufferingMB="Sareko bufferreratzea"
 HardwareDecode="Erabili hardware deskodeketa eskuragarri dagoenean"
 ClearOnMediaEnd="Erreprodukzioa bukatzean ez erakutsi ezer"
-Advanced="Aurreratua"
 RestartWhenActivated="Berrabiarazi erreprodukzioa iturburua aktiboa dagoenean"
 CloseFileWhenInactive="Itxi fitxategia inaktibo dagoenean"
 CloseFileWhenInactive.ToolTip="Itxi fitxategia iturburua ez bada bistaratzen transmisioan edo\ngrabazioan. Honi esker fitxategia alda daiteke iturburua aktiboa ez badago,\nbaina atzerapen bat sor daiteke iturburua biraktibatzean."
@@ -72,10 +75,15 @@
 WarnWindowsDefender="Windows 10 Ransomware Protection aktibatuta egoteak errore hori ere sor dezake. Gehitu OBS Windows segurtasuna/ birus eta mehatxuen babeserako ezarpenen kontrolpeko karpeten sarbide-zerrendara."
 Encoder.Error="Hutsegitea %1 irekitzerakoan: %2"
 Encoder.Timeout="%1 kodifikatzaileak denobra gehiegi hartzen du kodetzeko (timeout: %2 segundo)"
-AMF.Error="Hutsegitea AMF kodifikatzailea irekitzerakoan: %1"
 AMF.8bitUnsupportedHdr="OBSk ez du 8 biteko irteera onartzen Rec. 2100-rekin."
 AMF.10bitUnsupportedAvc="AMD H.264 kodetzailearekin ezin da 10 biteko kodeketarik egin."
+AMF.16bitUnsupported="Kodetzaile honekin ezin da 16 biteko kodeketarik egin."
 NVENC.Error="Huts egin du NVENC kodeka irekitzean: %1"
+NVENC.GenericError="Saiatu azken <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA kontrolatzailea</a> instalatzen eta NVENC erabiltzen duen beste grabazio-softwarea ixten, hala nola NVIDIA ShadowPlay edo Windows Game DVR."
 NVENC.BadGPUIndex="%1 GPUa aukeratu duzu zure irteerako kodetzailearen ezarpenetan. Leheneratu hau 0-ra eta saiatu berriro."
+NVENC.OutdatedDriver="Instalatutako NVIDIA kontrolatzaileak ez du NVENC bertsio hau onartzen. Saiatu <a href=\"https://obsproject.com/go/nvidia-drivers\">kontrolatzailea eguneratzen</a>."
+NVENC.UnsupportedDevice="NVENC errorea: gailua ez da onartzen. Egiaztatu zure bideo-txartelak <a href=\"https://obsproject.com/go/nvenc-matrix\">NVENC onartzen duela</a> eta saiatu <a href=\"https://obsproject.com/go/nvidia- drivers\">kontrolatzailea eguneratzen</a>."
+NVENC.TooManySessions="NVENC errorea: aldi berean saio gehiegi. Saiatu NVENC erabiltzen ari den beste grabaketa software bat ixten, hala nola NVIDIA ShadowPlay edo Windows Game DVR."
+NVENC.CheckDrivers="Saiatu azken <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA kontrolatzailea</a> instalatzen."
 AV1.8bitUnsupportedHdr="OBSk ez du 8 biteko irteera onartzen Rec. 2100-rekin."
 ReconnectDelayTime="Birkonektatzeko atzerapena"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/fa-IR.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="خروجی FFmpeg"
+FFmpegMuxer="تسهیم‌کننده FFmpeg"
+FFmpegHlsMuxer="تسهیم‌کننده FFmpeg HLS"
+FFmpegMpegtsMuxer="تسهیم‌کننده FFmpeg MPEG-TS"
 FFmpegALAC="FFmpeg ALAC (۲۴ بیتی)"
 FFmpegFLAC="FFmpeg FLAC (۱۶ بیتی)"
 FFmpegPCM16Bit="FFmpeg PCM (16 بیتی)"
@@ -15,10 +18,11 @@
 KeyframeIntervalSec="فاصله فریم کلیدی (0=خودکار)"
 Lossless="بدون تلف"
 Level="سطح"
+FilePath="مسیر فایل"
 AMFOpts="گزینه های AMF/FFmpeg"
 AMFOpts.ToolTip="برای تعیین گزینه های سفارشی AMF یا FFmpeg استفاده کنید. به عنوان مثال، \"level=5.2 profile=main\". برای جزئیات بیشتر، اسناد رمزگذار AMF را بررسی کنید."
+GPU="گرافیک"
 BFrames="حد اکثر فریم های B"
-VAAPI.Codec="کدک VAAPI"
 VAAPI.Device="دستگاه VAAPI"
 NVENC.LookAhead="پیش رو نگاه"
 NVENC.LookAhead.ToolTip="فریم های B پویا را فعال می کند.\n\nاگر غیرفعال باشد، رمزگذار همیشه از تعداد فریم های B مشخص شده در تنظیمات \"حداکثر فریم B\" استفاده خواهد کرد.\n\nدر صورت فعال بودن، فقط با استفاده از تعداد زیادی کیفیت بصری فریم B حداکثر افزایش می یابد،\n مقدار استفاده از گرافیک افزایش می یابد."
@@ -28,7 +32,8 @@
 NVENC.8bitUnsupportedHdr="OBS خروجی 8 بیتی ضبط را پشتیبانی نمی کند. 2100."
 NVENC.I010Unsupported="NVENC از I010 پشتیبانی نمی کند. به جای آن از P010 استفاده کنید."
 NVENC.10bitUnsupported="نمی توان رمزگذاری 10 بیتی را روی این رمزگذار انجام داد."
-NVENC.TooManyBFrames="حداکثر تنظیم فریم ب (%d) بیشتر از پشتیبانی رمزگذار (%d) است."
+NVENC.16bitUnsupported="نمی توان رمزگذاری ۱۶ بیتی را روی این رمزگذار انجام داد."
+NVENC.NoAV1FallbackPossible="کدگذاری AV۱ با تنظیمات جاری در دسترس نیست. سعی کنید هر گزینه تغییر مقیاس یا گزینه های پردازشگر گرافیکی که ممکن است را غیر فعال کنید. برای جزئیات بیشتر گزارش را بررسی کنید."
 NVENC.Preset2.p1="P1: سریعترین (کمترین کیفیت)"
 NVENC.Preset2.p2="P2: سریعتر (کیفیت پایین تر)"
 NVENC.Preset2.p3="P3: سریع (کیفیت پایین)"
@@ -55,7 +60,6 @@
 BufferingMB="بافر شبکه"
 HardwareDecode="در صورت وجود از رمزگشایی سخت افزاری استفاده کنید"
 ClearOnMediaEnd="با پایان پخش، چیزی نشان داده نشود"
-Advanced="پیشرفته"
 RestartWhenActivated="با فعال شدن منبع پخش را دوباره شروع کنید"
 CloseFileWhenInactive="بستن پرونده در صورت غیرفعال بودن"
 CloseFileWhenInactive.ToolTip="وقتی منبع در جریان نمایش داده نمی شود یا\n ضبط نمی شود، پرونده را می بندد. این اجازه می دهد تا پرونده هنگام فعال نبودن منبع تغییر کند،\n اما ممکن است هنگام فعال شدن مجدد منبع، تأخیر در شروع وجود داشته باشد."
@@ -81,10 +85,9 @@
 WarnWindowsDefender="اگر محافظت در برابر باج افزار ویندوز 10 فعال باشد نیز می تواند باعث این خطا شود. دسترسی به پوشه کنترل شده را در امنیت ویندوز/تنظیمات محافظت در برابر تهدید خاموش کنید."
 Encoder.Error="%1 باز نشد: %2"
 Encoder.Timeout="رمزگذار %1 بیش از حد طول می کشد تا رمزگذاری شود (موقعیت زمانی: %2 ثانیه)"
-AMF.Error="کدک AMF باز نشد: %1"
-AMF.GenericError="سعی کنید آخرین <a href=\"https://obsproject.com/go/amd-drivers\">درایور AMD</a> را نصب کنید و سایر نرم افزارهای ضبط را که ممکن است از رمزگذار AMD استفاده می کنند، مانند نرم‌افزار Radeon یا DVR بازی ویندوز ببندید."
 AMF.8bitUnsupportedHdr="OBS خروجی 8 بیتی ضبط را پشتیبانی نمی کند. 2100."
 AMF.10bitUnsupportedAvc="نمی توان رمزگذاری 10 بیتی را روی رمزگذار AMD H.264 انجام داد."
+AMF.16bitUnsupported="نمی توان رمزگذاری ۱۶ بیتی را روی این رمزگذار انجام داد."
 NVENC.Error="کدک NVENC باز نشد: %1"
 NVENC.GenericError="سعی کنید آخرین <a href=\"https://obsproject.com/go/nvidia-drivers\">درایور NVIDIA</a> را نصب کنید و سایر نرم افزارهای ضبط را که ممکن است از NVENC استفاده می کنند مانند NVIDIA ShadowPlay یا DVR بازی ویندوز ببندید."
 NVENC.BadGPUIndex="شما گرافیک %1 را در تنظیمات رمزگذار خروجی خود انتخاب کرده اید. دوباره روی 0 تنظیم کنید و امتحان کنید."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/fi-FI.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg-ulostulo"
+FFmpegMuxer="FFmpeg Mukseri"
+FFmpegHlsMuxer="FFmpeg HLS Mukseri"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS Mukseri"
 FFmpegPCM32BitFloat="FFmpeg PCM (32-bit liukuluku)"
 FFmpegOpts="FFmpeg-valinnat"
 FFmpegOpts.ToolTip.Source="Mahdollistaa FFmpeg-valintojen asettamisen. Hyväksyy valinnat vain muodossa valinta=arvo.\nUseita valintoja voi asettaa erottamalla ne välilyönnillä.\nEsimerkki: rtsp_transport=tcp rtsp_flags=prefer_tcp"
@@ -11,10 +14,10 @@
 KeyframeIntervalSec="Avainruutujen väli (0=automaattinen)"
 Lossless="Häviötön"
 Level="Taso"
+FilePath="Tiedostopolku"
 AMFOpts="AMF:n/FFmpegin asetukset"
 AMFOpts.ToolTip="Käytä AMF tai FFmpeg vaihtoehtoja esim. \"level=5.2 profile=main\". Tarkista AMF enkooderin ohjeet saadaksesi enemmän lisätietoja."
 BFrames="Maksimi-B-ruudut"
-VAAPI.Codec="VAAPI-koodekki"
 VAAPI.Device="VAAPI-laite"
 NVENC.LookAhead.ToolTip="Käytä dynaamisia B-ruutuja.\n\nPois päältä pidettäessä enkooderi käyttää aina B-ruutuja sen verran kuin asetuksessa 'Maksimi-B-ruudut' on määritetty.\n\nKäytössä ollessaan asetus parantaa visuaalista laatua käyttäen vain tarvittavan määrän B-ruutuja maksimiin asti,\nGPU:n käytön kustannuksella."
 NVENC.PsychoVisualTuning="Psykovisuaalinen viritys"
@@ -23,7 +26,8 @@
 NVENC.8bitUnsupportedHdr="OBS ei tue 8-bittistä käyttöä Rec. 2100:n kanssa."
 NVENC.I010Unsupported="NVENC ei tue I010:tä. Käytä sen sijaan P010:tä."
 NVENC.10bitUnsupported="Ei voida suorittaa 10-bittistä enkooderia tälle enkooderille."
-NVENC.TooManyBFrames="Ennimäis-B-ruutujen asetus (%d) on enemmän kuin enkooderi tukee (%d)."
+NVENC.16bitUnsupported="Ei voida suorittaa 16-bittistä koodausta tälle enkooderille."
+NVENC.NoAV1FallbackPossible="AV1-koodaus ei ole käytettävissä nykyisillä asetuksilla. Poista käytöstä mahdolliset skaalaus- tai GPU-asetukset. Tarkista lokista lisätietoja."
 NVENC.Preset2.p1="P1: Nopein (matalin laatu)"
 NVENC.Preset2.p2="P2: Nopeampi (matalampi laatu)"
 NVENC.Preset2.p3="P3: Nopea (matala laatu)"
@@ -50,7 +54,6 @@
 BufferingMB="Verkon puskurointi"
 HardwareDecode="Käytä laitteistotason purkua, kun mahdollista"
 ClearOnMediaEnd="Älä näytä mitään kun toisto päättyy"
-Advanced="Lisäasetukset"
 RestartWhenActivated="Aloita toisto uudelleen kun lähde aktivoituu"
 CloseFileWhenInactive="Sulje tiedosto, kun toimeton"
 CloseFileWhenInactive.ToolTip="Sulkee tiedoston kun lähdettä ei näytetä lähetyksessä tai nauhoituksessa.\nTämä mahdollistaa tiedoston muuttamisen kun lähde ei ole aktiivinen,\nmutta se saattaa aiheuttaa pientä viivettä käynnistyksessä kun tiedosto aktivoituu uudelleen."
@@ -76,10 +79,9 @@
 WarnWindowsDefender="Tämä virhe saattaa aiheutua myös jos Windowsin Hyökkäysten esto on käytössä. Yritä kytkeä valvottujen kansioiden seuranta pois päältä Windowsin suojaus / Virusten ja uhkien torjunta -asetuksissa."
 Encoder.Error="Ei voitu avata %1: %2"
 Encoder.Timeout="Enkooderin %1 koodaus kestää liian kauan (aikakatkaisu: %2 sekuntia)"
-AMF.Error="AMF-koodekin avaaminen epäonnistui: %1"
-AMF.GenericError="Kokeile asentaa uusin <a href=\"https://obsproject.com/go/amd-drivers\">AMD ajuri</a> ja sulje muut ohjelmat, jotka saattaa käyttää AMD-kooderia, kuten Radeon Software tai Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS ei tue 8-bittistä käyttöä Rec. 2100:n kanssa."
 AMF.10bitUnsupportedAvc="Ei voida suorittaa 10-bittistä koodausta AMD H.264 kooderilla."
+AMF.16bitUnsupported="Ei voida suorittaa 16-bittistä koodausta tälle enkooderille."
 NVENC.Error="NVENC-koodekin avaaminen epäonnistui: %1"
 NVENC.GenericError="Kokeile asentaa uusin <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA ajuri</a> ja sulje muut ohjelmat, jotka saattaa käyttää NVENC, kuten NVIDIA ShadowPlay tai Windows Game DVR."
 NVENC.BadGPUIndex="Olet valinnut GPU %1 \"Ulostulo\"-valikon enkooderi-asetuksesta. Aseta tämä takaisin arvoon 0 ja yritä uudelleen."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/fil-PH.ini Changed

@@ -8,6 +8,7 @@
 RateControl="Kontrolin ang Antas"
 KeyframeIntervalSec="Interval Ng Keyframe (0=auto)"
 Level="Antas"
+FilePath="Ang Landas ng File"
 AMFOpts="Options Ng AMF/FFmpeg"
 AMFOpts.ToolTip="Gamitin upang tukuyin ang custom na opsyon ng AMF o FFmpeg. Halimbawa, \"level=5.2 profile=main\". Tingnan ang AMF encoder docs para sa higit pang mga detalye."
 BFrames="Pinakamaraming B-frames"
@@ -18,7 +19,8 @@
 NVENC.8bitUnsupportedHdr="Hindi sinusuportahan ng OBS ang 8-bit na output ng Rec. 2100."
 NVENC.I010Unsupported="Hindi sinusuportahan ng NVENC ang I010. Gamitin na lang ang P010."
 NVENC.10bitUnsupported="Hindi makapagsagawa ng 10-bit na encode sa encoder na ito."
-NVENC.TooManyBFrames="Ang setting ng Max B-frames (%d) ay higit pa sa mga suporta sa encoder (%d)."
+NVENC.16bitUnsupported="Hindi maaaring magsagawa ng 16-bit encode sa encoder na ito."
+NVENC.NoAV1FallbackPossible="Ang pag-encode ng AV1 ay hindi magagamit sa kasalukuyang mga setting. Subukang huwag paganahin ang anumang mga pagpipilian sa muling pag-scale o GPU na maaaring itakda. Suriin ang log para sa higit pang mga detalye."
 NVENC.Preset2.p1="P1: Pinakamabilis (Mababang Kalidad)"
 NVENC.Preset2.p2="P1: Pinakamabilis (Mababang Kalidad)"
 NVENC.Preset2.p3="P3: Mabilis (Mababang Kalidad)"
@@ -43,7 +45,6 @@
 BufferingMB="Pag-buffer ng Network"
 HardwareDecode="Gamitin ang hardware decoding kapag magagamit"
 ClearOnMediaEnd="Walang ipakita kapag tapos na ang playback"
-Advanced="I-Advanced"
 RestartWhenActivated="Simulan mulang ang playback kapag aktibo ang pinagmulan"
 CloseFileWhenInactive="Isarado ang file pag di aktibo"
 CloseFileWhenInactive.ToolTip="Isarado ang file kapag ang pinagmulan ay di ipinapakita ang stream or\nrecording. Ito nagpapahintulot na baguhin ang pinagmulang pag hindi aktibo,'\n pero dapat mayroong startup delay kapang ang pinagmulan muliang aktibo."
@@ -68,7 +69,6 @@
 WarnWindowsDefender="Kung ang Proteksyon ng Windows 10 laban sa Ransomware ay nakabukas, maaring maging sanhi ito ng error na ito. Subukan buwagin ang pag-access ng controlled folder sa settings ng Windows Security / Virus & Threat."
 Encoder.Error="Nabigong Buksan %1: %2"
 Encoder.Timeout="Masyadong mahaba ang pag-encode ng encoder %1 (timeout: %2 segundo)"
-AMF.Error="Nabigong buksan ang AMF codec: %1"
 AMF.8bitUnsupportedHdr="Hindi sinusuportahan ng OBS ang 8-bit na output ng Rec. 2100."
 AMF.10bitUnsupportedAvc="Hindi makapagsagawa ng 10-bit na encode sa encoder na ito."
 NVENC.Error="Nabigong buksan ang NVENC codec: %1"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/fr-FR.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Sortie FFmpeg"
+FFmpegMuxer="Multiplexeur FFmpeg"
+FFmpegHlsMuxer="Multiplexeur FFmpeg HLS"
+FFmpegMpegtsMuxer="Multiplexeur FFmpeg MPEG-TS"
 FFmpegOpts="Options FFmpeg"
 FFmpegOpts.ToolTip.Source="Vous permet de définir les options FFmpeg. Les options ne sont acceptées qu'au format option=valeur.\nIl est possible de définir plusieurs options en les séparant par un espace.\nExemple : rtsp_transport=tcp rtsp_flags=prefer_tcp"
 Bitrate="Débit"
@@ -10,10 +13,10 @@
 KeyframeIntervalSec="Intervalle d'images clés (0 = auto)"
 Lossless="Sans perte"
 Level="Niveau"
+FilePath="Chemin du fichier"
 AMFOpts="Options de FFmpeg / AMF"
 AMFOpts.ToolTip="Utilisé pour spécifier des options personnalisées pour AMF ou FFmpeg. Par exemple, \"level=5.2 profile=main\". Vérifiez la documentation de l'encodeur AMF pour plus de détails."
 BFrames="Nombre maximal de B-frames"
-VAAPI.Codec="Codec VAAPI"
 VAAPI.Device="Appareil VAAPI"
 NVENC.LookAhead="Prédiction (Look-ahead)"
 NVENC.LookAhead.ToolTip="Active les B-frames dynamiques.\n\nSi désactivé, l'encodeur utilisera toujours le nombre de B-frames dans le paramètre \"Nombre maximal de B-frames\".\n\nSi activé, il augmentera la qualité visuelle en n'utilisant que le nombre de B-frames nécessaire, inférieur au maximum,\nau prix d'une utilisation accrue de la carte graphique."
@@ -23,21 +26,22 @@
 NVENC.8bitUnsupportedHdr="OBS ne prend pas en charge la sortie 8 bits de la Rec. 2100."
 NVENC.I010Unsupported="NVENC ne supporte pas I010. Utilisez P010 à la place."
 NVENC.10bitUnsupported="Impossible d'effectuer un encodage 10 bits sur cet encodeur."
-NVENC.TooManyBFrames="Le paramètre Max B-frames (%d) est supérieur à ce que l'encodeur peut supporter (%d)."
-NVENC.Preset2.p1="P1 : Plus rapide (qualité la plus basse)"
+NVENC.16bitUnsupported="Impossible d'effectuer un encodage sur 16 bits avec cet encodeur."
+NVENC.NoAV1FallbackPossible="L'encodage AV1 n'est pas disponible avec les paramètres actuels. Essayez de désactiver toute mise à l'échelle ou autre option GPU qui pourrait être activée. Consultez le fichier journal pour plus de détails."
+NVENC.Preset2.p1="P1 : Le plus rapide (qualité la plus basse)"
 NVENC.Preset2.p2="P2 : Plus rapide (qualité inférieure)"
 NVENC.Preset2.p3="P3 : Rapide (basse qualité)"
 NVENC.Preset2.p4="P4 : Moyen (qualité moyenne)"
-NVENC.Preset2.p5="P5 : Lent (bonne qualité)"
+NVENC.Preset2.p5="P5 : Lente (bonne qualité)"
 NVENC.Preset2.p6="P6 : Plus lente (très bonne qualité)"
-NVENC.Preset2.p7="P7 : Plus lente (meilleure qualité)"
+NVENC.Preset2.p7="P7 : La plus lente (meilleure qualité)"
 NVENC.Tuning.hq="Haute qualité"
 NVENC.Tuning.ll="Faible latence"
 NVENC.Tuning.ull="Très faible latence"
 NVENC.Multipass="Mode Multipass"
 NVENC.Multipass.disabled="Passe unique"
 NVENC.Multipass.qres="Deux passes (quart de résolution)"
-NVENC.Multipass.fullres="Deux passes (Résolution complète)"
+NVENC.Multipass.fullres="Deux passes (pleine résolution)"
 AMF.Preset.speed="Vitesse"
 AMF.Preset.balanced="Équilibré"
 AMF.Preset.quality="Qualité"
@@ -50,7 +54,6 @@
 BufferingMB="Tampon réseau (Mo)"
 HardwareDecode="Utiliser le décodage matériel (si disponible)"
 ClearOnMediaEnd="Ne rien afficher lorsque la lecture se termine"
-Advanced="Options avancées"
 RestartWhenActivated="Reprendre depuis le début quand cette source redevient active"
 CloseFileWhenInactive="Fermer le fichier quand cette source est inactive"
 CloseFileWhenInactive.ToolTip="Ferme le fichier lorsque la source ne s'affiche pas sur le stream ou\nl'enregistrement. Cela permet de modifier le fichier lorsque la source n'est pas active,\nmais il peut y avoir un délai de démarrage lorsque la source se réactive."
@@ -74,10 +77,9 @@
 WarnWindowsDefender="Si la Protection contre les ransomware de Windows 10 est activée, cela peut causer cette erreur. Essayez de désactiver le Dispositif d'accès contrôlé aux dossiers dans \"Sécurité Windows\" / \"Protection contre les virus et menaces\"."
 Encoder.Error="Impossible d'ouvrir %1: %2"
 Encoder.Timeout="L'encodeur %1 met trop de temps à encoder (délai d'expiration : %2 secondes)"
-AMF.Error="Impossible d'ouvrir le codec AMF : %1"
-AMF.GenericError="Essayez d'installer la dernière version des <a href=\"https://obsproject.com/go/amd-drivers\">pilotes AMD</a> et de fermer les autres logiciels d'enregistrement qui pourraient utiliser l'encodeur AMD comme le logiciel Radeon ou Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS ne prend pas en charge la sortie 8 bits de la Rec. 2100."
 AMF.10bitUnsupportedAvc="Impossible d'effectuer l'encodage 10-bit sur l'encodeur AMD H.264."
+AMF.16bitUnsupported="Impossible d'effectuer un encodage sur 16 bits avec cet encodeur."
 NVENC.Error="Impossible d'ouvrir le codec NVENC : %1"
 NVENC.GenericError="Essayez d'installer la dernière version des <a href=\"https://obsproject.com/go/nvidia-drivers\">pilotes NVIDIA</a> et de fermer les autres logiciels d'enregistrement qui pourraient utiliser NVENC comme NVIDIA ShadowPlay ou Windows Game DVR."
 NVENC.BadGPUIndex="Vous avez sélectionné le GPU %1 dans les paramètres de l'encodeur de sortie. Changez la valeur à 0 et réessayez."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/gd-GB.ini Changed

@@ -7,7 +7,6 @@
 Lossless="Gun chall càileachd"
 Level="Leibheil"
 BFrames="Frèamaichean-B as motha"
-VAAPI.Codec="Codec VAAPI"
 VAAPI.Device="Uidheam VAAPI"
 NVENC.LookAhead="Coimhead roimhe"
 NVENC.LookAhead.ToolTip="Cuiridh seo frèamaichean-B innsgineach an comas.\n\nMa tha seo à comas, cleachdaidh an t-inneal-còdachaidh an àireamh de fhrèamaichean-B a chaidh a shònrachadh san roghainn “Frèamaichean-B as motha” an-còmhnaidh.\n\nMa tha seo an comas, cuiridh e ris a’ chàileachd lèirsinneach a’ cleachdadh an àireamh sa fhrèamaichean-B air a bhios feum a-mhàin gu ruige na h-àireimh as àirde\nagus pàighidh thu dha le barrachd cleachdadh a’ GPU."
@@ -22,7 +21,6 @@
 BufferingMB="Bufair an lìonraidh"
 HardwareDecode="Cleachd dì-chòdachadh bathair-chruaidh ma bhios e ri fhaighinn"
 ClearOnMediaEnd="Na seall dad nuair a bhios a’ chluiche deiseil"
-Advanced="Adhartach"
 RestartWhenActivated="Ath-thòisich a’ chluiche nuair a thig gnìomh on tùs"
 CloseFileWhenInactive="Dùin am faidhle mur eil gnìomh ann"
 CloseFileWhenInactive.ToolTip="Dùinidh seo am faidhle mur eil an tùs ’ga shealltainn air an t-sruthadh no clàradh\n. Gabhaidh am faidhle atharrachadh le seo nuair nach eil an tùs gnìomhach,\nach dh’fhaoidte gum bi dàil bheag ’ga thòiseachadh nuair a thèid an tùs a ghnìomhachadh a-rithist."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/gl-ES.ini Changed

@@ -8,7 +8,6 @@
 Lossless="Sen perdas"
 Level="Nivel"
 BFrames="Máximo de B-frames"
-VAAPI.Codec="Códec VAAPI"
 VAAPI.Device="Dispositivo VAAPI"
 NVENC.LookAhead="Previsión"
 NVENC.LookAhead.ToolTip="Activar B-frames dinámicos.\n\nSe está desactivado, o codificador empregará sempre o número de B-frames especificados na configuración «Máximo de B-frames».\n\nSe está activado, aumentará a calidade visual empregando só a cantidade de B-frames necesarios, ata o máximo,\nco custo do aumento de emprego da GPU."
@@ -27,7 +26,6 @@
 BufferingMB="Memoria intermedia de rede"
 HardwareDecode="Utilizar a descodificación por hárdware cando estiver dispoñíbel"
 ClearOnMediaEnd="Non amosar nada ao rematar a reprodución"
-Advanced="Avanzado"
 RestartWhenActivated="Reiniciar a reprodución cando fonte estea activa"
 CloseFileWhenInactive="Pechar o ficheiro cando estea inactivo"
 CloseFileWhenInactive.ToolTip="Pecha o ficheiro cando a fonte non se está a amosar na emisión ou na\ngravación. Isto permite cambiar o ficheiro cando a fonte non está activa,\nmais pode haber algún atraso de inicio cando se reactive a fonte."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/he-IL.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="פלט FFmpeg"
+FFmpegMuxer="מרבב FFmpeg"
+FFmpegHlsMuxer="מרבב HLS של FFmpeg"
+FFmpegMpegtsMuxer="מרבב FFmpeg MPEG-TS"
 FFmpegALAC="FFmpeg ALAC (24 סיביות)"
 FFmpegFLAC="FFmpeg FLAC (16 סיביות)"
 FFmpegPCM16Bit="FFmpeg PCM (16 סיביות)"
@@ -15,10 +18,11 @@
 KeyframeIntervalSec="מרווח תמונות מפתח (0=אוטומטי)"
 Lossless="ללא אובדן נתונים"
 Level="רמה"
+FilePath="נתיב קובץ"
 AMFOpts="אפשרויות AMF/FFmpeg"
 AMFOpts.ToolTip="עבור הוספת אפשרויות מותאמות אישית עבור AMF או FFmpeg. לדוגמה, \"level=5.2 profile=main\". לפרטים נוספים יש לעיין במסמכי המקודד."
+GPU="מעבד גרפי"
 BFrames="מקסימום B-פריימים"
-VAAPI.Codec="מפענח VAAPI"
 VAAPI.Device="מכשיר VAAPI"
 NVENC.LookAhead.ToolTip="מאפשר B-פריימים דינאמיים.\n\nאם מבוטל, המקודד ישתמש תמיד במספר ה-B-פריימים המצויין בהגדרה 'מקסימום B-פריימים'.\n\nאם מאופשר, המקודד יוכל לשפר את איכות התמונה ע\"י שימוש רק במספר ה-B-פריימים הנדרש, לא יותר מהמקסימום,\nבמחיר של שימוש נוסף ב-GPU."
 NVENC.PsychoVisualTuning.ToolTip="מאפשר הגדרות מקודד שמבצעות מיטוב של קצב הנתונים עבור איכות התמונה המורגשת,\nבמיוחד במצבים עם תנועה מרובה, במחיר של שימוש נוסף ב-GPU."
@@ -26,7 +30,8 @@
 NVENC.8bitUnsupportedHdr="OBS לא תומך בפלט 8 סיביות עם Rec. 2100."
 NVENC.I010Unsupported="NVENC לא תומך ב־I010. יש להשתמש ב־P010 במקום."
 NVENC.10bitUnsupported="לא ניתן לבצע הצפנה של 10 סיביות במצפין הזה."
-NVENC.TooManyBFrames="הגדרת ה־B-פריימים המרבית (%d) גדולה ממה שתומך המצפין (%d)."
+NVENC.16bitUnsupported="לא ניתן לבצע הצפנה של 16 סיביות במצפין הזה."
+NVENC.NoAV1FallbackPossible="קידוד AV1 לא זמין עם ההגדרות הנוכחיות. כדאי לנסות להשבית אפשרויות שינוי קנה מידה או מעבד גרפי שעשויות להיות מוגדרות. אפשר לעיין ביומן לפרטים נוספים."
 NVENC.Preset2.p1="P1: המהיר ביותר (האיכות הנמוכה ביותר)"
 NVENC.Preset2.p2="P2: מהיר יותר (איכות נמוכה יותר)"
 NVENC.Preset2.p3="P3: מהיר (איכות נמוכה)"
@@ -53,7 +58,6 @@
 BufferingMB="מטמון רשת"
 HardwareDecode="השתמש בפענוח חומרה כאשר היא זמין"
 ClearOnMediaEnd="לא להראות כלום כאשר הניגון מסתיים"
-Advanced="מתקדם"
 RestartWhenActivated="הפעל מחדש השמעה כאשר מקור הופך לפעיל"
 CloseFileWhenInactive="סגירת הקובץ כאשר לא פעיל"
 CloseFileWhenInactive.ToolTip="הקובץ ייסגר כאשר המקור לא מוצג בשידור החי או\nההקלטקה. זה מאפשר שינוי של הקובץ כאשר המקור אינו פעיל,\nאבל עשוי לגרום להשהייה בהתחלה כאשר המקור מופעל מחדש."
@@ -79,10 +83,9 @@
 WarnWindowsDefender="אם הגנת כופרה של ווינדוס 10 מופעלת זה עלול לגרום לשגיאה זו. יש לנסות לכבות את הגישה המבוקרת לתיקיות ב-אבטחת ווינדוס / הגדרות הגנה מפני וירוסים ואיומים."
 Encoder.Error="הפתיחה של %1 נכשלה: %2"
 Encoder.Timeout="למצפין %1 לוקח זמן רב להצפין (זמן קצוב: %2 שניות)"
-AMF.Error="פתיחת מפענח ה־AMF נכשלה: %1"
-AMF.GenericError="כדאי לנסות להתקין את <a href=\"https://obsproject.com/go/amd-drivers\">מנהל ההתקן העדכני ביותר של AMD</a> ולסגור תוכנות הקלטה אחרות שעלולות להשתמש במצפין של AMD כגון התוכנה של Radeon או Game DVR של Windows."
 AMF.8bitUnsupportedHdr="OBS לא תומך בפלט 8 סיביות עם Rec. 2100."
 AMF.10bitUnsupportedAvc="לא ניתן לבצע הצפנה של 10 סיביות במצפין AMD H.264."
+AMF.16bitUnsupported="לא ניתן לבצע הצפנה של 16 סיביות במצפין הזה."
 NVENC.Error="פתיחת מפענח ה־NVENC נכשלה: %1"
 NVENC.GenericError="כדאי לנסות להתקין את <a href=\"https://obsproject.com/go/nvidia-drivers\">מנהל ההתקן העדכני ביותר של NVIDIA</a> ולסגור תוכנות הקלטה אחרות שעלולות להשתמש ב־NVENC כגון ShadowPlay של NVIDIA או Game DVR של Windows."
 NVENC.BadGPUIndex="בחרת ב-GPU %1 בהגדרות פלט המקודד שלך. יש להגדיר שוב ל-0 ולנסות שוב."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/hi-IN.ini Changed

@@ -1,4 +1,12 @@
 FFmpegOutput="FFmpeg आउटपुट"
+FFmpegMuxer="FFmpeg मक्सर"
+FFmpegHlsMuxer="FFmpeg HLS मक्सर"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS मक्सर"
+FFmpegALAC="FFmpeg ALAC (24-बिट्)"
+FFmpegFLAC="FFmpeg FLAC (16-बिट्)"
+FFmpegPCM16Bit="FFmpeg PCM (16-बिट्)"
+FFmpegPCM24Bit="FFmpeg PCM (24-बिट्)"
+FFmpegPCM32BitFloat="FFmpeg PCM (32-बिट् फ़्लोट)"
 FFmpegOpts="FFmpeg विकल्प"
 FFmpegOpts.ToolTip.Source="आपको FFmpeg विकल्प सेट करने की अनुमति देता है. यह केवल विकल्प=मान प्रारूप में विकल्पों को स्वीकार करता है.\nएक से अधिक विकल्पों को एक रिक्त स्थान से अलग करके सेट किया जा सकता है.\nउदाहरण : rtsp_transport=tcp rtsp_flags=prefer_tcp"
 Bitrate="बिटरेट"
@@ -10,10 +18,10 @@
 KeyframeIntervalSec="कीफ़्रेम अंतराल (0=स्वतः)"
 Lossless="दोषरहित"
 Level="स्तर"
+FilePath="फ़ाइल पथ"
 AMFOpts="AMF/FFmpeg विकल्प"
 AMFOpts.ToolTip="कस्टम AMF या FFmpeg विकल्प निर्दिष्ट करने के लिए उपयोग करें.उदाहरण के लिए, \"स्तर=5.2 प्रोफ़ाइल=मुख्य\". अधिक जानकारी के लिए AMF एनकोडर डॉक्स देखें."
 BFrames="महत्तम बी-फ्रेम्स"
-VAAPI.Codec="VAAPI कोडेक"
 VAAPI.Device="VAAPI डिवाइस"
 NVENC.LookAhead="आगे-पढ़ें"
 NVENC.LookAhead.ToolTip="गतिशील बी-फ़्रेम सक्षम करता है.\n\nयदि अक्षम है, तो एन्कोडर हमेशा 'महत्तम बी-फ़्रेम' सेटिंग में निर्दिष्ट बी-फ़्रेम की संख्या का उपयोग करेगा.\n\nयदि सक्षम है, तो यह केवल आवश्यक से अधिकतम तक बी-फ़्रेम का उपयोग करके दृश्य गुणवत्ता में वृद्धि करेगा,\nबढ़ी हुई GPU उपयोग की कीमत पर."
@@ -23,7 +31,8 @@
 NVENC.8bitUnsupportedHdr="Rec. 2100 के 8-बिट् आउटपुट को OBS सपोर्ट नहीं करता है."
 NVENC.I010Unsupported="NVENC I010 का समर्थन नहीं करता है. इसके बजाय P010 का प्रयोग करें."
 NVENC.10bitUnsupported="इस एन्कोडर पर 10-बिट एन्कोड नहीं किया जा सकता."
-NVENC.TooManyBFrames="अधिकतम B-फ़्रेम सेटिंग (%d) एन्कोडर समर्थन (%d) से अधिक है."
+NVENC.16bitUnsupported="इस एन्कोडर पर 16-बिट् एन्कोड नहीं किया जा सकता."
+NVENC.NoAV1FallbackPossible="AV1 एन्कोडिंग वर्तमान सेटिंग्स के साथ उपलब्ध नहीं है. सेट किए जा सकने वाले किसी भी री-स्केलिंग या GPU विकल्प को अक्षम करने का प्रयास करें.अधिक विवरण के लिए लॉग जांचें."
 NVENC.Preset2.p1="P1: सबसे तेज (निम्नतम गुणवत्ता)"
 NVENC.Preset2.p2="P2: तेज (निम्नतर गुणवत्ता)"
 NVENC.Preset2.p3="P3: तेज (निम्नतम गुणवत्ता)"
@@ -50,7 +59,6 @@
 BufferingMB="नेटवर्क बफ़रिंग"
 HardwareDecode="यदि उपलब्ध हो तो हार्डवेयर डिकोडिंग का उपयोग करें"
 ClearOnMediaEnd="प्लेबैक समाप्त होने पर कुछ भी न दिखाएं"
-Advanced="उन्नत"
 RestartWhenActivated="स्रोत के सक्रिय होने पर प्लेबैक पुनः प्रारंभ करें"
 CloseFileWhenInactive="निष्क्रिय होने पर फ़ाइल बंद करें"
 CloseFileWhenInactive.ToolTip="जब स्रोत, स्ट्रीम या\nरिकॉर्डिंग पर प्रदर्शित नहीं हो रहा हो तो फ़ाइल को बंद कर देता है.\nयह स्रोत के सक्रिय न होने पर फ़ाइल को बदलने की अनुमति देता है,\nलेकिन स्रोत के पुन: सक्रिय होने पर कुछ आरंभिक विलंब हो सकता है."
@@ -76,10 +84,15 @@
 WarnWindowsDefender="यदि विंडोज 10 रैंसमवेयर प्रोटेक्शन सक्षम है तो यह इस त्रुटि का कारण भी बन सकता है. विंडोज सुरक्षा / वायरस व खतरे से सुरक्षा सेटिंग्स में नियंत्रित फ़ोल्डर पहुंच को बंद करने का प्रयास करें."
 Encoder.Error="%1: %2 खोलने में विफल"
 Encoder.Timeout="एन्कोडर %1 को एन्कोड करने में बहुत अधिक समय लग रहा है (समयसीमा : %2 सेकंड)"
-AMF.Error="AMF कोडेक खोलने में विफल : %1"
 AMF.8bitUnsupportedHdr="Rec. 2100 के 8-बिट् आउटपुट को OBS सपोर्ट नहीं करता है."
 AMF.10bitUnsupportedAvc="AMD H.264 एन्कोडर पर 10-बिट् एन्कोड नहीं किया जा सकता."
+AMF.16bitUnsupported="इस एन्कोडर पर 16-बिट् एन्कोड नहीं किया जा सकता."
 NVENC.Error="NVENC कोडेक खोलने में विफल : %1"
+NVENC.GenericError="नवीनतम <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA ड्राइवर</a> स्थापित करने का प्रयास करें और अन्य रिकॉर्डिंग सॉफ़्टवेयर को बंद करें जो NVENC का उपयोग कर रहे हों जैसे कि NVIDIA ShadowPlay या विंडोज गेम DVR."
 NVENC.BadGPUIndex="आपने अपनी आउटपुट एन्कोडर सेटिंग में GPU %1 का चयन किया है. इसे वापस 0 पर सेट करें और पुन: प्रयास करें."
+NVENC.OutdatedDriver="स्थापित NVIDIA ड्राइवर इस NVENC संस्करण का समर्थन नहीं करता है, <a href=\"https://obsproject.com/go/nvidia-drivers\">ड्राइवर को अपडेट करने का प्रयास करें</a>."
+NVENC.UnsupportedDevice="NVENC त्रुटि: असमर्थित डिवाइस. जांचें कि आपका वीडियो कार्ड <a href='https://obsproject.com/go/nvenc-matrix'>NVENC का समर्थन करता है</a> और <a href=\"https://obsproject.com/go/nvidia-drivers\"> से ड्राइवर को अपडेट करने का प्रयास करें</a>।"
+NVENC.TooManySessions="NVENC त्रुटि: बहुत सारे समवर्ती सत्र. अन्य रिकॉर्डिंग सॉफ़्टवेयर को बंद करने का प्रयास करें जो NVENC का उपयोग कर रहे हों जैसे कि NVIDIA शैडोप्ले या Windows गेम DVR"
+NVENC.CheckDrivers="नवीनतम <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA ड्राइवर</a> स्थापित करने का प्रयास करें."
 AV1.8bitUnsupportedHdr="Rec. 2100 के 8-बिट् आउटपुट को OBS सपोर्ट नहीं करता है."
 ReconnectDelayTime="रीकनेक्ट विलंब"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/hr-HR.ini Changed

@@ -6,24 +6,30 @@
 FFmpegPCM32BitFloat="FFmpeg PCM (32-bitno)"
 Bitrate="Protok"
 Preset="Šablon"
+Profile="Profil"
 RateControl="Kontrola protoka"
 Lossless="Bez gubitka"
+NVENC.16bitUnsupported="16-bitno kodiranje ne može se izvršiti tim enkoderom."
+NVENC.NoAV1FallbackPossible="AV1 kodiranje nije dostupno uz trenutačne postavke. Onemogućite bilo kakvo ponovno skaliranje ili postavke GPU-a. Provjerite zapisnike za više informacija."
+AMF.Preset.quality="Kvaliteta"
+AMF.Preset.highQuality="Visoka kvaliteta"
 FFmpegSource="Medija izvor"
 LocalFile="Lokalna datoteka"
 Looping="Ponavljanje"
 Input="Ulaz"
 InputFormat="Format ulaza"
 HardwareDecode="Koristi hardversko enkodiranje kada je dostupno"
-Advanced="Napredno"
 RestartWhenActivated="Ponovi reprodukciju kada izvor postane aktivan"
+CloseFileWhenInactive="Zatvori datoteku kad je neaktivna"
 ColorRange="YUV opseg boja"
 ColorRange.Auto="Automatski"
 ColorRange.Full="Potpuni"
+SpeedPercentage="Brzina"
 MediaFileFilter.AllMediaFiles="Sve medija datoteke"
 MediaFileFilter.VideoFiles="Video datoteke"
 MediaFileFilter.AudioFiles="Zvučne datoteke"
 MediaFileFilter.AllFiles="Sve datoteke"
-AMF.GenericError="Pokušajte instalirati najnoviji <a href=\"https://obsproject.com/go/amd-drivers\">upravljački program AMD</a> i zatvoriti ostale programe za snimanje koji bi mogli upotrebljavati enkoder za AMD poput Radeon Softwarea ili Windows Game DVR-a."
+AMF.16bitUnsupported="16-bitno kodiranje ne može se izvršiti tim enkoderom."
 NVENC.GenericError="Pokušajte instalirati najnoviji <a href=\"https://obsproject.com/go/nvidia-drivers\">upravljački program NVIDIA</a> i zatvoriti ostale programe za snimanje koji bi mogli upotrebljavati NVENC poput NVIDIA ShadowPlaya ili Windows Game DVR-a."
 NVENC.OutdatedDriver="Instalirani upravljački program NVIDIA ne podržava ovu verziju NVENC-a, pokušajte <a href=\"https://obsproject.com/go/nvidia-drivers\">nadograditi upravljački program</a>."
 NVENC.UnsupportedDevice="NVENC greška: Nepodržani uređaj. Osigurajte da grafička kartica <a href=\"https://obsproject.com/go/nvenc-matrix\">podržava NVENC</a> i pokušajte <a href=\"https://obsproject.com/go/nvidia-drivers\">nadograditi upravljački program</a>."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/hu-HU.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg kimenet"
+FFmpegMuxer="FFmpeg muxer"
+FFmpegHlsMuxer="FFmpeg HLS muxer"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS muxer"
 FFmpegALAC="FFmpeg ALAC (24 bites)"
 FFmpegFLAC="FFmpeg FLAC (16 bites)"
 FFmpegPCM16Bit="FFmpeg PCM (16 bites)"
@@ -15,6 +18,7 @@
 KeyframeIntervalSec="Kulcsképkockák időköze (0=automatikus)"
 Lossless="Veszteségmentes"
 Level="Szint"
+FilePath="Fájl elérési útja"
 AMFOpts="AMF/FFmpeg beállítások"
 AMFOpts.ToolTip="Egyéni AMF vagy FFmpeg beállítások megadására használható. Például: \"level=5.2 profile=main\". További részletekért tekintse meg az AMF kódoló dokumentumait."
 BFrames="Max B-kockák"
@@ -27,7 +31,8 @@
 NVENC.8bitUnsupportedHdr="Az OBS nem támogatja a Rec. 2100 8 bites kimenetét."
 NVENC.I010Unsupported="Az NVENC nem támogatja az I010 formátumot. Használja inkább a P010 formátumot."
 NVENC.10bitUnsupported="Nem lehet 10 bites kódolást végezni ezen a kódolón."
-NVENC.TooManyBFrames="A maximális B-kocka beállítás (%d) több, mint amit a kódoló támogat (%d)."
+NVENC.16bitUnsupported="Nem lehet 16 bites kódolást végezni ezen a kódolón."
+NVENC.NoAV1FallbackPossible="Az AV1 kódolás nem érhető el a jelenlegi beállításokkal. Próbálja letiltani az esetlegesen beállított átméretezést vagy az egyéb GPU beállításokat. További részletekért nézze meg a naplót."
 NVENC.Preset2.p1="P1: Leggyorsabb (legalacsonyabb minőség)"
 NVENC.Preset2.p2="P2: Gyorsabb (alacsonyabb minőség)"
 NVENC.Preset2.p3="P3: Gyors (alacsony minőség)"
@@ -54,7 +59,6 @@
 BufferingMB="Hálózati pufferelés"
 HardwareDecode="Hardveres dekódolás használata, ha rendelkezésre áll"
 ClearOnMediaEnd="Semmit se mutasson, a lejátszás végeztével"
-Advanced="Haladó"
 RestartWhenActivated="Lejátszás újraindítása, ha a forrás aktivizálódik"
 CloseFileWhenInactive="Fájl bezárása ha tétlen"
 CloseFileWhenInactive.ToolTip="Bezárja a fájlt, ha a forrás nem aktív streamen vagy\nfelvételen. Ez lehetővé teszi, hogy a fájlt meg kell változtatni, ha a forrás nem aktív, a \nviszont felléphet némi indítási késés, ha a forrás reaktiválódik."
@@ -72,17 +76,16 @@
 MediaFileFilter.VideoFiles="Videofájlok"
 MediaFileFilter.AudioFiles="Hangfájlok"
 MediaFileFilter.AllFiles="Minden fájl"
-ReplayBuffer="Visszajátszás puffer"
+ReplayBuffer="Visszajátszási puffer"
 ReplayBuffer.Save="Visszajátszás mentése"
 HelperProcessFailed="Nem lehet indítani a felvétel segítő folyamatot. Ellenőrizze, hogy az OBS fájlok nincsenek e blokkolva vagy eltávolítva bármilyen harmadik féltől származó antivírus / biztonsági szoftver által."
 UnableToWritePath="A(z) %1 nem írható. Győződjön meg róla, hogy a felhasználói fiók írhat-e a felvételek elérési útjára, és hogy elegendő lemezterület áll-e rendelkezésre."
 WarnWindowsDefender="Amennyiben a Windows 10 Ransomware Védelem aktiválva van, úgy az is képes ezt a hibát generálni. Adja hozzá a kontrollált könyvtárlistához a Windows Biztonság / Vírus és fenyegetésvédelem beállítások között."
 Encoder.Error="A(z) %1 megnyitása sikertelen: %2"
 Encoder.Timeout="A(z) %1 kódoló túl sok időt tölt a kódolással (időtúllépés: %2 másodperc)"
-AMF.Error="Nem sikerült megnyitni az AMF kodeket: %1"
-AMF.GenericError="Próbálja telepíteni a legfrissebb <a href=\"https://obsproject.com/go/amd-drivers\">AMD illesztőprogramot</a> és zárja be a többi rögzítési szoftvert, amely az AMD kódolót használhatja, mint például a Radeon Software vagy a Windows Game DVR."
 AMF.8bitUnsupportedHdr="Az OBS nem támogatja a Rec. 2100 8 bites kimenetét."
 AMF.10bitUnsupportedAvc="Nem lehet 10 bites kódolást végezni az AMD H.264 kódolón."
+AMF.16bitUnsupported="Nem lehet 16 bites kódolást végezni ezen a kódolón."
 NVENC.Error="Nem sikerült megnyitni az NVENC kodeket: %1"
 NVENC.GenericError="Próbálja telepíteni a legfrissebb <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA illesztőprogramot</a> és zárja be a többi rögzítési szoftvert, amely az NVENC kódolót használhatja, mint például az NIVIDIA ShadowPlay vagy a Windows Game DVR."
 NVENC.BadGPUIndex="A kimeneti kódoló beállításaiban kiválasztotta a %1 GPU-t. Állítsa vissza 0-ra, és próbálja újra."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/hy-AM.ini Changed

@@ -1,4 +1,9 @@
 FFmpegOutput="FFmpeg արդյունք"
+FFmpegALAC="FFmpeg ALAC (24-բիթ)"
+FFmpegFLAC="FFmpeg FLAC (16-բիթ)"
+FFmpegPCM16Bit="FFmpeg PCM (16-բիթ)"
+FFmpegPCM24Bit="FFmpeg PCM (24-բիթ)"
+FFmpegPCM32BitFloat="FFmpeg PCM (32-բիթ լողացող)"
 FFmpegOpts="FFmpeg-ի կարգավորումներ"
 FFmpegOpts.ToolTip.Source="Թույլ է տալիս սահմանել FFmpeg ընտրանքներ: Սա ընդունում է միայն option=value ձևաչափի տարբերակները:\nԲազմաթիվ տարբերակներ կարող են սահմանվել՝ դրանք բացատով բաժանելով:\nՕրինակ՝ rtsp_transport=tcp rtsp_flags=prefer_tcp"
 Bitrate="Բիթրեյթ"
@@ -10,10 +15,10 @@
 KeyframeIntervalSec="Հիմնական կադրերի ընդմիջում (0=ավտոմատ)"
 Lossless="Անկորուստ"
 Level="Մակարդակ"
+FilePath="Ֆայլի ուղին"
 AMFOpts="AMF/FFmpeg ընտրանքներ"
 AMFOpts.ToolTip="Օգտագործեք անհատական AMF կամ FFmpeg կայանքները։ Օրինակ, \"level=5.2 profile=main\"։ Ստուգեք AMF ծածկագրիչը հավելյալ տվյալների համար։"
 BFrames="Առավ. B-կադրերի քանակը"
-VAAPI.Codec="VAAPI կոդեկ"
 VAAPI.Device="VAAPI սարք"
 NVENC.LookAhead="Գուշակություն (Look-ahead)"
 NVENC.LookAhead.ToolTip="Միացնում է դինամիկ B կադրերը:\n\nԵթե անջատված է, կոդավորիչը միշտ կօգտագործի «Առավ. B-կադրերի քանակը'։\n\nԵթե միացված է, սա կբարձրացնի պատկերի տեսողական որակը՝ օգտագործելով ցանկացած թվով B կադրեր, մինչև առավելագույնը,\nԿՄՀի օգտագործումը մեծացնելու հաշվին:"
@@ -23,7 +28,8 @@
 NVENC.8bitUnsupportedHdr="OBS-ը չի աջակցում 8-բիթ Rec. 2100-ի ելքը"
 NVENC.I010Unsupported="NVENC-ը չի աջակցում I010-ը։ Դրա փոխարեն օգտագործեք P010։"
 NVENC.10bitUnsupported="Հնարավոր չէ կատարել 10-բիթանոց կոդավորում այս կոդավորիչի վրա."
-NVENC.TooManyBFrames="B-կադրերի առավելագույն կարգավորումը (%d) ավելին է, քան կոդավորողի աջակցումը (%d)."
+NVENC.16bitUnsupported="Հնարավոր չէ կատարել 16-բիթանոց կոդավորում այս կոդավորիչի վրա։"
+NVENC.NoAV1FallbackPossible="AV1 կոդավորումը հասանելի չէ ընթացիկ կարգավորումներով: Փորձեք անջատել ցանկացած փոփոխական մասշտաբի կամ GPU կարգավորում, որը կարող է սահմանվել: Ստուգեք գրանցամատյանը լրացուցիչ մանրամասների համար։"
 NVENC.Preset2.p1="P1: Ամենաարագ (Ցածր որակ)"
 NVENC.Preset2.p2="P2: Ավելի արագ (Ավելի ցածր որակ)"
 NVENC.Preset2.p3="P3: Արագ (Ցածր որակ)"
@@ -50,7 +56,6 @@
 BufferingMB="Ցանցի բուֆերացում"
 HardwareDecode="Հնարավորության դեպքում օգտագործեք ապարատային ապակոդավորում"
 ClearOnMediaEnd="Ցույց տալ ոչինչ, երբ նվագարկումն ավարտվի"
-Advanced="Լրացուցիչ"
 RestartWhenActivated="Վերագործարկեք նվագարկումը, երբ աղբյուրը ակտիվանա"
 CloseFileWhenInactive="Փակել ֆայլը, երբ գործունեություն չկա"
 CloseFileWhenInactive.ToolTip="Փակում է ֆայլը, երբ աղբյուրը տեսանելի չէ հեռարձակման կամ ձայնագրման ընթացքում:\nՍա թույլ է տալիս փոփոխել ֆայլը, երբ աղբյուրը ակտիվ չէ, սակայն գործարկման հետաձգումները կարող են \nհայտնվել, երբ աղբյուրը նորից ակտիվացվի:"
@@ -76,10 +81,15 @@
 WarnWindowsDefender="Եթե Windows 10 Ransomware Protection-ը միացված է, դա նույնպես կարող է առաջացնել այս սխալը: Փորձեք անջատել Վերահսկվող մուտք դեպի թղթապանակներ Windows-ի անվտանգություն / պաշտպանություն վիրուսներից և սպառնալիքներից:"
 Encoder.Error="Չհաջողվեց բացել %1: %2"
 Encoder.Timeout="%1 կոդավորիչը չափազանց երկար է կոդավորումը (ժամկետը սպառվելու է՝ %2 վայրկյան)"
-AMF.Error="Չհաջողվեց բացել AMF կոդեկը: %1"
 AMF.8bitUnsupportedHdr="OBS-ը չի աջակցում 8-բիթ Rec. 2100-ի ելքը"
 AMF.10bitUnsupportedAvc="Հնարավոր չէ կատարել 10-բիթանոց կոդավորում AMD H.264 կոդավորիչի վրա։"
+AMF.16bitUnsupported="Հնարավոր չէ կատարել 16-բիթանոց կոդավորում այս կոդավորիչի վրա:"
 NVENC.Error="Չհաջողվեց բացել NVENC կոդեկը: %1"
+NVENC.GenericError="Փորձեք տեղադրել վերջին <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA դրայվերը</a> և փակել ձայնագրման այլ ծրագրեր, որոնք կարող են օգտագործել NVENC, օրինակ՝ NVIDIA ShadowPlay կամ Windows Game DVR:"
 NVENC.BadGPUIndex="Դուք ընտրել եք վիդեո քարտի համարը %1 կոդավորման կարգավորումներում: Ընտրեք գրաֆիկական քարտի համարը 0 և նորից փորձեք:"
+NVENC.OutdatedDriver="Տեղադրված NVIDIA դրայվերը չի աջակցում այս NVENC տարբերակը, փորձեք <a href=\"https://obsproject.com/go/nvidia-drivers\">թարմացնել դրայվերը</a>:"
+NVENC.UnsupportedDevice="NVENC սխալ. չաջակցվող սարք: Ստուգեք, որ ձեր վիդեո քարտը <a href=\"https://obsproject.com/go/nvenc-matrix\">աջակցում է NVENC</a> և փորձեք <a href=\"https://obsproject.com/go/nvidia-drivers\">թարմացնել դրայվերը</a>:"
+NVENC.TooManySessions="NVENC Սխալ. չափազանց շատ միաժամանակյա նիստեր: Փորձեք փակել ձայնագրման այլ ծրագրեր, որոնք կարող են օգտագործել NVENC, օրինակ՝ NVIDIA ShadowPlay կամ Windows Game DVR:"
+NVENC.CheckDrivers="Փորձեք տեղադրել վերջին <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA դրայվերի տարբերակը</a>:"
 AV1.8bitUnsupportedHdr="OBS-ը չի աջակցում 8-բիթ Rec. 2100-ի ելքը"
 ReconnectDelayTime="Վերամիացման հետաձգում"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/id-ID.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Output FFmpeg"
+FFmpegMuxer="Muxer FFmpeg"
+FFmpegHlsMuxer="Muxer HLS FFmpeg"
+FFmpegMpegtsMuxer="Muxer MPEG-TS FFmpeg"
 FFmpegOpts="Pengaturan FFmpeg"
 FFmpegOpts.ToolTip.Source="Memungkinkan Anda untuk mengatur opsi FFmpeg. Opsi ini hanya menerima dalam format option=value.\nOpsi ganda dapat diatur dengan memisahkan nya dengan spasi.\nContoh: rtsp_transport=tcp rtsp_flags=prefer_tcp"
 MaxBitrate="Maksimum Bitrate"
@@ -6,10 +9,10 @@
 Profile="Profil"
 RateControl="Kontrol Rate"
 KeyframeIntervalSec="Interval Keyframe (0=otomatis)"
+FilePath="Jalur Berkas"
 AMFOpts="Pengaturan AMF/FFmpeg"
 AMFOpts.ToolTip="Gunakan opsi sesuaian AMF atau FFmpeg tertentu. Contohnya, \"level=5.2 profile=main\". Cek dokumentasi pengkodean AMF untuk lebih detil nya."
 BFrames="Maksimum B-frame"
-VAAPI.Codec="Codec VAAPI"
 VAAPI.Device="Perangkat VAAPI"
 NVENC.LookAhead.ToolTip="Mengaktifkan B-frame dinamis.\n\nJika dinonaktifkan, pengkodean akan selalu menggunakan jumlah B-frame yang ditentukan di pengaturan 'Maksimum B-frame'.\n\nJika diaktifkan, akan meningkatkan kualitas visual dengan hanya memakai seberapa banyak B-frame yang diperlukan, hingga maksimum,\ndengan resiko peningkatan penggunaan GPU."
 NVENC.PsychoVisualTuning.ToolTip="Mengaktifkan pengaturan pengkodean yang mengoptimalkan penggunaan bitrate untuk meningkatkan kualitas visual yang dirasakan,\nterutama dalam situasi dengan motion yang tinggi, dengan resiko peningkatan penggunaan GPU."
@@ -17,7 +20,8 @@
 NVENC.8bitUnsupportedHdr="OBS tidak mendukung output 8-bit dari Rec. 2100."
 NVENC.I010Unsupported="NVENC tidak mendukung I010. Sebagai gantinya, gunakan P010."
 NVENC.10bitUnsupported="Tidak dapat melakukan meng-kode 10-bit pada pengkodean ini."
-NVENC.TooManyBFrames="Aturan Maksimum B-frames (%d) lebih dari dukungan pengkodean (%d)."
+NVENC.16bitUnsupported="Tidak dapat melakukan meng-kode 16-bit pada pengkodean ini."
+NVENC.NoAV1FallbackPossible="Pengkodean AV1 tidak tersedia dengan pengaturan saat ini. Cobalah menonaktifkan penskalaan ulang atau opsi GPU apapun yang mungkin di atur. Cek catatan nya untuk detil lebih lanjut."
 NVENC.Preset2.p1="P1: Tercepat (Kualitas Terendah)"
 NVENC.Preset2.p2="P2: Lebih Cepat (Kualitas Lebih Rendah)"
 NVENC.Preset2.p3="P3: Cepat (Kualitas Rendah)"
@@ -42,7 +46,6 @@
 BufferingMB="Buffering Jaringan"
 HardwareDecode="Gunakan decoding perangkat keras jika tersedia"
 ClearOnMediaEnd="Tidak munculkan apapun saat pemutaran berakhir"
-Advanced="Lanjutan"
 RestartWhenActivated="Ulangi pemutaran ketika sumber sudah aktif"
 CloseFileWhenInactive="Tutup berkas ketika tidak aktif"
 CloseFileWhenInactive.ToolTip="Menutup berkas ketika sumber tidak ditampilkan di streaming atau perekaman.\nIni memungkinkan berkas dapat diubah ketika sumbernya tidak aktif, tetapi\nmungkin akan ada delay pengaktifan saat sumber aktif kembali."
@@ -68,10 +71,9 @@
 WarnWindowsDefender="Jika Windows 10 Ransomware Protection diaktifkan, ini juga dapat menyebabkan kesalahan tersebut. Coba nonaktifkan akses folder yang dikontrol di pengaturan Windows Security / Pengaturan perlindungan dari virus & ancaman."
 Encoder.Error="Gagal membuka %1: %2"
 Encoder.Timeout="Pengkodean %1 terlalu lama untuk mengkodekan (timeout: %2 detik)"
-AMF.Error="Gagal untuk membuka kodek AMF: %1"
-AMF.GenericError="Coba pasang <a href=\"https://obsproject.com/go/amd-drivers\">driver AMD</a> yang terbaru dan tutup perangkat lunak perekam lainnya yang mungkin menggunakan pengkodean AMD seperti Radeon Software atau Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS tidak mendukung output 8-bit dari Rec. 2100."
 AMF.10bitUnsupportedAvc="Tidak dapat melakukan meng-kode 10-bit pada pengkodean AMD H.264."
+AMF.16bitUnsupported="Tidak dapat melakukan meng-kode 16-bit pada pengkodean ini."
 NVENC.Error="Gagal untuk membuka kodek NVENC: %1"
 NVENC.GenericError="Coba pasang <a href=\"https://obsproject.com/go/nvidia-drivers\">driver NVIDIA</a> yang terbaru dan tutup perangkat lunak perekam lainnya yang mungkin menggunakan NVENC seperti NVIDIA ShadowPlay atau Windows Game DVR."
 NVENC.BadGPUIndex="Anda telah memilih GPU %1 pada pengaturan pengkodean output. Atur ini kembali ke 0 dan coba lagi."

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/it-IT.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Uscita FFmpeg"
+FFmpegMuxer="Muxer FFmpeg"
+FFmpegHlsMuxer="Muxel HLS FFmpeg"
+FFmpegMpegtsMuxer="Muxer MPEG-TS FFmpeg"
 FFmpegALAC="ALAC FFmpeg (24 bit)"
 FFmpegFLAC="FLAC FFmpeg (16 bit)"
 FFmpegPCM16Bit="PCM FFmpeg (16 bit)"
@@ -12,10 +15,10 @@
 RateControl="Tipo di controllo della frequenza"
 KeyframeIntervalSec="Intervallo fotogramma chiave (0=automatico)"
 Level="Livello"
+FilePath="Percorso file"
 AMFOpts="Opzioni AMF/FFmpeg"
 AMFOpts.ToolTip="Specifica le opzioni AMF o FFmpeg. per esempio, \"level=5.2 profile=main\". \nPer maggiori dettagli controlla la documentazione dell'encoder AMF."
 BFrames="B-frame massimi"
-VAAPI.Codec="Codec VAAPI"
 VAAPI.Device="Dispositivo VAAPI"
 NVENC.LookAhead="Previsione (look-ahead)"
 NVENC.LookAhead.ToolTip="Attiva i B-frame dinamici.\n\nSe disattivato, la codifica utilizzerà sempre il numero di B-frame specificato nell'impostazione «B-frame massimi».\n\nSe attivato, aumenterà la qualità visiva utilizzando comunque solo i B-frame necessari,\nfino al massimo, al costo di un maggiore utilizzo della GPU."
@@ -25,8 +28,8 @@
 NVENC.8bitUnsupportedHdr="OBS non supporta l'output Rec. 2100 8bit."
 NVENC.I010Unsupported="NVENC non supporta I010. Usa invece P010."
 NVENC.10bitUnsupported="Impossibile eseguire la codifica a 10 bit con questo encoder."
-NVENC.16bitUnsupported="Impossibile eseguire la codifica a 16-bit su questo encoder."
-NVENC.TooManyBFrames="L'impostazione B-frame massimi (%d) supera i limiti dell'encoder (%d)."
+NVENC.16bitUnsupported="Impossibile con questo encoder eseguire la codifica a 16bit."
+NVENC.NoAV1FallbackPossible="Con le impostazioni attuali la codifica AV1 non è disponibile. \nProva a disabilitare eventuali opzioni di ridimensionamento o GPU che potrebbero essere impostate. \nPer maggiori dettagli controlla il registro."
 NVENC.Preset2.p1="P1: Più veloce (qualità più bassa)"
 NVENC.Preset2.p2="P1: Più Veloce (Qualità Più Bassa)"
 NVENC.Preset2.p3="P3: Veloce (Bassa Qualità)"
@@ -52,7 +55,6 @@
 BufferingMB="Buffering della rete"
 HardwareDecode="Utilizza la decodifica hardware quando disponibile"
 ClearOnMediaEnd="Non mostrare nulla quando la riproduzione finisce"
-Advanced="Avanzate"
 RestartWhenActivated="Riavvia la riproduzione quando la fonte torna attiva"
 CloseFileWhenInactive="Chiudi il file quando la fonte diventa inattiva"
 CloseFileWhenInactive.ToolTip="Chiude il file quando la fonte non viene più visualizzata nell'inquadratura.\nQuesto permette di modificare il file quando la fonte non è attiva,\nma potrebbe esserci un po' di ritardo all'avvio quando si riattiva la fonte."
@@ -77,8 +79,6 @@
 WarnWindowsDefender="Se la protezione ransomware di Windows 10 è attivata, può causare questo errore. Prova a disattivare l'accesso alle cartelle controllato, lo puoi trovare in Sicurezza di Windows → Protezione da virus e minacce → Gestisci protezione ransomware."
 Encoder.Error="Apertura di %1 non riuscita: %2"
 Encoder.Timeout="Il codificatore %1 sta impiegando troppo tempo per codificare (timeout: %2 secondi)"
-AMF.Error="Apertura del codec AMF non riuscita: %1"
-AMF.GenericError="Prova ad installare il <a href=\"https://obsproject.com/go/amd-drivers\">driver AMD più recente</a> e a chiudere altri software di registrazione che potrebbero usare l'encoder AMD come il software Radeon o Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS non supporta l'uscita Rec. 2100 8bit."
 AMF.10bitUnsupportedAvc="Impossibile eseguire la codifica a 10 bit con l'encoder AMD H.264."
 AMF.16bitUnsupported="Impossibile eseguire la codifica a 16-bit su questo encoder."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ja-JP.ini Changed

@@ -10,10 +10,10 @@
 KeyframeIntervalSec="キーフレーム間隔 (0=自動)"
 Lossless="無損失"
 Level="レベル"
+FilePath="ファイルのパス"
 AMFOpts="AMF/FFmpeg オプション"
 AMFOpts.ToolTip="カスタムAMF または FFmpegオプション を指定するために使用します。 例えば \"level=5.2 profile=main\" です。 詳細については AMFエンコーダ のドキュメントを確認してください。"
 BFrames="最大Bフレーム"
-VAAPI.Codec="VAAPI コーデック"
 VAAPI.Device="VAAPI デバイス"
 NVENC.LookAhead.ToolTip="動的Bフレームを有効にします。 \n\n無効にすると、エンコーダは常に '最大Bフレーム' 設定で指定されたBフレーム数を使用します。 \n\n有効にした場合、GPU使用率の増加を犠牲にして、\n\n最大数まで、必要な分だけ多くのBフレームを使用することで視覚的品質を向上させます。"
 NVENC.PsychoVisualTuning="心理視覚チューニング"
@@ -22,7 +22,8 @@
 NVENC.8bitUnsupportedHdr="OBSは Rec. 2100 で 8-bit 出力をサポートしていません。"
 NVENC.I010Unsupported="NVENC は I010 をサポートしていません。 代わりに P010 を使用してください。"
 NVENC.10bitUnsupported="このエンコーダでは 10-bit エンコードを実行できません。"
-NVENC.TooManyBFrames="最大Bフレーム 設定 (%d) はエンコーダがサポートしている (%d) を超えています。"
+NVENC.16bitUnsupported="このエンコーダでは 16-bit エンコードを実行できません。"
+NVENC.NoAV1FallbackPossible="現在の設定では AV1エンコーディング は利用できません。リスケーリング や GPUオプション が設定されている場合は無効にしてみてください。詳細についてはログを確認してください。"
 NVENC.Preset2.p1="P1: Fastest (最低品質)"
 NVENC.Preset2.p2="P2: Faster (より低品質)"
 NVENC.Preset2.p3="P3: Fast (低品質)"
@@ -45,7 +46,6 @@
 BufferingMB="ネットワークバッファリング"
 HardwareDecode="利用可能な場合はハードウェアデコードを使用する"
 ClearOnMediaEnd="再生終了時に何も表示しない"
-Advanced="高度な設定"
 RestartWhenActivated="ソースがアクティブになったときに再生を再開する"
 CloseFileWhenInactive="非アクティブ時にファイルを閉じる"
 CloseFileWhenInactive.ToolTip="ソースが配信または録画に表示されていないときにファイルを閉じます。\nこれによりソースが非アクティブのときにファイルを変更することができますが、\nソースが再度アクティブになる際に開始の遅延が発生することがあります。"
@@ -71,10 +71,9 @@
 WarnWindowsDefender="Windows 10 ランサムウェア保護が有効になっていると、このエラーが発生する可能性があります。Windowsのセキュリティ/ウイルス対策と脅威対策の設定で、フォルダへのアクセス制御を無効にしてみてください。"
 Encoder.Error="%1 を開けませんでした: %2"
 Encoder.Timeout="エンコーダ %1 のエンコードに時間がかかりすぎています (タイムアウト: %2 秒)"
-AMF.Error="AMF コーデックを開けませんでした: %1"
-AMF.GenericError="最新の <a href=\"https://obsproject.com/go/amd-drivers\">AMD ドライバー</a> をインストールし Radeon Software や Windows Game DVR など AMD エンコーダ を使用している可能性のある他の録画ソフトウェアを終了してみてください。"
 AMF.8bitUnsupportedHdr="OBSは Rec. 2100 で 8-bit 出力には対応していません。"
 AMF.10bitUnsupportedAvc="AMD H.264 エンコーダ では 10-bit エンコードを実行できません。"
+AMF.16bitUnsupported="このエンコーダでは 16-bit エンコードを実行できません。"
 NVENC.Error="NVENC コーデックを開けませんでした: %1"
 NVENC.GenericError="最新の <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA ドライバー</a> をインストールし NVIDIA ShadowPlay や Windows Game DVR など NVENC を使用している可能性のある他の録画ソフトウェアを終了してみてください。"
 NVENC.BadGPUIndex="出力エンコーダ設定で GPU %1 を選択しました。 これを 0 に戻してもう一度お試しください。"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ka-GE.ini Changed

@@ -1,4 +1,8 @@
 FFmpegOutput="FFmpeg-გამოტანა"
+FFmpegMuxer="FFmpeg-მფუთავი"
+FFmpegHlsMuxer="FFmpeg-HLS-მფუთავი"
+FFmpegMpegts="FFmpeg-MPEG-TS"
+FFmpegMpegtsMuxer="FFmpeg-MPEG-TS-მფუთავი"
 FFmpegALAC="FFmpeg ALAC (24-ბიტი)"
 FFmpegFLAC="FFmpeg FLAC (16-ბიტი)"
 FFmpegPCM16Bit="FFmpeg PCM (16-ბიტი)"
@@ -15,10 +19,10 @@
 KeyframeIntervalSec="საკვანძო კადრების დაშორება (0=თვითშერჩევა)"
 Lossless="უდანაკარგო"
 Level="დონე"
+FilePath="ფაილის მისამართი"
 AMFOpts="AMF/FFmpeg-პარამეტრები"
 AMFOpts.ToolTip="გამოიყენება AMF- ან FFmpeg-პარამეტრების მისათითებლად. მაგალითად, \"level=5.2 profile=main\". ვრცლად იხილეთ AMF-დამშიფრავის ცნობარში."
 BFrames="B-კადრების დასაშვები რაოდენობა"
-VAAPI.Codec="VAAPI-მშიფრავი"
 VAAPI.Device="VAAPI-მოწყობილობა"
 NVENC.LookAhead="თვითგანსაზღვრა"
 NVENC.LookAhead.ToolTip="ჩაირთვება ცვალებადი ოდენობის B-კადრები.\n\nგამორთვის შემთხვევაში დამშიფრავი ყოველთვის „B-კადრების დასაშვები რაოდენობის“ ველში მითითებულს გამოიყენებს.\n\nჩართვის შედეგად გაიზრდება გამოსახულების ხარისხი საჭირო რაოდენობის B-კადრების დამატებით უმაღლეს რაოდენობამდე\nგრაფიკული პროცესორის გაზრდილი დატვირთვის ხარჯზე."
@@ -28,7 +32,8 @@
 NVENC.8bitUnsupportedHdr="OBS-ში ვერ იქნება გამოყენებული 8-ბიტიანი გამოტანა და Rec. 2100."
 NVENC.I010Unsupported="NVENC ვერ უზრუნველყოფს I010-ს. სანაცვლოდ გამოიყენეთ P010."
 NVENC.10bitUnsupported="10-ბიტიანი დაშიფვრა ვერ მოხერხდება ამ მშიფრავით."
-NVENC.TooManyBFrames="B-კადრების უდიდესი მნიშვნელობა (%d) აღემატება მშიფრავით მხარდაჭერილს (%d)."
+NVENC.16bitUnsupported="16-ბიტიანი დაშიფვრა ვერ ხერხდება ამ მშიფრავით."
+NVENC.NoAV1FallbackPossible="AV1-დაშიფვრა მიუწვდომელია მიმდინარე პარამეტრებით. სცადეთ ზომების ცვლის ან გრაფიკული პარამეტრების გათიშვა. დაწვრილებით იხილეთ აღრიცხვები."
 NVENC.Preset2.p1="P1: უსწრაფესი (უდაბლესი ხარისხი)"
 NVENC.Preset2.p2="P2: მეტად სწრაფი (მეტად დაბალი ხარისხი)"
 NVENC.Preset2.p3="P3: სწრაფი (დაბალი ხარისხი)"
@@ -55,7 +60,6 @@
 BufferingMB="ქსელით მომარაგება"
 HardwareDecode="აპარატურული დაშიფვრის გამოყენება, ხელმისაწვდომობის შემთხვევაში"
 ClearOnMediaEnd="აღარაფერი გამოჩნდეს, ჩვენების დასრულების შემდგომ"
-Advanced="გაფართოებული"
 RestartWhenActivated="ხელახლა გაშვება წყაროს ამოქმედებისას"
 CloseFileWhenInactive="ფაილის დახურვა უმოქმედობისას"
 CloseFileWhenInactive.ToolTip="ფაილი დაიხურება, თუ წყარო არ იქნება ეთერში ან\nჩაწერაზე გაშვებული. ეს საშუალებას იძლევა შეიცვალოს ფაილი, როცა წყარო არაა მოქმედი,\nთუმცა ხელახლა ამოქმედებისას, შესაძლოა გარკვეული დროით დაყოვნებას ჰქონდეს ადგილი."
@@ -81,10 +85,9 @@
 WarnWindowsDefender="თუ ჩართულია Windows 10-ის დაცვა ფაილების მიმტაცებელი პროგრამებისგან (Ransomware), ამ შეცდომას ეგეც შეიძლება იწვევდეს. სცადეთ საქაღალდეებთან წვდომის შეზღუდვის მოხსნა, Windows-ის უსაფრთხოების ან ანტივირუსის პარამეტრებიდან."
 Encoder.Error="ვერ გაიხსნა %1: %2"
 Encoder.Timeout="დამშიფრავი %1 დიდხანს ანდომებს დაშიფვრას (დროის ამოწურვამდე: %2 წამი)"
-AMF.Error="ვერ გაიხსნა AMF-მშიფრავი: %1"
-AMF.GenericError="სცადეთ უახლესი <a href=\"https://obsproject.com/go/amd-drivers\">AMD-დრაივერის</a> დაყენება და სხვა ჩამწერი პროგრამების გათიშვა, რომლებიც შეიძლება იყენებდეს AMD-დამშიფრავს, მაგალითად, ასეთი შეიძლება იყოს Radeon Software ან Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS-ში ვერ იქნება გამოყენებული 8-ბიტიანი გამოტანა და Rec. 2100."
 AMF.10bitUnsupportedAvc="10-ბიტიანი დაშიფვრა ვერ მოხერხდება AMD-H.264-მშიფრავით."
+AMF.16bitUnsupported="16-ბიტიანი დაშიფვრა ვერ ხერხდება ამ მშიფრავით."
 NVENC.Error="ვერ გაიხსნა NVENC-მშიფრავი: %1"
 NVENC.GenericError="სცადეთ უახლესი <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA-დრაივერის</a> დაყენება და სხვა ჩამწერი პროგრამების გათიშვა, რომლებიც შეიძლება იყენებდეს NVENC-მშიფრავს, მაგალითად, ასეთი შეიძლება იყოს NVIDIA ShadowPlay ან Windows Game DVR."
 NVENC.BadGPUIndex="თქვენ გიყენიათ GPU %1 თქვენი გამოტანის დამშიფრავის პარამეტრებში. დააბრუნეთ 0 და სცადეთ ხელახლა."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/kmr-TR.ini Changed

@@ -14,7 +14,6 @@
 AMFOpts="Vebijêrkên AMF/FFmpeg"
 AMFOpts.ToolTip="Ji bo destnîşankirina vebijêrkên kesane yên AMF an FFmpeg bi kar bîne. Mînak, \"ast=5.2 profîl=sereke\". Ji bo bêtir zanyarî, pelbendên encoder AMF kontrol bike."
 BFrames="Herî zêde B-Çarçove"
-VAAPI.Codec="Şifreya VAAPI"
 VAAPI.Device="Amûra VAAPI"
 NVENC.LookAhead="Li pêş binêre"
 NVENC.LookAhead.ToolTip="Çalak dike B-çarçoveyen dînamîk.\n\nEger bêçalakkirin, kodankirî dê her dem hejmara b-çarçove ên di ahenga 'Maks B-Çarçove' de hatine diyarkirin bi kar bîne.\n\nEger çalak be, wê kalîteya dîtbarî tenê bi kar bîne ku gelek B-çarçoveyên pêwîst in, heta herî zêde,\nli bihayê bikaranîna GPU zêde dibe."
@@ -24,7 +23,7 @@
 NVENC.8bitUnsupportedHdr="OBS piştgiriyê nade deranê 8-bit ji Rec. 2100."
 NVENC.I010Unsupported="NVENC piştgiriyê nade I010. P010 bi kar bîne ji devla wê."
 NVENC.10bitUnsupported="Nikare kodkirina 10-bit li ser vê kodkerê pêk bîne."
-NVENC.TooManyBFrames="sazkariyên B-çarçove ya herî mezin (%d) ji piştgiriya Kodkera (%d) bêtir e."
+NVENC.16bitUnsupported="Nikare kodkirina 16-bit li ser vê kodkerê pêk bîne."
 NVENC.Preset2.p1="P1: Leztirîn (Kêmtirîn kalîteya)"
 NVENC.Preset2.p2="P1: Leztir (Kêmtir kalîte)"
 NVENC.Preset2.p3="P3: Lezdar (Kalîteya kêm)"
@@ -51,7 +50,6 @@
 BufferingMB="Pêşbîra demkî ya torê"
 HardwareDecode="Gava hebê vekirina kodkirinê reqalavê bi kar bîne"
 ClearOnMediaEnd="Dema ku lîstin qediya tiştek nîşan nede"
-Advanced="Pêşketî"
 RestartWhenActivated="Gava çavkanî çalak bibe, lîstinê ji nû ve bide destpêkirin"
 CloseFileWhenInactive="Gava neçalak be pelê bigire"
 CloseFileWhenInactive.ToolTip="Dema ku çavkanî li ser çem an\ngirtinî neyê nîşandan pelê bigire. Ev dihêle ku dema çavkanî ne çalak be, pel were guhertin,\nlê dema ku çavkanî ji nû ve çalak bike dibe ku hin derengbûna destpêkê be."
@@ -77,10 +75,9 @@
 WarnWindowsDefender="Ku Parastina Ransomware Windows 10 çalak be, ew dikare bibe sedema vê çewtiyê. Di sazkariyên parastina Windows Security / Vîrus & tehdîdê de têgihîştina peldanka kontrolkirî veke."
 Encoder.Error="Vekirina %1: %2 bi ser neket"
 Encoder.Timeout="Kodker %1 Demeke pir dirêj distîne heya kodkirinê dike\n(Dem: %2 çirke)"
-AMF.Error="Kodkirina AMF nehate vekirin: %1"
-AMF.GenericError="Biceribîne ku dawîtirîn <a href=\"https://obsproject.com/go/amd-drivers\">ajokerê AMD</a> saz bikî û nermalava tomarkirinê ya din ku dibe kodkera AMD bikar tîne bigirî, wekî Nermalava Radeon an jî Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS piştgiriyê nade deranê 8-bit ji Rec. 2100."
 AMF.10bitUnsupportedAvc="Nikare kodkirina 10-bit li ser kodkerê AMD H.264 pêk bîne."
+AMF.16bitUnsupported="Nikare kodkirina 16-bit li ser vê kodkerê pêk bîne."
 NVENC.Error="Kodkirina NVENC nehate vekirin: %1"
 NVENC.GenericError="Biceribîne ku dawîtirîn <a href=\"https://obsproject.com/go/nvidia-drivers\">ajokerê NVIDIA</a> saz bikî û nermalava tomarkirinê ya din ku dibe kodkera NVENC bikar tîne bigirî, wekî Nermalava NVIDIA ShadowPlay an jî Windows Game DVR."
 NVENC.BadGPUIndex="Te di sazkariyên kodkirinên deranê de GPU %1 hilbijartiye. Vê vegerîne 0 û dîsa biceribîne."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ko-KR.ini Changed

@@ -15,10 +15,10 @@
 KeyframeIntervalSec="키프레임 간격 (0=자동)"
 Lossless="무손실"
 Level="레벨"
+FilePath="파일 경로"
 AMFOpts="AMF/FFmpeg 설정"
 AMFOpts.ToolTip="AMF 또는 FFmpeg에 대한 사용자 정의 옵션을 지정합니다. 예를 들어, \"level=5.2 profile=main\". 더 자세한 내용은 AMF 인코더 문서를 참조하십시오."
 BFrames="최대 B-프레임"
-VAAPI.Codec="VAAPI 코덱"
 VAAPI.Device="VAAPI 장치"
 NVENC.LookAhead.ToolTip="동적 B-프레임을 활성화합니다.\n\n이 설정을 사용하지 않으면 인코더는 항상 지정한 수 만큼만 B-프레임을 사용합니다.\n\n이 설정을 켜면 B-프레임을 품질을 올리는데 필요한 만큼 사용하지만,\nGPU사용률이 증가합니다."
 NVENC.PsychoVisualTuning.ToolTip="비트레이트 사용을 최적화하여 영상 품질을 높일 수 있습니다.\n특히 영상 내 빠른 동작을 처리할 때 도움이 됩니다. 다만 GPU 사용률이 증가합니다."
@@ -26,7 +26,8 @@
 NVENC.8bitUnsupportedHdr="OBS는 Rec. 2100을 통한 8비트 출력을 지원하지 않습니다."
 NVENC.I010Unsupported="NVENC는 I010을 지원하지 않습니다. 대신 P010을 이용하십시오."
 NVENC.10bitUnsupported="이 인코더에서는 10비트 인코딩을 할 수 없습니다."
-NVENC.TooManyBFrames="최대 B-프레임 설정 (%d)이 인코더의 지원 범위 (%d)를 초과합니다."
+NVENC.16bitUnsupported="이 인코더에서는 16비트 인코딩을 할 수 없습니다."
+NVENC.NoAV1FallbackPossible="현재 설정에서는 AV1 인코딩을 지원하지 않습니다. 배율 재조정 설정이나 GPU 설정을 해제하십시오. 자세한 내용은 로그에서 확인하십시오."
 NVENC.Preset2.p1="P1: 가장 빠름 (최저 품질)"
 NVENC.Preset2.p2="P2: 더 빠름 (더 낮은 품질)"
 NVENC.Preset2.p3="P3: 빠름 (낮은 품질)"
@@ -35,12 +36,12 @@
 NVENC.Preset2.p6="P6: 더 느림 (더 좋은 품질)"
 NVENC.Preset2.p7="P7: 가장 느림 (최고 품질)"
 NVENC.Tuning.hq="우수한 품질"
-NVENC.Tuning.ll="낮은 지연 시간"
-NVENC.Tuning.ull="매우 낮은 지연 시간"
+NVENC.Tuning.ll="짧은 지연 시간"
+NVENC.Tuning.ull="매우 짧은 지연 시간"
 NVENC.Multipass="멀티패스 모드"
 NVENC.Multipass.disabled="1패스"
 NVENC.Multipass.qres="2패스 (1/4 해상도)"
-NVENC.Multipass.fullres="2패스 (풀 해상도)"
+NVENC.Multipass.fullres="2패스 (전체 해상도)"
 AMF.Preset.speed="속도"
 AMF.Preset.balanced="균형"
 AMF.Preset.quality="품질"
@@ -53,7 +54,6 @@
 BufferingMB="네트워크 버퍼링"
 HardwareDecode="가능한 경우 하드웨어 디코딩 사용"
 ClearOnMediaEnd="재생이 끝나면 아무 것도 표시하지 않기"
-Advanced="고급"
 RestartWhenActivated="소스가 활성화되면 재생을 다시 시작"
 CloseFileWhenInactive="비활성화 상태일 때 파일 닫기"
 CloseFileWhenInactive.ToolTip="소스가 방송이나 녹화에 표시가 되지 않으면 파일을 닫습니다.\n이 설정을 사용하면 소스가 활성화되어 있지 않을 때 파일을 수정할 수 있지만,\n다시 활성화될 때 약간의 지연이 일어날 수 있습니다."
@@ -79,10 +79,9 @@
 WarnWindowsDefender="Windows 10에서 제공하는 랜섬웨어 보호 기능이 켜져 있으면 이 오류가 일어날 수 있습니다. Windows 보안 / 바이러스 및 위협 방지 설정에서 제어된 폴더 액세스를 해제해 보십시오."
 Encoder.Error="%1 열기 실패: %2"
 Encoder.Timeout="%1 인코더가 인코딩을 하는 데 너무 오래 걸립니다 (제한 시간: %2초)"
-AMF.Error="AMF 코덱을 여는데 실패함: %1"
-AMF.GenericError="최신 <a href=\"https://obsproject.com/go/amd-drivers\">AMD 드라이버</a>를 설치하고, Radeon 소프트웨어 혹은 Windows 게임 바 캡처 기능과 같이 AMD 인코더를 사용하고 있는 다른 녹화 프로그램을 종료해 보십시오."
 AMF.8bitUnsupportedHdr="OBS는 Rec. 2100을 통한 8비트 출력을 지원하지 않습니다."
 AMF.10bitUnsupportedAvc="AMD H.264 인코더에서는 10비트 인코딩을 할 수 없습니다."
+AMF.16bitUnsupported="이 인코더에서는 16비트 인코딩을 할 수 없습니다."
 NVENC.Error="NVENC 코덱을 여는데 실패함: %1"
 NVENC.GenericError="최신 <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA 드라이버</a>를 설치하고, NVIDIA ShadowPlay 혹은 Windows 게임 바 캡처 기능과 같이 NVIDIA 인코더를 사용하고 있는 다른 녹화 프로그램을 종료해 보십시오."
 NVENC.BadGPUIndex="출력 설정 내 인코더 항목에서 GPU %1 (을)를 지정했습니다. 이 항목을 0으로 되돌린 다음 다시 시도해보세요."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ms-MY.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Output FFmpeg"
+FFmpegMuxer="Muxer FFmpeg"
+FFmpegHlsMuxer="Muxer HSL FFmpeg"
+FFmpegMpegtsMuxer="Muxer MPEG-TS FFmpeg"
 FFmpegOpts="Pilihan FFmpeg"
 FFmpegOpts.ToolTip.Source="Membolehkan anda tetapkan pilihan FFmpeg. Ia hanya menerima pilihan dalam format option=value.\nPilihan berbilang boleh ditetapkan dengan memisahkannya dengan tanda jarak.\nContohnya: rtsp_transport=tcp rtsp_flags=prefer_tcp"
 Bitrate="Kadar Bit"
@@ -10,9 +13,10 @@
 KeyframeIntervalSec="Sela Bingkai Kunci (0=auto)"
 Lossless="Tak Hilang"
 Level="Tahap"
+FilePath="Laluan Fail"
 AMFOpts="Pilihan AMF/FFmpeg"
+AMFOpts.ToolTip="Digunakan untuk menentukan pilihan AMF atau FFmpeg suai. Contohnya, \"level=5.2 profile=main\". Sila rujuk dokumentasi AMF encoder untuk maklumat lanjut."
 BFrames="Bingkai-B Maks"
-VAAPI.Codec="Kodeks VAAPI"
 VAAPI.Device="Peranti VAAPI"
 NVENC.LookAhead.ToolTip="Benarkan Bingkai-B dinamik\n\nJika dilumpuhkan, pengekod akan sentiasa menggunakan bilangan Bingkai-B yang dinyatakan dalma tetapan 'Bingkai-B Maks;.\n\nJika dibenarkan, ia akan meningkatkan kualiti visual jika hanya menggunakan banyak Bingkai-B yang diperlukan,\nsehingga maksimum pada kos penggunaan GPU bertambah."
 NVENC.PsychoVisualTuning="Penalaan Maya Psiko"
@@ -21,10 +25,12 @@
 NVENC.8bitUnsupportedHdr="OBS tidak menyokong penggunaan output 8-bit Rec. 2100."
 NVENC.I010Unsupported="NVEBC tidak menyokong I010. Sila guna P010 sebagai ganti."
 NVENC.10bitUnsupported="Tidak dapat melakukan pengekodan 10-bit dengan pengekod ini"
-NVENC.TooManyBFrames="Tetapan bingkai-B Maks. (%d) adalah lebih berbanding sokongan pengekod (%d)."
+NVENC.16bitUnsupported="Tidak dapat melakukan pengekodan 16-bit dengan pengekod ini."
+NVENC.NoAV1FallbackPossible="Pengekodan AV1 tidak tersedia dengan tetapan semasa. Cuba lumpuhkan mana-mana pilihan penskalaan-semula atau GPU yang telah ditetapkan. Sila rujuk log untuk maklumat lanjut."
 NVENC.Preset2.p1="P1: Terpantas (Kualiti Terendah)"
 NVENC.Preset2.p2="P2: Lebih Pantas (Kualiti Lebih Rendah)"
 NVENC.Preset2.p3="P3: Pantas (Kualiti Rendah)"
+NVENC.Preset2.p4="P4: Sederhana (Kualiti Sederhana)"
 NVENC.Preset2.p5="P5: Perlahan (Kualiti Baik)"
 NVENC.Preset2.p6="P6: Lebih Perlahan (Kualiti Lebih Baik)"
 NVENC.Preset2.p7="P6: Paling Perlahan (Kualiti Terbaik)"
@@ -46,7 +52,6 @@
 BufferingMB="Penimbalan Rangkaian"
 HardwareDecode="Guna penyahkodan perkakasan jika ada"
 ClearOnMediaEnd="Jangan tunjuk apa-apa ketika main balik tamat"
-Advanced="Lanjutan"
 RestartWhenActivated="Mula semula main balik ketika sumber menjadi aktif"
 CloseFileWhenInactive="Tutup fail bila tidak aktif"
 CloseFileWhenInactive.ToolTip="Tutup fail bila sumber tidak dipaparkan dalam strim atau rakaman. Ia membolehkan\nfail diubah ketika sumber tidak aktif, tetapi boleh menyebabkan\n lengah permulaan bila sumber diaktifkan semula."
@@ -71,10 +76,9 @@
 WarnWindowsDefender="Jika Perlindungan Perisian Tebusan Windows 10 dibenarkan ia juga boleh menyebabkan ralat ini. Cuba matikan capaian folder terkawal dalam tetapan perlindungan Keselamatan Windows / Virus & ancaman."
 Encoder.Error="Gagal membuka %1: %2"
 Encoder.Timeout="Pengekod %1 mengambil masa terlalu lama untuk mengekod (had masa tamat: %2 saat)"
-AMF.Error="Gagal membuka kodeks AMF: %1"
-AMF.GenericError="Cuba pasangkan <a href=\"https://obsproject.com/go/amd-drivers\">pemacu AMD</a> terkini dan tutup semua perisian lain yang mungkin menggunakan enkoder AMD contohnya seperti perisian Radeon atau Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS tidak menyokong penggunaan output 8-bit Rec. 2100."
 AMF.10bitUnsupportedAvc="Tidak dapat melakukan pengekodan 10-bit dengan pengekod H.264 AMD."
+AMF.16bitUnsupported="Tidak dapat melakukan pengekodan 16-bit dengan pengekod ini."
 NVENC.Error="Gagal membuka kodeks NVENC: %1"
 NVENC.GenericError="Cuba pasangkan <a href=\"https://obsproject.com/go/nvidia-drivers\">pemacu NVIDIA</a> terkini dan tutup perisian rakaman lain yang mungkin menggunakan NVENC contohnya sepertia NVIDIA ShadowPlay atau Windows Game DVR."
 NVENC.BadGPUIndex="Anda telah memilih GPU %1 dalam tetapan pengekod output anda. Tetapkan ini kembali ke nilai 0 dan cuba sekali lagi."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/nb-NO.ini Changed

@@ -1,17 +1,34 @@
 FFmpegOutput="FFmpeg utdata"
+FFmpegOpts="FFmpeg-innstillinger"
 MaxBitrate="Maks bitrate"
 Preset="Forhåndsinnstilling"
 Profile="Profil"
 RateControl="Hastighetskontroll"
 Lossless="Tapsfri"
 Level="Nivå"
+FilePath="Filbane"
+AMFOpts="AMF/FFmpeg-innstillinger"
+GPU="Skjermkort"
 BFrames="Maksimalt antall B-frames"
-VAAPI.Codec="VAAPI kodek"
 VAAPI.Device="VAAPI enhet"
 NVENC.LookAhead.ToolTip="Aktiverer dynamiske B-frames. \n\nHvis deaktivert, vil koderen alltid bruke nummeret spesifisert i \"Maks B-frames\" instillingen. \n\nHvis aktivert, vil bildekvaliteten forbedres ved å bare bruke antallet nødvendige B-frames, opp til maksimum antallet,\npå bekostning av økt GPU-forbruk."
 NVENC.PsychoVisualTuning="Psykovisuell justering"
 NVENC.PsychoVisualTuning.ToolTip="Aktiverer kodingsinstillinger som optimerer bruken av bitrate for forbedret oppfattet bildekvalitet,\nspesielt i situasjonen med mye bevegelse, på bekostning av økt GPU-forbruk."
 NVENC.CQLevel="QC-nivå"
+NVENC.Preset2.p1="P1: Raskest (laveste kvalitet)"
+NVENC.Preset2.p2="P2: Raskere (lavere kvalitet)"
+NVENC.Preset2.p3="P3: Rask (lav kvalitet)"
+NVENC.Preset2.p4="P4: Middels (middels kvalitet)"
+NVENC.Preset2.p5="P5: Treg (god kvalitet)"
+NVENC.Preset2.p6="P6: Tregere (bedre kvalitet)"
+NVENC.Preset2.p7="P7: Tregest (beste kvalitet)"
+NVENC.Tuning.hq="Høy kvalitet"
+NVENC.Tuning.ll="Lav latens"
+NVENC.Tuning.ull="Ultralav latens"
+AMF.Preset.speed="Hastighet"
+AMF.Preset.balanced="Balansert"
+AMF.Preset.quality="Kvalitet"
+AMF.Preset.highQuality="Høy kvalitet"
 FFmpegSource="Mediekilde"
 LocalFile="Lokal fil"
 Looping="Repeter"
@@ -20,12 +37,12 @@
 BufferingMB="Nettverksbuffer"
 HardwareDecode="Bruk maskinvaredekoding når tilgjengelig"
 ClearOnMediaEnd="Vis ingenting når avspillingen slutter"
-Advanced="Avansert"
 RestartWhenActivated="Start avspilling omigjen når kilde blir aktiv"
 CloseFileWhenInactive="Lukk fil når inaktiv"
 CloseFileWhenInactive.ToolTip="Lukker filen når kilden ikke vises på strømmen eller \nopptaket. Dette gjør at filen kan endres når kilden ikke er aktiv,\nmen det kan være noe forsinkelse på oppstart når kilden reaktiveres."
 ColorRange="YUV fargerom"
 ColorRange.Auto="Automatisk"
+ColorRange.Partial="Begrenset"
 ColorRange.Full="Hel"
 LinearAlpha="Bruk lineær gjennomsiktighet (alpha)"
 RestartMedia="Start på nytt"
@@ -42,6 +59,8 @@
 HelperProcessFailed="Kan ikke starte prosess for opptakshjelper. Sjekk at OBS ikke har noen blokkerte filer, eller at tredjeparts antivirus/sikkerhetsprogramvare har slettet noen filer."
 UnableToWritePath="Kan ikke skrive til %1. Kontroller at du bruker en filbane som kontoen din har rettigheter til å skrive på, og at du har nok diskplass tilgjengelig."
 WarnWindowsDefender="Hvis Windows 10 Ransomvare-beskyttelse er aktivert, kan dette medføre denne feilen. Forsøk å deaktivere kontrollert mappetilgang i Windows-instillingen Sikkerhet > Virus- og Trusselbeskyttelse."
+Encoder.Error="Mislyktes i å åpne %1: %2"
 NVENC.Error="Kunne ikke åpne NVENC kodek: %1"
 NVENC.BadGPUIndex="Du har valgt GPU %1 i utdatakodesinstillinger. Setter dette tilbake til 0, og prøv igjen."
+NVENC.OutdatedDriver="Den installerte NVIDIA-driveren støtter ikke denne NVENC-versjonen, prøv å <a href=\"https://obsproject.com/go/nvidia-drivers\">oppdatere driveren</a>."
 ReconnectDelayTime="Gjenoppkoblingsforsinkelse"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/nl-NL.ini Changed

@@ -5,6 +5,7 @@
 Profile="Profiel"
 KeyframeIntervalSec="Tijd tussen keyframes (0=auto)"
 Level="Niveau"
+FilePath="Bestandspad"
 AMFOpts="AMF/FFmpeg opties"
 AMFOpts.ToolTip="Gebruik om aangepaste AMF- of FFmpeg-opties op te geven. Bijvoorbeeld, \"level=5.2 profile=main\". Controleer de AMF-encoder docs voor meer details."
 VAAPI.Device="VAAPI apparaat"
@@ -15,7 +16,8 @@
 NVENC.8bitUnsupportedHdr="OBS ondersteunt geen 8-bit output van Rec. 2100."
 NVENC.I010Unsupported="NVENC ondersteunt I010 niet. Gebruik in plaats daarvan P010."
 NVENC.10bitUnsupported="Kan niet 10-bit encoden met deze encoder."
-NVENC.TooManyBFrames="Max B-frames instelling (%d) is meer dan de encoder ondersteunt (%d)."
+NVENC.16bitUnsupported="Kan niet 16-bit encoden met deze encoder."
+NVENC.NoAV1FallbackPossible="AV1 encoding is niet beschikbaar met de huidige instellingen. Probeer eventueel ingestelde herschalings- of GPU-opties uit te schakelen. Controleer de logs voor meer details."
 NVENC.Preset2.p1="P1: Snelste (laagste kwaliteit)"
 NVENC.Preset2.p2="P2: Sneller (Lagere Kwaliteit)"
 NVENC.Preset2.p3="P3: snel (Lage Kwaliteit)"
@@ -42,7 +44,6 @@
 BufferingMB="Netwerkbuffering"
 HardwareDecode="Gebruik hardware-decoding wanneer mogelijk"
 ClearOnMediaEnd="Toon niets wanneer het afspelen eindigt"
-Advanced="Geavanceerd"
 RestartWhenActivated="Opnieuw starten met afspelen zodra de bron actief wordt"
 CloseFileWhenInactive="Sluit bestand wanneer niet actief"
 CloseFileWhenInactive.ToolTip="Het bestand wordt afgesloten wanneer de bron niet wordt weergegeven op de stream of\nopname. Hierdoor kan het bestand worden gewijzigd wanneer de bron niet actief is, \ner kan echter enige opstartvertraging zijn wanneer de bron opnieuw geactiveerd wordt."
@@ -67,10 +68,9 @@
 WarnWindowsDefender="Als Windows 10 Ransomware Protection is ingeschakeld, kan dit ook deze fout veroorzaken. Probeer gecontroleerde toegang tot mappen uit te schakelen in de instellingen van Windows Security / Virus & Threat Protection."
 Encoder.Error="Openen %1 mislukt: %2"
 Encoder.Timeout="Encoder %1 is te lang bezig met encoden (timeout: %2 seconden)"
-AMF.Error="Kan AMF codec niet openen: %1"
-AMF.GenericError="Probeer het installeren van de nieuwste <a href=\"https://obsproject.com/go/amd-drivers\">AMD driver</a> en het sluiten van andere opname software welke mogelijk de AMD encoder gebruiken zoals de Radeon Software of Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS ondersteunt geen 8-bit output van Rec. 2100."
 AMF.10bitUnsupportedAvc="Kan geen 10-bit encoding doen op AMD H.264 encoder."
+AMF.16bitUnsupported="Kan niet 16-bit encoden met deze encoder."
 NVENC.Error="NVENC codec openen mislukt: %1"
 NVENC.GenericError="Probeer het installeren van de nieuwste <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDEA driver</a> en het sluiten van andere opname software welke mogelijk NVENC gebruiken zoals NVIDEA ShadowPlay of Windows Game DVR."
 NVENC.BadGPUIndex="Je hebt GPU %1 geselecteerd in je uitvoer encoder instellingen. Zet dit terug naar 0 en probeer het opnieuw."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/nn-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/nn-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/pl-PL.ini Changed

@@ -15,10 +15,10 @@
 KeyframeIntervalSec="Odstęp między klatkami kluczowymi (0=automatyczny)"
 Lossless="Bezstratny"
 Level="Poziom"
+FilePath="Ścieżka do pliku"
 AMFOpts="Opcje AMF/FFmpeg"
 AMFOpts.ToolTip="Użyj do określenia niestandardowych opcji AMF lub FFmpeg. Na przykład \"level=5.2 profile=main\". Sprawdź dokumentację AMF dla enkodera, aby uzyskać więcej informacji."
 BFrames="Maksymalna liczba klatek B-frame"
-VAAPI.Codec="Kodek VAAPI"
 VAAPI.Device="Urządzenie VAAPI"
 NVENC.LookAhead.ToolTip="Włącza dynamiczne sterowanie klatkami B-frame.\n\nOpcja wyłączona - enkoder będzie ustawiał liczbę klatek B-frame zgodnie z wartością w opcji 'Maksymalna liczba klatek B-frame\".\n\nOpcja włączona - zwiększenie jakości obrazu kosztem zwiększonego użycia procesora graficznego\nprzez generowanie optymalnej liczby potrzebnych klatek B-frame\nale nie większej od wartości maksymalnej określonej w opcjach."
 NVENC.PsychoVisualTuning.ToolTip="Włącza ustawienia enkodera optymalizujące bitrate w celu zwiększenia jakości wizualnej\nkosztem zwiększonego wykorzystania procesora graficznego, szczególnie przy scenach o dużym natężeniu ruchu."
@@ -26,7 +26,8 @@
 NVENC.8bitUnsupportedHdr="OBS nie obsługuje 8-bitowego wyjścia z Rec. 2100."
 NVENC.I010Unsupported="NVENC nie obsługuje I010. Zamiast tego należy użyć P010."
 NVENC.10bitUnsupported="Nie można wykonać 10-bitowego kodowania na tym enkoderze."
-NVENC.TooManyBFrames="Maksymalne ustawienie B-frames (%d) jest więcej niż enkoder obsługuje (%d)."
+NVENC.16bitUnsupported="Wybrany enkoder nie obsługuje 16-bitowego kodowania."
+NVENC.NoAV1FallbackPossible="Enkoder AV1 nie jest dostępny przy obecnych ustawieniach. Spróbuj wyłączyć opcje przeskalowania lub inne ustawienia karty graficznej. Sprawdź więcej szczegółów w pliku dziennika."
 NVENC.Preset2.p1="P1: Fastest (najniższa jakość)"
 NVENC.Preset2.p2="P2: Faster (niższa jakość)"
 NVENC.Preset2.p3="P3: Fast (niska jakość)"
@@ -53,7 +54,6 @@
 BufferingMB="Rozmiar bufora"
 HardwareDecode="Użyj sprzętowego dekodowania gdy to możliwe"
 ClearOnMediaEnd="Po zakończeniu odtwarzania nie pokazuj nic"
-Advanced="Zaawansowane"
 RestartWhenActivated="Zrestartuj odtwarzanie, gdy źródła będą aktywne"
 CloseFileWhenInactive="Zamknij plik, gdy nieaktywne"
 CloseFileWhenInactive.ToolTip="Plik jest zamykany, gdy źródło nie jest wyświetlane.\nPozwala to na zmianę pliku, gdy źródło nie jest aktywne\nmoże jednak opóźniać włączenie źródła w momencie jego aktywacji."
@@ -79,10 +79,9 @@
 WarnWindowsDefender="Błąd ten może być spowodowany również włączoną ochroną Windows 10 przed ransomware. Prosimy spróbować wyłączyć \"Kontrolowany dostęp do folderu\" w sekcji Ochrona przed wirusami i zagrożeniami."
 Encoder.Error="Nie udało się otworzyć %1: %2"
 Encoder.Timeout="Enkodowanie enkoderem %1 trwa zbyt długo (limit czasu: %2 s.)"
-AMF.Error="Nie udało się otworzyć kodeka AMF: %1"
-AMF.GenericError="Spróbuj zainstalować najnowszy <a href=\"https://obsproject.com/go/amd-drivers\">sterownik AMD</a> i zamknąć inne oprogramowanie do nagrywania, które może korzystać z kodera AMD, takie jak Radeon Software lub Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS nie obsługuje 8-bitowego wyjścia z Rec. 2100."
 AMF.10bitUnsupportedAvc="Nie można użyć 10-bitowego enkodowania z enkoderem AMD H.264."
+AMF.16bitUnsupported="Wybrany enkoder nie obsługuje 16-bitowego kodowania."
 NVENC.Error="Nie udało się otworzyć kodeka NVENC: %1"
 NVENC.GenericError="Spróbuj zainstalować najnowszy <a href=\"https://obsproject.com/go/nvidia-drivers\">sterownik NVIDIA</a> i zamknąć inne oprogramowanie do nagrywania, które może używać NVENC, takie jak NVIDIA ShadowPlay lub Windows Game DVR."
 NVENC.BadGPUIndex="Wybrałeś GPU %1 w ustawieniach enkodera. Ustaw z powrotem wartość 0 i spróbuj ponownie."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/pt-BR.ini Changed

@@ -1,89 +1,92 @@
 FFmpegOutput="Saída do FFmpeg"
+FFmpegMuxer="Conversor FFmpeg"
+FFmpegHlsMuxer="Conversor FFmpeg HLS"
+FFmpegMpegtsMuxer="Conversor FFmpeg MPEG-TS"
 FFmpegOpts="Opções do FFmpeg"
 FFmpegOpts.ToolTip.Source="Permite que você defina opções FFmpeg. Isto só aceita opções no formato option=value.\nMúltiplas opções podem ser definidas separando as mesmas com um espaço.\nExemplo: rtsp_transport=tcp rtsp_flags=prefer_tcp"
-Bitrate="Taxa de Bits"
-MaxBitrate="Taxa de Bits Máxima"
+Bitrate="Taxa de bits"
+MaxBitrate="Taxa de bits máxima"
 Preset="Predefinição"
 Tuning="Ajuste"
 Profile="Perfil"
-RateControl="Controle da Taxa de Bits"
-KeyframeIntervalSec="Intervalo de Keyframe (0=auto)"
+RateControl="Controle da taxa de bits"
+KeyframeIntervalSec="Intervalo de keyframes (0=auto)"
 Lossless="Sem perdas"
 Level="Nível"
+FilePath="Caminho do arquivo"
 AMFOpts="Opções AMF/FFmpeg"
 AMFOpts.ToolTip="Use para especificar opções personalizadas de AMF ou FFmpeg. Por exemplo, \"level=5.2 profile=main\". Verifique os documentos dos codificadores AMF para mais detalhes."
-BFrames="B-Frames Máximo"
-VAAPI.Codec="Codec VAAPI"
+BFrames="B-Frames máximo"
 VAAPI.Device="Dispositivo VAAPI"
-NVENC.LookAhead="Olhar quadros futuros"
+NVENC.LookAhead="Quadros futuros (look-ahead)"
 NVENC.LookAhead.ToolTip="Habilita B-Frames dinâmicos.\n\nSe desabilitado, o codificador sempre usará o número de B-Frames especificados na configuração de 'B-Frames Máximo'.\n\nSe habilitado, aumentará a qualidade visual usando apenas B-Frames necessários, até o máximo,\nao custo de uma maior utilização da GPU."
-NVENC.PsychoVisualTuning="Ajuste Psico-Visual"
+NVENC.PsychoVisualTuning="Ajuste psico-visual"
 NVENC.PsychoVisualTuning.ToolTip="Permite configurações do codificador que otimizam o uso da taxa de bits para uma melhoria\n perceptível na qualidade - especialmente em situações com muitos movimentos - com o custo de mais utilização da GPU."
 NVENC.CQLevel="Nível de CQ"
 NVENC.8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."
 NVENC.I010Unsupported="NVENC não suporta I010. Use P010 em vez disso."
 NVENC.10bitUnsupported="Não é possível executar codificação de 10 bits neste codificador."
-NVENC.TooManyBFrames="Configuração máxima de quadros B (%d) é maior do que o codificador suporta (%d)."
-NVENC.Preset2.p1="P1: Rapidíssimo (Qualidade Baixíssima)"
-NVENC.Preset2.p2="P2: Mais Rápido (Qualidade Mais Baixa)"
-NVENC.Preset2.p3="P3: Rápido (Qualidade Baixa)"
-NVENC.Preset2.p4="P4: Médio (Qualidade Média)"
-NVENC.Preset2.p5="P5: Lento (Qualidade Boa)"
-NVENC.Preset2.p6="P6: Mais Lento (Qualidade Melhor)"
-NVENC.Preset2.p7="P7: Lentíssimo (Qualidade Mais Alta)"
-NVENC.Tuning.hq="Alta Qualidade"
-NVENC.Tuning.ll="Baixa Latência"
-NVENC.Tuning.ull="Latência Ultra Baixa"
-NVENC.Multipass="Modo Multiplas Passadas"
-NVENC.Multipass.disabled="Passada Única"
-NVENC.Multipass.qres="Duas Passadas (Um Quarto da Resolução)"
-NVENC.Multipass.fullres="Duas Passadas (Resolução Total)"
+NVENC.16bitUnsupported="Não é possível executar codificação de 16 bits neste codificador."
+NVENC.NoAV1FallbackPossible="Codificação AV1 não disponível com as configurações atuais. Tente desabilitar qualquer opção de redimensionamento ou GPU que possa estar definida. Verifique os arquivos de registro para mais detalhes."
+NVENC.Preset2.p1="P1: muito rápido (qualidade muito baixa)"
+NVENC.Preset2.p2="P2: mais rápido (qualidade mais baixa)"
+NVENC.Preset2.p3="P3: rápido (qualidade baixa)"
+NVENC.Preset2.p4="P4: médio (qualidade média)"
+NVENC.Preset2.p5="P5: lento (qualidade boa)"
+NVENC.Preset2.p6="P6: mais lento (qualidade maior)"
+NVENC.Preset2.p7="P7: muito lento (melhor qualidade)"
+NVENC.Tuning.hq="Alta qualidade"
+NVENC.Tuning.ll="Baixa latência"
+NVENC.Tuning.ull="Latência ultra baixa"
+NVENC.Multipass="Modo multipassagem"
+NVENC.Multipass.disabled="Passagem única"
+NVENC.Multipass.qres="Passagem dupla (um quarto de resolução)"
+NVENC.Multipass.fullres="Passagem dupla (resolução completa)"
 AMF.Preset.speed="Velocidade"
 AMF.Preset.balanced="Equilibrado"
 AMF.Preset.quality="Qualidade"
-AMF.Preset.highQuality="Alta Qualidade"
+AMF.Preset.highQuality="Alta qualidade"
 FFmpegSource="Fonte de mídia"
 LocalFile="Arquivo local"
 Input="Entrada"
 InputFormat="Formato de entrada"
 BufferingMB="Buffering de rede"
-HardwareDecode="Utilizar descodificação de hardware quando disponível"
+HardwareDecode="Usar decodificação de hardware quando disponível"
 ClearOnMediaEnd="Não mostrar nada quando terminar a reprodução"
-Advanced="Avançado"
 RestartWhenActivated="Reiniciar reprodução quando a fonte se tornar ativa"
 CloseFileWhenInactive="Fechar arquivo quando inativo"
 CloseFileWhenInactive.ToolTip="Fechar o arquivo quando a fonte não estiver sendo exibida na transmissão\n ou gravação. Isto permite alterar o arquivo quando a fonte não está ativa,\nmas pode ter algum atraso de inicialização quando a fonte for reativada."
-ColorRange="Intervalo de Cores YUV"
+ColorRange="Intervalo de cores YUV"
+ColorRange.Auto="Automático"
 ColorRange.Partial="Limitado"
 ColorRange.Full="Completo"
 LinearAlpha="Aplicar alfa no espaço linear"
 RestartMedia="Reiniciar"
 SpeedPercentage="Velocidade"
-Seekable="Procurável"
-Play="Iniciar"
+Seekable="Pesquisável"
+Play="Reproduzir"
 Pause="Pausar"
 Stop="Parar"
 MediaFileFilter.AllMediaFiles="Todos os arquivos de mídia"
-MediaFileFilter.VideoFiles="Arquivos de Vídeo"
-MediaFileFilter.AudioFiles="Arquivos de Áudio"
+MediaFileFilter.VideoFiles="Arquivos de vídeo"
+MediaFileFilter.AudioFiles="Arquivos de áudio"
 MediaFileFilter.AllFiles="Todos os arquivos"
 ReplayBuffer="Buffer de repetição"
 ReplayBuffer.Save="Salvar replay"
-HelperProcessFailed="Não foi possível iniciar o processo auxiliar de gravação. Verifique se os arquivos do OBS não foram bloqueados ou removidos por qualquer outro software (Ex: antivírus)."
+HelperProcessFailed="Não foi possível iniciar o processo auxiliar de gravação. Verifique se os arquivos do OBS não foram bloqueados ou removidos por outro software (ex: antivírus)."
 UnableToWritePath="Não foi possível escrever em %1. Certifique-se de que você está usando um caminho de gravação que sua conta de usuário possui permissão para gravar e que há espaço suficiente no disco."
 WarnWindowsDefender="Este erro pode acontecer também por causa da Proteção contra Ransomware do Windows 10. Experimente desligar o acesso controlado a pastas em: Configurações do Windows Defender > Proteção contra vírus e ameaças."
 Encoder.Error="Falha ao abrir %1: %2"
 Encoder.Timeout="O codificador %1 está demorando muito para codificar (tempo esgotado: %2 segundos)"
-AMF.Error="Falha ao abrir o codec AMF: %1"
-AMF.GenericError="Tente instalar o último <a href=\"https://obsproject.com/go/amd-drivers\">driver AMD</a> e feche outros aplicativos de gravação que podem estar usando o codificador da AMD como o Radeon Software ou o Windows Game DVR."
 AMF.8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."
 AMF.10bitUnsupportedAvc="Não é possível executar a codificação 10 bits no codificador AMD H.264."
+AMF.16bitUnsupported="Não é possível executar codificação de 16 bits neste codificador."
 NVENC.Error="Falha ao abrir o codec NVENC: %1"
-NVENC.GenericError="Tente instalar o último <a href=\"https://obsproject.com/go/nvidia-drivers\">driver NVIDIA</a> e feche outros aplicativos de gravação que podem estar usando o NVENC como o NVIDIA ShadowPlay ou o Windows Game DVR."
-NVENC.BadGPUIndex="Você selecionou a GPU %1 nas configurações de saída do encoder. Defina este valor de volta para 0 e tente novamente."
+NVENC.GenericError="Tente instalar o <a href=\"https://obsproject.com/go/nvidia-drivers\">driver da NVIDIA</a> mais recente e feche outros aplicativos de gravação que possam estar usando o NVENC, como o NVIDIA ShadowPlay ou o Windows Game DVR."
+NVENC.BadGPUIndex="Você selecionou a GPU %1 nas configurações de saída do codificador. Defina este valor de volta para 0 e tente novamente."
 NVENC.OutdatedDriver="O driver NVIDIA instalado não suporta essa versão do NVENC, tente <a href=\"https://obsproject.com/go/nvidia-drivers\">atualizar o driver</a>."
 NVENC.UnsupportedDevice="Erro do NVENC: Dispositivo não suportado. Verifique que sua placa de vídeo <a href=\"https://obsproject.com/go/nvenc-matrix\">é compatível com o NVENC</a> e tente <a href=\"https://obsproject.com/go/nvidia-drivers\">atualizar o driver</a>."
 NVENC.TooManySessions="Erro do NVENC: Muitas sessões simultâneas. Tente fechar outros aplicativos de gravação que podem estar usando o NVENC como o NVIDIA ShadowPlay ou o Windows Game DVR."
-NVENC.CheckDrivers="Tente instalar o último <a href=\"https://obsproject.com/go/nvidia-drivers\">driver da NVIDIA</a>."
+NVENC.CheckDrivers="Tente instalar o <a href=\"https://obsproject.com/go/nvidia-drivers\">driver da NVIDIA</a> mais recente."
 AV1.8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."
-ReconnectDelayTime="Atraso para Reconectar"
+ReconnectDelayTime="Atraso de reconexão"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/pt-PT.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Saída de FFmpeg"
+FFmpegMuxer="Conversor FFmpeg"
+FFmpegHlsMuxer="Conversor HLD FFmpeg"
+FFmpegMpegtsMuxer="Conversor MPEG-TS"
 FFmpegPCM32BitFloat="FFmpeg PCM (32-bit flutuante)"
 FFmpegOpts="Opções de FFmpeg"
 FFmpegOpts.ToolTip.Source="Permite-lhe definir opções de FFmpeg. Apenas são aceites opções no formato option=value.\nOpções múltiplas podem ser definidas separando-as com um espaço.\nExemplo: rtsp_transport=tcp rtsp_flags=prefer_tcp"
@@ -11,10 +14,10 @@
 KeyframeIntervalSec="Intervalo de fotogramas-chave ( 0=automático)"
 Lossless="Sem perdas"
 Level="Nível"
+FilePath="Caminho do ficheiro"
 AMFOpts="Opções de FFmpeg/AMF"
 AMFOpts.ToolTip="Use para especificar opções personalizadas de AMF ou FFmpeg. Por exemplo, \"level=5.2 profile=main\". Verifique os documentos dos codificadores AMF para mais detalhes."
-BFrames="B-frames máximas"
-VAAPI.Codec="Codec VAAPI"
+BFrames="Máximo de fotogramas B"
 VAAPI.Device="Dispositivo VAAPI"
 NVENC.LookAhead="Previsão"
 NVENC.LookAhead.ToolTip="Ativa as B-frames dinâmicas.\n\nSe desativado, o codificador usará sempre o número de B-Frames especificado na definição \"B-frames máximas\".\n\nSe ativado, aumentará a qualidade visual até ao máximo, usando só as B-Frames necessárias,\ncom um custo de utilização da GPU."
@@ -24,14 +27,15 @@
 NVENC.8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."
 NVENC.I010Unsupported="O NVENC não suporta I010. Em vez disso, use P010."
 NVENC.10bitUnsupported="Não é possível executar a codificação de 10 bits neste codificador."
-NVENC.TooManyBFrames="Configuração do máximo de B-frames (%d) é superior ao que o sistema de codificação suporta (%d)."
-NVENC.Preset2.p1="P1: Mais rápido (Qualidade mais baixa)"
+NVENC.16bitUnsupported="Não é possível executar a codificação de 16 bits neste codificador."
+NVENC.NoAV1FallbackPossible="Codificação AV1 não se encontra disponível com as definições atuais. Tente desativar quaisquer redimensionamentos ou definições da placa gráfica que possam existir. Verifique o histórico para mais detalhes."
+NVENC.Preset2.p1="P1: O mais rápido (Qualidade mais baixa)"
 NVENC.Preset2.p2="P2: Muito rápido (Qualidade muito baixa)"
 NVENC.Preset2.p3="P3: Rápido (Baixa qualidade)"
 NVENC.Preset2.p4="P4: Médio (Qualidade Média)"
 NVENC.Preset2.p5="P5: Lento (Boa qualidade)"
 NVENC.Preset2.p6="P6: Muito lento (Melhor qualidade)"
-NVENC.Preset2.p7="P7: Mais lento (Qualidade mais alta)"
+NVENC.Preset2.p7="P7: O mais lento (Qualidade mais alta)"
 NVENC.Tuning.hq="Alta qualidade"
 NVENC.Tuning.ll="Baixa latência"
 NVENC.Tuning.ull="Latência ultrabaixa"
@@ -51,7 +55,6 @@
 BufferingMB="Memória temporária de rede"
 HardwareDecode="Utilizar descodificação por hardware, quando disponível"
 ClearOnMediaEnd="Não mostrar nada quando a reprodução terminar"
-Advanced="Avançado"
 RestartWhenActivated="Reiniciar reprodução quando a fonte se tornar ativa"
 CloseFileWhenInactive="Fechar ficheiro quando inativa"
 CloseFileWhenInactive.ToolTip="Fecha o ficheiro quando a fonte não estiver a ser mostrada na transmissão ou\ngravação. Permite assim que o ficheiro seja alterado quando a fonte não estiver ativa,\nmas pode haver algum atraso inicial quando a fonte for reativada."
@@ -77,13 +80,14 @@
 WarnWindowsDefender="Se a proteção contra Ransomware do Windows 10 estiver ativa, pode ser a causa deste erro. Tente desativar o controlo de acesso a pastas nas definições de segurança/vírus do Windows."
 Encoder.Error="Falha ao abrir %1: %2"
 Encoder.Timeout="O codificador %1 está a demorar demasiado tempo para codificar (tempo limite: %2 segundos)"
-AMF.Error="Falha ao abrir o codec AMF: %1"
-AMF.GenericError="Tente instalar o <a href=\"https://obsproject.com/go/amd-drivers\">driver da AMD</a> mais recente e fechar outros programas de gravação que possam estar a usar o codificador AMD, como o software Radeon ou o Windows Game DVR."
 AMF.8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."
 AMF.10bitUnsupportedAvc="Não é possível executar a codificação de 10 bits no codificador AMD H.264."
+AMF.16bitUnsupported="Não é possível executar a codificação de 16 bits neste codificador."
 NVENC.Error="Falha ao abrir o codec NVENC: %1"
 NVENC.GenericError="Tente instalar o <a href=\"https://obsproject.com/go/nvidia-drivers\">driver da NVIDIA</a> mais recente e fechar outros programas de gravação que possam estar a usar o codificador NVENC tal como o NVIDIA ShadowPlay ou o Windows Game DVR."
 NVENC.BadGPUIndex="Selecionou a GPU %1 nas definições do codificador de saída. Redefina este valor para 0 e tente novamente."
+NVENC.OutdatedDriver="Os drivers NVIDIA instalados não suportam esta versão NVENC, tente <a href=\"https://obsproject.com/go/nvidia-drivers\">atualizar os drivers</a>."
+NVENC.UnsupportedDevice="Erro NVENC: Dispositivo não suportado. Verifique se a sua placa gráfica <a href=\"https://obsproject.com/go/nvenc-matrix\">suporta NVENC</a> e tente <a href=\"https://obsproject.com/go/nvidia-drivers\">atualizar os drivers</a>."
 NVENC.TooManySessions="Erro NVENC: demasiadas sessões simultâneas, tente fechar outros programas que possam estar a usar o NVENC, como o NVIDIA ShadowPlay ou Windows Game DVR."
 NVENC.CheckDrivers="Tente instalar o <a href=\"https://obsproject.com/go/nvidia-drivers\">driver da NVIDIA</a> mais recente."
 AV1.8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ro-RO.ini Changed

@@ -1,4 +1,5 @@
 FFmpegOutput="Output FFmpeg"
+FFmpegMuxer="Muxer FFmpeg"
 FFmpegALAC="FFmpeg ALAC (24 biți)"
 FFmpegFLAC="FFmpeg FLAC (16 biți)"
 FFmpegPCM16Bit="FFmpeg PCM (16 biți)"
@@ -9,16 +10,15 @@
 Bitrate="Rată de biți"
 MaxBitrate="Rată de biți maximă"
 Preset="Presetare"
-Tuning="Ajustare"
 Profile="Profil"
 RateControl="Controlul ratei"
 KeyframeIntervalSec="Interval de cadre cheie (0=auto)"
 Lossless="Fără pierderi"
 Level="Nivel"
+FilePath="Calea fișierului"
 AMFOpts="Opțiuni AMF/FFmpeg"
 AMFOpts.ToolTip="Se utilizează pentru a specifica opțiuni AMF sau FFmpeg personalizate. De exemplu, \"level=5.2 profile=main\". Pentru mai multe detalii, consultați documentația codificatorului AMF."
 BFrames="Cadre B maxime"
-VAAPI.Codec="Codec VAAPI"
 VAAPI.Device="Dispozitiv VAAPI"
 NVENC.LookAhead.ToolTip="Activează cadre B dinamice.\n\nDacă este dezactivat, codificatorul va folosi întotdeauna numărul de cadre B specificat în setarea „Cadre B maxime”.\n\nDacă este activat, va crește calitatea vizuală folosind doar cât de multe cadre B sunt necesare, până la maximum,\ncu costul utilizării crescute a GPU-ului."
 NVENC.PsychoVisualTuning.ToolTip="Activează setările codificatorului care optimizează folosirea ratei de biți pentru o calitate vizuală percepută crescută,\nîn special în situații cu mișcare mare, cu prețul unei utilizări mai mari a GPU-ului."
@@ -26,7 +26,8 @@
 NVENC.8bitUnsupportedHdr="OBS nu suportă outputul pe 8 biți a Rec. 2100."
 NVENC.I010Unsupported="NVENC nu suportă I010. Utilizați în schimb P010."
 NVENC.10bitUnsupported="Nu se poate efectua codarea pe 10 biți pe acest codificator."
-NVENC.TooManyBFrames="Setarea maximă a cadrelor B (%d) este mai mult decât suportul codificatorului (%d)."
+NVENC.16bitUnsupported="Nu se poate efectua codarea pe 16 biți pe acest codificator."
+NVENC.NoAV1FallbackPossible="Codificarea AV1 nu este disponibilă cu setările actuale. Încercați să dezactivați orice opțiuni de redimensionare sau de GPU care ar putea fi setate. Verificați jurnalul pentru mai multe detalii."
 NVENC.Preset2.p1="P1: Cel mai rapid (cea mai scăzută calitate)"
 NVENC.Preset2.p2="P1: Mai rapid (calitate mai slabă)"
 NVENC.Preset2.p3="P3: Rapid (calitate slabă)"
@@ -52,7 +53,6 @@
 BufferingMB="Buffering în rețea"
 HardwareDecode="Folosește decodificarea hardware când este disponibilă"
 ClearOnMediaEnd="Nu afișa nimic la terminarea redării"
-Advanced="Avansat"
 RestartWhenActivated="Repornește redarea când sursa devine activă"
 CloseFileWhenInactive="Închide fișierul când este inactiv"
 CloseFileWhenInactive.ToolTip="Închide fișierul atunci când sursa nu este afișată pe transmisiune sau înregistrare.\nAcest lucru permite fișierului să fie schimbat în momentul în care sursa nu este\nactivă, însă poate exista o întârziere la pornire în momentul reactivării sursei."
@@ -78,10 +78,9 @@
 WarnWindowsDefender="Dacă este activată protecţia Ransomware Windows 10 poate cauza şi această eroare. Încercați să dezactivați accesul la dosarele controlate în setările de securitate / Virus și protecție împotriva amenințării."
 Encoder.Error="Eșuare la deschidere %1: %2"
 Encoder.Timeout="Codificatorului %1 îi ea prea mult timp să codifice (pauză: %2 secunde)"
-AMF.Error="Nu s-a reușit deschiderea codecului AMF: %1"
-AMF.GenericError="Încercați să instalați cel mai recent <a href=\"https://obsproject.com/go/amd-drivers\">driver AMD</a> și închideți alte programe de înregistrare care ar putea utiliza codificatorul AMD, cum ar fi Radeon Software sau Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS nu suportă outputul pe 8 biți a Rec. 2100."
 AMF.10bitUnsupportedAvc="Nu se poate efectua codificarea de 10 biți pe codificatorul AMD H.264."
+AMF.16bitUnsupported="Nu se poate efectua codarea pe 16 biți pe acest codificator."
 NVENC.Error="Deschiderea codecului NVENC a eșuat: %1"
 NVENC.GenericError="Încercați să instalați cel mai recent <a href=\"https://obsproject.com/go/nvidia-drivers\">driver NVIDIA</a> și închideți alte programe de înregistrare care ar putea utiliza NVENC, cum ar fi NVIDIA ShadowPlay sau Windows Game DVR."
 NVENC.BadGPUIndex="Ai selectat GPU-ul %1 în setările codificatorului de output. Setează acest lucru înapoi la 0 și încearcă din nou."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ru-RU.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Вывод FFmpeg"
+FFmpegMuxer="Паковщик FFmpeg"
+FFmpegHlsMuxer="Паковщик FFmpeg HLS"
+FFmpegMpegtsMuxer="Паковщик FFmpeg MPEG-TS"
 FFmpegALAC="FFmpeg ALAC (24 бита)"
 FFmpegFLAC="FFmpeg FLAC (16 бит)"
 FFmpegPCM16Bit="FFmpeg PCM (16 бит)"
@@ -15,27 +18,29 @@
 KeyframeIntervalSec="Интервал ключевых кадров (0=авто)"
 Lossless="Без потерь"
 Level="Уровень"
+FilePath="Путь файла"
 AMFOpts="Параметры AMF/FFmpeg"
-AMFOpts.ToolTip="Используйте для указания нестандартных параметров AMF или FFmpeg. Например, \"level=5.2 profile=main\". Смотрите подробности в документации кодировщика AMF."
+AMFOpts.ToolTip="Используйте для указания нестандартных параметров AMF или FFmpeg. Например, «level=5.2 profile=main». Смотрите подробности в документации кодировщика AMF."
+GPU="Видеокарта"
 BFrames="Максимум B-кадров"
-VAAPI.Codec="Кодек VAAPI"
 VAAPI.Device="Устройство VAAPI"
 NVENC.LookAhead="Предугадывание (Look-ahead)"
-NVENC.LookAhead.ToolTip="Включает динамические B-кадры.\n\nЕсли отключено, кодировщик всегда будет использовать количество B-кадров, указанное в параметре «Максимум B-кадров».\n\nЕсли включено, то это увеличит визуальное качество изображения путем использования любого количества B-кадров, вплоть до максимума,\nза счет увеличения использования ГП."
+NVENC.LookAhead.ToolTip="Включает динамические B-кадры.\n\nЕсли отключено, кодировщик всегда будет использовать количество B-кадров, указанное в параметре «Максимум B-кадров».\n\nЕсли включено, то это увеличит визуальное качество изображения путём использования любого количества B-кадров, вплоть до максимума,\nза счёт увеличения использования ресурсов видеокарты."
 NVENC.PsychoVisualTuning="Психовизуальная корректировка (Psycho Visual Tuning)"
-NVENC.PsychoVisualTuning.ToolTip="Включает настройки кодировщика, оптимизирующие использование битрейта для повышения визуального восприятия\nкачества, особенно в ситуациях с высоким движением, за счёт увеличения использования ГП."
+NVENC.PsychoVisualTuning.ToolTip="Включает настройки кодировщика, оптимизирующие использование битрейта для повышения визуального восприятия\nкачества, особенно в ситуациях с высоким движением, за счёт увеличения использования ресурсов видеокарты."
 NVENC.CQLevel="Значение CQ"
 NVENC.8bitUnsupportedHdr="OBS не поддерживает 8-битный вывод Rec. 2100."
 NVENC.I010Unsupported="NVENC не поддерживает I010. Используйте вместо этого P010."
-NVENC.10bitUnsupported="Невозможно выполнить 10-битное кодирование в этом кодировщике."
-NVENC.TooManyBFrames="Настройка максимального количества B-кадров (%d) больше, чем поддерживает кодировщик (%d)."
-NVENC.Preset2.p1="P1: Самая быстрая (низшее качество)"
-NVENC.Preset2.p2="Р2: Более быстрая (более низкое качество)"
-NVENC.Preset2.p3="P3: Быстрая (низкое качество)"
-NVENC.Preset2.p4="P4: Средняя (среднее качество)"
-NVENC.Preset2.p5="P5: Медленная (хорошее качество)"
-NVENC.Preset2.p6="P6: Более медленная (более хорошее качество)"
-NVENC.Preset2.p7="P7: Самая медленная (лучшее качество)"
+NVENC.10bitUnsupported="Не удаётся выполнить 10-битное кодирование в этом кодировщике."
+NVENC.16bitUnsupported="Не удаётся выполнить 16-битное кодирование в этом кодировщике."
+NVENC.NoAV1FallbackPossible="Кодирование AV1 недоступно при текущих настройках. Попробуйте отключить любые заданные параметры масштабирования или видеокарты. Смотрите журнал для подробностей."
+NVENC.Preset2.p1="П1: Самая быстрая (низшее качество)"
+NVENC.Preset2.p2="П2: Более быстрая (более низкое качество)"
+NVENC.Preset2.p3="П3: Быстрая (низкое качество)"
+NVENC.Preset2.p4="П4: Средняя (среднее качество)"
+NVENC.Preset2.p5="П5: Медленная (хорошее качество)"
+NVENC.Preset2.p6="П6: Более медленная (более хорошее качество)"
+NVENC.Preset2.p7="П7: Самая медленная (лучшее качество)"
 NVENC.Tuning.hq="Высокое качество"
 NVENC.Tuning.ll="Низкая задержка"
 NVENC.Tuning.ull="Сверхнизкая задержка"
@@ -55,7 +60,6 @@
 BufferingMB="Сетевая буферизация"
 HardwareDecode="Использовать аппаратное декодирование по возможности"
 ClearOnMediaEnd="Ничего не показывать, когда воспроизведение заканчивается"
-Advanced="Дополнительно"
 RestartWhenActivated="Перезапустить воспроизведение, когда источник становится активным"
 CloseFileWhenInactive="Закрыть файл при отсутствии активности"
 CloseFileWhenInactive.ToolTip="Закрывает файл, когда источник не отображается во время трансляции или\nзаписи. Это позволяет изменять файл, когда источник не активен,\nно могут возникнуть задержки запуска при повторной активации источника."
@@ -77,14 +81,13 @@
 ReplayBuffer="Буфер повтора"
 ReplayBuffer.Save="Сохранить повтор"
 HelperProcessFailed="Невозможно запустить вспомогательный процесс для записи. Проверьте, не были ли заблокированы или удалены файлы OBS сторонним антивирусом / защитным ПО."
-UnableToWritePath="Невозможно записать в %1. Убедитесь, что для вашей учетной записи разрешена запись по этому пути, и что на диске достаточно свободного пространства."
-WarnWindowsDefender="Если включена Защита от программ-шантажистов Windows 10, это так же может вызывать эту ошибку. Попробуйте выключить контролируемый доступ к папкам в параметрах Безопасности Windows / Защита от вирусов и угроз."
+UnableToWritePath="Невозможно записать в %1. Убедитесь, что для вашей учётной записи/аккаунта разрешена запись по этому пути, и что на диске достаточно свободного пространства."
+WarnWindowsDefender="Если включена «Защита от программ-шантажистов Windows 10», это так же может вызывать эту ошибку. Попробуйте выключить контролируемый доступ к папкам в параметрах «Безопасности Windows / Защита от вирусов и угроз»."
 Encoder.Error="Не удалось открыть %1: %2"
-Encoder.Timeout="Кодировщик %1 слишком долго кодирует (таймаут: %2 секунды)"
-AMF.Error="Не удалось открыть кодек AMF: %1"
-AMF.GenericError="Попробуйте установить последнюю версию <a href=\"https://obsproject.com/go/amd-drivers\">драйвера AMD</a> и закрыть прочее программное обеспечения для записи, которое может использовать кодировщик AMD, например, программное обеспечение от Radeon или Windows Game DVR."
+Encoder.Timeout="Кодировщик %1 слишком долго кодирует (время ожидания: %2 сек.)"
 AMF.8bitUnsupportedHdr="OBS не поддерживает 8-битный вывод Rec. 2100."
-AMF.10bitUnsupportedAvc="Невозможно выполнить 10-битное кодирование в кодировщике AMD H.264."
+AMF.10bitUnsupportedAvc="Не удаётся выполнить 10-битное кодирование в кодировщике AMD H.264."
+AMF.16bitUnsupported="Не удаётся выполнить 16-битное кодирование в этом кодировщике."
 NVENC.Error="Не удалось открыть кодек NVENC: %1"
 NVENC.GenericError="Попробуйте установить последнюю версию <a href=\"https://obsproject.com/go/nvidia-drivers\">драйвера NVIDIA</a> и закрыть прочее программное обеспечения для записи, которое может использовать NVENC, например, NVIDIA ShadowPlay или Windows Game DVR."
 NVENC.BadGPUIndex="Вы выбрали видеокарту под номером %1 в настройках кодирования. Выберите ГП под номером 0 и повторите попытку."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/si-LK.ini Changed

@@ -1,4 +1,8 @@
 FFmpegOutput="FFmpeg ප්‍රතිදානය"
+FFmpegALAC="FFmpeg ALAC (බිටු-24)"
+FFmpegFLAC="FFmpeg FLAC (බිටු-16)"
+FFmpegPCM16Bit="FFmpeg PCM (බිටු-16)"
+FFmpegPCM24Bit="FFmpeg PCM (බිටු-24)"
 FFmpegOpts="FFmpeg විකල්ප"
 Bitrate="බිටුඅනුපා."
 MaxBitrate="උපරිම බිටුඅනු."
@@ -6,11 +10,16 @@
 Profile="පැතිකඩ"
 RateControl="අනුපාතය පාලනය"
 Level="මට්ටම"
+FilePath="ගොනුවේ මාර්ගය"
+AMFOpts="AMF/FFmpeg විකල්ප"
 BFrames="උපරිම B-රාමු"
 VAAPI.Device="VAAPI උපාංගය"
 NVENC.CQLevel="CQ මට්ටම"
+NVENC.Tuning.hq="ඉහළ ගුණත්‍වය"
 AMF.Preset.speed="වේගය"
+AMF.Preset.balanced="සංතුලිත"
 AMF.Preset.quality="ගුණත්‍වය"
+AMF.Preset.highQuality="ඉහළ ගුණත්‍වය"
 FFmpegSource="මාධ්‍ය මූලාශ්‍රය"
 LocalFile="ස්ථානීය ගොනුව"
 Looping="පුඩුලීම"
@@ -19,12 +28,12 @@
 BufferingMB="ජාලය අන්තරාචය"
 HardwareDecode="තිබෙන විට දෘඩාංග විකේතනය භාවිතා කරන්න"
 ClearOnMediaEnd="ධාවනය නිමවූ විට කිසිත් නොපෙන්වන්න"
-Advanced="වැඩිදුර"
 RestartWhenActivated="මූලාශ්‍රය සක්‍රිය වූ විට නැවත ධාවනය අරඹන්න"
 CloseFileWhenInactive="අක්‍රිය වූ විට ගොනුව වසන්න"
 CloseFileWhenInactive.ToolTip="පටිගත කිරීමේ හෝ\nප්‍රචාරයේ මූලාශ්‍රය නොපෙන්වන විට ගොනුව වසා දමයි. මූලාශ්‍රය සක්‍රියව නැති විට ගොනුව සංශෝධනයට මෙය ඉඩ දෙයි,\nනමුත් මූලාශ්‍රය නැවත සක්‍රිය කරන විට යම් ආරම්භක ප්‍රමාදයක් තිබිය හැකිය."
 ColorRange="YUV වර්ණ පරාසය"
 ColorRange.Auto="ස්වයං"
+ColorRange.Partial="සීමිත"
 ColorRange.Full="පූර්ණ"
 RestartMedia="නැවත අරඹන්න"
 SpeedPercentage="වේගය"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/sk-SK.ini Changed

@@ -1,30 +1,24 @@
-FFmpegOutput="Výstup FFmpeg"
-FFmpegALAC="FFmpeg ALAC (24-bitový)"
-FFmpegFLAC="FFmpeg FLAC (16-bitový)"
-FFmpegPCM16Bit="FFmpeg PCM (16-bitový)"
-FFmpegPCM24Bit="FFmpeg PCM (24-bitový)"
-FFmpegPCM32BitFloat="FFmpeg PCM (32-bitové desatinné)"
+FFmpegOutput="FFmpeg výstup"
 FFmpegOpts="FFmpeg nastavenia"
-FFmpegOpts.ToolTip.Source="Umožní ti nastaviť FFmpeg nastavenia. Podporované su iba nastavenia v tvare nastavenie=hodnota.\nViaceré nastavenia je možno zadať s použitím medzery medzi nastaveniami.\nPríklad: rtsp_transport=tcp rtsp_flags=prefer_tcp"
+FFmpegOpts.ToolTip.Source="Umožní ti nastaviť FFmpeg nastavenia. Podporované su iba nastavenia v tvare parameter=hodnota.\nViaceré nastavenia je možno zadať s použitím medzery medzi nastaveniami.\nPríklad: rtsp_transport=tcp rtsp_flags=prefer_tcp"
 MaxBitrate="Max. bitrate"
 Preset="Predvoľba"
-Tuning="Ladenie"
 Profile="Profil"
 RateControl="Riadenie toku"
 KeyframeIntervalSec="Interval kľúčových snímkov (0=automaticky)"
 Lossless="Bezstratové"
-Level="Úroveň"
+FilePath="Cesta k súboru"
 AMFOpts="AMF/FFmpeg nastavenia"
 AMFOpts.ToolTip="Použite na špecifikovanie vlastných AMF a FFmpeg nastavení. Napríklad, \"level=5.2 profile=main\". Pozrite si dokumentáciu AMF enkodéra pre viac detailov."
 BFrames="Maximum B-snímkov"
-VAAPI.Codec="Kodek VAAPI"
 VAAPI.Device="Zariadenie VAAPI"
 NVENC.LookAhead.ToolTip="Aktivuje dynamické B-snímky.\n\nKeď sú vypnuté, enkodér bude vždy používať počet snímkov špecifikovaný v nastavení 'Maximum B-snímkov'.\n\nKeď sú zapnuté, zvýši sa vizuálna kvalita tým, že bude používať iba toľko B-snímkov, koľko je potrebné, až do maxima,\nna úkor zvýšeného používania GPU."
 NVENC.PsychoVisualTuning.ToolTip="Povolí nastavenia enkodéra, ktoré optimalizujú využitie bitrate pre vylepšenú vnímanú vizuálnu kvalitu,\nhlavne v situáciách s veľkým množstvom pohybu, na úkor zvýšenia používania GPU."
 NVENC.8bitUnsupportedHdr="OBS nepodporuje 8-bitový výstup z Rec. 2100."
 NVENC.I010Unsupported="NVENC nepodporuje I010. Použite P010 namiesto toho."
 NVENC.10bitUnsupported="Nemožno vykonať 10-bitové enkódovanie na tomto enkodéri."
-NVENC.TooManyBFrames="Nastavenie Maximum B-snímkov (%d) je vyššie než enkodér podporuje (%d)."
+NVENC.16bitUnsupported="Nemožno vykonať 16-bitové enkódovanie na tomto enkodéri."
+NVENC.NoAV1FallbackPossible="AV1 enkódovanie nie je dostupné s aktuálnymi nastaveniami. Skúste vypnúť akékoľvek škálovanie alebo GPU nastavenia, ktoré môžu byť nastavené. Pozrite si log súbor pre viac detailov."
 NVENC.Preset2.p1="P1: Najrýchlejší (Najnižšia kvalita)"
 NVENC.Preset2.p2="P2: Rýchlejší (Nižšia kvalita)"
 NVENC.Preset2.p3="P3: Rýchly (Nízka kvalita)"
@@ -33,11 +27,11 @@
 NVENC.Preset2.p6="P6: Pomalší (Lepšia kvalita)"
 NVENC.Preset2.p7="P7: Najpomalší (Najlepšia kvalita)"
 NVENC.Tuning.hq="Vysoká kvalita"
-NVENC.Tuning.ll="Nízka odozva"
-NVENC.Tuning.ull="Ultra nízka odozva"
-NVENC.Multipass="Viacprechodový mód"
+NVENC.Tuning.ll="Nízka latencia"
+NVENC.Tuning.ull="Ultra nízka latencia"
+NVENC.Multipass="Viacprechodový režim"
 NVENC.Multipass.disabled="Jeden prechod"
-NVENC.Multipass.qres="Dva prechody (štvrtina rozlíšenia)"
+NVENC.Multipass.qres="Dva prechody (štvrtinové rozlíšenie)"
 NVENC.Multipass.fullres="Dva prechody (plné rozlíšenie)"
 AMF.Preset.speed="Rýchlosť"
 AMF.Preset.balanced="Vyvážené"
@@ -51,7 +45,6 @@
 BufferingMB="Vyrovnávacia pamäť siete"
 HardwareDecode="Použiť hardvérové dekódovanie podľa dostupnosti"
 ClearOnMediaEnd="Po skončení prehrávania neukazovať nič"
-Advanced="Rozšírené"
 RestartWhenActivated="Obnoviť prehrávanie pri aktivovaní zdroja"
 CloseFileWhenInactive="Zatvoriť súbor pri neaktivite"
 CloseFileWhenInactive.ToolTip="Zatvorí súbor, ak zdroj nie je práve zobrazovaný vo vysielaní\nalebo nahrávaní. Toto umožní zmeny súboru pri neaktivite zdroja,\nale môže spôsobiť oneskorenie pri opätovnom použití zdroja."
@@ -69,17 +62,16 @@
 MediaFileFilter.VideoFiles="Video súbory"
 MediaFileFilter.AudioFiles="Zvukové súbory"
 MediaFileFilter.AllFiles="Všetky súbory"
-ReplayBuffer="Medzipamäť znovuprehratia"
+ReplayBuffer="Medzipamäť záznamu"
 ReplayBuffer.Save="Uložiť záznam"
 HelperProcessFailed="Nepodarilo sa spustiť pomocný proces nahrávania. Skontrolujte, či neboli súbory OBS zablokované alebo odstránené zabezpečovacím softvérom/antivírusom tretej strany."
 UnableToWritePath="Nedá sa zapisovať do %1. Uistite sa, že v ceste nahrávania má váš používateľský účet právo na zápis a že máte dostatok miesta na disku."
 WarnWindowsDefender="Ak je ochrana proti Ransomwaru Windows 10 zapnutá, tak to môže taktiež spôsobiť túto chybu. Skúste vypnúť kontrolovaný prístup do priečinkov vo Windows Zabezpečení / Ochrana pred vírusmi a hrozbami."
 Encoder.Error="Nepodarilo sa otvoriť %1: %2"
 Encoder.Timeout="Enkodéru %1 trvá enkódovanie príliš dlho (časový limit: %2 sekúnd)"
-AMF.Error="Nepodarilo sa otvoriť kodek AMF: %1"
-AMF.GenericError="Skúste nainštalovať najnovší <a href=\"https://obsproject.com/go/amd-drivers\">AMD ovládač</a> a zavrite iný nahrávací softvér, ktorý môže používať AMD enkodér, napríklad Radeon Software alebo Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS nepodporuje 8-bitový výstup z Rec. 2100."
 AMF.10bitUnsupportedAvc="Nemožno vykonať 10-bitové enkódovanie na enkodéri AMD H.264."
+AMF.16bitUnsupported="Nemožno vykonať 16-bitové enkódovanie na tomto enkodéri."
 NVENC.Error="Nepodarilo sa otvoriť kodek NVENC: %1"
 NVENC.GenericError="Skúste nainštalovať najnovší <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA ovládač</a> a zavrite iný nahrávací softvér, ktorý môže používať NVENC, napríklad NVIDIA ShadowPlay alebo Windows Game DVR."
 NVENC.BadGPUIndex="Zvolili ste GPU %1 vo vašich výstupových nastaveniach enkodéra. Nastavte to naspäť na 0 a skúste znova."
@@ -88,4 +80,4 @@
 NVENC.TooManySessions="Chyba NVENC: Priveľa súčasných relácií. Skúste zatvoriť ostatné nahrávacie programy, ktoré môžu používať NVENC, napríklad NVIDIA Shadowplay alebo Windows Game DVR."
 NVENC.CheckDrivers="Skúste nainštalovať najnovší <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA ovládač</a>."
 AV1.8bitUnsupportedHdr="OBS nepodporuje 8-bitový výstup z Rec. 2100."
-ReconnectDelayTime="Opätovné pripojenie oneskorenia"
+ReconnectDelayTime="Oneskorenie opätovné pripojenia"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/sl-SI.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="Izhod FFmpeg"
+FFmpegMuxer="Prepakirnik FFmpeg"
+FFmpegHlsMuxer="Prepakirnik HLS FFmpeg"
+FFmpegMpegtsMuxer="Prepakirnik MPEG-TS FFmpeg"
 FFmpegALAC="FFmpeg ALAC (24-bitno)"
 FFmpegFLAC="FFmpeg FLAC (16-bitno)"
 FFmpegPCM16Bit="FFmpeg PCM (16-bitno)"
@@ -15,10 +18,11 @@
 KeyframeIntervalSec="Razmik med ključnimi sličicami (0=samodejno)"
 Lossless="Brezizgubno"
 Level="Nivo"
+FilePath="Pot datoteke"
 AMFOpts="Možnosti AMF/FFmpeg"
 AMFOpts.ToolTip="Uporabite za določitev možnosti AMF ali FFmpeg po meri. Primer: \"level=5.2 profile=main\". Preverite dokumentacijo kodirnika AMF za podrobnosti."
+GPU="GPE"
 BFrames="Največje št. sličic B"
-VAAPI.Codec="VAAPI kodek"
 VAAPI.Device="VAAPI naprava"
 NVENC.LookAhead="Predvidevanje"
 NVENC.LookAhead.ToolTip="Omogoči dinamične sličice B.\n\nČe je onemogočeno, bo kodirnik vedno uporabil število sličic B, ki so navedene v nastavitvi 'Največje št. sličic B'.\n\nČe je omogočeno, bo vidna kakovost izboljšana, ker bo uporabljeno samo toliko sličic B, kot je potrebno, do\nnajvečjega števila na račun dodatne porabe GPE-ja."
@@ -28,7 +32,8 @@
 NVENC.8bitUnsupportedHdr="OBS ne podpira 8-bitnega izhoda z Rec. 2100."
 NVENC.I010Unsupported="NVENC ne podpira I010. Namesto tega uporabite P010."
 NVENC.10bitUnsupported="Na tem kodirniku ni mogoče izvesti 10-bitnega kodiranja."
-NVENC.TooManyBFrames="Najvišja nastavitev B-sličic (%d) je večja od tiste, ki ji podpira kodirnik (%d)."
+NVENC.16bitUnsupported="S tem kodirnikom ni mogoče izvesti 16-bitnega kodiranja."
+NVENC.NoAV1FallbackPossible="Kodiranje AV1 s trenutnimi nastavitvami ni na voljo. Poskusite onemogočiti spremembo velikosti ali možnosti GPE, ki so nastavljive. Preverite zapisnik za podrobnosti."
 NVENC.Preset2.p1="P1: najhitreje (najnižja kakovost)"
 NVENC.Preset2.p2="P2: hitreje (nižja kakovost)"
 NVENC.Preset2.p3="P3: hitro (nizka kakovost)"
@@ -55,7 +60,6 @@
 BufferingMB="Omrežno medpomnenje"
 HardwareDecode="Uporabi strojno odkodiranje, ko je na voljo"
 ClearOnMediaEnd="Ne prikaži ničesar, ko se predvajanje konča"
-Advanced="Napredno"
 RestartWhenActivated="Ponovno predvajaj, ki vir postane dejaven"
 CloseFileWhenInactive="Zapri datoteko, ko ni dejaven"
 CloseFileWhenInactive.ToolTip="Zapre datoteko, ki vir ni prikazan v pretoku ali posnetku. To omogoča\nspreminjanje datoteke, ko vir ni dejaven, vendar lahko pride do zakasnitve zagona,\nko vir ponovno postane dejaven."
@@ -81,10 +85,9 @@
 WarnWindowsDefender="To napako lahko povzroči tudi omogočena zaščita sistema Windows 10 proti izsiljevanju. V nastavitvah za varnost/zaščito proti virusom in grožnjami sistema Windows poizkusite izklopiti nadziran dostop do map."
 Encoder.Error="Ni mogoče odpreti %1: %2"
 Encoder.Timeout="Kodirnik %1 potrebuje preveč časa za kodiranje (časovna prekoračitev: %2 s)"
-AMF.Error="Napaka pri odpiranju kodeka AMF: %1"
-AMF.GenericError="Poskusite namestiti najnovejše <a href=\"https://obsproject.com/go/amd-drivers\">AMD gonilnike</a> in zaprite druge programe za snemanje, ki uporabljajo AMD kodirnik, kot so sta Radeon Software ali Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS ne podpira 8-bitnega izhoda z Rec. 2100."
 AMF.10bitUnsupportedAvc="Na kodirniku AMD H.264 ni mogoče izvesti 10-bitnega kodiranja."
+AMF.16bitUnsupported="S tem kodirnikom ni mogoče izvesti 16-bitnega kodiranja."
 NVENC.Error="Napaka pri odpiranju NVENC kodeka: %1"
 NVENC.GenericError="Poskusite namestiti najnovejše <a href=\"https://obsproject.com/go/nvidia-drivers\">AMD gonilnike</a> in zaprite druge programe za snemanje, ki uporabljajo NVENC kodirnik, kot so sta NVIDIA SHadowPlay ali Windows Game DVR."
 NVENC.BadGPUIndex="Imaš izbrano grafično kartico %1 v izhodni nastavitvah kodirnika. Nastavi to vrednost nazaj na 0 in poizkusi ponovno."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/sr-SP.ini Changed

@@ -20,7 +20,6 @@
 BufferingMB="Баферовање мреже"
 HardwareDecode="Користи хардверско енкодирање када је доступно"
 ClearOnMediaEnd="Не приказуј ништа када се плејбек заврши"
-Advanced="Напредно"
 RestartWhenActivated="Понови репродукцију када извор постане активан"
 CloseFileWhenInactive="Затвори фајл када је неактиван"
 CloseFileWhenInactive.ToolTip="Затворите фајл када извор није приказан током стримовања или\nна снимку. Ово омогућава фајлу да буде измењен када извор није активан, \nали је могуће да се јави одређено кашњење када се извор поново активира."
@@ -46,7 +45,6 @@
 WarnWindowsDefender="Ова грешка такође може да настане ако је Windows 10 Ransomware Protection укључен. Покушајте да искључите контролисани приступ фолдеру у подешавањима за Windows Сигурност/Заштиту од вируса."
 Encoder.Error="Неуспешно отварање %1: %2"
 Encoder.Timeout="Кодер %1 је предуго кодирао (истек времена: %2 s)"
-AMF.Error="Неуспешно отварање AMF кодека: %1"
 AMF.8bitUnsupportedHdr="OBS не подржава осмобитни излаз Rec. 2100."
 AMF.10bitUnsupportedAvc="Није могуће извршити десетобитно кодирање на AMD H.264 кодеру."
 NVENC.Error="Неуспешно отварање NVENC кодека: %1"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/sv-SE.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg-utmatning"
+FFmpegMuxer="FFmpeg-muxer"
+FFmpegHlsMuxer="FFmpeg HLS-muxer"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS-muxer"
 FFmpegALAC="FFmpeg ALAC (24-bitars)"
 FFmpegFLAC="FFmpeg FLAC (16-bitars)"
 FFmpegPCM16Bit="FFmpeg PCM (16-bitars)"
@@ -15,10 +18,11 @@
 KeyframeIntervalSec="Intervall för keyframes (0=automatiskt)"
 Lossless="Förlustfri"
 Level="Nivå"
+FilePath="Filsökväg"
 AMFOpts="AMF/FFmpeg-alternativ"
 AMFOpts.ToolTip="Använd för att ange anpassade AMF- eller FFmpeg-alternativ. Till exempel \"level=5.2 profile=main\". Kontrollera dokumentationen om AMF-kodare för mer information."
+GPU="Grafikprocessor"
 BFrames="Maximalt antal B-frames"
-VAAPI.Codec="VAAPI-kodek"
 VAAPI.Device="VAAPI-enhet"
 NVENC.LookAhead.ToolTip="Aktiverar dynamiska B-frames.\n\nOm detta inaktiveras kommer kodaren alltid använda antalet B-frames som anges i inställningen \"Max B-frames\".\n\nOm detta aktiveras kommer det öka den visuella kvaliteten genom att endast använda så många B-frames som är nödvändigt, upp till det som är möjligt\npå bekostnad av ökad användning av grafikprocessorn."
 NVENC.PsychoVisualTuning="Psykovisuell justering"
@@ -27,7 +31,8 @@
 NVENC.8bitUnsupportedHdr="OBS saknar stöd för 8-bitars utmatning av Rec. 2100."
 NVENC.I010Unsupported="NVENC saknar stöd för I010. Använd P010 istället."
 NVENC.10bitUnsupported="Kan inte utföra 10-bitars kodning på denna kodare."
-NVENC.TooManyBFrames="Inställningen för max antal B-frames (%d) är mer än vad kodaren har stöd för (%d)."
+NVENC.16bitUnsupported="Kan inte utföra kodning med 16-bitar på denna kodare."
+NVENC.NoAV1FallbackPossible="AV1-kodning är inte tillgänglig med nuvarande inställningar. Försök att inaktivera alla omskalnings- eller grafikprocessorrelaterade inställningar som kan har ändrats. Se loggen för mer information."
 NVENC.Preset2.p1="P1: Snabbast (lägst kvalitet)"
 NVENC.Preset2.p2="P2: Snabbare (lägre kvalitet)"
 NVENC.Preset2.p3="P3: Snabb (låg kvalitet)"
@@ -54,7 +59,6 @@
 BufferingMB="Nätverksbuffring"
 HardwareDecode="Använd hårdvaruavkodning när det är tillgängligt"
 ClearOnMediaEnd="Visa ingenting när uppspelningen slutar"
-Advanced="Avancerat"
 RestartWhenActivated="Starta om uppspelning när källa blir aktiv"
 CloseFileWhenInactive="Stäng filen vid inaktivitet"
 CloseFileWhenInactive.ToolTip="Stänger filen när källan inte visas i strömmen vid\ninspelning. Detta låter filen att ändras när källan inte är aktiv,\nmen en liten fördröjning kan uppstå när källan aktiveras igen."
@@ -80,10 +84,9 @@
 WarnWindowsDefender="Om skyddet mot ransomware i Windows 10 är aktiverat kan det också orsaka detta fel. Försök att inaktivera kontrollerad mappåtkomst i Windows-säkerhet / Inställningar för skydd mot virus & hot."
 Encoder.Error="Kunde inte öppna %1: %2"
 Encoder.Timeout="Kodare %1 tar för lång tid för att koda (timeout: %2 sekunder)"
-AMF.Error="Misslyckades att öppna AMF-kodare: %1"
-AMF.GenericError="Prova att installera den senaste drivrutinen från <a href=\"https://obsproject.com/go/amd-drivers\">AMD</a> och stäng sedan ner alla andra programvaror för inspelning som skulle kunna använda AMD-avkodaren så som Radeon Software eller Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS saknar stöd för 8-bitars utmatning av Rec. 2100."
 AMF.10bitUnsupportedAvc="Kan inte utföra 10-bitars kodning på AMD H.264-kodare."
+AMF.16bitUnsupported="Kan inte utföra kodning med 16-bitar på denna kodare."
 NVENC.Error="Det gick inte att öppna NVENC-codec: %1"
 NVENC.GenericError="Prova att installera den senaste drivrutinen från <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA</a> och stäng sedan ner alla andra programvaror för inspelning som skulle kunna använda NVENC som till exempel NVIDIA ShadowPlay eller Windows Game DVR."
 NVENC.BadGPUIndex="Du har valt grafikprocessorn %1 i inställningarna för din utmatningskodare. Återställ detta till 0 och försök igen."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/szl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/szl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/ta-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/th-TH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/th-TH.ini Changed

@@ -14,7 +14,9 @@
 KeyframeIntervalSec="ช่วงคีย์เฟรม (0=อัตโนมัติ)"
 Lossless="ไม่มีการสูญเสีย"
 Level="ระดับ"
+FilePath="ตำแหน่งไฟล์"
 AMFOpts="ตัวเลือก AMF/FFmpeg"
+GPU="จีพียู"
 BFrames="บี-เฟรม สูงสุด"
 VAAPI.Device="อุปกรณ์ VAAPI"
 NVENC.LookAhead="มองไปข้างหน้า"
@@ -24,6 +26,8 @@
 NVENC.8bitUnsupportedHdr="OBS ไม่รองรับเอาต์พุต 8 บิตของ Rec 2100 นะ"
 NVENC.I010Unsupported="NVENC ไม่รองรับ I010 ใช้ P010 แทนนะ"
 NVENC.10bitUnsupported="ไม่สามารถทำการเข้ารหัส 10 บิตบนตัวเข้ารหัสนี้ได้นะ"
+NVENC.16bitUnsupported="ไม่สามารถเข้ารหัสแบบ 16 บิตบนตัวเข้ารหัสนี้ได้"
+NVENC.NoAV1FallbackPossible="การเข้ารหัสแบบ AV1 นั้นไม่สามารถใช้งานได้กับการตั้งค่าปัจจุบัน ลองปิดใช้งานการปรับขนาดใหม่หรือตัวเลือก GPU ที่อาจตั้งค่าเอาไว้ ตรวจสอบบันทึกสำหรับรายละเอียดเพิ่มเติม"
 NVENC.Preset2.p1="P1: เร็วที่สุด (คุณภาพต่ำสุด)"
 NVENC.Preset2.p2="P2: เร็วกว่า (คุณภาพต่ำกว่า)"
 NVENC.Preset2.p3="P3: เร็ว (คุณภาพต่ำ)"
@@ -50,7 +54,6 @@
 BufferingMB="ขนาดบัฟเฟอร์เครือข่าย"
 HardwareDecode="ใช้การถอดรหัสฮาร์ดแวร์เมื่อมีให้ใช้"
 ClearOnMediaEnd="ไม่แสดงอะไรเลยเมื่อเล่นจบ"
-Advanced="ตัวเลือกขั้นสูง"
 RestartWhenActivated="เริ่มเล่นใหม่เมื่อแหล่งสัญญาณเปิดใช้งานอยู่"
 CloseFileWhenInactive="ปิดไฟล์เมื่อไม่ได้ใช้งาน"
 CloseFileWhenInactive.ToolTip="ปิดไฟล์เมื่อไม่ได้แสดงแหล่งที่มาบนสตรีมหรือ\nการบันทึก ซึ่งช่วยให้สามารถเปลี่ยนไฟล์ได้เมื่อแหล่งที่มาไม่ได้ใช้งาน\nแต่อาจมีความล่าช้าในการเริ่มต้นเมื่อแหล่งที่มาเปิดใช้งานอีกครั้ง"
@@ -74,10 +77,16 @@
 HelperProcessFailed="ไม่สามารถเริ่มกระบวนการตัวช่วยบันทึกได้ ตรวจสอบว่าไฟล์ OBS ไม่ถูกบล็อกหรือลบโดยซอฟต์แวร์ป้องกันไวรัส/ความปลอดภัยของบุคคลที่สาม"
 UnableToWritePath="ไม่สามารถเขียนถึง %1 ตรวจสอบให้แน่ใจว่าคุณใช้เส้นทางการบันทึกซึ่งบัญชีผู้ใช้ของคุณได้รับอนุญาตให้เขียนและมีพื้นที่ดิสก์เพียงพอ"
 WarnWindowsDefender="หากเปิดใช้งาน Windows 10 Ransomware Protection ก็อาจทำให้เกิดข้อผิดพลาดนี้ได้ ลองปิดการเข้าถึงโฟลเดอร์ที่ควบคุมในการตั้งค่าความปลอดภัยของ Windows / ไวรัสและภัยคุกคาม"
+Encoder.Error="เปิดไม่สำเร็จ %1: %2"
+Encoder.Timeout="Encoder %1 คือใช้เวลานานเกินไปในการเข้ารหัส (timeout: %2 seconds)"
 AMF.8bitUnsupportedHdr="OBS ไม่รองรับเอาต์พุต 8 บิตในรูปแบบ Rec 2100 นะ"
 AMF.10bitUnsupportedAvc="ไม่สามารถทำการเข้ารหัส 10 บิตบนตัวเข้ารหัส AMD H.264 ได้นะ"
+AMF.16bitUnsupported="ไม่สามารถเข้ารหัสแบบ 16 บิตบนตัวเข้ารหัสนี้ได้"
 NVENC.Error="ไม่สามารถเปิดตัวแปลงสัญญาณ NVENC: %1"
 NVENC.BadGPUIndex="คุณได้เลือก GPU %1 ในการตั้งค่าตัวเข้ารหัสเอาต์พุตของคุณ ตั้งค่ากลับเป็น 0 แล้วลองอีกครั้ง"
+NVENC.OutdatedDriver="ไดรเวอร์ NVIDIA ที่ติดตั้งไม่รองรับเวอร์ชัน NVENC นี้ ลอง <a href=\"https://obsproject.com/go/nvidia-drivers\">อัพเดตไดรเวอร์</a>."
+NVENC.UnsupportedDevice="ข้อผิดพลาด NVENC: อุปกรณ์ไม่รองรับ ตรวจสอบการ์ดแสดงผลของคุณ <a href=\"https://obsproject.com/go/nvenc-matrix\">รองรับ NVENC</a> และพยายาม <a href=\"https://obsproject.com/go/nvidia-drivers\">อัพเดตไดรเวอร์</a>."
 NVENC.TooManySessions="ข้อผิดพลาด NVENC: มีเซสชันพร้อมกันมากเกินไป ลองปิดซอฟต์แวร์บันทึกอื่นที่อาจใช้ NVENC เช่น NVIDIA Shadowplay หรือ Windows Game DVR"
+NVENC.CheckDrivers="ลองติดตั้งเวอร์ชันล่าสุด <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA ไดรเวอร์</a>."
 AV1.8bitUnsupportedHdr="OBS ไม่รองรับเอาต์พุต 8 บิตในรูปแบบ Rec 2100 นะ"
 ReconnectDelayTime="เชื่อมต่อล่าช้า"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/tl-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/tl-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/tr-TR.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg Çıkışı"
+FFmpegMuxer="FFmpeg Muxlayıcı"
+FFmpegHlsMuxer="FFmpeg HLS Muxlayıcı"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS Muxlayıcı"
 FFmpegPCM32BitFloat="FFmpeg PCM (32-bit Kayan nokta)"
 FFmpegOpts="FFmpeg Ayarları"
 FFmpegOpts.ToolTip.Source="FFmpeg seçeneklerini ayarlamanıza izin verir. Bu, yalnızca seçenek=değer biçimindeki seçenekleri kabul eder.\nBoşlukla ayırarak birden fazla seçenek ayarlanabilir.\nÖrnek: rtsp_transport=tcp rtsp_flags=prefer_tcp"
@@ -11,8 +14,10 @@
 KeyframeIntervalSec="Anahtar Kare Aralığı (0=otomatik)"
 Lossless="Kayıpsız"
 Level="Seviye"
+FilePath="Dosya Yolu"
 AMFOpts="AMF/FFmpeg Ayarları"
 AMFOpts.ToolTip="Özel AMF ya da FFmpeg seçeneklerini belirtmek için kullanın. Örneğin, \"seviye=5.2 profil=main\". Daha fazla detay için AMF kodlayıcı dosyalarını kontrol edin."
+GPU="Ekran Kartı"
 BFrames="Maksimum B-kareleri"
 VAAPI.Device="VAAPI Aygıtı"
 NVENC.LookAhead="İleri bakma"
@@ -23,7 +28,8 @@
 NVENC.8bitUnsupportedHdr="OBS Rec. 2100'ün 8-bit olarak çıkışını desteklemiyor."
 NVENC.I010Unsupported="NVENC, I010 desteklemiyor. Bunun yerine P010 kullanın."
 NVENC.10bitUnsupported="Bu kodlayıcıda 10-bit kodlama gerçekleştirilemiyor."
-NVENC.TooManyBFrames="Maksimum B-kare ayarı (%d), kodlayıcının desteklediğinden (%d) fazla."
+NVENC.16bitUnsupported="Bu kodlayıcıda 16 bit kodlama gerçekleştirilemiyor."
+NVENC.NoAV1FallbackPossible="AV1 kodlaması mevcut ayarlarla kullanılamaz. Ayarlanmış olabilecek tüm yeniden ölçeklendirme veya GPU seçeneklerini devre dışı bırakmayı deneyin. Daha fazla ayrıntı için günlüğü kontrol edin."
 NVENC.Preset2.p1="P1: En Hızlı (En Düşük Kalite)"
 NVENC.Preset2.p2="P2: Daha Hızlı (Daha Düşük Kalite)"
 NVENC.Preset2.p3="P3: Hızlı (Düşük Kalite)"
@@ -50,7 +56,6 @@
 BufferingMB="Ağ Arabelleğe Alma"
 HardwareDecode="Kullanılabilir ise, donanım kod çözmeyi kullan"
 ClearOnMediaEnd="Oynatma bittiğinde hiçbir şey gösterme"
-Advanced="Gelişmiş"
 RestartWhenActivated="Yeniden oynatmayı kaynak etkin olduğunda yeniden başlat"
 CloseFileWhenInactive="Etkin değilken dosyayı kapat"
 CloseFileWhenInactive.ToolTip="Kaynak yayında veya kayıtta gösterilmiyorken dosyayı kapatır.\nBu dosya etkin değilken onun değiştirilmesine izin verir,\nancak kaynak yeniden etkinleşirken başlatmada gecikme olabilir."
@@ -76,10 +81,9 @@
 WarnWindowsDefender="Eğer Windows 10 Fidye Virüsü koruması etkinse bu hataya neden olabilir. Windows Güvenlik / Virüs & tehdit koruması ayarlarından kontrollü klasör erişimini kapatmayı dene."
 Encoder.Error="%1 açılamadı: %2"
 Encoder.Timeout="%1 kodlayıcı kodlaması çok uzun sürüyor (zaman aşımı: %2 saniye)"
-AMF.Error="AMF kodeği açılamadı: %1"
-AMF.GenericError="<a href=\"https://obsproject.com/go/amd-drivers\">AMD Sürücüsü</a>'nün son sürümünü indirmeyi deneyin ve AMD kodlayıcısını kullanıyor olabilecek diğer Radeon Yazılımı veya Windows Game DVR gibi kayıt programlarını kapatın."
 AMF.8bitUnsupportedHdr="OBS Rec. 2100'ün 8-bit olarak çıkışını desteklemiyor."
 AMF.10bitUnsupportedAvc="AMD H.264 kodlayıcıda 10-bit kodlama gerçekleştirilemiyor."
+AMF.16bitUnsupported="Bu kodlayıcıda 16 bit kodlama gerçekleştirilemiyor."
 NVENC.Error="NVENC kodeği açılamadı: %1"
 NVENC.GenericError="<a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA Sürücüsü</a>'nün son sürümünü indirmeyi deneyin ve NVENC kullanıyor olabilecek diğer NVIDIA ShadowPlay veya Windows Game DVR gibi kayıt programlarını kapatın."
 NVENC.BadGPUIndex="Çıkış kodlayıcı ayarlarınızda GPU %1 seçili. 0 olarak ayarlayın ve tekrar deneyin."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/uk-UA.ini Changed

@@ -15,10 +15,10 @@
 KeyframeIntervalSec="Інтервал ключових кадрів (0=авто)"
 Lossless="Без втрат"
 Level="Рівень"
+FilePath="Шлях до файлу"
 AMFOpts="Параметри AMF/FFmpeg"
 AMFOpts.ToolTip="Скористайтесь, щоб задати параметри AMF або FFmpeg. Наприклад, \"level=5.2 profile=main\". Подробиці шукайте в документації кодувальника AMF."
 BFrames="Максимальна кількість B-кадрів"
-VAAPI.Codec="Кодек VAAPI"
 VAAPI.Device="Пристрій VAAPI"
 NVENC.LookAhead="Передбачення (Look-ahead)"
 NVENC.LookAhead.ToolTip="Дозволяє використовувати динамічні B-кадри.\n\nЯкщо опцію вимкнено – кодувальник завжди буде використовувати кількість B-кадрів, заданих у налаштуванні «Максимальна кількість B-кадрів».\n\nЯкщо увімкнено – це поліпшить якість зображення завдяки використанню необхідної кількості B-кадрів (не більше вказаного максимуму), але\nце збільшить навантаження на графічний процесор."
@@ -28,7 +28,8 @@
 NVENC.8bitUnsupportedHdr="OBS не підтримує 8-розрядний вивід з Rec. 2100."
 NVENC.I010Unsupported="NVENC не підтримує I010. Використайте P010 натомість."
 NVENC.10bitUnsupported="Не можна виконати 10-розрядний код на цьому кодувальнику."
-NVENC.TooManyBFrames="Максимальний параметр B-кадрів (%d) більше ніж підтримує кодувальник (%d)."
+NVENC.16bitUnsupported="Не можна виконати 16-розрядний код на цьому кодувальнику."
+NVENC.NoAV1FallbackPossible="Кодування AV1 недоступне за поточних налаштувань. Спробуйте вимкнути всі налаштовані параметри перемасштабування або графічного процесора. Перегляньте журнал для отримання докладнішої інформації."
 NVENC.Preset2.p1="P1: Найвища (найнижча якість)"
 NVENC.Preset2.p2="P2: Швидша (нижча якість)"
 NVENC.Preset2.p3="P3: Швидка (низька якість)"
@@ -55,7 +56,6 @@
 BufferingMB="Мережева буферизація"
 HardwareDecode="Використовувати апаратне декодування при наявності"
 ClearOnMediaEnd="Не показувати джерело, коли відтворення завершено"
-Advanced="Розширені параметри"
 RestartWhenActivated="Перезапустити відтворення, коли джерело стає активним"
 CloseFileWhenInactive="Закрити файл, коли неактивний"
 CloseFileWhenInactive.ToolTip="Закриває файл, коли джерело не показується у трансляції чи записі.\nЦе дозволяє редагувати файл, коли джерело неактивне, але може виникнути\nдеяка затримка запуску, коли джерело знову активується."
@@ -81,10 +81,9 @@
 WarnWindowsDefender="Якщо Windows 10 Ransomware Protection (захист від програм-вимагачів) увімкнено – це також може спричинити цю помилку. Спробуйте вимкнути керований доступ до папок у «Безпека у Windows» - «Захист від вірусів і загроз»."
 Encoder.Error="Не вдалося відкрити %1: %2"
 Encoder.Timeout="Перекодування %1 триває занадто довго (затримка: %2 секунд)"
-AMF.Error="Не вдалося відкрити кодек AMF: %1"
-AMF.GenericError="Спробуйте встановити найновіший <a href=\"https://obsproject.com/go/amd-drivers\">драйвер AMD</a> і закрити інші програми запису, які можуть використовувати кодувальник AMD, наприклад, Radeon Software або Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS не підтримує 8-розрядний вивід з Rec. 2100."
 AMF.10bitUnsupportedAvc="Не вдалося виконати 10-розрядний код на кодувальнику AMD H.264."
+AMF.16bitUnsupported="Не можна виконати 16-розрядний код на цьому кодувальнику."
 NVENC.Error="Не вдалося відкрити кодек NVENC: %1"
 NVENC.GenericError="Спробуйте встановити найновіший <a href=\"https://obsproject.com/go/nvidia-drivers\">драйвер NVIDIA</a> і закрити інші програми запису, які можуть використовувати NVENC, такі як NVIDIA ShadowPlay або Windows Game DVR."
 NVENC.BadGPUIndex="Ви обрали ГП %1 у своїх налаштуваннях виведення кодувальника. Поверніть його в 0 і спробуйте знову."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/vi-VN.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg đầu ra"
+FFmpegMuxer="Bộ chuyển đổi FFmpeg"
+FFmpegHlsMuxer="Bộ chuyển đổi FFmpeg HLS"
+FFmpegMpegtsMuxer="Bộ chuyển đổi MPEG-TS"
 FFmpegPCM32BitFloat="FFmpeg PCM (32-bit nổi)"
 FFmpegOpts="Các tuỳ chọn FFmpeg"
 FFmpegOpts.ToolTip.Source="Cho phép bạn chọn các thiết lập FFmpeg. Chỉ có các thiết lập với định dạng option=value được chấp nhận ở đây.\nNhiều thiết lập có thể được chọn bằbawngvieecj sử dụng phím cách để phân cách chúng.\nVí dụ: rtsp_transport=tcp rtsp_flags=prefer_tcp"
@@ -10,10 +13,10 @@
 RateControl="Cách kiểm soát bitrate"
 KeyframeIntervalSec="Thời Gian Giữa Các Khung Chính (0=tự động)"
 Level="Cấp độ"
+FilePath="Đường dẫn tệp"
 AMFOpts="Tuỳ chọn AMF/FFmpeg"
 AMFOpts.ToolTip="Sử dụng để chỉ định tùy chọn AMF hoặc FFmpeg tùy chỉnh. Ví dụ: \"level=5.2 profile=main\". Kiểm tra tài liệu mã hóa AMF để biết thêm chi tiết."
 BFrames="Khung-B tối đa"
-VAAPI.Codec="Bộ biên giải mã VAAPI"
 VAAPI.Device="Thiết bị VAAPI"
 NVENC.LookAhead.ToolTip="Bật chế độ khung hình B động.\n\nNếu tắt, trình mã hóa sẽ luôn sử dụng số khung hình B được chỉ định trong cài đặt 'Khung hình B tối đa'.\n\nNếu bật, nó sẽ tăng chất lượng hình ảnh bằng cách sử dụng số lượng khung hình B cần thiết, lên tới tối đa,\nnhưng tăng sử dụng GPU."
 NVENC.PsychoVisualTuning="Tinh chỉnh tâm lý thị giác"
@@ -22,7 +25,8 @@
 NVENC.8bitUnsupportedHdr="OBS không hỗ trợ đầu ra 8-bit của Rec. 2100."
 NVENC.I010Unsupported="NVENC không hỗ trợ I010. Sử dụng P010 thay thế."
 NVENC.10bitUnsupported="Không thể thực hiện mã hóa 10-bit trên bộ mã hóa này."
-NVENC.TooManyBFrames="Tùy chọn khung B-frame tối đa (%d) nhiều hơn tùy chọn mà bộ giải mã này hỗ trợ (%d)."
+NVENC.16bitUnsupported="Không thể thực hiện mã hóa 16-bit trên encoder này."
+NVENC.NoAV1FallbackPossible="Mã hóa AV1 (Encoding) không khả dụng với cài đặt hiện tại. Hãy thử tắt bất kỳ tùy chọn GPU hoặc thay đổi quy mô nào có thể được đặt. Kiểm tra log để biết thêm chi tiết."
 NVENC.Preset2.p1="P1: Nhanh nhất (Chất lượng thấp nhất)"
 NVENC.Preset2.p2="P2: Nhanh hơn (Chất lượng thấp hơn)"
 NVENC.Preset2.p3="P3: Nhanh (Chất lượng thấp)"
@@ -49,7 +53,6 @@
 BufferingMB="Bộ đệm mạng"
 HardwareDecode="Sử dụng phần cứng để giải mã khi có"
 ClearOnMediaEnd="Không hiện gì cả khi kết thúc phát lại"
-Advanced="Nâng cao"
 RestartWhenActivated="Khởi động lại phát lại khi nguồn hoạt động trở lại"
 CloseFileWhenInactive="Đóng tệp khi không hoạt động"
 CloseFileWhenInactive.ToolTip="Đóng tập tin khi nguồn không được hiển thị trên luồng hoặc\nghi âm. Điều này cho phép thay đổi file khi nguồn không hoạt động,\nnhưng có thể có độ trễ khởi động khi nguồn hoạt động trở lại."
@@ -74,10 +77,9 @@
 WarnWindowsDefender="Nếu Windows 10 Ransomware Protection đang bật thì có thể gây ra lỗi này. Thử tắt Controlled Folder Access trong cài đặt Windows Security / Virus & threat protection."
 Encoder.Error="Không thể mở %1: %2"
 Encoder.Timeout="Bộ biên mã %1 tốn quá nhiều thời gian để biên mã (quá thời gian: %2 giây)"
-AMF.Error="Mở bộ biên giải mã (codec) AMF thất bại: %1"
-AMF.GenericError="Hãy thử cài đặt <a href=\"https://obsproject.com/go/amd-drivers\">trình điều khiển AMD</a> mới nhất và đóng phần mềm ghi khác có thể đang sử dụng bộ mã hóa AMD chẳng hạn như Radeon Software hoặc Windows Game DVR."
 AMF.8bitUnsupportedHdr="OBS không hỗ trợ đầu ra 8-bit của Rec. 2100."
 AMF.10bitUnsupportedAvc="Không thể thực hiện mã hóa 10-bit trên bộ mã hóa AMD H.264."
+AMF.16bitUnsupported="Không thể thực hiện mã hóa 16-bit trên encoder này."
 NVENC.Error="Không thể mở bộ biên giải mã NVENC: %1"
 NVENC.GenericError="Hãy thử cài đặt <a href=\"https://obsproject.com/go/nvidia-drivers\">trình điều khiển NVIDIA</a> mới nhất và đóng phần mềm ghi khác có thể đang sử dụng NVENC, chẳng hạn như NVIDIA ShadowPlay hoặc Windows Game DVR."
 NVENC.BadGPUIndex="Bạn đã lựa chọn GPU %1 trong phần thiết đặt bộ biên giải mã đầu ra của bạn. Đặt nó lại thành 0 và thử lại."

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/zh-CN.ini Changed

@@ -1,4 +1,7 @@
 FFmpegOutput="FFmpeg 输出"
+FFmpegMuxer="FFmpeg 封装器"
+FFmpegHlsMuxer="FFmpeg HLS 封装器"
+FFmpegMpegtsMuxer="FFmpeg MPEG-TS 封装器"
 FFmpegALAC="FFmpeg ALAC (24位)"
 FFmpegFLAC="FFmpeg FLAC (16位)"
 FFmpegPCM16Bit="FFmpeg PCM (16位)"
@@ -7,7 +10,7 @@
 FFmpegOpts="FFmpeg 选项"
 FFmpegOpts.ToolTip.Source="允许您设置 FFmpeg 选项。只接受 option=value 格式的选项。\n如需设置多个选项，可以用空格分隔。\n例如：rtsp_transport=tcp rtsp_flags=prefer_tcp"
 Bitrate="码率"
-MaxBitrate="最大码率"
+MaxBitrate="最高码率"
 Preset="预设"
 Tuning="调节"
 Profile="配置"
@@ -15,27 +18,28 @@
 KeyframeIntervalSec="关键帧间隔（0=自动）"
 Lossless="无损"
 Level="等级"
+FilePath="文件路径"
 AMFOpts="AMF/FFmpeg 选项"
 AMFOpts.ToolTip="用于自定义 AMF 或 FFmpeg 选项。例如，\"level=5.2 profile=main\"。请查看AMF 编码器文档以了解更多详情。"
 BFrames="最大B帧"
-VAAPI.Codec="VAAPI 编解码器"
 VAAPI.Device="VAAPI 设备"
 NVENC.LookAhead="前向考虑"
 NVENC.LookAhead.ToolTip="开启动态B帧。\n\n如果禁用，编码器将始终使用“最大B帧”设置中指定的B帧数。\n\n如果开启，它将通过仅使用足够多的B帧来提高视觉质量，直到最大，\n但以增加 GPU 使用率为代价。"
 NVENC.PsychoVisualTuning="心理视觉调整"
 NVENC.PsychoVisualTuning.ToolTip="开启编码器设置以优化码率使用，以提高 GPU 使用率为代价，\n可在快速运动场景下提高人眼感知的视频质量。"
 NVENC.CQLevel="CQ 级别"
-NVENC.8bitUnsupportedHdr="OBS不支持Rec.2100的 8-bit 输出。"
+NVENC.8bitUnsupportedHdr="OBS不支持Rec. 2100的 8-bit 输出。"
 NVENC.I010Unsupported="NVENC 不支持 I010。 请使用 P010 替代。"
 NVENC.10bitUnsupported="无法在此编码器上执行 10-bit 编码。"
-NVENC.TooManyBFrames="最大 B 帧设置（%d）超过编码器限制（%d）"
-NVENC.Preset2.p1="P1：最快 (质量最低)"
-NVENC.Preset2.p2="P2：更快 (质量更低)"
-NVENC.Preset2.p3="P3：快速 (质量低)"
-NVENC.Preset2.p4="P4：中等 (质量中等)"
-NVENC.Preset2.p5="P5：慢速 (质量高)"
-NVENC.Preset2.p6="P6：更慢 (质量更高)"
-NVENC.Preset2.p7="P7：最慢 (质量最高)"
+NVENC.16bitUnsupported="无法在此编码器上进行 16-bit 编码。"
+NVENC.NoAV1FallbackPossible="AV1 编码在当前设置上不可用。请尝试禁用任何可能被设置的重新缩放设置或 GPU 设置。在日志中查看更多细节。"
+NVENC.Preset2.p1="P1：最快 (最低质量)"
+NVENC.Preset2.p2="P2：更快 (低质量)"
+NVENC.Preset2.p3="P3：快速 (较低质量)"
+NVENC.Preset2.p4="P4：中等 (中等质量)"
+NVENC.Preset2.p5="P5：慢速 (较高质量)"
+NVENC.Preset2.p6="P6：更慢 (高质量)"
+NVENC.Preset2.p7="P7：最慢 (最高质量)"
 NVENC.Tuning.hq="高质量"
 NVENC.Tuning.ll="低延迟"
 NVENC.Tuning.ull="超低延迟"
@@ -55,7 +59,6 @@
 BufferingMB="网络缓冲"
 HardwareDecode="在可用时使用硬件解码"
 ClearOnMediaEnd="播放结束时不显示任何内容"
-Advanced="高级"
 RestartWhenActivated="当源变为活动状态时重新启动播放"
 CloseFileWhenInactive="非活跃状态时关闭文件"
 CloseFileWhenInactive.ToolTip="当源没有被用以串流或录像时关闭文件。\n这允许在源未被使用时更改文件，\n但在重新启动源时可能会有些许的启动延迟。"
@@ -77,14 +80,13 @@
 ReplayBuffer="回放缓存"
 ReplayBuffer.Save="保存回放"
 HelperProcessFailed="无法启动录制助手进程。检查 OBS 文件未被任何第三方防病毒 / 安全软件阻止或删除。"
-UnableToWritePath="无法写入到 %1。请确保您使用的录像路径允许您的用户帐户写入，并且磁盘空间充足。"
+UnableToWritePath="无法写入到 %1。请确保您使用的录像路径允许您的用户账户写入，并且磁盘空间充足。"
 WarnWindowsDefender="Windows 10 的勒索软件防护机制也可能导致该错误的发生。请尝试关闭 Windows 安全中心 - 勒索软件防护中的文件夹限制访问。"
 Encoder.Error="打开 %1 失败：%2"
 Encoder.Timeout="编码器 %1 编码耗时过长(超时时间: %2 秒)"
-AMF.Error="打开 AMF 编解码器失败：%1"
-AMF.GenericError="尝试安装最新的<a href=\"https://obsproject.com/go/amd-drivers\">AMD 驱动程序</a>并关闭其他可能使用 AMD 编码器的录制软件，例如 Radeon 软件或 Windows Game DVR。"
-AMF.8bitUnsupportedHdr="OBS不支持Rec.2100的 8-bit 输出。"
+AMF.8bitUnsupportedHdr="OBS不支持Rec. 2100的 8-bit 输出。"
 AMF.10bitUnsupportedAvc="无法在 AMD H.264 编码器上执行 10-bit 编码。"
+AMF.16bitUnsupported="无法在此编码器上进行 16-bit 编码。"
 NVENC.Error="打开 NVENC 编解码器失败： %1"
 NVENC.GenericError="尝试安装最新的<a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA 驱动程序</a>并关闭其他可能使用 NVIDIA 编码器的录制软件，例如 NVIDIA ShadowPlay 或 Windows Game DVR。"
 NVENC.BadGPUIndex="您已输出编码器设置中选择了 GPU %1 。请将其设为 0，然后重试。"
@@ -92,5 +94,5 @@
 NVENC.UnsupportedDevice="NVENC 错误：不支持的设备。请检查您的显卡是否<a href=\"https://obsproject.com/go/nvenc-matrix\">支持NVENC</a>，并尝试<a href=\"https://obsproject.com/go/nvidia-drivers\">更新驱动</a>。"
 NVENC.TooManySessions="NVENC 错误：并发会话数太多。请尝试关闭可能使用 NVENC 的其他录制软件，如NVIDIA ShadowPlay 或 Windows Game DVR。"
 NVENC.CheckDrivers="请尝试安装最新的 <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA 驱动</a>。"
-AV1.8bitUnsupportedHdr="OBS不支持Rec.2100的 8-bit 输出。"
+AV1.8bitUnsupportedHdr="OBS不支持Rec. 2100的 8-bit 输出。"
 ReconnectDelayTime="重连时间间隔"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/data/locale/zh-TW.ini Changed

@@ -15,10 +15,10 @@
 KeyframeIntervalSec="關鍵訊框間隔（0 = 自動）"
 Lossless="無損"
 Level="級別"
+FilePath="檔案路徑"
 AMFOpts="AMF/FFmpeg 選項"
 AMFOpts.ToolTip="用來指定自訂的 AMF 或 FFmpeg 選項。舉例來說：「level=5.2 profile=main」。要深入了解，請參閱 AMF 編碼器文件。"
 BFrames="最大 B 畫格數"
-VAAPI.Codec="VAAPI 編碼器"
 VAAPI.Device="VAAPI 裝置"
 NVENC.LookAhead="編碼緩衝預測"
 NVENC.LookAhead.ToolTip="啟用動態B幀。 \n\n如果禁用，編碼器將始終使用“最大B幀”設置中指定的B幀數。 \n\n如果啟用，它將僅通過使用盡可能多的B幀來提高視覺品質，直到最大，\n但以增加 GPU 使用率為代價。"
@@ -28,7 +28,8 @@
 NVENC.8bitUnsupportedHdr="OBS 不支援 Rec. 2100 的 8 位輸出。"
 NVENC.I010Unsupported="NVENC 不支援 I010。請改用 P010。"
 NVENC.10bitUnsupported="無法在此編碼器進行 10-bit 編碼。"
-NVENC.TooManyBFrames="最大 B 影格 (B-frame) 設定 (%d) 大於編碼器支援的值 (%d)。"
+NVENC.16bitUnsupported="無法在此編碼器進行 16 位編碼。"
+NVENC.NoAV1FallbackPossible="AV1 編碼不能在目前的設定下使用。請嘗試停用任何你可能設定到的 re-scaling 或 GPU 選項。深入了解請參閱記錄檔。"
 NVENC.Preset2.p1="P1：最快速（畫質最低）"
 NVENC.Preset2.p2="P2：更快速（畫質更低）"
 NVENC.Preset2.p3="P3：快速（低畫質）"
@@ -55,7 +56,6 @@
 BufferingMB="網路緩衝"
 HardwareDecode="盡可能使用硬體解碼"
 ClearOnMediaEnd="播放結束時不顯示任何內容"
-Advanced="進階"
 RestartWhenActivated="當來源可使用時重新播放"
 CloseFileWhenInactive="非使用狀態時關閉檔案"
 CloseFileWhenInactive.ToolTip="當來源沒有被用以串流或錄影時關閉檔案。\n這允許來源在非使用狀態時更改檔案，但在\n來源重新啟用時可能會有許些的啟動延遲。"
@@ -81,10 +81,9 @@
 WarnWindowsDefender="如果啟用了 Windows 10 勒索軟體保護，也可能會導致此錯誤。請試試將 Windows 安全性 > 病毒與威脅防護 設定中的 受控資料夾存取權 關閉。"
 Encoder.Error="無法開啟 %1：%2"
 Encoder.Timeout="%1 編碼器花太久編碼（超時：%2 秒）"
-AMF.Error="無法開啟 AMF 編解碼器：%1"
-AMF.GenericError="請嘗試安裝最新版本的 <a href=\"https://obsproject.com/go/amd-drivers\">AMD 驅動程式</a> 並關閉其他可能正在使用 AMD 編碼器的錄影軟體，如 Radeon Software 或 Windows Game DVR。"
 AMF.8bitUnsupportedHdr="OBS 不支援 Rec. 2100 的 8 位輸出。"
 AMF.10bitUnsupportedAvc="無法在 AMD H.264 編碼器上進行 10 位編碼。"
+AMF.16bitUnsupported="無法在此編碼器進行 16 位編碼。"
 NVENC.Error="無法開啟 NVENC 編碼器：%1"
 NVENC.GenericError="請嘗試安裝最新版本的 <a href=\"https://obsproject.com/go/nvidia-drivers\">NVIDIA 驅動程式</a> 並關閉其他可能正在使用 NVENC 編碼器的錄影軟體，如 NVIDIA ShadowPlay 或 Windows Game DVR。"
 NVENC.BadGPUIndex="您在輸出編碼器設定中選擇了 GPU %1。請重設為 0 後重試。"

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c Changed

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Hugh Bailey <obs.jim@gmail.com>
+ * Copyright (c) 2023 Lain Bailey <lain@obsproject.com>
 *
 * Permission to use, copy, modify, and distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
@@ -39,12 +39,6 @@
 #define ANSI_COLOR_MAGENTA "\x1b0;95m"
 #define ANSI_COLOR_RESET "\x1b0m"
 
-#if LIBAVCODEC_VERSION_MAJOR >= 58
-#define CODEC_FLAG_GLOBAL_H AV_CODEC_FLAG_GLOBAL_HEADER
-#else
-#define CODEC_FLAG_GLOBAL_H CODEC_FLAG_GLOBAL_HEADER
-#endif
-
 #define AVIO_BUFFER_SIZE 65536
 
 /* ------------------------------------------------------------------------- */
@@ -529,7 +523,7 @@
 	}
 
 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_H;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	avcodec_parameters_from_context(ffm->video_stream->codecpar, context);
 
@@ -598,7 +592,7 @@
 		context->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_4POINT1;
 #endif
 	if (ffm->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_H;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	avcodec_parameters_from_context(stream->codecpar, context);
 
@@ -1096,10 +1090,6 @@
 			calloc(ffm->params.tracks, sizeof(*ffm->audio_header));
 	}
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	av_register_all();
-#endif
-
 	if (!ffmpeg_mux_get_extra_data(ffm))
 		return FFM_ERROR;

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.h -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-amf-test/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-amf-test/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-amf-test/cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-amf-test/cmake/legacy.cmake Added

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -217,10 +217,6 @@
 	int bitrate = (int)obs_data_get_int(settings, "bitrate");
 	audio_t *audio = obs_encoder_audio(encoder);
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	avcodec_register_all();
-#endif
-
 	enc = bzalloc(sizeof(struct enc_encoder));
 	enc->encoder = encoder;
 	enc->codec = avcodec_find_encoder_by_name(type);
@@ -342,7 +338,7 @@
 	/* enable experimental FFmpeg encoder if the only one available */
 	enc->context->strict_std_compliance = -2;
 
-	enc->context->flags = CODEC_FLAG_GLOBAL_H;
+	enc->context->flags = AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	if (initialize_codec(enc))
 		return enc;
@@ -421,7 +417,6 @@
 
 	enc->total_samples += enc->frame_size;
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
 	ret = avcodec_send_frame(enc->context, enc->aframe);
 	if (ret == 0)
 		ret = avcodec_receive_packet(enc->context, &avpacket);
@@ -430,10 +425,6 @@
 
 	if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
 		ret = 0;
-#else
-	ret = avcodec_encode_audio2(enc->context, &avpacket, enc->aframe,
-				 &got_packet);
-#endif
 	if (ret < 0) {
 		warn("avcodec_encode_audio2 failed: %s", av_err2str(ret));
 		return false;
@@ -453,7 +444,7 @@
 	packet->type = OBS_ENCODER_AUDIO;
 	packet->timebase_num = 1;
 	packet->timebase_den = (int32_t)enc->context->sample_rate;
-	av_free_packet(&avpacket);
+	av_packet_unref(&avpacket);
 	return true;
 }

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-av1.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-av1.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-compat.h -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-compat.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-hls-mux.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-hls-mux.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -107,8 +107,9 @@
 	AVCodecParameters *par = data->audio_infosidx.stream->codecpar;
 	obs_encoder_t *aencoder =
 		obs_output_get_audio_encoder(stream->output, idx);
-	struct encoder_packet packet = {
-		.type = OBS_ENCODER_AUDIO, .timebase_den = 1, .track_idx = idx};
+	struct encoder_packet packet = {.type = OBS_ENCODER_AUDIO,
+					.timebase_den = 1,
+					.track_idx = idx};
 
 	if (obs_encoder_get_extra_data(aencoder, &packet.data, &packet.size)) {
 		par->extradata = av_memdup(packet.data, packet.size);
@@ -625,14 +626,6 @@
 	memset(data, 0, sizeof(struct ffmpeg_data));
 }
 
-static inline const char *safe_str(const char *s)
-{
-	if (s == NULL)
-		return "(NULL)";
-	else
-		return s;
-}
-
 bool ffmpeg_mpegts_data_init(struct ffmpeg_output *stream,
 			 struct ffmpeg_data *data,
 			 struct ffmpeg_cfg *config)
@@ -645,9 +638,6 @@
 	if (!config->url || !*config->url)
 		return false;
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	av_register_all();
-#endif
 	avformat_network_init();
 
 #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)
@@ -895,8 +885,23 @@
 	config.format_mime_type = "video/M2PT";
 
 	/* 2. video settings */
-	// 2.a) set video format from obs to FFmpeg
-	video_t *video = obs_output_video(stream->output);
+
+	// 2.a) set width & height
+	config.width = (int)obs_output_get_width(stream->output);
+	config.height = (int)obs_output_get_height(stream->output);
+	config.scale_width = config.width;
+	config.scale_height = config.height;
+
+	// 2.b) set video codec & ID from video encoder
+	obs_encoder_t *vencoder = obs_output_get_video_encoder(stream->output);
+	config.video_encoder = obs_encoder_get_codec(vencoder);
+	if (strcmp(config.video_encoder, "h264") == 0)
+		config.video_encoder_id = AV_CODEC_ID_H264;
+	else
+		config.video_encoder_id = AV_CODEC_ID_AV1;
+
+	// 2.c) set video format from OBS to FFmpeg
+	video_t *video = obs_encoder_video(vencoder);
 	config.format =
 		obs_to_ffmpeg_video_format(video_output_get_format(video));
 
@@ -906,7 +911,7 @@
 		return false;
 	}
 
-	// 2.b) set colorspace, color_range & transfer characteristic (from voi)
+	// 2.d) set colorspace, color_range & transfer characteristic (from voi)
 	const struct video_output_info *voi = video_output_get_info(video);
 	config.color_range = voi->range == VIDEO_RANGE_FULL ? AVCOL_RANGE_JPEG
 							 : AVCOL_RANGE_MPEG;
@@ -939,21 +944,6 @@
 		config.color_trc = AVCOL_TRC_ARIB_STD_B67;
 		config.colorspace = AVCOL_SPC_BT2020_NCL;
 	}
-
-	// 2.c) set width & height
-	config.width = (int)obs_output_get_width(stream->output);
-	config.height = (int)obs_output_get_height(stream->output);
-	config.scale_width = config.width;
-	config.scale_height = config.height;
-
-	// 2.d) set video codec & id from video encoder
-	obs_encoder_t *vencoder = obs_output_get_video_encoder(stream->output);
-	config.video_encoder = obs_encoder_get_codec(vencoder);
-	if (strcmp(config.video_encoder, "h264") == 0)
-		config.video_encoder_id = AV_CODEC_ID_H264;
-	else
-		config.video_encoder_id = AV_CODEC_ID_AV1;
-
 	// 2.e) set video bitrate & gop through video encoder settings
 	obs_data_t *settings = obs_encoder_get_settings(vencoder);
 	config.video_bitrate = (int)obs_data_get_int(settings, "bitrate");

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2015 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -133,8 +133,6 @@
 	return os_atomic_load_bool(&stream->active);
 }
 
-/* TODO: allow codecs other than h264 whenever we start using them */
-
 static void add_video_encoder_params(struct ffmpeg_muxer *stream,
 				 struct dstr *cmd, obs_encoder_t *vencoder)
 {
@@ -687,8 +685,9 @@
 static bool send_audio_headers(struct ffmpeg_muxer *stream,
 			 obs_encoder_t *aencoder, size_t idx)
 {
-	struct encoder_packet packet = {
-		.type = OBS_ENCODER_AUDIO, .timebase_den = 1, .track_idx = idx};
+	struct encoder_packet packet = {.type = OBS_ENCODER_AUDIO,
+					.timebase_den = 1,
+					.track_idx = idx};
 
 	if (!obs_encoder_get_extra_data(aencoder, &packet.data, &packet.size))
 		return false;
@@ -813,12 +812,12 @@
 	return !!obs_output_get_audio_encoder(stream->output, 0);
 }
 
-static void push_back_packet(struct darray *packets,
+static void push_back_packet(mux_packets_t *packets,
 			 struct encoder_packet *packet)
 {
 	struct encoder_packet pkt;
 	obs_encoder_packet_ref(&pkt, packet);
-	darray_push_back(sizeof(pkt), packets, &pkt);
+	da_push_back(*packets, &pkt);
 }
 
 static void ffmpeg_mux_data(void *data, struct encoder_packet *packet)
@@ -841,8 +840,7 @@
 
 		if (pts_usec >= first_pts_usec) {
 			if (packet->type != OBS_ENCODER_AUDIO) {
-				push_back_packet(&stream->mux_packets.da,
-						 packet);
+				push_back_packet(&stream->mux_packets, packet);
 				return;
 			}
 
@@ -852,7 +850,7 @@
 		}
 	} else if (stream->split_file && should_split(stream, packet)) {
 		if (has_audio(stream)) {
-			push_back_packet(&stream->mux_packets.da, packet);
+			push_back_packet(&stream->mux_packets, packet);
 			return;
 		} else {
 			if (!prepare_split_file(stream, packet))
@@ -1123,13 +1121,11 @@
 		purge(stream);
 }
 
-static void insert_packet(struct darray *array, struct encoder_packet *packet,
+static void insert_packet(mux_packets_t *packets, struct encoder_packet *packet,
 			 int64_t video_offset, int64_t *audio_offsets,
 			 int64_t video_pts_offset, int64_t *audio_dts_offsets)
 {
 	struct encoder_packet pkt;
-	DARRAY(struct encoder_packet) packets;
-	packets.da = *array;
 	size_t idx;
 
 	obs_encoder_packet_ref(&pkt, packet);
@@ -1144,14 +1140,13 @@
 		pkt.pts -= audio_dts_offsetspkt.track_idx;
 	}
 
-	for (idx = packets.num; idx > 0; idx--) {
-		struct encoder_packet *p = packets.array + (idx - 1);
+	for (idx = packets->num; idx > 0; idx--) {
+		struct encoder_packet *p = packets->array + (idx - 1);
 		if (p->dts_usec < pkt.dts_usec)
 			break;
 	}
 
-	da_insert(packets, idx, &pkt);
-	*array = packets.da;
+	da_insert(*packets, idx, &pkt);
 }
 
 static void *replay_buffer_mux_thread(void *data)
@@ -1244,7 +1239,7 @@
 			}
 		}
 
-		insert_packet(&stream->mux_packets.da, pkt, video_offset,
+		insert_packet(&stream->mux_packets, pkt, video_offset,
 			 audio_offsets, video_pts_offset,
 			 audio_dts_offsets);
 	}

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.h -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mux.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -163,9 +163,7 @@
 		return false;
 	}
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 	avcodec_parameters_from_context(data->video->codecpar, context);
-#endif
 
 	return true;
 }
@@ -247,11 +245,7 @@
 			NULL);
 	}
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 	context = avcodec_alloc_context3(data->vcodec);
-#else
-	context = data->video->codec;
-#endif
 	context->bit_rate = (int64_t)data->config.video_bitrate * 1000;
 	context->width = data->config.scale_width;
 	context->height = data->config.scale_height;
@@ -268,9 +262,10 @@
 	context->thread_count = 0;
 
 	data->video->time_base = context->time_base;
+	data->video->avg_frame_rate = (AVRational){ovi.fps_num, ovi.fps_den};
 
 	if (data->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_H;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	data->video_ctx = context;
 
@@ -338,10 +333,8 @@
 		return false;
 	}
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 	avcodec_parameters_from_context(data->audio_infosidx.stream->codecpar,
 					context);
-#endif
 
 	return true;
 }
@@ -363,11 +356,7 @@
 			data->config.audio_encoder))
 		return false;
 
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
 	context = avcodec_alloc_context3(data->acodec);
-#else
-	context = stream->codec;
-#endif
 	context->bit_rate = (int64_t)data->config.audio_bitrate * 1000;
 	context->time_base = (AVRational){1, aoi.samples_per_sec};
 #if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(57, 24, 100)
@@ -399,7 +388,7 @@
 	data->audio_size = get_audio_size(data->audio_format, aoi.speakers, 1);
 
 	if (data->output->oformat->flags & AVFMT_GLOBALHEADER)
-		context->flags |= CODEC_FLAG_GLOBAL_H;
+		context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	data->audio_infosidx.stream = stream;
 	data->audio_infosidx.ctx = context;
@@ -594,9 +583,6 @@
 	if (!config->url || !*config->url)
 		return false;
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	av_register_all();
-#endif
 	avformat_network_init();
 
 	is_rtmp = (astrcmpi_n(config->url, "rtmp://", 7) == 0);
@@ -793,63 +779,43 @@
 
 	packet = av_packet_alloc();
 
-#if LIBAVFORMAT_VERSION_MAJOR < 58
-	if (data->output->flags & AVFMT_RAWPICTURE) {
-		packet->flags |= AV_PKT_FLAG_KEY;
-		packet->stream_index = data->video->index;
-		packet->data = data->vframe->data0;
-		packet->size = sizeof(AVPicture);
+	data->vframe->pts = data->total_frames;
+	ret = avcodec_send_frame(context, data->vframe);
+	if (ret == 0)
+		ret = avcodec_receive_packet(context, packet);
+
+	got_packet = (ret == 0);
+
+	if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
+		ret = 0;
+
+	if (ret < 0) {
+		blog(LOG_WARNING,
+		 "receive_video: Error encoding "
+		 "video: %s",
+		 av_err2str(ret));
+		//FIXME: stop the encode with an error
+		goto fail;
+	}
+
+	if (!ret && got_packet && packet->size) {
+		packet->pts = rescale_ts(packet->pts, context,
+					 data->video->time_base);
+		packet->dts = rescale_ts(packet->dts, context,
+					 data->video->time_base);
+		packet->duration = (int)av_rescale_q(packet->duration,
+						 context->time_base,
+						 data->video->time_base);
 
 		pthread_mutex_lock(&output->write_mutex);
 		da_push_back(output->packets, &packet);
 		packet = NULL;
 		pthread_mutex_unlock(&output->write_mutex);
 		os_sem_post(output->write_sem);
-
 	} else {
-#endif
-		data->vframe->pts = data->total_frames;
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
-		ret = avcodec_send_frame(context, data->vframe);
-		if (ret == 0)
-			ret = avcodec_receive_packet(context, packet);
-
-		got_packet = (ret == 0);
-
-		if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
-			ret = 0;
-#else
-	ret = avcodec_encode_video2(context, packet, data->vframe, &got_packet);
-#endif
-		if (ret < 0) {
-			blog(LOG_WARNING,
-			 "receive_video: Error encoding "
-			 "video: %s",
-			 av_err2str(ret));
-			//FIXME: stop the encode with an error
-			goto fail;
-		}
-
-		if (!ret && got_packet && packet->size) {
-			packet->pts = rescale_ts(packet->pts, context,
-						 data->video->time_base);
-			packet->dts = rescale_ts(packet->dts, context,
-						 data->video->time_base);
-			packet->duration = (int)av_rescale_q(
-				packet->duration, context->time_base,
-				data->video->time_base);
-
-			pthread_mutex_lock(&output->write_mutex);
-			da_push_back(output->packets, &packet);
-			packet = NULL;
-			pthread_mutex_unlock(&output->write_mutex);
-			os_sem_post(output->write_sem);
-		} else {
-			ret = 0;
-		}
-#if LIBAVFORMAT_VERSION_MAJOR < 58
+		ret = 0;
 	}
-#endif
+
 	if (ret != 0) {
 		blog(LOG_WARNING, "receive_video: Error writing video: %s",
 		 av_err2str(ret));
@@ -899,7 +865,6 @@
 
 	packet = av_packet_alloc();
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
 	ret = avcodec_send_frame(context, data->aframeidx);
 	if (ret == 0)
 		ret = avcodec_receive_packet(context, packet);
@@ -908,10 +873,7 @@
 
 	if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
 		ret = 0;
-#else
-	ret = avcodec_encode_audio2(context, packet, data->aframeidx,
-				 &got_packet);
-#endif
+
 	if (ret < 0) {
 		blog(LOG_WARNING, "encode_audio: Error encoding audio: %s",
 		 av_err2str(ret));

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-source.c Changed

@@ -53,6 +53,8 @@
 	bool close_when_inactive;
 	bool seekable;
 	bool is_stinger;
+	bool is_track_matte;
+	bool log_changes;
 
 	pthread_t reconnect_thread;
 	pthread_mutex_t reconnect_mutex;
@@ -127,6 +129,7 @@
 	obs_data_set_default_int(settings, "reconnect_delay_sec", 10);
 	obs_data_set_default_int(settings, "buffering_mb", 2);
 	obs_data_set_default_int(settings, "speed_percent", 100);
+	obs_data_set_default_bool(settings, "log_changes", true);
 }
 
 static const char *media_filter =
@@ -245,6 +248,8 @@
 static void dump_source_info(struct ffmpeg_source *s, const char *input,
 			 const char *input_format)
 {
+	if (!s->log_changes)
+		return;
 	FF_BLOG(LOG_INFO,
 		"settings:\n"
 		"\tinput: %s\n"
@@ -305,15 +310,17 @@
 static void media_stopped(void *opaque)
 {
 	struct ffmpeg_source *s = opaque;
-	if (s->is_clear_on_media_end && !s->is_stinger) {
+	if (s->is_clear_on_media_end && !s->is_track_matte) {
 		obs_source_output_video(s->source, NULL);
 	}
 
 	if ((s->close_when_inactive || !s->is_local_file) && s->media)
 		s->destroy_media = true;
 
-	set_media_state(s, OBS_MEDIA_STATE_ENDED);
-	obs_source_media_ended(s->source);
+	if (s->state != OBS_MEDIA_STATE_STOPPED) {
+		set_media_state(s, OBS_MEDIA_STATE_ENDED);
+		obs_source_media_ended(s->source);
+	}
 }
 
 static void ffmpeg_source_open(struct ffmpeg_source *s)
@@ -431,22 +438,34 @@
 {
 	struct ffmpeg_source *s = data;
 
+	bool active = obs_source_active(s->source);
 	bool is_local_file = obs_data_get_bool(settings, "is_local_file");
 	bool is_stinger = obs_data_get_bool(settings, "is_stinger");
+	bool is_track_matte = obs_data_get_bool(settings, "is_track_matte");
+	bool should_restart_media = (is_local_file != s->is_local_file) ||
+				 (is_stinger != s->is_stinger);
 
 	const char *input;
 	const char *input_format;
 	const char *ffmpeg_options;
 
-	bfree(s->input);
+	bool is_hw_decoding;
+	enum video_range_type range;
+	bool is_linear_alpha;
+	int speed_percent;
+	bool is_looping;
+
 	bfree(s->input_format);
-	bfree(s->ffmpeg_options);
 
 	if (is_local_file) {
 		input = obs_data_get_string(settings, "local_file");
 		input_format = NULL;
-		s->is_looping = obs_data_get_bool(settings, "looping");
+		is_looping = obs_data_get_bool(settings, "looping");
+
+		if (s->input && !should_restart_media)
+			should_restart_media |= strcmp(s->input, input) != 0;
 	} else {
+		should_restart_media = true;
 		input = obs_data_get_string(settings, "input");
 		input_format = obs_data_get_string(settings, "input_format");
 		if (requires_mpegts(input)) {
@@ -458,19 +477,42 @@
 		s->reconnect_delay_sec = s->reconnect_delay_sec == 0
 						 ? 10
 						 : s->reconnect_delay_sec;
-		s->is_looping = false;
+		is_looping = false;
 	}
 
 	stop_reconnect_thread(s);
 
+	is_hw_decoding = obs_data_get_bool(settings, "hw_decode");
+	range = obs_data_get_int(settings, "color_range");
+	speed_percent = (int)obs_data_get_int(settings, "speed_percent");
+	if (speed_percent < 1 || speed_percent > 200)
+		speed_percent = 100;
 	ffmpeg_options = obs_data_get_string(settings, "ffmpeg_options");
 
+	/* Restart media source if these properties are changed */
+	if (s->is_hw_decoding != is_hw_decoding || s->range != range ||
+	 s->speed_percent != speed_percent ||
+	 (s->ffmpeg_options &&
+	 strcmp(s->ffmpeg_options, ffmpeg_options) != 0))
+		should_restart_media = true;
+
+	/* If media has ended and user enables looping, user expects that it restarts.
+	 * Should still check if is_looping was changed, because users may stop them
+	 * intentionally, which is why we only check for ENDED and not STOPPED. */
+	if (active && s->state == OBS_MEDIA_STATE_ENDED && is_looping == true &&
+	 s->is_looping == false) {
+		should_restart_media = true;
+	}
+
+	bfree(s->input);
+	bfree(s->ffmpeg_options);
+
+	s->is_looping = is_looping;
 	s->close_when_inactive =
 		obs_data_get_bool(settings, "close_when_inactive");
-
 	s->input = input ? bstrdup(input) : NULL;
 	s->input_format = input_format ? bstrdup(input_format) : NULL;
-	s->is_hw_decoding = obs_data_get_bool(settings, "hw_decode");
+	s->is_hw_decoding = is_hw_decoding;
 	s->full_decode = obs_data_get_bool(settings, "full_decode");
 	s->is_clear_on_media_end =
 		obs_data_get_bool(settings, "clear_on_media_end");
@@ -478,30 +520,36 @@
 		!astrcmpi_n(input, RIST_PROTO, sizeof(RIST_PROTO) - 1)
 			? false
 			: obs_data_get_bool(settings, "restart_on_activate");
-	s->range = (enum video_range_type)obs_data_get_int(settings,
-							 "color_range");
-	s->is_linear_alpha = obs_data_get_bool(settings, "linear_alpha");
+	s->range = range;
+	is_linear_alpha = obs_data_get_bool(settings, "linear_alpha");
+	s->is_linear_alpha = is_linear_alpha;
 	s->buffering_mb = (int)obs_data_get_int(settings, "buffering_mb");
-	s->speed_percent = (int)obs_data_get_int(settings, "speed_percent");
+	s->speed_percent = speed_percent;
 	s->is_local_file = is_local_file;
 	s->seekable = obs_data_get_bool(settings, "seekable");
 	s->ffmpeg_options = ffmpeg_options ? bstrdup(ffmpeg_options) : NULL;
 	s->is_stinger = is_stinger;
+	s->is_track_matte = is_track_matte;
+	s->log_changes = obs_data_get_bool(settings, "log_changes");
 
 	if (s->speed_percent < 1 || s->speed_percent > 200)
 		s->speed_percent = 100;
 
-	if (s->media) {
+	if (s->media && should_restart_media) {
 		media_playback_destroy(s->media);
 		s->media = NULL;
 	}
 
-	bool active = obs_source_active(s->source);
-	if (!s->close_when_inactive || active)
+	/* directly set options if media is playing */
+	if (s->media) {
+		media_playback_set_looping(s->media, is_looping);
+		media_playback_set_is_linear_alpha(s->media, is_linear_alpha);
+	}
+	if ((!s->close_when_inactive || active) && should_restart_media)
 		ffmpeg_source_open(s);
 
 	dump_source_info(s, input, input_format);
-	if (!s->restart_on_activate || active)
+	if ((!s->restart_on_activate || active) && should_restart_media)
 		ffmpeg_source_start(s);
 }
 
@@ -534,7 +582,7 @@
 static void preload_first_frame_proc(void *data, calldata_t *cd)
 {
 	struct ffmpeg_source *s = data;
-	if (s->is_stinger)
+	if (s->is_track_matte)
 		obs_source_output_video(s->source, NULL);
 	media_playback_preload_frame(s->media);
 	UNUSED_PARAMETER(cd);

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-srt.h -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-srt.h Changed

@@ -20,6 +20,9 @@
 #include "obs-ffmpeg-url.h"
 #include <srt/srt.h>
 #include <libavformat/avformat.h>
+#ifdef _WIN32
+#include <sys/timeb.h>
+#endif
 
 #define POLLING_TIME 100 /// Time in milliseconds between interrupt check
 
@@ -73,6 +76,8 @@
 	char *smoother;
 	int messageapi;
 	SRT_TRANSTYPE transtype;
+	char *localip;
+	char *localport;
 	int linger;
 	int tsbpd;
 	double time; // time in s in order to post logs at definite intervals
@@ -458,6 +463,7 @@
 	char portstr10;
 	int64_t open_timeout = 0;
 	int eid, write_eid;
+	struct sockaddr_in la;
 
 	av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
 		 &port, path, sizeof(path), uri);
@@ -500,7 +506,24 @@
 	}
 
 	cur_ai = ai;
-
+	if (s->mode == SRT_MODE_RENDEZVOUS) {
+		if (s->localip == NULL || s->localport == NULL) {
+			blog(LOG_ERROR, "Invalid adapter configuration\n");
+			return OBS_OUTPUT_CONNECT_FAILED;
+		}
+		blog(LOG_DEBUG,
+		 "obs-ffmpeg mpegts muxer / libsrt: Adapter options %s:%s\n",
+		 s->localip, s->localport);
+		int lp = strtol(s->localport, NULL, 10);
+		if (lp <= 0 || lp >= 65536) {
+			blog(LOG_ERROR,
+			 "obs-ffmpeg mpegts muxer / libsrt: Local port missing in URL\n");
+			return OBS_OUTPUT_CONNECT_FAILED;
+		}
+		la.sin_family = AF_INET;
+		la.sin_port = htons(port);
+		inet_pton(AF_INET, s->localip, &la.sin_addr.s_addr);
+	}
 restart:
 
 	fd = srt_create_socket();
@@ -544,8 +567,8 @@
 		fd = ret;
 	} else {
 		if (s->mode == SRT_MODE_RENDEZVOUS) {
-			if (srt_bind(fd, cur_ai->ai_addr,
-				 (int)(cur_ai->ai_addrlen))) {
+			if (srt_bind(fd, (struct sockaddr *)&la,
+				 sizeof(struct sockaddr_in))) {
 				ret = libsrt_neterrno(h);
 				srt_epoll_release(write_eid);
 				goto fail1;
@@ -780,6 +803,12 @@
 		if (av_find_info_tag(buf, sizeof(buf), "linger", p)) {
 			s->linger = strtol(buf, NULL, 10);
 		}
+		if (av_find_info_tag(buf, sizeof(buf), "localip", p)) {
+			s->localip = av_strndup(buf, strlen(buf));
+		}
+		if (av_find_info_tag(buf, sizeof(buf), "localport", p)) {
+			s->localport = av_strndup(buf, strlen(buf));
+		}
 	}
 	ret = libsrt_setup(h, uri);
 	if (ret < 0)

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-url.h -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-url.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-vaapi.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2016 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,8 +17,6 @@
 
 #include <libavutil/avutil.h>
 
-#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 27, 100)
-
 #include <util/darray.h>
 #include <util/dstr.h>
 #include <util/base.h>
@@ -29,6 +27,7 @@
 #ifdef ENABLE_HEVC
 #include <obs-hevc.h>
 #endif
+#include <opts-parser.h>
 
 #include <unistd.h>
 
@@ -299,6 +298,8 @@
 	enc->context->level = level;
 	enc->context->bit_rate = bitrate * 1000;
 	enc->context->rc_max_rate = maxrate * 1000;
+	enc->context->rc_initial_buffer_occupancy =
+		(maxrate ? maxrate : bitrate) * 1000;
 
 	enc->context->width = obs_encoder_get_width(enc->encoder);
 	enc->context->height = obs_encoder_get_height(enc->encoder);
@@ -356,6 +357,14 @@
 
 	enc->height = enc->context->height;
 
+	const char *ffmpeg_opts = obs_data_get_string(settings, "ffmpeg_opts");
+	struct obs_options opts = obs_parse_options(ffmpeg_opts);
+	for (size_t i = 0; i < opts.count; i++) {
+		struct obs_option *opt = &opts.optionsi;
+		av_opt_set(enc->context->priv_data, opt->name, opt->value, 0);
+	}
+	obs_free_options(opts);
+
 	info("settings:\n"
 	 "\tdevice: %s\n"
 	 "\trate_control: %s\n"
@@ -367,10 +376,11 @@
 	 "\tkeyint: %d\n"
 	 "\twidth: %d\n"
 	 "\theight: %d\n"
-	 "\tb-frames: %d\n",
+	 "\tb-frames: %d\n"
+	 "\tffmpeg opts: %s\n",
 	 device, rate_control, profile, level, qp, bitrate, maxrate,
 	 enc->context->gop_size, enc->context->width, enc->context->height,
-	 enc->context->max_b_frames);
+	 enc->context->max_b_frames, ffmpeg_opts);
 
 	return vaapi_init_codec(enc, device);
 }
@@ -380,14 +390,8 @@
 	int r_pkt = 1;
 
 	while (r_pkt) {
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
 		if (avcodec_receive_packet(enc->context, enc->packet) < 0)
 			break;
-#else
-		if (avcodec_encode_video2(enc->context, enc->packet, NULL,
-					 &r_pkt) < 0)
-			break;
-#endif
 
 		if (r_pkt)
 			av_packet_unref(enc->packet);
@@ -418,9 +422,6 @@
 				 bool hevc)
 {
 	struct vaapi_encoder *enc;
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	avcodec_register_all();
-#endif
 
 	enc = bzalloc(sizeof(*enc));
 	enc->encoder = encoder;
@@ -534,7 +535,6 @@
 		goto fail;
 	}
 
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 40, 101)
 	ret = avcodec_send_frame(enc->context, hwframe);
 	if (ret == 0)
 		ret = avcodec_receive_packet(enc->context, enc->packet);
@@ -543,10 +543,7 @@
 
 	if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
 		ret = 0;
-#else
-	ret = avcodec_encode_video2(enc->context, enc->packet, hwframe,
-				 &got_packet);
-#endif
+
 	if (ret < 0) {
 		warn("vaapi_encode: Error encoding: %s", av_err2str(ret));
 		goto fail;
@@ -945,6 +942,10 @@
 				 20, 1);
 	obs_property_int_set_suffix(p, " s");
 
+	obs_properties_add_text(props, "ffmpeg_opts",
+				obs_module_text("FFmpegOpts"),
+				OBS_TEXT_DEFAULT);
+
 	return props;
 }
 
@@ -1011,5 +1012,3 @@
 	.get_video_info = hevc_vaapi_video_info,
 };
 #endif
-
-#endif

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg.c -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg.c Changed

@@ -9,11 +9,10 @@
 #include <dxgi.h>
 #include <util/windows/win-version.h>
 
-#include "jim-nvenc.h"
+#include "obs-nvenc.h"
 #endif
 
-#if !defined(_WIN32) && !defined(__APPLE__) && \
-	LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 27, 100)
+#if !defined(_WIN32) && !defined(__APPLE__)
 #include "vaapi-utils.h"
 
 #define LIBAVUTIL_VAAPI_AVAILABLE
@@ -283,10 +282,6 @@
 {
 	profile_start(nvenc_check_name);
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	av_register_all();
-#endif
-
 	const bool h264 = nvenc_codec_exists("h264_nvenc", "nvenc_h264");
 #ifdef ENABLE_HEVC
 	const bool hevc = nvenc_codec_exists("hevc_nvenc", "nvenc_hevc");
@@ -358,8 +353,8 @@
 #endif
 
 #ifdef _WIN32
-extern void jim_nvenc_load(bool h264, bool hevc, bool av1);
-extern void jim_nvenc_unload(void);
+extern void obs_nvenc_load(bool h264, bool hevc, bool av1);
+extern void obs_nvenc_unload(void);
 extern void amf_load(void);
 extern void amf_unload(void);
 #endif
@@ -409,7 +404,7 @@
 
 #ifdef _WIN32
 		if (get_win_ver_int() > 0x0601) {
-			jim_nvenc_load(h264, hevc, av1);
+			obs_nvenc_load(h264, hevc, av1);
 		} else {
 			// if on Win 7, new nvenc isn't available so there's
 			// no nvenc encoder for the user to select, expose
@@ -477,6 +472,6 @@
 
 #ifdef _WIN32
 	amf_unload();
-	jim_nvenc_unload();
+	obs_nvenc_unload();
 #endif
 }

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc-helpers.c Added

@@ -0,0 +1,338 @@
+#include "obs-nvenc.h"
+#include <util/platform.h>
+#include <util/threading.h>
+#include <util/config-file.h>
+#include <util/windows/device-enum.h>
+#include <util/dstr.h>
+#include <util/pipe.h>
+
+static void *nvenc_lib = NULL;
+static pthread_mutex_t init_mutex = PTHREAD_MUTEX_INITIALIZER;
+NV_ENCODE_API_FUNCTION_LIST nv = {NV_ENCODE_API_FUNCTION_LIST_VER};
+NV_CREATE_INSTANCE_FUNC nv_create_instance = NULL;
+
+#define error(format, ...) blog(LOG_ERROR, "obs-nvenc " format, ##__VA_ARGS__)
+
+bool nv_fail2(obs_encoder_t *encoder, void *session, const char *format, ...)
+{
+	struct dstr message = {0};
+	struct dstr error_message = {0};
+
+	va_list args;
+	va_start(args, format);
+	dstr_vprintf(&message, format, args);
+	va_end(args);
+
+	dstr_printf(&error_message, "NVENC Error: %s", message.array);
+	obs_encoder_set_last_error(encoder, error_message.array);
+	error("%s", error_message.array);
+
+	dstr_free(&error_message);
+	dstr_free(&message);
+
+	return true;
+}
+
+bool nv_failed2(obs_encoder_t *encoder, void *session, NVENCSTATUS err,
+		const char *func, const char *call)
+{
+	struct dstr error_message = {0};
+	const char *nvenc_error = NULL;
+
+	if (err == NV_ENC_SUCCESS)
+		return false;
+
+	if (session) {
+		nvenc_error = nv.nvEncGetLastErrorString(session);
+		if (nvenc_error) {
+			// Some NVENC errors begin with :: which looks
+			// odd to users. Strip it off.
+			while (*nvenc_error == ':')
+				nvenc_error++;
+		}
+	}
+
+	switch (err) {
+	case NV_ENC_ERR_OUT_OF_MEMORY:
+		obs_encoder_set_last_error(
+			encoder, obs_module_text("NVENC.TooManySessions"));
+		break;
+
+	case NV_ENC_ERR_NO_ENCODE_DEVICE:
+	case NV_ENC_ERR_UNSUPPORTED_DEVICE:
+		obs_encoder_set_last_error(
+			encoder, obs_module_text("NVENC.UnsupportedDevice"));
+		break;
+
+	case NV_ENC_ERR_INVALID_VERSION:
+		obs_encoder_set_last_error(
+			encoder, obs_module_text("NVENC.OutdatedDriver"));
+		break;
+
+	default:
+		if (nvenc_error && *nvenc_error) {
+			dstr_printf(&error_message, "NVENC Error: %s (%s)",
+				 nvenc_error, nv_error_name(err));
+		} else {
+
+			dstr_printf(&error_message,
+				 "NVENC Error: %s: %s failed: %d (%s)", func,
+				 call, (int)err, nv_error_name(err));
+		}
+		obs_encoder_set_last_error(encoder, error_message.array);
+		dstr_free(&error_message);
+		break;
+	}
+
+	if (nvenc_error && *nvenc_error) {
+		error("%s: %s failed: %d (%s): %s", func, call, (int)err,
+		 nv_error_name(err), nvenc_error);
+	} else {
+		error("%s: %s failed: %d (%s)", func, call, (int)err,
+		 nv_error_name(err));
+	}
+	return true;
+}
+
+#define NV_FAILED(e, x) nv_failed2(e, NULL, x, __FUNCTION__, #x)
+
+bool load_nvenc_lib(void)
+{
+	const char *const file = (sizeof(void *) == 8) ? "nvEncodeAPI64.dll"
+						 : "nvEncodeAPI.dll";
+	nvenc_lib = os_dlopen(file);
+	return nvenc_lib != NULL;
+}
+
+static void *load_nv_func(const char *func)
+{
+	void *func_ptr = os_dlsym(nvenc_lib, func);
+	if (!func_ptr) {
+		error("Could not load function: %s", func);
+	}
+	return func_ptr;
+}
+
+typedef NVENCSTATUS(NVENCAPI *NV_MAX_VER_FUNC)(uint32_t *);
+
+uint32_t get_nvenc_ver()
+{
+	static NV_MAX_VER_FUNC nv_max_ver = NULL;
+	static bool failed = false;
+
+	if (!nv_max_ver) {
+		if (failed)
+			return 0;
+
+		nv_max_ver = (NV_MAX_VER_FUNC)load_nv_func(
+			"NvEncodeAPIGetMaxSupportedVersion");
+		if (!nv_max_ver) {
+			failed = true;
+			return 0;
+		}
+	}
+
+	uint32_t ver = 0;
+	if (nv_max_ver(&ver) != NV_ENC_SUCCESS) {
+		return 0;
+	}
+	return ver;
+}
+
+const char *nv_error_name(NVENCSTATUS err)
+{
+#define RETURN_CASE(x) \
+	case x: \
+		return #x
+
+	switch (err) {
+		RETURN_CASE(NV_ENC_SUCCESS);
+		RETURN_CASE(NV_ENC_ERR_NO_ENCODE_DEVICE);
+		RETURN_CASE(NV_ENC_ERR_UNSUPPORTED_DEVICE);
+		RETURN_CASE(NV_ENC_ERR_INVALID_ENCODERDEVICE);
+		RETURN_CASE(NV_ENC_ERR_INVALID_DEVICE);
+		RETURN_CASE(NV_ENC_ERR_DEVICE_NOT_EXIST);
+		RETURN_CASE(NV_ENC_ERR_INVALID_PTR);
+		RETURN_CASE(NV_ENC_ERR_INVALID_EVENT);
+		RETURN_CASE(NV_ENC_ERR_INVALID_PARAM);
+		RETURN_CASE(NV_ENC_ERR_INVALID_CALL);
+		RETURN_CASE(NV_ENC_ERR_OUT_OF_MEMORY);
+		RETURN_CASE(NV_ENC_ERR_ENCODER_NOT_INITIALIZED);
+		RETURN_CASE(NV_ENC_ERR_UNSUPPORTED_PARAM);
+		RETURN_CASE(NV_ENC_ERR_LOCK_BUSY);
+		RETURN_CASE(NV_ENC_ERR_NOT_ENOUGH_BUFFER);
+		RETURN_CASE(NV_ENC_ERR_INVALID_VERSION);
+		RETURN_CASE(NV_ENC_ERR_MAP_FAILED);
+		RETURN_CASE(NV_ENC_ERR_NEED_MORE_INPUT);
+		RETURN_CASE(NV_ENC_ERR_ENCODER_BUSY);
+		RETURN_CASE(NV_ENC_ERR_EVENT_NOT_REGISTERD);
+		RETURN_CASE(NV_ENC_ERR_GENERIC);
+		RETURN_CASE(NV_ENC_ERR_INCOMPATIBLE_CLIENT_KEY);
+		RETURN_CASE(NV_ENC_ERR_UNIMPLEMENTED);
+		RETURN_CASE(NV_ENC_ERR_RESOURCE_REGISTER_FAILED);
+		RETURN_CASE(NV_ENC_ERR_RESOURCE_NOT_REGISTERED);
+		RETURN_CASE(NV_ENC_ERR_RESOURCE_NOT_MAPPED);
+	}
+#undef RETURN_CASE
+
+	return "Unknown Error";
+}
+
+static inline bool init_nvenc_internal(obs_encoder_t *encoder)
+{
+	static bool initialized = false;
+	static bool success = false;
+
+	if (initialized)
+		return success;
+	initialized = true;
+
+	uint32_t ver = get_nvenc_ver();
+	if (ver == 0) {
+		obs_encoder_set_last_error(
+			encoder,
+			"Missing NvEncodeAPIGetMaxSupportedVersion, check "
+			"your video card drivers are up to date.");
+		return false;
+	}
+
+	uint32_t supported_ver = (NVENC_COMPAT_MAJOR_VER << 4) |
+				 NVENC_COMPAT_MINOR_VER;
+	if (supported_ver > ver) {
+		obs_encoder_set_last_error(
+			encoder, obs_module_text("NVENC.OutdatedDriver"));
+
+		error("Current driver version does not support this NVENC "
+		 "version, please upgrade your driver");
+		return false;
+	}
+
+	nv_create_instance = (NV_CREATE_INSTANCE_FUNC)load_nv_func(
+		"NvEncodeAPICreateInstance");
+	if (!nv_create_instance) {
+		obs_encoder_set_last_error(
+			encoder, "Missing NvEncodeAPICreateInstance, check "
+				 "your video card drivers are up to date.");
+		return false;
+	}
+
+	if (NV_FAILED(encoder, nv_create_instance(&nv))) {
+		return false;
+	}
+
+	success = true;
+	return true;
+}
+
+bool init_nvenc(obs_encoder_t *encoder)
+{
+	bool success;
+
+	pthread_mutex_lock(&init_mutex);
+	success = init_nvenc_internal(encoder);
+	pthread_mutex_unlock(&init_mutex);
+
+	return success;
+}
+
+extern struct obs_encoder_info h264_nvenc_info;
+#ifdef ENABLE_HEVC
+extern struct obs_encoder_info hevc_nvenc_info;
+#endif
+extern struct obs_encoder_info av1_nvenc_info;
+
+static bool enum_luids(void *param, uint32_t idx, uint64_t luid)
+{
+	struct dstr *cmd = param;
+	dstr_catf(cmd, " %llX", luid);
+	UNUSED_PARAMETER(idx);
+	return true;
+}
+
+static bool av1_supported(void)
+{
+	char *test_exe = os_get_executable_path_ptr("obs-nvenc-test.exe");
+	struct dstr cmd = {0};
+	struct dstr caps_str = {0};
+	bool av1_supported = false;
+	config_t *config = NULL;
+
+	dstr_init_move_array(&cmd, test_exe);
+	dstr_insert_ch(&cmd, 0, '\"');
+	dstr_cat(&cmd, "\"");
+
+	enum_graphics_device_luids(enum_luids, &cmd);
+
+	os_process_pipe_t *pp = os_process_pipe_create(cmd.array, "r");
+	if (!pp) {
+		blog(LOG_WARNING, "NVENC Failed to launch the NVENC "
+				 "test process I guess");
+		goto fail;
+	}
+
+	for (;;) {
+		char data2048;
+		size_t len =
+			os_process_pipe_read(pp, (uint8_t *)data, sizeof(data));
+		if (!len)
+			break;
+
+		dstr_ncat(&caps_str, data, len);
+	}
+
+	os_process_pipe_destroy(pp);
+
+	if (dstr_is_empty(&caps_str)) {
+		blog(LOG_WARNING,
+		 "NVENC Seems the NVENC test subprocess crashed. "
+		 "Better there than here I guess. Let's just "
+		 "skip NVENC AV1 detection then I suppose.");
+		goto fail;
+	}
+
+	if (config_open_string(&config, caps_str.array) != 0) {
+		blog(LOG_WARNING, "NVENC Failed to open config string");
+		goto fail;
+	}
+
+	const char *error = config_get_string(config, "error", "string");
+	if (error) {
+		blog(LOG_WARNING, "NVENC AV1 test process failed: %s", error);
+		goto fail;
+	}
+
+	uint32_t adapter_count = (uint32_t)config_num_sections(config);
+	bool avc_supported = false;
+	bool hevc_supported = false;
+
+	/* for now, just check AV1 support on device 0 */
+	av1_supported = config_get_bool(config, "0", "supports_av1");
+
+fail:
+	if (config)
+		config_close(config);
+	dstr_free(&caps_str);
+	dstr_free(&cmd);
+
+	return av1_supported;
+}
+
+void obs_nvenc_load(bool h264, bool hevc, bool av1)
+{
+	pthread_mutex_init(&init_mutex, NULL);
+	if (h264)
+		obs_register_encoder(&h264_nvenc_info);
+#ifdef ENABLE_HEVC
+	if (hevc)
+		obs_register_encoder(&hevc_nvenc_info);
+#endif
+	if (av1 && av1_supported())
+		obs_register_encoder(&av1_nvenc_info);
+	else
+		blog(LOG_WARNING, "NVENC AV1 is not supported");
+}
+
+void obs_nvenc_unload(void)
+{
+	pthread_mutex_destroy(&init_mutex);
+}

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/obs-nvenc-test/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc-test/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc-test/cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc-test/cmake/legacy.cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc-test/obs-nvenc-test.c Added

@@ -0,0 +1,238 @@
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <ffnvcodec/nvEncodeAPI.h>
+#ifdef OBS_LEGACY
+#include "../obs-nvenc-ver.h"
+#else
+#include <obs-nvenc-ver.h>
+#endif
+
+#include <dxgi.h>
+#include <d3d11.h>
+#include <d3d11_1.h>
+
+__declspec(dllexport) DWORD NvOptimusEnablement = 1;
+NV_ENCODE_API_FUNCTION_LIST nv = {NV_ENCODE_API_FUNCTION_LIST_VER};
+static void *nvenc_lib = NULL;
+static bool av1_supported = false;
+
+#define NVIDIA_VENDOR_ID 0x10DE
+
+struct nvenc_info {
+	bool is_nvidia;
+	bool supports_av1;
+};
+
+#define MAX_CAPS 10
+static uint32_t luid_count = 0;
+static uint64_t luid_orderMAX_CAPS = {0};
+static struct nvenc_info adapter_infoMAX_CAPS = {0};
+
+bool load_nvenc_lib(void)
+{
+	const char *const file = (sizeof(void *) == 8) ? "nvEncodeAPI64.dll"
+						 : "nvEncodeAPI.dll";
+	nvenc_lib = LoadLibraryA(file);
+	return nvenc_lib != NULL;
+}
+
+static inline void *load_nv_func(const char *func)
+{
+	void *func_ptr = (void *)GetProcAddress(nvenc_lib, func);
+	return func_ptr;
+}
+
+static inline uint32_t get_adapter_idx(uint32_t adapter_idx, LUID luid)
+{
+	for (uint32_t i = 0; i < luid_count; i++) {
+		if (luid_orderi == *(uint64_t *)&luid) {
+			return i;
+		}
+	}
+
+	return adapter_idx;
+}
+
+static bool get_adapter_caps(IDXGIFactory *factory, uint32_t adapter_idx)
+{
+	struct nvenc_info *caps;
+	IDXGIAdapter *adapter = NULL;
+	ID3D11Device *device = NULL;
+	ID3D11DeviceContext *context = NULL;
+	GUID *guids = NULL;
+	void *session = NULL;
+	HRESULT hr;
+
+	if (adapter_idx == MAX_CAPS)
+		return false;
+
+	hr = factory->lpVtbl->EnumAdapters(factory, adapter_idx, &adapter);
+	if (FAILED(hr))
+		return false;
+
+	DXGI_ADAPTER_DESC desc;
+	adapter->lpVtbl->GetDesc(adapter, &desc);
+
+	caps = &adapter_infoget_adapter_idx(adapter_idx, desc.AdapterLuid);
+	if (desc.VendorId != NVIDIA_VENDOR_ID)
+		return true;
+
+	caps->is_nvidia = true;
+
+	hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, 0, NULL,
+			 0, D3D11_SDK_VERSION, &device, NULL, &context);
+	if (FAILED(hr))
+		goto finish;
+
+	/* ---------------------------------------------------------------- */
+
+	NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS params = {
+		NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER};
+	params.device = device;
+	params.deviceType = NV_ENC_DEVICE_TYPE_DIRECTX;
+	params.apiVersion = NVENCAPI_VERSION;
+
+	NVENCSTATUS stat = nv.nvEncOpenEncodeSessionEx(&params, &session);
+	if (stat != NV_ENC_SUCCESS)
+		goto finish;
+
+	uint32_t guid_count = 0;
+	if (nv.nvEncGetEncodeGUIDCount(session, &guid_count) != NV_ENC_SUCCESS)
+		goto finish;
+
+	guids = malloc(guid_count * sizeof(GUID));
+	stat = nv.nvEncGetEncodeGUIDs(session, guids, guid_count, &guid_count);
+	if (stat != NV_ENC_SUCCESS)
+		goto finish;
+
+	for (uint32_t i = 0; i < guid_count; i++) {
+		GUID *guid = &guidsi;
+
+		if (memcmp(guid, &NV_ENC_CODEC_AV1_GUID, sizeof(GUID)) == 0) {
+			caps->supports_av1 = true;
+			break;
+		}
+	}
+
+finish:
+	if (guids)
+		free(guids);
+	if (session)
+		nv.nvEncDestroyEncoder(session);
+	if (context)
+		context->lpVtbl->Release(context);
+	if (device)
+		device->lpVtbl->Release(device);
+	if (adapter)
+		adapter->lpVtbl->Release(adapter);
+	return true;
+}
+
+typedef NVENCSTATUS(NVENCAPI *NV_MAX_VER_FUNC)(uint32_t *);
+typedef NVENCSTATUS(NVENCAPI *NV_CREATE_INSTANCE_FUNC)(
+	NV_ENCODE_API_FUNCTION_LIST *);
+
+static inline uint32_t get_nvenc_ver(void)
+{
+	NV_MAX_VER_FUNC nv_max_ver = (NV_MAX_VER_FUNC)load_nv_func(
+		"NvEncodeAPIGetMaxSupportedVersion");
+	if (!nv_max_ver) {
+		return 0;
+	}
+
+	uint32_t ver = 0;
+	if (nv_max_ver(&ver) != NV_ENC_SUCCESS) {
+		return 0;
+	}
+	return ver;
+}
+
+static inline bool init_nvenc_internal(void)
+{
+	if (!load_nvenc_lib())
+		return false;
+
+	uint32_t ver = get_nvenc_ver();
+	if (ver == 0)
+		return false;
+
+	uint32_t supported_ver = (NVENC_COMPAT_MAJOR_VER << 4) |
+				 NVENC_COMPAT_MINOR_VER;
+	if (supported_ver > ver)
+		return false;
+
+	NV_CREATE_INSTANCE_FUNC nv_create_instance =
+		(NV_CREATE_INSTANCE_FUNC)load_nv_func(
+			"NvEncodeAPICreateInstance");
+	if (!nv_create_instance)
+		return false;
+
+	return nv_create_instance(&nv) == NV_ENC_SUCCESS;
+}
+
+DWORD WINAPI TimeoutThread(LPVOID param)
+{
+	HANDLE hMainThread = (HANDLE)param;
+
+	DWORD ret = WaitForSingleObject(hMainThread, 2500);
+	if (ret == WAIT_TIMEOUT)
+		TerminateProcess(GetCurrentProcess(), STATUS_TIMEOUT);
+
+	CloseHandle(hMainThread);
+	return 0;
+}
+
+int main(int argc, char *argv)
+{
+	IDXGIFactory *factory = NULL;
+	HRESULT hr;
+
+	HANDLE hMainThread;
+	DuplicateHandle(GetCurrentProcess(), GetCurrentThread(),
+			GetCurrentProcess(), &hMainThread, 0, FALSE,
+			DUPLICATE_SAME_ACCESS);
+	DWORD threadId;
+	HANDLE hThread;
+	hThread =
+		CreateThread(NULL, 0, TimeoutThread, hMainThread, 0, &threadId);
+	CloseHandle(hThread);
+
+	/* --------------------------------------------------------- */
+	/* try initializing nvenc, I guess */
+
+	if (!init_nvenc_internal())
+		return 0;
+
+	/* --------------------------------------------------------- */
+	/* parse expected LUID order */
+
+	luid_count = argc - 1;
+	for (int i = 1; i < argc; i++) {
+		luid_orderi - 1 = strtoull(argvi, NULL, 16);
+	}
+
+	/* --------------------------------------------------------- */
+	/* obtain adapter compatibility information */
+
+	hr = CreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&factory);
+	if (FAILED(hr))
+		return 0;
+
+	uint32_t idx = 0;
+	while (get_adapter_caps(factory, idx++))
+		;
+
+	for (uint32_t i = 0; i < idx; i++) {
+		struct nvenc_info caps = adapter_infoi;
+
+		printf("%u\n", i);
+		printf("is_nvidia=%s\n", caps.is_nvidia ? "true" : "false");
+		printf("supports_av1=%s\n",
+		 caps.supports_av1 ? "true" : "false");
+	}
+
+	factory->lpVtbl->Release(factory);
+	return 0;
+}

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc-ver.h Changed

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc.c Added

@@ -0,0 +1,1577 @@
+#include "obs-nvenc.h"
+#include <util/circlebuf.h>
+#include <util/darray.h>
+#include <util/dstr.h>
+#include <obs-avc.h>
+#include <libavutil/rational.h>
+#define INITGUID
+#include <dxgi.h>
+#include <d3d11.h>
+#include <d3d11_1.h>
+#include <obs-hevc.h>
+
+/* ========================================================================= */
+/* a hack of the ages: nvenc backward compatibility */
+
+#define CONFIGURED_NVENC_MAJOR 12
+#define CONFIGURED_NVENC_MINOR 0
+#define CONFIGURED_NVENC_VER \
+	(CONFIGURED_NVENC_MAJOR | (CONFIGURED_NVENC_MINOR << 24))
+
+/* we cannot guarantee structures haven't changed, so purposely break on
+ * version change to force the programmer to update or remove backward
+ * compatibility NVENC code. */
+#if CONFIGURED_NVENC_VER != NVENCAPI_VERSION
+#error NVENC version changed, update or remove NVENC compatibility code
+#endif
+
+#undef NVENCAPI_STRUCT_VERSION
+#define NVENCAPI_STRUCT_VERSION(ver) \
+	((uint32_t)(enc->codec == CODEC_AV1 ? NVENCAPI_VERSION \
+					 : NVENC_COMPAT_VER) | \
+	 ((ver) << 16) | (0x7 << 28))
+
+#define NV_ENC_CONFIG_COMPAT_VER (NVENCAPI_STRUCT_VERSION(7) | (1 << 31))
+#define NV_ENC_PIC_PARAMS_COMPAT_VER (NVENCAPI_STRUCT_VERSION(4) | (1 << 31))
+#define NV_ENC_LOCK_BITSTREAM_COMPAT_VER NVENCAPI_STRUCT_VERSION(1)
+#define NV_ENC_REGISTER_RESOURCE_COMPAT_VER NVENCAPI_STRUCT_VERSION(3)
+
+/* ========================================================================= */
+
+#define EXTRA_BUFFERS 5
+
+#define do_log(level, format, ...) \
+	blog(level, "obs-nvenc: '%s' " format, \
+	 obs_encoder_get_name(enc->encoder), ##__VA_ARGS__)
+
+#define error(format, ...) do_log(LOG_ERROR, format, ##__VA_ARGS__)
+#define warn(format, ...) do_log(LOG_WARNING, format, ##__VA_ARGS__)
+#define info(format, ...) do_log(LOG_INFO, format, ##__VA_ARGS__)
+#define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
+
+#define error_hr(msg) error("%s: %s: 0x%08lX", __FUNCTION__, msg, (uint32_t)hr);
+
+struct nv_bitstream;
+struct nv_texture;
+
+struct handle_tex {
+	uint32_t handle;
+	ID3D11Texture2D *tex;
+	IDXGIKeyedMutex *km;
+};
+
+/* ------------------------------------------------------------------------- */
+/* Main Implementation Structure */
+
+enum codec_type {
+	CODEC_H264,
+	CODEC_HEVC,
+	CODEC_AV1,
+};
+
+static const char *get_codec_name(enum codec_type type)
+{
+	switch (type) {
+	case CODEC_H264:
+		return "H264";
+	case CODEC_HEVC:
+		return "HEVC";
+	case CODEC_AV1:
+		return "AV1";
+	}
+
+	return "Unknown";
+}
+
+struct nvenc_data {
+	obs_encoder_t *encoder;
+	enum codec_type codec;
+	GUID codec_guid;
+
+	void *session;
+	NV_ENC_INITIALIZE_PARAMS params;
+	NV_ENC_CONFIG config;
+	int rc_lookahead;
+	int buf_count;
+	int output_delay;
+	int buffers_queued;
+	size_t next_bitstream;
+	size_t cur_bitstream;
+	bool encode_started;
+	bool first_packet;
+	bool can_change_bitrate;
+	int32_t bframes;
+
+	DARRAY(struct nv_bitstream) bitstreams;
+	DARRAY(struct nv_texture) textures;
+	DARRAY(struct handle_tex) input_textures;
+	struct circlebuf dts_list;
+
+	DARRAY(uint8_t) packet_data;
+	int64_t packet_pts;
+	bool packet_keyframe;
+
+	ID3D11Device *device;
+	ID3D11DeviceContext *context;
+
+	uint32_t cx;
+	uint32_t cy;
+
+	uint8_t *header;
+	size_t header_size;
+
+	uint8_t *sei;
+	size_t sei_size;
+};
+
+/* ------------------------------------------------------------------------- */
+/* Bitstream Buffer */
+
+struct nv_bitstream {
+	void *ptr;
+};
+
+#define NV_FAIL(format, ...) nv_fail(enc->encoder, format, ##__VA_ARGS__)
+#define NV_FAILED(x) nv_failed(enc->encoder, x, __FUNCTION__, #x)
+
+static bool nv_bitstream_init(struct nvenc_data *enc, struct nv_bitstream *bs)
+{
+	NV_ENC_CREATE_BITSTREAM_BUFFER buf = {
+		NV_ENC_CREATE_BITSTREAM_BUFFER_VER};
+
+	if (NV_FAILED(nv.nvEncCreateBitstreamBuffer(enc->session, &buf))) {
+		return false;
+	}
+
+	bs->ptr = buf.bitstreamBuffer;
+	return true;
+}
+
+static void nv_bitstream_free(struct nvenc_data *enc, struct nv_bitstream *bs)
+{
+	if (bs->ptr) {
+		nv.nvEncDestroyBitstreamBuffer(enc->session, bs->ptr);
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+/* Texture Resource */
+
+struct nv_texture {
+	void *res;
+	ID3D11Texture2D *tex;
+	void *mapped_res;
+};
+
+static bool nv_texture_init(struct nvenc_data *enc, struct nv_texture *nvtex)
+{
+	const bool p010 = obs_p010_tex_active();
+
+	D3D11_TEXTURE2D_DESC desc = {0};
+	desc.Width = enc->cx;
+	desc.Height = enc->cy;
+	desc.MipLevels = 1;
+	desc.ArraySize = 1;
+	desc.Format = p010 ? DXGI_FORMAT_P010 : DXGI_FORMAT_NV12;
+	desc.SampleDesc.Count = 1;
+	desc.BindFlags = D3D11_BIND_RENDER_TARGET;
+
+	ID3D11Device *const device = enc->device;
+	ID3D11Texture2D *tex;
+	HRESULT hr = device->lpVtbl->CreateTexture2D(device, &desc, NULL, &tex);
+	if (FAILED(hr)) {
+		error_hr("Failed to create texture");
+		return false;
+	}
+
+	tex->lpVtbl->SetEvictionPriority(tex, DXGI_RESOURCE_PRIORITY_MAXIMUM);
+
+	uint32_t struct_ver = enc->codec == CODEC_AV1
+				 ? NV_ENC_REGISTER_RESOURCE_VER
+				 : NV_ENC_REGISTER_RESOURCE_COMPAT_VER;
+
+	NV_ENC_REGISTER_RESOURCE res = {struct_ver};
+	res.resourceType = NV_ENC_INPUT_RESOURCE_TYPE_DIRECTX;
+	res.resourceToRegister = tex;
+	res.width = enc->cx;
+	res.height = enc->cy;
+	res.bufferFormat = p010 ? NV_ENC_BUFFER_FORMAT_YUV420_10BIT
+				: NV_ENC_BUFFER_FORMAT_NV12;
+
+	if (NV_FAILED(nv.nvEncRegisterResource(enc->session, &res))) {
+		tex->lpVtbl->Release(tex);
+		return false;
+	}
+
+	nvtex->res = res.registeredResource;
+	nvtex->tex = tex;
+	nvtex->mapped_res = NULL;
+	return true;
+}
+
+static void nv_texture_free(struct nvenc_data *enc, struct nv_texture *nvtex)
+{
+	if (nvtex->res) {
+		if (nvtex->mapped_res) {
+			nv.nvEncUnmapInputResource(enc->session,
+						 nvtex->mapped_res);
+		}
+		nv.nvEncUnregisterResource(enc->session, nvtex->res);
+		nvtex->tex->lpVtbl->Release(nvtex->tex);
+	}
+}
+
+/* ------------------------------------------------------------------------- */
+/* Implementation */
+
+static const char *h264_nvenc_get_name(void *type_data)
+{
+	UNUSED_PARAMETER(type_data);
+	return "NVIDIA NVENC H.264";
+}
+
+#ifdef ENABLE_HEVC
+static const char *hevc_nvenc_get_name(void *type_data)
+{
+	UNUSED_PARAMETER(type_data);
+	return "NVIDIA NVENC HEVC";
+}
+#endif
+
+static const char *av1_nvenc_get_name(void *type_data)
+{
+	UNUSED_PARAMETER(type_data);
+	return "NVIDIA NVENC AV1";
+}
+
+static inline int nv_get_cap(struct nvenc_data *enc, NV_ENC_CAPS cap)
+{
+	if (!enc->session)
+		return 0;
+
+	NV_ENC_CAPS_PARAM param = {NV_ENC_CAPS_PARAM_VER};
+	int v;
+
+	param.capsToQuery = cap;
+	nv.nvEncGetEncodeCaps(enc->session, enc->codec_guid, &param, &v);
+	return v;
+}
+
+static bool nvenc_update(void *data, obs_data_t *settings)
+{
+	struct nvenc_data *enc = data;
+
+	/* Only support reconfiguration of CBR bitrate */
+	if (enc->can_change_bitrate) {
+		int bitrate = (int)obs_data_get_int(settings, "bitrate");
+		int max_bitrate =
+			(int)obs_data_get_int(settings, "max_bitrate");
+		bool vbr = (enc->config.rcParams.rateControlMode ==
+			 NV_ENC_PARAMS_RC_VBR);
+
+		enc->config.rcParams.averageBitRate = bitrate * 1000;
+		enc->config.rcParams.maxBitRate = vbr ? max_bitrate * 1000
+						 : bitrate * 1000;
+
+		NV_ENC_RECONFIGURE_PARAMS params = {0};
+		params.version = NV_ENC_RECONFIGURE_PARAMS_VER;
+		params.reInitEncodeParams = enc->params;
+		params.resetEncoder = 1;
+		params.forceIDR = 1;
+
+		if (NV_FAILED(nv.nvEncReconfigureEncoder(enc->session,
+							 &params))) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+static HANDLE get_lib(struct nvenc_data *enc, const char *lib)
+{
+	HMODULE mod = GetModuleHandleA(lib);
+	if (mod)
+		return mod;
+
+	mod = LoadLibraryA(lib);
+	if (!mod)
+		error("Failed to load %s", lib);
+	return mod;
+}
+
+typedef HRESULT(WINAPI *CREATEDXGIFACTORY1PROC)(REFIID, void **);
+
+static bool init_d3d11(struct nvenc_data *enc, obs_data_t *settings)
+{
+	HMODULE dxgi = get_lib(enc, "DXGI.dll");
+	HMODULE d3d11 = get_lib(enc, "D3D11.dll");
+	CREATEDXGIFACTORY1PROC create_dxgi;
+	PFN_D3D11_CREATE_DEVICE create_device;
+	IDXGIFactory1 *factory;
+	IDXGIAdapter *adapter;
+	ID3D11Device *device;
+	ID3D11DeviceContext *context;
+	HRESULT hr;
+
+	if (!dxgi || !d3d11) {
+		return false;
+	}
+
+	create_dxgi = (CREATEDXGIFACTORY1PROC)GetProcAddress(
+		dxgi, "CreateDXGIFactory1");
+	create_device = (PFN_D3D11_CREATE_DEVICE)GetProcAddress(
+		d3d11, "D3D11CreateDevice");
+
+	if (!create_dxgi || !create_device) {
+		error("Failed to load D3D11/DXGI procedures");
+		return false;
+	}
+
+	hr = create_dxgi(&IID_IDXGIFactory1, &factory);
+	if (FAILED(hr)) {
+		error_hr("CreateDXGIFactory1 failed");
+		return false;
+	}
+
+	hr = factory->lpVtbl->EnumAdapters(factory, 0, &adapter);
+	factory->lpVtbl->Release(factory);
+	if (FAILED(hr)) {
+		error_hr("EnumAdapters failed");
+		return false;
+	}
+
+	hr = create_device(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, 0, NULL, 0,
+			 D3D11_SDK_VERSION, &device, NULL, &context);
+	adapter->lpVtbl->Release(adapter);
+	if (FAILED(hr)) {
+		error_hr("D3D11CreateDevice failed");
+		return false;
+	}
+
+	enc->device = device;
+	enc->context = context;
+	return true;
+}
+
+static bool init_session(struct nvenc_data *enc)
+{
+	NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS params = {
+		NV_ENC_OPEN_ENCODE_SESSION_EX_PARAMS_VER};
+	params.device = enc->device;
+	params.deviceType = NV_ENC_DEVICE_TYPE_DIRECTX;
+	params.apiVersion = enc->codec == CODEC_AV1 ? NVENCAPI_VERSION
+						 : NVENC_COMPAT_VER;
+
+	if (NV_FAILED(nv.nvEncOpenEncodeSessionEx(&params, &enc->session))) {
+		return false;
+	}
+	return true;
+}
+
+static void initialize_params(struct nvenc_data *enc, const GUID *nv_preset,
+			 NV_ENC_TUNING_INFO nv_tuning, uint32_t width,
+			 uint32_t height, uint32_t fps_num,
+			 uint32_t fps_den)
+{
+	int darWidth, darHeight;
+	av_reduce(&darWidth, &darHeight, width, height, 1024 * 1024);
+
+	NV_ENC_INITIALIZE_PARAMS *params = &enc->params;
+	memset(params, 0, sizeof(*params));
+	params->version = NV_ENC_INITIALIZE_PARAMS_VER;
+	params->encodeGUID = enc->codec_guid;
+	params->presetGUID = *nv_preset;
+	params->encodeWidth = width;
+	params->encodeHeight = height;
+	params->darWidth = enc->codec == CODEC_AV1 ? width : darWidth;
+	params->darHeight = enc->codec == CODEC_AV1 ? height : darHeight;
+	params->frameRateNum = fps_num;
+	params->frameRateDen = fps_den;
+	params->enableEncodeAsync = 0;
+	params->enablePTD = 1;
+	params->encodeConfig = &enc->config;
+	params->tuningInfo = nv_tuning;
+}
+
+static inline GUID get_nv_preset2(const char *preset2)
+{
+	if (astrcmpi(preset2, "p1") == 0) {
+		return NV_ENC_PRESET_P1_GUID;
+	} else if (astrcmpi(preset2, "p2") == 0) {
+		return NV_ENC_PRESET_P2_GUID;
+	} else if (astrcmpi(preset2, "p3") == 0) {
+		return NV_ENC_PRESET_P3_GUID;
+	} else if (astrcmpi(preset2, "p4") == 0) {
+		return NV_ENC_PRESET_P4_GUID;
+	} else if (astrcmpi(preset2, "p6") == 0) {
+		return NV_ENC_PRESET_P6_GUID;
+	} else if (astrcmpi(preset2, "p7") == 0) {
+		return NV_ENC_PRESET_P7_GUID;
+	} else {
+		return NV_ENC_PRESET_P5_GUID;
+	}
+}
+
+static inline NV_ENC_TUNING_INFO get_nv_tuning(const char *tuning)
+{
+	if (astrcmpi(tuning, "ll") == 0) {
+		return NV_ENC_TUNING_INFO_LOW_LATENCY;
+	} else if (astrcmpi(tuning, "ull") == 0) {
+		return NV_ENC_TUNING_INFO_ULTRA_LOW_LATENCY;
+	} else {
+		return NV_ENC_TUNING_INFO_HIGH_QUALITY;
+	}
+}
+
+static inline NV_ENC_MULTI_PASS get_nv_multipass(const char *multipass)
+{
+	if (astrcmpi(multipass, "qres") == 0) {
+		return NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
+	} else if (astrcmpi(multipass, "fullres") == 0) {
+		return NV_ENC_TWO_PASS_FULL_RESOLUTION;
+	} else {
+		return NV_ENC_MULTI_PASS_DISABLED;
+	}
+}
+
+static bool init_encoder_base(struct nvenc_data *enc, obs_data_t *settings,
+			 int bf, bool compatibility, bool *lossless)
+{
+	const char *rc = obs_data_get_string(settings, "rate_control");
+	int bitrate = (int)obs_data_get_int(settings, "bitrate");
+	int max_bitrate = (int)obs_data_get_int(settings, "max_bitrate");
+	int cqp = (int)obs_data_get_int(settings, "cqp");
+	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
+	const char *preset = obs_data_get_string(settings, "preset");
+	const char *preset2 = obs_data_get_string(settings, "preset2");
+	const char *tuning = obs_data_get_string(settings, "tune");
+	const char *multipass = obs_data_get_string(settings, "multipass");
+	const char *profile = obs_data_get_string(settings, "profile");
+	bool lookahead = obs_data_get_bool(settings, "lookahead");
+	bool vbr = astrcmpi(rc, "VBR") == 0;
+	bool psycho_aq = !compatibility &&
+			 obs_data_get_bool(settings, "psycho_aq");
+	NVENCSTATUS err;
+
+	video_t *video = obs_encoder_video(enc->encoder);
+	const struct video_output_info *voi = video_output_get_info(video);
+
+	enc->cx = obs_encoder_get_width(enc->encoder);
+	enc->cy = obs_encoder_get_height(enc->encoder);
+
+	/* -------------------------- */
+	/* get preset */
+
+	GUID nv_preset = get_nv_preset2(preset2);
+	NV_ENC_TUNING_INFO nv_tuning = get_nv_tuning(tuning);
+	NV_ENC_MULTI_PASS nv_multipass = compatibility
+						 ? NV_ENC_MULTI_PASS_DISABLED
+						 : get_nv_multipass(multipass);
+
+	if (obs_data_has_user_value(settings, "preset") &&
+	 !obs_data_has_user_value(settings, "preset2") &&
+	 enc->codec == CODEC_H264) {
+		if (astrcmpi(preset, "mq") == 0) {
+			nv_preset = NV_ENC_PRESET_P5_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
+
+		} else if (astrcmpi(preset, "hq") == 0) {
+			nv_preset = NV_ENC_PRESET_P5_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "default") == 0) {
+			nv_preset = NV_ENC_PRESET_P3_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "hp") == 0) {
+			nv_preset = NV_ENC_PRESET_P1_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "ll") == 0) {
+			nv_preset = NV_ENC_PRESET_P3_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "llhq") == 0) {
+			nv_preset = NV_ENC_PRESET_P4_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "llhp") == 0) {
+			nv_preset = NV_ENC_PRESET_P2_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+		}
+	} else if (obs_data_has_user_value(settings, "preset") &&
+		 !obs_data_has_user_value(settings, "preset2") &&
+		 enc->codec == CODEC_HEVC) {
+		if (astrcmpi(preset, "mq") == 0) {
+			nv_preset = NV_ENC_PRESET_P6_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
+
+		} else if (astrcmpi(preset, "hq") == 0) {
+			nv_preset = NV_ENC_PRESET_P6_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "default") == 0) {
+			nv_preset = NV_ENC_PRESET_P5_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "hp") == 0) {
+			nv_preset = NV_ENC_PRESET_P1_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "ll") == 0) {
+			nv_preset = NV_ENC_PRESET_P3_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "llhq") == 0) {
+			nv_preset = NV_ENC_PRESET_P4_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+
+		} else if (astrcmpi(preset, "llhp") == 0) {
+			nv_preset = NV_ENC_PRESET_P2_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_LOW_LATENCY;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+		}
+	}
+
+	const bool rc_lossless = astrcmpi(rc, "lossless") == 0;
+	*lossless = rc_lossless;
+	if (rc_lossless) {
+		*lossless =
+			nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_LOSSLESS_ENCODE);
+		if (*lossless) {
+			nv_tuning = NV_ENC_TUNING_INFO_LOSSLESS;
+			nv_multipass = NV_ENC_MULTI_PASS_DISABLED;
+		} else {
+			warn("lossless encode is not supported, ignoring");
+			nv_preset = NV_ENC_PRESET_P5_GUID;
+			nv_tuning = NV_ENC_TUNING_INFO_HIGH_QUALITY;
+			nv_multipass = NV_ENC_TWO_PASS_QUARTER_RESOLUTION;
+		}
+	}
+
+	/* -------------------------- */
+	/* get preset default config */
+
+	uint32_t config_ver = enc->codec == CODEC_AV1
+				 ? NV_ENC_CONFIG_VER
+				 : NV_ENC_CONFIG_COMPAT_VER;
+
+	NV_ENC_PRESET_CONFIG preset_config = {NV_ENC_PRESET_CONFIG_VER,
+					 {config_ver}};
+
+	err = nv.nvEncGetEncodePresetConfigEx(enc->session, enc->codec_guid,
+					 nv_preset, nv_tuning,
+					 &preset_config);
+	if (nv_failed(enc->encoder, err, __FUNCTION__,
+		 "nvEncGetEncodePresetConfig")) {
+		return false;
+	}
+
+	/* -------------------------- */
+	/* main configuration */
+
+	enc->config = preset_config.presetCfg;
+
+	uint32_t gop_size =
+		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
+
+	NV_ENC_CONFIG *config = &enc->config;
+
+	initialize_params(enc, &nv_preset, nv_tuning, voi->width, voi->height,
+			 voi->fps_num, voi->fps_den);
+
+	config->gopLength = gop_size;
+	config->frameIntervalP = 1 + bf;
+
+	enc->bframes = bf;
+
+	/* lookahead */
+	const bool use_profile_lookahead = config->rcParams.enableLookahead;
+	lookahead = nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_LOOKAHEAD) &&
+		 (lookahead || use_profile_lookahead);
+	if (lookahead) {
+		enc->rc_lookahead = use_profile_lookahead
+					 ? config->rcParams.lookaheadDepth
+					 : 8;
+	}
+
+	int buf_count = max(4, config->frameIntervalP * 2 * 2);
+	if (lookahead) {
+		buf_count = max(buf_count, config->frameIntervalP +
+						 enc->rc_lookahead +
+						 EXTRA_BUFFERS);
+	}
+
+	buf_count = min(64, buf_count);
+	enc->buf_count = buf_count;
+
+	const int output_delay = buf_count - 1;
+	enc->output_delay = output_delay;
+
+	if (lookahead) {
+		const int lkd_bound = output_delay - config->frameIntervalP - 4;
+		if (lkd_bound >= 0) {
+			config->rcParams.enableLookahead = 1;
+			config->rcParams.lookaheadDepth =
+				max(enc->rc_lookahead, lkd_bound);
+			config->rcParams.disableIadapt = 0;
+			config->rcParams.disableBadapt = 0;
+		} else {
+			lookahead = false;
+		}
+	}
+
+	/* psycho aq */
+	if (!compatibility) {
+		if (nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_TEMPORAL_AQ)) {
+			config->rcParams.enableAQ = psycho_aq;
+			config->rcParams.aqStrength = 8;
+			config->rcParams.enableTemporalAQ = psycho_aq;
+		} else {
+			warn("Ignoring Psycho Visual Tuning request since GPU is not capable");
+		}
+	}
+
+	/* -------------------------- */
+	/* rate control */
+
+	enc->can_change_bitrate =
+		nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_DYN_BITRATE_CHANGE);
+
+	config->rcParams.rateControlMode = NV_ENC_PARAMS_RC_VBR;
+
+	if (astrcmpi(rc, "cqp") == 0 || rc_lossless) {
+		if (*lossless)
+			cqp = 0;
+
+		int cqp_val = enc->codec == CODEC_AV1 ? cqp * 4 : cqp;
+
+		config->rcParams.rateControlMode = NV_ENC_PARAMS_RC_CONSTQP;
+		config->rcParams.constQP.qpInterP = cqp_val;
+		config->rcParams.constQP.qpInterB = cqp_val;
+		config->rcParams.constQP.qpIntra = cqp_val;
+		enc->can_change_bitrate = false;
+
+		bitrate = 0;
+		max_bitrate = 0;
+
+	} else if (astrcmpi(rc, "vbr") != 0) { /* CBR by default */
+		config->rcParams.rateControlMode = NV_ENC_PARAMS_RC_CBR;
+	}
+
+	config->rcParams.averageBitRate = bitrate * 1000;
+	config->rcParams.maxBitRate = vbr ? max_bitrate * 1000 : bitrate * 1000;
+	config->rcParams.vbvBufferSize = bitrate * 1000;
+	config->rcParams.multiPass = nv_multipass;
+
+	/* -------------------------- */
+	/* initialize */
+
+	info("settings:\n"
+	 "\tcodec: %s\n"
+	 "\trate_control: %s\n"
+	 "\tbitrate: %d\n"
+	 "\tcqp: %d\n"
+	 "\tkeyint: %d\n"
+	 "\tpreset: %s\n"
+	 "\ttuning: %s\n"
+	 "\tmultipass: %s\n"
+	 "\tprofile: %s\n"
+	 "\twidth: %d\n"
+	 "\theight: %d\n"
+	 "\tb-frames: %d\n"
+	 "\tlookahead: %s\n"
+	 "\tpsycho_aq: %s\n",
+	 get_codec_name(enc->codec), rc, bitrate, cqp, gop_size, preset2,
+	 tuning, multipass, profile, enc->cx, enc->cy, bf,
+	 lookahead ? "true" : "false", psycho_aq ? "true" : "false");
+
+	return true;
+}
+
+static bool init_encoder_h264(struct nvenc_data *enc, obs_data_t *settings,
+			 int bf, bool compatibility)
+{
+	const char *rc = obs_data_get_string(settings, "rate_control");
+	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
+	const char *profile = obs_data_get_string(settings, "profile");
+	bool lossless;
+
+	if (!init_encoder_base(enc, settings, bf, compatibility, &lossless)) {
+		return false;
+	}
+
+	NV_ENC_CONFIG *config = &enc->config;
+	NV_ENC_CONFIG_H264 *h264_config = &config->encodeCodecConfig.h264Config;
+	NV_ENC_CONFIG_H264_VUI_PARAMETERS *vui_params =
+		&h264_config->h264VUIParameters;
+
+	video_t *video = obs_encoder_video(enc->encoder);
+	const struct video_output_info *voi = video_output_get_info(video);
+	uint32_t gop_size =
+		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
+
+	h264_config->idrPeriod = gop_size;
+
+	bool repeat_headers = obs_data_get_bool(settings, "repeat_headers");
+	if (repeat_headers) {
+		h264_config->repeatSPSPPS = 1;
+		h264_config->disableSPSPPS = 0;
+		h264_config->outputAUD = 1;
+	}
+
+	h264_config->sliceMode = 3;
+	h264_config->sliceModeData = 1;
+
+	h264_config->useBFramesAsRef = NV_ENC_BFRAME_REF_MODE_DISABLED;
+
+	/* Enable CBR padding */
+	if (config->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR)
+		h264_config->enableFillerDataInsertion = 1;
+
+	vui_params->videoSignalTypePresentFlag = 1;
+	vui_params->videoFullRangeFlag = (voi->range == VIDEO_RANGE_FULL);
+	vui_params->colourDescriptionPresentFlag = 1;
+
+	switch (voi->colorspace) {
+	case VIDEO_CS_601:
+		vui_params->colourPrimaries = 6;
+		vui_params->transferCharacteristics = 6;
+		vui_params->colourMatrix = 6;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		vui_params->colourPrimaries = 1;
+		vui_params->transferCharacteristics = 1;
+		vui_params->colourMatrix = 1;
+		break;
+	case VIDEO_CS_SRGB:
+		vui_params->colourPrimaries = 1;
+		vui_params->transferCharacteristics = 13;
+		vui_params->colourMatrix = 1;
+		break;
+	}
+
+	if (astrcmpi(rc, "lossless") == 0) {
+		h264_config->qpPrimeYZeroTransformBypassFlag = 1;
+	} else if (astrcmpi(rc, "vbr") != 0) { /* CBR */
+		h264_config->outputBufferingPeriodSEI = 1;
+	}
+
+	h264_config->outputPictureTimingSEI = 1;
+
+	/* -------------------------- */
+	/* profile */
+
+	if (astrcmpi(profile, "main") == 0) {
+		config->profileGUID = NV_ENC_H264_PROFILE_MAIN_GUID;
+	} else if (astrcmpi(profile, "baseline") == 0) {
+		config->profileGUID = NV_ENC_H264_PROFILE_BASELINE_GUID;
+	} else if (!lossless) {
+		config->profileGUID = NV_ENC_H264_PROFILE_HIGH_GUID;
+	}
+
+	if (NV_FAILED(nv.nvEncInitializeEncoder(enc->session, &enc->params))) {
+		return false;
+	}
+
+	return true;
+}
+
+static bool init_encoder_hevc(struct nvenc_data *enc, obs_data_t *settings,
+			 int bf, bool compatibility)
+{
+	const char *rc = obs_data_get_string(settings, "rate_control");
+	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
+	const char *profile = obs_data_get_string(settings, "profile");
+	bool lossless;
+
+	if (!init_encoder_base(enc, settings, bf, compatibility, &lossless)) {
+		return false;
+	}
+
+	NV_ENC_CONFIG *config = &enc->config;
+	NV_ENC_CONFIG_HEVC *hevc_config = &config->encodeCodecConfig.hevcConfig;
+	NV_ENC_CONFIG_HEVC_VUI_PARAMETERS *vui_params =
+		&hevc_config->hevcVUIParameters;
+
+	video_t *video = obs_encoder_video(enc->encoder);
+	const struct video_output_info *voi = video_output_get_info(video);
+	uint32_t gop_size =
+		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
+
+	hevc_config->idrPeriod = gop_size;
+
+	bool repeat_headers = obs_data_get_bool(settings, "repeat_headers");
+	if (repeat_headers) {
+		hevc_config->repeatSPSPPS = 1;
+		hevc_config->disableSPSPPS = 0;
+		hevc_config->outputAUD = 1;
+	}
+
+	hevc_config->sliceMode = 3;
+	hevc_config->sliceModeData = 1;
+
+	hevc_config->useBFramesAsRef = NV_ENC_BFRAME_REF_MODE_DISABLED;
+
+	/* Enable CBR padding */
+	if (config->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR)
+		hevc_config->enableFillerDataInsertion = 1;
+
+	vui_params->videoSignalTypePresentFlag = 1;
+	vui_params->videoFullRangeFlag = (voi->range == VIDEO_RANGE_FULL);
+	vui_params->colourDescriptionPresentFlag = 1;
+
+	switch (voi->colorspace) {
+	case VIDEO_CS_601:
+		vui_params->colourPrimaries = 6;
+		vui_params->transferCharacteristics = 6;
+		vui_params->colourMatrix = 6;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		vui_params->colourPrimaries = 1;
+		vui_params->transferCharacteristics = 1;
+		vui_params->colourMatrix = 1;
+		break;
+	case VIDEO_CS_SRGB:
+		vui_params->colourPrimaries = 1;
+		vui_params->transferCharacteristics = 13;
+		vui_params->colourMatrix = 1;
+		break;
+	case VIDEO_CS_2100_PQ:
+		vui_params->colourPrimaries = 9;
+		vui_params->transferCharacteristics = 16;
+		vui_params->colourMatrix = 9;
+		vui_params->chromaSampleLocationFlag = 1;
+		vui_params->chromaSampleLocationTop = 2;
+		vui_params->chromaSampleLocationBot = 2;
+		break;
+	case VIDEO_CS_2100_HLG:
+		vui_params->colourPrimaries = 9;
+		vui_params->transferCharacteristics = 18;
+		vui_params->colourMatrix = 9;
+		vui_params->chromaSampleLocationFlag = 1;
+		vui_params->chromaSampleLocationTop = 2;
+		vui_params->chromaSampleLocationBot = 2;
+	}
+
+	hevc_config->pixelBitDepthMinus8 = obs_p010_tex_active() ? 2 : 0;
+
+	if (astrcmpi(rc, "cbr") == 0) {
+		hevc_config->outputBufferingPeriodSEI = 1;
+	}
+
+	hevc_config->outputPictureTimingSEI = 1;
+
+	/* -------------------------- */
+	/* profile */
+
+	if (astrcmpi(profile, "main10") == 0) {
+		config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN10_GUID;
+	} else if (obs_p010_tex_active()) {
+		blog(LOG_WARNING, "obs-nvenc Forcing main10 for P010");
+		config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN10_GUID;
+	} else {
+		config->profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID;
+	}
+
+	if (NV_FAILED(nv.nvEncInitializeEncoder(enc->session, &enc->params))) {
+		return false;
+	}
+
+	return true;
+}
+
+static bool init_encoder_av1(struct nvenc_data *enc, obs_data_t *settings,
+			 int bf, bool compatibility)
+{
+	const char *rc = obs_data_get_string(settings, "rate_control");
+	int keyint_sec = (int)obs_data_get_int(settings, "keyint_sec");
+	bool lossless;
+
+	if (!init_encoder_base(enc, settings, bf, compatibility, &lossless)) {
+		return false;
+	}
+
+	NV_ENC_INITIALIZE_PARAMS *params = &enc->params;
+	NV_ENC_CONFIG *config = &enc->config;
+	NV_ENC_CONFIG_AV1 *av1_config = &config->encodeCodecConfig.av1Config;
+
+	video_t *video = obs_encoder_video(enc->encoder);
+	const struct video_output_info *voi = video_output_get_info(video);
+	uint32_t gop_size =
+		(keyint_sec) ? keyint_sec * voi->fps_num / voi->fps_den : 250;
+
+	av1_config->idrPeriod = gop_size;
+
+	av1_config->useBFramesAsRef = NV_ENC_BFRAME_REF_MODE_DISABLED;
+
+	av1_config->colorRange = (voi->range == VIDEO_RANGE_FULL);
+
+	/* Enable CBR padding */
+	if (config->rcParams.rateControlMode == NV_ENC_PARAMS_RC_CBR)
+		av1_config->enableBitstreamPadding = 1;
+
+	switch (voi->colorspace) {
+	case VIDEO_CS_601:
+		av1_config->colorPrimaries = 6;
+		av1_config->transferCharacteristics = 6;
+		av1_config->matrixCoefficients = 6;
+		break;
+	case VIDEO_CS_DEFAULT:
+	case VIDEO_CS_709:
+		av1_config->colorPrimaries = 1;
+		av1_config->transferCharacteristics = 1;
+		av1_config->matrixCoefficients = 1;
+		break;
+	case VIDEO_CS_SRGB:
+		av1_config->colorPrimaries = 1;
+		av1_config->transferCharacteristics = 13;
+		av1_config->matrixCoefficients = 1;
+		break;
+	case VIDEO_CS_2100_PQ:
+		av1_config->colorPrimaries = 9;
+		av1_config->transferCharacteristics = 16;
+		av1_config->matrixCoefficients = 9;
+		break;
+	case VIDEO_CS_2100_HLG:
+		av1_config->colorPrimaries = 9;
+		av1_config->transferCharacteristics = 18;
+		av1_config->matrixCoefficients = 9;
+	}
+
+	/* -------------------------- */
+	/* profile */
+
+	config->profileGUID = NV_ENC_AV1_PROFILE_MAIN_GUID;
+	av1_config->tier = NV_ENC_TIER_AV1_0;
+
+	av1_config->level = NV_ENC_LEVEL_AV1_AUTOSELECT;
+	av1_config->chromaFormatIDC = 1;
+	av1_config->pixelBitDepthMinus8 = obs_p010_tex_active() ? 2 : 0;
+	av1_config->inputPixelBitDepthMinus8 = av1_config->pixelBitDepthMinus8;
+	av1_config->numFwdRefs = 1;
+	av1_config->numBwdRefs = 1;
+	av1_config->repeatSeqHdr = 1;
+
+	if (NV_FAILED(nv.nvEncInitializeEncoder(enc->session, &enc->params))) {
+		return false;
+	}
+
+	return true;
+}
+
+static bool init_bitstreams(struct nvenc_data *enc)
+{
+	da_reserve(enc->bitstreams, enc->buf_count);
+	for (int i = 0; i < enc->buf_count; i++) {
+		struct nv_bitstream bitstream;
+		if (!nv_bitstream_init(enc, &bitstream)) {
+			return false;
+		}
+
+		da_push_back(enc->bitstreams, &bitstream);
+	}
+
+	return true;
+}
+
+static bool init_textures(struct nvenc_data *enc)
+{
+	da_reserve(enc->textures, enc->buf_count);
+	for (int i = 0; i < enc->buf_count; i++) {
+		struct nv_texture texture;
+		if (!nv_texture_init(enc, &texture)) {
+			return false;
+		}
+
+		da_push_back(enc->textures, &texture);
+	}
+
+	return true;
+}
+
+static void nvenc_destroy(void *data);
+
+static bool init_specific_encoder(struct nvenc_data *enc, obs_data_t *settings,
+				 int bf, bool compatibility)
+{
+	switch (enc->codec) {
+	case CODEC_HEVC:
+		return init_encoder_hevc(enc, settings, bf, compatibility);
+	case CODEC_H264:
+		return init_encoder_h264(enc, settings, bf, compatibility);
+	case CODEC_AV1:
+		return init_encoder_av1(enc, settings, bf, compatibility);
+	}
+
+	return false;
+}
+
+static bool init_encoder(struct nvenc_data *enc, enum codec_type codec,
+			 obs_data_t *settings, obs_encoder_t *encoder)
+{
+	int bf = (int)obs_data_get_int(settings, "bf");
+	const bool support_10bit =
+		nv_get_cap(enc, NV_ENC_CAPS_SUPPORT_10BIT_ENCODE);
+	const int bf_max = nv_get_cap(enc, NV_ENC_CAPS_NUM_MAX_BFRAMES);
+
+	if (obs_p010_tex_active() && !support_10bit) {
+		NV_FAIL(obs_module_text("NVENC.10bitUnsupported"));
+		return false;
+	}
+
+	video_t *video = obs_encoder_video(enc->encoder);
+	const struct video_output_info *voi = video_output_get_info(video);
+	switch (voi->format) {
+	case VIDEO_FORMAT_I010:
+	case VIDEO_FORMAT_P010:
+		break;
+	default:
+		switch (voi->colorspace) {
+		case VIDEO_CS_2100_PQ:
+		case VIDEO_CS_2100_HLG:
+			NV_FAIL(obs_module_text("NVENC.8bitUnsupportedHdr"));
+			return false;
+		}
+	}
+
+	if (bf > bf_max) {
+		blog(LOG_WARNING,
+		 "obs-nvenc Max B-frames setting (%d) is more than encoder supports (%d).\n"
+		 "Setting B-frames to %d",
+		 bf, bf_max, bf_max);
+		bf = bf_max;
+	}
+
+	if (!init_specific_encoder(enc, settings, bf, false)) {
+		blog(LOG_WARNING, "obs-nvenc init_specific_encoder failed, "
+				 "trying again with compatibility options");
+
+		nv.nvEncDestroyEncoder(enc->session);
+		enc->session = NULL;
+
+		if (!init_session(enc)) {
+			return false;
+		}
+		/* try without multipass and psycho aq */
+		if (!init_specific_encoder(enc, settings, bf, true)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+static void *nvenc_create_internal(enum codec_type codec, obs_data_t *settings,
+				 obs_encoder_t *encoder)
+{
+	struct nvenc_data *enc = bzalloc(sizeof(*enc));
+	enc->encoder = encoder;
+	enc->codec = codec;
+	enc->first_packet = true;
+
+	NV_ENCODE_API_FUNCTION_LIST init = {NV_ENCODE_API_FUNCTION_LIST_VER};
+
+	switch (enc->codec) {
+	case CODEC_H264:
+		enc->codec_guid = NV_ENC_CODEC_H264_GUID;
+		break;
+	case CODEC_HEVC:
+		enc->codec_guid = NV_ENC_CODEC_HEVC_GUID;
+		break;
+	case CODEC_AV1:
+		enc->codec_guid = NV_ENC_CODEC_AV1_GUID;
+		break;
+	}
+
+	if (!init_nvenc(encoder)) {
+		goto fail;
+	}
+	if (NV_FAILED(nv_create_instance(&init))) {
+		goto fail;
+	}
+	if (!init_d3d11(enc, settings)) {
+		goto fail;
+	}
+	if (!init_session(enc)) {
+		goto fail;
+	}
+	if (!init_encoder(enc, codec, settings, encoder)) {
+		goto fail;
+	}
+	if (!init_bitstreams(enc)) {
+		goto fail;
+	}
+	if (!init_textures(enc)) {
+		goto fail;
+	}
+
+#ifdef ENABLE_HEVC
+	enc->codec = codec;
+#endif
+	return enc;
+
+fail:
+	nvenc_destroy(enc);
+	return NULL;
+}
+
+static void *nvenc_create_base(enum codec_type codec, obs_data_t *settings,
+			 obs_encoder_t *encoder)
+{
+	/* this encoder requires shared textures, this cannot be used on a
+	 * gpu other than the one OBS is currently running on. */
+	const int gpu = (int)obs_data_get_int(settings, "gpu");
+	if (gpu != 0) {
+		blog(LOG_INFO,
+		 "obs-nvenc different GPU selected by user, falling back to ffmpeg");
+		goto reroute;
+	}
+
+	if (obs_encoder_scaling_enabled(encoder)) {
+		if (!obs_encoder_gpu_scaling_enabled(encoder)) {
+			blog(LOG_INFO,
+			 "obs-nvenc CPU scaling enabled, falling back to ffmpeg");
+			goto reroute;
+		}
+		blog(LOG_INFO, "obs-nvenc GPU scaling enabled");
+	}
+
+	if (!obs_p010_tex_active() && !obs_nv12_tex_active()) {
+		blog(LOG_INFO,
+		 "obs-nvenc nv12/p010 not active, falling back to ffmpeg");
+		goto reroute;
+	}
+
+	struct nvenc_data *enc =
+		nvenc_create_internal(codec, settings, encoder);
+
+	if (enc) {
+		return enc;
+	}
+
+reroute:
+	switch (codec) {
+	case CODEC_H264:
+		return obs_encoder_create_rerouted(encoder, "ffmpeg_nvenc");
+	case CODEC_HEVC:
+		return obs_encoder_create_rerouted(encoder,
+						 "ffmpeg_hevc_nvenc");
+	case CODEC_AV1:
+		obs_encoder_set_last_error(
+			encoder,
+			obs_module_text("NVENC.NoAV1FallbackPossible"));
+		break;
+	}
+
+	return NULL;
+}
+
+static void *h264_nvenc_create(obs_data_t *settings, obs_encoder_t *encoder)
+{
+	return nvenc_create_base(CODEC_H264, settings, encoder);
+}
+
+#ifdef ENABLE_HEVC
+static void *hevc_nvenc_create(obs_data_t *settings, obs_encoder_t *encoder)
+{
+	return nvenc_create_base(CODEC_HEVC, settings, encoder);
+}
+#endif
+
+static void *av1_nvenc_create(obs_data_t *settings, obs_encoder_t *encoder)
+{
+	return nvenc_create_base(CODEC_AV1, settings, encoder);
+}
+
+static bool get_encoded_packet(struct nvenc_data *enc, bool finalize);
+
+static void nvenc_destroy(void *data)
+{
+	struct nvenc_data *enc = data;
+
+	if (enc->encode_started) {
+		size_t next_bitstream = enc->next_bitstream;
+
+		uint32_t struct_ver = enc->codec == CODEC_AV1
+					 ? NV_ENC_PIC_PARAMS_VER
+					 : NV_ENC_PIC_PARAMS_COMPAT_VER;
+		NV_ENC_PIC_PARAMS params = {struct_ver};
+		params.encodePicFlags = NV_ENC_PIC_FLAG_EOS;
+		nv.nvEncEncodePicture(enc->session, &params);
+		get_encoded_packet(enc, true);
+	}
+	for (size_t i = 0; i < enc->textures.num; i++) {
+		nv_texture_free(enc, &enc->textures.arrayi);
+	}
+	for (size_t i = 0; i < enc->bitstreams.num; i++) {
+		nv_bitstream_free(enc, &enc->bitstreams.arrayi);
+	}
+	if (enc->session) {
+		nv.nvEncDestroyEncoder(enc->session);
+	}
+	for (size_t i = 0; i < enc->input_textures.num; i++) {
+		ID3D11Texture2D *tex = enc->input_textures.arrayi.tex;
+		IDXGIKeyedMutex *km = enc->input_textures.arrayi.km;
+		tex->lpVtbl->Release(tex);
+		km->lpVtbl->Release(km);
+	}
+	if (enc->context) {
+		enc->context->lpVtbl->Release(enc->context);
+	}
+	if (enc->device) {
+		enc->device->lpVtbl->Release(enc->device);
+	}
+
+	bfree(enc->header);
+	bfree(enc->sei);
+	circlebuf_free(&enc->dts_list);
+	da_free(enc->textures);
+	da_free(enc->bitstreams);
+	da_free(enc->input_textures);
+	da_free(enc->packet_data);
+	bfree(enc);
+}
+
+static ID3D11Texture2D *get_tex_from_handle(struct nvenc_data *enc,
+					 uint32_t handle,
+					 IDXGIKeyedMutex **km_out)
+{
+	ID3D11Device *device = enc->device;
+	IDXGIKeyedMutex *km;
+	ID3D11Texture2D *input_tex;
+	HRESULT hr;
+
+	for (size_t i = 0; i < enc->input_textures.num; i++) {
+		struct handle_tex *ht = &enc->input_textures.arrayi;
+		if (ht->handle == handle) {
+			*km_out = ht->km;
+			return ht->tex;
+		}
+	}
+
+	hr = device->lpVtbl->OpenSharedResource(device,
+						(HANDLE)(uintptr_t)handle,
+						&IID_ID3D11Texture2D,
+						&input_tex);
+	if (FAILED(hr)) {
+		error_hr("OpenSharedResource failed");
+		return NULL;
+	}
+
+	hr = input_tex->lpVtbl->QueryInterface(input_tex, &IID_IDXGIKeyedMutex,
+					 &km);
+	if (FAILED(hr)) {
+		error_hr("QueryInterface(IDXGIKeyedMutex) failed");
+		input_tex->lpVtbl->Release(input_tex);
+		return NULL;
+	}
+
+	input_tex->lpVtbl->SetEvictionPriority(input_tex,
+					 DXGI_RESOURCE_PRIORITY_MAXIMUM);
+
+	*km_out = km;
+
+	struct handle_tex new_ht = {handle, input_tex, km};
+	da_push_back(enc->input_textures, &new_ht);
+	return input_tex;
+}
+
+static bool get_encoded_packet(struct nvenc_data *enc, bool finalize)
+{
+	void *s = enc->session;
+
+	da_resize(enc->packet_data, 0);
+
+	if (!enc->buffers_queued)
+		return true;
+	if (!finalize && enc->buffers_queued < enc->output_delay)
+		return true;
+
+	size_t count = finalize ? enc->buffers_queued : 1;
+
+	for (size_t i = 0; i < count; i++) {
+		size_t cur_bs_idx = enc->cur_bitstream;
+		struct nv_bitstream *bs = &enc->bitstreams.arraycur_bs_idx;
+		struct nv_texture *nvtex = &enc->textures.arraycur_bs_idx;
+
+		/* ---------------- */
+
+		uint32_t struct_ver =
+			enc->codec == CODEC_AV1
+				? NV_ENC_LOCK_BITSTREAM_VER
+				: NV_ENC_LOCK_BITSTREAM_COMPAT_VER;
+
+		NV_ENC_LOCK_BITSTREAM lock = {struct_ver};
+		lock.outputBitstream = bs->ptr;
+		lock.doNotWait = false;
+
+		if (NV_FAILED(nv.nvEncLockBitstream(s, &lock))) {
+			return false;
+		}
+
+		if (enc->first_packet) {
+			NV_ENC_SEQUENCE_PARAM_PAYLOAD payload = {0};
+			uint8_t buf256;
+			uint32_t size = 0;
+
+			payload.version = NV_ENC_SEQUENCE_PARAM_PAYLOAD_VER;
+			payload.spsppsBuffer = buf;
+			payload.inBufferSize = sizeof(buf);
+			payload.outSPSPPSPayloadSize = &size;
+
+			nv.nvEncGetSequenceParams(s, &payload);
+			enc->header = bmemdup(buf, size);
+			enc->header_size = size;
+			enc->first_packet = false;
+		}
+
+		da_copy_array(enc->packet_data, lock.bitstreamBufferPtr,
+			 lock.bitstreamSizeInBytes);
+
+		enc->packet_pts = (int64_t)lock.outputTimeStamp;
+		enc->packet_keyframe = lock.pictureType == NV_ENC_PIC_TYPE_IDR;
+
+		if (NV_FAILED(nv.nvEncUnlockBitstream(s, bs->ptr))) {
+			return false;
+		}
+
+		/* ---------------- */
+
+		if (nvtex->mapped_res) {
+			NVENCSTATUS err;
+			err = nv.nvEncUnmapInputResource(s, nvtex->mapped_res);
+			if (nv_failed(enc->encoder, err, __FUNCTION__,
+				 "unmap")) {
+				return false;
+			}
+			nvtex->mapped_res = NULL;
+		}
+
+		/* ---------------- */
+
+		if (++enc->cur_bitstream == enc->buf_count)
+			enc->cur_bitstream = 0;
+
+		enc->buffers_queued--;
+	}
+
+	return true;
+}
+
+static bool nvenc_encode_tex(void *data, uint32_t handle, int64_t pts,
+			 uint64_t lock_key, uint64_t *next_key,
+			 struct encoder_packet *packet,
+			 bool *received_packet)
+{
+	struct nvenc_data *enc = data;
+	ID3D11Device *device = enc->device;
+	ID3D11DeviceContext *context = enc->context;
+	ID3D11Texture2D *input_tex;
+	ID3D11Texture2D *output_tex;
+	IDXGIKeyedMutex *km;
+	struct nv_texture *nvtex;
+	struct nv_bitstream *bs;
+	NVENCSTATUS err;
+
+	if (handle == GS_INVALID_HANDLE) {
+		error("Encode failed: bad texture handle");
+		*next_key = lock_key;
+		return false;
+	}
+
+	bs = &enc->bitstreams.arrayenc->next_bitstream;
+	nvtex = &enc->textures.arrayenc->next_bitstream;
+
+	input_tex = get_tex_from_handle(enc, handle, &km);
+	output_tex = nvtex->tex;
+
+	if (!input_tex) {
+		*next_key = lock_key;
+		return false;
+	}
+
+	circlebuf_push_back(&enc->dts_list, &pts, sizeof(pts));
+
+	/* ------------------------------------ */
+	/* copy to output tex */
+
+	km->lpVtbl->AcquireSync(km, lock_key, INFINITE);
+
+	context->lpVtbl->CopyResource(context, (ID3D11Resource *)output_tex,
+				 (ID3D11Resource *)input_tex);
+
+	km->lpVtbl->ReleaseSync(km, *next_key);
+
+	/* ------------------------------------ */
+	/* map output tex so nvenc can use it */
+
+	NV_ENC_MAP_INPUT_RESOURCE map = {NV_ENC_MAP_INPUT_RESOURCE_VER};
+	map.registeredResource = nvtex->res;
+	if (NV_FAILED(nv.nvEncMapInputResource(enc->session, &map))) {
+		return false;
+	}
+
+	nvtex->mapped_res = map.mappedResource;
+
+	/* ------------------------------------ */
+	/* do actual encode call */
+
+	NV_ENC_PIC_PARAMS params = {0};
+	params.version = enc->codec == CODEC_AV1 ? NV_ENC_PIC_PARAMS_VER
+						 : NV_ENC_PIC_PARAMS_COMPAT_VER;
+	params.pictureStruct = NV_ENC_PIC_STRUCT_FRAME;
+	params.inputBuffer = nvtex->mapped_res;
+	params.bufferFmt = obs_p010_tex_active()
+				 ? NV_ENC_BUFFER_FORMAT_YUV420_10BIT
+				 : NV_ENC_BUFFER_FORMAT_NV12;
+	params.inputTimeStamp = (uint64_t)pts;
+	params.inputWidth = enc->cx;
+	params.inputHeight = enc->cy;
+	params.inputPitch = enc->cx;
+	params.outputBitstream = bs->ptr;
+
+	err = nv.nvEncEncodePicture(enc->session, &params);
+	if (err != NV_ENC_SUCCESS && err != NV_ENC_ERR_NEED_MORE_INPUT) {
+		nv_failed(enc->encoder, err, __FUNCTION__,
+			 "nvEncEncodePicture");
+		return false;
+	}
+
+	enc->encode_started = true;
+	enc->buffers_queued++;
+
+	if (++enc->next_bitstream == enc->buf_count) {
+		enc->next_bitstream = 0;
+	}
+
+	/* ------------------------------------ */
+	/* check for encoded packet and parse */
+
+	if (!get_encoded_packet(enc, false)) {
+		return false;
+	}
+
+	/* ------------------------------------ */
+	/* output encoded packet */
+
+	if (enc->packet_data.num) {
+		int64_t dts;
+		circlebuf_pop_front(&enc->dts_list, &dts, sizeof(dts));
+
+		/* subtract bframe delay from dts */
+		dts -= (int64_t)enc->bframes * packet->timebase_num;
+
+		*received_packet = true;
+		packet->data = enc->packet_data.array;
+		packet->size = enc->packet_data.num;
+		packet->type = OBS_ENCODER_VIDEO;
+		packet->pts = enc->packet_pts;
+		packet->dts = dts;
+		packet->keyframe = enc->packet_keyframe;
+	} else {
+		*received_packet = false;
+	}
+
+	return true;
+}
+
+extern void h264_nvenc_defaults(obs_data_t *settings);
+extern obs_properties_t *h264_nvenc_properties(void *unused);
+#ifdef ENABLE_HEVC
+extern void hevc_nvenc_defaults(obs_data_t *settings);
+extern obs_properties_t *hevc_nvenc_properties(void *unused);
+#endif
+extern obs_properties_t *av1_nvenc_properties(void *unused);
+extern void av1_nvenc_defaults(obs_data_t *settings);
+
+static bool nvenc_extra_data(void *data, uint8_t **header, size_t *size)
+{
+	struct nvenc_data *enc = data;
+
+	if (!enc->header) {
+		return false;
+	}
+
+	*header = enc->header;
+	*size = enc->header_size;
+	return true;
+}
+
+static bool nvenc_sei_data(void *data, uint8_t **sei, size_t *size)
+{
+	struct nvenc_data *enc = data;
+
+	if (!enc->sei) {
+		return false;
+	}
+
+	*sei = enc->sei;
+	*size = enc->sei_size;
+	return true;
+}
+
+struct obs_encoder_info h264_nvenc_info = {
+	.id = "jim_nvenc",
+	.codec = "h264",
+	.type = OBS_ENCODER_VIDEO,
+	.caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_DYN_BITRATE,
+	.get_name = h264_nvenc_get_name,
+	.create = h264_nvenc_create,
+	.destroy = nvenc_destroy,
+	.update = nvenc_update,
+	.encode_texture = nvenc_encode_tex,
+	.get_defaults = h264_nvenc_defaults,
+	.get_properties = h264_nvenc_properties,
+	.get_extra_data = nvenc_extra_data,
+	.get_sei_data = nvenc_sei_data,
+};
+
+#ifdef ENABLE_HEVC
+struct obs_encoder_info hevc_nvenc_info = {
+	.id = "jim_hevc_nvenc",
+	.codec = "hevc",
+	.type = OBS_ENCODER_VIDEO,
+	.caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_DYN_BITRATE,
+	.get_name = hevc_nvenc_get_name,
+	.create = hevc_nvenc_create,
+	.destroy = nvenc_destroy,
+	.update = nvenc_update,
+	.encode_texture = nvenc_encode_tex,
+	.get_defaults = hevc_nvenc_defaults,
+	.get_properties = hevc_nvenc_properties,
+	.get_extra_data = nvenc_extra_data,
+	.get_sei_data = nvenc_sei_data,
+};
+#endif
+
+struct obs_encoder_info av1_nvenc_info = {
+	.id = "jim_av1_nvenc",
+	.codec = "av1",
+	.type = OBS_ENCODER_VIDEO,
+	.caps = OBS_ENCODER_CAP_PASS_TEXTURE | OBS_ENCODER_CAP_DYN_BITRATE,
+	.get_name = av1_nvenc_get_name,
+	.create = av1_nvenc_create,
+	.destroy = nvenc_destroy,
+	.update = nvenc_update,
+	.encode_texture = nvenc_encode_tex,
+	.get_defaults = av1_nvenc_defaults,
+	.get_properties = av1_nvenc_properties,
+	.get_extra_data = nvenc_extra_data,
+};

obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/obs-nvenc.h Added

obs-studio-29.1.3.tar.xz/plugins/obs-ffmpeg/texture-amf.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-ffmpeg/texture-amf.cpp Changed

@@ -1026,7 +1026,8 @@
 	bool hevc = amf_codec_type::HEVC == codec;
 	bool av1 = amf_codec_type::AV1 == codec;
 
-	if (obs_encoder_scaling_enabled(encoder))
+	if (obs_encoder_scaling_enabled(encoder) &&
+	 !obs_encoder_gpu_scaling_enabled(encoder))
 		throw "Encoder scaling is active";
 
 	if (hevc || av1) {
@@ -1505,7 +1506,8 @@
 	amf_encoder_info.get_defaults = amf_defaults;
 	amf_encoder_info.get_properties = amf_avc_properties;
 	amf_encoder_info.get_extra_data = amf_extra_data;
-	amf_encoder_info.caps = OBS_ENCODER_CAP_PASS_TEXTURE;
+	amf_encoder_info.caps = OBS_ENCODER_CAP_PASS_TEXTURE |
+				OBS_ENCODER_CAP_DYN_BITRATE;
 
 	obs_register_encoder(&amf_encoder_info);
 
@@ -1858,7 +1860,8 @@
 	amf_encoder_info.get_defaults = amf_defaults;
 	amf_encoder_info.get_properties = amf_hevc_properties;
 	amf_encoder_info.get_extra_data = amf_extra_data;
-	amf_encoder_info.caps = OBS_ENCODER_CAP_PASS_TEXTURE;
+	amf_encoder_info.caps = OBS_ENCODER_CAP_PASS_TEXTURE |
+				OBS_ENCODER_CAP_DYN_BITRATE;
 
 	obs_register_encoder(&amf_encoder_info);
 
@@ -2183,7 +2186,8 @@
 	amf_encoder_info.get_defaults = amf_av1_defaults;
 	amf_encoder_info.get_properties = amf_av1_properties;
 	amf_encoder_info.get_extra_data = amf_extra_data;
-	amf_encoder_info.caps = OBS_ENCODER_CAP_PASS_TEXTURE;
+	amf_encoder_info.caps = OBS_ENCODER_CAP_PASS_TEXTURE |
+				OBS_ENCODER_CAP_DYN_BITRATE;
 
 	obs_register_encoder(&amf_encoder_info);
 
@@ -2229,7 +2233,9 @@
 	std::stringstream cmd;
 	std::string caps_str;
 
+	cmd << '"';
 	cmd << test_exe;
+	cmd << '"';
 	enum_graphics_device_luids(enum_luids, &cmd);
 
 	os_process_pipe_t *pp = os_process_pipe_create(cmd.str().c_str(), "r");

obs-studio-29.1.3.tar.xz/plugins/obs-filters/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/async-delay-filter.c -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/async-delay-filter.c Changed

@@ -2,6 +2,10 @@
 #include <util/circlebuf.h>
 #include <util/util_uint64.h>
 
+/* NOTE: Delaying audio shouldn't be necessary because the audio subsystem will
+ * automatically sync audio to video frames */
+/* #define DELAY_AUDIO */
+
 #ifndef SEC_TO_NSEC
 #define SEC_TO_NSEC 1000000000ULL
 #endif
@@ -20,9 +24,11 @@
 	/* contains struct obs_source_frame* */
 	struct circlebuf video_frames;
 
+#ifdef DELAY_AUDIO
 	/* stores the audio data */
 	struct circlebuf audio_frames;
 	struct obs_audio_data audio_output;
+#endif
 
 	uint64_t last_video_ts;
 	uint64_t last_audio_ts;
@@ -52,6 +58,7 @@
 	}
 }
 
+#ifdef DELAY_AUDIO
 static inline void free_audio_packet(struct obs_audio_data *audio)
 {
 	for (size_t i = 0; i < MAX_AV_PLANES; i++)
@@ -69,6 +76,7 @@
 		free_audio_packet(&audio);
 	}
 }
+#endif
 
 static void async_delay_filter_update(void *data, obs_data_t *settings)
 {
@@ -106,9 +114,11 @@
 {
 	struct async_delay_data *filter = data;
 
-	free_audio_packet(&filter->audio_output);
 	circlebuf_free(&filter->video_frames);
+#ifdef DELAY_AUDIO
+	free_audio_packet(&filter->audio_output);
 	circlebuf_free(&filter->audio_frames);
+#endif
 	bfree(data);
 }
 
@@ -129,7 +139,9 @@
 	struct async_delay_data *filter = data;
 
 	free_video_data(filter, parent);
+#ifdef DELAY_AUDIO
 	free_audio_data(filter);
+#endif
 }
 
 /* due to the fact that we need timing information to be consistent in order to
@@ -176,11 +188,6 @@
 	return output;
 }
 
-/* NOTE: Delaying audio shouldn't be necessary because the audio subsystem will
- * automatically sync audio to video frames */
-
-/* #define DELAY_AUDIO */
-
 #ifdef DELAY_AUDIO
 static struct obs_audio_data *
 async_delay_filter_audio(void *data, struct obs_audio_data *audio)

obs-studio-29.1.3.tar.xz/plugins/obs-filters/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/cmake/legacy.cmake Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/color-correction-filter.c -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/color-correction-filter.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/blend_add_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/blend_add_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/blend_mul_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/blend_mul_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/blend_sub_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/blend_sub_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/chroma_key_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/chroma_key_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/chroma_key_filter_v2.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/chroma_key_filter_v2.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/color.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/color.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/color_correction_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/color_correction_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/color_grade_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/color_grade_filter.effect Changed

@@ -47,7 +47,7 @@
 float4 LUT1D(VertDataOut v_in) : TARGET
 {
 	float4 textureColor = image.Sample(textureSampler, v_in.uv);
-	textureColor.rgb = max(float3(0.0, 0.0, 0.0), textureColor.rgb / textureColor.a);
+	textureColor.rgb *= (textureColor.a > 0.) ? (1. / textureColor.a) : 0.;
 	float3 nonlinear = srgb_linear_to_nonlinear(textureColor.rgb);
 
 	if (nonlinear.r >= domain_min.r && nonlinear.r <= domain_max.r) {
@@ -85,7 +85,7 @@
 float4 LUTAlpha3D(VertDataOut v_in) : TARGET
 {
 	float4 textureColor = image.Sample(textureSampler, v_in.uv);
-	textureColor.rgb = max(float3(0.0, 0.0, 0.0), textureColor.rgb / textureColor.a);
+	textureColor.rgb *= (textureColor.a > 0.) ? (1. / textureColor.a) : 0.;
 	float3 nonlinear = srgb_linear_to_nonlinear(textureColor.rgb);
 
 	float3 clut_uvw = nonlinear * clut_scale + clut_offset;
@@ -98,7 +98,7 @@
 float4 LUTAmount3D(VertDataOut v_in) : TARGET
 {
 	float4 textureColor = image.Sample(textureSampler, v_in.uv);
-	textureColor.rgb = max(float3(0.0, 0.0, 0.0), textureColor.rgb / textureColor.a);
+	textureColor.rgb *= (textureColor.a > 0.) ? (1. / textureColor.a) : 0.;
 	float3 nonlinear = srgb_linear_to_nonlinear(textureColor.rgb);
 
 	float3 clut_uvw = nonlinear * clut_scale + clut_offset;
@@ -112,7 +112,7 @@
 float4 LUTDomain3D(VertDataOut v_in) : TARGET
 {
 	float4 textureColor = image.Sample(textureSampler, v_in.uv);
-	textureColor.rgb = max(float3(0.0, 0.0, 0.0), textureColor.rgb / textureColor.a);
+	textureColor.rgb *= (textureColor.a > 0.) ? (1. / textureColor.a) : 0.;
 	float3 nonlinear = srgb_linear_to_nonlinear(textureColor.rgb);
 
 	float r = nonlinear.r;

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/color_key_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/color_key_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/color_key_filter_v2.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/color_key_filter_v2.effect Changed

obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/af-ZA.ini Added

@@ -0,0 +1,90 @@
+ColorFilter="Kleurkorreksie"
+CropFilter="Snoei/Aanvul"
+ScrollFilter="Rol"
+SharpnessFilter="Verskerp"
+Sharpness="Skerpte"
+ScaleFilter="Verskaling/Aspekverhouding"
+NoiseSuppress="Ruisonderdrukking"
+InvertPolarity="Keer polariteit om"
+DelayMs="Vertraging"
+Type="Tipe"
+MaskBlendType.MaskColor="Alfamasker (Kleurkanaal)"
+MaskBlendType.MaskAlpha="Alfamasker (Alfakanaal)"
+MaskBlendType.BlendMultiply="Meng (Vermenigvuldig)"
+MaskBlendType.BlendAddition="Meng (Toevoeging)"
+MaskBlendType.BlendSubtraction="Meng (Verskil)"
+Path="Pad"
+Color="Kleur"
+ColorMultiply="Kleur vermenigvuldiging"
+ColorAdd="Kleur toevoeging"
+Opacity="Ondeursigtigheid"
+Contrast="Kontras"
+Brightness="Helderheid"
+BrowsePath.Images="Alle beeldlêers"
+BrowsePath.AllFiles="Alle lêers"
+Similarity="Toleransie (1-1000)"
+Smoothness="Gladheid (1-1000)"
+Crop.Left="Links"
+Crop.Right="Regs"
+Crop.Top="Bo"
+Crop.Bottom="Onder"
+Crop.Width="Breedte"
+Crop.Height="Hoogte"
+Crop.Relative="Relatief"
+HdrTonemap.Description="OBS kan outomaties HDR na SDR omsit. Gebruik net hierdie filter as u ekstra invloed benodig vir ’n bepaalde bron.\nHierdie filter het geen effek op SDR-bronne nie."
+HdrTonemap.SdrWhiteLevel="SDR witvlak"
+ScrollFilter.SpeedX="Horisontale snelheid"
+ScrollFilter.SpeedY="Vertikale snelheid"
+ScrollFilter.LimitWidth="Beperk wydte"
+ScrollFilter.LimitHeight="Beperk hoogte"
+ScrollFilter.Loop="Herhaal"
+CustomColor="Pasgemaakte kleur"
+Red="Rooi"
+Green="Groen"
+Blue="Blou"
+NoiseGate.OpenThreshold="Oop-drempel"
+NoiseGate.CloseThreshold="Sluit-drempel"
+StretchImage="Rek beeld uit (ignoreer beeldaspekverhouding)"
+Resolution="Beeldskerpte"
+Base.Canvas="Basisbeeldskerpte (Doek)"
+None="Geen"
+ScaleFiltering="Skaalfilter"
+ScaleFiltering.Point="Punt"
+ScaleFiltering.Bilinear="Bilineêr"
+NoiseSuppress.SuppressLevel="Onderdrukkingsvlak"
+NoiseSuppress.Intensity="Onderdrukkingsintensiteit"
+NoiseSuppress.Method="Metode"
+NoiseSuppress.Method.RNNoise="RNNoise (goeie kwaliteit, meer SVE-gebruik)"
+NoiseSuppress.Method.Nvafx.Denoiser="NVIDIA-ruisverwydering"
+NoiseSuppress.Method.Nvafx.Dereverb="NVIDIA-kamereggoverwydering"
+NoiseSuppress.Method.Nvafx.DenoiserPlusDereverb="NVIDIA-ruisverwydering + -kamereggoverwydering"
+NoiseSuppress.Method.Nvafx.Deprecation="WAARSKUWING: Gradeer asb. sowel die NVIDIA Video SDK as die NVIDIA Audio SDK op. U huidige weergawe van Audio SDK is verouderd."
+Saturation="Versadiging"
+HueShift="Tintverskuiwing"
+Amount="Hoeveelheid"
+Compressor="Kompressor"
+Compressor.Ratio="Verhouding"
+Compressor.Threshold="Drempel"
+Limiter="Begrenser"
+Limiter.Threshold="Drempel"
+Expander="Uitbreiding"
+Expander.Ratio="Verhouding"
+Expander.Threshold="Drempel"
+Expander.Detector="Bespeuring"
+Expander.Peak="Piek"
+Expander.Presets="Voorinstellings"
+Expander.Presets.Expander="Uitbreiding"
+Expander.Presets.Gate="Hek"
+Expander.Knee.Width="Kniebreedte"
+NvidiaGreenscreenFilter="NVIDIA-agtergrondverwydering"
+Greenscreen.Mode="Modus"
+Greenscreen.Quality="Kwaliteit (hoër GPU-gebruik, beter kwaliteit)"
+Greenscreen.Performance="Verrigting (laer GPU-gebruik, goeie kwaliteit)"
+Greenscreen.Threshold="Drempel"
+Greenscreen.Deprecation="WAARSKUWING: Gradeer asb. sowel die NVIDIA Video SDK as die NVIDIA Audio SDK op. U huidige weergawe van Video SDK is verouderd."
+Greenscreen.Processing.Hint="Dit verlig die GPU-lading deur slegs vir elke N rame ’n masker te genereer (2 by verstek)."
+Upward.Compressor="Opwaartse kompressor"
+3BandEq="3-bandeffenaar"
+3BandEq.low="Laag"
+3BandEq.mid="Middel"
+3BandEq.high="Hoog"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/az-AZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/az-AZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ba-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ba-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/de-DE.ini Changed

@@ -1,9 +1,9 @@
 ColorFilter="Farbkorrektur"
 ColorGradeFilter="LUT anwenden"
 MaskFilter="Bildmaske/-vermischung"
-AsyncDelayFilter="Videoverzögerung (asynchron)"
+AsyncDelayFilter="Videoverzögerung (Asynchron)"
 CropFilter="Zuschneiden/Pad"
-HdrTonemapFilter="HDR-Tone-Mapping (überschreiben)"
+HdrTonemapFilter="HDR-Tone-Mapping (Überschreiben)"
 ScrollFilter="Bewegung"
 SharpnessFilter="Schärfung"
 Sharpness="Schärfe"
@@ -24,7 +24,7 @@
 Path="Pfad"
 Color="Farbe"
 ColorMultiply="Farbe multiplizieren"
-ColorAdd="Farbe hinzufügen"
+ColorAdd="Farbe addieren"
 Opacity="Deckkraft"
 Contrast="Kontrast"
 Brightness="Helligkeit"
@@ -46,8 +46,10 @@
 HdrTonemap.Description="OBS kann Tone-Mapping von HDR auf SDR automatisch durchführen. Sie sollten diesen Filter also nur benutzen, wenn Sie zusätzliche Kontrolle über eine Quelle benötigen.\nDieser Filter hat keine Auswirkung auf SDR-Quellen."
 HdrTonemap.ToneTransform="Tone-Transformation"
 HdrTonemap.SdrWhiteLevel="SDR-Weißwert"
-HdrTonemap.HdrInputMaximum="Maximale HDR-Eingabe"
-HdrTonemap.HdrOutputMaximum="Maximale HDR-Ausgabe"
+HdrTonemap.HdrInputMaximum="HDR-Eingabemaximum"
+HdrTonemap.HdrOutputMaximum="HDR-Ausgabemaximum"
+HdrTonemap.SdrInputMaximum="SDR-Eingabemaximum"
+HdrTonemap.SdrOutputMaximum="SDR-Ausgabemaximum"
 ScrollFilter.SpeedX="Horizontale Geschwindigkeit"
 ScrollFilter.SpeedY="Vertikale Geschwindigkeit"
 ScrollFilter.LimitWidth="Breite begrenzen"
@@ -71,8 +73,8 @@
 NoiseSuppress.SuppressLevel="Unterdrückungspegel"
 NoiseSuppress.Intensity="Unterdrückungsintensität"
 NoiseSuppress.Method="Methode"
-NoiseSuppress.Method.Speex="Speex (niedrige CPU-Auslastung, niedrige Qualität)"
-NoiseSuppress.Method.RNNoise="RNNoise (gute Qualität, mehr CPU-Auslastung)"
+NoiseSuppress.Method.Speex="Speex (Niedrige CPU-Auslastung, niedrige Qualität)"
+NoiseSuppress.Method.RNNoise="RNNoise (Gute Qualität, mehr CPU-Auslastung)"
 NoiseSuppress.Method.Nvafx.Denoiser="NVIDIA-Rauschentfernung"
 NoiseSuppress.Method.Nvafx.Dereverb="NVIDIA-Raumechoentfernung"
 NoiseSuppress.Method.Nvafx.DenoiserPlusDereverb="NVIDIA-Rauschentfernung + -Raumechoentfernung"
@@ -91,7 +93,6 @@
 Expander.Threshold="Schwellwert"
 Expander.OutputGain="Ausgabeverstärkung"
 Expander.Detector="Erkennung"
-Expander.None="Keine"
 Expander.Presets="Voreinstellungen"
 Expander.Knee.Width="Knee-Breite"
 Luma.LumaMax="Max. Luma"
@@ -100,8 +101,8 @@
 Luma.LumaMinSmooth="Min. Luma-Glätte"
 NvidiaGreenscreenFilter="NVIDIA-Hintergrundentfernung"
 Greenscreen.Mode="Modus"
-Greenscreen.Quality="Qualität (höhere GPU-Nutzung, bessere Qualität)"
-Greenscreen.Performance="Performance (niedrigere GPU-Nutzung, gute Qualität)"
+Greenscreen.Quality="Qualität (Höhere GPU-Nutzung, bessere Qualität)"
+Greenscreen.Performance="Performance (Niedrigere GPU-Nutzung, gute Qualität)"
 Greenscreen.Threshold="Schwellwert"
 Greenscreen.Deprecation="ACHTUNG: Bitte aktualisieren Sie sowohl Ihr NVIDIA-Video- als auch -Audio-SDK. Die Version Ihres Video-SDK ist veraltet."
 Greenscreen.Processing="Masken-Aktualisierungshäufigkeit in Frames"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/el-GR.ini Changed

@@ -30,6 +30,7 @@
 Contrast="Αντίθεση"
 Brightness="Φωτεινότητα"
 Gamma="Γάμμα"
+SdrOnlyInfo="Πληροφορία: Οι ρυθμίσεις εφαρμόζονται μόνο στο SDR βίντεο."
 BrowsePath.Images="Όλα τα αρχεία εικόνας"
 BrowsePath.AllFiles="Όλα τα αρχεία"
 KeyColorType="Βασικό χρώμα τύπου"
@@ -44,6 +45,11 @@
 Crop.Width="Πλάτος"
 Crop.Height="Ύψος"
 Crop.Relative="Σχετική"
+HdrTonemap.Description="Το OBS μπορεί να εκτελέσει αυτόματα αντιστοίχιση τόνου HDR σε SDR.Χρησιμοποιήστε αυτό το φίλτρο μόνο εάν χρειάζεστε πρόσθετο έλεγχο για μια συγκεκριμένη πηγή.\nΑυτό το φίλτρο δεν έχει καμία επίδραση στις πηγές SDR."
+HdrTonemap.ToneTransform="Τονικός Μετασχηματισμός"
+HdrTonemap.SdrWhiteLevel="Λευκό Επίπεδο SDR"
+HdrTonemap.HdrInputMaximum="Μέγιστη Είσοδος HDR"
+HdrTonemap.HdrOutputMaximum="Μέγιστη Έξοδος HDR"
 ScrollFilter.SpeedX="Οριζόντια Ταχύτητα"
 ScrollFilter.SpeedY="Κατακόρυφη Ταχύτητα"
 ScrollFilter.LimitWidth="Περιορισμός Πλάτους"
@@ -81,6 +87,7 @@
 Saturation="Κορεσμός"
 HueShift="Μετατόπιση Απόχρωσης"
 Amount="Ποσό"
+PassthroughAlpha="Alpha Περατό"
 Compressor="Συμπιεστής"
 Compressor.Ratio="Αναλογία"
 Compressor.Threshold="Κατώφλι"
@@ -98,16 +105,25 @@
 Expander.ReleaseTime="Απελευθέρωση"
 Expander.OutputGain="Ένταση Εξόδου"
 Expander.Detector="Ανίχνευση"
-Expander.None="Καμία"
 Expander.Presets="Προεπιλογές"
 Expander.Presets.Expander="Επέκταση"
 Expander.Presets.Gate="Πύλη"
+Expander.Knee.Width="Εύρος Knee"
 LumaKeyFilter="Κλειδί Luma"
 Luma.LumaMax="Μέγιστο Luma"
 Luma.LumaMin="Ελάχιστο Luma"
 Luma.LumaMaxSmooth="Απαλό Μέγιστο Luma"
 Luma.LumaMinSmooth="Απαλό Ελάχιστο Luma"
 NvidiaGreenscreenFilter="Αφαίρεση Φόντου NVIDIA"
+Greenscreen.Mode="Λειτουργία"
+Greenscreen.Quality="Ποιότητα (υψηλότερη χρήση GPU, καλύτερη ποιότητα)"
+Greenscreen.Performance="Απόδοση (χαμηλότερη χρήση GPU, καλή ποιότητα)"
+Greenscreen.Threshold="Κατώφλι"
 Greenscreen.Deprecation="ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Παρακαλώ αναβαθμίστε τα NVIDIA Video & Audio SDK. Η τρέχουσα έκδοση του Video SDK είναι παρωχημένη."
 Greenscreen.Processing="Μασκάρισμα της συχνότητας ανανέωσης στα καρέ"
 Greenscreen.Processing.Hint="Ανακουφίζει το φορτίο της GPU δημιουργώντας μια μάσκα κάθε N καρέ (2 ως προεπιλογή)."
+Upward.Compressor="Ανοδικός Συμπιεστής"
+3BandEq="Ισοσταθμιστής 3 Ζωνών"
+3BandEq.low="Χαμηλή"
+3BandEq.mid="Μεσαία"
+3BandEq.high="Υψηλή"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/en-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/en-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/eu-ES.ini Changed

@@ -50,6 +50,8 @@
 HdrTonemap.SdrWhiteLevel="SDR zuri maila"
 HdrTonemap.HdrInputMaximum="HDR Gehienezko sarrera"
 HdrTonemap.HdrOutputMaximum="HDR Gehienezko irteera"
+HdrTonemap.SdrInputMaximum="SDR Gehienezko sarrera"
+HdrTonemap.SdrOutputMaximum="SDR Gehienezko irteera"
 ScrollFilter.SpeedX="Abiadura horizontala"
 ScrollFilter.SpeedY="Abiadura bertikala"
 ScrollFilter.LimitWidth="Mugatu zabalera"
@@ -104,7 +106,6 @@
 Expander.OutputGain="Irteerako irabazia"
 Expander.Detector="Detekzioa"
 Expander.Peak="Gailurra"
-Expander.None="Bat ere ez"
 Expander.Presets="Aurrez ezarritakoak"
 Expander.Presets.Expander="Deskonprimagailua"
 Expander.Presets.Gate="Atea"
@@ -118,7 +119,10 @@
 Greenscreen.Quality="Kalitatea (GPU erabilera handiagoa baina kalitate hobea)"
 Greenscreen.Performance="Errendimendua (GPU erabilera txikiagoa, kalitate ona)"
 Greenscreen.Threshold="Ataria"
+Greenscreen.Deprecation="OHARRA: Berritu NVIDIA Bideo eta Audio SDK. Bideo SDK-ren egungo bertsioa zaharkituta dago."
+Greenscreen.Processing="Fotogrametan maskara eguneratzeko maiztasuna"
 Greenscreen.Processing.Hint="Honek GPU karga arintzen du N marko bakoitzeko maskara bat sortuz (2 akatsean)."
 Upward.Compressor="Gorakako konprimatzailea"
+3BandEq="3 bandako ekualizadorea"
 3BandEq.low="Baxua"
 3BandEq.high="Altua"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/fr-FR.ini Changed

@@ -45,9 +45,13 @@
 Crop.Relative="Relatif"
 HdrTonemap.Description="OBS peut effectuer automatiquement le mappage des tons HDR vers SDR. N'utilisez ce filtre que si vous avez besoin d'un contrôle supplémentaire pour une source particulière.\nCe filtre n'a aucun effet sur les sources SDR."
 HdrTonemap.ToneTransform="Transformation tonale"
+HdrTonemap.HdrMaxrgb="HDR : maxRGB"
+HdrTonemap.SdrMaxrgb="SDR : maxRGB"
 HdrTonemap.SdrWhiteLevel="Niveau de blanc SDR"
-HdrTonemap.HdrInputMaximum="Maximum d'entrée HDR"
-HdrTonemap.HdrOutputMaximum="Maximum de sortie HDR"
+HdrTonemap.HdrInputMaximum="Entrée HDR maximale"
+HdrTonemap.HdrOutputMaximum="Sortie HDR maximale"
+HdrTonemap.SdrInputMaximum="Entrée SDR maximale"
+HdrTonemap.SdrOutputMaximum="Sortie SDR maximale"
 ScrollFilter.SpeedX="Vitesse horizontale"
 ScrollFilter.SpeedY="Vitesse verticale"
 ScrollFilter.LimitWidth="Limiter la largeur"
@@ -98,7 +102,6 @@
 Expander.OutputGain="Gain en sortie"
 Expander.Detector="Détection"
 Expander.Peak="Crête"
-Expander.None="Aucune"
 Expander.Presets="Pré-réglages"
 Expander.Presets.Expander="Expandeur"
 Expander.Knee.Width="Largeur du coude"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/hi-IN.ini Changed

@@ -48,11 +48,12 @@
 Crop.Relative="सापेक्ष"
 HdrTonemap.Description="OBS स्वचालित रूप से HDR से SDR टोन मैपिंग कर सकता है. इस फ़िल्टर का उपयोग केवल तभी करें जब आपको किसी विशेष स्रोत के लिए अतिरिक्त नियंत्रण की आवश्यकता हो.\nइस फ़िल्टर का SDR स्रोतों पर कोई प्रभाव नहीं पड़ता है."
 HdrTonemap.ToneTransform="स्वर रूपांतर"
-HdrTonemap.SdrReinhard="SDR: रेइनहार्ड"
-HdrTonemap.HdrMaxrgb="HDR: उच्चतम RGB"
+HdrTonemap.SdrMaxrgb="SDR: उच्चतम RGB"
 HdrTonemap.SdrWhiteLevel="SDR सफेद स्तर"
 HdrTonemap.HdrInputMaximum="HDR अधिकतम इनपुट"
 HdrTonemap.HdrOutputMaximum="HDR अधिकतम आउटपुट"
+HdrTonemap.SdrInputMaximum="SDR अधिकतम इनपुट"
+HdrTonemap.SdrOutputMaximum="SDR अधिकतम आउटपुट"
 ScrollFilter.SpeedX="समतल गति"
 ScrollFilter.SpeedY="खड़ी गति"
 ScrollFilter.LimitWidth="सीमित चौड़ाई"
@@ -109,7 +110,6 @@
 Expander.OutputGain="आउटपुट बढ़त"
 Expander.Detector="संसूचन"
 Expander.Peak="चोटी"
-Expander.None="कुछ नहीं"
 Expander.Presets="प्रीसेट"
 Expander.Presets.Expander="विस्तारक"
 Expander.Presets.Gate="द्वार"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ka-GE.ini Changed

@@ -9,9 +9,9 @@
 ColorKeyFilter="ფერის ჩანაცვლება (Color Key)"
 SharpnessFilter="სიმკვეთრის მომატება"
 Sharpness="სიმკვეთრე"
-ScaleFilter="ზომების ცვლილება/გვერდების თანაფარდობა"
+ScaleFilter="ზომების ცვლა/გვერდების ფარდობა"
 GPUDelayFilter="დაყოვნება დამუშავებისას"
-UndistortCenter="ზეფართო სურათის შუაგულის გამრუდების არიდება, ზომების შეცვლისას"
+UndistortCenter="ზეფართო სურათის შუაგულის გამრუდების არიდება ზომების შეცვლისას"
 NoiseGate="ხმაურის ჩამკეტი"
 NoiseSuppress="ხმაურის დამხშობი"
 InvertPolarity="პოლარობის შებრუნება"
@@ -51,6 +51,8 @@
 HdrTonemap.SdrWhiteLevel="SDR-სითეთრის დონე"
 HdrTonemap.HdrInputMaximum="უმაღლესი HDR-შეტანა"
 HdrTonemap.HdrOutputMaximum="უმაღლესი HDR-გამოტანა"
+HdrTonemap.SdrInputMaximum="უმაღლესი SDR-შეტანა"
+HdrTonemap.SdrOutputMaximum="უმაღლესი SDR-გამოტანა"
 ScrollFilter.SpeedX="თარაზული სიჩქარე"
 ScrollFilter.SpeedY="შვეული სიჩქარე"
 ScrollFilter.LimitWidth="სიგანის შეზღუდვა"
@@ -71,7 +73,7 @@
 Resolution="გაფართოება"
 Base.Canvas="ძირითადი (ფონის) გაფართოება"
 None="არცერთი"
-ScaleFiltering="მასშტაბირების ფილტრი"
+ScaleFiltering="ზომების შეცვლის ფილტრი"
 ScaleFiltering.Point="წერტილოვანი"
 ScaleFiltering.Bilinear="ორხაზოვანი"
 ScaleFiltering.Bicubic="ბიკუბური"
@@ -95,7 +97,7 @@
 Compressor.AttackTime="გამძაფრება"
 Compressor.ReleaseTime="დაცხრომა"
 Compressor.OutputGain="გამოტანის გაძლიერება"
-Compressor.SidechainSource="ხმის დადაბლების/გადაფარვის წყარო"
+Compressor.SidechainSource="დაწევის/გადაფარვის წყარო"
 Limiter="შემზღუდავი"
 Limiter.Threshold="ზღურბლი"
 Limiter.ReleaseTime="გაშვება"
@@ -108,7 +110,6 @@
 Expander.Detector="დადგენა"
 Expander.RMS="საშ. კვადრატულით (RMS)"
 Expander.Peak="უკიდურესი გადახრით"
-Expander.None="არცერთით"
 Expander.Presets="მზა პარამეტრები"
 Expander.Presets.Expander="განმვრცობი"
 Expander.Presets.Gate="ჩამკეტი"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ms-MY.ini Changed

@@ -82,6 +82,7 @@
 NoiseSuppress.Method.Nvafx.Denoiser="Pembuangan Hingar NVIDIA"
 NoiseSuppress.Method.Nvafx.Dereverb="Pembuangan Gema Bilik NVIDIA"
 NoiseSuppress.Method.Nvafx.DenoiserPlusDereverb="Pembuangan Hingar NVIDIA + Pembuangan Gema Bilik"
+NoiseSuppress.Method.Nvafx.Deprecation="AMARAN: Sila tatar kedua-dua SDK Video & Audio NVIDIA. Versi semasa SDK Audio anda telah lapuk."
 Saturation="Ketepuan"
 HueShift="Anjak Rona"
 Amount="Amaun"
@@ -104,10 +105,10 @@
 Expander.OutputGain="Gandaan Output"
 Expander.Detector="Pengesanan"
 Expander.Peak="Puncak"
-Expander.None="Tiada"
 Expander.Presets="Praset"
 Expander.Presets.Expander="Pengembang"
 Expander.Presets.Gate="Get"
+Expander.Knee.Width="Lebar Knee"
 LumaKeyFilter="Kunci Luma"
 Luma.LumaMax="Kunci Maks"
 Luma.LumaMin="Kunci Min"
@@ -118,6 +119,11 @@
 Greenscreen.Quality="Kualiti (penggunaan GPU lebih tinggi, kualiti lebih baik)"
 Greenscreen.Performance="Prestasi (penggunaan GPU lebih rendah, kualiti baik)"
 Greenscreen.Threshold="Ambang"
+Greenscreen.Deprecation="AMARAN: Sila tatar kedua-dua SDK Video & Audio NVIDIA. Versi semasa SDK Video anda telah lapuk."
+Greenscreen.Processing="Frekuensi segar semula topeng dalam bingkai"
+Greenscreen.Processing.Hint="Ia meningkatkan beban GPU dengan menjana topeng bag setiap bingkai N sahaja (2 secara lalai)."
+Upward.Compressor="Pemampat Naik"
+3BandEq="Penyama 3-Jalur"
 3BandEq.low="Rendah"
 3BandEq.mid="Sederhana"
 3BandEq.high="Tinggi"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/nb-NO.ini Changed

@@ -42,6 +42,7 @@
 Crop.Width="Bredde"
 Crop.Height="Høyde"
 Crop.Relative="Relativ"
+HdrTonemap.SdrWhiteLevel="SDR-hvitfargenivå"
 ScrollFilter.SpeedX="Vannrett hastighet"
 ScrollFilter.SpeedY="Loddrett hastighet"
 ScrollFilter.LimitWidth="Begrens bredde"
@@ -71,6 +72,7 @@
 NoiseSuppress.Method="Metode"
 NoiseSuppress.Method.Speex="Speex (lav CPU bruk, lav kvalitet)"
 NoiseSuppress.Method.RNNoise="RNNoise (god kvalitet, mer CPU bruk)"
+NoiseSuppress.Method.Nvafx.Denoiser="NVIDIA-støyfjerning"
 Saturation="Metning"
 HueShift="Fargetone Skifte"
 Amount="Mengde"
@@ -92,7 +94,6 @@
 Expander.OutputGain="Utdataforsterkning"
 Expander.Detector="Identifisering"
 Expander.Peak="Topp"
-Expander.None="Ingen"
 Expander.Presets="Forhåndsinnstillinger"
 Expander.Presets.Expander="Utvider"
 Expander.Presets.Gate="Port"
@@ -100,3 +101,10 @@
 Luma.LumaMin="Luma min."
 Luma.LumaMaxSmooth="Luma maks. glidende"
 Luma.LumaMinSmooth="Luma min. glidende"
+Greenscreen.Mode="Modus"
+Greenscreen.Quality="Kvalitet (høyere skjermkortbruk, bedre kvalitet)"
+Greenscreen.Performance="Ytelse (lavere skjermkortbruk, god kvalitet)"
+Greenscreen.Threshold="Terskel"
+3BandEq.low="Lav"
+3BandEq.mid="Middels"
+3BandEq.high="Høy"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/nn-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/nn-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/pt-BR.ini Changed

@@ -1,77 +1,80 @@
 ColorFilter="Correção de cor"
 ColorGradeFilter="Aplicar LUT"
-MaskFilter="Máscara/mistura de imagem"
+MaskFilter="Máscara ou mistura"
 AsyncDelayFilter="Atraso de vídeo (Async)"
-CropFilter="Recortar/Preencher"
-HdrTonemapFilter="Mapeamento de Tom HDR (Substituir)"
+CropFilter="Recorte e preenchimento"
+HdrTonemapFilter="Mapeamento de tons HDR (sobrepor)"
 ScrollFilter="Rolagem"
 SharpnessFilter="Nitidez"
 Sharpness="Nitidez"
-ScaleFilter="Dimensionamento/proporção"
-GPUDelayFilter="Atraso de Renderização"
-UndistortCenter="Remover distorção do centro da imagem ao redimensionar de ultralargo"
-NoiseGate="Filtro de Rúido"
-NoiseSuppress="Redução de ruídos"
-InvertPolarity="Inverter Polaridade"
+ScaleFilter="Dimensionamento e proporção"
+GPUDelayFilter="Atraso de renderização"
+UndistortCenter="Remover distorção ao escalar de imagens ultrawide"
+NoiseGate="Filtro de ruídos"
+NoiseSuppress="Supressão de ruídos"
+InvertPolarity="Inverter polaridade"
 Gain="Ganho"
 DelayMs="Atraso"
 Type="Tipo"
 MaskBlendType.MaskColor="Máscara Alpha (Canal de Cor)"
 MaskBlendType.MaskAlpha="Máscara Alpha (Canal Alpha)"
-MaskBlendType.BlendMultiply="Misturar (Multiplicar)"
-MaskBlendType.BlendAddition="Misturar (Adicionar)"
-MaskBlendType.BlendSubtraction="Misturar (Subtrair)"
+MaskBlendType.BlendMultiply="Misturar (multiplicar)"
+MaskBlendType.BlendAddition="Misturar (adicionar)"
+MaskBlendType.BlendSubtraction="Misturar (subtrair)"
 Path="Caminho"
 Color="Cor"
-ColorMultiply="Multiplicar Cor"
-ColorAdd="Adicionar Cor"
+ColorMultiply="Multiplicar cor"
+ColorAdd="Adicionar cor"
 Opacity="Opacidade"
 Contrast="Contraste"
 Brightness="Brilho"
 Gamma="Gama"
-SdrOnlyInfo="Info: As configurações só se aplicam ao vídeo SDR."
+SdrOnlyInfo="Info: as configurações só se aplicam ao vídeo SDR."
 BrowsePath.Images="Todos os arquivos de imagem"
 BrowsePath.AllFiles="Todos os arquivos"
-KeyColorType="Tipo de Key Color"
+KeyColorType="Tipo de Color Key"
+KeyColor="Cor-chave"
 Similarity="Similaridade (1-1000)"
 Smoothness="Suavidade (1-1000)"
-ColorSpillReduction="Redução de Excesso de Key Color (1-1000)"
+ColorSpillReduction="Redução de excesso da cor-chave (1-1000)"
 Crop.Left="Esquerda"
 Crop.Right="Direita"
-Crop.Top="Topo"
+Crop.Top="Cima"
 Crop.Bottom="Baixo"
 Crop.Width="Largura"
 Crop.Height="Altura"
 Crop.Relative="Relativo"
 HdrTonemap.Description="O OBS pode executar o mapeamento de tom HDR para SDR automaticamente. Use este filtro somente se você precisa de controle adicional para uma fonte específica.\nEste filtro não tem efeito sobre fontes SDR."
-HdrTonemap.ToneTransform="Transformação de tom"
+HdrTonemap.ToneTransform="Transformação de tons"
 HdrTonemap.SdrWhiteLevel="Nível de Branco SDR"
 HdrTonemap.HdrInputMaximum="Entrada HDR Máximo"
 HdrTonemap.HdrOutputMaximum="Saída HDR Máximo"
-ScrollFilter.SpeedX="Velocidade Horizontal"
-ScrollFilter.SpeedY="Velocidade Vertical"
-ScrollFilter.LimitWidth="Limitar Largura"
-ScrollFilter.LimitHeight="Limitar Altura"
+HdrTonemap.SdrInputMaximum="Entrada SDR Máxima"
+HdrTonemap.SdrOutputMaximum="Saída HDR Máxima"
+ScrollFilter.SpeedX="Velocidade horizontal"
+ScrollFilter.SpeedY="Velocidade vertical"
+ScrollFilter.LimitWidth="Limitar largura"
+ScrollFilter.LimitHeight="Limitar altura"
 ScrollFilter.Loop="Exibir continuamente"
-CustomColor="Cor Personalizada"
+CustomColor="Cor personalizada"
 Red="Vermelho"
 Green="Verde"
 Blue="Azul"
-NoiseGate.OpenThreshold="Limite de Abertura"
-NoiseGate.CloseThreshold="Limite de Fecho"
-NoiseGate.AttackTime="Tempo de Ataque"
-NoiseGate.HoldTime="Tempo de Bloqueio"
+NoiseGate.OpenThreshold="Limite de abertura"
+NoiseGate.CloseThreshold="Limite de fechamento"
+NoiseGate.AttackTime="Tempo de ataque"
+NoiseGate.HoldTime="Tempo de espera"
 NoiseGate.ReleaseTime="Tempo de liberação"
 Gain.GainDB="Ganho"
-StretchImage="Esticar a Imagem (descartar aspecto da imagem)"
+StretchImage="Esticar a imagem (ignorar proporção da imagem)"
 Resolution="Resolução"
-Base.Canvas="Resolução Base (Tela)"
-None="Nenhum"
+Base.Canvas="Resolução base (tela)"
+None="Nenhuma"
 ScaleFiltering="Filtragem de escala"
 ScaleFiltering.Point="Ponto"
 ScaleFiltering.Bicubic="Bicúbico"
 ScaleFiltering.Area="Área"
-NoiseSuppress.SuppressLevel="Nível de redução"
+NoiseSuppress.SuppressLevel="Nível de supressão"
 NoiseSuppress.Intensity="Intensidade de supressão"
 NoiseSuppress.Method="Método"
 NoiseSuppress.Method.Speex="Speex (baixo uso de CPU, qualidade baixa)"
@@ -101,7 +104,6 @@
 Expander.OutputGain="Ganho na Saída"
 Expander.Detector="Detecção"
 Expander.Peak="Pico"
-Expander.None="Nenhuma"
 Expander.Presets="Predefinições"
 Expander.Presets.Expander="Expansor"
 Expander.Presets.Gate="Portão"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/pt-PT.ini Changed

@@ -51,6 +51,8 @@
 HdrTonemap.SdrWhiteLevel="Nível de brancos SDR"
 HdrTonemap.HdrInputMaximum="Máximo de entrada HDR"
 HdrTonemap.HdrOutputMaximum="Máximo de saída HDR"
+HdrTonemap.SdrInputMaximum="Máximo de entrada SDR"
+HdrTonemap.SdrOutputMaximum="Máximo de saída SDR"
 ScrollFilter.SpeedX="Velocidade horizontal"
 ScrollFilter.SpeedY="Velocidade vertical"
 ScrollFilter.LimitWidth="Limitar largura"
@@ -104,7 +106,6 @@
 Expander.OutputGain="Ganho de saída"
 Expander.Detector="Deteção"
 Expander.Peak="Pico"
-Expander.None="Nenhuma"
 Expander.Presets="Predefinições"
 Expander.Presets.Expander="Expansor"
 Expander.Presets.Gate="Porta"
@@ -120,8 +121,8 @@
 Greenscreen.Performance="Desempenho (menor uso da GPU, boa qualidade)"
 Greenscreen.Threshold="Limiar"
 Greenscreen.Deprecation="AVISO: Por favor, atualize ambos os SDK de vídeo e áudio NVIDIA. A sua versão atual do SDK de vídeo está desatualizada."
-Greenscreen.Processing="Frequência de atualização da máscara em quadros"
-Greenscreen.Processing.Hint="Isto reduz a carga da GPU gerando uma máscara apenas a cada N quadros (2 por predefinição)."
+Greenscreen.Processing="Frequência de atualização da máscara em fotogramas"
+Greenscreen.Processing.Hint="Isto reduz a carga da GPU gerando uma máscara apenas a cada N fotogramas (2 por predefinição)."
 Upward.Compressor="Compressor ascendente"
 3BandEq="Equalizador de 3 bandas"
 3BandEq.low="Baixa"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ru-RU.ini Changed

@@ -3,13 +3,13 @@
 MaskFilter="Маска изображения/смешивание"
 AsyncDelayFilter="Задержка видео (асинхронность)"
 CropFilter="Кадрирование"
-HdrTonemapFilter="Тональная компрессия HDR (замещение)"
+HdrTonemapFilter="Тональная компрессия HDR (подмена)"
 ScrollFilter="Прокрутка"
 ChromaKeyFilter="Хромакей"
 ColorKeyFilter="Цветовой ключ"
 SharpnessFilter="Увеличение резкости"
 Sharpness="Резкость"
-ScaleFilter="Масштаб/соотношение сторон"
+ScaleFilter="Масштаб / соотношение сторон"
 GPUDelayFilter="Задержка отображения"
 UndistortCenter="Не искривлять центр изображения при масштабировании сверхширокого разрешения"
 NoiseGate="Пропускной уровень шума"
@@ -51,6 +51,8 @@
 HdrTonemap.SdrWhiteLevel="Уровень белого SDR"
 HdrTonemap.HdrInputMaximum="Максимум входного HDR"
 HdrTonemap.HdrOutputMaximum="Максимум выходного HDR"
+HdrTonemap.SdrInputMaximum="Максимум входного SDR"
+HdrTonemap.SdrOutputMaximum="Максимум выходного SDR"
 ScrollFilter.SpeedX="Горизонтальная скорость"
 ScrollFilter.SpeedY="Вертикальная скорость"
 ScrollFilter.LimitWidth="Ограничивать ширину"
@@ -97,10 +99,10 @@
 Compressor.ReleaseTime="Спад"
 Compressor.OutputGain="Выходное усиление"
 Compressor.SidechainSource="Источник приглушения/сайдчейн-компрессии"
-Limiter="Лимитер"
+Limiter="Ограничитель"
 Limiter.Threshold="Порог срабатывания"
 Limiter.ReleaseTime="Восстановление"
-Expander="Экспандер"
+Expander="Расширитель"
 Expander.Ratio="Соотношение"
 Expander.Threshold="Порог срабатывания"
 Expander.AttackTime="Атака"
@@ -108,10 +110,9 @@
 Expander.OutputGain="Выходное усиление"
 Expander.Detector="Обнаружение"
 Expander.Peak="Пик"
-Expander.None="Нет"
 Expander.Presets="Предустановки"
-Expander.Presets.Expander="Экспандер"
-Expander.Presets.Gate="Гейт"
+Expander.Presets.Expander="Расширитель"
+Expander.Presets.Gate="Заслон"
 Expander.Knee.Width="Ширина колена"
 LumaKeyFilter="Яркостный ключ"
 Luma.LumaMax="Макс. яркость"
@@ -125,7 +126,7 @@
 Greenscreen.Threshold="Порог"
 Greenscreen.Deprecation="ПРЕДУПРЕЖДЕНИЕ: Пожалуйста, обновите видео и аудио SDK NVIDIA. Текущая версия SDK видео устарела."
 Greenscreen.Processing="Маскировать частоту обновления в кадрах"
-Greenscreen.Processing.Hint="Это облегчает загрузку ГП, создавая маску только для каждого N-го кадра (по умолчанию — 2)."
+Greenscreen.Processing.Hint="Это облегчает загрузку видеокарты, создавая маску только для каждого N-го кадра (по умолчанию — 2)."
 Upward.Compressor="Повышающий компрессор"
 3BandEq="3-полосный эквалайзер"
 3BandEq.low="Низкие"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/szl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/szl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/ta-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/th-TH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/th-TH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/zh-CN.ini Changed

@@ -51,6 +51,8 @@
 HdrTonemap.SdrWhiteLevel="SDR 白电平"
 HdrTonemap.HdrInputMaximum="HDR 输入最大值"
 HdrTonemap.HdrOutputMaximum="HDR 输出最大值"
+HdrTonemap.SdrInputMaximum="SDR 输入最大值"
+HdrTonemap.SdrOutputMaximum="SDR 输出最大值"
 ScrollFilter.SpeedX="水平速度"
 ScrollFilter.SpeedY="垂直速度"
 ScrollFilter.LimitWidth="限制宽度"
@@ -71,17 +73,17 @@
 Resolution="分辨率"
 Base.Canvas="基础 (画布) 分辨率"
 None="无"
-ScaleFiltering="缩放过滤"
-ScaleFiltering.Point="点"
-ScaleFiltering.Bilinear="双线性算法"
-ScaleFiltering.Bicubic="双立方算法"
-ScaleFiltering.Lanczos="兰索斯算法"
+ScaleFiltering="缩放算法"
+ScaleFiltering.Point="最近邻插值"
+ScaleFiltering.Bilinear="双线性插值"
+ScaleFiltering.Bicubic="双三次插值"
+ScaleFiltering.Lanczos="Lanczos插值"
 ScaleFiltering.Area="区域"
 NoiseSuppress.SuppressLevel="抑制水平"
 NoiseSuppress.Intensity="抑制强度"
 NoiseSuppress.Method="方式"
-NoiseSuppress.Method.Speex="Speex (低CPU使用率，低质量)"
-NoiseSuppress.Method.RNNoise="RNNoise (高质量，更多CPU使用率)"
+NoiseSuppress.Method.Speex="Speex （低CPU使用率，低质量）"
+NoiseSuppress.Method.RNNoise="RNNoise（高质量，更多CPU使用率）"
 NoiseSuppress.Method.Nvafx.Denoiser="英伟达噪声移除"
 NoiseSuppress.Method.Nvafx.Dereverb="英伟达房间回音移除"
 NoiseSuppress.Method.Nvafx.DenoiserPlusDereverb="英伟达噪声删除 + 房间回音移除"
@@ -109,7 +111,6 @@
 Expander.Detector="检测"
 Expander.RMS="均方根"
 Expander.Peak="峰值"
-Expander.None="无"
 Expander.Presets="预设"
 Expander.Presets.Expander="扩展效果"
 Expander.Presets.Gate="门限"
@@ -121,8 +122,8 @@
 Luma.LumaMinSmooth="最小亮度平滑"
 NvidiaGreenscreenFilter="英伟达背景移除"
 Greenscreen.Mode="模式"
-Greenscreen.Quality="质量（GPU 使用率更高，质量更佳）"
-Greenscreen.Performance="性能（GPU 使用率更低，质量较佳)"
+Greenscreen.Quality="质量（GPU 使用率更高，更高质量）"
+Greenscreen.Performance="性能（GPU 使用率更低，高质量）"
 Greenscreen.Threshold="阈值"
 Greenscreen.Deprecation="警告：请同时升级 NVIDIA 视频和音频 SDK。您当前的视频 SDK 的版本已过时。"
 Greenscreen.Processing="蒙版刷新间隔 (帧数)"

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/luma_key_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/luma_key_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/luma_key_filter_v2.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/luma_key_filter_v2.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/mask_alpha_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/mask_alpha_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/data/mask_color_filter.effect -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/data/mask_color_filter.effect Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/noise-suppress-filter.c -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/noise-suppress-filter.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/nvafx-load.h -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/nvafx-load.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-filters/nvvfx-load.h -> obs-studio-30.0.2.tar.xz/plugins/obs-filters/nvvfx-load.h Changed

obs-studio-30.0.2.tar.xz/plugins/obs-libfdk/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-libfdk/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-libfdk/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-libfdk/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/CMakeLists.txt Changed

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16...3.25)
+cmake_minimum_required(VERSION 3.22...3.25)
 
 legacy_check()
 
@@ -44,7 +44,11 @@
 "$<$<BOOL:${ENABLE_HEVC}>:rtmp-hevc.c>"
 "$<$<BOOL:${ENABLE_HEVC}>:rtmp-hevc.h>")
 
-target_link_libraries(obs-outputs PRIVATE OBS::libobs MbedTLS::MbedTLS ZLIB::ZLIB)
+if(NOT TARGET happy-eyeballs)
+ add_subdirectory("${CMAKE_SOURCE_DIR}/deps/happy-eyeballs" "${CMAKE_BINARY_DIR}/deps/happy-eyeballs")
+endif()
+
+target_link_libraries(obs-outputs PRIVATE OBS::libobs OBS::happy-eyeballs MbedTLS::MbedTLS ZLIB::ZLIB)
 
 target_compile_definitions(obs-outputs PRIVATE USE_MBEDTLS CRYPTO)
 
@@ -56,11 +60,13 @@
 
 target_sources(obs-outputs PRIVATE obs-outputs.rc)
 elseif(OS_MACOS)
- find_library(FOUNDATION_FRAMEWORK Foundation)
- find_library(SECURITY_FRAMEWORK Security)
- mark_as_advanced(FOUNDATION_FRAMEWORK SECURITY_FRAMEWORK)
-
- target_link_libraries(obs-outputs PRIVATE ${FOUNDATION_FRAMEWORK} ${SECURITY_FRAMEWORK})
+ target_compile_options(obs-outputs PRIVATE -Wno-comma)
+ # cmake-format: off
+ target_link_libraries(
+ obs-outputs
+ PRIVATE "$<LINK_LIBRARY:FRAMEWORK,Foundation.framework>"
+ "$<LINK_LIBRARY:FRAMEWORK,Security.framework>")
+ # cmake-format: on
 endif()
 
 include(cmake/ftl.cmake)

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/cmake/ftl.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/cmake/ftl.cmake Changed

@@ -10,20 +10,21 @@
 
 target_sources(
   ftl-sdk
-  INTERFACE ftl-stream.c
+  INTERFACE # cmake-format: sortable
+            ftl-sdk/libftl/ftl-sdk.c
             ftl-sdk/libftl/ftl.h
+            ftl-sdk/libftl/ftl_helpers.c
             ftl-sdk/libftl/ftl_private.h
+            ftl-sdk/libftl/gettimeofday/gettimeofday.c
+            ftl-sdk/libftl/handshake.c
             ftl-sdk/libftl/hmac/hmac.c
             ftl-sdk/libftl/hmac/hmac.h
             ftl-sdk/libftl/hmac/sha2.c
             ftl-sdk/libftl/hmac/sha2.h
-            ftl-sdk/libftl/ftl-sdk.c
-            ftl-sdk/libftl/handshake.c
             ftl-sdk/libftl/ingest.c
-            ftl-sdk/libftl/ftl_helpers.c
+            ftl-sdk/libftl/logging.c
             ftl-sdk/libftl/media.c
-            ftl-sdk/libftl/gettimeofday/gettimeofday.c
-            ftl-sdk/libftl/logging.c)
+            ftl-stream.c)
 
 target_include_directories(ftl-sdk INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/ftl-sdk/libftl")
 
@@ -45,29 +46,29 @@
 target_enable_feature(obs-outputs "FTL protocol support")
 
 get_target_property(target_sources ftl-sdk INTERFACE_SOURCES)
-list(
-  APPEND
-  silence_ftl
-  -Wno-error=unused-parameter
-  -Wno-error=unused-variable
-  -Wno-error=sign-compare
-  -Wno-error=pointer-sign
-  -Wno-error=int-conversion)
-
-if(CMAKE_C_COMPILER_ID STREQUAL AppleClang OR CMAKE_C_COMPILER_ID STREQUAL Clang)
-  list(APPEND silence_ftl -Wno-error=incompatible-function-pointer-types -Wno-error=implicit-int-conversion
-       -Wno-error=shorten-64-to-32 -Wno-error=macro-redefined)
-elseif(CMAKE_C_COMPILER_ID STREQUAL GNU)
-  list(APPEND silence_ftl -Wno-error=extra -Wno-error=incompatible-pointer-types -Wno-error=int-conversion
-       -Wno-error=builtin-macro-redefined)
-endif()
 
-if((NOT CMAKE_C_COMPILER_ID STREQUAL GNU) OR CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
-  list(APPEND silence_ftl -Wno-error=enum-conversion)
+if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+  set(silence_ftl -Wno-unused-parameter -Wno-unused-variable -Wno-sign-compare -Wno-pointer-sign -Wno-int-conversion)
+
+  if(CMAKE_C_COMPILER_ID MATCHES "(Apple)?Clang")
+    list(
+      APPEND
+      silence_ftl
+      -Wno-incompatible-function-pointer-types
+      -Wno-implicit-int-conversion
+      -Wno-shorten-64-to-32
+      -Wno-macro-redefined
+      -Wno-enum-conversion)
+  elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+    list(APPEND silence_ftl -Wno-extra -Wno-incompatible-pointer-types -Wno-int-conversion -Wno-builtin-macro-redefined)
+  endif()
+
+  if((NOT CMAKE_C_COMPILER_ID STREQUAL "GNU") OR CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
+    list(APPEND silence_ftl -Wno-error=enum-conversion)
+  endif()
+  set_source_files_properties(${target_sources} PROPERTIES COMPILE_OPTIONS "${silence_ftl}")
 endif()
 
-set_source_files_properties(${target_sources} PROPERTIES COMPILE_OPTIONS "${silence_ftl}")
-
 set(target_headers ${target_sources})
 list(FILTER target_sources INCLUDE REGEX ".+ftl-sdk/.+\\.(m|ccp?p?|swift)")
 list(FILTER target_headers INCLUDE REGEX ".+ftl-sdk/.+\\.h(pp)?")

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/cmake/legacy.cmake Changed

obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ar-SA.ini Changed

@@ -1,7 +1,14 @@
 RTMPStream="تيار RTMP"
 RTMPStream.DropThreshold="الحد الأقصى للاسقاط"
-FLVOutput="اخراج الملف بصيغة FLV"
+RTMPStream.BindIP="ربط بـ IP"
+RTMPStream.NewSocketLoop="حلقة المقبس (Socket) الجديدة"
+RTMPStream.LowLatencyMode="نمط الاستجابة المنخفض"
+FLVOutput="إخراج المِلَفّ بصيغة FLV"
 FLVOutput.FilePath="مسار الملف"
+IPFamily="عائلة عنوان IP"
+IPFamily.Both="IPv4 و IPv6 (افتراضي)"
+IPFamily.V4Only="IPv4 فقط"
+IPFamily.V6Only="IPv6 فقط"
 ConnectionTimedOut="انتهت مهلة الاتصال. تأكد من أن قمت بتكوين خدمة البث صالحة ولا جدار الحماية بحظر الاتصال."
 PermissionDenied="تم حظر الاتصال. تحقق من جدار الحماية/إعدادات مكافحة الفيروسات للتأكد من السماح لـ OBS بالوصول الكامل للإنترنت."
 ConnectionAborted="تم إحباط الاتصال. وهذا يشير عادة إلى مشاكل في الاتصال بالإنترنت بينك وبين خدمة البث."
@@ -9,3 +16,7 @@
 NoData="تم العثور على اسم المضيف، ولكن لا توجد بيانات من النوع المطلوب. يمكن أن يحدث هذا إذا كنت مرتبطة بعنوان IPv6 وخدمة البث الخاصة بك تحتوي فقط على عناوين IPv4 (انظر الإعدادات ← المتقدمة)."
 AddressNotAvailable="العنوان غير متوفر. ربما كنت قد حاولت ربط عنوان IP غير صالح (انظر الإعدادات ← المتقدم)."
 SSLCertVerifyFailed="أرسل خادم RTMP شهادة SSL غير صالحة."
+InvalidParameter="مدخلات الاتصال غير صحيحة، تأكد أن عنوان خادم البث صحيح."
+NoRoute="حدث خطأ أثناء الوصول إلى المضيف. تأكد من أن الواجهة التي قمت بربطها يمكنها الوصول إلى الإنترنت وأن خدمة البث تدعم عائلة العناوين التي حددتها (انظر الإعدادات ← خيارات متقدمة)."
+FTLStream="تيار FTL "
+FTLStream.PeakBitrate="قمة البتّات"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ca-ES.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Flux RTMP"
 RTMPStream.DropThreshold="Llindar"
+RTMPStream.BindIP="Enllaça la IP"
+RTMPStream.NewSocketLoop="Nou bucle de servidor WebSocket"
+RTMPStream.LowLatencyMode="Mode de baixa latència"
 FLVOutput="Sortida del fitxer FLV"
 FLVOutput.FilePath="Camí del fitxer"
 Default="Per defecte"
+IPFamily="Família d'adreces IP"
+IPFamily.Both="IPv4 i IPv6 (per defecte)"
+IPFamily.V4Only="Només IPv4"
+IPFamily.V6Only="Només IPv6"
 ConnectionTimedOut="S'ha esgotat el temps de la connexió. Assegureu-vos que ha configurat un servei de transmissió vàlid i cap tallafocs està bloquejant la connexió."
 PermissionDenied="La connexió ha estat bloquejada. Comproveu la configuració del tallafocs o antivirus per assegurar-se que OBS disposa de llibertat absoluta a Internet."
 ConnectionAborted="La connexió ha estat avortada. Normalment això indica que hi ha problemes de connexió entre el vostre equip i el servei de transmissió."
@@ -11,3 +18,7 @@
 NoData="S'ha trobat el nom d'amfitrió, però no hi ha dades del tipus sol·licitat. Això pot passar si heu enllaçat a una adreça IPv6 i el seu servei de transmissió només té adreces IPv4 (veieu configuració → avançada)."
 AddressNotAvailable="Adreça no disponible. Potser heu intentat enllaçar amb una adreça IP no vàlida (veieu configuració → avançada)."
 SSLCertVerifyFailed="El servidor RTMP ha enviat un certificat SSL no vàlid."
+InvalidParameter="Paràmetres de connexió no vàlids. Comproveu que l'adreça del servei de transmissió sigui correcta."
+NoRoute="S'ha produït un error en arribar a l'amfitrió. Assegureu-vos que la interfície que heu vinculat pot accedir a Internet i que el servei de transmissió admet la família d'adreces que heu seleccionat (vegeu Configuració → Avançat)."
+FTLStream="Transmissió FTL"
+FTLStream.PeakBitrate="Pic de taxa de bits"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/cs-CZ.ini Changed

@@ -1,7 +1,14 @@
 RTMPStream.DropThreshold="Hladina zahození"
+RTMPStream.BindIP="Svázat s adresou"
+RTMPStream.NewSocketLoop="Nová smyška socketu"
+RTMPStream.LowLatencyMode="Režim nízké odezvy"
 FLVOutput="Výstup do FLV souboru"
 FLVOutput.FilePath="Cesta k souboru"
 Default="Výchozí"
+IPFamily="Rodina IP adres"
+IPFamily.Both="IPv4 a IPv6 (výchozí)"
+IPFamily.V4Only="Pouze IPv4"
+IPFamily.V6Only="Pouze IPv6"
 ConnectionTimedOut="Vypršel časový limit připojení. Přesvědčte se, zda jste správně nastavili vysílací službu a že žádná brána firewall neblokuje připojení."
 PermissionDenied="Připojení bylo zablokováno. Zkontrolujte, zda má OBS povolen přístup k internetu v nastavení své brány firewall / antiviru."
 ConnectionAborted="Připojení bylo přerušeno. Toto obvykle znamená, že nastaly problémy s připojením mezi vámi a vysílací službou."
@@ -10,3 +17,6 @@
 NoData="Hostitel byl nalezen, ale žádná data požadovaného typu. Toto se může stát, pokud používáte IPv6 adresu, ale vaše vysílací služba podporuje pouze připojení přes svou IPv4 adresu (viz. Nastavení → Rozšířené)."
 AddressNotAvailable="Adresa není k dispozici. Možná jste se snažili použít chybnou IP adresu (viz. Nastavení → Rozšířené)."
 SSLCertVerifyFailed="RTMP server odeslal neplatný SSL certifikát."
+InvalidParameter="Chybné parametry pro připojení. Zkontrolujte, zda je zadaná adresa streamovací služby správná."
+NoRoute="Chyba při komunikaci s hostem. Zkontrolujte, zda vybrané rozhranní má přístup k internetu a streamovací služba podporuje vybranou rodinu adres (Nastavení → Rozšířené)."
+FTLStream.PeakBitrate="Špičkový bitrate"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/de-DE.ini Changed

@@ -1,13 +1,24 @@
 RTMPStream="RTMP-Stream"
 RTMPStream.DropThreshold="Drop-Schwellwert"
+RTMPStream.BindIP="An IP binden"
+RTMPStream.NewSocketLoop="Neue Socket-Schleife"
+RTMPStream.LowLatencyMode="Niedriger Latenzmodus"
 FLVOutput="FLV-Dateiausgabe"
 FLVOutput.FilePath="Dateipfad"
 Default="Standard"
+IPFamily="IP-Adressfamilie"
+IPFamily.Both="IPv4 und IPv6 (Standard)"
+IPFamily.V4Only="Nur IPv4"
+IPFamily.V6Only="Nur IPv6"
 ConnectionTimedOut="Zeitüberschreitung bei der Verbindung. Stellen Sie sicher, dass Sie eine gültige Streamingplattform konfiguriert haben und keine Firewall die Verbindung blockiert."
-PermissionDenied="Die Verbindung wurde blockiert. Überprüfen Sie Ihre Firewall-/Anti-Virus-Einstellungen, um sicherzustellen, dass OBS vollen Internetzugang hat."
+PermissionDenied="Die Verbindung wurde blockiert. Überprüfen Sie in Ihren Firewall-/Anti-Virus-Einstellungen, ob OBS vollen Internetzugriff hat."
 ConnectionAborted="Die Verbindung wurde abgebrochen. Dies bedeutet in der Regel Probleme mit der Internetverbindung zwischen Ihnen und der Streamingplattform."
 ConnectionReset="Die Verbindung wurde durch den Kommunikationspartner zurückgesetzt. In der Regel bedeutet das Probleme mit der Internetverbindung zwischen Ihnen und der Streamingplattform."
 HostNotFound="Hostname nicht gefunden. Stellen Sie sicher, dass Sie einen gültigen Streamingserver eingegeben haben und Ihre Internetverbindung/Ihr DNS korrekt funktioniert."
-NoData="Der Hostname wurde gefunden, aber keine Daten des angeforderten Typs sind vorhanden. Dies kann auftreten, wenn Sie eine IPv6-Adresse verwenden, Ihre Streamingplattform aber nur über IPv4-Adressen verfügt. (siehe „Einstellungen“ → „Erweitert“)"
-AddressNotAvailable="Adresse nicht verfügbar. Sie haben möglicherweise eine ungültige IP-Adresse versucht zu verwenden. (siehe „Einstellungen“ → „Erweitert“)"
+NoData="Der Hostname wurde gefunden, aber keine Daten des angeforderten Typs sind vorhanden. Dies kann auftreten, wenn Sie eine IPv6-Adresse verwenden, Ihre Streamingplattform aber nur über IPv4-Adressen verfügt. (Siehe „Einstellungen“ → „Erweitert“)"
+AddressNotAvailable="Adresse nicht verfügbar. Sie haben möglicherweise eine ungültige IP-Adresse versucht zu verwenden. (Siehe „Einstellungen“ → „Erweitert“)"
 SSLCertVerifyFailed="Der RTMP-Server hat ein ungültiges SSL-Zertifikat gesendet."
+InvalidParameter="Ungültige Verbindungsparameter. Überprüfen Sie die Adresse des Streamingdienstes."
+NoRoute="Der Host konnte nicht erreicht werden. Stellen Sie sicher, dass die von Ihnen angebundene Schnittstelle auf das Internet zugreifen kann und die Streamingplattform die von Ihnen ausgewählte Adressfamilie unterstützt. (Siehe „Einstellungen“ → „Erweitert“)"
+FTLStream="FTL-Stream"
+FTLStream.PeakBitrate="Spitzenbitrate"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/el-GR.ini Changed

@@ -1,8 +1,13 @@
 RTMPStream="Ροή RTMP"
 RTMPStream.DropThreshold="Όριο Απόπτωσης"
+RTMPStream.BindIP="Σύνδεση με IP"
+RTMPStream.LowLatencyMode="Λειτουργία χαμηλής καθυστέρησης"
 FLVOutput="FLV Αρχείο Εξόδου"
 FLVOutput.FilePath="Διαδρομή Αρχείου"
 Default="Προεπιλογή"
+IPFamily.Both="IPv4 και IPv6 (Προεπιλογή)"
+IPFamily.V4Only="Μόνο IPv4"
+IPFamily.V6Only="Μόνο IPv6"
 ConnectionTimedOut="Εξαντλήθηκε το χρονικό όριο της σύνδεσης. Βεβαιωθείτε ότι έχετε ρυθμίσει μια έγκυρη υπηρεσία συνεχούς ροής και το τείχος προστασίας δεν εμποδίζει τη σύνδεση."
 PermissionDenied="Αποκλείστηκε η σύνδεση. Ελέγξτε το τείχος προστασίας / ρυθμίσεις προστασίας από ιούς για να βεβαιωθείτε οτι στο OBS επιτρέπεται να έχει πλήρης πρόσβαση στο διαδίκτυο."
 ConnectionAborted="Η σύνδεση ματαιώθηκε. Αυτό συνήθως υποδεικνύει προβλήματα σύνδεσης στο διαδίκτυο ανάμεσα σε εσάς και την υπηρεσία συνεχούς ροής."
@@ -11,3 +16,6 @@
 NoData="Το όνομα του κεντρικού υπολογιστή βρέθηκε, αλλά χωρίς δεδομένα του ζητούμενου τύπου. Αυτό μπορεί να συμβεί αν έχετε δεσμεύσει μια διεύθυνση IPv6 και για η υπηρεσία συνεχούς ροής διαθέτει μόνο διευθύνσεις IPv4 (ανατρέξτε στην ενότητα Ρυθμίσεις → Για Προχωρημένους)."
 AddressNotAvailable="Η διεύθυνση δεν είναι διαθέσιμη. Μπορεί να Δοκιμάσατε να συνδεθείτε σε μια άκυρη διεύθυνση IP (ανατρέξτε στην ενότητα Ρυθμίσεις → Για Προχωρημένους)."
 SSLCertVerifyFailed="Ο διακομιστής RTMP έστειλε ένα άκυρο πιστοποιητικό SSL."
+InvalidParameter="Μη έγκυρες παράμετροι σύνδεσης. Ελέγξτε ότι η διεύθυνση της υπηρεσίας ροής είναι σωστή."
+FTLStream="Ροή FTL"
+FTLStream.PeakBitrate="Μέγιστος ρυθμός μετάδοσης bit"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/en-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/en-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/en-US.ini Changed

@@ -7,6 +7,11 @@
 FLVOutput.FilePath="File Path"
 Default="Default"
 
+IPFamily="IP Address Family"
+IPFamily.Both="IPv4 and IPv6 (Default)"
+IPFamily.V4Only="IPv4 Only"
+IPFamily.V6Only="IPv6 Only"
+
 ConnectionTimedOut="The connection timed out. Make sure you've configured a valid streaming service and no firewall is blocking the connection."
 PermissionDenied="The connection was blocked. Check your firewall / anti-virus settings to make sure OBS is allowed full internet access."
 ConnectionAborted="The connection was aborted. This usually indicates internet connection problems between you and the streaming service."
@@ -15,6 +20,8 @@
 NoData="Hostname found, but no data of the requested type. This can occur if you have bound to an IPv6 address and your streaming service only has IPv4 addresses (see Settings → Advanced)."
 AddressNotAvailable="Address not available. You may have tried to bind to an invalid IP address (see Settings → Advanced)."
 SSLCertVerifyFailed="The RTMP server sent an invalid SSL certificate."
+InvalidParameter="Invalid connection parameters. Check that the streaming service address is correct."
+NoRoute="Error reaching host. Make sure that the interface you have bound can access the internet and that the streaming service supports the address family you selected (see Settings → Advanced)."
 
 FTLStream="FTL Stream"
 FTLStream.PeakBitrate="Peak Bitrate"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/es-ES.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Retransmisión RTMP"
 RTMPStream.DropThreshold="Umbral límite"
+RTMPStream.BindIP="Enlazar la IP"
+RTMPStream.NewSocketLoop="Nuevo bucle de socket"
+RTMPStream.LowLatencyMode="Modo de baja latencia"
 FLVOutput="Archivo de salida FLV"
 FLVOutput.FilePath="Ruta de archivo"
 Default="Por defecto"
+IPFamily="Familia de la dirección IP"
+IPFamily.Both="IPv4 y IPv6 (per defecto)"
+IPFamily.V4Only="Sólo IPv4"
+IPFamily.V6Only="Sólo IPv6"
 ConnectionTimedOut="Agotado el tiempo de la conexión. Asegúrese de que ha configurado un servicio de streaming válido y ningún firewall está bloqueando la conexión."
 PermissionDenied="La conexión ha sido bloqueada. Compruebe su configuración del cortafuegos o anti-virus para asegurarse de que OBS tiene acceso completo a Internet."
 ConnectionAborted="La conexión ha sido abortada. Normalmente esto indica que hay problemas de conexión entre tu equipo y el servicio de transmisión."
@@ -11,3 +18,7 @@
 NoData="Nombre de host encontrado, pero no hay datos del tipo solicitado. Esto puede ocurrir si has enlazado a una dirección IPv6 y su servicio de streaming sólo tiene direcciones IPv4 (ver Configuración → Avanzado)."
 AddressNotAvailable="Dirección no disponible. Puede que hayas intentado enlazar con una dirección IP no válida (vea Configuración → Avanzado)."
 SSLCertVerifyFailed="El servidor RTMP envió un certificado SSL no válido."
+InvalidParameter="Los parámetros de conexión no son válidos. Comprueba que la dirección del servicio de transmisión es correcta."
+NoRoute="Error al llegar al host. Asegúrate de que la interfaz que has vinculado pueda acceder a internet y que el servicio de transmisión admita la familia de direcciones que seleccionaste (Ajustes → Avanzado)."
+FTLStream="Transmisión FTL"
+FTLStream.PeakBitrate="Pico de tasa de bits"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/fa-IR.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="پخش زنده RTMP"
 RTMPStream.DropThreshold="آستانه سقوط"
+RTMPStream.BindIP="اتصال IP"
+RTMPStream.NewSocketLoop="حلقه سوکت جدید"
+RTMPStream.LowLatencyMode="حالت تاخیر کم"
 FLVOutput="خروجی پرونده FLV"
 FLVOutput.FilePath="مسر پرونده"
 Default="پیش فرض"
+IPFamily="آدرس IP خانواده"
+IPFamily.Both="IPv4 و IPv6 (پیش‌فرض)"
+IPFamily.V4Only="فقط IPv4"
+IPFamily.V6Only="فقط IPv6"
 ConnectionTimedOut="اتصال به پایان رسید. اطمینان حاصل کنید که یک سرویس پخش معتبر پیکربندی کرده اید و هیچ فایروالی اتصال را مسدود نمی کند."
 PermissionDenied="اتصال مسدود شد. تنظیمات فایروال / آنتی ویروس خود را بررسی کنید تا مطمئن شوید OBS دسترسی کامل به اینترنت دارد."
 ConnectionAborted="ارتباط قطع شد. این معمولاً نشان دهنده مشکلات اتصال به اینترنت بین شما و سرویس جریان است."
@@ -11,3 +18,7 @@
 NoData="نام میزبان پیدا شد، اما داده ای از نوع درخواستی وجود ندارد. این امر می تواند در صورتی رخ دهد که به یک آدرس IPv6 متصل شده باشید و سرویس پخش شما فقط دارای آدرس های IPv4 است (به تنظیمات → پیشرفته مراجعه کنید)."
 AddressNotAvailable="آدرس در دسترس نیست شاید سعی کرده اید به یک آدرس IP نامعتبر وصل شوید (به تنظیمات → پیشرفته مراجعه کنید)."
 SSLCertVerifyFailed="سرور RTMP یک گواهی SSL نامعتبر ارسال کرد."
+InvalidParameter="پارامترهای اتصال نامعتبر است. بررسی کنید که آدرس سرویس پخش درست باشد."
+NoRoute="خطا در رسیدن به میزبان. مطمئن شوید که رابطی که متصل کرده اید می تواند به اینترنت دسترسی داشته باشد و سرویس پخش از خانواده آدرسی که انتخاب کرده اید پشتیبانی می کند (به تنظیمات ← پیشرفته مراجعه کنید)."
+FTLStream="جریان FTL"
+FTLStream.PeakBitrate="حداکثر میزان ارسال"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/fi-FI.ini Changed

@@ -1,8 +1,14 @@
 RTMPStream="RTMP-virtaus"
 RTMPStream.DropThreshold="Pudotuskynnys"
+RTMPStream.BindIP="Liitä IP:seen"
+RTMPStream.LowLatencyMode="Alhainen latenssi"
 FLVOutput="FLV-tiedostoulostulo"
 FLVOutput.FilePath="Tiedostopolku"
 Default="Oletusarvo"
+IPFamily="IP-osoiteperhe"
+IPFamily.Both="IPv4 ja IPv6 (oletus)"
+IPFamily.V4Only="Vain IPv4"
+IPFamily.V6Only="Vain IPv6"
 ConnectionTimedOut="Yhteys keskeytyi. Varmista että olet asettanut lähetyspalvelun oikein ja palomuuri ei estä yhteyttä."
 PermissionDenied="Yhteys estettiin. Tarkista palomuurin / virusturvan asetukset ja varmista, että OBS:lle on sallittu täydet yhteydet."
 ConnectionAborted="Yhteys katkaistiin. Tämä tarkoittaa yleensä yhteysongelmia sinun ja lähetyspalvelun välillä."
@@ -11,3 +17,6 @@
 NoData="Isäntänimi löytyi, mutta pyydetyn tyyppistä dataa ei löydetty. Näin voi tapahtua jos olet rajannut yhteytesi IPv6 -osoitteeseen ja lähetyspalvelusi tukee vain IPv4-osoitteita (Katso Asetukset → Lisäasetukset)."
 AddressNotAvailable="Osoite ei ole saatavilla. Saatoit yrittää kiinnittää väärän IP-osoitteen (Katso Asetukset → Lisäasetukset)."
 SSLCertVerifyFailed="RTMP-palvelin lähetti virheellisen SSL-sertifikaatin."
+InvalidParameter="Virheelliset yhteyden parametrit. Varmista, että suoratoistopalvelun osoite on oikein."
+NoRoute="Virhe tavoittaessa kohdetta. Varmista, että käyttöliittymä pääsee Internetiin ja että suoratoistopalvelu tukee valitsemaasi osoitetta (katso Asetukset → Lisäasetukset)."
+FTLStream.PeakBitrate="Bittinopeuden huippu"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/fr-FR.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Flux RTMP"
 RTMPStream.DropThreshold="Seuil de rejet des paquets"
+RTMPStream.BindIP="Lier l'IP"
+RTMPStream.NewSocketLoop="Nouvelle boucle de socket"
+RTMPStream.LowLatencyMode="Mode faible latence"
 FLVOutput="Sortie vers fichier FLV"
 FLVOutput.FilePath="Chemin du fichier"
 Default="Interface par défaut"
+IPFamily="Famille d'adresse IP"
+IPFamily.Both="IPv4 et IPv6 (par défaut)"
+IPFamily.V4Only="IPv4 uniquement"
+IPFamily.V6Only="IPv6 uniquement"
 ConnectionTimedOut="La connexion a expiré. Assurez-vous que vous avez configuré un service de streaming valide et qu'aucun pare-feu ne bloque la connexion."
 PermissionDenied="La connexion a été bloquée. Vérifiez vos paramètres de pare-feu / antivirus pour vous assurer qu'OBS est autorisé à avoir un accès complet à Internet."
 ConnectionAborted="La connexion à été interrompue. Cela indique généralement des problèmes de connexion Internet entre vous et le service de streaming."
@@ -11,3 +18,7 @@
 NoData="Nom d’hôte trouvé, mais aucune donnée du type requis. Cela peut se produire si vous utilisez une adresse IPv6 et que le service de streaming ne possède que des adresses IPv4 (voir Paramètres → Avancé)."
 AddressNotAvailable="Adresse non disponible. Vous avez peut-être essayé de la lier à une adresse IP non valide (voir Paramètres → Avancé)."
 SSLCertVerifyFailed="Le serveur RTMP a fourni un certificat SSL incorrect."
+InvalidParameter="Paramètres de connexion invalides. Vérifiez que l'adresse du service de streaming est correcte."
+NoRoute="Une erreur est survenue pour atteindre l'hôte. Assurez-vous que l'interface que vous avez liée peut accéder à Internet et que le service de streaming prend en charge la famille d'adresse que vous avez sélectionné (voir Paramètres → Avancé)."
+FTLStream="Flux FTL"
+FTLStream.PeakBitrate="Débit binaire crête"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/he-IL.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="שידור חי מסוג RTMP"
 RTMPStream.DropThreshold="סף דילוג על תמונות מפתח"
+RTMPStream.BindIP="איגוד IP"
+RTMPStream.NewSocketLoop="לולאת שקע חדשה"
+RTMPStream.LowLatencyMode="מצב השהיה נמוכה"
 FLVOutput="קובץ פלט FLV"
 FLVOutput.FilePath="נתיב קובץ"
 Default="ברירת־מחדל"
+IPFamily="משפחת כתובות IP"
+IPFamily.Both="IPv4 ו־IPv6 (ברירת מחדל)"
+IPFamily.V4Only="IPv4 בלבד"
+IPFamily.V6Only="IPv6 בלבד"
 ConnectionTimedOut="פג הזמן הקצוב לחיבור. ודא שהגדרת שירות הזרמה תקף ואף חומת אש לא חוסמת את החיבור."
 PermissionDenied="הקשר נחסם. בדוק את הגדרות חומת האש/האנטי־וירוס שלך כדי לוודא ש־OBS מורשה גישה מלאה לאינטרנט."
 ConnectionAborted="החיבור הופסק. זה בד\"כ מעיד על בעיות בחיבור האינטרנט בינך לבין שירות השידור החי."
@@ -11,3 +18,7 @@
 NoData="שם מארח נמצא, אך לא נמצאו נתונים של הסוג המבוקש. זה יכול לקרות אם הוגדרה כתובת IPv6 ולשירות השידור החי יש רק כתובות IPv4 (ראו הגדרות ← מתקדם)."
 AddressNotAvailable="כתובת אינה חוקית. יכול להיות שניסית לאגד ל-IP שגוי (ראו הגדרות ← מתקדם)."
 SSLCertVerifyFailed="שרת ה-RTMP שלח אישור SSL לא חוקי."
+InvalidParameter="משתני החיבור שגויים. נא לבדוק שכתובת שירות ההזרמה נכונה."
+NoRoute="שגיאה בהגעה למארח. נא לוודא שהמנשק שאיגדת יכול לגשת לאינטרנט וששירות ההזרמה תומך במשפחת הכתובות שבחרת (תחת הגדרות ← מתקדם)."
+FTLStream="שידור חי מסוג FTL"
+FTLStream.PeakBitrate="שיא קצב סיביות"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/hi-IN.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP स्ट्रीम"
 RTMPStream.DropThreshold="ड्रॉप थ्रेशोल्ड"
+RTMPStream.BindIP="IP से जोड़ें"
+RTMPStream.NewSocketLoop="नया सॉकेट लूप"
+RTMPStream.LowLatencyMode="निम्न विलंबता मोड"
 FLVOutput="FLV फ़ाइल आउटपुट"
 FLVOutput.FilePath="फ़ाइल पथ"
 Default="आरंभिक"
+IPFamily="IP पता परिवार"
+IPFamily.Both="IPv4 और IPv6 (डिफ़ॉल्ट)"
+IPFamily.V4Only="कुंजी: IPFamily.V4केवल\nIPFamily.V4केवल"
+IPFamily.V6Only="केवल IPv6"
 ConnectionTimedOut="कनेक्शन का समय समाप्त हो गया. सुनिश्चित करें कि आपने एक मान्य स्ट्रीमिंग सेवा कॉन्फ़िगर की है और कोई फ़ायरवॉल कनेक्शन को अवरुद्ध नहीं कर रहा है."
 PermissionDenied="कनेक्शन ब्लॉक कर दिया गया था. यह सुनिश्चित करने के लिए कि OBS को पूर्ण इंटरनेट एक्सेस की अनुमति है, अपनी फ़ायरवॉल / एंटी-वायरस सेटिंग्स की जाँच करें."
 ConnectionAborted="कनेक्शन निरस्त कर दिया गया था. यह आमतौर पर आपके और स्ट्रीमिंग सेवा के बीच इंटरनेट कनेक्शन की समस्याओं को इंगित करता है."
@@ -11,3 +18,7 @@
 NoData="होस्टनाम मिला, लेकिन अनुरोधित प्रकार का कोई डेटा नहीं मिला. यह तब हो सकता है जब आप किसी IPv6 पते से बंधे हों और आपकी स्ट्रीमिंग सेवा में केवल IPv4 पते हों (सेटिंग → उन्नत देखें)."
 AddressNotAvailable="पता उपलब्ध नहीं है. हो सकता है कि आपने किसी अमान्य IP पते से जुड़ने का प्रयास किया हो (सेटिंग्स → उन्नत देखें)."
 SSLCertVerifyFailed="RTMP सर्वर ने एक अमान्य SSL प्रमाणपत्र भेजा है."
+InvalidParameter="अमान्य संपर्क पैरामीटर. जांचें कि स्ट्रीमिंग सेवा का पता सही है."
+NoRoute="होस्ट तक पहुंचने में त्रुटि. सुनिश्चित करें कि आपके द्वारा जोड़ा गया इंटरफ़ेस इंटरनेट तक पहुंच सकता है और स्ट्रीमिंग सेवा आपके द्वारा चुने गए पता परिवार का समर्थन करती है (सेटिंग्स → उन्नत देखें)."
+FTLStream="FTL स्ट्रीम"
+FTLStream.PeakBitrate="महत्तम बिटरेट"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/hu-HU.ini Changed

@@ -1,13 +1,24 @@
-RTMPStream="RTMP stream"
+RTMPStream="RTMP adatfolyam"
 RTMPStream.DropThreshold="Eldobási köszöb"
+RTMPStream.BindIP="Kötési IP"
+RTMPStream.NewSocketLoop="Új foglalat"
+RTMPStream.LowLatencyMode="Alacsony késleltetésű mód"
 FLVOutput="FLV kimeneti fájl"
 FLVOutput.FilePath="Fájl elérési útja"
 Default="Alapértelmezett"
+IPFamily="IP-címcsalád"
+IPFamily.Both="IPv4 és IPv6 (alapértelmezett)"
+IPFamily.V4Only="Csak IPv4"
+IPFamily.V6Only="Csak IPv6"
 ConnectionTimedOut="A kapcsolat időtúllépés miatt megszakadt. Győződjön meg arról, hogy a beállított közvetítési szolgáltatás érvényes, és hogy a tűzfal nem blokkolja a kapcsolatot."
 PermissionDenied="A kapcsolat blokkolásra került. Ellenőrizze a tűzfal és vírusirtó beállításait, hogy az OBS számára engedélyezett-e a hozzáférés."
 ConnectionAborted="A kapcsolat megszakadt. Ez általában azt jelzi, hogy az internetkapcsolat a stream kiszolgáló és ön között problémákkal néz szembe."
-ConnectionReset="A kapcsolat a peer által megszakítva. Ez általában azt jelzi, hogy az internetkapcsolat a stream kiszolgáló és ön között problémákkal néz szembe."
+ConnectionReset="A kapcsolatot a partner megszakította. Ez általában az internetkapcsolat hibáját jelzi a közvetítési kiszolgáló és Ön között."
 HostNotFound="A gépnév nem található. Győződjön meg arról, hogy érvényes közvetítési kiszolgálót adott meg, és hogy az internetkapcsolata és DNS-kiszolgálója megfelelően működik."
-NoData="A hostnév megtalálva, viszont a kért állománytípus nem elérhető. Ez akkor fordulhat elő, ha a IPv6 címhez van kötve, de a stream kiszolgálójának csak IPv4 címei állnak rendelkezésre. (Lásd: Beállítások → Haladó)."
-AddressNotAvailable="A cím nem elérhető. Valószínűleg érvénytelen IP címet adott meg (Lásd: Beállítások → Haladó)."
-SSLCertVerifyFailed="Az RTMP kiszolgáló által küldött SSL tanúsítvány érvénytelen."
+NoData="A gépnév megtalálva, de nincsenek a kérésnek megfelelő típusú adatok. Ez akkor fordulhat elő, ha a IPv6-címhez kapcsolódott, de a közvetítési kiszolgálónak csak IPv4-címei állnak rendelkezésre (lásd: Beállítások → Speciális)."
+AddressNotAvailable="A cím nem érhető el. Valószínűleg érvénytelen IP-címet adott meg (lásd: Beállítások → Speciális)."
+SSLCertVerifyFailed="Az RTMP-kiszolgáló által küldött SSL-tanúsítvány érvénytelen."
+InvalidParameter="Érvénytelen kapcsolati paraméterek. Ellenőrizze, hogy a közvetítési szolgáltatás címe helyes-e."
+NoRoute="Hiba a kiszolgáló elérése során. Győződjön meg róla, hogy a csatoló eléri az internetet, és hogy a közvetítési kiszolgáló támogatja-e a kiválasztott címcsaládot (lásd Beálítások → Speciális)."
+FTLStream="RTMP adatfolyam"
+FTLStream.PeakBitrate="Csúcs bitsebesség"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/hy-AM.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP հեռարձակում"
 RTMPStream.DropThreshold="Նվազման շեմը"
+RTMPStream.BindIP="Կապել IP"
+RTMPStream.NewSocketLoop="Սոկետի նոր ուրվագիծ"
+RTMPStream.LowLatencyMode="Քիչ հետաձգման ռեժիմ"
 FLVOutput="FLV ելքային ֆայլ"
 FLVOutput.FilePath="Ֆայլի ուղին"
 Default="Կանխադրված"
+IPFamily="IP հասցեների ընտանիք"
+IPFamily.Both="IPv4 և IPv6 (կանխադրված)"
+IPFamily.V4Only="Միայն IPv4"
+IPFamily.V6Only="Միայն IPv6"
 ConnectionTimedOut="Կապի ժամանակը սպառվել է: Համոզվեք, որ դուք ստեղծել եք վավեր հեռարձակման ծառայություն, և որ հրապատը չի արգելափակում կապը:"
 PermissionDenied="Կապն արգելափակվել է։ Ստուգեք ձեր հրատապի/հակավիրուսային կարգավորումները՝ համոզվելու համար, որ OBS-ին թույլատրված է ամբողջական ինտերնետ հասանելիություն:"
 ConnectionAborted="Կապը դադարեցվել է։ Սա սովորաբար ցույց է տալիս ձեր և հեռարձակման ծառայության միջև ինտերնետ կապի հետ կապված խնդիրներ:"
@@ -11,3 +18,7 @@
 NoData="Գտնվել է հանգույցի անունը, բայց պահանջվող տիպի տվյալներ չկան: Դա կարող է տեղի ունենալ, եթե դուք կապված եք IPv6 հասցեի հետ, և ձեր հեռարձակման ծառայությունն ունի միայն IPv4 հասցեներ (տես Կարգավորումներ → Ընդլայնված):"
 AddressNotAvailable="Հասցեն անհասանելի է։ Հնարավոր է, որ փորձել եք կապվել անվավեր IP հասցեի հետ (տես Կարգավորումներ → Ընդլայնված):"
 SSLCertVerifyFailed="RTMP սերվերն ուղարկել է անվավեր SSL վկայագիր:"
+InvalidParameter="Անվավեր կապի պարամետրեր: Ստուգեք, որ հոսքային ծառայության հասցեն ճիշտ է:"
+NoRoute="Սխալ՝ հյուրընկալողին հասնելիս: Համոզվեք, որ ձեր կապած ինտերֆեյսը կարող է մուտք գործել ինտերնետ, և որ հոսքային ծառայությունն աջակցում է ձեր ընտրած հասցեների ընտանիքին (տես Կարգավորումներ → Ընդլայնված):"
+FTLStream="FTL Հեռարձակում"
+FTLStream.PeakBitrate="Գագաթային բիտրեյթ"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/id-ID.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Stream RTMP"
 RTMPStream.DropThreshold="Ambang Batas Drop"
+RTMPStream.BindIP="Ikat IP"
+RTMPStream.NewSocketLoop="Soket Loop Baru"
+RTMPStream.LowLatencyMode="Mode Latensi Rendah"
 FLVOutput="Output Berkas FLV"
 FLVOutput.FilePath="Jalur Berkas"
 Default="Bawaan"
+IPFamily="Keluarga Alamat IP"
+IPFamily.Both="IPv4 dan IPv6 (Bawaan)"
+IPFamily.V4Only="Hanya IPv4"
+IPFamily.V6Only="Hanya IPv6"
 ConnectionTimedOut="Waktu koneksi habis. Pastikan Anda telah meng-konfigurasi layanan streaming dengan sah dan tidak ada firewall yang memblokir koneksinya."
 PermissionDenied="Koneksi diblokir. Periksa pengaturan firewall / anti-virus Anda untuk memastikan OBS diizinkan akses internet penuh."
 ConnectionAborted="Koneksi dibatalkan. Ini biasanya mengindikasikan masalah koneksi internet antara Anda dan layanan streaming nya."
@@ -11,3 +18,7 @@
 NoData="Nama Host ditemukan, tetapi tidak ada data dari tipe yang diminta. Ini dapat terjadi jika Anda telah terikat ke alamat IPv6 dan layanan streaming Anda hanya memiliki alamat IPv4 (lihat Pengaturan → Tingkat Lanjut)."
 AddressNotAvailable="Alamat tidak tersedia. Anda mungkin mencoba untuk mengikat ke alamat IP yang tidak benar (lihat Pengaturan → Tingkat Lanjut)."
 SSLCertVerifyFailed="Server RTMP mengirim sertifikat SSL yang tidak sah."
+InvalidParameter="Parameter koneksi tidak sah. Periksa apakah alamat layanan streaming nya sudah benar atau belum."
+NoRoute="Kesalahan saat menghubungi host. Pastikan antarmuka yang Anda ikat dapat mengakses internet dan layanan streaming nya itu mendukung alamat keluarga yang Anda pilih (lihat Pengaturan → Lanjutan)."
+FTLStream="Stream FTL"
+FTLStream.PeakBitrate="Puncak Bitrate"

obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/it-IT.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Stream RTMP"
 RTMPStream.DropThreshold="Soglia caduta"
+RTMPStream.BindIP="Associa IP"
+RTMPStream.NewSocketLoop="Nuovo loop socket"
+RTMPStream.LowLatencyMode="Modalità a bassa latenza"
 FLVOutput="Uscita file FLV"
 FLVOutput.FilePath="Percorso file"
 Default="Predefinito"
+IPFamily="Famiglia indirizzo IP"
+IPFamily.Both="IPv4 e IPv6 (predefinito)"
+IPFamily.V4Only="Solo IPv4"
+IPFamily.V6Only="Solo IPv6"
 ConnectionTimedOut="La connessione è scaduta. Assicurati di aver configurato un servizio di dirette valido e controlla che non ci siano firewall che bloccano la connessione."
 PermissionDenied="La connessione è stata bloccata. Controlla il tuo firewall e le impostazioni dell'antivirus, assicurati che OBS abbia l'accesso completo a internet."
 ConnectionAborted="La connessione è stata interrotta. Generalmente questo problema riguarda la connessione tra l'utente e il servizio di dirette."
@@ -11,3 +18,7 @@
 NoData="Nome dell'host trovato, ma nessun dato del tipo richiesto. Ciò può verificarsi se sei collegato tramite un indirizzo IPv6 e il servizio di dirette funziona solo con indirizzi IPv4 (vai a controllare: Impostazioni → Avanzate)."
 AddressNotAvailable="L'indirizzo non è disponibile. Probabilmente hai cercato di associare un indirizzo IP non valido (vai a controllare: Impostazioni → Avanzate)."
 SSLCertVerifyFailed="Il server RTMP ha inviato un certificato SSL non valido."
+InvalidParameter="Parametri di connessione non validi. Controlla che l'indirizzo del servizio di streaming sia corretto."
+NoRoute="Errore nel contatto dell'host. Assicurati che l'interfaccia che hai collegato possa accedere ad internet e che il servizio di streaming supporti la famiglia di indirizzi che hai selezionato (in Impostazioni → Avanzate)."
+FTLStream="Stream FTL"
+FTLStream.PeakBitrate="Picco bitrate"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ja-JP.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP ストリーム"
 RTMPStream.DropThreshold="ドロップしきい値"
+RTMPStream.BindIP="バインド IP"
+RTMPStream.NewSocketLoop="新ソケットループ"
+RTMPStream.LowLatencyMode="低遅延モード"
 FLVOutput="FLV ファイル出力"
 FLVOutput.FilePath="ファイルのパス"
 Default="既定"
+IPFamily="IP アドレスファミリー"
+IPFamily.Both="IPv4 および IPv6 (既定値)"
+IPFamily.V4Only="IPv4 のみ"
+IPFamily.V6Only="IPv6 のみ"
 ConnectionTimedOut="接続がタイムアウトしました。 有効な配信サービスを設定し、ファイアウォールが接続をブロックしていないことを確認してください。"
 PermissionDenied="接続がブロックされました。 ファイアウォール/アンチウィルスの設定を確認してOBSにインターネットへのアクセスがすべて許可されていることを確認してください。"
 ConnectionAborted="接続は中止されました。配信サービスとの間のインターネット接続に問題があることを示しています。"
@@ -11,3 +18,7 @@
 NoData="ホスト名が見つかりましたが、要求されたタイプのデータがありません。 これはIPv6アドレスにバインドしている状態で配信サービスにIPv4アドレスしかない場合に発生します。 (設定 → 詳細設定 を参照)"
 AddressNotAvailable="アドレスを利用できません。 無効なIPアドレスにバインドしようとした可能性があります。 (設定 → 詳細設定 を参照)"
 SSLCertVerifyFailed="RTMPサーバーが無効なSSL証明書を送信しました。"
+InvalidParameter="接続パラメータが無効です。 配信サービスのアドレスが正しいか確認してください。"
+NoRoute="ホストへの到達エラー。 バインドしたインターフェイスがインターネットにアクセスできること、および配信サービスが選択したアドレスファミリーをサポートしているか確認してください。 (設定 → 詳細設定 を参照)"
+FTLStream="FTL 配信"
+FTLStream.PeakBitrate="ピークビットレート"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ka-GE.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP-ნაკადი"
 RTMPStream.DropThreshold="ვარდნის ზღურბლი"
+RTMPStream.BindIP="IP-ის მიბმა"
+RTMPStream.NewSocketLoop="ახალი Socket-Loop"
+RTMPStream.LowLatencyMode="მცირე დაყოვნების რეჟიმი"
 FLVOutput="გამოტანილი FLV-ფაილი"
 FLVOutput.FilePath="ფაილის მისამართი"
 Default="ნაგულისხმევი"
+IPFamily="IP-მისამართების ჯგუფი"
+IPFamily.Both="IPv4 და IPv6 (ნაგულისხმევი)"
+IPFamily.V4Only="IPv4 მხოლოდ"
+IPFamily.V6Only="IPv6 მხოლოდ"
 ConnectionTimedOut="კავშირის ვადა ამოიწურა. გადაამოწმეთ, სწორად გაქვთ თუ არა გამართული ნაკადის გამშვები მომსახურება და ქსელის ფარი ხომ არ ზღუდავს კავშირს."
 PermissionDenied="კავშირი შეიზღუდა. გადაამოწმეთ ქსელის ფარის ან ანტივირუსული პროგრამის პარამეტრები და დარწმუნდით, რომ OBS-ს აქვს სრული დაშვება ინტერნეტთან."
 ConnectionAborted="კავშირი გაუქმდა. ძირითადად, ეს მიუთითებს ინტერნეტკავშირის ხარვეზების არსებობას, თქვენსა და ნაკადის გამშვები მომსახურების მომწოდებელს შორის."
@@ -11,3 +18,7 @@
 NoData="დაკავშირების წერტილი მოიძებნა, მაგრამ მოთხოვნილი სახის მონაცემები არა. ეს შეიძლება გამოწვეული იყოს იმით, რომ თქვენ უკავშირდებით IPv6-მისამართზე, ხოლო თქვენს ნაკადის გამშვებ მომსახურებას, მხოლოდ IPv4-მისამართები გააჩნია (იხილეთ პარამეტრები → დამატებითი)."
 AddressNotAvailable="მისამართი მიუწვდომელია. შესაძლოა, თქვენ ცდილობთ მცდარ IP-მისამართზე დაკავშირებას (იხილეთ პარამეტრები → დამატებით)."
 SSLCertVerifyFailed="RTMP სერვერმა გაგზავნა არამართებული SSL სერტიფიკატი."
+InvalidParameter="კავშირის უმართებულო პარამეტრები. გადაამოწმეთ ეთერში გამშვები მომსახურების მისამართის სისწორე."
+NoRoute="შეცდომა მიერთებისას. გადაამოწმეთ, რომ თქვენს მაკავშირებელს აქვს წვდომა ქსელთან და ეთერში გამშვები მომსახურებით მხარდაჭერილია თქვენ მიერ შერჩეული IP-მისამართების ჯგუფი (იხ. პარამეტრები → დამატებითი)"
+FTLStream="FTL-ნაკადი"
+FTLStream.PeakBitrate="უკიდურესი ბიტური სიხშირე"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ko-KR.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP 스트림"
 RTMPStream.DropThreshold="손실 임계값"
+RTMPStream.BindIP="IP 바인딩"
+RTMPStream.NewSocketLoop="새 Socket 루프"
+RTMPStream.LowLatencyMode="짧은 지연 시간 방식"
 FLVOutput="FLV 파일 출력"
 FLVOutput.FilePath="파일 경로"
 Default="기본값"
+IPFamily="IP 주소 체계"
+IPFamily.Both="IPv4 및 IPv6 (기본값)"
+IPFamily.V4Only="IPv4 전용"
+IPFamily.V6Only="IPv6 전용"
 ConnectionTimedOut="연결 시간이 초과되었습니다. 방송 서버 정보가 제대로 입력되었는지 확인하고, 방화벽 때문에 연결에 문제가 있는지 점검하십시오."
 PermissionDenied="연결이 차단되었습니다. 방화벽/백신 설정을 확인하여 OBS의 인터넷 연결이 허용되었는지 확인하십시오."
 ConnectionAborted="연결이 취소되었습니다. 보통 사용자와 방송 서비스 간의 연결 상태에 문제가 있음을 의미합니다."
@@ -11,3 +18,7 @@
 NoData="호스트 이름을 찾았지만, 요청한 형식의 데이터가 없습니다. 이 문제는 보통 사용자가 IPv6 형식의 주소를 고정하여 사용하면서 IPv4 형식의 주소만 지원하는 방송 서비스에 접속을 시도한 경우 발생합니다 (설정 → 고급 창을 확인하세요)."
 AddressNotAvailable="주소를 사용할 수 없습니다. 잘못된 IP 주소에 바인드하려 시도했을 수 있습니다 (설정 → 고급 창을 확인하세요)."
 SSLCertVerifyFailed="해당 RTMP 서버가 잘못된 SSL 인증서를 보냈습니다."
+InvalidParameter="연결 매개변수가 잘못되었습니다. 스트리밍 서비스 주소가 올바른지 확인하십시오."
+NoRoute="호스트에 연결하는 동안 오류가 발생했습니다. 바인딩된 인터페이스로 인터넷을 접속할 수 있는지, 스트리밍 서비스가 선택한 주소 체계를 지원하는지 확인하십시오 (설정 → 고급 설정 참조)."
+FTLStream="FTL 스트림"
+FTLStream.PeakBitrate="최대 비트레이트"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ms-MY.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Strim RTMP"
 RTMPStream.DropThreshold="Ambang Lepas"
+RTMPStream.BindIP="Ikat IP"
+RTMPStream.NewSocketLoop="Gelung Soket Baharu"
+RTMPStream.LowLatencyMode="Mod Kependaman Rendah"
 FLVOutput="Output Fail FLV"
 FLVOutput.FilePath="Laluan Fail"
 Default="Lalai"
+IPFamily="Keluarga Alamat IP"
+IPFamily.Both="IPv4 dan IPv6 (Lalai)"
+IPFamily.V4Only="IPv4 Sahaja"
+IPFamily.V6Only="IPv6 Sahaja"
 ConnectionTimedOut="Sambungan tamat masa. Pastikan anda telah mengkonfigur perkhidmatan penstriman yang sah dan tiada tembok api menyekat sambungan."
 PermissionDenied="Sambungan telah disekat. Periksa tetapan tembok api / antivirus untuk memastikan OBS mendapat capaian internet sepenuhnya."
 ConnectionAborted="Sambungan telah dihenti paksa. Ia biasanya menunjukkan masalah sambungan internet antara anda dengan perkhidmatan penstriman."
@@ -11,3 +18,7 @@
 NoData="Nama hos ditemui, tetapi tiada data bagi jenis yang dipinta. Ia boleh berlaku jika anda terikat dengan alamat IPv6 dan perkhidmatan penstriman anda hanya ada alamat IPv4 (lihat Tetapan →Lanjutan)."
 AddressNotAvailable="Alamat tidak tersedia. Anda mungkin telah mengikat dengan satu alamat IP tidak sah (lihat Tetapan → Lanjutan)."
 SSLCertVerifyFailed="Pelayan RTMP telah menghantar satu sijil SSL yang tidak sah."
+InvalidParameter="Parameter sambungan tidak sah. Sila periksa alamat perkhidmatan penstriman adalah betul."
+NoRoute="Ralat ketika mencapai hos. Pastikan antara muka yang diikat bersama dapat mencapai internet dan perkhidmatan penstriman menyokong keluarga alamat yang anda pilih (sila rujuk Tetapan → Lanjutan)."
+FTLStream="Strim FTL"
+FTLStream.PeakBitrate="Kada Bit Puncak"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/nl-NL.ini Changed

@@ -1,7 +1,13 @@
 RTMPStream.DropThreshold="Drop Drempel"
+RTMPStream.NewSocketLoop="Nieuwe Socket Loop"
+RTMPStream.LowLatencyMode="Lage latency modus"
 FLVOutput="FLV Bestandsuitvoer"
 FLVOutput.FilePath="Bestandspad"
 Default="Standaard"
+IPFamily="IP-adres familie"
+IPFamily.Both="IPv4 en IPv6 (Standaard)"
+IPFamily.V4Only="Alleen IPv4"
+IPFamily.V6Only="Alleen IPv6"
 ConnectionTimedOut="Er is een time-out opgetreden in de verbinding. Controleer dat je een geldige streaming service hebt ingesteld en dat er geen firewall de verbinding blokkeert."
 PermissionDenied="De verbinding was geblokkeerd. Controleer je firewall/anti-virus instellingen om te controleren dat OBS volledige internettoegang heeft."
 ConnectionAborted="De verbinding was afgebroken. Dit duidt meestal op verbindingsproblemen tussen jou en de streaming service."
@@ -10,3 +16,6 @@
 NoData="Hostnaam gevonden, maar geen data van het verwachte type. Dit kan gebeuren als je aan een IPv6 adres hebt gebonden, en je streaming service alleen IPv4 adressen heeft (zie Instellingen → Geavanceerd)."
 AddressNotAvailable="Adres niet beschikbaar. Je hebt misschien geprobeerd om aan een ongeldig IP adres te binden (zie Instellingen → Geavanceerd)."
 SSLCertVerifyFailed="De RTMP-server heeft een ongeldig SSL-certificaat verzonden."
+InvalidParameter="Incorrecte verbindingsinstellingen. Controleer dat de streaming service adres correct is."
+NoRoute="Fout bij het bereiken van de host. Zorg ervoor dat de interface die u hebt gekoppeld toegang heeft tot internet en dat de streamingdienst de adresfamilie ondersteunt die u hebt geselecteerd (zie Instellingen → Geavanceerd)."
+FTLStream.PeakBitrate="Piekbitrate"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/pl-PL.ini Changed

@@ -1,8 +1,14 @@
 RTMPStream="Strumień RTMP"
 RTMPStream.DropThreshold="Próg odcięcia"
+RTMPStream.BindIP="Przydziel IP"
+RTMPStream.LowLatencyMode="Tryb niskich opóźnień"
 FLVOutput="Wyjście do pliku FLV"
 FLVOutput.FilePath="Ścieżka pliku"
 Default="Domyślne"
+IPFamily="Protokół IP"
+IPFamily.Both="IPv4 i IPv6 (domyślnie)"
+IPFamily.V4Only="Tylko IPv4"
+IPFamily.V6Only="Tylko IPv6"
 ConnectionTimedOut="Upłynął limit czasu połączenia. Upewnij się, że usługa strumieniowania jest poprawnie skonfigurowana a zapora internetowa nie blokuje połączenia."
 PermissionDenied="Połączenie zostało zablokowane. Sprawdź stan zapory internetowej / ustawienia antywirusowe, aby upewnić się, że OBS ma pełny dostęp do internetu."
 ConnectionAborted="Połączenie zostało przerwane. Wskazuje to najczęściej na problemy w połączeniu między Tobą a usługą strumieniowania."
@@ -11,3 +17,7 @@
 NoData="Nazwa serwera została znaleziona ale nie stwierdzono poprawności odbieranych danych. Dzieje się tak najczęściej po przypisaniu aplikacji do adresu IPv6, gdy usługa strumieniowania obsługuje jedynie adresy IPv4 (zobacz Ustawienia → Zaawansowane)."
 AddressNotAvailable="Adres IP niedostępny. Być może powiązano aplikację z nieprawidłowym adresem IP (zobacz Ustawienia → Zaawansowane)."
 SSLCertVerifyFailed="Serwer RTMP wysłał nieprawidłowy certyfikat SSL."
+InvalidParameter="Nieprawidłowe parametry połączenia. Sprawdź, czy adres usługi streamingowej jest prawidłowy."
+NoRoute="Błąd połączenia z serwerem. Sprawdź, czy przypisany interfejs sieciowy ma dostęp do internetu i czy dana usługa streamingowa wspiera wybrany protokół internetowy (zobacz Ustawienia → Zaawansowane)."
+FTLStream="Strumień FTL"
+FTLStream.PeakBitrate="Maksymalna przepływność (bitrate)"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/pt-BR.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Stream RTMP"
 RTMPStream.DropThreshold="Limiar de Exclusão"
+RTMPStream.BindIP="Vincular IP"
+RTMPStream.NewSocketLoop="Novo \"Loop\" de Socket"
+RTMPStream.LowLatencyMode="Modo de baixa latência"
 FLVOutput="Arquivo de Saída FLV"
 FLVOutput.FilePath="Caminho do Arquivo"
 Default="Padrão"
+IPFamily="Família de endereços IP"
+IPFamily.Both="IPv4 e IPv6 (Padrão)"
+IPFamily.V4Only="IPv4 Apenas"
+IPFamily.V6Only="IPv6 Apenas"
 ConnectionTimedOut="A conexão expirou. Verifique se você configurou um serviço de transmissão válido e nenhum firewall está bloqueando a conexão."
 PermissionDenied="A conexão foi bloqueada. Verifique seu firewall / configurações de antivírus para certificar-se do acesso completo do OBS à internet."
 ConnectionAborted="A conexão foi abortada. Isso geralmente indica problemas de conexão entre você e o serviço de transmissão."
@@ -11,3 +18,7 @@
 NoData="Host encontrado, mas não há dados do tipo solicitado. Isso pode ocorrer se você tiver vinculado a um endereço IPv6 e seu serviço de transmissão tem apenas endereços IPv4 (consulte Configurações → Avançado)."
 AddressNotAvailable="Endereço indisponível. Você pode ter tentado se vincular a um endereço IP inválido (consulte Configurações → Avançado)."
 SSLCertVerifyFailed="O servidor RTMP enviou um certificado SSL inválido."
+InvalidParameter="Parâmetros de conexão inválidos. Verifique se o endereço do serviço de streaming está correto."
+NoRoute="Erro ao acessar o host. Certifique-se de que a interface que você tem vinculada pode acessar a internet e que o serviço de streaming suporta a família de endereços que você selecionou (veja Configurações → Avançado)."
+FTLStream="Transmissão FTL"
+FTLStream.PeakBitrate="Taxa de bits Máxima"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/pt-PT.ini Changed

@@ -1,13 +1,24 @@
 RTMPStream="Transmissão RTMP"
 RTMPStream.DropThreshold="Limiar de queda"
+RTMPStream.BindIP="Vincular IP"
+RTMPStream.NewSocketLoop="Nova repetição de tomada"
+RTMPStream.LowLatencyMode="Modo de baixa latência"
 FLVOutput="Saída de ficheiro FLV"
 FLVOutput.FilePath="Caminho do ficheiro"
 Default="Predefinido"
+IPFamily="Família de endereços IP"
+IPFamily.Both="IPv4 e IPv6 (Predefinido)"
+IPFamily.V4Only="Apenas IPv4"
+IPFamily.V6Only="Apenas IPv6"
 ConnectionTimedOut="A ligação expirou. Assegure-se de que configurou um serviço de transmissão válido e não tem uma firewall a bloquear a ligação."
 PermissionDenied="A ligação foi bloqueada. Verifique as configurações de firewall/antivírus para garantir que o OBS tem acesso total à Internet."
 ConnectionAborted="A ligação foi abortada. Isto normalmente indica problemas de ligação à Internet entre si e o serviço de transmissão."
 ConnectionReset="A ligação foi desligada pelo parceiro. Isto normalmente indica problemas de ligação à Internet entre si e o serviço de transmissão."
 HostNotFound="Anfitrião não encontrado. Verifique se inseriu um servidor de transmissão válido e se a ligação à Internet ou DNS estão a funcionar corretamente."
-NoData="Anfitrião encontrado, mas sem dados do tipo solicitado. Isto pode acontecer se tiver um endereço IPv6 e o serviço de transmissão tiver apenas endereços IPv4 (veja Definições → Avançado)."
+NoData="Anfitrião encontrado, mas sem dados do tipo solicitado. Isto pode acontecer se optar por vincular a um endereço IPv6 mas o serviço de transmissão tiver apenas endereços IPv4 (veja Definições → Avançado)."
 AddressNotAvailable="Endereço indisponível. Pode ter tentado um vínculo a um endereço IP inválido (veja Definições → Avançado)."
 SSLCertVerifyFailed="O servidor RTMP enviou um certificado SSL inválido."
+InvalidParameter="Parâmetros de ligação inválidos. Verifique se o endereço do serviço de transmissão está correto."
+NoRoute="Erro ao aceder ao servidor. Certifique-se de que a interface a que vinculou pode aceder a Internet e que o serviço de transmissão suporta a família de endereços que selecionou (consulte Configurações → Avançado)."
+FTLStream="Transmissão FTL"
+FTLStream.PeakBitrate="Pico de taxa de bits"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ro-RO.ini Changed

@@ -1,8 +1,14 @@
 RTMPStream="Flux RTMP"
 RTMPStream.DropThreshold="Prag de scădere"
+RTMPStream.NewSocketLoop="Loop socket nou"
+RTMPStream.LowLatencyMode="Mod latenta scăzuta"
 FLVOutput="Output fișier FLV"
 FLVOutput.FilePath="Calea fișierului"
 Default="Implicit"
+IPFamily="Familia adresei IP"
+IPFamily.Both="IPv4 și IPv6 (implicit)"
+IPFamily.V4Only="Numai IPv4"
+IPFamily.V6Only="Numai IPv6"
 ConnectionTimedOut="Conexiunea a expirat. Asigură-te că ai configurat un serviciu de streaming valid și că nici un firewall nu blochează conexiunea."
 PermissionDenied="Conexiunea a fost blocată. Verificați setările firewall-ului / anti-virus pentru a vă asigura că OBS are acces complet la internet."
 ConnectionAborted="Conexiunea a fost întreruptă. Acest lucru indică de obicei probleme de conexiune la internet între tine și serviciul de transmisiune."
@@ -11,3 +17,5 @@
 NoData="A fost găsit numele gazdei, dar nu există date de tipul solicitat. Acest lucru se poate întâmpla dacă ai o adresă IPv6 și serviciul de transmisiune are doar adrese IPv4 (vezi Setări → Avansate)."
 AddressNotAvailable="Adresa nu este disponibilă. Este posibil să fi încercat conectarea la o adresă IP invalidă (vezi Setări → Avansat)."
 SSLCertVerifyFailed="Serverul RTMP a trimis un certificat SSL nevalid."
+FTLStream="Stream FTL"
+FTLStream.PeakBitrate="Rata de biți maximă"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/ru-RU.ini Changed

@@ -1,13 +1,24 @@
-RTMPStream="RTMP-трансляция"
+RTMPStream="Поток RTMP"
 RTMPStream.DropThreshold="Порог выпадения"
+RTMPStream.BindIP="Привязать IP"
+RTMPStream.NewSocketLoop="Новый контур сокета"
+RTMPStream.LowLatencyMode="Режим низкой задержки"
 FLVOutput="Выходной файл FLV"
-FLVOutput.FilePath="Путь к файлу"
+FLVOutput.FilePath="Путь файла"
 Default="По умолчанию"
+IPFamily="Семейство IP-адресов"
+IPFamily.Both="IPv4 и IPv6 (По умолчанию)"
+IPFamily.V4Only="Только IPv4"
+IPFamily.V6Only="Только IPv6"
 ConnectionTimedOut="Истекло время ожидания соединения. Убедитесь, что вы настроили действительный сервис вещания и брандмауэр не блокирует подключение."
 PermissionDenied="Соединение было заблокировано. Проверьте параметры вашего брандмауэра/антивируса, чтобы убедиться, что OBS разрешен полный доступ к интернету."
 ConnectionAborted="Соединение было прервано. Обычно это указывает на проблемы с интернет-соединением между вами и службой вещания."
 ConnectionReset="Соединение было сброшено одноранговым узлом. Обычно это указывает на проблемы с интернет-соединением между вами и службой вещания."
-HostNotFound="Имя узла не найдено. Убедитесь, что вы ввели действительный сервер вещания и ваше подключение к интернету/DNS работают правильно."
-NoData="Имя узла найдено, но нет данных запрошенного типа. Такое может случиться, если вы привязаны к IPv6-адресу, а ваш сервис вещания имеет только IPv4-адреса (смотрите Настройки → Расширенные)."
-AddressNotAvailable="Адрес недоступен. Возможно вы пытались привязаться к недействительному IP-адресу (смотрите Настройки → Расширенные)."
+HostNotFound="Имя сервера не найдено. Убедитесь, что вы ввели действительный сервер вещания и ваше подключение к интернету/DNS работают правильно."
+NoData="Имя сервера найдено, но нет данных запрошенного типа. Такое может случиться, если вы привязаны к IPv6-адресу, а ваш сервис вещания имеет только IPv4-адреса (смотрите «Настройки → Расширенные»)."
+AddressNotAvailable="Адрес недоступен. Возможно вы пытались привязаться к недействительному IP-адресу (смотрите «Настройки → Расширенные»)."
 SSLCertVerifyFailed="RTMP сервер отправил недействительный сертификат SSL."
+InvalidParameter="Неправильные параметры соединения. Удостоверьтесь, что адрес сервиса потока верен."
+NoRoute="Ошибка соединения с сервером. Удостоверьтесь, что используемый вами интерфейс имеет доступ к интернету, и что он поддерживает выбранную вами версию IP (смотрите «Настройки → Расширенные»)"
+FTLStream="Поток FTL"
+FTLStream.PeakBitrate="Пиковый битрейт"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/sk-SK.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP stream"
-RTMPStream.DropThreshold="Hladina zahodenia"
+RTMPStream.DropThreshold="Hranica zahodenia"
+RTMPStream.BindIP="Zviazať s IP adresou"
+RTMPStream.NewSocketLoop="Nová socketová slučka"
+RTMPStream.LowLatencyMode="Režim nízkej latencie"
 FLVOutput="Výstup do súboru FLV"
 FLVOutput.FilePath="Cesta k súboru"
 Default="Predvolené"
+IPFamily="Rodina IP adresy"
+IPFamily.Both="IPv4 a IPv6 (Predvolené)"
+IPFamily.V4Only="Iba IPv4"
+IPFamily.V6Only="Iba IPv6"
 ConnectionTimedOut="Pripojenie vypršalo. Uistite sa že ste nakonfigurovali správnu službu vysielania a že firewall neblokuje toto pripojenie."
 PermissionDenied="Pripojenie bolo zablokované. Pozrite si nastavenia vášho firewallu / antivirusu a uistite sa že OBS má plný prístup na internet."
 ConnectionAborted="Pripojenie bolo ukončené. Toto obvykle znamená, že nastali problémy s internetovým pripojením medzi vami a službou vysielania."
@@ -11,3 +18,6 @@
 NoData="Názov hostiteľa sa našiel, ale žiadne dáta požadovaného typu. K tomu môže dôjsť, ak ste viazaní na adresu IPv6 a vaša služba vysielania má iba adresy IPv4 (pozri Nastavenia → Rozšírené)."
 AddressNotAvailable="Adresa nie je k dispozícii. Môžno ste sa snažili naviazať na neplatnú IP adresu (pozrite si Nastavenia → Rozšírené)."
 SSLCertVerifyFailed="RTMP server poslal neplatný SSL certifikát."
+InvalidParameter="Nesprávne parametre pripojenia. Skontrolujte či je adresa streamovacej služby správna."
+NoRoute="Chyba pri dosahovaní hosťa. Uistite sa, že rozhranie ktoré ste pripojili, môže pristupovať na internet a že daná streamovacia služba podporuje rodinu adries, ktorú ste zvolili (pozrite Nastavenia → Pokročilé)."
+FTLStream.PeakBitrate="Max. dátový tok"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/sl-SI.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP pretok"
 RTMPStream.DropThreshold="Prag opuščanja"
+RTMPStream.BindIP="Veži IP"
+RTMPStream.NewSocketLoop="Nova vtična zanka"
+RTMPStream.LowLatencyMode="Način nizke zakasnitve"
 FLVOutput="Izhod datoteke FLV"
 FLVOutput.FilePath="Pot datoteke"
 Default="Privzeto"
+IPFamily="Družina naslovov IP"
+IPFamily.Both="IPv4 in IPv6 (privzeto)"
+IPFamily.V4Only="Samo IPv4"
+IPFamily.V6Only="Samo IPv6"
 ConnectionTimedOut="Povezava je potekla. Prepričajte se, da ste pravilno nastavili pretočno storitev in da požarni zid ne blokira povezave."
 PermissionDenied="Povezava je bila blokirana. Preverite nastavitve požarnega zidu/protivirusnega programa in se prepričajte, da ima OBS poln dostop do interneta."
 ConnectionAborted="Povezava je bila prekinjena. To običajno pomeni, da imate težave z spletno povezavo med vami in pretočno storitvijo."
@@ -11,3 +18,7 @@
 NoData="Ime gostitelja je bilo najdeno, vendar ni podatkov zahtevane vrste. To se lahko zgodi, če ste se vezali na naslov IPv6, vaša storitev za pretakanje pa ima samo naslove IPv4 (glejte Nastavitve → Napredno)."
 AddressNotAvailable="Naslov ni na voljo. Morda ste se poizkusili vezati na neveljaven naslov IP (glejte Nastavitve → Napredno)."
 SSLCertVerifyFailed="Strežnik RMTP je poslal neveljavno potrdilo SSL."
+InvalidParameter="Neveljavni parametri povezave. Preverite, da je naslov pretočne storitve pravilen."
+NoRoute="Napaka pri doseganju gostitelja. Preverite, da vmesnik, na katerega ste vezani, lahko dostopa do interneta in da pretočna storitev podpira družino naslovov, ki ste jo izbrali (glejte Nastavitve → Napredno)."
+FTLStream="Tok FTL"
+FTLStream.PeakBitrate="Največja bitna hitrost"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/sv-SE.ini Changed

@@ -1,8 +1,14 @@
 RTMPStream="RTMP-ström"
 RTMPStream.DropThreshold="Släppningströskel"
+RTMPStream.NewSocketLoop="Ny socket-loop"
+RTMPStream.LowLatencyMode="Låg latens-läge"
 FLVOutput="FLV-filutmatning"
 FLVOutput.FilePath="Filsökväg"
 Default="Standard"
+IPFamily="IP-adressfamilj"
+IPFamily.Both="IPv4 och IPv6 (standard)"
+IPFamily.V4Only="Endast IPv4"
+IPFamily.V6Only="Endast IPv6"
 ConnectionTimedOut="Anslutningen förlorades. Se till att du har konfigurerat en giltig strömningstjänst och att inga brandväggar blockerar anslutningen."
 PermissionDenied="Anslutningen blockerades. Kontrollera inställningarna för din brandvägg/antivirusprogram för att se till att OBS har fullständig åtkomst till Internet."
 ConnectionAborted="Anslutningen avbröts. Detta kan indikera problem med Internetanslutningen mellan dig och strömningstjänsten."
@@ -11,3 +17,7 @@
 NoData="Värdnamnet hittades, men ingen data av den begärda typen. Detta kan förekomma om du har bundit till en IPv6-adress och din strömtjänst endast har IPv4-adresser (se Inställningar → Avancerat)."
 AddressNotAvailable="Adressen är inte tillgänglig. Du kanske har försökt binda till en ogiltig IP-adress (se Inställningar → Avancerat)."
 SSLCertVerifyFailed="RTMP-servern skickade ett ogiltigt SSL-certifikat."
+InvalidParameter="Ogiltiga anslutningsparametrar. Kontrollera att adressen till strömtjänsten är korrekt."
+NoRoute="Fel när värd skulle nås. Se till att gränssnittet du har kopplat kan komma åt internet och strömtjänsten har stöd för adressfamiljen du valde (se Inställningar → Avancerat)."
+FTLStream="FTL-ström"
+FTLStream.PeakBitrate="Maximal bithastighet"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/tr-TR.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP Yayın"
 RTMPStream.DropThreshold="Düşme eşiği"
+RTMPStream.BindIP="IP'yi Bağla"
+RTMPStream.NewSocketLoop="Yeni Soket Döngüsü"
+RTMPStream.LowLatencyMode="Düşük Gecikme Modu"
 FLVOutput="FLV Dosyası Çıkışı"
 FLVOutput.FilePath="Dosya Yolu"
 Default="Varsayılan"
+IPFamily="IP Adres Ailesi"
+IPFamily.Both="IPv4 ve IPv6 (Varsayılan)"
+IPFamily.V4Only="Sadece IPv4"
+IPFamily.V6Only="Sadece IPv6"
 ConnectionTimedOut="Bağlantı zaman aşımına uğradı. Geçerli bir yayın servisi yapılandırdığınızdan ve bağlantıyı engelleyen bir güvenlik duvarı olmadığından emin olun."
 PermissionDenied="Bağlantı engellendi. Güvenlik duvarı / virüs koruma ayarlarınızı OBS'ye tam internet erişimi verildiğinden emin olmak için kontrol edin."
 ConnectionAborted="Bağlantı iptal edildi. Bu genellikle sizin ve yayın servisinin arasındaki internet bağlantısı sorununa işaret eder."
@@ -11,3 +18,7 @@
 NoData="Ana bilgisayar adı bulundu, ancak istenen türde veri bulunamadı. Bu bir IPv6 adresine bağlamış ve yayın servisinizin sadece IPv4 adresleri varsa oluşabilir (bkz: Ayarlar → Gelişmiş)."
 AddressNotAvailable="Adres kullanılamaz. Geçersiz bir IP adresi bağlamayı denemiş olabilirsiniz (bakın: Ayarlar → Gelişmiş)."
 SSLCertVerifyFailed="RTMP sunucusu geçersiz bir SSL sertifikası gönderdi."
+InvalidParameter="Geçersiz bağlantı parametreleri. Yayın servisinizin adresinin doğru olup olmadığını kontrol edin."
+NoRoute="Ana bilgisayara ulaşılırken hata oluştu. Bağladığınız arabirimin internet'e erişebildiğinden ve yayın servisinizin seçtiğiniz adres ailesini desteklediğinden emin olun (bkz. Ayarlar → Gelişmiş)."
+FTLStream="FTL Yayını"
+FTLStream.PeakBitrate="Tepe Bithızı"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/uk-UA.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="RTMP потік"
 RTMPStream.DropThreshold="Поріг пропускання"
+RTMPStream.BindIP="Прив'язати IP"
+RTMPStream.NewSocketLoop="Новий цикл сокетів"
+RTMPStream.LowLatencyMode="Режим з низькою затримкою"
 FLVOutput="Вивід FLV файлу"
 FLVOutput.FilePath="Шлях до файлу"
 Default="За замовчуванням"
+IPFamily="IP-адреса Родини"
+IPFamily.Both="IPv4 та IPv6 (за замовчуванням)"
+IPFamily.V4Only="Тільки IPv4"
+IPFamily.V6Only="Тільки IPv6"
 ConnectionTimedOut="Час очікування підключення вичерпано. Переконайтеся, що ви вказали коректний сервіс трансляцій і брандмауер не блокує з'єднання."
 PermissionDenied="З'єднання було заблоковано. Перевірте налаштування вашого брандмауера / антивірусу, щоб переконатися чи має OBS повний доступ до Інтернету."
 ConnectionAborted="З'єднання було перервано. Зазвичай, це свідчить про проблеми з Інтернет підключенням між вами та сервісом трансляцій."
@@ -11,3 +18,7 @@
 NoData="Ім'я хоста знайдено, але нема жодних даних вказаного типу. Це трапляється, якщо ви вказали прив'язку до IPv6-адресу, а ваш сервіс трансляцій підтримує лише адреси IPv4 (див. Налаштування → Розширені)."
 AddressNotAvailable="Адреса недоступна. Напевно ви спробували прив'язатись до недійсної IP-адреси (див. Налаштування → Розширені)."
 SSLCertVerifyFailed="RTMP сервер надіслав недійсний SSL сертифікат."
+InvalidParameter="Неправильні параметри з'єднання. Перевірте правильність адреси стримінгового сервісу."
+NoRoute="Помилка під'єднання до хосту. Переконайтеся, що інтерфейс, який ви прив'язали, має доступ до інтернету, і що стримінговий сервіс підтримує вибрану вами сім'ю адрес (перегляньте Налаштування → Додатково)."
+FTLStream="FTL-трансляція"
+FTLStream.PeakBitrate="Максимальний бітрейт"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/vi-VN.ini Changed

@@ -1,8 +1,15 @@
 RTMPStream="Luồng RTMP"
 RTMPStream.DropThreshold="Ngưỡng bỏ qua"
+RTMPStream.BindIP="Liên kết IP"
+RTMPStream.NewSocketLoop="Vòng lặp ổ cắm mới"
+RTMPStream.LowLatencyMode="Chế độ Độ trễ Thấp"
 FLVOutput="FLV tập tin đầu ra"
 FLVOutput.FilePath="Đường dẫn tệp"
 Default="Mặc định"
+IPFamily="Dòng địa chỉ IP"
+IPFamily.Both="IPv4 và IPv6 (Mặc định)"
+IPFamily.V4Only="Chỉ IPv4"
+IPFamily.V6Only="Chỉ IPv6"
 ConnectionTimedOut="Kết nối đã hết thời. Đảm bảo bạn đã định cấu hình dịch vụ phát trực tuyến hợp lệ và không có tường lửa nào đang chặn kết nối."
 PermissionDenied="Kết nối đã bị chặn. Hãy kiểm tra tường lửa / thiết đặt chống virus để đảm bảo rằng OBS được cho phép truy cập internet đầy đủ."
 ConnectionAborted="Kết nối đã bị hủy bỏ. Điều này thường chỉ ra kết nối internet giữa bạn và dịch vụ trực tuyến có vấn đề."
@@ -11,3 +18,7 @@
 NoData="Tên máy chủ đã được tìm thấy, nhưng không có dữ liệu loại yêu cầu. Điều này có thể xảy ra nếu bạn đã ràng buộc đến địa chỉ IPv6 và dịch vụ phát sóng của bạn chỉ có địa chỉ IPv4 (xem Cài đặt → Nâng cao)."
 AddressNotAvailable="Địa chỉ không có sẵn. Bạn có thể đã cố gắng liên kết với một địa chỉ IP không hợp lệ (xem Thiết đặt → Nâng cao)."
 SSLCertVerifyFailed="Máy chủ RTMP đã gửi một chứng chỉ SSL không hợp lệ."
+InvalidParameter="Tham số kết nối không hợp lệ. Kiểm tra xem địa chỉ dịch vụ phát trực tuyến có đúng không."
+NoRoute="Lỗi khi tiếp cận máy chủ. Đảm bảo rằng giao diện bạn đã liên kết có thể truy cập internet và dịch vụ phát trực tuyến hỗ trợ họ địa chỉ bạn đã chọn (xem Cài đặt → Nâng cao)."
+FTLStream="Luồng FTL"
+FTLStream.PeakBitrate="Bitrate Cao nhất"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/zh-CN.ini Changed

@@ -1,13 +1,24 @@
 RTMPStream="RTMP 流"
-RTMPStream.DropThreshold="丢弃阈值"
+RTMPStream.DropThreshold="帧丢弃阈值"
+RTMPStream.BindIP="绑定IP"
+RTMPStream.NewSocketLoop="新建套接字循环"
+RTMPStream.LowLatencyMode="低延迟模式"
 FLVOutput="FLV 文件输出"
 FLVOutput.FilePath="文件路径"
 Default="默认"
-ConnectionTimedOut="连接超时。请确保您已经配置了一个有效的流媒体服务并且没有防火墙阻止连接。"
+IPFamily="IP 地址族"
+IPFamily.Both="IPv4 和 IPv6（默认）"
+IPFamily.V4Only="仅 IPv4"
+IPFamily.V6Only="仅 IPv6"
+ConnectionTimedOut="连接超时。请确保您已经配置了一个有效的流媒体服务并且没有防火墙阻止此连接。"
 PermissionDenied="连接被阻止。检查您的防火墙 / 防病毒设置以确保允许 OBS 自由访问互联网。"
 ConnectionAborted="连接被中止。这通常表明你和流媒体服务器间的互联网存在连接问题。"
 ConnectionReset="对方重置了连接。这通常表明你和流媒体服务器间的互联网存在连接问题。"
 HostNotFound="找不到主机名。请确保您输入了有效的流媒体服务器并且您的互联网连接 / DNS 工作正常。"
-NoData="找到主机名，但没有所请求类型的数据。如果绑定到 IPv6 地址并且流式服务只有 IPv4 地址，则可能发生这种情况（请参阅设置→高级）。"
+NoData="找到主机名，但没有请求类型的数据。如果绑定到了 IPv6 地址但您的流媒体服务只有 IPv4 地址，则可能发生这种情况（请参阅设置→高级）。"
 AddressNotAvailable="地址不可用。您可能试图绑定到一个无效的 IP 地址（请参阅设置→高级）。"
 SSLCertVerifyFailed="RTMP 服务器发送了无效的 SSL 证书。"
+InvalidParameter="连接参数无效。请检查串流服务地址是否正确。"
+NoRoute="到达主机时出错。确保您绑定的接口可以访问互联网，并且串流服务支持您选择的地址族（参阅设置 → 高级）。"
+FTLStream="FTL 流"
+FTLStream.PeakBitrate="峰值比特率"

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/flv-mux.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/flv-mux.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@
 //#define DEBUG_TIMESTAMPS
 //#define WRITE_FLV_HEADER
 
-#define VIDEODATA_AVCVIDEOPACKET 7.0
 #define AUDIODATA_AAC 10.0
 
 #define VIDEO_FRAMETYPE_OFFSET 4
@@ -101,6 +100,29 @@
 	return bitrate;
 }
 
+static const double VIDEODATA_AVCVIDEOPACKET = 7.0;
+// Additional FLV onMetaData values for Enhanced RTMP/FLV
+static const double VIDEODATA_AV1VIDEOPACKET = 1635135537.0; // FourCC "av01"
+#ifdef ENABLE_HEVC
+static const double VIDEODATA_HEVCVIDEOPACKET = 1752589105.0; // FourCC "hvc1"
+#endif
+
+static inline double encoder_video_codec(obs_encoder_t *encoder)
+{
+	const char *codec = obs_encoder_get_codec(encoder);
+
+	if (strcmp(codec, "h264") == 0)
+		return VIDEODATA_AVCVIDEOPACKET;
+	if (strcmp(codec, "av1") == 0)
+		return VIDEODATA_AV1VIDEOPACKET;
+#ifdef ENABLE_HEVC
+	if (strcmp(codec, "hevc") == 0)
+		return VIDEODATA_HEVCVIDEOPACKET;
+#endif
+
+	return 0.0;
+}
+
 #define FLV_INFO_SIZE_OFFSET 42
 
 void write_file_info(FILE *file, int64_t duration_ms, int64_t size)
@@ -143,7 +165,7 @@
 	enc_num_val(&enc, end, "height",
 		 (double)obs_encoder_get_height(vencoder));
 
-	enc_num_val(&enc, end, "videocodecid", VIDEODATA_AVCVIDEOPACKET);
+	enc_num_val(&enc, end, "videocodecid", encoder_video_codec(vencoder));
 	enc_num_val(&enc, end, "videodatarate", encoder_bitrate(vencoder));
 	enc_num_val(&enc, end, "framerate", video_output_get_frame_rate(video));
 
@@ -167,7 +189,7 @@
 	dstr_printf(&encoder_name, "%s (libobs version ", MODULE_NAME);
 
 #ifdef HAVE_OBSCONFIG_H
-	dstr_cat(&encoder_name, OBS_VERSION);
+	dstr_cat(&encoder_name, obs_get_version_string());
 #else
 	dstr_catf(&encoder_name, "%d.%d.%d", LIBOBS_API_MAJOR_VER,
 		 LIBOBS_API_MINOR_VER, LIBOBS_API_PATCH_VER);

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/flv-mux.h -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/flv-mux.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/flv-output.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/flv-output.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/ftl-stream.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/ftl-stream.c Changed

@@ -109,8 +109,6 @@
 	frame_of_nalus_t coded_pic_buffer;
 };
 
-static void log_libftl_messages(ftl_log_severity_t log_level,
-				const char *message);
 static int init_connect(struct ftl_stream *stream);
 static void *connect_thread(void *data);
 static void *status_thread(void *data);
@@ -122,12 +120,6 @@
 	return obs_module_text("FTLStream");
 }
 
-static void log_ftl(int level, const char *format, va_list args)
-{
-	blogva(LOG_INFO, format, args);
-	UNUSED_PARAMETER(level);
-}
-
 static inline size_t num_buffered_packets(struct ftl_stream *stream);
 
 static inline void free_packets(struct ftl_stream *stream)
@@ -1012,13 +1004,6 @@
 	return NULL;
 }
 
-static void log_libftl_messages(ftl_log_severity_t log_level,
-				const char *message)
-{
-	UNUSED_PARAMETER(log_level);
-	blog(LOG_WARNING, "libftl %s", message);
-}
-
 static int init_connect(struct ftl_stream *stream)
 {
 	obs_service_t *service;
@@ -1074,7 +1059,7 @@
 	stream->params.audio_codec = FTL_AUDIO_OPUS;
 	stream->params.ingest_hostname = stream->path.array;
 	stream->params.vendor_name = "OBS Studio";
-	stream->params.vendor_version = OBS_VERSION;
+	stream->params.vendor_version = obs_get_version_string();
 	stream->params.peak_kbps = stream->peak_kbps < 0 ? 0
 							 : stream->peak_kbps;

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/librtmp/rtmp.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/librtmp/rtmp.c Changed

@@ -32,6 +32,7 @@
 #include "rtmp_sys.h"
 #include "log.h"
 
+#include "happy-eyeballs.h"
 #include <util/platform.h>
 
 #if !defined(MSG_NOSIGNAL)
@@ -314,42 +315,30 @@
 CertFreeCertificateContext(pCertContext);
 CertCloseStore(hCertStore, 0);
 #elif defined(__APPLE__)
- SecKeychainRef keychain_ref;
- CFMutableDictionaryRef search_settings_ref;
- CFArrayRef result_ref;
-
- if (SecKeychainOpen("/System/Library/Keychains/SystemRootCertificates.keychain",
- &keychain_ref)
- != errSecSuccess) {
- goto error;
- }
-
- search_settings_ref = CFDictionaryCreateMutable(NULL, 0, NULL, NULL);
- CFDictionarySetValue(search_settings_ref, kSecClass, kSecClassCertificate);
- CFDictionarySetValue(search_settings_ref, kSecMatchLimit, kSecMatchLimitAll);
- CFDictionarySetValue(search_settings_ref, kSecReturnRef, kCFBooleanTrue);
- CFDictionarySetValue(search_settings_ref, kSecMatchSearchList,
- CFArrayCreate(NULL, (const void **)&keychain_ref, 1, NULL));
-
- if (SecItemCopyMatching(search_settings_ref, (CFTypeRef *)&result_ref)
- != errSecSuccess) {
- goto error;
- }
-
- for (CFIndex i = 0; i < CFArrayGetCount(result_ref); i++) {
- SecCertificateRef item_ref = (SecCertificateRef)
- CFArrayGetValueAtIndex(result_ref, i);
- CFDataRef data_ref;
+ CFArrayRef anchors;
+ OSStatus code = SecTrustCopyAnchorCertificates(&anchors);
 
- if ((data_ref = SecCertificateCopyData(item_ref))) {
- mbedtls_x509_crt_parse_der(chain,
- (unsigned char *)CFDataGetBytePtr(data_ref),
- CFDataGetLength(data_ref));
- CFRelease(data_ref);
- }
+ if (code != noErr) {
+ goto error;
+ }
+
+ for (CFIndex i = 0; i < CFArrayGetCount(anchors); i++) {
+ SecCertificateRef cert = (SecCertificateRef)CFArrayGetValueAtIndex(anchors, i);
+
+ CFDataRef der_data = SecCertificateCopyData(cert);
+
+ const UInt8 *data = CFDataGetBytePtr(der_data);
+ size_t length = CFDataGetLength(der_data);
+
+ if (data && length > 0) {
+ mbedtls_x509_crt_parse_der(chain, data, length);
+ }
+
+ CFRelease(der_data);
 }
 
- CFRelease(keychain_ref);
+ CFRelease(anchors);
+
 #elif defined(__linux__)
 if (mbedtls_x509_crt_parse_path(chain, "/etc/ssl/certs/") < 0) {
 RTMP_Log(RTMP_LOGERROR, "mbedtls_x509_crt_parse_path: Couldn't parse "
@@ -749,6 +738,29 @@
 return idx;
 }
 
+/* Returns true if the string needs to be freed */
+static char* get_hostname(AVal *host, bool *should_free)
+{
+ if (should_free == NULL)
+ return NULL;
+
+ if (host->av_valhost->av_len || host->av_val0 == '')
+ {
+ int v6 = host->av_val0 == '';
+ char* hostname = malloc(host->av_len+1 - v6 * 2);
+ if (hostname != NULL)
+ {
+ memcpy(hostname, host->av_val + v6, host->av_len - v6 * 2);
+ hostnamehost->av_len - v6 * 2 = '\0';
+ *should_free = TRUE;
+ }
+ return hostname;
+ }
+
+ *should_free = FALSE;
+ return host->av_val;
+}
+
 static int
 add_addr_info(struct sockaddr_storage *service, socklen_t *addrlen, AVal *host, int port, socklen_t addrlen_hint, int *socket_error)
 {
@@ -850,68 +862,28 @@
 #define E_TIMEDOUT WSAETIMEDOUT
 #define E_CONNREFUSED WSAECONNREFUSED
 #define E_ACCES WSAEACCES
+#define E_INVAL WSAEINVAL
+#define E_HOSTUNREACH WSAEHOSTUNREACH
 #else
 #define E_TIMEDOUT ETIMEDOUT
 #define E_CONNREFUSED ECONNREFUSED
 #define E_ACCES EACCES
+#define E_INVAL EINVAL
+#define E_HOSTUNREACH EHOSTUNREACH
 #endif
 
 int
-RTMP_Connect0(RTMP *r, struct sockaddr * service, socklen_t addrlen)
+RTMP_Connect0(RTMP *r, SOCKET socket_fd)
 {
 int on = 1;
 r->m_sb.sb_timedout = FALSE;
 r->m_pausing = 0;
 r->m_fDuration = 0.0;
 
- //best to be explicit, we need overlapped socket
-#ifdef _WIN32
- r->m_sb.sb_socket = WSASocket(service->sa_family, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED);
-#else
- r->m_sb.sb_socket = socket(service->sa_family, SOCK_STREAM, IPPROTO_TCP);
-#endif
+ r->m_sb.sb_socket = socket_fd;
 
 if (r->m_sb.sb_socket != INVALID_SOCKET)
 {
-#ifndef _WIN32
-#ifdef SO_NOSIGPIPE
- setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_NOSIGPIPE, &(int){ 1 }, sizeof(int));
-#endif
-#endif
- if(r->m_bindIP.addrLen)
- {
- if (bind(r->m_sb.sb_socket, (const struct sockaddr *)&r->m_bindIP.addr, r->m_bindIP.addrLen) < 0)
- {
- int err = GetSockError();
- RTMP_Log(RTMP_LOGERROR, "%s, failed to bind socket: %s (%d)",
- __FUNCTION__, socketerror(err), err);
- r->last_error_code = err;
- RTMP_Close(r);
- return FALSE;
- }
- }
-
- uint64_t connect_start = os_gettime_ns();
-
- if (connect(r->m_sb.sb_socket, service, addrlen) < 0)
- {
- int err = GetSockError();
- if (err == E_CONNREFUSED)
- RTMP_Log(RTMP_LOGERROR, "%s is offline. Try a different server (ECONNREFUSED).", r->Link.hostname.av_val);
- else if (err == E_ACCES)
- RTMP_Log(RTMP_LOGERROR, "The connection is being blocked by a firewall or other security software (EACCES).");
- else if (err == E_TIMEDOUT)
- RTMP_Log(RTMP_LOGERROR, "The connection timed out. Try a different server, or check that the connection is not being blocked by a firewall or other security software (ETIMEDOUT).");
- else
- RTMP_Log(RTMP_LOGERROR, "%s, failed to connect socket: %s (%d)",
- __FUNCTION__, socketerror(err), err);
- r->last_error_code = err;
- RTMP_Close(r);
- return FALSE;
- }
-
- r->connect_time_ms = (int)((os_gettime_ns() - connect_start) / 1000000);
-
 if (r->Link.socksport)
 {
 RTMP_Log(RTMP_LOGDEBUG, "%s ... SOCKS negotiation", __FUNCTION__);
@@ -1064,58 +1036,99 @@
 int
 RTMP_Connect(RTMP *r, RTMPPacket *cp)
 {
-#ifdef _WIN32
- HOSTENT *h;
-#endif
- struct sockaddr_storage service;
- socklen_t addrlen = 0;
- socklen_t addrlen_hint = 0;
- int socket_error = 0;
-
- if (!r->Link.hostname.av_len)
- return FALSE;
-
-#ifdef _WIN32
- //COMODO security software sandbox blocks all DNS by returning "host not found"
- h = gethostbyname("localhost");
- if (!h && GetLastError() == WSAHOST_NOT_FOUND)
- {
- r->last_error_code = WSAHOST_NOT_FOUND;
- RTMP_Log(RTMP_LOGERROR, "RTMP_Connect: Connection test failed. This error is likely caused by Comodo Internet Security running OBS in sandbox mode. Please add OBS to the Comodo automatic sandbox exclusion list, restart OBS and try again (11001).");
- return FALSE;
+ struct happy_eyeballs_ctx* happy_ctx = NULL;
+ bool free_hostname = FALSE;
+ char *hostname = NULL;
+ int port = 0;
+ int result = FALSE;
+
+ int he_result = happy_eyeballs_create(&happy_ctx);
+ if (he_result != 0)
+ {
+ /* did not successfully create the happy eyeballs context */
+ r->last_error_code = -he_result;
+ goto fail;
 }
-#endif
-
- memset(&service, 0, sizeof(service));
-
- if (r->m_bindIP.addrLen)
- addrlen_hint = r->m_bindIP.addrLen;
 
 if (r->Link.socksport)
 {
 /* Connect via SOCKS */
- if (!add_addr_info(&service, &addrlen, &r->Link.sockshost, r->Link.socksport, addrlen_hint, &socket_error))
- {
- r->last_error_code = socket_error;
- return FALSE;
- }
+ hostname = get_hostname(&r->Link.sockshost, &free_hostname);
+ port = r->Link.socksport;
 }
 else
 {
 /* Connect directly */
- if (!add_addr_info(&service, &addrlen, &r->Link.hostname, r->Link.port, addrlen_hint, &socket_error))
+ hostname = get_hostname(&r->Link.hostname, &free_hostname);
+ port = r->Link.port;
+ }
+
+ /* Set local bind address (if present) */
+ happy_eyeballs_set_bind_addr(happy_ctx, r->m_bindIP.addrLen, &r->m_bindIP.addr);
+
+ /* Attempt connection */
+ he_result = happy_eyeballs_connect(happy_ctx, hostname, port);
+ if (he_result == EAGAIN)
+ {
+ /* Connect returned with the connection process ongoing, let's wait for a few more seconds... */
+ he_result = happy_eyeballs_timedwait_default(happy_ctx);
+ }
+
+ if (he_result == -E_INVAL)
+ {
+ /* Parameter error */
+ r->last_error_code = E_INVAL;
+ RTMP_Log(RTMP_LOGERROR, "Invalid connection parameters. Try to make sure you're using a valid server address and port.");
+ goto fail;
+
+ }
+ else if (he_result != 0)
+ {
+ /* Error while connecting */
+ int err = happy_eyeballs_get_error_code(happy_ctx);
+ if (err == E_CONNREFUSED)
+ RTMP_Log(RTMP_LOGERROR, "%s is offline. Try a different server (ECONNREFUSED).", r->Link.hostname.av_val);
+ else if (err == E_ACCES)
+ RTMP_Log(RTMP_LOGERROR, "The connection is being blocked by a firewall or other security software (EACCES).");
+ else if (err == E_TIMEDOUT)
+ RTMP_Log(RTMP_LOGERROR, "The connection timed out. Try a different server, or check that the connection is not being blocked by a firewall or other security software (ETIMEDOUT).");
+ else if (r->m_bindIP.addrLen > 0)
 {
- r->last_error_code = socket_error;
- return FALSE;
+ /* There are several different errors that platform network implementations can
+ * emit when a user attempts to connect to e.g. IPv6 on a device where it is
+ * disabled (EINVAL, EHOSTUNREACH) or vice-versa. Squash this down to EHOSTUNREACH
+ * in order to emit a more user-friendly error. */
+ RTMP_Log(RTMP_LOGERROR, "Invalid socket settings: %s (%d). Are you trying to use IPv6 on an IPv4-only interface?", socketerror(err), err);
+ err = E_HOSTUNREACH;
 }
+ else
+ RTMP_Log(RTMP_LOGERROR, "%s, failed to connect socket: %s (%d)",
+ __FUNCTION__, socketerror(err), err);
+ r->last_error_code = err;
+ goto fail;
 }
 
- if (!RTMP_Connect0(r, (struct sockaddr *)&service, addrlen))
- return FALSE;
+ happy_eyeballs_get_remote_addr(happy_ctx, &r->m_sb.sb_addr);
+ r->connect_time_ms = (int)(happy_eyeballs_get_connection_time_ns(happy_ctx) / 1000000);
 
- r->m_bSendCounter = TRUE;
+ /* Successful connection */
+ SOCKET socket_fd = happy_eyeballs_get_socket_fd(happy_ctx);
+ result = RTMP_Connect0(r, socket_fd);
+ if (result)
+ {
+ r->m_bSendCounter = TRUE;
+ result = RTMP_Connect1(r, cp);
+ }
+
+fail:
+ if (!result)
+ RTMP_Close(r);
+ if (happy_ctx)
+ happy_eyeballs_destroy(happy_ctx);
+ if (free_hostname)
+ free(hostname);
 
- return RTMP_Connect1(r, cp);
+ return result;
 }
 
 static int

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/librtmp/rtmp.h -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/librtmp/rtmp.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/net-if.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/net-if.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/net-if.h -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/net-if.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/null-output.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/null-output.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/rtmp-av1.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/rtmp-av1.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/rtmp-av1.h -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/rtmp-av1.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/rtmp-helpers.h -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/rtmp-helpers.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/rtmp-hevc.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/rtmp-hevc.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/rtmp-hevc.h -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/rtmp-hevc.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/rtmp-stream.c -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/rtmp-stream.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -227,13 +227,6 @@
 	}
 }
 
-static inline void set_rtmp_str(AVal *val, const char *str)
-{
-	bool valid = (str && *str);
-	val->av_val = valid ? (char *)str : NULL;
-	val->av_len = valid ? (int)strlen(str) : 0;
-}
-
 static inline void set_rtmp_dstr(AVal *val, struct dstr *str)
 {
 	bool valid = !dstr_is_empty(str);
@@ -528,6 +521,12 @@
 	case WSAEADDRNOTAVAIL:
 		msg = obs_module_text("AddressNotAvailable");
 		break;
+	case WSAEINVAL:
+		msg = obs_module_text("InvalidParameter");
+		break;
+	case WSAEHOSTUNREACH:
+		msg = obs_module_text("NoRoute");
+		break;
 	}
 #else
 	switch (stream->rtmp.last_error_code) {
@@ -552,6 +551,12 @@
 	case EADDRNOTAVAIL:
 		msg = obs_module_text("AddressNotAvailable");
 		break;
+	case EINVAL:
+		msg = obs_module_text("InvalidParameter");
+		break;
+	case EHOSTUNREACH:
+		msg = obs_module_text("NoRoute");
+		break;
 	}
 #endif
 
@@ -795,8 +800,9 @@
 	uint8_t *header;
 	size_t size;
 
-	struct encoder_packet packet = {
-		.type = OBS_ENCODER_VIDEO, .timebase_den = 1, .keyframe = true};
+	struct encoder_packet packet = {.type = OBS_ENCODER_VIDEO,
+					.timebase_den = 1,
+					.keyframe = true};
 
 	if (!obs_encoder_get_extra_data(vencoder, &header, &size))
 		return false;
@@ -1031,13 +1037,12 @@
 		stream->write_buf_size = ideal_buffer_size;
 		stream->write_buf = bmalloc(ideal_buffer_size);
 
-#ifdef _WIN32
-		ret = pthread_create(&stream->socket_thread, NULL,
-				 socket_thread_windows, stream);
-#else
+#ifndef _WIN32
 		warn("New socket loop not supported on this platform");
 		return OBS_OUTPUT_ERROR;
-#endif
+#else
+		ret = pthread_create(&stream->socket_thread, NULL,
+				 socket_thread_windows, stream);
 
 		if (ret != 0) {
 			RTMP_Close(&stream->rtmp);
@@ -1049,6 +1054,7 @@
 		stream->rtmp.m_bCustomSend = true;
 		stream->rtmp.m_customSendFunc = socket_queue_data;
 		stream->rtmp.m_customSendParam = stream;
+#endif
 	}
 
 	os_atomic_set_bool(&stream->active, true);
@@ -1194,6 +1200,10 @@
 		}
 	}
 
+	// Only use the IPv4 / IPv6 hint if a binding address isn't specified.
+	if (stream->rtmp.m_bindIP.addrLen == 0)
+		stream->rtmp.m_bindIP.addrLen = stream->addrlen_hint;
+
 	RTMP_AddStream(&stream->rtmp, stream->key.array);
 
 	stream->rtmp.m_outChunkSize = 4096;
@@ -1212,7 +1222,11 @@
 	if (!RTMP_ConnectStream(&stream->rtmp, 0))
 		return OBS_OUTPUT_INVALID_STREAM;
 
-	info("Connection to %s successful", stream->path.array);
+	char ip_addressINET6_ADDRSTRLEN = {0};
+	netif_addr_to_str(&stream->rtmp.m_sb.sb_addr, ip_address,
+			 INET6_ADDRSTRLEN);
+	info("Connection to %s (%s) successful", stream->path.array,
+	 ip_address);
 
 	return init_send(stream);
 }
@@ -1222,6 +1236,7 @@
 	obs_service_t *service;
 	obs_data_t *settings;
 	const char *bind_ip;
+	const char *ip_family;
 	int64_t drop_p;
 	int64_t drop_b;
 	uint32_t caps;
@@ -1308,6 +1323,18 @@
 	bind_ip = obs_data_get_string(settings, OPT_BIND_IP);
 	dstr_copy(&stream->bind_ip, bind_ip);
 
+	// Check that we have an IP Family set and that the setting length
+	// is 4 characters long so we don't capture ie. IPv4+IPv6
+	ip_family = obs_data_get_string(settings, OPT_IP_FAMILY);
+	if (ip_family != NULL && strlen(ip_family) == 4) {
+		socklen_t len = 0;
+		if (strncmp(ip_family, "IPv6", 4) == 0)
+			len = sizeof(struct sockaddr_in6);
+		else if (strncmp(ip_family, "IPv4", 4) == 0)
+			len = sizeof(struct sockaddr_in);
+		stream->addrlen_hint = len;
+	}
+
 #ifdef _WIN32
 	stream->new_socket_loop =
 		obs_data_get_bool(settings, OPT_NEWSOCKETLOOP_ENABLED);
@@ -1721,6 +1748,18 @@
 				 200, 10000, 100);
 	obs_property_int_set_suffix(p, " ms");
 
+	p = obs_properties_add_list(props, OPT_IP_FAMILY,
+				 obs_module_text("IPFamily"),
+				 OBS_COMBO_TYPE_LIST,
+				 OBS_COMBO_FORMAT_STRING);
+
+	obs_property_list_add_string(p, obs_module_text("IPFamily.Both"),
+				 "IPv4+IPv6");
+	obs_property_list_add_string(p, obs_module_text("IPFamily.V4Only"),
+				 "IPv4");
+	obs_property_list_add_string(p, obs_module_text("IPFamily.V6Only"),
+				 "IPv6");
+
 	p = obs_properties_add_list(props, OPT_BIND_IP,
 				 obs_module_text("RTMPStream.BindIP"),
 				 OBS_COMBO_TYPE_LIST,

obs-studio-29.1.3.tar.xz/plugins/obs-outputs/rtmp-stream.h -> obs-studio-30.0.2.tar.xz/plugins/obs-outputs/rtmp-stream.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/CMakeLists.txt Changed

@@ -1,125 +1,54 @@
-option(ENABLE_QSV11 "Build Intel QSV11 Hardware Encoder." TRUE)
+cmake_minimum_required(VERSION 3.22...3.25)
+
+legacy_check()
 
+option(ENABLE_QSV11 "Build Intel QSV11 Hardware Encoder." TRUE)
 if(NOT ENABLE_QSV11)
-  obs_status(DISABLED "obs-qsv11")
+  target_disable_feature(obs-qsv11 "Intel QSV11 Hardware Encoder")
+  target_disable(obs-qsv11)
   return()
 endif()
 
-project(obs-qsv11)
-
 add_library(obs-qsv11 MODULE)
 add_library(OBS::qsv11 ALIAS obs-qsv11)
 
-add_library(libmfx INTERFACE)
-add_library(OBS::libmfx ALIAS libmfx)
-
-target_sources(
-  libmfx
-  INTERFACE libmfx/src/main.cpp
-            libmfx/src/mfx_critical_section.cpp
-            libmfx/src/mfx_dispatcher.cpp
-            libmfx/src/mfx_dispatcher_log.cpp
-            libmfx/src/mfx_driver_store_loader.cpp
-            libmfx/src/mfx_dxva2_device.cpp
-            libmfx/src/mfx_function_table.cpp
-            libmfx/src/mfx_library_iterator.cpp
-            libmfx/src/mfx_load_dll.cpp
-            libmfx/src/mfx_load_plugin.cpp
-            libmfx/src/mfx_plugin_hive.cpp
-            libmfx/src/mfx_win_reg_key.cpp
-            libmfx/include/msdk/include/mfxadapter.h
-            libmfx/include/msdk/include/mfxastructures.h
-            libmfx/include/msdk/include/mfxaudio.h
-            libmfx/include/msdk/include/mfxaudio++.h
-            libmfx/include/msdk/include/mfxcommon.h
-            libmfx/include/msdk/include/mfxdefs.h
-            libmfx/include/msdk/include/mfxjpeg.h
-            libmfx/include/msdk/include/mfxmvc.h
-            libmfx/include/msdk/include/mfxplugin.h
-            libmfx/include/msdk/include/mfxplugin++.h
-            libmfx/include/msdk/include/mfxsession.h
-            libmfx/include/msdk/include/mfxstructures.h
-            libmfx/include/msdk/include/mfxvideo.h
-            libmfx/include/msdk/include/mfxvideo++.h
-            libmfx/include/msdk/include/mfxvstructures.h
-            libmfx/include/mfx_critical_section.h
-            libmfx/include/mfx_dispatcher.h
-            libmfx/include/mfx_dispatcher_defs.h
-            libmfx/include/mfx_dispatcher_log.h
-            libmfx/include/mfx_driver_store_loader.h
-            libmfx/include/mfx_dxva2_device.h
-            libmfx/include/mfx_exposed_functions_list.h
-            libmfx/include/mfx_library_iterator.h
-            libmfx/include/mfx_load_dll.h
-            libmfx/include/mfx_load_plugin.h
-            libmfx/include/mfx_plugin_hive.h
-            libmfx/include/mfx_vector.h
-            libmfx/include/mfx_win_reg_key.h
-            libmfx/include/mfxaudio_exposed_functions_list.h)
-
-target_include_directories(libmfx INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libmfx/include/msdk/include
-                                            ${CMAKE_CURRENT_SOURCE_DIR}/libmfx/include)
+find_package(VPL 2.6 REQUIRED)
 
 target_sources(
   obs-qsv11
-  PRIVATE obs-qsv11.c
-          obs-qsv11-plugin-main.c
-          common_directx9.cpp
-          common_directx9.h
-          common_directx11.cpp
-          common_directx11.h
+  PRIVATE # cmake-format: sortable
           common_utils.cpp
           common_utils.h
-          common_utils_windows.cpp
-          device_directx9.cpp
-          device_directx9.h
+          obs-qsv11-plugin-main.c
+          obs-qsv11.c
           QSV_Encoder.cpp
           QSV_Encoder.h
           QSV_Encoder_Internal.cpp
-          QSV_Encoder_Internal.h
-          bits/linux_defs.h
-          bits/windows_defs.h)
+          QSV_Encoder_Internal.h)
 
-target_link_libraries(
-  obs-qsv11
-  PRIVATE OBS::libobs
-          OBS::libmfx
-          d3d9
-          d3d11
-          dxva2
-          dxgi
-          dxguid)
+target_link_libraries(obs-qsv11 PRIVATE OBS::libobs VPL::VPL)
 
-target_compile_definitions(obs-qsv11 PRIVATE DX11_D3D)
+# cmake-format: off
+set_target_properties_obs(obs-qsv11 PROPERTIES FOLDER plugins/obs-qsv11 PREFIX "")
+# cmake-format: on
 
 if(OS_WINDOWS)
   add_subdirectory(obs-qsv-test)
 
-  set(MODULE_DESCRIPTION "OBS QSV encoder")
-  configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in obs-qsv11.rc)
-
+  configure_file(cmake/windows/obs-module.rc.in obs-qsv11.rc)
   target_sources(obs-qsv11 PRIVATE obs-qsv11.rc)
 
-  target_compile_definitions(obs-qsv11 PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
-endif()
+  target_compile_definitions(obs-qsv11 PRIVATE DX11_D3D)
 
-set_target_properties(obs-qsv11 PROPERTIES FOLDER "plugins/obs-qsv11")
+  target_sources(obs-qsv11 PRIVATE # cmake-format: sortable
+                                   common_directx11.cpp common_directx11.h common_utils_windows.cpp)
 
-file(GLOB _OBS_QSV11_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-file(GLOB _OBS_QSV11_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
+  target_link_libraries(obs-qsv11 PRIVATE d3d11 dxgi dxguid)
+  target_link_options(obs-qsv11 PRIVATE /IGNORE:4099)
+elseif(OS_LINUX)
+  find_package(Libva REQUIRED)
 
-source_group("obs-qsv11\\Source Files" FILES ${_OBS_QSV11_SOURCE_FILES})
-source_group("obs-qsv11\\Header Files" FILES ${_OBS_QSV11_HEADER_FILES})
+  target_sources(obs-qsv11 PRIVATE common_utils_linux.cpp)
 
-get_target_property(_LIBMFX_SOURCES OBS::libmfx INTERFACE_SOURCES)
-
-foreach(_LIBMFX_SOURCE ${_LIBMFX_SOURCES})
-  get_filename_component(_EXT ${_LIBMFX_SOURCE} EXT)
-  if(${_EXT} STREQUAL "hpp" OR ${_EXT} STREQUAL "h")
-    source_group("libmfx\\Header Files" FILES ${_LIBMFX_SOURCE})
-  elseif(${_EXT} STREQUAL "cpp" OR ${_EXT} STREQUAL "c")
-    source_group("libmfx\\Source Files" FILES ${_LIBMFX_SOURCE})
-  endif()
-endforeach()
-
-setup_plugin_target(obs-qsv11)
+  target_link_libraries(obs-qsv11 PRIVATE Libva::va Libva::drm)
+endif()

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/QSV_Encoder.cpp Changed

@@ -59,13 +59,10 @@
 
 #include "QSV_Encoder.h"
 #include "QSV_Encoder_Internal.h"
+#include "common_utils.h"
 #include <obs-module.h>
 #include <string>
 #include <atomic>
-#include <intrin.h>
-#include <d3d11.h>
-#include <dxgi1_2.h>
-#include <wrl/client.h>
 
 #define do_log(level, format, ...) \
 	blog(level, "qsv encoder: '%s' " format, "msdk_impl", ##__VA_ARGS__)
@@ -82,9 +79,6 @@
 
 qsv_t *qsv_encoder_open(qsv_param_t *pParams, enum qsv_codec codec)
 {
-	mfxIMPL impl_list4 = {MFX_IMPL_HARDWARE, MFX_IMPL_HARDWARE2,
-				MFX_IMPL_HARDWARE3, MFX_IMPL_HARDWARE4};
-
 	obs_video_info ovi;
 	obs_get_video_info(&ovi);
 	size_t adapter_idx = ovi.adapter;
@@ -107,10 +101,8 @@
 	}
 
 	bool isDGPU = adaptersadapter_idx.is_dgpu;
-	impl = impl_listadapter_idx;
 
-	QSV_Encoder_Internal *pEncoder =
-		new QSV_Encoder_Internal(impl, ver, isDGPU);
+	QSV_Encoder_Internal *pEncoder = new QSV_Encoder_Internal(ver, isDGPU);
 	mfxStatus sts = pEncoder->Open(pParams, codec);
 	if (sts != MFX_ERR_NONE) {
 
@@ -295,7 +287,7 @@
 	using std::string;
 
 	int cpuInfo4;
-	__cpuid(cpuInfo, 0);
+	util_cpuid(cpuInfo, 0);
 
 	string vendor;
 	vendor += string((char *)&cpuInfo1, 4);
@@ -305,9 +297,10 @@
 	if (vendor != "GenuineIntel")
 		return QSV_CPU_PLATFORM_UNKNOWN;
 
-	__cpuid(cpuInfo, 1);
-	BYTE model = ((cpuInfo0 >> 4) & 0xF) + ((cpuInfo0 >> 12) & 0xF0);
-	BYTE family = ((cpuInfo0 >> 8) & 0xF) + ((cpuInfo0 >> 20) & 0xFF);
+	util_cpuid(cpuInfo, 1);
+	uint8_t model = ((cpuInfo0 >> 4) & 0xF) + ((cpuInfo0 >> 12) & 0xF0);
+	uint8_t family =
+		((cpuInfo0 >> 8) & 0xF) + ((cpuInfo0 >> 20) & 0xFF);
 
 	// See Intel 64 and IA-32 Architectures Software Developer's Manual,
 	// Vol 3C Table 35-1

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/QSV_Encoder.h -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/QSV_Encoder.h Changed

@@ -56,10 +56,12 @@
 
 #pragma once
 
-#include <Windows.h>
-#include "mfxstructures.h"
-#include "mfxadapter.h"
+#include <vpl/mfxstructures.h>
+#include <vpl/mfxadapter.h>
 #include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include "common_utils.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -70,42 +72,26 @@
 	bool haswell_or_greater;
 };
 
-static const struct qsv_rate_control_info qsv_ratecontrols = {
-	{"CBR", false}, {"VBR", false}, {"VCM", true}, {"CQP", false},
-	{"AVBR", false}, {"ICQ", true}, {"LA_ICQ", true}, {"LA_CBR", true},
-	{"LA_VBR", true}, {0, false}};
-
-static const struct qsv_rate_control_info qsv_av1_ratecontrols =
-	{{"CBR", false}, {"VBR", false}, {"CQP", false}, {0, false}};
+static const struct qsv_rate_control_info qsv_ratecontrols = {{"CBR", false},
+								{"VBR", false},
+								{"CQP", false},
+								{"ICQ", true},
+								{0, false}};
 
 static const char *const qsv_profile_names = {"high", "main", "baseline", 0};
 static const char *const qsv_profile_names_av1 = {"main", 0};
 static const char *const qsv_profile_names_hevc = {"main", "main10", 0};
-static const char *const qsv_usage_names = {"quality", "balanced", "speed",
-					 "veryslow", "slower", "slow",
-					 "medium", "fast", "faster",
-					 "veryfast", 0};
+static const char *const qsv_usage_translation_keys = {
+	"TargetUsage.TU1", "TargetUsage.TU2",
+	"TargetUsage.TU3", "TargetUsage.TU4",
+	"TargetUsage.TU5", "TargetUsage.TU6",
+	"TargetUsage.TU7", 0};
+static const char *const qsv_usage_names = {"TU1", "TU2", "TU3", "TU4",
+					 "TU5", "TU6", "TU7", 0};
 static const char *const qsv_latency_names = {"ultra-low", "low", "normal",
 						0};
 typedef struct qsv_t qsv_t;
 
-struct adapter_info {
-	bool is_intel;
-	bool is_dgpu;
-	bool supports_av1;
-	bool supports_hevc;
-};
-
-enum qsv_codec {
-	QSV_CODEC_AVC,
-	QSV_CODEC_AV1,
-	QSV_CODEC_HEVC,
-};
-
-#define MAX_ADAPTERS 10
-extern struct adapter_info adaptersMAX_ADAPTERS;
-extern size_t adapter_count;
-
 typedef struct {
 	mfxU16 nTargetUsage; /* 1 through 7, 1 being best quality and 7
 				being the best speed */
@@ -142,9 +128,9 @@
 	mfxU32 MinDisplayMasteringLuminance;
 	mfxU16 MaxContentLightLevel;
 	mfxU16 MaxPicAverageLightLevel;
-	bool bMBBRC;
 	bool bCQM;
 	bool video_fmt_10bit;
+	bool bRepeatHeaders;
 } qsv_param_t;
 
 enum qsv_cpu_platform {

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.cpp Changed

@@ -56,9 +56,9 @@
 
 #include "QSV_Encoder_Internal.h"
 #include "QSV_Encoder.h"
-#include "mfxastructures.h"
-#include "mfxvideo++.h"
-#include <VersionHelpers.h>
+#include <vpl/mfxstructures.h>
+#include <vpl/mfxvideo++.h>
+#include <vpl/mfxdispatcher.h>
 #include <obs-module.h>
 
 #define do_log(level, format, ...) \
@@ -71,8 +71,7 @@
 mfxHDL QSV_Encoder_Internal::g_DX_Handle = NULL;
 mfxU16 QSV_Encoder_Internal::g_numEncodersOpen = 0;
 
-QSV_Encoder_Internal::QSV_Encoder_Internal(mfxIMPL &impl, mfxVersion &version,
-					 bool isDGPU)
+QSV_Encoder_Internal::QSV_Encoder_Internal(mfxVersion &version, bool isDGPU)
 	: m_pmfxSurfaces(NULL),
 	 m_pmfxENC(NULL),
 	 m_nSPSBufferSize(1024),
@@ -82,65 +81,52 @@
 	 m_nTaskIdx(0),
 	 m_nFirstSyncTask(0),
 	 m_outBitstream(),
-	 m_isDGPU(isDGPU)
+	 m_isDGPU(isDGPU),
+	 m_sessionData(NULL)
 {
-	mfxIMPL tempImpl;
+	mfxVariant tempImpl;
 	mfxStatus sts;
 
-	m_bIsWindows8OrGreater = IsWindows8OrGreater();
-	m_bUseD3D11 = false;
-	m_bD3D9HACK = true;
-
-	if (m_bIsWindows8OrGreater) {
-		tempImpl = impl | MFX_IMPL_VIA_D3D11;
-		sts = m_session.Init(tempImpl, &version);
-		if (sts == MFX_ERR_NONE) {
-			m_session.QueryVersion(&version);
-			m_session.Close();
-
-			// Use D3D11 surface
-			// m_bUseD3D11 = ((version.Major > 1) ||
-			//	(version.Major == 1 && version.Minor >= 8));
-			m_bUseD3D11 = true;
-			if (m_bUseD3D11)
-				blog(LOG_INFO, "\timpl: D3D11\n"
-					 "\tsurf: D3D11");
-			else
-				blog(LOG_INFO, "\timpl: D3D11\n"
-					 "\tsurf: SysMem");
-
-			m_impl = tempImpl;
-			m_ver = version;
-			return;
-		}
-	} else if (m_bD3D9HACK) {
-		tempImpl = impl | MFX_IMPL_VIA_D3D9;
-		sts = m_session.Init(tempImpl, &version);
-		if (sts == MFX_ERR_NONE) {
-			m_session.QueryVersion(&version);
-			m_session.Close();
-
-			blog(LOG_INFO, "\timpl: D3D09\n"
-				 "\tsurf: Hack");
-
-			m_impl = tempImpl;
-			m_ver = version;
-			return;
-		}
-	}
-
-	// Either windows 7 or D3D11 failed at this point.
-	tempImpl = impl | MFX_IMPL_VIA_D3D9;
-	sts = m_session.Init(tempImpl, &version);
+	mfxLoader loader = MFXLoad();
+	mfxConfig cfg = MFXCreateConfig(loader);
+
+	tempImpl.Type = MFX_VARIANT_TYPE_U32;
+	tempImpl.Data.U32 = MFX_IMPL_TYPE_HARDWARE;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.Impl", tempImpl);
+
+	tempImpl.Type = MFX_VARIANT_TYPE_U32;
+	tempImpl.Data.U32 = INTEL_VENDOR_ID;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.VendorID", tempImpl);
+#if defined(_WIN32)
+	m_bUseD3D11 = true;
+	m_bUseTexAlloc = true;
+
+	tempImpl.Type = MFX_VARIANT_TYPE_U32;
+	tempImpl.Data.U32 = MFX_ACCEL_MODE_VIA_D3D11;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.AccelerationMode",
+		tempImpl);
+#else
+	m_bUseTexAlloc = false;
+	tempImpl.Type = MFX_VARIANT_TYPE_U32;
+	tempImpl.Data.U32 = MFX_ACCEL_MODE_VIA_VAAPI;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.AccelerationMode",
+		tempImpl);
+#endif
+	sts = MFXCreateSession(loader, 0, &m_session);
 	if (sts == MFX_ERR_NONE) {
-		m_session.QueryVersion(&version);
-		m_session.Close();
+		MFXQueryVersion(m_session, &version);
+		MFXClose(m_session);
+		MFXUnload(loader);
 
-		blog(LOG_INFO, "\timpl: D3D09\n"
-			 "\tsurf: SysMem");
+		blog(LOG_INFO, "\tsurf: %s",
+		 m_bUseTexAlloc ? "Texture" : "SysMem");
 
-		m_impl = tempImpl;
 		m_ver = version;
+		return;
 	}
 }
 
@@ -154,24 +140,24 @@
 {
 	mfxStatus sts = MFX_ERR_NONE;
 
+#if defined(_WIN32)
 	if (m_bUseD3D11)
 		// Use D3D11 surface
-		sts = Initialize(m_impl, m_ver, &m_session, &m_mfxAllocator,
-				 &g_DX_Handle, false, false);
-	else if (m_bD3D9HACK)
-		// Use hack
-		sts = Initialize(m_impl, m_ver, &m_session, &m_mfxAllocator,
-				 &g_DX_Handle, false, true);
+		sts = Initialize(m_ver, &m_session, &m_mfxAllocator,
+				 &g_DX_Handle, false, codec, &m_sessionData);
 	else
-		sts = Initialize(m_impl, m_ver, &m_session, NULL);
+		sts = Initialize(m_ver, &m_session, NULL, NULL, NULL, codec,
+				 &m_sessionData);
+#else
+	sts = Initialize(m_ver, &m_session, NULL, NULL, false, codec,
+			 &m_sessionData);
+#endif
 
 	MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
 	m_pmfxENC = new MFXVideoENCODE(m_session);
 
-	sts = InitParams(pParams, codec);
-	MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
-
+	InitParams(pParams, codec);
 	sts = m_pmfxENC->Query(&m_mfxEncParams, &m_mfxEncParams);
 	MSDK_IGNORE_MFX_STS(sts, MFX_WRN_INCOMPATIBLE_VIDEO_PARAM);
 	MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
@@ -206,7 +192,6 @@
 	else if (codec == QSV_CODEC_HEVC)
 		m_mfxEncParams.mfx.CodecId = MFX_CODEC_HEVC;
 
-	m_mfxEncParams.mfx.GopOptFlag = MFX_GOP_STRICT;
 	if (codec == QSV_CODEC_HEVC) {
 		m_mfxEncParams.mfx.NumSlice = 0;
 		m_mfxEncParams.mfx.IdrInterval = 1;
@@ -231,108 +216,108 @@
 	m_mfxEncParams.mfx.FrameInfo.CropY = 0;
 	m_mfxEncParams.mfx.FrameInfo.CropW = pParams->nWidth;
 	m_mfxEncParams.mfx.FrameInfo.CropH = pParams->nHeight;
-	if (codec == QSV_CODEC_AV1)
-		m_mfxEncParams.mfx.GopRefDist = 1;
-	else
-		m_mfxEncParams.mfx.GopRefDist = pParams->nbFrames + 1;
+	m_mfxEncParams.mfx.GopRefDist = pParams->nbFrames + 1;
 
-	if (codec == QSV_CODEC_HEVC)
-		m_mfxEncParams.mfx.LowPower = MFX_CODINGOPTION_OFF;
+	mfxPlatform platform;
+	MFXVideoCORE_QueryPlatform(m_session, &platform);
 
-	enum qsv_cpu_platform qsv_platform = qsv_get_cpu_platform();
-	if ((m_isDGPU || qsv_platform >= QSV_CPU_PLATFORM_ICL ||
-	 qsv_platform == QSV_CPU_PLATFORM_UNKNOWN) &&
-	 (pParams->nbFrames == 0) &&
-	 (m_ver.Major == 1 && m_ver.Minor >= 31)) {
+	PRAGMA_WARN_PUSH
+	PRAGMA_WARN_DEPRECATION
+	if (codec == QSV_CODEC_AVC || codec == QSV_CODEC_HEVC) {
+		if (platform.CodeName >= MFX_PLATFORM_DG2)
+			m_mfxEncParams.mfx.LowPower = MFX_CODINGOPTION_ON;
+	} else if (codec == QSV_CODEC_AV1) {
 		m_mfxEncParams.mfx.LowPower = MFX_CODINGOPTION_ON;
-		if (pParams->nRateControl == MFX_RATECONTROL_LA_ICQ ||
-		 pParams->nRateControl == MFX_RATECONTROL_LA_HRD ||
-		 pParams->nRateControl == MFX_RATECONTROL_LA)
-			pParams->nRateControl = MFX_RATECONTROL_VBR;
 	}
+	PRAGMA_WARN_POP
 
 	m_mfxEncParams.mfx.RateControlMethod = pParams->nRateControl;
 
 	switch (pParams->nRateControl) {
 	case MFX_RATECONTROL_CBR:
 		m_mfxEncParams.mfx.TargetKbps = pParams->nTargetBitRate;
-		m_mfxEncParams.mfx.BufferSizeInKB = pParams->nTargetBitRate * 2;
+		m_mfxEncParams.mfx.BufferSizeInKB =
+			(pParams->nTargetBitRate / 8) * 2;
 		m_mfxEncParams.mfx.InitialDelayInKB =
-			pParams->nTargetBitRate * 1;
+			(pParams->nTargetBitRate / 8) * 1;
 		break;
 	case MFX_RATECONTROL_VBR:
-	case MFX_RATECONTROL_VCM:
 		m_mfxEncParams.mfx.TargetKbps = pParams->nTargetBitRate;
 		m_mfxEncParams.mfx.MaxKbps = pParams->nMaxBitRate;
-		m_mfxEncParams.mfx.BufferSizeInKB = pParams->nTargetBitRate * 2;
+		m_mfxEncParams.mfx.BufferSizeInKB =
+			(pParams->nTargetBitRate / 8) * 2;
 		m_mfxEncParams.mfx.InitialDelayInKB =
-			pParams->nTargetBitRate * 1;
+			(pParams->nTargetBitRate / 8) * 1;
 		break;
 	case MFX_RATECONTROL_CQP:
 		m_mfxEncParams.mfx.QPI = pParams->nQPI;
 		m_mfxEncParams.mfx.QPB = pParams->nQPB;
 		m_mfxEncParams.mfx.QPP = pParams->nQPP;
 		break;
-	case MFX_RATECONTROL_AVBR:
-		m_mfxEncParams.mfx.TargetKbps = pParams->nTargetBitRate;
-		m_mfxEncParams.mfx.Accuracy = pParams->nAccuracy;
-		m_mfxEncParams.mfx.Convergence = pParams->nConvergence;
-		break;
 	case MFX_RATECONTROL_ICQ:
 		m_mfxEncParams.mfx.ICQQuality = pParams->nICQQuality;
 		break;
-	case MFX_RATECONTROL_LA:
-		m_mfxEncParams.mfx.TargetKbps = pParams->nTargetBitRate;
-		break;
-	case MFX_RATECONTROL_LA_ICQ:
-		m_mfxEncParams.mfx.ICQQuality = pParams->nICQQuality;
-		break;
-	case MFX_RATECONTROL_LA_HRD:
-		m_mfxEncParams.mfx.TargetKbps = pParams->nTargetBitRate;
-		m_mfxEncParams.mfx.MaxKbps = pParams->nTargetBitRate;
-		break;
 	default:
 		break;
 	}
 
 	m_mfxEncParams.AsyncDepth = pParams->nAsyncDepth;
 	m_mfxEncParams.mfx.GopPicSize =
-		(mfxU16)(pParams->nKeyIntSec * pParams->nFpsNum /
-			 (float)pParams->nFpsDen);
-
-	if (m_ver.Major == 1 && m_ver.Minor >= 8) {
-		memset(&m_co2, 0, sizeof(mfxExtCodingOption2));
-		m_co2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2;
-		m_co2.Header.BufferSz = sizeof(m_co2);
-		if (codec != QSV_CODEC_AVC)
-			m_co2.RepeatPPS = MFX_CODINGOPTION_ON;
-		if (pParams->nRateControl == MFX_RATECONTROL_LA_ICQ ||
-		 pParams->nRateControl == MFX_RATECONTROL_LA)
-			m_co2.LookAheadDepth = pParams->nLADEPTH;
-		if (pParams->bMBBRC)
-			m_co2.MBBRC = MFX_CODINGOPTION_ON;
-		if (pParams->nbFrames > 1)
-			m_co2.BRefType = MFX_B_REF_PYRAMID;
-		if (m_mfxEncParams.mfx.LowPower == MFX_CODINGOPTION_ON) {
-			if (codec == QSV_CODEC_AVC)
-				m_co2.RepeatPPS = MFX_CODINGOPTION_OFF;
-			if (pParams->nRateControl == MFX_RATECONTROL_CBR ||
-			 pParams->nRateControl == MFX_RATECONTROL_VBR) {
-				m_co2.LookAheadDepth = pParams->nLADEPTH;
-			}
+		(pParams->nKeyIntSec)
+			? (mfxU16)(pParams->nKeyIntSec * pParams->nFpsNum /
+				 (float)pParams->nFpsDen)
+			: 240;
+
+	memset(&m_co2, 0, sizeof(mfxExtCodingOption2));
+	m_co2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2;
+	m_co2.Header.BufferSz = sizeof(m_co2);
+	if (pParams->bRepeatHeaders)
+		m_co2.RepeatPPS = MFX_CODINGOPTION_ON;
+	else
+		m_co2.RepeatPPS = MFX_CODINGOPTION_OFF;
+
+	memset(&m_co3, 0, sizeof(mfxExtCodingOption3));
+	m_co3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3;
+	m_co3.Header.BufferSz = sizeof(m_co3);
+
+	if (pParams->nbFrames > 1)
+		m_co2.BRefType = MFX_B_REF_PYRAMID;
+
+	PRAGMA_WARN_PUSH
+	PRAGMA_WARN_DEPRECATION
+	// LA VME/ENC case for older platforms
+	if (pParams->nLADEPTH && codec == QSV_CODEC_AVC &&
+	 m_mfxEncParams.mfx.LowPower != MFX_CODINGOPTION_ON &&
+	 platform.CodeName >= MFX_PLATFORM_ICELAKE) {
+		if (pParams->nRateControl == MFX_RATECONTROL_CBR) {
+			pParams->nRateControl = MFX_RATECONTROL_LA_HRD;
+		} else if (pParams->nRateControl == MFX_RATECONTROL_VBR) {
+			pParams->nRateControl = MFX_RATECONTROL_LA;
+		} else if (pParams->nRateControl == MFX_RATECONTROL_ICQ) {
+			pParams->nRateControl = MFX_RATECONTROL_LA_ICQ;
 		}
-		extendedBuffers.push_back((mfxExtBuffer *)&m_co2);
+		m_co2.LookAheadDepth = pParams->nLADEPTH;
 	}
+	PRAGMA_WARN_POP
 
-	if ((m_mfxEncParams.mfx.LowPower == MFX_CODINGOPTION_ON) ||
-	 (pParams->bCQM && m_ver.Major == 1 && m_ver.Minor >= 16)) {
-		memset(&m_co3, 0, sizeof(mfxExtCodingOption3));
-		m_co3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3;
-		m_co3.Header.BufferSz = sizeof(m_co3);
-		m_co3.ScenarioInfo = MFX_SCENARIO_GAME_STREAMING;
-		extendedBuffers.push_back((mfxExtBuffer *)&m_co3);
+	// LA VDENC case for newer platform, works only under CBR / VBR
+	if (pParams->nRateControl == MFX_RATECONTROL_CBR ||
+	 pParams->nRateControl == MFX_RATECONTROL_VBR) {
+		if (pParams->nLADEPTH &&
+		 m_mfxEncParams.mfx.LowPower == MFX_CODINGOPTION_ON) {
+			m_co2.LookAheadDepth = pParams->nLADEPTH;
+		}
+		// CQM to follow UI setting
+		if (pParams->bCQM && !pParams->bRepeatHeaders) {
+			m_co3.AdaptiveCQM = MFX_CODINGOPTION_ON;
+		} else {
+			m_co3.AdaptiveCQM = MFX_CODINGOPTION_OFF;
+		}
 	}
 
+	extendedBuffers.push_back((mfxExtBuffer *)&m_co2);
+	extendedBuffers.push_back((mfxExtBuffer *)&m_co3);
+
 	if (codec == QSV_CODEC_HEVC) {
 		if ((pParams->nWidth & 15) || (pParams->nHeight & 15)) {
 			memset(&m_ExtHEVCParam, 0, sizeof(m_ExtHEVCParam));
@@ -346,6 +331,8 @@
 		}
 	}
 
+#if defined(_WIN32)
+	// TODO: Ask about this one on VAAPI too.
 	memset(&m_ExtVideoSignalInfo, 0, sizeof(m_ExtVideoSignalInfo));
 	m_ExtVideoSignalInfo.Header.BufferId = MFX_EXTBUFF_VIDEO_SIGNAL_INFO;
 	m_ExtVideoSignalInfo.Header.BufferSz = sizeof(m_ExtVideoSignalInfo);
@@ -357,21 +344,30 @@
 		pParams->TransferCharacteristics;
 	m_ExtVideoSignalInfo.MatrixCoefficients = pParams->MatrixCoefficients;
 	extendedBuffers.push_back((mfxExtBuffer *)&m_ExtVideoSignalInfo);
-
-/* TODO: Ask Intel why this is MFX_ERR_UNSUPPORTED */
-#if 0
-	memset(&m_ExtChromaLocInfo, 0, sizeof(m_ExtChromaLocInfo));
-	m_ExtChromaLocInfo.Header.BufferId = MFX_EXTBUFF_CHROMA_LOC_INFO;
-	m_ExtChromaLocInfo.Header.BufferSz = sizeof(m_ExtChromaLocInfo);
-	m_ExtChromaLocInfo.ChromaLocInfoPresentFlag = 1;
-	m_ExtChromaLocInfo.ChromaSampleLocTypeTopField =
-		pParams->ChromaSampleLocTypeTopField;
-	m_ExtChromaLocInfo.ChromaSampleLocTypeBottomField =
-		pParams->ChromaSampleLocTypeBottomField;
-	extendedBuffers.push_back((mfxExtBuffer *)&m_ExtChromaLocInfo);
 #endif
 
-	if (codec != QSV_CODEC_AV1 && pParams->MaxContentLightLevel > 0) {
+	// CLL and Chroma location in HEVC only supported by VPL
+	if (m_ver.Major >= 2) {
+		// Chroma location is HEVC only
+		if (codec == QSV_CODEC_HEVC) {
+			memset(&m_ExtChromaLocInfo, 0,
+			 sizeof(m_ExtChromaLocInfo));
+			m_ExtChromaLocInfo.Header.BufferId =
+				MFX_EXTBUFF_CHROMA_LOC_INFO;
+			m_ExtChromaLocInfo.Header.BufferSz =
+				sizeof(m_ExtChromaLocInfo);
+			m_ExtChromaLocInfo.ChromaLocInfoPresentFlag = 1;
+			m_ExtChromaLocInfo.ChromaSampleLocTypeTopField =
+				pParams->ChromaSampleLocTypeTopField;
+			m_ExtChromaLocInfo.ChromaSampleLocTypeBottomField =
+				pParams->ChromaSampleLocTypeBottomField;
+			extendedBuffers.push_back(
+				(mfxExtBuffer *)&m_ExtChromaLocInfo);
+		}
+	}
+
+	// AV1 HDR meta data is now supported by VPL.
+	if (pParams->MaxContentLightLevel > 0) {
 		memset(&m_ExtMasteringDisplayColourVolume, 0,
 		 sizeof(m_ExtMasteringDisplayColourVolume));
 		m_ExtMasteringDisplayColourVolume.Header.BufferId =
@@ -425,7 +421,7 @@
 	m_mfxEncParams.mfx.FrameInfo.Width = MSDK_ALIGN16(pParams->nWidth);
 	m_mfxEncParams.mfx.FrameInfo.Height = MSDK_ALIGN16(pParams->nHeight);
 
-	if (m_bUseD3D11 || m_bD3D9HACK)
+	if (m_bUseTexAlloc)
 		m_mfxEncParams.IOPattern = MFX_IOPATTERN_IN_VIDEO_MEMORY;
 	else
 		m_mfxEncParams.IOPattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
@@ -433,7 +429,12 @@
 	m_mfxEncParams.ExtParam = extendedBuffers.data();
 	m_mfxEncParams.NumExtParam = (mfxU16)extendedBuffers.size();
 
-	mfxStatus sts = m_pmfxENC->Query(&m_mfxEncParams, &m_mfxEncParams);
+	// We don't check what was valid or invalid here, just try changing LowPower.
+	// Ensure set values are not overwritten so in case it wasn't lowPower we fail
+	// during the parameter check.
+	mfxVideoParam validParams = {0};
+	memcpy(&validParams, &m_mfxEncParams, sizeof(validParams));
+	mfxStatus sts = m_pmfxENC->Query(&m_mfxEncParams, &validParams);
 	if (sts == MFX_ERR_UNSUPPORTED || sts == MFX_ERR_UNDEFINED_BEHAVIOR) {
 		if (m_mfxEncParams.mfx.LowPower == MFX_CODINGOPTION_ON) {
 			m_mfxEncParams.mfx.LowPower = MFX_CODINGOPTION_OFF;
@@ -475,7 +476,7 @@
 	EncRequest.NumFrameSuggested += m_mfxEncParams.AsyncDepth;
 
 	// Allocate required surfaces
-	if (m_bUseD3D11 || m_bD3D9HACK) {
+	if (m_bUseTexAlloc) {
 		sts = m_mfxAllocator.Alloc(m_mfxAllocator.pthis, &EncRequest,
 					 &m_mfxResponse);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
@@ -719,8 +720,8 @@
 
 	while (MFX_ERR_NOT_FOUND == nTaskIdx || MFX_ERR_NOT_FOUND == nSurfIdx) {
 		// No more free tasks or surfaces, need to sync
-		sts = m_session.SyncOperation(
-			m_pTaskPoolm_nFirstSyncTask.syncp, 60000);
+		sts = MFXVideoCORE_SyncOperation(
+			m_session, m_pTaskPoolm_nFirstSyncTask.syncp, 60000);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
 		mfxU8 *pTemp = m_outBitstream.Data;
@@ -752,7 +753,7 @@
 	}
 
 	mfxFrameSurface1 *pSurface = m_pmfxSurfacesnSurfIdx;
-	if (m_bUseD3D11 || m_bD3D9HACK) {
+	if (m_bUseTexAlloc) {
 		sts = m_mfxAllocator.Lock(m_mfxAllocator.pthis,
 					 pSurface->Data.MemId,
 					 &(pSurface->Data));
@@ -766,7 +767,7 @@
 	MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 	pSurface->Data.TimeStamp = ts;
 
-	if (m_bUseD3D11 || m_bD3D9HACK) {
+	if (m_bUseTexAlloc) {
 		sts = m_mfxAllocator.Unlock(m_mfxAllocator.pthis,
 					 pSurface->Data.MemId,
 					 &(pSurface->Data));
@@ -809,8 +810,8 @@
 
 	while (MFX_ERR_NOT_FOUND == nTaskIdx || MFX_ERR_NOT_FOUND == nSurfIdx) {
 		// No more free tasks or surfaces, need to sync
-		sts = m_session.SyncOperation(
-			m_pTaskPoolm_nFirstSyncTask.syncp, 60000);
+		sts = MFXVideoCORE_SyncOperation(
+			m_session, m_pTaskPoolm_nFirstSyncTask.syncp, 60000);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
 		mfxU8 *pTemp = m_outBitstream.Data;
@@ -831,9 +832,10 @@
 	mfxFrameSurface1 *pSurface = m_pmfxSurfacesnSurfIdx;
 	//copy to default surface directly
 	pSurface->Data.TimeStamp = ts;
-	if (m_bUseD3D11 || m_bD3D9HACK) {
+	if (m_bUseTexAlloc) {
+		// mfxU64 isn't consistent with stdint, requiring a cast to be multi-platform.
 		sts = simple_copytex(m_mfxAllocator.pthis, pSurface->Data.MemId,
-				 tex_handle, lock_key, next_key);
+				 tex_handle, lock_key, (mfxU64 *)next_key);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 	}
 
@@ -866,8 +868,8 @@
 	mfxStatus sts = MFX_ERR_NONE;
 
 	while (m_pTaskPool && m_pTaskPoolm_nFirstSyncTask.syncp) {
-		sts = m_session.SyncOperation(
-			m_pTaskPoolm_nFirstSyncTask.syncp, 60000);
+		sts = MFXVideoCORE_SyncOperation(
+			m_session, m_pTaskPoolm_nFirstSyncTask.syncp, 60000);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
 		m_pTaskPoolm_nFirstSyncTask.syncp = NULL;
@@ -888,12 +890,12 @@
 		m_pmfxENC = NULL;
 	}
 
-	if (m_bUseD3D11 || m_bD3D9HACK)
+	if (m_bUseTexAlloc)
 		m_mfxAllocator.Free(m_mfxAllocator.pthis, &m_mfxResponse);
 
 	if (m_pmfxSurfaces) {
 		for (int i = 0; i < m_nSurfNum; i++) {
-			if (!m_bUseD3D11 && !m_bD3D9HACK)
+			if (!m_bUseTexAlloc)
 				delete m_pmfxSurfacesi->Data.Y;
 
 			delete m_pmfxSurfacesi;
@@ -916,11 +918,13 @@
 		g_numEncodersOpen--;
 	}
 
-	if ((m_bUseD3D11 || m_bD3D9HACK) && (g_numEncodersOpen <= 0)) {
+	if ((m_bUseTexAlloc) && (g_numEncodersOpen <= 0)) {
 		Release();
 		g_DX_Handle = NULL;
 	}
-	m_session.Close();
+	MFXVideoENCODE_Close(m_session);
+	ReleaseSessionData(m_sessionData);
+	m_sessionData = NULL;
 	return sts;
 }

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.h -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/QSV_Encoder_Internal.h Changed

@@ -54,8 +54,8 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #pragma once
-#include "mfxastructures.h"
-#include "mfxvideo++.h"
+#include <vpl/mfxstructures.h>
+#include <vpl/mfxvideo++.h>
 #include "QSV_Encoder.h"
 #include "common_utils.h"
 
@@ -63,7 +63,7 @@
 
 class QSV_Encoder_Internal {
 public:
-	QSV_Encoder_Internal(mfxIMPL &impl, mfxVersion &version, bool isDGPU);
+	QSV_Encoder_Internal(mfxVersion &version, bool isDGPU);
 	~QSV_Encoder_Internal();
 
 	mfxStatus Open(qsv_param_t *pParams, enum qsv_codec codec);
@@ -99,9 +99,9 @@
 	int GetFreeTaskIndex(Task *pTaskPool, mfxU16 nPoolSize);
 
 private:
-	mfxIMPL m_impl;
 	mfxVersion m_ver;
-	MFXVideoSession m_session;
+	mfxSession m_session;
+	void *m_sessionData;
 	mfxFrameAllocator m_mfxAllocator;
 	mfxVideoParam m_mfxEncParams;
 	mfxFrameAllocResponse m_mfxResponse;
@@ -129,9 +129,8 @@
 	int m_nTaskIdx;
 	int m_nFirstSyncTask;
 	mfxBitstream m_outBitstream;
-	bool m_bIsWindows8OrGreater;
 	bool m_bUseD3D11;
-	bool m_bD3D9HACK;
+	bool m_bUseTexAlloc;
 	bool m_isDGPU;
 	static mfxU16 g_numEncodersOpen;
 	static mfxHDL

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/bits/linux_defs.h -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/bits/linux_defs.h Changed

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/cmake/legacy.cmake Added

@@ -0,0 +1,60 @@
+option(ENABLE_QSV11 "Build Intel QSV11 Hardware Encoder." TRUE)
+
+if(NOT ENABLE_QSV11)
+  obs_status(DISABLED "obs-qsv11")
+  return()
+endif()
+
+project(obs-qsv11)
+
+add_library(obs-qsv11 MODULE)
+add_library(OBS::qsv11 ALIAS obs-qsv11)
+
+find_package(VPL 2.6 REQUIRED)
+
+target_sources(
+  obs-qsv11
+  PRIVATE obs-qsv11.c
+          obs-qsv11-plugin-main.c
+          common_utils.cpp
+          common_utils.h
+          QSV_Encoder.cpp
+          QSV_Encoder.h
+          QSV_Encoder_Internal.cpp
+          QSV_Encoder_Internal.h
+          bits/linux_defs.h
+          bits/windows_defs.h)
+
+target_link_libraries(obs-qsv11 PRIVATE OBS::libobs VPL::VPL)
+
+if(OS_WINDOWS)
+  add_subdirectory(obs-qsv-test)
+
+  target_compile_definitions(obs-qsv11 PRIVATE DX11_D3D)
+
+  set(MODULE_DESCRIPTION "OBS QSV encoder")
+  configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in obs-qsv11.rc)
+
+  target_sources(obs-qsv11 PRIVATE obs-qsv11.rc common_directx11.cpp common_directx11.h common_utils_windows.cpp)
+
+  target_link_libraries(obs-qsv11 PRIVATE d3d11 dxgi dxguid)
+  target_link_options(obs-qsv11 PRIVATE /IGNORE:4099)
+
+  target_compile_definitions(obs-qsv11 PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
+elseif(OS_LINUX)
+  find_package(Libva REQUIRED)
+
+  target_sources(obs-qsv11 PRIVATE common_utils_linux.cpp)
+
+  target_link_libraries(obs-qsv11 PRIVATE Libva::va Libva::drm)
+endif()
+
+set_target_properties(obs-qsv11 PROPERTIES FOLDER "plugins/obs-qsv11")
+
+file(GLOB _OBS_QSV11_SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
+file(GLOB _OBS_QSV11_HEADER_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
+
+source_group("obs-qsv11\\Source Files" FILES ${_OBS_QSV11_SOURCE_FILES})
+source_group("obs-qsv11\\Header Files" FILES ${_OBS_QSV11_HEADER_FILES})
+
+setup_plugin_target(obs-qsv11)

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/cmake/windows Added

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/cmake/windows/obs-module.rc.in Added

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/common_directx11.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/common_directx11.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/common_utils.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/common_utils.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/common_utils.h -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/common_utils.h Changed

@@ -2,7 +2,38 @@
 
 #include <stdio.h>
 
-#include "mfxvideo++.h"
+// Most of this file shouldnt be accessed from C.
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+enum qsv_codec {
+	QSV_CODEC_AVC,
+	QSV_CODEC_AV1,
+	QSV_CODEC_HEVC,
+};
+
+struct adapter_info {
+	bool is_intel;
+	bool is_dgpu;
+	bool supports_av1;
+	bool supports_hevc;
+};
+
+#define MAX_ADAPTERS 10
+extern struct adapter_info adaptersMAX_ADAPTERS;
+extern size_t adapter_count;
+
+void util_cpuid(int cpuinfo4, int flags);
+void check_adapters(struct adapter_info *adapters, size_t *adapter_count);
+
+#ifdef __cplusplus
+}
+
+#include <vpl/mfxvideo++.h>
+#include <vpl/mfxdispatcher.h>
+
+constexpr inline int INTEL_VENDOR_ID = 0x8086;
 
 // =================================================================
 // OS-specific definitions of types, macro, etc...
@@ -77,7 +108,7 @@
 #define WILL_WRITE 0x2000
 
 // =================================================================
-// Intel Media SDK memory allocator entrypoints....
+// Intel VPL memory allocator entrypoints....
 // Implementation of this functions is OS/Memory type specific.
 mfxStatus simple_alloc(mfxHDL pthis, mfxFrameAllocRequest *request,
 		 mfxFrameAllocResponse *response);
@@ -89,7 +120,7 @@
 			 mfxU64 lock_key, mfxU64 *next_key);
 
 // =================================================================
-// Utility functions, not directly tied to Media SDK functionality
+// Utility functions, not directly tied to VPL functionality
 //
 
 void PrintErrString(int err, const char *filestr, int line);
@@ -127,14 +158,16 @@
 // Get free task
 int GetFreeTaskIndex(Task *pTaskPool, mfxU16 nPoolSize);
 
-// Initialize Intel Media SDK Session, device/display and memory manager
-mfxStatus Initialize(mfxIMPL impl, mfxVersion ver, MFXVideoSession *pSession,
-		 mfxFrameAllocator *pmfxAllocator,
-		 mfxHDL *deviceHandle = NULL,
-		 bool bCreateSharedHandles = false, bool dx9hack = false);
+// Initialize Intel VPL Session, device/display and memory manager
+mfxStatus Initialize(mfxVersion ver, mfxSession *pSession,
+		 mfxFrameAllocator *pmfxAllocator, mfxHDL *deviceHandle,
+		 bool bCreateSharedHandles, enum qsv_codec codec,
+		 void **data); //vpl change
 
-// Release resources (device/display)
+// Release global shared resources (device/display)
 void Release();
+// Release per session resources
+void ReleaseSessionData(void *data);
 
 // Convert frame type to string
 char mfxFrameTypeString(mfxU16 FrameType);
@@ -143,3 +176,5 @@
 
 //void mfxInitTime(); might need this for Windows
 double TimeDiffMsec(mfxTime tfinish, mfxTime tstart);
+
+#endif // __cplusplus

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/common_utils_linux.cpp Added

@@ -0,0 +1,380 @@
+#include "common_utils.h"
+
+#include <time.h>
+#include <cpuid.h>
+#include <util/c99defs.h>
+#include <util/dstr.h>
+#include <va/va_drm.h>
+#include <va/va_str.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <dirent.h>
+
+#include <obs.h>
+#include <obs-nix-platform.h>
+
+// Set during check_adapters to work-around VPL dispatcher not setting a VADisplay
+// for the MSDK runtime.
+static const char *default_h264_device = nullptr;
+static const char *default_hevc_device = nullptr;
+static const char *default_av1_device = nullptr;
+
+struct linux_data {
+	int fd;
+	VADisplay vaDisplay;
+};
+
+mfxStatus simple_alloc(mfxHDL pthis, mfxFrameAllocRequest *request,
+		 mfxFrameAllocResponse *response)
+{
+	UNUSED_PARAMETER(pthis);
+	UNUSED_PARAMETER(request);
+	UNUSED_PARAMETER(response);
+	return MFX_ERR_UNSUPPORTED;
+}
+
+mfxStatus simple_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+{
+	UNUSED_PARAMETER(pthis);
+	UNUSED_PARAMETER(mid);
+	UNUSED_PARAMETER(ptr);
+	return MFX_ERR_UNSUPPORTED;
+}
+
+mfxStatus simple_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+{
+	UNUSED_PARAMETER(pthis);
+	UNUSED_PARAMETER(mid);
+	UNUSED_PARAMETER(ptr);
+	return MFX_ERR_UNSUPPORTED;
+}
+
+mfxStatus simple_gethdl(mfxHDL pthis, mfxMemId mid, mfxHDL *handle)
+{
+	UNUSED_PARAMETER(pthis);
+	UNUSED_PARAMETER(mid);
+	UNUSED_PARAMETER(handle);
+	return MFX_ERR_UNSUPPORTED;
+}
+
+mfxStatus simple_free(mfxHDL pthis, mfxFrameAllocResponse *response)
+{
+	UNUSED_PARAMETER(pthis);
+	UNUSED_PARAMETER(response);
+	return MFX_ERR_UNSUPPORTED;
+}
+
+mfxStatus simple_copytex(mfxHDL pthis, mfxMemId mid, mfxU32 tex_handle,
+			 mfxU64 lock_key, mfxU64 *next_key)
+{
+	UNUSED_PARAMETER(pthis);
+	UNUSED_PARAMETER(mid);
+	UNUSED_PARAMETER(tex_handle);
+	UNUSED_PARAMETER(lock_key);
+	UNUSED_PARAMETER(next_key);
+	return MFX_ERR_UNSUPPORTED;
+}
+
+#if 0
+void ClearYUVSurfaceVMem(mfxMemId memId);
+void ClearRGBSurfaceVMem(mfxMemId memId);
+#endif
+
+// Initialize Intel VPL Session, device/display and memory manager
+mfxStatus Initialize(mfxVersion ver, mfxSession *pSession,
+		 mfxFrameAllocator *pmfxAllocator, mfxHDL *deviceHandle,
+		 bool bCreateSharedHandles, enum qsv_codec codec,
+		 void **data)
+{
+	UNUSED_PARAMETER(ver);
+	UNUSED_PARAMETER(pmfxAllocator);
+	UNUSED_PARAMETER(deviceHandle);
+	UNUSED_PARAMETER(bCreateSharedHandles);
+	mfxStatus sts = MFX_ERR_NONE;
+	mfxVariant impl;
+
+	// Initialize Intel VPL Session
+	mfxLoader loader = MFXLoad();
+	mfxConfig cfg = MFXCreateConfig(loader);
+
+	impl.Type = MFX_VARIANT_TYPE_U32;
+	impl.Data.U32 = MFX_IMPL_TYPE_HARDWARE;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.Impl", impl);
+
+	impl.Type = MFX_VARIANT_TYPE_U32;
+	impl.Data.U32 = INTEL_VENDOR_ID;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.VendorID", impl);
+
+	impl.Type = MFX_VARIANT_TYPE_U32;
+	impl.Data.U32 = MFX_ACCEL_MODE_VIA_VAAPI_DRM_RENDER_NODE;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.AccelerationMode",
+		impl);
+
+	int fd = -1;
+	if (codec == QSV_CODEC_AVC && default_h264_device)
+		fd = open(default_h264_device, O_RDWR);
+	if (codec == QSV_CODEC_HEVC && default_hevc_device)
+		fd = open(default_hevc_device, O_RDWR);
+	if (codec == QSV_CODEC_AV1 && default_av1_device)
+		fd = open(default_av1_device, O_RDWR);
+	if (fd < 0) {
+		blog(LOG_ERROR, "Failed to open device '%s'",
+		 default_h264_device);
+		return MFX_ERR_DEVICE_FAILED;
+	}
+
+	mfxHDL vaDisplay = vaGetDisplayDRM(fd);
+	if (!vaDisplay) {
+		return MFX_ERR_DEVICE_FAILED;
+	}
+
+	sts = MFXCreateSession(loader, 0, pSession);
+	if (MFX_ERR_NONE > sts) {
+		blog(LOG_ERROR, "Failed to initialize MFX");
+		MSDK_PRINT_RET_MSG(sts);
+		close(fd);
+		return sts;
+	}
+
+	// VPL expects the VADisplay to be initialized.
+	int major;
+	int minor;
+	if (vaInitialize(vaDisplay, &major, &minor) != VA_STATUS_SUCCESS) {
+		blog(LOG_ERROR, "Failed to initialize VA-API");
+		vaTerminate(vaDisplay);
+		close(fd);
+		return MFX_ERR_DEVICE_FAILED;
+	}
+
+	sts = MFXVideoCORE_SetHandle(*pSession, MFX_HANDLE_VA_DISPLAY,
+				 vaDisplay);
+	MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+
+	struct linux_data *d =
+		(struct linux_data *)bmalloc(sizeof(struct linux_data));
+	d->fd = fd;
+	d->vaDisplay = (VADisplay)vaDisplay;
+	*data = d;
+
+	return sts;
+}
+
+void Release() {}
+
+// Release per session resources.
+void ReleaseSessionData(void *data)
+{
+	struct linux_data *d = (struct linux_data *)data;
+	if (d) {
+		vaTerminate(d->vaDisplay);
+		close(d->fd);
+		bfree(d);
+	}
+}
+
+void mfxGetTime(mfxTime *timestamp)
+{
+	clock_gettime(CLOCK_MONOTONIC, timestamp);
+}
+
+double TimeDiffMsec(mfxTime tfinish, mfxTime tstart)
+{
+	UNUSED_PARAMETER(tfinish);
+	UNUSED_PARAMETER(tstart);
+	//TODO, unused so far it seems
+	return 0.0;
+}
+
+extern "C" void util_cpuid(int cpuinfo4, int level)
+{
+	__get_cpuid(level, (unsigned int *)&cpuinfo0,
+		 (unsigned int *)&cpuinfo1, (unsigned int *)&cpuinfo2,
+		 (unsigned int *)&cpuinfo3);
+}
+
+struct vaapi_device {
+	int fd;
+	VADisplay display;
+	const char *driver;
+};
+
+static void vaapi_open(char *device_path, struct vaapi_device *device)
+{
+	int fd = open(device_path, O_RDWR);
+	if (fd < 0) {
+		return;
+	}
+
+	VADisplay display = vaGetDisplayDRM(fd);
+	if (!display) {
+		close(fd);
+		return;
+	}
+
+	// VA-API is noisy by default.
+	vaSetInfoCallback(display, nullptr, nullptr);
+	vaSetErrorCallback(display, nullptr, nullptr);
+
+	int major;
+	int minor;
+	if (vaInitialize(display, &major, &minor) != VA_STATUS_SUCCESS) {
+		vaTerminate(display);
+		close(fd);
+		return;
+	}
+
+	const char *driver = vaQueryVendorString(display);
+	if (strstr(driver, "Intel i965 driver") != nullptr) {
+		blog(LOG_WARNING,
+		 "Legacy intel-vaapi-driver detected, incompatible with QSV");
+		vaTerminate(display);
+		close(fd);
+		return;
+	}
+
+	device->fd = fd;
+	device->display = display;
+	device->driver = driver;
+}
+
+static void vaapi_close(struct vaapi_device *device)
+{
+	vaTerminate(device->display);
+	close(device->fd);
+}
+
+static uint32_t vaapi_check_support(VADisplay display, VAProfile profile,
+				 VAEntrypoint entrypoint)
+{
+	bool ret = false;
+	VAConfigAttrib attrib1;
+	attrib->type = VAConfigAttribRateControl;
+
+	VAStatus va_status =
+		vaGetConfigAttributes(display, profile, entrypoint, attrib, 1);
+
+	uint32_t rc = 0;
+	switch (va_status) {
+	case VA_STATUS_SUCCESS:
+		rc = attrib->value;
+		break;
+	case VA_STATUS_ERROR_UNSUPPORTED_PROFILE:
+	case VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT:
+	default:
+		break;
+	}
+
+	return (rc & VA_RC_CBR || rc & VA_RC_CQP || rc & VA_RC_VBR);
+}
+
+static bool vaapi_supports_h264(VADisplay display)
+{
+	bool ret = false;
+	ret |= vaapi_check_support(display, VAProfileH264ConstrainedBaseline,
+				 VAEntrypointEncSlice);
+	ret |= vaapi_check_support(display, VAProfileH264Main,
+				 VAEntrypointEncSlice);
+	ret |= vaapi_check_support(display, VAProfileH264High,
+				 VAEntrypointEncSlice);
+
+	if (!ret) {
+		ret |= vaapi_check_support(display,
+					 VAProfileH264ConstrainedBaseline,
+					 VAEntrypointEncSliceLP);
+		ret |= vaapi_check_support(display, VAProfileH264Main,
+					 VAEntrypointEncSliceLP);
+		ret |= vaapi_check_support(display, VAProfileH264High,
+					 VAEntrypointEncSliceLP);
+	}
+
+	return ret;
+}
+
+static bool vaapi_supports_av1(VADisplay display)
+{
+	bool ret = false;
+	// Are there any devices with non-LowPower entrypoints?
+	ret |= vaapi_check_support(display, VAProfileAV1Profile0,
+				 VAEntrypointEncSlice);
+	ret |= vaapi_check_support(display, VAProfileAV1Profile0,
+				 VAEntrypointEncSliceLP);
+	return ret;
+}
+
+static bool vaapi_supports_hevc(VADisplay display)
+{
+	bool ret = false;
+	ret |= vaapi_check_support(display, VAProfileHEVCMain,
+				 VAEntrypointEncSlice);
+	ret |= vaapi_check_support(display, VAProfileHEVCMain,
+				 VAEntrypointEncSliceLP);
+	return ret;
+}
+
+void check_adapters(struct adapter_info *adapters, size_t *adapter_count)
+{
+	struct dstr full_path;
+	struct dirent **namelist;
+	int no;
+	int adapter_idx;
+	const char *base_dir = "/dev/dri/";
+
+	dstr_init(&full_path);
+	if ((no = scandir(base_dir, &namelist, 0, alphasort)) > 0) {
+		for (int i = 0; i < no; i++) {
+			struct adapter_info *adapter;
+			struct dirent *dp;
+			struct vaapi_device device = {0};
+
+			dp = namelisti;
+			if (strstr(dp->d_name, "renderD") == nullptr)
+				goto next_entry;
+
+			adapter_idx = atoi(&dp->d_name7) - 128;
+			if (adapter_idx >= (ssize_t)*adapter_count ||
+			 adapter_idx < 0)
+				goto next_entry;
+
+			*adapter_count = adapter_idx + 1;
+			dstr_copy(&full_path, base_dir);
+			dstr_cat(&full_path, dp->d_name);
+			vaapi_open(full_path.array, &device);
+			if (!device.display)
+				goto next_entry;
+
+			adapter = &adaptersadapter_idx;
+			adapter->is_intel = strstr(device.driver, "Intel") !=
+					 nullptr;
+			// This is currently only used for LowPower coding which is busted on VA-API anyway.
+			adapter->is_dgpu = false;
+			adapter->supports_av1 =
+				vaapi_supports_av1(device.display);
+			adapter->supports_hevc =
+				vaapi_supports_hevc(device.display);
+
+			if (adapter->is_intel && default_h264_device == nullptr)
+				default_h264_device = strdup(full_path.array);
+
+			if (adapter->is_intel && adapter->supports_av1 &&
+			 default_av1_device == nullptr)
+				default_av1_device = strdup(full_path.array);
+
+			if (adapter->is_intel && adapter->supports_hevc &&
+			 default_hevc_device == nullptr)
+				default_hevc_device = strdup(full_path.array);
+
+			vaapi_close(&device);
+
+		next_entry:
+			free(dp);
+		}
+		free(namelist);
+	}
+	dstr_free(&full_path);
+}

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/common_utils_windows.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/common_utils_windows.cpp Changed

@@ -6,26 +6,57 @@
 #include "common_directx.h"
 #elif DX11_D3D
 #include "common_directx11.h"
-#include "common_directx9.h"
 #endif
 
+#include <util/windows/device-enum.h>
+#include <util/config-file.h>
+#include <util/platform.h>
+#include <util/pipe.h>
+#include <util/dstr.h>
+
+#include <intrin.h>
+#include <inttypes.h>
+
 /* =======================================================
 * Windows implementation of OS-specific utility functions
 */
 
-mfxStatus Initialize(mfxIMPL impl, mfxVersion ver, MFXVideoSession *pSession,
+mfxStatus Initialize(mfxVersion ver, mfxSession *pSession,
 		 mfxFrameAllocator *pmfxAllocator, mfxHDL *deviceHandle,
-		 bool bCreateSharedHandles, bool dx9hack)
+		 bool bCreateSharedHandles, enum qsv_codec codec,
+		 void **data)
 {
-	bCreateSharedHandles; // (Hugh) Currently unused
-	pmfxAllocator; // (Hugh) Currently unused
+	UNUSED_PARAMETER(codec);
+	UNUSED_PARAMETER(data);
 
 	mfxStatus sts = MFX_ERR_NONE;
+	mfxVariant impl;
 
 	// If mfxFrameAllocator is provided it means we need to setup DirectX device and memory allocator
-	if (pmfxAllocator && !dx9hack) {
-		// Initialize Intel Media SDK Session
-		sts = pSession->Init(impl, &ver);
+	if (pmfxAllocator) {
+		// Initialize Intel VPL Session
+		mfxLoader loader = MFXLoad();
+		mfxConfig cfg = MFXCreateConfig(loader);
+
+		impl.Type = MFX_VARIANT_TYPE_U32;
+		impl.Data.U32 = MFX_IMPL_TYPE_HARDWARE;
+		MFXSetConfigFilterProperty(
+			cfg, (const mfxU8 *)"mfxImplDescription.Impl", impl);
+
+		impl.Type = MFX_VARIANT_TYPE_U32;
+		impl.Data.U32 = INTEL_VENDOR_ID;
+		MFXSetConfigFilterProperty(
+			cfg, (const mfxU8 *)"mfxImplDescription.VendorID",
+			impl);
+
+		impl.Type = MFX_VARIANT_TYPE_U32;
+		impl.Data.U32 = MFX_ACCEL_MODE_VIA_D3D11;
+		MFXSetConfigFilterProperty(
+			cfg,
+			(const mfxU8 *)"mfxImplDescription.AccelerationMode",
+			impl);
+
+		sts = MFXCreateSession(loader, 0, pSession);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
 		// Create DirectX device context
@@ -38,56 +69,47 @@
 		if (deviceHandle == NULL || *deviceHandle == NULL)
 			return MFX_ERR_DEVICE_FAILED;
 
-		// Provide device manager to Media SDK
-		sts = pSession->SetHandle(DEVICE_MGR_TYPE, *deviceHandle);
+		// Provide device manager to VPL
+		sts = MFXVideoCORE_SetHandle(*pSession, DEVICE_MGR_TYPE,
+					 *deviceHandle);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
 		pmfxAllocator->pthis =
-			*pSession; // We use Media SDK session ID as the allocation identifier
+			*pSession; // We use VPL session ID as the allocation identifier
 		pmfxAllocator->Alloc = simple_alloc;
 		pmfxAllocator->Free = simple_free;
 		pmfxAllocator->Lock = simple_lock;
 		pmfxAllocator->Unlock = simple_unlock;
 		pmfxAllocator->GetHDL = simple_gethdl;
 
-		// Since we are using video memory we must provide Media SDK with an external allocator
-		sts = pSession->SetFrameAllocator(pmfxAllocator);
-		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
-
-	} else if (pmfxAllocator && dx9hack) {
-		// Initialize Intel Media SDK Session
-		sts = pSession->Init(impl, &ver);
-		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
-
-		// Create DirectX device context
-		if (deviceHandle == NULL || *deviceHandle == NULL) {
-			sts = DX9_CreateHWDevice(*pSession, deviceHandle, NULL,
-						 false);
-			MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
-		}
-		if (*deviceHandle == NULL)
-			return MFX_ERR_DEVICE_FAILED;
-
-		// Provide device manager to Media SDK
-		sts = pSession->SetHandle(MFX_HANDLE_D3D9_DEVICE_MANAGER,
-					 *deviceHandle);
-		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
-
-		pmfxAllocator->pthis =
-			*pSession; // We use Media SDK session ID as the allocation identifier
-		pmfxAllocator->Alloc = dx9_simple_alloc;
-		pmfxAllocator->Free = dx9_simple_free;
-		pmfxAllocator->Lock = dx9_simple_lock;
-		pmfxAllocator->Unlock = dx9_simple_unlock;
-		pmfxAllocator->GetHDL = dx9_simple_gethdl;
-
-		// Since we are using video memory we must provide Media SDK with an external allocator
-		sts = pSession->SetFrameAllocator(pmfxAllocator);
+		// Since we are using video memory we must provide VPL with an external allocator
+		sts = MFXVideoCORE_SetFrameAllocator(*pSession, pmfxAllocator);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 
 	} else {
-		// Initialize Intel Media SDK Session
-		sts = pSession->Init(impl, &ver);
+		// Initialize Intel VPL Session
+		mfxLoader loader = MFXLoad();
+		mfxConfig cfg = MFXCreateConfig(loader);
+
+		impl.Type = MFX_VARIANT_TYPE_U32;
+		impl.Data.U32 = MFX_IMPL_TYPE_HARDWARE;
+		MFXSetConfigFilterProperty(
+			cfg, (const mfxU8 *)"mfxImplDescription.Impl", impl);
+
+		impl.Type = MFX_VARIANT_TYPE_U32;
+		impl.Data.U32 = INTEL_VENDOR_ID;
+		MFXSetConfigFilterProperty(
+			cfg, (const mfxU8 *)"mfxImplDescription.VendorID",
+			impl);
+
+		impl.Type = MFX_VARIANT_TYPE_U32;
+		impl.Data.U32 = MFX_ACCEL_MODE_VIA_D3D9;
+		MFXSetConfigFilterProperty(
+			cfg,
+			(const mfxU8 *)"mfxImplDescription.AccelerationMode",
+			impl);
+
+		sts = MFXCreateSession(loader, 0, pSession);
 		MSDK_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
 	}
 	return sts;
@@ -97,10 +119,11 @@
 {
 #if defined(DX9_D3D) || defined(DX11_D3D)
 	CleanupHWDevice();
-	DX9_CleanupHWDevice();
 #endif
 }
 
+void ReleaseSessionData(void *) {}
+
 void mfxGetTime(mfxTime *timestamp)
 {
 	QueryPerformanceCounter(timestamp);
@@ -118,7 +141,96 @@
 	 freq;
 }
 
-/* (Hugh) Functions currently unused */
+void util_cpuid(int cpuinfo4, int flags)
+{
+	return __cpuid(cpuinfo, flags);
+}
+
+static bool enum_luids(void *param, uint32_t idx, uint64_t luid)
+{
+	struct dstr *cmd = (struct dstr *)param;
+	dstr_catf(cmd, " %" PRIx64, luid);
+	UNUSED_PARAMETER(idx);
+	return true;
+}
+
+void check_adapters(struct adapter_info *adapters, size_t *adapter_count)
+{
+	char *test_exe = os_get_executable_path_ptr("obs-qsv-test.exe");
+	struct dstr cmd = {0};
+	struct dstr caps_str = {0};
+	os_process_pipe_t *pp = nullptr;
+	config_t *config = nullptr;
+	const char *error = nullptr;
+	size_t config_adapter_count;
+
+	dstr_init_move_array(&cmd, test_exe);
+	dstr_insert_ch(&cmd, 0, '\"');
+	dstr_cat(&cmd, "\"");
+
+	enum_graphics_device_luids(enum_luids, &cmd);
+
+	pp = os_process_pipe_create(cmd.array, "r");
+	if (!pp) {
+		blog(LOG_INFO, "Failed to launch the QSV test process I guess");
+		goto fail;
+	}
+
+	for (;;) {
+		char data2048;
+		size_t len =
+			os_process_pipe_read(pp, (uint8_t *)data, sizeof(data));
+		if (!len)
+			break;
+
+		dstr_ncat(&caps_str, data, len);
+	}
+
+	if (dstr_is_empty(&caps_str)) {
+		blog(LOG_INFO, "Seems the QSV test subprocess crashed. "
+			 "Better there than here I guess. "
+			 "Let's just skip loading QSV then I suppose.");
+		goto fail;
+	}
+
+	if (config_open_string(&config, caps_str.array) != 0) {
+		blog(LOG_INFO, "Couldn't open QSV configuration string");
+		goto fail;
+	}
+
+	error = config_get_string(config, "error", "string");
+	if (error) {
+		blog(LOG_INFO, "Error querying QSV support: %s", error);
+		goto fail;
+	}
+
+	config_adapter_count = config_num_sections(config);
+
+	if (config_adapter_count < *adapter_count)
+		*adapter_count = config_adapter_count;
+
+	for (size_t i = 0; i < *adapter_count; i++) {
+		char section16;
+		snprintf(section, sizeof(section), "%d", (int)i);
+
+		struct adapter_info *adapter = &adaptersi;
+		adapter->is_intel =
+			config_get_bool(config, section, "is_intel");
+		adapter->is_dgpu = config_get_bool(config, section, "is_dgpu");
+		adapter->supports_av1 =
+			config_get_bool(config, section, "supports_av1");
+		adapter->supports_hevc =
+			config_get_bool(config, section, "supports_hevc");
+	}
+
+fail:
+	config_close(config);
+	dstr_free(&caps_str);
+	dstr_free(&cmd);
+	os_process_pipe_destroy(pp);
+}
+
+/* (Lain) Functions currently unused */
 #if 0
 void ClearYUVSurfaceVMem(mfxMemId memId)
 {

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/af-ZA.ini Added

@@ -0,0 +1,20 @@
+TargetUsage="Teikengebruik"
+Bitrate="Bistempo"
+MaxBitrate="Maksimum bistempo"
+KeyframeIntervalSec="sleutelraaminterval (0=outomaties)"
+Profile="Profiel"
+ICQQuality="ICQ-kwaliteit"
+Latency="Vertraging"
+Latency.ToolTip="Daar is ’n wisselwerking tussen vertraging en kwaliteit.\nAs die kwaliteit verkies word kies u ‘normaal’, waarby die eind-tot-eind vertraging >2s kan wees.\nAs u <500ms vertraging benodig kies u ‘ultra-laag’."
+SubjectiveVideoEnhancements="Subjektiewe videoverbeteringe"
+8bitUnsupportedHdr="OBS ondersteun nie 8-bisafvoer van Rec. 2100 nie."
+10bitUnsupportedAvc="Kan nie 10-bisenkodering op Intel QSV H.264-enkodeerder uitvoer nie."
+16bitUnsupported="Kan nie 16-bisenkodering op hierdie enkodeerder uitvoer nie."
+BFrames="B-rame"
+TargetUsage.TU1="TU1: Stadigste (beste kwaliteit)"
+TargetUsage.TU2="TU2: Stadiger"
+TargetUsage.TU3="TU3: Stadig"
+TargetUsage.TU4="TU4: Gebalanseerd (gemiddelde kwaliteit)"
+TargetUsage.TU5="TU5: Vinnig"
+TargetUsage.TU6="TU6: Vinniger"
+TargetUsage.TU7="TU7: Vinnigste (beste snelheid)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ba-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ba-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ca-ES.ini Changed

@@ -4,8 +4,6 @@
 RateControl="Control de la freqüència"
 KeyframeIntervalSec="Interval de fotogrames clau (0=auto)"
 Profile="Perfil"
-Accuracy="Precisió"
-Convergence="Convergència"
 ICQQuality="Qualitat ICQ"
 Latency="Latència"
 Latency.ToolTip="Existeix un equilibri entre la latència i la qualitat.\nSi preferiu qualitat, seleccioneu el mode «normal», que pot arribar a > 2s de latència final.\nSi necessiteu una latència < 500ms, aleshores seleccioneu el mode «ultra baix»."
@@ -13,3 +11,11 @@
 8bitUnsupportedHdr="L'OBS no admet la sortida de 8 bits de Rec. 2100."
 10bitUnsupportedAvc="No es pot realitzar la codificació de 10 bits al codificador Intel QSV H.264."
 16bitUnsupported="No es pot realitzar la codificació de 16 bits amb aquest codificador."
+BFrames="Fotogrames B"
+TargetUsage.TU1="P1: El més lent (millor qualitat)"
+TargetUsage.TU2="P2: Més lent"
+TargetUsage.TU3="P3: Lent"
+TargetUsage.TU4="P4: Equilibrat (qualitat acceptable)"
+TargetUsage.TU5="P5: Ràpid"
+TargetUsage.TU6="P6: Més ràpid"
+TargetUsage.TU7="P7: El més ràpid (millor velocitat)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/cs-CZ.ini Changed

@@ -3,11 +3,18 @@
 RateControl="Řízení toku"
 KeyframeIntervalSec="Interval klíč. snímků (0=auto)"
 Profile="Profil"
-Accuracy="Přesnost"
-Convergence="Konvergence"
 ICQQuality="Kvalita ICQ"
 Latency="Odezva"
 Latency.ToolTip="Existuje kompromis mezi odezvou a kvalitou.\nPokud preferujete kvalitu, tak prosím vyberte 'normal' mód, který může přidat > 2s odezvy.\nPokud vyžadujete < 500ms odezvy, tak prosím vyberte 'ultra-low' mód."
 SubjectiveVideoEnhancements="Subjektivní vylepšení obrazu"
 8bitUnsupportedHdr="OBS nepodporuje 8bitový výstup Rec. 2100."
 10bitUnsupportedAvc="Nelze provést 10bitové enkódování pomocí Intel QSV H.264 enkodéru."
+16bitUnsupported="Nelze provést 16bitové enkódování na tomto enkodéru."
+BFrames="B-snímky"
+TargetUsage.TU1="TU1: Nejpomalejší (nejvyšší kvalita)"
+TargetUsage.TU2="TU2: Pomalejší"
+TargetUsage.TU3="TU3: Pomalé"
+TargetUsage.TU4="TU4: Vyrovnané (střední kvalita)"
+TargetUsage.TU5="TU5: Rychlé"
+TargetUsage.TU6="TU6: Rychlejší"
+TargetUsage.TU7="TU7: Nejrychlejší (nejvyšší rychlost)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/de-DE.ini Changed

@@ -3,8 +3,6 @@
 RateControl="Qualitätsregulierungsmethode"
 KeyframeIntervalSec="Keyframeintervall (0 = automatisch)"
 Profile="Profil"
-Accuracy="Genauigkeit"
-Convergence="Konvergenz"
 ICQQuality="ICQ-Qualität"
 Latency="Latenz"
 Latency.ToolTip="Es gibt einen Kompromiss zwischen Latenz und Qualität.\nWenn Sie für Ihren Fall Qualität bevorzugen, wählen Sie den Modus „normal“\naus, durch den eine End-zu-End-Latenz von mehr als 2 s auftreten kann.\nFalls Sie aber eine Latenz von weniger als 500 ms\nbenötigen, wählen Sie den Modus „ultra-low“."
@@ -12,3 +10,11 @@
 8bitUnsupportedHdr="Die Ausgabe von 8-Bit von Rec. 2100 wird nicht unterstützt."
 10bitUnsupportedAvc="Mit dem Intel-QSV-H.264-Encoder kann kein 10-Bit encodet werden."
 16bitUnsupported="Mit diesem Encoder kann kein 16-Bit encodet werden."
+BFrames="B-Frames"
+TargetUsage.TU1="TU1: Am langsamsten (Beste Qualität)"
+TargetUsage.TU2="TU2: Langsamer"
+TargetUsage.TU3="TU3: Langsam"
+TargetUsage.TU4="TU4: Ausgeglichen (Mittlere Qualität)"
+TargetUsage.TU5="TU5: Schnell"
+TargetUsage.TU6="TU6: Schneller"
+TargetUsage.TU7="TU7: Am schnellsten (Beste Geschwindigkeit)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/el-GR.ini Changed

@@ -2,11 +2,20 @@
 Bitrate="Ρυθμός μετάδοσης bit"
 MaxBitrate="Μέγιστος ρυθμός μετάδοσης bit"
 RateControl="Έλεγχος ρυθμού"
+KeyframeIntervalSec="Διάστημα Καρέ-Κλειδιού (0=αυτόματο)"
 Profile="Προφίλ"
-Accuracy="Ακρίβεια"
-Convergence="Σύγκλιση"
 ICQQuality="Ποιότητα ICQ"
 Latency="Καθυστέρηση"
 Latency.ToolTip="Υπάρχει αλληλεξάρτηση της καθυστέρησης με την ποιότητα.\nΑν προτιμάτε υψηλή ποιότητα, επιλέξτε την 'κανονική' λειτουργία, η οποία μπορεί να έχει καθυστέρηση πάνω από 2 δευτερόλεπτα.\nΑν χρειάζεστε καθυστέρηση μικρότερη των 500 χιλιοστών του δευτερολέπτου, παρακαλώ επιλέξτε την 'εξαιρετικά χαμηλή' λειτουργία."
 SubjectiveVideoEnhancements="Υποκειμενικές Βελτιώσεις Βίντεο"
+8bitUnsupportedHdr="Το OBS δεν υποστηρίζει την έξοδο 8-bit του Rec. 2100."
 10bitUnsupportedAvc="Αδυναμία εκτέλεσης 10-bit κωδικοποίησης στον κωδικοποιητή Intel QSV H.264."
+16bitUnsupported="Αδυναμία εκτέλεσης 16-bit κωδικοποίησης σε αυτόν τον κωδικοποιητή."
+BFrames="B Καρέ"
+TargetUsage.TU1="TU1: Πιο αργό (Καλύτερη ποιότητα)"
+TargetUsage.TU2="TU2: Πιο αργό"
+TargetUsage.TU3="TU3: Αργό"
+TargetUsage.TU4="TU4: Ισορροπημένο (Μεσαία ποιότητα)"
+TargetUsage.TU5="TU5: Γρήγορο"
+TargetUsage.TU6="TU6: Πιο γρήγορο"
+TargetUsage.TU7="TU7: Ταχύτερο (Καλύτερη Ταχύτητα)"

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/es-ES.ini Changed

@@ -3,11 +3,18 @@
 RateControl="Control de la frecuencia"
 KeyframeIntervalSec="Intervalo de fotogramas clave (0=auto)"
 Profile="Perfíl"
-Accuracy="Precision"
-Convergence="Convergencia"
 ICQQuality="Calidad ICQ"
 Latency="Latencia"
 Latency.ToolTip="Hay una compensación entre latencia y calidad.\nSi prefiere calidad, seleccione el modo 'normal', que puede tener una latencia de extremo a extremo de unos 2s.\nEn caso que requiera < 500ms de latencia, por favor seleccione el modo 'ultra-low'."
 SubjectiveVideoEnhancements="Mejoras subjetivas de vídeo"
 8bitUnsupportedHdr="OBS no soporta salida de 8 bits de Rec. 2100."
 10bitUnsupportedAvc="No se puede realizar codificación de 10 bits en el codificador Intel QSV H.264."
+16bitUnsupported="No se puede realizar codificación de 16 bits en este codificador."
+BFrames="B-Frames"
+TargetUsage.TU1="TU1: El más lento (máxima calidad)"
+TargetUsage.TU2="TU2: Más lento"
+TargetUsage.TU3="TU3: Lento"
+TargetUsage.TU4="TU4: Equilibrado (calidad media)"
+TargetUsage.TU5="TU5: Rápido"
+TargetUsage.TU6="TU6: Más rápido"
+TargetUsage.TU7="TU7: El más rápido (mejor velocidad)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/fa-IR.ini Changed

@@ -4,11 +4,18 @@
 RateControl="کنترل نرخ"
 KeyframeIntervalSec="فاصله فریم کلیدی (0=خودکار)"
 Profile="نمایه"
-Accuracy="دقت"
-Convergence="همگرایی"
 ICQQuality="کیفیت ICQ"
 Latency="تأخیر"
 Latency.ToolTip="معامله بین تأخیر و کیفیت وجود دارد.\nاگر پرونده شما کیفیت را ترجیح می دهد، لطفاً حالت \"عادی\" را انتخاب کنید که ممکن است تاخیر پایان به پایان> 2 ثانیه داشته باشد.\n اگر پرونده شما به <500 میلی ثانیه تاخیر پایان به پایان نیاز دارد، لطفاً حالت \"خیلی کم\" را انتخاب کنید."
 SubjectiveVideoEnhancements="پیشرفت های ویدئویی ذهنی"
 8bitUnsupportedHdr="OBS خروجی 8 بیتی ضبط را پشتیبانی نمی کند. 2100."
 10bitUnsupportedAvc="نمی توان رمزگذاری 10 بیتی را روی رمزگذار Intel QSV H.264 انجام داد."
+16bitUnsupported="نمی‌توان رمزگذاری ۱۶ بیتی را روی این رمزگذار انجام داد."
+BFrames="فریم های B"
+TargetUsage.TU1="TU1: کندترین (بهترین کیفیت)"
+TargetUsage.TU2="TU2: کندتر"
+TargetUsage.TU3="TU3: کند"
+TargetUsage.TU4="TU4: متعادل (کیفیت متوسط)"
+TargetUsage.TU5="TU5: سریع"
+TargetUsage.TU6="TU6: سریعتر"
+TargetUsage.TU7="TU7: سریعترین (بهترین سرعت)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/fi-FI.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Bittinopeuden säätely"
 KeyframeIntervalSec="Avainruutujen väli (0=automaattinen)"
 Profile="Profiili"
-Accuracy="Tarkkus"
-Convergence="Suppeneminen"
 ICQQuality="ICQ laatu"
 Latency="Viive"
 Latency.ToolTip="Laadun ja viiveen välillä on kompromissi.\nJos tarvitset paremman laadun, valitse \"normaali\" -tila, joka saattaa johtaa yli kahden sekunnin viiveeseen.\nJos tarvitset alle 500ms viiveen, valitse \"ultra-low\" -tila."
 SubjectiveVideoEnhancements="Subjektiiviset kuvanparannukset"
 8bitUnsupportedHdr="OBS ei tue 8-bittistä käyttöä Rec. 2100:n kanssa."
 10bitUnsupportedAvc="Ei voida suorittaa 10-bittistä koodausta Intel QSV H.264 kooderilla."
+16bitUnsupported="Ei voida suorittaa 16-bittistä koodausta tälle enkooderille."
+BFrames="B-kehykset"
+TargetUsage.TU1="TU1: Hitain (paras laatu)"
+TargetUsage.TU2="TU2: Hitaampi"
+TargetUsage.TU3="TU3: Hidas"
+TargetUsage.TU4="TU4: Keskitaso (keskilaatuinen)"
+TargetUsage.TU5="TU5: Nopeampi"
+TargetUsage.TU6="TU6: Nopea"
+TargetUsage.TU7="TU7: Nopein (paras nopeus)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/fr-FR.ini Changed

@@ -4,10 +4,18 @@
 RateControl="Contrôle du débit"
 KeyframeIntervalSec="Intervalle d'images clés (0 = auto)"
 Profile="Profil"
-Accuracy="Précision"
 ICQQuality="Qualité ICQ"
 Latency="Latence"
 Latency.ToolTip="Il y a un compromis entre latence et qualité.\nSi vous souhaitez une qualité supérieure, sélectionnez le mode 'normal' qui peut engendrer plus de 2s de latence.\nSi vous avez besoin d'une latence inférieure à 500 ms, sélectionnez le mode 'latence ultra faible'."
 SubjectiveVideoEnhancements="Améliorations vidéo subjectives"
 8bitUnsupportedHdr="OBS ne prend pas en charge la sortie 8 bits de la Rec. 2100."
 10bitUnsupportedAvc="Impossible d'effectuer l'encodage 10 bits sur l'encodeur Intel QSV H.264."
+16bitUnsupported="Impossible d'effectuer un encodage sur 16 bits avec cet encodeur."
+BFrames="Images B"
+TargetUsage.TU1="TU1 : La plus lente (meilleure qualité)"
+TargetUsage.TU2="TU2 : Plus lente"
+TargetUsage.TU3="TU3 : Lente"
+TargetUsage.TU4="TU4 : Équilibrée (qualité moyenne)"
+TargetUsage.TU5="TU5 : Rapide"
+TargetUsage.TU6="TU6 : Plus rapide"
+TargetUsage.TU7="TU7 : La plus rapide (meilleures performances)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/he-IL.ini Changed

@@ -4,11 +4,18 @@
 RateControl="בקרת קצב"
 KeyframeIntervalSec="מרווח תמונות מפתח (0=אוטומטי)"
 Profile="פרופיל"
-Accuracy="דיוק"
-Convergence="התכנסות"
 ICQQuality="איכות ICQ"
 Latency="זמן שיהוי (Latency)"
 Latency.ToolTip="קיים יחס בין זמן שיהוי (Latency) לבין איכות.\nאם השימוש שלך מתעדף איכות, נא לבחור במצב 'רגיל', שעשוי לקבל מעל 2 שניות זמן שיהוי קצה-אל-קצה.\nאם השימוש שלך דורש פחות מ-500 מילי שניות זמן שיהוי קצה-אל-קצה, נא לבחור במצב 'אולטרה-נמוך'."
 SubjectiveVideoEnhancements="שיפורי וידאו סובייקטיביים."
 8bitUnsupportedHdr="OBS לא תומך בפלט 8 סיביות עם Rec. 2100."
 10bitUnsupportedAvc="לא ניתן לבצע הצפנה של 10 סיביות במצפין QSV H.264 של אינטל."
+16bitUnsupported="לא ניתן לבצע הצפנה של 16 סיביות במצפין הזה."
+BFrames="תמוניות B"
+TargetUsage.TU1="TU1: האיטי ביותר (האיכות הטובה ביותר)"
+TargetUsage.TU2="TU2: איטי יותר"
+TargetUsage.TU3="TU3: איטי"
+TargetUsage.TU4="TU4: מאוזן (איכות בינונית)"
+TargetUsage.TU5="TU5: מהיר"
+TargetUsage.TU6="TU6: מהיר יותר"
+TargetUsage.TU7="TU7: הכי מהיר (המהירות המיטבית)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/hi-IN.ini Changed

@@ -4,11 +4,18 @@
 RateControl="दर नियंत्रण"
 KeyframeIntervalSec="कीफ़्रेम अंतराल (0=स्वतः)"
 Profile="प्रोफ़ाइल"
-Accuracy="सटीकता"
-Convergence="कन्वर्जेंस"
 ICQQuality="ICQ गुणवत्ता"
 Latency="विलंबता"
 Latency.ToolTip="विलंबता और गुणवत्ता के बीच समझौता करना पड़ता है.\nयदि आप गुणवत्ता पसंद करते हैं, तो कृपया 'सामान्य' मोड चुनें, जो ओर-छोर की > 2सेकेंड की विलंबता प्राप्त कर सकता है.\nयदि आपके मामले में <500मिलीसेकेंड ओर-छोर के विलंबता की आवश्यकता है , तो कृपया 'अति-नयून' मोड चुनें."
 SubjectiveVideoEnhancements="सब्जेक्टिव वीडियो एन्हांसमेंट"
 8bitUnsupportedHdr="Rec. 2100 के 8-बिट् आउटपुट को OBS सपोर्ट नहीं करता है."
 10bitUnsupportedAvc="Intel QSV H.264 एन्कोडर पर 10-बिट् एन्कोड नहीं किया जा सकता."
+16bitUnsupported="इस एन्कोडर पर 16-बिट एन्कोड नहीं किया जा सकता."
+BFrames="B फ़्रेम्स"
+TargetUsage.TU1="TU1: सबसे धीमा (महत्तम गुणवत्ता)"
+TargetUsage.TU2="TU2: थोड़ा धीमा"
+TargetUsage.TU3="TU3: धीमा"
+TargetUsage.TU4="TU4: मध्यम (मध्यम गुणवत्ता)"
+TargetUsage.TU5="TU5: तेज"
+TargetUsage.TU6="TU6: और तेज"
+TargetUsage.TU7="TU7: सबसे तेज (महत्तम गति)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/hu-HU.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Sebesség Vezérlés"
 KeyframeIntervalSec="Kulcsképkockák időköze (0=automatikus)"
 Profile="Profil"
-Accuracy="Pontosság"
-Convergence="Konvergencia"
 ICQQuality="ICQ minőség"
 Latency="Késleltetés"
 Latency.ToolTip="A késés és a minőség között kompromisszum van.\nHa az eset inkább a minőséget részesíti előnyben, akkor válaszd a „normál” módot, amely> 2-es végső látenciát kaphat. \nHa az esetének <500 ms közötti teljes késleltetést igényel, akkor válaszd az „ultra alacsony” módot."
 SubjectiveVideoEnhancements="Szubjektív videó fejlesztések"
 8bitUnsupportedHdr="Az OBS nem támogatja a Rec. 2100 8 bites kimenetét."
 10bitUnsupportedAvc="Nem lehet 10 bites kódolást végezni az Intel QSV H.264 kódolón."
+16bitUnsupported="Nem lehet 16 bites kódolást végezni ezen a kódolón."
+BFrames="B képkockák"
+TargetUsage.TU1="FC7: Leglassabb (legjobb minőség)"
+TargetUsage.TU2="FC2: Lassabb"
+TargetUsage.TU3="FC3: Lassú"
+TargetUsage.TU4="FC4: Kiegyensúlyozott (Közepes minőség)"
+TargetUsage.TU5="FC5: Gyors"
+TargetUsage.TU6="FC6: Gyorsabb"
+TargetUsage.TU7="FC7: Leggyorsabb (legjobb sebesség)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/hy-AM.ini Changed

@@ -1,14 +1,14 @@
-TargetUsage="Թիրախային օգտագործումը"
-Bitrate="Բիթրեյթ"
-MaxBitrate="Առավելագույն բիթրեյթ"
-RateControl="Բիթերի կառավարում"
+TargetUsage="Նպատակային օգտագործում"
+Bitrate="Բիտրեյթ"
+MaxBitrate="Առավելագույն բիտրեյթ"
+RateControl="Բիտրեյթի կառավարում"
 KeyframeIntervalSec="Հիմնական կադրերի ընդմիջում (0=ավտոմատ)"
 Profile="Պրոֆիլ"
-Accuracy="Ճշգրտություն"
-Convergence="Կոնվերգենցիա"
 ICQQuality="ICQ-որակը"
 Latency="Լատենտություն"
 Latency.ToolTip="Կա փոխզիջում հապաղման և որակի միջև:\nԵթե ձեր գործն առաջնահերթություն է տալիս որակին, խնդրում ենք ընտրել «Նորմալ» ռեժիմը, որը կարող է ունենալ >2 վրկ վերջից մինչև վերջ հապաղում:\nԵթե ձեր գործը պահանջում է < 500 մս վերջից մինչև վերջ հապաղում: , խնդրում ենք ընտրել «Ուլտրա-ցածր» ռեժիմը:"
 SubjectiveVideoEnhancements="Տեսանյութի սուբյեկտիվ բարելավումներ"
 8bitUnsupportedHdr="OBS-ը չի աջակցում 8-բիթ Rec. 2100-ի ելքը"
 10bitUnsupportedAvc="Հնարավոր չէ կատարել 10-բիթանոց կոդավորում Intel QSV H.264 կոդավորիչի վրա։"
+16bitUnsupported="Հնարավոր չէ կատարել 16-բիթանոց կոդավորում։"
+BFrames="B Կադրեր"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/id-ID.ini Changed

@@ -3,11 +3,17 @@
 RateControl="Kontrol Rate"
 KeyframeIntervalSec="Interval Keyframe (0=otomatis)"
 Profile="Profil"
-Accuracy="Akurasi"
-Convergence="Konvergensi"
 ICQQuality="Kualitas ICQ"
 Latency="Latensi"
 Latency.ToolTip="Ada untung-rugi antara latensi dan kualitas.\nJika lebih memilih kualitas, silakan pilih mode 'normal', kemungkinan ada latensi end-to-end > 2 detik.\nJika menginginkan latensi end-to-end < 500 milidetik, silakan pilih mode 'ultra-low'."
 SubjectiveVideoEnhancements="Penyempurnaan Subyektif Video"
 8bitUnsupportedHdr="OBS tidak mendukung output 8-bit dari Rec. 2100."
 10bitUnsupportedAvc="Tidak dapat melakukan meng-kode 10-bit pada pengkodean Intel QSV H.264."
+16bitUnsupported="Tidak dapat melakukan meng-kode 16-bit pada pengkodean ini."
+TargetUsage.TU1="TU1: Paling Lambat (Kualitas Terbaik)"
+TargetUsage.TU2="TU2: Lebih Lambat"
+TargetUsage.TU3="TU3: Lambat"
+TargetUsage.TU4="TU4: Seimbang (Kualitas Menengah)"
+TargetUsage.TU5="TU5: Cepat"
+TargetUsage.TU6="TU6: Lebih Cepat"
+TargetUsage.TU7="TU7: Paling Cepat (Kecepatan Terbaik)"

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/it-IT.ini Changed

@@ -4,12 +4,18 @@
 RateControl="Tipo di controllo della frequenza"
 KeyframeIntervalSec="Intervallo fotogramma chiave (0=automatico)"
 Profile="Profilo"
-Accuracy="Precisione"
-Convergence="Convergenza"
 ICQQuality="Qualità ICQ"
 Latency="Latenza"
 Latency.ToolTip="C'è un compromesso tra latenza e qualità.\nSe nel tuo caso si preferisce la qualità, seleziona la modalità 'normale', arrivando a più di 2s di latenza end-to-end.\nSe si vuole una latenza minore di 500ms, seleziona la modalità 'ultra-low'."
 SubjectiveVideoEnhancements="Miglioramenti Video Soggettivi"
 8bitUnsupportedHdr="OBS non supporta l'uscita Rec. 2100 8bit."
 10bitUnsupportedAvc="Impossibile eseguire la codifica a 10 bit con l'encoder Intel QSV H.264."
-16bitUnsupported="Impossibile eseguire la codifica a 16-bit su questo encoder."
+16bitUnsupported="Impossibile con questo encoder eseguire la codifica a 16bit."
+BFrames="B-frame"
+TargetUsage.TU1="TU1: più lento (migliore qualità)"
+TargetUsage.TU2="TU2: più lento"
+TargetUsage.TU3="TU3: lento"
+TargetUsage.TU4="TU4: bilanciato (media qualità)"
+TargetUsage.TU5="TU5: veloce"
+TargetUsage.TU6="TU6: più veloce"
+TargetUsage.TU7="TU7: più veloce (massima velocità)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ka-GE.ini Changed

@@ -4,11 +4,18 @@
 RateControl="სიხშირის მართვა"
 KeyframeIntervalSec="საკვანძო კადრების დაშორება (0=თვითშერჩევა)"
 Profile="პროფილი"
-Accuracy="სიზუსტე"
-Convergence="შერწყმა"
 ICQQuality="ICQ-ხარისხი"
 Latency="დაყოვნება"
 Latency.ToolTip="დაყოვნება და ხარისხი ურთიერთსაპირისპირო კავშირშია.\nთუ ხარისხს ამჯობინებთ, აირჩიეთ „normal“ და მაყურებელთან დაყოვნება > 2წმ იქნება.\nთუ გესაჭიროებათ მცირე < 500მწმ დაყოვნება, აირჩიეთ „ultra-low“."
 SubjectiveVideoEnhancements="ვიდეოს მოჩვენებითი გაუმჯობესება"
 8bitUnsupportedHdr="OBS-ში ვერ იქნება გამოყენებული 8-ბიტიანი გამოტანა და Rec. 2100."
 10bitUnsupportedAvc="10-ბიტიანი დაშიფვრა ვერ მოხერხდება Intel-QSV-H.264-მშიფრავით."
+16bitUnsupported="16-ბიტიანი დაშიფვრა ვერ ხერხდება ამ მშიფრავით."
+BFrames="B-კადრები"
+TargetUsage.TU1="TU1: უნელესი (საუკეთესო ხარისხი)"
+TargetUsage.TU2="TU2: მეტად ნელი"
+TargetUsage.TU3="TU3: ნელი"
+TargetUsage.TU4="TU4: საშუალო (საშუალო ხარისხი)"
+TargetUsage.TU5="TU5: სწრაფი"
+TargetUsage.TU6="TU6: მეტად სწრაფი"
+TargetUsage.TU7="TU7: უსწრაფესი (საუკეთესო ხარისხი)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ms-MY.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Kawalan Kadar"
 KeyframeIntervalSec="Sela Bingkai Kunci (0=auto)"
 Profile="Profil"
-Accuracy="Ketepatan"
-Convergence="Penumpuan"
 ICQQuality="Kualiti ICQ"
 Latency="Kependaman"
 Latency.ToolTip="Terdapat tukar-ganti antara kependaman dengan kualiti.\nJika ada mahukan kualiti, sila pilih mod 'biasa', yang memperoleh >2s kependaman hujung-ke-hujung.\nJika anda mahu <500ms kependaman hujung-ke-hujung, sila pilih mod 'ultra-rendah'."
 SubjectiveVideoEnhancements="Penambahbaikan Video Subjektif"
 8bitUnsupportedHdr="OBS tidak menyokong penggunaan output 8-bit Rec. 2100."
 10bitUnsupportedAvc="Tidak dapat melakukan pengekodan 10-bit dengan pengekod H.264 QSV Intel."
+16bitUnsupported="Tidak dapat melakukan pengekodan 16-bit dengan pengekod ini."
+BFrames="Bingkai B"
+TargetUsage.TU1="TU1: Paling Perlahan (Kualiti Terbaik)"
+TargetUsage.TU2="TU2: Perlahan"
+TargetUsage.TU3="TU3: Perlahan"
+TargetUsage.TU4="TU4: Seimbang (Kualiti Pertengahan)"
+TargetUsage.TU5="TU5: Laju"
+TargetUsage.TU6="TU6: Laju Sedikit"
+TargetUsage.TU7="TU7: Paling Laju (Kelajuan Terbaik)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/nl-NL.ini Changed

@@ -2,11 +2,18 @@
 MaxBitrate="Maximale bitrate"
 KeyframeIntervalSec="Tijd tussen keyframes (0=auto)"
 Profile="Profiel"
-Accuracy="Nauwkeurigheid"
-Convergence="Convergentie"
 ICQQuality="ICQ kwaliteit"
 Latency="Vertraging"
 Latency.ToolTip="Er is een wisselwerking tussen vertraging en kwaliteit.\nAls de kwaliteit primeert selecteert u 'normaal', waarbij de end-to-end vertraging >2s kan zijn. \nAls u <500ms vertraging nodig heeft selecteert u 'ultra-laag'."
 SubjectiveVideoEnhancements="Subjectieve Videoverbeteringen"
 8bitUnsupportedHdr="OBS ondersteunt geen 8-bit output van Rec. 2100."
 10bitUnsupportedAvc="Kan geen 10-bit encoding doen op Intel QSV H.264 encoder."
+16bitUnsupported="Kan niet 16-bit encoden met deze encoder."
+BFrames="B-frames"
+TargetUsage.TU1="TU1: Langzaamste (beste kwaliteit)"
+TargetUsage.TU2="TU2: Langzamer"
+TargetUsage.TU3="TU3: Langzaam"
+TargetUsage.TU4="TU4: Gebalanceerd (gemiddelde kwaliteit)"
+TargetUsage.TU5="TU5: Snel"
+TargetUsage.TU6="TU6: Sneller"
+TargetUsage.TU7="TU7: Snelste (beste snelheid)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/nn-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/nn-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/pt-BR.ini Changed

@@ -2,11 +2,18 @@
 RateControl="Controle de Bitrate"
 KeyframeIntervalSec="Intervalo de Keyframe (0=auto)"
 Profile="Perfil"
-Accuracy="Precisão"
-Convergence="Convergência"
 ICQQuality="Qualidade ICQ"
 Latency="Latência"
 Latency.ToolTip="Existe uma troca entre latência e qualidade.\nSe você prefere qualidade, por favor selecione o modo 'normal', que pode obter > 2s de latência de ponta a ponta.\nSe você prefere < 500ms de latência de ponta a ponta, por favor selecione o modo 'ultra-low'."
 SubjectiveVideoEnhancements="Aprimoramentos Subjetivos de Vídeo"
 8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."
 10bitUnsupportedAvc="Não é possível executar a codificação de 10 bits no codificador Intel QSV H.264."
+16bitUnsupported="Codificação 16-bit não pode ser feita neste codificador."
+BFrames="B-Frames"
+TargetUsage.TU1="TU1: O Mais Lento (Melhor Qualidade)"
+TargetUsage.TU2="TU2: Mais Lento"
+TargetUsage.TU3="TU3: Lento"
+TargetUsage.TU4="TU4: Balanceado (Qualidade Média)"
+TargetUsage.TU5="TU5: Rápido"
+TargetUsage.TU6="TU6: Mais Rápido"
+TargetUsage.TU7="TU7: O Mais Rápido (Melhor Velocidade)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/pt-PT.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Controlo de taxa"
 KeyframeIntervalSec="Intervalo de fotogramas-chave ( 0=automático)"
 Profile="Perfil"
-Accuracy="Precisão"
-Convergence="Convergência"
 ICQQuality="Qualidade ICQ"
 Latency="Latência"
 Latency.ToolTip="Existe uma escolha a fazer entre latência e qualidade.\nSe prefere qualidade, selecione o modo \"Normal\" e pode obter > 2s de latência de ponta a ponta.\nSe requer latência < 500ms de ponta a ponta, selecione o modo \"Ultra-baixo\"."
 SubjectiveVideoEnhancements="Melhorias de vídeo subjetivas"
 8bitUnsupportedHdr="O OBS não suporta saída de 8 bits do Rec. 2100."
 10bitUnsupportedAvc="Não é possível executar a codificação de 10 bits no codificador Intel QSV H.264."
+16bitUnsupported="Não é possível executar a codificação de 16 bits neste codificador."
+BFrames="Fotogramas B"
+TargetUsage.TU1="TU1: O mais lento (Qualidade mais alta)"
+TargetUsage.TU2="TU2: Muito lento"
+TargetUsage.TU3="TU3: Lento"
+TargetUsage.TU4="TU4: Equilibrado (Qualidade média)"
+TargetUsage.TU5="TU5: Rápido"
+TargetUsage.TU6="TU6: Muito rápido"
+TargetUsage.TU7="TU7: O mais rápido (Velocidade mais alta)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ro-RO.ini Changed

@@ -4,11 +4,11 @@
 RateControl="Controlul ratei"
 KeyframeIntervalSec="Interval de cadre cheie (0=auto)"
 Profile="Profil"
-Accuracy="Acuratețe"
-Convergence="Convergență"
 ICQQuality="Calitate ICQ"
 Latency="Latență"
-Latency.ToolTip="Există un compromis între latență și calitate.\nDacă cazul dvs. preferă calitatea, vă rugăm să selectați modul 'normal', care poate primi > 2s latență end-to-end.\nDacă cazul tău necesită < 500ms latență cap la cap, te rugăm să selectezi modul 'ultra-low'."
+Latency.ToolTip="Există un compromis între latență și calitate.\nDacă în cazul tău se preferă calitatea, te rugăm să selectezi modul „normal” care poate duce la peste 2s latență de la un capăt la altul.\nDacă cazul tău necesită sub 500ms latență de la un capăt la altul, te rugăm să selectezi modul „ultrascăzut”."
 SubjectiveVideoEnhancements="Îmbunătățiri video subiective"
 8bitUnsupportedHdr="OBS nu suportă outputul pe 8 biți a Rec. 2100."
 10bitUnsupportedAvc="Nu se poate efectua codificarea de 10 biți pe codificatorul Intel QSV H.264."
+16bitUnsupported="Nu se poate efectua codarea pe 16 biți pe acest codificator."
+BFrames="Cadre B"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/ru-RU.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Управление битрейтом"
 KeyframeIntervalSec="Интервал ключевых кадров (0=авто)"
 Profile="Профиль"
-Accuracy="Точность"
-Convergence="Конвергенция"
 ICQQuality="Качество ICQ"
 Latency="Задержка"
-Latency.ToolTip="Существует компромисс между задержкой и качеством.\nЕсли ваше дело отдает предпочтение качеству, выберите «нормальный» режим, который может иметь сквозную задержку>2 с.\nЕсли ваше дело требует сквозной задержки <500 мс, пожалуйста, выберите режим «ультра-низкий»."
+Latency.ToolTip="Существует компромисс между задержкой и качеством.\nЕсли ваше дело отдаёт предпочтение качеству, выберите «нормальный» режим, который может иметь сквозную задержку>2 с.\nЕсли ваше дело требует сквозной задержки <500 мс, пожалуйста, выберите режим «сверхнизкий»."
 SubjectiveVideoEnhancements="Субъективные улучшения видео"
 8bitUnsupportedHdr="OBS не поддерживает 8-битный вывод Rec. 2100."
-10bitUnsupportedAvc="Невозможно выполнить 10-битное кодирование в кодировщике Intel QSV H.264."
+10bitUnsupportedAvc="Не удаётся выполнить 10-битное кодирование в кодировщике Intel QSV H.264."
+16bitUnsupported="Не удаётся выполнить 16-битное кодирование в этом кодировщике."
+BFrames="B-кадры"
+TargetUsage.TU1="ЦИ1: Самая медленная (лучшее качество)"
+TargetUsage.TU2="ЦИ2: Более медленная"
+TargetUsage.TU3="ЦИ3: Медленная"
+TargetUsage.TU4="ЦИ4: Сбалансированная (среднее качество)"
+TargetUsage.TU5="ЦИ5: Быстрая"
+TargetUsage.TU6="ЦИ6: Более быстрая"
+TargetUsage.TU7="ЦИ7: Самая быстрая (лучшая скорость)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/sk-SK.ini Changed

@@ -3,11 +3,18 @@
 RateControl="Riadenie toku"
 KeyframeIntervalSec="Interval kľúčových snímkov (0=automaticky)"
 Profile="Profil"
-Accuracy="Presnosť"
-Convergence="Konvergencia"
 ICQQuality="ICQ Kvalita"
 Latency="Odozva"
 Latency.ToolTip="Medzi odozvou a kvalitou existuje kompromis. \nAk uprednostňujete kvalitu, vyberte prosím 'normálny' režim, ktorý môže mať > 2s odozvu. \nAk potrebujete odozvu < 500ms, vyberte režim 'nízka odozva'."
 SubjectiveVideoEnhancements="Subjektívne vylepšenia videa"
 8bitUnsupportedHdr="OBS nepodporuje 8-bitový výstup z Rec. 2100."
 10bitUnsupportedAvc="Nemožno vykonať 10-bitové enkódovanie na enkodéri Intel QSV H.264."
+16bitUnsupported="Nemožno vykonať 16-bitové enkódovanie na tomto enkodéri."
+BFrames="B snímky"
+TargetUsage.TU1="TU1: Najpomalší (Najlepšia kvalita)"
+TargetUsage.TU2="TU2: Pomalší"
+TargetUsage.TU3="TU3: Pomalý"
+TargetUsage.TU4="TU4: Vyrovnaný (Stredná kvalita)"
+TargetUsage.TU5="TU5: Rýchly"
+TargetUsage.TU6="TU6: Rýchlejší"
+TargetUsage.TU7="TU7: Najrýchlejší (Najlepšia rýchlosť)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/sl-SI.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Nadzor hitrosti"
 KeyframeIntervalSec="Razmik med ključnimi sličicami (0=samodejno)"
 Profile="Profil"
-Accuracy="Natančnost"
-Convergence="Zbliževanje"
 ICQQuality="Kakovost ICQ"
 Latency="Zakasnitev"
 Latency.ToolTip="Razmerje med zamikom/ latenco in kakovstjo je kompromi.\nČe potrebujete kakovost, izbertie način 'normalno', ki lahko doseže latenco večjo od dveh sekund.\nČe potrebujete latenco manjšo od 500ms, izberite način 'ultra-nizka'."
 SubjectiveVideoEnhancements="Subjektivne izboljšave videa"
 8bitUnsupportedHdr="OBS ne podpira rabe 8-bitnega izhoda z Rec. 2100."
 10bitUnsupportedAvc="Na kodirniku Intel QSV H.264 ni mogoče izvesti 10-bitnega kodiranja."
+16bitUnsupported="S tem kodirnikom ni mogoče izvesti 16-bitnega kodiranja."
+BFrames="B-sličice"
+TargetUsage.TU1="TU1: najpočasneje (najvišja kakovost)"
+TargetUsage.TU2="TU2: še počasneje"
+TargetUsage.TU3="TU3: počasno"
+TargetUsage.TU4="TU4: uravnoteženo (srednja kakovost)"
+TargetUsage.TU5="TU5: hitro"
+TargetUsage.TU6="TU6: še hitreje"
+TargetUsage.TU7="TU7: najhitreje (najvišja hitrost)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/sv-SE.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Hastighetskontroll"
 KeyframeIntervalSec="Intervall för keyframes (0=automatiskt)"
 Profile="Profil"
-Accuracy="Noggrannhet"
-Convergence="Konvergens"
 ICQQuality="ICQ-kvalitet"
 Latency="Latens"
 Latency.ToolTip="Man kan välja mellan latens och kvalitet.\nOm du föredrar kvalitet väljer du läget \"normal\", som ger dig en latenstid på >2s för slutpunkt till slutpunkt.\nOm du kräver en latenstid på <500 ms för slutpunkt till slutpunkt väljer du läget \"ultralåg\"."
 SubjectiveVideoEnhancements="Subjektiva videoförbättringar"
 8bitUnsupportedHdr="OBS saknar stöd för 8-bitars utmatning av Rec. 2100."
 10bitUnsupportedAvc="Kan inte utföra 10-bitars kodning på Intel QSV H.264-kodare."
+16bitUnsupported="Kan inte utföra kodning med 16-bitar på denna kodare."
+BFrames="B-bildrutor"
+TargetUsage.TU1="TU1: Långsammast (bäst kvalitet)"
+TargetUsage.TU2="TU2: Långsammare"
+TargetUsage.TU3="TU3: Långsam"
+TargetUsage.TU4="TU4: Balanserad (mediumkvalitet)"
+TargetUsage.TU5="TU5: Snabb"
+TargetUsage.TU6="TU6: Snabbare"
+TargetUsage.TU7="TU7: Snabbaste (bäst hastighet)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/tl-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/tl-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/tr-TR.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Oran Kontrolü"
 KeyframeIntervalSec="Anahtar Kare Aralığı (0=otomatik)"
 Profile="Profil"
-Accuracy="Doğruluk"
-Convergence="Yakınsama"
 ICQQuality="ICQ Kalitesi"
 Latency="Gecikme süresi"
 Latency.ToolTip="Gecikme ve kalite arasında bir denge vardır.\nKaliteyi tercih ediyorsanız, lütfen 2s'den uzun uçtan uca gecikme süresine çıkabilen 'normal' modunu seçin.\nDurumunuz 500ms'den düşük uçtan uca gecikme gerektiriyorsa, lütfen 'ultra düşük' modunu seçin."
 SubjectiveVideoEnhancements="Öznel Video Geliştirmeleri"
 8bitUnsupportedHdr="OBS Rec. 2100'ün 8-bit olarak çıkışını desteklemiyor."
 10bitUnsupportedAvc="Intel QSV H.264 kodlayıcıda 10-bit kodlama gerçekleştirilemiyor."
+16bitUnsupported="Bu kodlayıcıda 16 bit kodlama gerçekleştirilemiyor."
+BFrames="B Kareleri"
+TargetUsage.TU1="TU1: En Yavaş (En İyi Kalite)"
+TargetUsage.TU2="TU2: Daha Az Yavaş"
+TargetUsage.TU3="TU3: Yavaş"
+TargetUsage.TU4="TU4: Dengeli (Orta Kalite)"
+TargetUsage.TU5="TU5: Hızlı"
+TargetUsage.TU6="TU6: Daha Hızlı"
+TargetUsage.TU7="TU7: En Hızlı (En İyi Hız)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/uk-UA.ini Changed

@@ -4,11 +4,18 @@
 RateControl="Керування бітрейтом"
 KeyframeIntervalSec="Інтервал ключових кадрів (0=авто)"
 Profile="Профіль"
-Accuracy="Точність"
-Convergence="Збіжність результатів"
 ICQQuality="Якість ICQ"
 Latency="Затримка"
 Latency.ToolTip="Є компроміс між затримкою і якістю.\nЯкщо у вашому випадку надається перевага якості, тоді виберіть «нормальний» режим, який може надати понад 2 с кінцевої затримки.\nЯкщо у вашому потрібно менше ніж 500 мс кінцевої затримки – виберіть, «ультранизький» режим."
 SubjectiveVideoEnhancements="Суб'єктивні покращення відео"
 8bitUnsupportedHdr="OBS не підтримує 8-розрядний вивід з Rec. 2100."
 10bitUnsupportedAvc="Не вдалося виконати 10-розрядне кодування на кодувальнику Intel QSV H.264."
+16bitUnsupported="Не можна виконати 16-розрядний код на цьому кодувальнику."
+BFrames="B-кадри"
+TargetUsage.TU1="TU1: Найнижча (найкраща якість)"
+TargetUsage.TU2="TU2: Нижча"
+TargetUsage.TU3="TU3: Низька"
+TargetUsage.TU4="TU4: Збалансована (середня якість)"
+TargetUsage.TU5="TU5: Висока"
+TargetUsage.TU6="TU6: Вища"
+TargetUsage.TU7="TU7: Найвища (найкраща швидкість)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/vi-VN.ini Changed

@@ -3,10 +3,18 @@
 RateControl="Cách kiểm soát bitrate"
 KeyframeIntervalSec="Khoảng thời gian giữa các khung chính (0=tự động)"
 Profile="Hồ sơ"
-Accuracy="Độ chính xác"
 ICQQuality="ICQ chất lượng"
 Latency="Độ trễ"
 Latency.ToolTip="Có sự đánh đổi giữa độ trễ và chất lượng.\nNếu trường hợp của bạn ưu tiên chất lượng, hãy chọn chế độ 'trung bình', cái có thể có độ trễ cuối-cuối > 2 giây.\nNếu trường hợp của bạn yêu cầu độ trễ cuối-cuối < 500ms, hãy chọn chế độ 'siêu thấp'."
 SubjectiveVideoEnhancements="Cải tiến video chủ quan"
 8bitUnsupportedHdr="OBS không hỗ trợ đầu ra 8-bit của Rec. 2100."
 10bitUnsupportedAvc="Không thể thực hiện mã hóa 10-bit trên bộ mã hóa Intel QSV H.264."
+16bitUnsupported="Không thể thực hiện mã hóa 16-bit trên encoder này."
+BFrames="Khung B"
+TargetUsage.TU1="TU1: Chậm nhất (Chất lượng tốt nhất)"
+TargetUsage.TU2="TU2: Chậm hơn"
+TargetUsage.TU3="TỦ: Chậm"
+TargetUsage.TU4="TU4: Cân bằng (Chất lượng trung bình)"
+TargetUsage.TU5="TU5: Nhanh"
+TargetUsage.TU6="TU6: Nhanh hơn"
+TargetUsage.TU7="TU7: Nhanh nhất (Tốc độ tốt nhất)"

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/obs-qsv-test/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/obs-qsv-test/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/obs-qsv-test/cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/obs-qsv-test/cmake/legacy.cmake Added

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/obs-qsv-test/obs-qsv-test.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/obs-qsv-test/obs-qsv-test.cpp Changed

@@ -1,6 +1,6 @@
-#include "mfxstructures.h"
-#include "mfxadapter.h"
-#include "mfxvideo++.h"
+#include <vpl/mfxstructures.h>
+#include <vpl/mfxadapter.h>
+#include <vpl/mfxvideo++.h>
 #include "../common_utils.h"
 
 #include <util/windows/ComPtr.hpp>
@@ -18,8 +18,6 @@
 extern "C" __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
 #endif
 
-#define INTEL_VENDOR_ID 0x8086
-
 struct adapter_caps {
 	bool is_intel = false;
 	bool is_dgpu = false;
@@ -30,14 +28,9 @@
 static std::vector<uint64_t> luid_order;
 static std::map<uint32_t, adapter_caps> adapter_info;
 
-static bool has_encoder(mfxIMPL impl, mfxU32 codec_id)
+static bool has_encoder(mfxSession m_session, mfxU32 codec_id)
 {
-	MFXVideoSession session;
-	mfxInitParam init_param = {};
-	init_param.Implementation = impl;
-	init_param.Version.Major = 1;
-	init_param.Version.Minor = 0;
-	mfxStatus sts = session.InitEx(init_param);
+	MFXVideoENCODE *session = new MFXVideoENCODE(m_session);
 
 	mfxVideoParam video_param;
 	memset(&video_param, 0, sizeof(video_param));
@@ -46,8 +39,8 @@
 	video_param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420;
 	video_param.mfx.FrameInfo.Width = MSDK_ALIGN16(1280);
 	video_param.mfx.FrameInfo.Height = MSDK_ALIGN16(720);
-	sts = MFXVideoENCODE_Query(session, &video_param, &video_param);
-	session.Close();
+	mfxStatus sts = session->Query(&video_param, &video_param);
+	session->Close();
 
 	return sts == MFX_ERR_NONE;
 }
@@ -63,11 +56,11 @@
 	return adapter_idx;
 }
 
-static bool get_adapter_caps(IDXGIFactory *factory, uint32_t adapter_idx)
+static bool get_adapter_caps(IDXGIFactory *factory, mfxLoader loader,
+			 mfxSession m_session, uint32_t adapter_idx)
 {
-	mfxIMPL impls4 = {MFX_IMPL_HARDWARE, MFX_IMPL_HARDWARE2,
-			 MFX_IMPL_HARDWARE3, MFX_IMPL_HARDWARE4};
 	HRESULT hr;
+	static uint32_t idx_adjustment = 0;
 
 	ComPtr<IDXGIAdapter> adapter;
 	hr = factory->EnumAdapters(adapter_idx, &adapter);
@@ -79,18 +72,47 @@
 
 	uint32_t luid_idx = get_adapter_idx(adapter_idx, desc.AdapterLuid);
 	adapter_caps &caps = adapter_infoluid_idx;
-	if (desc.VendorId != INTEL_VENDOR_ID)
+	if (desc.VendorId != INTEL_VENDOR_ID) {
+		idx_adjustment++;
 		return true;
-
-	bool dgpu = desc.DedicatedVideoMemory > 512 * 1024 * 1024;
-	mfxIMPL impl = implsadapter_idx;
+	}
 
 	caps.is_intel = true;
-	caps.is_dgpu = dgpu;
-	caps.supports_av1 = has_encoder(impl, MFX_CODEC_AV1);
+
+	mfxImplDescription *idesc;
+	mfxStatus sts =
+		MFXEnumImplementations(loader, adapter_idx - idx_adjustment,
+				 MFX_IMPLCAPS_IMPLDESCSTRUCTURE,
+				 reinterpret_cast<mfxHDL *>(&idesc));
+
+	if (sts != MFX_ERR_NONE)
+		return false;
+
+	caps.is_dgpu = false;
+	if (idesc->Dev.MediaAdapterType == MFX_MEDIA_DISCRETE)
+		caps.is_dgpu = true;
+
+	caps.supports_av1 = false;
+	caps.supports_hevc = false;
+	mfxEncoderDescription *enc = &idesc->Enc;
+	if (enc->NumCodecs != 0) {
+		for (int codec = 0; codec < enc->NumCodecs; codec++) {
+			if (enc->Codecscodec.CodecID == MFX_CODEC_AV1)
+				caps.supports_av1 = true;
+#if ENABLE_HEVC
+			if (enc->Codecscodec.CodecID == MFX_CODEC_HEVC)
+				caps.supports_hevc = true;
+#endif
+		}
+	} else {
+		// Encoder information is not available before TGL for VPL, so the MSDK legacy approach is taken
+		caps.supports_av1 = has_encoder(m_session, MFX_CODEC_AV1);
 #if ENABLE_HEVC
-	caps.supports_hevc = has_encoder(impl, MFX_CODEC_HEVC);
+		caps.supports_hevc = has_encoder(m_session, MFX_CODEC_HEVC);
 #endif
+	}
+
+	MFXDispReleaseImplDescription(loader, idesc);
 
 	return true;
 }
@@ -139,10 +161,34 @@
 	if (FAILED(hr))
 		throw "CreateDXGIFactory1 failed";
 
+	mfxLoader loader = MFXLoad();
+	if (!loader)
+		throw "MFXLoad failed";
+
+	mfxConfig cfg = MFXCreateConfig(loader);
+	if (!cfg)
+		throw "MFXCreateConfig failed";
+
+	mfxVariant impl;
+
+	// Low latency is disabled due to encoding capabilities not being provided before TGL for VPL
+	impl.Type = MFX_VARIANT_TYPE_U32;
+	impl.Data.U32 = MFX_IMPL_TYPE_HARDWARE;
+	MFXSetConfigFilterProperty(
+		cfg, (const mfxU8 *)"mfxImplDescription.Impl", impl);
+
+	mfxSession m_session = nullptr;
+	mfxStatus sts = MFXCreateSession(loader, 0, &m_session);
+
 	uint32_t idx = 0;
-	while (get_adapter_caps(factory, idx++) && idx < 4)
+	while (get_adapter_caps(factory, loader, m_session, idx++) == true)
 		;
 
+	if (m_session)
+		MFXClose(m_session);
+
+	MFXUnload(loader);
+
 	for (auto &idx, caps : adapter_info) {
 		printf("%u\n", idx);
 		printf("is_intel=%s\n", caps.is_intel ? "true" : "false");

obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/obs-qsv11-LICENSE.txt Added

@@ -0,0 +1,59 @@
+Portions of the OBS QSV plugin are separately licensed under either the BSD-3-Clause or GPL-2.0-only licenses.
+
+The license declaration is reproduced below:
+
+/*
+
+This is provided under a dual BSD/GPLv2 license. When using or
+redistributing this, you may do so under either license.
+
+GPL LICENSE SUMMARY
+
+Copyright(c) Oct. 2015 Intel Corporation.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of version 2 of the GNU General Public License as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+Contact Information:
+
+Seung-Woo Kim, seung-woo.kim@intel.com
+705 5th Ave S #500, Seattle, WA 98104
+
+BSD LICENSE
+
+Copyright(c) <date> Intel Corporation.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the
+distribution.
+
+* Neither the name of Intel Corporation nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/obs-qsv11-plugin-main.c -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/obs-qsv11-plugin-main.c Changed

@@ -54,12 +54,8 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <obs-module.h>
-#include <util/windows/device-enum.h>
-#include <util/config-file.h>
-#include <util/platform.h>
-#include <util/pipe.h>
-#include <util/dstr.h>
-#include "QSV_Encoder.h"
+
+#include "common_utils.h"
 
 OBS_DECLARE_MODULE()
 OBS_MODULE_USE_DEFAULT_LOCALE("obs-qsv11", "en-US")
@@ -77,85 +73,16 @@
 extern struct obs_encoder_info obs_qsv_hevc_encoder_tex;
 extern struct obs_encoder_info obs_qsv_hevc_encoder;
 
-extern bool av1_supported(mfxIMPL impl);
-
-struct adapter_info adaptersMAX_ADAPTERS = {0};
-size_t adapter_count = 0;
-
-static bool enum_luids(void *param, uint32_t idx, uint64_t luid)
-{
-	struct dstr *cmd = param;
-	dstr_catf(cmd, " %llX", luid);
-	UNUSED_PARAMETER(idx);
-	return true;
-}
-
 bool obs_module_load(void)
 {
-	char *test_exe = os_get_executable_path_ptr("obs-qsv-test.exe");
-	struct dstr cmd = {0};
-	struct dstr caps_str = {0};
-	os_process_pipe_t *pp = NULL;
-	config_t *config = NULL;
-
-	dstr_copy(&cmd, test_exe);
-	enum_graphics_device_luids(enum_luids, &cmd);
-
-	pp = os_process_pipe_create(cmd.array, "r");
-	if (!pp) {
-		blog(LOG_INFO, "Failed to launch the QSV test process I guess");
-		goto fail;
-	}
-
-	for (;;) {
-		char data2048;
-		size_t len =
-			os_process_pipe_read(pp, (uint8_t *)data, sizeof(data));
-		if (!len)
-			break;
-
-		dstr_ncat(&caps_str, data, len);
-	}
+	adapter_count = MAX_ADAPTERS;
+	check_adapters(adapters, &adapter_count);
 
-	if (dstr_is_empty(&caps_str)) {
-		blog(LOG_INFO, "Seems the QSV test subprocess crashed. "
-			 "Better there than here I guess. "
-			 "Let's just skip loading QSV then I suppose.");
-		goto fail;
-	}
-
-	if (config_open_string(&config, caps_str.array) != 0) {
-		blog(LOG_INFO, "Couldn't open QSV configuration string");
-		goto fail;
-	}
-
-	const char *error = config_get_string(config, "error", "string");
-	if (error) {
-		blog(LOG_INFO, "Error querying QSV support: %s", error);
-		goto fail;
-	}
-
-	adapter_count = config_num_sections(config);
 	bool avc_supported = false;
 	bool av1_supported = false;
 	bool hevc_supported = false;
-
-	if (adapter_count > MAX_ADAPTERS)
-		adapter_count = MAX_ADAPTERS;
-
 	for (size_t i = 0; i < adapter_count; i++) {
-		char section16;
-		snprintf(section, sizeof(section), "%d", (int)i);
-
 		struct adapter_info *adapter = &adaptersi;
-		adapter->is_intel =
-			config_get_bool(config, section, "is_intel");
-		adapter->is_dgpu = config_get_bool(config, section, "is_dgpu");
-		adapter->supports_av1 =
-			config_get_bool(config, section, "supports_av1");
-		adapter->supports_hevc =
-			config_get_bool(config, section, "supports_hevc");
-
 		avc_supported |= adapter->is_intel;
 		av1_supported |= adapter->supports_av1;
 		hevc_supported |= adapter->supports_hevc;
@@ -178,12 +105,5 @@
 	}
 #endif
 
-fail:
-	config_close(config);
-	dstr_free(&caps_str);
-	dstr_free(&cmd);
-	os_process_pipe_destroy(pp);
-	bfree(test_exe);
-
 	return true;
 }

obs-studio-29.1.3.tar.xz/plugins/obs-qsv11/obs-qsv11.c -> obs-studio-30.0.2.tar.xz/plugins/obs-qsv11/obs-qsv11.c Changed

@@ -55,21 +55,17 @@
 */
 
 #include <stdio.h>
+#include <inttypes.h>
 #include <util/dstr.h>
 #include <util/darray.h>
 #include <util/platform.h>
+#include <util/threading.h>
 #include <obs-module.h>
 #include <obs-hevc.h>
 #include <obs-avc.h>
-#include <d3d11.h>
-#include <dxgi1_2.h>
-
-#ifndef _STDINT_H_INCLUDED
-#define _STDINT_H_INCLUDED
-#endif
 
 #include "QSV_Encoder.h"
-#include <Windows.h>
+#include "common_utils.h"
 
 #define do_log(level, format, ...) \
 	blog(level, "qsv encoder: '%s' " format, \
@@ -80,6 +76,10 @@
 #define info(format, ...) do_log(LOG_INFO, format, ##__VA_ARGS__)
 #define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
 
+#ifndef GS_INVALID_HANDLE
+#define GS_INVALID_HANDLE (uint32_t) - 1
+#endif
+
 /* ------------------------------------------------------------------------- */
 
 struct obs_qsv {
@@ -103,7 +103,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-static SRWLOCK g_QsvLock = SRWLOCK_INIT;
+static pthread_mutex_t g_QsvLock = PTHREAD_MUTEX_INITIALIZER;
 static unsigned short g_verMajor;
 static unsigned short g_verMinor;
 static int64_t g_pts2dtsShift;
@@ -139,10 +139,10 @@
 static void clear_data(struct obs_qsv *obsqsv)
 {
 	if (obsqsv->context) {
-		AcquireSRWLockExclusive(&g_QsvLock);
+		pthread_mutex_lock(&g_QsvLock);
 		qsv_encoder_close(obsqsv->context);
 		obsqsv->context = NULL;
-		ReleaseSRWLockExclusive(&g_QsvLock);
+		pthread_mutex_unlock(&g_QsvLock);
 
 		// bfree(obsqsv->sei);
 		bfree(obsqsv->extra_data);
@@ -167,7 +167,7 @@
 static void obs_qsv_defaults(obs_data_t *settings, int ver,
 			 enum qsv_codec codec)
 {
-	obs_data_set_default_string(settings, "target_usage", "balanced");
+	obs_data_set_default_string(settings, "target_usage", "TU4");
 	obs_data_set_default_int(settings, "bitrate", 2500);
 	obs_data_set_default_int(settings, "max_bitrate", 3000);
 	obs_data_set_default_string(settings, "profile",
@@ -176,18 +176,17 @@
 
 	obs_data_set_default_int(settings, "__ver", ver);
 
-	obs_data_set_default_int(settings, "accuracy", 1000);
-	obs_data_set_default_int(settings, "convergence", 1);
 	obs_data_set_default_int(settings, "cqp", 23);
 	obs_data_set_default_int(settings, "qpi", 23);
 	obs_data_set_default_int(settings, "qpp", 23);
 	obs_data_set_default_int(settings, "qpb", 23);
 	obs_data_set_default_int(settings, "icq_quality", 23);
 
-	obs_data_set_default_int(settings, "keyint_sec", 3);
+	obs_data_set_default_int(settings, "keyint_sec", 0);
 	obs_data_set_default_string(settings, "latency", "normal");
 	obs_data_set_default_int(settings, "bframes", 3);
-	obs_data_set_default_bool(settings, "enhancements", false);
+	obs_data_set_default_bool(settings, "enhancements", true);
+	obs_data_set_default_bool(settings, "repeat_headers", false);
 }
 
 static void obs_qsv_defaults_h264_v1(obs_data_t *settings)
@@ -218,14 +217,24 @@
 	}
 }
 
+static inline void add_translated_strings(obs_property_t *list,
+					 const char *const *keys,
+					 const char *const *strings)
+{
+	while (*keys && *strings) {
+		obs_property_list_add_string(list, obs_module_text(*keys),
+					 *strings);
+		keys++;
+		strings++;
+	}
+}
+
 #define TEXT_SPEED obs_module_text("TargetUsage")
 #define TEXT_TARGET_BITRATE obs_module_text("Bitrate")
 #define TEXT_MAX_BITRATE obs_module_text("MaxBitrate")
 #define TEXT_PROFILE obs_module_text("Profile")
 #define TEXT_LATENCY obs_module_text("Latency")
 #define TEXT_RATE_CONTROL obs_module_text("RateControl")
-#define TEXT_ACCURACY obs_module_text("Accuracy")
-#define TEXT_CONVERGENCE obs_module_text("Convergence")
 #define TEXT_ICQ_QUALITY obs_module_text("ICQQuality")
 #define TEXT_KEYINT_SEC obs_module_text("KeyframeIntervalSec")
 #define TEXT_BFRAMES obs_module_text("BFrames")
@@ -256,14 +265,22 @@
 		update = true;
 	}
 
-	if (update) {
-		const char *rate_control =
-			obs_data_get_string(settings, "rate_control");
+	const char *rate_control =
+		obs_data_get_string(settings, "rate_control");
 
-		bool lookahead = astrcmpi(rate_control, "LA_CBR") == 0 ||
-				 astrcmpi(rate_control, "LA_VBR") == 0 ||
-				 astrcmpi(rate_control, "LA_ICQ") == 0;
+	bool lookahead = false;
+	if (astrcmpi(rate_control, "LA_CBR") == 0) {
+		obs_data_set_string(settings, "rate_control", "CBR");
+		lookahead = true;
+	} else if (astrcmpi(rate_control, "LA_VBR") == 0) {
+		obs_data_set_string(settings, "rate_control", "VBR");
+		lookahead = true;
+	} else if (astrcmpi(rate_control, "LA_ICQ") == 0) {
+		obs_data_set_string(settings, "rate_control", "ICQ");
+		lookahead = true;
+	}
 
+	if (update) {
 		if (lookahead) {
 			if (la_depth == 0 || la_depth >= 15)
 				obs_data_set_string(settings, "latency",
@@ -283,6 +300,20 @@
 	return true;
 }
 
+static bool update_ratecontrol(obs_data_t *settings)
+{
+	const char *rate_control =
+		obs_data_get_string(settings, "rate_control");
+
+	if (astrcmpi(rate_control, "VCM") == 0) {
+		obs_data_set_string(settings, "rate_control", "CBR");
+	} else if (astrcmpi(rate_control, "AVBR") == 0) {
+		obs_data_set_string(settings, "rate_control", "VBR");
+	}
+
+	return true;
+}
+
 static bool update_enhancements(obs_data_t *settings)
 {
 	bool update = false;
@@ -308,29 +339,45 @@
 	return true;
 }
 
+static void update_targetusage(obs_data_t *settings)
+{
+	const char *target_usage =
+		obs_data_get_string(settings, "target_usage");
+
+	if (astrcmpi(target_usage, "veryslow") == 0 ||
+	 astrcmpi(target_usage, "quality") == 0)
+		obs_data_set_string(settings, "target_usage", "TU1");
+	else if (astrcmpi(target_usage, "slower") == 0)
+		obs_data_set_string(settings, "target_usage", "TU2");
+	else if (astrcmpi(target_usage, "slow") == 0)
+		obs_data_set_string(settings, "target_usage", "TU3");
+	else if (astrcmpi(target_usage, "medium") == 0 ||
+		 astrcmpi(target_usage, "balanced") == 0)
+		obs_data_set_string(settings, "target_usage", "TU4");
+	else if (astrcmpi(target_usage, "fast") == 0)
+		obs_data_set_string(settings, "target_usage", "TU5");
+	else if (astrcmpi(target_usage, "faster") == 0)
+		obs_data_set_string(settings, "target_usage", "TU6");
+	else if (astrcmpi(target_usage, "veryfast") == 0 ||
+		 astrcmpi(target_usage, "speed") == 0)
+		obs_data_set_string(settings, "target_usage", "TU7");
+}
+
 static bool rate_control_modified(obs_properties_t *ppts, obs_property_t *p,
 				 obs_data_t *settings)
 {
 	const char *rate_control =
 		obs_data_get_string(settings, "rate_control");
 
-	bool bVisible = astrcmpi(rate_control, "VCM") == 0 ||
-			astrcmpi(rate_control, "VBR") == 0;
+	bool bVisible = astrcmpi(rate_control, "VBR") == 0;
 	p = obs_properties_get(ppts, "max_bitrate");
 	obs_property_set_visible(p, bVisible);
 
 	bVisible = astrcmpi(rate_control, "CQP") == 0 ||
-		 astrcmpi(rate_control, "LA_ICQ") == 0 ||
 		 astrcmpi(rate_control, "ICQ") == 0;
 	p = obs_properties_get(ppts, "bitrate");
 	obs_property_set_visible(p, !bVisible);
 
-	bVisible = astrcmpi(rate_control, "AVBR") == 0;
-	p = obs_properties_get(ppts, "accuracy");
-	obs_property_set_visible(p, bVisible);
-	p = obs_properties_get(ppts, "convergence");
-	obs_property_set_visible(p, bVisible);
-
 	bVisible = astrcmpi(rate_control, "CQP") == 0;
 	p = obs_properties_get(ppts, "qpi");
 	if (p)
@@ -345,8 +392,7 @@
 	if (p)
 		obs_property_set_visible(p, bVisible);
 
-	bVisible = astrcmpi(rate_control, "ICQ") == 0 ||
-		 astrcmpi(rate_control, "LA_ICQ") == 0;
+	bVisible = astrcmpi(rate_control, "ICQ") == 0;
 	p = obs_properties_get(ppts, "icq_quality");
 	obs_property_set_visible(p, bVisible);
 
@@ -357,6 +403,8 @@
 
 	update_latency(settings);
 	update_enhancements(settings);
+	update_targetusage(settings);
+	update_ratecontrol(settings);
 
 	return true;
 }
@@ -399,10 +447,7 @@
 				 OBS_COMBO_TYPE_LIST,
 				 OBS_COMBO_FORMAT_STRING);
 
-	if (codec == QSV_CODEC_AVC || codec == QSV_CODEC_HEVC)
-		add_rate_controls(prop, qsv_ratecontrols);
-	else if (codec == QSV_CODEC_AV1)
-		add_rate_controls(prop, qsv_av1_ratecontrols);
+	add_rate_controls(prop, qsv_ratecontrols);
 
 	obs_property_set_modified_callback(prop, rate_control_modified);
 
@@ -429,7 +474,8 @@
 	prop = obs_properties_add_list(props, "target_usage", TEXT_SPEED,
 				 OBS_COMBO_TYPE_LIST,
 				 OBS_COMBO_FORMAT_STRING);
-	add_strings(prop, qsv_usage_names);
+	add_translated_strings(prop, qsv_usage_translation_keys,
+			 qsv_usage_names);
 
 	prop = obs_properties_add_list(props, "profile", TEXT_PROFILE,
 				 OBS_COMBO_TYPE_LIST,
@@ -444,13 +490,10 @@
 
 	obs_property_set_modified_callback(prop, profile_modified);
 
-	prop = obs_properties_add_int(props, "keyint_sec", TEXT_KEYINT_SEC, 1,
+	prop = obs_properties_add_int(props, "keyint_sec", TEXT_KEYINT_SEC, 0,
 				 20, 1);
 	obs_property_int_set_suffix(prop, " s");
 
-	obs_properties_add_int(props, "accuracy", TEXT_ACCURACY, 0, 10000, 1);
-	obs_properties_add_int(props, "convergence", TEXT_CONVERGENCE, 0, 10,
-			 1);
 	prop = obs_properties_add_list(props, "latency", TEXT_LATENCY,
 				 OBS_COMBO_TYPE_LIST,
 				 OBS_COMBO_FORMAT_STRING);
@@ -458,8 +501,7 @@
 	obs_property_set_long_description(prop,
 					 obs_module_text("Latency.ToolTip"));
 
-	if (codec != QSV_CODEC_AV1)
-		obs_properties_add_int(props, "bframes", TEXT_BFRAMES, 0, 3, 1);
+	obs_properties_add_int(props, "bframes", TEXT_BFRAMES, 0, 3, 1);
 
 	if (is_skl_or_greater_platform())
 		obs_properties_add_bool(props, "enhancements",
@@ -497,6 +539,7 @@
 	const struct video_output_info *voi = video_output_get_info(video);
 	update_latency(settings);
 	update_enhancements(settings);
+	update_targetusage(settings);
 
 	const char *target_usage =
 		obs_data_get_string(settings, "target_usage");
@@ -506,8 +549,6 @@
 	const char *latency = obs_data_get_string(settings, "latency");
 	int target_bitrate = (int)obs_data_get_int(settings, "bitrate");
 	int max_bitrate = (int)obs_data_get_int(settings, "max_bitrate");
-	int accuracy = (int)obs_data_get_int(settings, "accuracy");
-	int convergence = (int)obs_data_get_int(settings, "convergence");
 	int qpi = (int)obs_data_get_int(settings, "qpi");
 	int qpp = (int)obs_data_get_int(settings, "qpp");
 	int qpb = (int)obs_data_get_int(settings, "qpb");
@@ -518,38 +559,32 @@
 	bool cbr_override = obs_data_get_bool(settings, "cbr");
 	int bFrames = (int)obs_data_get_int(settings, "bframes");
 	bool enhancements = obs_data_get_bool(settings, "enhancements");
-	const char *codec;
+	bool repeat_headers = obs_data_get_bool(settings, "repeat_headers");
+	const char *codec = "";
 
 	if (obs_data_has_user_value(settings, "bf"))
 		bFrames = (int)obs_data_get_int(settings, "bf");
 
 	enum qsv_cpu_platform plat = qsv_get_cpu_platform();
-	if (obsqsv->codec == QSV_CODEC_AV1 || plat == QSV_CPU_PLATFORM_IVB ||
-	 plat == QSV_CPU_PLATFORM_SNB)
+	if (plat == QSV_CPU_PLATFORM_IVB || plat == QSV_CPU_PLATFORM_SNB)
 		bFrames = 0;
 
 	int width = (int)obs_encoder_get_width(obsqsv->encoder);
 	int height = (int)obs_encoder_get_height(obsqsv->encoder);
-	if (astrcmpi(target_usage, "quality") == 0)
+	if (astrcmpi(target_usage, "TU1") == 0)
 		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_BEST_QUALITY;
-	else if (astrcmpi(target_usage, "balanced") == 0)
+	else if (astrcmpi(target_usage, "TU4") == 0)
 		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_BALANCED;
-	else if (astrcmpi(target_usage, "speed") == 0)
+	else if (astrcmpi(target_usage, "TU7") == 0)
 		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_BEST_SPEED;
-	else if (astrcmpi(target_usage, "veryslow") == 0)
-		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_1;
-	else if (astrcmpi(target_usage, "slower") == 0)
+	else if (astrcmpi(target_usage, "TU2") == 0)
 		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_2;
-	else if (astrcmpi(target_usage, "slow") == 0)
+	else if (astrcmpi(target_usage, "TU3") == 0)
 		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_3;
-	else if (astrcmpi(target_usage, "medium") == 0)
-		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_4;
-	else if (astrcmpi(target_usage, "fast") == 0)
+	else if (astrcmpi(target_usage, "TU5") == 0)
 		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_5;
-	else if (astrcmpi(target_usage, "faster") == 0)
+	else if (astrcmpi(target_usage, "TU6") == 0)
 		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_6;
-	else if (astrcmpi(target_usage, "veryfast") == 0)
-		obsqsv->params.nTargetUsage = MFX_TARGETUSAGE_7;
 
 	if (obsqsv->codec == QSV_CODEC_AVC) {
 		codec = "H.264";
@@ -659,37 +694,24 @@
 		obsqsv->params.nRateControl = MFX_RATECONTROL_CBR;
 	else if (astrcmpi(rate_control, "VBR") == 0)
 		obsqsv->params.nRateControl = MFX_RATECONTROL_VBR;
-	else if (astrcmpi(rate_control, "VCM") == 0)
-		obsqsv->params.nRateControl = MFX_RATECONTROL_VCM;
 	else if (astrcmpi(rate_control, "CQP") == 0)
 		obsqsv->params.nRateControl = MFX_RATECONTROL_CQP;
-	else if (astrcmpi(rate_control, "AVBR") == 0)
-		obsqsv->params.nRateControl = MFX_RATECONTROL_AVBR;
 	else if (astrcmpi(rate_control, "ICQ") == 0)
 		obsqsv->params.nRateControl = MFX_RATECONTROL_ICQ;
-	else if (astrcmpi(rate_control, "LA_ICQ") == 0)
-		obsqsv->params.nRateControl = MFX_RATECONTROL_LA_ICQ;
-	else if (astrcmpi(rate_control, "LA_VBR") == 0)
-		obsqsv->params.nRateControl = MFX_RATECONTROL_LA;
-	else if (astrcmpi(rate_control, "LA_CBR") == 0)
-		obsqsv->params.nRateControl = MFX_RATECONTROL_LA_HRD;
-
-	if (obsqsv->codec == QSV_CODEC_AV1) {
+
+	obsqsv->params.nLADEPTH = (mfxU16)0;
+	if (astrcmpi(latency, "ultra-low") == 0) {
+		obsqsv->params.nAsyncDepth = 1;
+	} else if (astrcmpi(latency, "low") == 0) {
 		obsqsv->params.nAsyncDepth = 4;
-		obsqsv->params.nLADEPTH = 0;
-	} else {
-		if (astrcmpi(latency, "ultra-low") == 0) {
-			obsqsv->params.nAsyncDepth = 1;
-			obsqsv->params.nLADEPTH = (mfxU16)0;
-		} else if (astrcmpi(latency, "low") == 0) {
-			obsqsv->params.nAsyncDepth = 4;
-			obsqsv->params.nLADEPTH =
-				(mfxU16)(voi->fps_num / voi->fps_den / 2);
-		} else if (astrcmpi(latency, "normal") == 0) {
-			obsqsv->params.nAsyncDepth = 4;
-			obsqsv->params.nLADEPTH =
-				(mfxU16)(voi->fps_num / voi->fps_den);
-		}
+		if (obsqsv->params.nRateControl == MFX_RATECONTROL_CBR ||
+		 obsqsv->params.nRateControl == MFX_RATECONTROL_VBR)
+			obsqsv->params.nLADEPTH = 30;
+	} else if (astrcmpi(latency, "normal") == 0) {
+		obsqsv->params.nAsyncDepth = 4;
+		if (obsqsv->params.nRateControl == MFX_RATECONTROL_CBR ||
+		 obsqsv->params.nRateControl == MFX_RATECONTROL_VBR)
+			obsqsv->params.nLADEPTH = 60;
 	}
 
 	if (obsqsv->params.nLADEPTH > 0) {
@@ -699,8 +721,6 @@
 			obsqsv->params.nLADEPTH = 10;
 	}
 
-	obsqsv->params.nAccuracy = (mfxU16)accuracy;
-	obsqsv->params.nConvergence = (mfxU16)convergence;
 	if (ver == 1) {
 		obsqsv->params.nQPI = (mfxU16)qpi;
 		obsqsv->params.nQPP = (mfxU16)qpp;
@@ -722,33 +742,28 @@
 	obsqsv->params.nbFrames = (mfxU16)bFrames;
 	obsqsv->params.nKeyIntSec = (mfxU16)keyint_sec;
 	obsqsv->params.nICQQuality = (mfxU16)icq_quality;
-	obsqsv->params.bMBBRC = enhancements;
 	obsqsv->params.bCQM = enhancements;
+	obsqsv->params.bRepeatHeaders = repeat_headers;
 
 	info("settings:\n"
 	 "\tcodec: %s\n"
 	 "\trate_control: %s",
 	 codec, rate_control);
 
-	if (obsqsv->params.nRateControl != MFX_RATECONTROL_LA_ICQ &&
-	 obsqsv->params.nRateControl != MFX_RATECONTROL_ICQ &&
+	if (obsqsv->params.nRateControl != MFX_RATECONTROL_ICQ &&
 	 obsqsv->params.nRateControl != MFX_RATECONTROL_CQP)
 		blog(LOG_INFO, "\ttarget_bitrate: %d",
 		 (int)obsqsv->params.nTargetBitRate);
 
-	if (obsqsv->params.nRateControl == MFX_RATECONTROL_VBR ||
-	 obsqsv->params.nRateControl == MFX_RATECONTROL_VCM)
+	if (obsqsv->params.nRateControl == MFX_RATECONTROL_VBR)
 		blog(LOG_INFO, "\tmax_bitrate: %d",
 		 (int)obsqsv->params.nMaxBitRate);
 
-	if (obsqsv->params.nRateControl == MFX_RATECONTROL_LA_ICQ ||
-	 obsqsv->params.nRateControl == MFX_RATECONTROL_ICQ)
+	if (obsqsv->params.nRateControl == MFX_RATECONTROL_ICQ)
 		blog(LOG_INFO, "\tICQ Quality: %d",
 		 (int)obsqsv->params.nICQQuality);
 
-	if (obsqsv->params.nRateControl == MFX_RATECONTROL_LA_ICQ ||
-	 obsqsv->params.nRateControl == MFX_RATECONTROL_LA ||
-	 obsqsv->params.nRateControl == MFX_RATECONTROL_LA_HRD)
+	if (obsqsv->params.nLADEPTH)
 		blog(LOG_INFO, "\tLookahead Depth:%d",
 		 (int)obsqsv->params.nLADEPTH);
 
@@ -760,11 +775,19 @@
 		 qpi, qpb, qpp);
 
 	blog(LOG_INFO,
+	 "\ttarget_usage: %s\n"
+	 "\tprofile: %s\n"
+	 "\tkeyint: %d\n"
+	 "\tlatency: %s\n"
+	 "\tb-frames: %d\n"
+	 "\tenhancements: %s\n"
 	 "\tfps_num: %d\n"
 	 "\tfps_den: %d\n"
 	 "\twidth: %d\n"
 	 "\theight: %d",
-	 voi->fps_num, voi->fps_den, width, height);
+	 target_usage, profile, keyint_sec, latency, bFrames,
+	 enhancements ? "on" : "off", voi->fps_num, voi->fps_den, width,
+	 height);
 
 	info("debug info:");
 }
@@ -885,9 +908,9 @@
 	}
 
 	if (update_settings(obsqsv, settings)) {
-		AcquireSRWLockExclusive(&g_QsvLock);
+		pthread_mutex_lock(&g_QsvLock);
 		obsqsv->context = qsv_encoder_open(&obsqsv->params, codec);
-		ReleaseSRWLockExclusive(&g_QsvLock);
+		pthread_mutex_unlock(&g_QsvLock);
 
 		if (obsqsv->context == NULL)
 			warn("qsv failed to load");
@@ -918,9 +941,9 @@
 			GopPicSize - (GopPicSize / interval) * interval;
 
 		blog(LOG_INFO,
-		 "\tinterval: %d\n"
-		 "\tGopPictSize: %d\n"
-		 "\tg_pts2dtsShift: %d",
+		 "\tinterval: %" PRId64 "\n"
+		 "\tGopPictSize: %" PRId64 "\n"
+		 "\tg_pts2dtsShift: %" PRId64,
 		 interval, GopPicSize, g_pts2dtsShift);
 	} else
 		g_pts2dtsShift = -1;
@@ -952,20 +975,6 @@
 	return obs_qsv_create(QSV_CODEC_HEVC, settings, encoder);
 }
 
-static HANDLE get_lib(const char *lib)
-{
-	HMODULE mod = GetModuleHandleA(lib);
-	if (mod)
-		return mod;
-
-	mod = LoadLibraryA(lib);
-	if (!mod)
-		blog(LOG_INFO, "Failed to load %s", lib);
-	return mod;
-}
-
-typedef HRESULT(WINAPI *CREATEDXGIFACTORY1PROC)(REFIID, void **);
-
 static void *obs_qsv_create_tex(enum qsv_codec codec, obs_data_t *settings,
 				obs_encoder_t *encoder, const char *fallback_id)
 {
@@ -1000,10 +1009,13 @@
 	}
 
 	if (obs_encoder_scaling_enabled(encoder)) {
-		blog(LOG_INFO,
-		 ">>> encoder scaling active, fall back to old qsv encoder");
-		return obs_encoder_create_rerouted(encoder,
-						 (const char *)fallback_id);
+		if (!obs_encoder_gpu_scaling_enabled(encoder)) {
+			blog(LOG_INFO,
+			 ">>> encoder CPU scaling active, fall back to old qsv encoder");
+			return obs_encoder_create_rerouted(
+				encoder, (const char *)fallback_id);
+		}
+		blog(LOG_INFO, ">>> encoder GPU scaling active");
 	}
 
 	blog(LOG_INFO, ">>> new qsv encoder");
@@ -1373,7 +1385,7 @@
 	if (!frame || !packet || !received_packet)
 		return false;
 
-	AcquireSRWLockExclusive(&g_QsvLock);
+	pthread_mutex_lock(&g_QsvLock);
 
 	video_t *video = obs_encoder_video(obsqsv->encoder);
 	const struct video_output_info *voi = video_output_get_info(video);
@@ -1397,7 +1409,7 @@
 
 	if (ret < 0) {
 		warn("encode failed");
-		ReleaseSRWLockExclusive(&g_QsvLock);
+		pthread_mutex_unlock(&g_QsvLock);
 		return false;
 	}
 
@@ -1408,7 +1420,7 @@
 	else if (obsqsv->codec == QSV_CODEC_HEVC)
 		parse_packet_hevc(obsqsv, packet, pBS, voi, received_packet);
 
-	ReleaseSRWLockExclusive(&g_QsvLock);
+	pthread_mutex_unlock(&g_QsvLock);
 
 	return true;
 }
@@ -1429,7 +1441,7 @@
 	if (!packet || !received_packet)
 		return false;
 
-	AcquireSRWLockExclusive(&g_QsvLock);
+	pthread_mutex_lock(&g_QsvLock);
 
 	video_t *video = obs_encoder_video(obsqsv->encoder);
 	const struct video_output_info *voi = video_output_get_info(video);
@@ -1445,7 +1457,7 @@
 
 	if (ret < 0) {
 		warn("encode failed");
-		ReleaseSRWLockExclusive(&g_QsvLock);
+		pthread_mutex_unlock(&g_QsvLock);
 		return false;
 	}
 
@@ -1456,7 +1468,7 @@
 	else if (obsqsv->codec == QSV_CODEC_HEVC)
 		parse_packet_hevc(obsqsv, packet, pBS, voi, received_packet);
 
-	ReleaseSRWLockExclusive(&g_QsvLock);
+	pthread_mutex_unlock(&g_QsvLock);
 
 	return true;
 }

obs-studio-29.1.3.tar.xz/plugins/obs-text/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-text/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/obs-text/cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-text/cmake/legacy.cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-text/cmake/windows Added

obs-studio-30.0.2.tar.xz/plugins/obs-text/cmake/windows/obs-module.rc.in Added

obs-studio-30.0.2.tar.xz/plugins/obs-text/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-text/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-text/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-text/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-text/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-text/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-text/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-text/gdiplus/obs-text.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-text/gdiplus/obs-text.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/af-ZA.ini Added

@@ -0,0 +1,61 @@
+FadeTransition="Vervaag"
+CutTransition="Knip"
+SwipeTransition="Vee"
+SlideTransition="Skuif"
+FadeToColorTransition="Vervaag na kleur"
+Direction="Rigting"
+Direction.Left="Links"
+Direction.Right="Regs"
+Direction.Up="Boontoe"
+Direction.Down="Ondertoe"
+SwipeIn="Vee af"
+Color="Kleur"
+VideoFile="Videolêer"
+FileFilter.VideoFiles="Videolêers"
+FileFilter.AllFiles="Alle lêers"
+TransitionPoint="Oorgangspunt"
+TransitionPointFrame="Oorgangspunt (raam)"
+TransitionPointType="Oorgangspunttipe"
+AudioTransitionPointType="Oudui-oorgangspunttipe"
+TransitionPointTypeFrame="Raam"
+TransitionPointTypeTime="Tyd"
+TrackMatteLayoutSeparateFile="Afsonderlike lêer (waarskuwing: mat kan gedesinchroniseer word)"
+TrackMatteLayoutMask="Slegs masker"
+PreloadVideoToRam="Laai video voor na RAM"
+AudioFadeStyle.FadeOutFadeIn="Doof uit na oorgangspunt en doof dan in"
+AudioFadeStyle.CrossFade="Kruisvervaging"
+SwitchPoint="Piek kleurpunt"
+LumaWipe.Image="Beeld"
+LumaWipe.Softness="Sagtheid"
+LumaWipe.Type.BarndoorBottomLeft="Skuurdeur linksonder"
+LumaWipe.Type.BarndoorHorizontal="Skuurdeur horisontaal"
+LumaWipe.Type.BarndoorTopLeft="Skuurdeur linksbo"
+LumaWipe.Type.BarndoorVertical="Skuurdeur vertikaal"
+LumaWipe.Type.BlindsHorizontal="Blindings horisontaal"
+LumaWipe.Type.BoxBottomLeft="Blok linksonder"
+LumaWipe.Type.BoxBottomRight="Blok regsonder"
+LumaWipe.Type.BoxTopLeft="Blok linksbo"
+LumaWipe.Type.BoxTopRight="Blok regsbo"
+LumaWipe.Type.Burst="Uitbarsting"
+LumaWipe.Type.CheckerboardSmall="Skaakbord klein"
+LumaWipe.Type.Circles="Sirkels"
+LumaWipe.Type.Clock="Horlosie"
+LumaWipe.Type.Cloud="Wolk"
+LumaWipe.Type.Curtain="Gordyn"
+LumaWipe.Type.Fan="Waaier"
+LumaWipe.Type.LinearHorizontal="Lineêr horisontaal"
+LumaWipe.Type.LinearTopLeft="Lineêr linksbo"
+LumaWipe.Type.LinearTopRight="Lineêr regsbo"
+LumaWipe.Type.LinearVertical="Lineêr vertikaal"
+LumaWipe.Type.ParallelZigzagHorizontal="Parallelle sigsag horisontaal"
+LumaWipe.Type.ParallelZigzagVertical="Parallelle sigsag vertikaal"
+LumaWipe.Type.Spiral="Spiraal"
+LumaWipe.Type.Square="Vierkant"
+LumaWipe.Type.Squares="Vierkante"
+LumaWipe.Type.Stripes="Strepe"
+LumaWipe.Type.StripsHorizontal="Stroke horisontaal"
+LumaWipe.Type.StripsVertical="Stroke vertikaal"
+LumaWipe.Type.Watercolor="Waterverf"
+LumaWipe.Type.ZigzagHorizontal="Sigsag horisontaal"
+LumaWipe.Type.ZigzagVertical="Sigsag vertikaal"
+HardwareDecode="Gebruik apparatuurdekodering wanneer moontlik"

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/pt-BR.ini Changed

@@ -8,15 +8,15 @@
 Direction.Right="Direita"
 Direction.Up="Cima"
 Direction.Down="Baixo"
-SwipeIn="Deslizar para"
+SwipeIn="Deslizar para dentro"
 Color="Cor"
 VideoFile="Arquivo de vídeo"
-FileFilter.VideoFiles="Arquivos de Vídeo"
+FileFilter.VideoFiles="Arquivos de vídeo"
 FileFilter.AllFiles="Todos os arquivos"
 TransitionPoint="Ponto de transição"
 TransitionPointFrame="Ponto de transição (quadro)"
 TransitionPointType="Tipo de ponto de transição"
-AudioTransitionPointType="Tipo de ponto da transição de áudio"
+AudioTransitionPointType="Tipo de ponto de transição do áudio"
 TransitionPointTypeFrame="Quadro"
 TransitionPointTypeTime="Tempo"
 TrackMatteEnabled="Usar um track matte"
@@ -26,15 +26,15 @@
 TrackMatteLayoutHorizontal="Mesmo arquivo, lado a lado (stinger à esquerda, track matte à direita)"
 TrackMatteLayoutVertical="Mesmo arquivo, empilhado (stinger no topo, track matte na parte inferior)"
 TrackMatteLayoutSeparateFile="Arquivo separado (aviso: o matte pode sair de sincronia)"
-TrackMatteLayoutMask="Máscara apenas"
-PreloadVideoToRam="Pré-carregar Vídeo para RAM"
-PreloadVideoToRam.Description="Carregar todo o Stinger para RAM, evitando decodificação em tempo real durante a reprodução.\nRequer um muita RAM (um vídeo típico de 5 segundos 1080p60 ocupa ~1 GB)."
+TrackMatteLayoutMask="Apenas máscara"
+PreloadVideoToRam="Pré-carregar vídeo para RAM"
+PreloadVideoToRam.Description="Carrega o arquivo de Stinger para a memória RAM, evitando decodificação em tempo real durante a reprodução.\nRequer muita RAM (um vídeo típico de 5 segundos 1080p60 ocupa ~1 GB)."
 AudioFadeStyle="Estilo de esmaecimento de áudio"
 AudioFadeStyle.FadeOutFadeIn="Esmaecer imagem até o ponto de transição e depois aparecer"
 AudioFadeStyle.CrossFade="Transição suave"
 SwitchPoint="Ponto de cor do pico"
-LumaWipe.Image="Imagem"
-LumaWipe.Invert="Inverso"
+LumaWipe.Image="Estilo"
+LumaWipe.Invert="Inverter"
 LumaWipe.Softness="Suavidade"
 LumaWipe.Type.BarndoorBottomLeft="Barndoor inferior esquerdo"
 LumaWipe.Type.BarndoorHorizontal="Barndoor horizontal"
@@ -71,4 +71,4 @@
 AudioMonitoring.None="Não monitorar"
 AudioMonitoring.MonitorOnly="Apenas monitorar (saída muda)"
 AudioMonitoring.Both="Monitorar e enviar áudio"
-HardwareDecode="Utilizar decodificação de hardware quando disponível"
+HardwareDecode="Usar decodificação de hardware quando disponível"

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/ro-RO.ini Changed

@@ -2,7 +2,7 @@
 CutTransition="Decupare"
 SwipeTransition="Glisare"
 SlideTransition="Culisare"
-FadeToColorTransition="Estompare prin culoare"
+FadeToColorTransition="Estompare la culoare"
 Direction="Direcție"
 Direction.Left="Stânga"
 Direction.Right="Dreapta"
@@ -29,11 +29,10 @@
 TrackMatteLayoutMask="Doar masca"
 PreloadVideoToRam="Preîncărcare video în RAM"
 PreloadVideoToRam.Description="Încarcă întregul stinger în memoria RAM, evitând decodarea în timp real în timpul redării.\nNecesită multă memorie RAM (un videoclip tipic de 5 secunde la 1080p60 ocupă ~1 GB)."
-AudioFadeStyle="Stil estompare audio"
-AudioFadeStyle.FadeOutFadeIn="Estompare la punctul de tranziție, apoi estompează în"
-AudioFadeStyle.CrossFade="Estompare"
+AudioFadeStyle="Stil de estompare audio"
+AudioFadeStyle.FadeOutFadeIn="Dispariție graduală până la punctul de tranziție, apoi apariție graduală"
+AudioFadeStyle.CrossFade="Estompare încrucișată"
 SwitchPoint="Punct de culoare al vârfului"
-LumaWipeTransition="Ştergere Luma"
 LumaWipe.Image="Imagine"
 LumaWipe.Invert="Inversează"
 LumaWipe.Softness="Moliciune"

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/ru-RU.ini Changed

@@ -20,13 +20,13 @@
 AudioTransitionPointType="Тип точки перехода звука"
 TransitionPointTypeFrame="Кадр"
 TransitionPointTypeTime="Время"
-TrackMatteEnabled="Использовать Track Matte"
+TrackMatteEnabled="Использовать маску"
 InvertTrackMatte="Инвертировать цвета Matte"
 TrackMatteVideoFile="Отслеживать видеофайл Matte"
-TrackMatteLayout="Слой Matte"
-TrackMatteLayoutHorizontal="Тот же файл, бок о бок (стингер слева, track matte справа)"
+TrackMatteLayout="Слой маски"
+TrackMatteLayoutHorizontal="Тот же файл, бок о бок (стингер слева, маска справа)"
 TrackMatteLayoutVertical="Тот же файл, стак (стингер вверху, маска внизу)"
-TrackMatteLayoutSeparateFile="Отдельный файл (внимание: matte может выйти из синхронизации)"
+TrackMatteLayoutSeparateFile="Отдельный файл (внимание: маска может выйти из синхронизации)"
 TrackMatteLayoutMask="Только маска"
 PreloadVideoToRam="Предзагрузить видео в ОЗУ"
 PreloadVideoToRam.Description="Загрузить весь Stinger в ОЗУ для предотвращения декодирования в реальном времени.\nТребует много оперативной памяти (обычно 5 секунд видео в 1080p60 занимает ~1 ГБ)."

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-transitions/transition-stinger.c -> obs-studio-30.0.2.tar.xz/plugins/obs-transitions/transition-stinger.c Changed

obs-studio-29.1.3.tar.xz/plugins/obs-vst/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/obs-vst/EditorWidget.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/EditorWidget.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-vst/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/cmake/legacy.cmake Changed

obs-studio-30.0.2.tar.xz/plugins/obs-vst/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-vst/data/locale/an-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/data/locale/an-ES.ini Changed

obs-studio-30.0.2.tar.xz/plugins/obs-vst/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-vst/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/data/locale/ko-KR.ini Changed

obs-studio-30.0.2.tar.xz/plugins/obs-vst/data/locale/si-LK.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-vst/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-vst/mac/EditorWidget-osx.mm -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/mac/EditorWidget-osx.mm Changed

@@ -23,40 +23,35 @@
 
 void EditorWidget::buildEffectContainer(AEffect *effect)
 {
-	NSView *view =
-		NSView alloc initWithFrame:NSMakeRect(0, 0, 300, 300);
-	cocoaViewContainer =
-		QWidget::createWindowContainer(QWindow::fromWinId(WId(view)));
-	cocoaViewContainer->move(0, 0);
-	cocoaViewContainer->resize(300, 300);
-	cocoaViewContainer->show();
+    NSView *view = NSView alloc initWithFrame:NSMakeRect(0, 0, 300, 300);
+    cocoaViewContainer = QWidget::createWindowContainer(QWindow::fromWinId(WId(view)));
+    cocoaViewContainer->move(0, 0);
+    cocoaViewContainer->resize(300, 300);
+    cocoaViewContainer->show();
 
-	QGridLayout *hblParams = new QGridLayout();
-	hblParams->setContentsMargins(0, 0, 0, 0);
-	hblParams->setSpacing(0);
-	hblParams->addWidget(cocoaViewContainer);
+    QGridLayout *hblParams = new QGridLayout();
+    hblParams->setContentsMargins(0, 0, 0, 0);
+    hblParams->setSpacing(0);
+    hblParams->addWidget(cocoaViewContainer);
 
-	VstRect *vstRect = nullptr;
-	effect->dispatcher(effect, effEditGetRect, 0, 0, &vstRect, 0);
-	if (vstRect) {
-		NSRect frame = NSMakeRect(vstRect->left, vstRect->top,
-					  vstRect->right, vstRect->bottom);
+    VstRect *vstRect = nullptr;
+    effect->dispatcher(effect, effEditGetRect, 0, 0, &vstRect, 0);
+    if (vstRect) {
+        NSRect frame = NSMakeRect(vstRect->left, vstRect->top, vstRect->right, vstRect->bottom);
 
-		view setFrame:frame;
+        view setFrame:frame;
 
-		cocoaViewContainer->resize(vstRect->right - vstRect->left,
-					   vstRect->bottom - vstRect->top);
+        cocoaViewContainer->resize(vstRect->right - vstRect->left, vstRect->bottom - vstRect->top);
 
-		setFixedSize(vstRect->right - vstRect->left,
-			     vstRect->bottom - vstRect->top);
-	}
+        setFixedSize(vstRect->right - vstRect->left, vstRect->bottom - vstRect->top);
+    }
 
-	effect->dispatcher(effect, effEditOpen, 0, 0, view, 0);
+    effect->dispatcher(effect, effEditOpen, 0, 0, view, 0);
 
-	setLayout(hblParams);
+    setLayout(hblParams);
 }
 
 void EditorWidget::handleResizeRequest(int width, int height)
 {
-	setFixedSize(width, height);
+    setFixedSize(width, height);
 }

obs-studio-29.1.3.tar.xz/plugins/obs-vst/mac/VSTPlugin-osx.mm -> obs-studio-30.0.2.tar.xz/plugins/obs-vst/mac/VSTPlugin-osx.mm Changed

@@ -19,81 +19,74 @@
 
 AEffect *VSTPlugin::loadEffect()
 {
-	AEffect *newEffect = NULL;
-
-	// Create a path to the bundle
-	CFStringRef pluginPathStringRef = CFStringCreateWithCString(
-		NULL, pluginPath.c_str(), kCFStringEncodingUTF8);
-	CFURLRef bundleUrl = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,
-							   pluginPathStringRef,
-							   kCFURLPOSIXPathStyle,
-							   true);
-
-	if (bundleUrl == NULL) {
-		CFRelease(pluginPathStringRef);
-		blog(LOG_WARNING,
-		     "Couldn't make URL reference for VST plug-in");
-		return NULL;
-	}
-
-	// Open the bundle
-	bundle = CFBundleCreate(kCFAllocatorDefault, bundleUrl);
-	if (bundle == NULL) {
-		blog(LOG_WARNING, "Couldn't create VST bundle reference.");
-		CFRelease(pluginPathStringRef);
-		CFRelease(bundleUrl);
-		return NULL;
-	}
-
-	vstPluginMain mainEntryPoint = NULL;
-	mainEntryPoint = (vstPluginMain)CFBundleGetFunctionPointerForName(
-		bundle, CFSTR("VSTPluginMain"));
-
-	// VST plugins previous to the 2.4 SDK used main_macho for the
-	// entry point name.
-	if (mainEntryPoint == NULL) {
-		mainEntryPoint =
-			(vstPluginMain)CFBundleGetFunctionPointerForName(
-				bundle, CFSTR("main_macho"));
-	}
-
-	if (mainEntryPoint == NULL) {
-		blog(LOG_WARNING, "Couldn't get a pointer to plug-in's main()");
-		CFRelease(pluginPathStringRef);
-		CFRelease(bundleUrl);
-		CFRelease(bundle);
-		bundle = NULL;
-		return NULL;
-	}
-
-	newEffect = mainEntryPoint(hostCallback_static);
-	if (newEffect == NULL) {
-		blog(LOG_WARNING, "VST Plug-in's main() returns null.");
-		CFRelease(pluginPathStringRef);
-		CFRelease(bundleUrl);
-		CFRelease(bundle);
-		bundle = NULL;
-		return NULL;
-	}
-
-	newEffect->user = this;
-
-	// Clean up
-	CFRelease(pluginPathStringRef);
-	CFRelease(bundleUrl);
-
-	return newEffect;
+    AEffect *newEffect = NULL;
+
+    // Create a path to the bundle
+    CFStringRef pluginPathStringRef = CFStringCreateWithCString(NULL, pluginPath.c_str(), kCFStringEncodingUTF8);
+    CFURLRef bundleUrl =
+        CFURLCreateWithFileSystemPath(kCFAllocatorDefault, pluginPathStringRef, kCFURLPOSIXPathStyle, true);
+
+    if (bundleUrl == NULL) {
+        CFRelease(pluginPathStringRef);
+        blog(LOG_WARNING, "Couldn't make URL reference for VST plug-in");
+        return NULL;
+    }
+
+    // Open the bundle
+    bundle = CFBundleCreate(kCFAllocatorDefault, bundleUrl);
+    if (bundle == NULL) {
+        blog(LOG_WARNING, "Couldn't create VST bundle reference.");
+        CFRelease(pluginPathStringRef);
+        CFRelease(bundleUrl);
+        return NULL;
+    }
+
+    vstPluginMain mainEntryPoint = NULL;
+    mainEntryPoint = (vstPluginMain) CFBundleGetFunctionPointerForName(bundle, CFSTR("VSTPluginMain"));
+
+    // VST plugins previous to the 2.4 SDK used main_macho for the
+    // entry point name.
+    if (mainEntryPoint == NULL) {
+        mainEntryPoint = (vstPluginMain) CFBundleGetFunctionPointerForName(bundle, CFSTR("main_macho"));
+    }
+
+    if (mainEntryPoint == NULL) {
+        blog(LOG_WARNING, "Couldn't get a pointer to plug-in's main()");
+        CFRelease(pluginPathStringRef);
+        CFRelease(bundleUrl);
+        CFRelease(bundle);
+        bundle = NULL;
+        return NULL;
+    }
+
+    newEffect = mainEntryPoint(hostCallback_static);
+    if (newEffect == NULL) {
+        blog(LOG_WARNING, "VST Plug-in's main() returns null.");
+        CFRelease(pluginPathStringRef);
+        CFRelease(bundleUrl);
+        CFRelease(bundle);
+        bundle = NULL;
+        return NULL;
+    }
+
+    newEffect->user = this;
+
+    // Clean up
+    CFRelease(pluginPathStringRef);
+    CFRelease(bundleUrl);
+
+    return newEffect;
 }
 
 void VSTPlugin::unloadLibrary()
 {
-	if (bundle) {
-		CFRelease(bundle);
-		bundle = NULL;
-	}
+    if (bundle) {
+        CFRelease(bundle);
+        bundle = NULL;
+    }
 }
 
 bool VSTPlugin::vstLoaded()
 {
-	return (bundle != NULL);
+    return (bundle != NULL);
 }

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/CMakeLists.txt Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/cmake/legacy.cmake Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/cmake/macos Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/cmake/macos/Info.plist.in Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/cmake/windows Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/cmake/windows/obs-module.rc.in Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/bg-BG.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/ca-ES.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/cs-CZ.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/de-DE.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/el-GR.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/en-GB.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/en-US.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/es-ES.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/et-EE.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/fa-IR.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/fi-FI.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/fr-FR.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/he-IL.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/hi-IN.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/hr-HR.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/hu-HU.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/hy-AM.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/id-ID.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/it-IT.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/ja-JP.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/ka-GE.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/ko-KR.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/ms-MY.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/nb-NO.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/nl-NL.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/pl-PL.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/pt-BR.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/pt-PT.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/ru-RU.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/si-LK.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/sk-SK.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/sl-SI.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/sv-SE.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/tr-TR.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/uk-UA.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/vi-VN.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/zh-CN.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/data/locale/zh-TW.ini Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/obs-webrtc.cpp Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/whip-output.cpp Added

@@ -0,0 +1,579 @@
+#include "whip-output.h"
+#include "whip-utils.h"
+
+/*
+ * Sets the maximum size for a video fragment. Effective range is
+ * 576-1470, with a lower value equating to more packets created,
+ * but also better network compatability.
+ */
+static uint16_t MAX_VIDEO_FRAGMENT_SIZE = 1200;
+
+const int signaling_media_id_length = 16;
+const char signaling_media_id_valid_char = "0123456789"
+					 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+					 "abcdefghijklmnopqrstuvwxyz";
+
+const std::string user_agent = generate_user_agent();
+
+const char *audio_mid = "0";
+const uint8_t audio_payload_type = 111;
+
+const char *video_mid = "1";
+const uint8_t video_payload_type = 96;
+
+WHIPOutput::WHIPOutput(obs_data_t *, obs_output_t *output)
+	: output(output),
+	 endpoint_url(),
+	 bearer_token(),
+	 resource_url(),
+	 running(false),
+	 start_stop_mutex(),
+	 start_stop_thread(),
+	 base_ssrc(generate_random_u32()),
+	 peer_connection(nullptr),
+	 audio_track(nullptr),
+	 video_track(nullptr),
+	 total_bytes_sent(0),
+	 connect_time_ms(0),
+	 start_time_ns(0),
+	 last_audio_timestamp(0),
+	 last_video_timestamp(0)
+{
+}
+
+WHIPOutput::~WHIPOutput()
+{
+	Stop();
+
+	std::lock_guard<std::mutex> l(start_stop_mutex);
+	if (start_stop_thread.joinable())
+		start_stop_thread.join();
+}
+
+bool WHIPOutput::Start()
+{
+	std::lock_guard<std::mutex> l(start_stop_mutex);
+
+	if (!obs_output_can_begin_data_capture(output, 0))
+		return false;
+	if (!obs_output_initialize_encoders(output, 0))
+		return false;
+
+	if (start_stop_thread.joinable())
+		start_stop_thread.join();
+	start_stop_thread = std::thread(&WHIPOutput::StartThread, this);
+
+	return true;
+}
+
+void WHIPOutput::Stop(bool signal)
+{
+	std::lock_guard<std::mutex> l(start_stop_mutex);
+	if (start_stop_thread.joinable())
+		start_stop_thread.join();
+
+	start_stop_thread = std::thread(&WHIPOutput::StopThread, this, signal);
+}
+
+void WHIPOutput::Data(struct encoder_packet *packet)
+{
+	if (!packet) {
+		Stop(false);
+		obs_output_signal_stop(output, OBS_OUTPUT_ENCODE_ERROR);
+		return;
+	}
+
+	if (packet->type == OBS_ENCODER_AUDIO) {
+		int64_t duration = packet->dts_usec - last_audio_timestamp;
+		Send(packet->data, packet->size, duration, audio_track,
+		 audio_sr_reporter);
+		last_audio_timestamp = packet->dts_usec;
+	} else if (packet->type == OBS_ENCODER_VIDEO) {
+		int64_t duration = packet->dts_usec - last_video_timestamp;
+		Send(packet->data, packet->size, duration, video_track,
+		 video_sr_reporter);
+		last_video_timestamp = packet->dts_usec;
+	}
+}
+
+void WHIPOutput::ConfigureAudioTrack(std::string media_stream_id,
+				 std::string cname)
+{
+	auto media_stream_track_id = std::string(media_stream_id + "-audio");
+
+	uint32_t ssrc = base_ssrc;
+
+	rtc::Description::Audio audio_description(
+		audio_mid, rtc::Description::Direction::SendOnly);
+	audio_description.addOpusCodec(audio_payload_type);
+	audio_description.addSSRC(ssrc, cname, media_stream_id,
+				 media_stream_track_id);
+	audio_track = peer_connection->addTrack(audio_description);
+
+	auto rtp_config = std::make_shared<rtc::RtpPacketizationConfig>(
+		ssrc, cname, audio_payload_type,
+		rtc::OpusRtpPacketizer::defaultClockRate);
+	auto packetizer = std::make_shared<rtc::OpusRtpPacketizer>(rtp_config);
+	audio_sr_reporter = std::make_shared<rtc::RtcpSrReporter>(rtp_config);
+	auto nack_responder = std::make_shared<rtc::RtcpNackResponder>();
+
+	auto opus_handler =
+		std::make_shared<rtc::OpusPacketizationHandler>(packetizer);
+	opus_handler->addToChain(audio_sr_reporter);
+	opus_handler->addToChain(nack_responder);
+	audio_track->setMediaHandler(opus_handler);
+}
+
+void WHIPOutput::ConfigureVideoTrack(std::string media_stream_id,
+				 std::string cname)
+{
+	auto media_stream_track_id = std::string(media_stream_id + "-video");
+
+	// More predictable SSRC values between audio and video
+	uint32_t ssrc = base_ssrc + 1;
+
+	rtc::Description::Video video_description(
+		video_mid, rtc::Description::Direction::SendOnly);
+	video_description.addH264Codec(video_payload_type);
+	video_description.addSSRC(ssrc, cname, media_stream_id,
+				 media_stream_track_id);
+	video_track = peer_connection->addTrack(video_description);
+
+	auto rtp_config = std::make_shared<rtc::RtpPacketizationConfig>(
+		ssrc, cname, video_payload_type,
+		rtc::H264RtpPacketizer::defaultClockRate);
+	auto packetizer = std::make_shared<rtc::H264RtpPacketizer>(
+		rtc::H264RtpPacketizer::Separator::StartSequence, rtp_config,
+		MAX_VIDEO_FRAGMENT_SIZE);
+	video_sr_reporter = std::make_shared<rtc::RtcpSrReporter>(rtp_config);
+	auto nack_responder = std::make_shared<rtc::RtcpNackResponder>();
+
+	auto h264_handler =
+		std::make_shared<rtc::H264PacketizationHandler>(packetizer);
+	h264_handler->addToChain(video_sr_reporter);
+	h264_handler->addToChain(nack_responder);
+	video_track->setMediaHandler(h264_handler);
+}
+
+/**
+ * @brief Initialize encoders and store connect info provided by the service.
+ *
+ * @return bool
+ */
+bool WHIPOutput::Init()
+{
+	if (!obs_output_can_begin_data_capture(output, 0))
+		return false;
+
+	if (!obs_output_initialize_encoders(output, 0))
+		return false;
+
+	obs_service_t *service = obs_output_get_service(output);
+	if (!service) {
+		obs_output_signal_stop(output, OBS_OUTPUT_ERROR);
+		return false;
+	}
+
+	endpoint_url = obs_service_get_connect_info(
+		service, OBS_SERVICE_CONNECT_INFO_SERVER_URL);
+	if (endpoint_url.empty()) {
+		obs_output_signal_stop(output, OBS_OUTPUT_BAD_PATH);
+		return false;
+	}
+
+	bearer_token = obs_service_get_connect_info(
+		service, OBS_SERVICE_CONNECT_INFO_BEARER_TOKEN);
+
+	return true;
+}
+
+/**
+ * @brief Set up the PeerConnection and media tracks.
+ *
+ * @return bool
+ */
+bool WHIPOutput::Setup()
+{
+
+	peer_connection = std::make_shared<rtc::PeerConnection>();
+
+	peer_connection->onStateChange(this(rtc::PeerConnection::State state) {
+		switch (state) {
+		case rtc::PeerConnection::State::New:
+			do_log(LOG_INFO, "PeerConnection state is now: New");
+			break;
+		case rtc::PeerConnection::State::Connecting:
+			do_log(LOG_INFO,
+			 "PeerConnection state is now: Connecting");
+			start_time_ns = os_gettime_ns();
+			break;
+		case rtc::PeerConnection::State::Connected:
+			do_log(LOG_INFO,
+			 "PeerConnection state is now: Connected");
+			connect_time_ms =
+				(int)((os_gettime_ns() - start_time_ns) /
+				 1000000.0);
+			do_log(LOG_INFO, "Connect time: %dms",
+			 connect_time_ms.load());
+			break;
+		case rtc::PeerConnection::State::Disconnected:
+			do_log(LOG_INFO,
+			 "PeerConnection state is now: Disconnected");
+			Stop(false);
+			obs_output_signal_stop(output, OBS_OUTPUT_DISCONNECTED);
+			break;
+		case rtc::PeerConnection::State::Failed:
+			do_log(LOG_INFO, "PeerConnection state is now: Failed");
+			Stop(false);
+			obs_output_signal_stop(output, OBS_OUTPUT_ERROR);
+			break;
+		case rtc::PeerConnection::State::Closed:
+			do_log(LOG_INFO, "PeerConnection state is now: Closed");
+			break;
+		}
+	});
+
+	std::string media_stream_id, cname;
+	media_stream_id.reserve(signaling_media_id_length);
+	cname.reserve(signaling_media_id_length);
+
+	for (int i = 0; i < signaling_media_id_length; ++i) {
+		media_stream_id += signaling_media_id_valid_char
+			rand() % (sizeof(signaling_media_id_valid_char) - 1);
+
+		cname += signaling_media_id_valid_char
+			rand() % (sizeof(signaling_media_id_valid_char) - 1);
+	}
+
+	ConfigureAudioTrack(media_stream_id, cname);
+	ConfigureVideoTrack(media_stream_id, cname);
+
+	peer_connection->setLocalDescription();
+
+	return true;
+}
+
+bool WHIPOutput::Connect()
+{
+	struct curl_slist *headers = NULL;
+	headers = curl_slist_append(headers, "Content-Type: application/sdp");
+	if (!bearer_token.empty()) {
+		auto bearer_token_header =
+			std::string("Authorization: Bearer ") + bearer_token;
+		headers =
+			curl_slist_append(headers, bearer_token_header.c_str());
+	}
+
+	std::string read_buffer;
+	std::vector<std::string> location_headers;
+
+	auto offer_sdp =
+		std::string(peer_connection->localDescription().value());
+
+#ifdef DEBUG_SDP
+	do_log(LOG_DEBUG, "Offer SDP:\n%s", offer_sdp.c_str());
+#endif
+
+	// Add user-agent to our requests
+	headers = curl_slist_append(headers, user_agent.c_str());
+
+	CURL *c = curl_easy_init();
+	curl_easy_setopt(c, CURLOPT_WRITEFUNCTION, curl_writefunction);
+	curl_easy_setopt(c, CURLOPT_WRITEDATA, (void *)&read_buffer);
+	curl_easy_setopt(c, CURLOPT_HEADERFUNCTION,
+			 curl_header_location_function);
+	curl_easy_setopt(c, CURLOPT_HEADERDATA, (void *)&location_headers);
+	curl_easy_setopt(c, CURLOPT_HTTPHEADER, headers);
+	curl_easy_setopt(c, CURLOPT_URL, endpoint_url.c_str());
+	curl_easy_setopt(c, CURLOPT_POST, 1L);
+	curl_easy_setopt(c, CURLOPT_COPYPOSTFIELDS, offer_sdp.c_str());
+	curl_easy_setopt(c, CURLOPT_TIMEOUT, 8L);
+	curl_easy_setopt(c, CURLOPT_FOLLOWLOCATION, 1L);
+	curl_easy_setopt(c, CURLOPT_UNRESTRICTED_AUTH, 1L);
+
+	auto cleanup = &() {
+		curl_easy_cleanup(c);
+		curl_slist_free_all(headers);
+	};
+
+	CURLcode res = curl_easy_perform(c);
+	if (res != CURLE_OK) {
+		do_log(LOG_ERROR,
+		 "Connect failed: CURL returned result not CURLE_OK");
+		cleanup();
+		obs_output_signal_stop(output, OBS_OUTPUT_CONNECT_FAILED);
+		return false;
+	}
+
+	long response_code;
+	curl_easy_getinfo(c, CURLINFO_RESPONSE_CODE, &response_code);
+	if (response_code != 201) {
+		do_log(LOG_ERROR,
+		 "Connect failed: HTTP endpoint returned response code %ld",
+		 response_code);
+		cleanup();
+		obs_output_signal_stop(output, OBS_OUTPUT_INVALID_STREAM);
+		return false;
+	}
+
+	if (read_buffer.empty()) {
+		do_log(LOG_ERROR,
+		 "Connect failed: No data returned from HTTP endpoint request");
+		cleanup();
+		obs_output_signal_stop(output, OBS_OUTPUT_CONNECT_FAILED);
+		return false;
+	}
+
+	long redirect_count = 0;
+	curl_easy_getinfo(c, CURLINFO_REDIRECT_COUNT, &redirect_count);
+
+	if (location_headers.size() < static_cast<size_t>(redirect_count) + 1) {
+		do_log(LOG_ERROR,
+		 "WHIP server did not provide a resource URL via the Location header");
+		cleanup();
+		obs_output_signal_stop(output, OBS_OUTPUT_CONNECT_FAILED);
+		return false;
+	}
+
+	CURLU *url_builder = curl_url();
+	auto last_location_header = location_headers.back();
+
+	// If Location header doesn't start with `http` it is a relative URL.
+	// Construct a absolute URL using the host of the effective URL
+	if (last_location_header.find("http") != 0) {
+		char *effective_url = nullptr;
+		curl_easy_getinfo(c, CURLINFO_EFFECTIVE_URL, &effective_url);
+		if (effective_url == nullptr) {
+			do_log(LOG_ERROR, "Failed to build Resource URL");
+			cleanup();
+			obs_output_signal_stop(output,
+					 OBS_OUTPUT_CONNECT_FAILED);
+			return false;
+		}
+
+		curl_url_set(url_builder, CURLUPART_URL, effective_url, 0);
+		curl_url_set(url_builder, CURLUPART_PATH,
+			 last_location_header.c_str(), 0);
+		curl_url_set(url_builder, CURLUPART_QUERY, "", 0);
+	} else {
+		curl_url_set(url_builder, CURLUPART_URL,
+			 last_location_header.c_str(), 0);
+	}
+
+	char *url = nullptr;
+	CURLUcode rc = curl_url_get(url_builder, CURLUPART_URL, &url,
+				 CURLU_NO_DEFAULT_PORT);
+	if (rc) {
+		do_log(LOG_ERROR,
+		 "WHIP server provided a invalid resource URL via the Location header");
+		cleanup();
+		obs_output_signal_stop(output, OBS_OUTPUT_CONNECT_FAILED);
+		return false;
+	}
+
+	resource_url = url;
+	curl_free(url);
+	do_log(LOG_DEBUG, "WHIP Resource URL is: %s", resource_url.c_str());
+	curl_url_cleanup(url_builder);
+
+#ifdef DEBUG_SDP
+	do_log(LOG_DEBUG, "Answer SDP:\n%s", read_buffer.c_str());
+#endif
+
+	auto response = std::string(read_buffer);
+	response.erase(0, response.find("v=0"));
+
+	rtc::Description answer(response, "answer");
+	peer_connection->setRemoteDescription(answer);
+	cleanup();
+	return true;
+}
+
+void WHIPOutput::StartThread()
+{
+	if (!Init())
+		return;
+
+	if (!Setup())
+		return;
+
+	if (!Connect()) {
+		peer_connection->close();
+		peer_connection = nullptr;
+		audio_track = nullptr;
+		video_track = nullptr;
+		return;
+	}
+
+	obs_output_begin_data_capture(output, 0);
+	running = true;
+}
+
+void WHIPOutput::SendDelete()
+{
+	if (resource_url.empty()) {
+		do_log(LOG_DEBUG,
+		 "No resource URL available, not sending DELETE");
+		return;
+	}
+
+	struct curl_slist *headers = NULL;
+	if (!bearer_token.empty()) {
+		auto bearer_token_header =
+			std::string("Authorization: Bearer ") + bearer_token;
+		headers =
+			curl_slist_append(headers, bearer_token_header.c_str());
+	}
+
+	// Add user-agent to our requests
+	headers = curl_slist_append(headers, user_agent.c_str());
+
+	CURL *c = curl_easy_init();
+	curl_easy_setopt(c, CURLOPT_HTTPHEADER, headers);
+	curl_easy_setopt(c, CURLOPT_URL, resource_url.c_str());
+	curl_easy_setopt(c, CURLOPT_CUSTOMREQUEST, "DELETE");
+	curl_easy_setopt(c, CURLOPT_TIMEOUT, 8L);
+
+	auto cleanup = &() {
+		curl_easy_cleanup(c);
+		curl_slist_free_all(headers);
+	};
+
+	CURLcode res = curl_easy_perform(c);
+	if (res != CURLE_OK) {
+		do_log(LOG_WARNING,
+		 "DELETE request for resource URL failed. Reason: %s",
+		 curl_easy_strerror(res));
+		cleanup();
+		return;
+	}
+
+	long response_code;
+	curl_easy_getinfo(c, CURLINFO_RESPONSE_CODE, &response_code);
+	if (response_code != 200) {
+		do_log(LOG_WARNING,
+		 "DELETE request for resource URL failed. HTTP Code: %ld",
+		 response_code);
+		cleanup();
+		return;
+	}
+
+	do_log(LOG_DEBUG,
+	 "Successfully performed DELETE request for resource URL");
+	resource_url.clear();
+	cleanup();
+}
+
+void WHIPOutput::StopThread(bool signal)
+{
+	if (peer_connection != nullptr) {
+		peer_connection->close();
+		peer_connection = nullptr;
+		audio_track = nullptr;
+		video_track = nullptr;
+	}
+
+	SendDelete();
+
+	/*
+	 * "signal" exists because we have to preserve the "running" state
+	 * across reconnect attempts. If we don't emit a signal if
+	 * something calls obs_output_stop() and it's reconnecting, you'll
+	 * desync the UI, as the output will be "stopped" and not
+	 * "reconnecting", but the "stop" signal will have never been
+	 * emitted.
+	 */
+	if (running && signal) {
+		obs_output_signal_stop(output, OBS_OUTPUT_SUCCESS);
+		running = false;
+	}
+
+	total_bytes_sent = 0;
+	connect_time_ms = 0;
+	start_time_ns = 0;
+	last_audio_timestamp = 0;
+	last_video_timestamp = 0;
+}
+
+void WHIPOutput::Send(void *data, uintptr_t size, uint64_t duration,
+		 std::shared_ptr<rtc::Track> track,
+		 std::shared_ptr<rtc::RtcpSrReporter> rtcp_sr_reporter)
+{
+	if (track == nullptr || !track->isOpen())
+		return;
+
+	std::vector<rtc::byte> sample{(rtc::byte *)data,
+				 (rtc::byte *)data + size};
+
+	auto rtp_config = rtcp_sr_reporter->rtpConfig;
+
+	// Sample time is in microseconds, we need to convert it to seconds
+	auto elapsed_seconds = double(duration) / (1000.0 * 1000.0);
+
+	// Get elapsed time in clock rate
+	uint32_t elapsed_timestamp =
+		rtp_config->secondsToTimestamp(elapsed_seconds);
+
+	// Set new timestamp
+	rtp_config->timestamp = rtp_config->timestamp + elapsed_timestamp;
+
+	// get elapsed time in clock rate from last RTCP sender report
+	auto report_elapsed_timestamp =
+		rtp_config->timestamp -
+		rtcp_sr_reporter->lastReportedTimestamp();
+
+	// check if last report was at least 1 second ago
+	if (rtp_config->timestampToSeconds(report_elapsed_timestamp) > 1)
+		rtcp_sr_reporter->setNeedsToReport();
+
+	try {
+		track->send(sample);
+		total_bytes_sent += sample.size();
+	} catch (const std::exception &e) {
+		do_log(LOG_ERROR, "error: %s ", e.what());
+	}
+}
+
+void register_whip_output()
+{
+	struct obs_output_info info = {};
+
+	info.id = "whip_output";
+	info.flags = OBS_OUTPUT_AV | OBS_OUTPUT_ENCODED | OBS_OUTPUT_SERVICE;
+	info.get_name = (void *) -> const char * {
+		return obs_module_text("Output.Name");
+	};
+	info.create = (obs_data_t *settings, obs_output_t *output) -> void * {
+		return new WHIPOutput(settings, output);
+	};
+	info.destroy = (void *priv_data) {
+		delete static_cast<WHIPOutput *>(priv_data);
+	};
+	info.start = (void *priv_data) -> bool {
+		return static_cast<WHIPOutput *>(priv_data)->Start();
+	};
+	info.stop = (void *priv_data, uint64_t) {
+		static_cast<WHIPOutput *>(priv_data)->Stop();
+	};
+	info.encoded_packet = (void *priv_data,
+				 struct encoder_packet *packet) {
+		static_cast<WHIPOutput *>(priv_data)->Data(packet);
+	};
+	info.get_defaults = (obs_data_t *) {
+	};
+	info.get_properties = (void *) -> obs_properties_t * {
+		return obs_properties_create();
+	};
+	info.get_total_bytes = (void *priv_data) -> uint64_t {
+		return (uint64_t) static_cast<WHIPOutput *>(priv_data)
+			->GetTotalBytes();
+	};
+	info.get_connect_time_ms = (void *priv_data) -> int {
+		return static_cast<WHIPOutput *>(priv_data)->GetConnectTime();
+	};
+	info.encoded_video_codecs = "h264";
+	info.encoded_audio_codecs = "opus";
+	info.protocols = "WHIP";
+
+	obs_register_output(&info);
+}

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/whip-output.h Added

@@ -0,0 +1,70 @@
+#pragma once
+
+#include <obs-module.h>
+#include <util/curl/curl-helper.h>
+#include <util/platform.h>
+#include <util/base.h>
+#include <util/dstr.h>
+
+#include <string>
+#include <atomic>
+#include <mutex>
+#include <thread>
+
+#include <rtc/rtc.hpp>
+
+class WHIPOutput {
+public:
+	WHIPOutput(obs_data_t *settings, obs_output_t *output);
+	~WHIPOutput();
+
+	bool Start();
+	void Stop(bool signal = true);
+	void Data(struct encoder_packet *packet);
+
+	inline size_t GetTotalBytes() { return total_bytes_sent; }
+
+	inline int GetConnectTime() { return connect_time_ms; }
+
+private:
+	void ConfigureAudioTrack(std::string media_stream_id,
+				 std::string cname);
+	void ConfigureVideoTrack(std::string media_stream_id,
+				 std::string cname);
+	bool Init();
+	bool Setup();
+	bool Connect();
+	void StartThread();
+	void SendDelete();
+	void StopThread(bool signal);
+
+	void Send(void *data, uintptr_t size, uint64_t duration,
+		 std::shared_ptr<rtc::Track> track,
+		 std::shared_ptr<rtc::RtcpSrReporter> rtcp_sr_reporter);
+
+	obs_output_t *output;
+
+	std::string endpoint_url;
+	std::string bearer_token;
+	std::string resource_url;
+
+	std::atomic<bool> running;
+
+	std::mutex start_stop_mutex;
+	std::thread start_stop_thread;
+
+	uint32_t base_ssrc;
+	std::shared_ptr<rtc::PeerConnection> peer_connection;
+	std::shared_ptr<rtc::Track> audio_track;
+	std::shared_ptr<rtc::Track> video_track;
+	std::shared_ptr<rtc::RtcpSrReporter> audio_sr_reporter;
+	std::shared_ptr<rtc::RtcpSrReporter> video_sr_reporter;
+
+	std::atomic<size_t> total_bytes_sent;
+	std::atomic<int> connect_time_ms;
+	int64_t start_time_ns;
+	int64_t last_audio_timestamp;
+	int64_t last_video_timestamp;
+};
+
+void register_whip_output();

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/whip-service.cpp Added

@@ -0,0 +1,107 @@
+#include "whip-service.h"
+
+const char *audio_codecsMAX_CODECS = {"opus"};
+const char *video_codecsMAX_CODECS = {"h264"};
+
+WHIPService::WHIPService(obs_data_t *settings, obs_service_t *)
+	: server(),
+	 bearer_token()
+{
+	Update(settings);
+}
+
+void WHIPService::Update(obs_data_t *settings)
+{
+	server = obs_data_get_string(settings, "server");
+	bearer_token = obs_data_get_string(settings, "bearer_token");
+}
+
+obs_properties_t *WHIPService::Properties()
+{
+	obs_properties_t *ppts = obs_properties_create();
+
+	obs_properties_add_text(ppts, "server", "URL", OBS_TEXT_DEFAULT);
+	obs_properties_add_text(ppts, "bearer_token",
+				obs_module_text("Service.BearerToken"),
+				OBS_TEXT_PASSWORD);
+
+	return ppts;
+}
+
+void WHIPService::ApplyEncoderSettings(obs_data_t *video_settings, obs_data_t *)
+{
+	// For now, ensure maximum compatibility with webrtc peers
+	if (video_settings) {
+		obs_data_set_int(video_settings, "bf", 0);
+		obs_data_set_bool(video_settings, "repeat_headers", true);
+	}
+}
+
+const char *WHIPService::GetConnectInfo(enum obs_service_connect_info type)
+{
+	switch (type) {
+	case OBS_SERVICE_CONNECT_INFO_SERVER_URL:
+		return server.c_str();
+	case OBS_SERVICE_CONNECT_INFO_BEARER_TOKEN:
+		return bearer_token.c_str();
+	default:
+		return nullptr;
+	}
+}
+
+bool WHIPService::CanTryToConnect()
+{
+	return !server.empty();
+}
+
+void register_whip_service()
+{
+	struct obs_service_info info = {};
+
+	info.id = "whip_custom";
+	info.get_name = (void *) -> const char * {
+		return obs_module_text("Service.Name");
+	};
+	info.create = (obs_data_t *settings,
+			 obs_service_t *service) -> void * {
+		return new WHIPService(settings, service);
+	};
+	info.destroy = (void *priv_data) {
+		delete static_cast<WHIPService *>(priv_data);
+	};
+	info.update = (void *priv_data, obs_data_t *settings) {
+		static_cast<WHIPService *>(priv_data)->Update(settings);
+	};
+	info.get_properties = (void *) -> obs_properties_t * {
+		return WHIPService::Properties();
+	};
+	info.get_protocol = (void *) -> const char * {
+		return "WHIP";
+	};
+	info.get_url = (void *priv_data) -> const char * {
+		return static_cast<WHIPService *>(priv_data)->server.c_str();
+	};
+	info.get_output_type = (void *) -> const char * {
+		return "whip_output";
+	};
+	info.apply_encoder_settings = (void *, obs_data_t *video_settings,
+					 obs_data_t *audio_settings) {
+		WHIPService::ApplyEncoderSettings(video_settings,
+						 audio_settings);
+	};
+	info.get_supported_video_codecs = (void *) -> const char ** {
+		return video_codecs;
+	};
+	info.get_supported_audio_codecs = (void *) -> const char ** {
+		return audio_codecs;
+	};
+	info.can_try_to_connect = (void *priv_data) -> bool {
+		return static_cast<WHIPService *>(priv_data)->CanTryToConnect();
+	};
+	info.get_connect_info = (void *priv_data,
+				 uint32_t type) -> const char * {
+		return static_cast<WHIPService *>(priv_data)->GetConnectInfo(
+			(enum obs_service_connect_info)type);
+	};
+	obs_register_service(&info);
+}

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/whip-service.h Added

obs-studio-30.0.2.tar.xz/plugins/obs-webrtc/whip-utils.h Added

@@ -0,0 +1,90 @@
+#pragma once
+
+#include <obs.h>
+
+#include <string>
+#include <random>
+#include <sstream>
+
+#define do_log(level, format, ...) \
+	blog(level, "obs-webrtc whip_output: '%s' " format, \
+	 obs_output_get_name(output), ##__VA_ARGS__)
+
+static uint32_t generate_random_u32()
+{
+	std::random_device rd;
+	std::mt19937 gen(rd());
+	std::uniform_int_distribution<uint32_t> dist(1, (UINT32_MAX - 1));
+	return dist(gen);
+}
+
+static std::string trim_string(const std::string &source)
+{
+	std::string ret(source);
+	ret.erase(0, ret.find_first_not_of(" \n\r\t"));
+	ret.erase(ret.find_last_not_of(" \n\r\t") + 1);
+	return ret;
+}
+
+static size_t curl_writefunction(char *data, size_t size, size_t nmemb,
+				 void *priv_data)
+{
+	auto read_buffer = static_cast<std::string *>(priv_data);
+
+	size_t real_size = size * nmemb;
+
+	read_buffer->append(data, real_size);
+	return real_size;
+}
+
+#define LOCATION_HEADER_LENGTH 10
+
+static size_t curl_header_location_function(char *data, size_t size,
+					 size_t nmemb, void *priv_data)
+{
+	auto header_buffer = static_cast<std::vector<std::string> *>(priv_data);
+
+	size_t real_size = size * nmemb;
+
+	if (real_size < LOCATION_HEADER_LENGTH)
+		return real_size;
+
+	if (!astrcmpi_n(data, "location: ", LOCATION_HEADER_LENGTH)) {
+		char *val = data + LOCATION_HEADER_LENGTH;
+		auto header_temp =
+			std::string(val, real_size - LOCATION_HEADER_LENGTH);
+
+		header_temp = trim_string(header_temp);
+		header_buffer->push_back(header_temp);
+	}
+
+	return real_size;
+}
+
+static inline std::string generate_user_agent()
+{
+#ifdef _WIN64
+#define OS_NAME "Windows x86_64"
+#elif __APPLE__
+#define OS_NAME "Mac OS X"
+#elif __OpenBSD__
+#define OS_NAME "OpenBSD"
+#elif __FreeBSD__
+#define OS_NAME "FreeBSD"
+#elif __linux__ && __LP64__
+#define OS_NAME "Linux x86_64"
+#else
+#define OS_NAME "Linux"
+#endif
+
+	// Build the user-agent string
+	std::stringstream ua;
+	// User agent header prefix
+	ua << "User-Agent: Mozilla/5.0 ";
+	// OBS version info
+	ua << "(OBS-Studio/" << obs_get_version_string() << "; ";
+	// Operating system version info
+	ua << OS_NAME << "; " << obs_get_locale() << ")";
+
+	return ua.str();
+}

obs-studio-30.0.2.tar.xz/plugins/obs-websocket/.github/workflows/crowdin_upload.yml Added

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/.gitmodules -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/.gitmodules Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/CMakeLists.txt Changed

@@ -2,7 +2,7 @@
 
 legacy_check()
 
-set(obs-websocket_VERSION 5.2.3)
+set(obs-websocket_VERSION 5.3.4)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
@@ -11,17 +11,17 @@
 return()
 endif()
 
-# Submodule deps check
-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp")
- message(FATAL_ERROR "obs-websocket submodule deps not available.")
-endif()
-
 # Find Qt
 find_qt(COMPONENTS Core Widgets Svg Network)
 
 # Find nlohmann JSON
 find_package(nlohmann_json 3 REQUIRED)
 
+# Find qrcodegencpp
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
+find_package(qrcodegencpp REQUIRED)
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
+
 # Find WebSocket++
 find_package(Websocketpp 0.8 REQUIRED)
 
@@ -53,7 +53,6 @@
 PRIVATE src/websocketserver/WebSocketServer.cpp
 src/websocketserver/WebSocketServer_Protocol.cpp
 src/websocketserver/WebSocketServer.h
- src/websocketserver/rpc/WebSocketSession.cpp
 src/websocketserver/rpc/WebSocketSession.h
 src/websocketserver/types/WebSocketCloseCode.h
 src/websocketserver/types/WebSocketOpCode.h)
@@ -125,13 +124,11 @@
 src/utils/Platform.h
 src/utils/Utils.h)
 
-target_sources(obs-websocket PRIVATE deps/qr/cpp/QrCode.cpp deps/qr/cpp/QrCode.hpp)
-
 configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
 target_sources(obs-websocket PRIVATE plugin-macros.generated.h)
 
 target_compile_definitions(
- obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:PLUGIN_TESTS>:PLUGIN_TESTS>
+ obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:${PLUGIN_TESTS}>:PLUGIN_TESTS>
 $<$<PLATFORM_ID:Windows>:_WEBSOCKETPP_CPP11_STL_> $<$<PLATFORM_ID:Windows>:_WIN32_WINNT=0x0603>)
 
 target_compile_options(
@@ -155,7 +152,8 @@
 Qt::Network
 nlohmann_json::nlohmann_json
 Websocketpp::Websocketpp
- Asio::Asio)
+ Asio::Asio
+ qrcodegencpp::qrcodegencpp)
 
 set_target_properties_obs(
 obs-websocket
@@ -170,4 +168,6 @@
 TARGET obs-websocket
 APPEND
 PROPERTY AUTORCC_OPTIONS --format-version 1)
+
+ target_link_options(obs-websocket PRIVATE /IGNORE:4099)
 endif()

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/README.md -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/README.md Changed

@@ -13,7 +13,7 @@
 
 ## Downloads
 
-obs-websocket is now included by default with OBS Studio 28.0.0 and above. As such, **there should be no need to download obs-websocket if you have OBS Studio > 28.0.0.**
+**obs-websocket is now included by default with OBS Studio 28.0.0 and above. As such, there should be no need to download obs-websocket if you have OBS Studio > 28.0.0.**
 
 Binaries **for OBS Studio < 28.0.0** on Windows, MacOS, and Linux are available in the Releases(https://github.com/obsproject/obs-websocket/releases) section.
 
@@ -65,12 +65,11 @@
 
 ### Code Contributors
 
-This project exists thanks to all the people(graphs/contributors) who contribute. Contribute(wiki/Contributing-Guidelines).
-<a href="https://github.com/obsproject/obs-websocket/graphs/contributors"><img src="https://opencollective.com/obs-websocket-dev/contributors.svg?width=890&button=false" /></a>
+This project exists thanks to all the people(https://github.com/obsproject/obs-websocket/graphs/contributors) who contribute. Contribute Code(https://github.com/obsproject/obs-websocket/wiki/Contributing-Guidelines).
 
 ### Financial Contributors
 
-Become a financial contributor and help us sustain our community. Contribute(https://opencollective.com/obs-websocket-dev/contribute)
+Become a financial contributor and help us sustain our community. Contribute Financially(https://opencollective.com/obs-websocket-dev/contribute)
 
 #### Individuals

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/cmake/legacy.cmake Changed

@@ -1,4 +1,4 @@
-project(obs-websocket VERSION 5.2.3)
+project(obs-websocket VERSION 5.3.4)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)
@@ -8,11 +8,6 @@
   return()
 endif()
 
-# Submodule deps check
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp)
-  obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
-endif()
-
 # Plugin tests flag
 option(PLUGIN_TESTS "Enable plugin runtime tests" OFF)
 
@@ -22,6 +17,11 @@
 # Find nlohmann JSON
 find_package(nlohmann_json 3 REQUIRED)
 
+# Find qrcodegencpp
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
+find_package(qrcodegencpp REQUIRED)
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG OFF)
+
 # Find WebSocket++
 find_package(Websocketpp 0.8 REQUIRED)
 
@@ -67,7 +67,6 @@
           src/websocketserver/WebSocketServer.cpp
           src/websocketserver/WebSocketServer_Protocol.cpp
           src/websocketserver/WebSocketServer.h
-          src/websocketserver/rpc/WebSocketSession.cpp
           src/websocketserver/rpc/WebSocketSession.h
           src/websocketserver/types/WebSocketCloseCode.h
           src/websocketserver/types/WebSocketOpCode.h
@@ -128,9 +127,7 @@
           src/utils/Platform.h
           src/utils/Compat.cpp
           src/utils/Compat.h
-          src/utils/Utils.h
-          deps/qr/cpp/QrCode.cpp
-          deps/qr/cpp/QrCode.hpp)
+          src/utils/Utils.h)
 
 target_link_libraries(
   obs-websocket
@@ -142,7 +139,8 @@
           Qt::Network
           nlohmann_json::nlohmann_json
           Websocketpp::Websocketpp
-          Asio::Asio)
+          Asio::Asio
+          qrcodegencpp::qrcodegencpp)
 
 target_compile_features(obs-websocket PRIVATE cxx_std_17)
 
@@ -159,6 +157,7 @@
 
 if(MSVC)
   target_compile_options(obs-websocket PRIVATE /wd4267 /wd4996)
+  target_link_options(obs-websocket PRIVATE "LINKER:/IGNORE:4099")
 else()
   target_compile_options(
     obs-websocket

obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/af-ZA.ini Added

@@ -0,0 +1,35 @@
+OBSWebSocket.Plugin.Description="Afstandbeheer van OBS deur WebSocket"
+OBSWebSocket.Settings.DialogTitle="WebSocket-bedienerinstellings"
+OBSWebSocket.Settings.PluginSettingsTitle="Inpropinstellings"
+OBSWebSocket.Settings.ServerEnable="Aktiveer WebSocket-diens"
+OBSWebSocket.Settings.ServerSettingsTitle="Bedienerinstellings"
+OBSWebSocket.Settings.Password="Bedienerwagwoord"
+OBSWebSocket.Settings.GeneratePassword="Genereer wagwoord"
+OBSWebSocket.Settings.ServerPort="Bedienerpoort"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Waarskuwing: Tans regstreeks"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Dit lyk of ’n afvoer (stroom, opname, ens.) tans aktief is."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Is u seker u wil u verbindingsinligting laat sien?"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Waarskuwing: potensiële beveiligingsprobleem"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websok bewaar die bedienerwagwoord as platteks. Dit word ten sterkste aanbeveel om ’n wagwoord wat deur obs-websok geskep is te gebruik."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Is u seker u wil u eie wagwoord gebruik?"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Fout: Ongeldige opstalling"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="U moet ’n wagwoord van meet as 6 karakters gebruik."
+OBSWebSocket.SessionTable.Title="Gekoppelde WebSocket-sessies"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Afstandsadres"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Sessieduur"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Boodskappe In/Uit"
+OBSWebSocket.SessionTable.IdentifiedTitle="Geïdentifiseer"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Verwyder?"
+OBSWebSocket.SessionTable.KickButtonText="Verwyder"
+OBSWebSocket.ConnectInfo.DialogTitle="WebSocket-verbindingsinligting"
+OBSWebSocket.ConnectInfo.CopyText="Kopieer"
+OBSWebSocket.ConnectInfo.ServerIp="Bediener-IP (beste skatting)"
+OBSWebSocket.ConnectInfo.ServerPort="Bedienerpoort"
+OBSWebSocket.ConnectInfo.ServerPassword="Bedienerwagwoord"
+OBSWebSocket.ConnectInfo.QrTitle="Koppel QR"
+OBSWebSocket.TrayNotification.Identified.Title="Nuwe WebSocket-koppeling"
+OBSWebSocket.TrayNotification.Identified.Body="Kliënt %1 geïdentifiseer."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket-waarmerkfout"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Kliënt %1 kon nie waarmerk nie."
+OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-kliënt is ontkoppel"
+OBSWebSocket.TrayNotification.Disconnected.Body="Kliënt %1 is ontkoppel."

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/de-DE.ini Changed

@@ -4,7 +4,7 @@
 OBSWebSocket.Settings.ServerEnable="WebSocket-Server aktivieren"
 OBSWebSocket.Settings.AlertsEnable="Warnungen im Infobereich aktivieren"
 OBSWebSocket.Settings.DebugEnable="Debug-Logging aktivieren"
-OBSWebSocket.Settings.DebugEnableHoverText="Aktiviert Debug-Logging für die aktuelle OBS-Instanz.\nVerwenden Sie „--websocket_debug“, damit die Option beim Laden aktiviert wird."
+OBSWebSocket.Settings.DebugEnableHoverText="Aktiviert Debug-Logging für die aktuelle OBS-Instanz.\nVerwenden Sie „--websocket_debug“, damit die Option beim Starten aktiviert wird."
 OBSWebSocket.Settings.ServerSettingsTitle="Servereinstellungen"
 OBSWebSocket.Settings.AuthRequired="Authentifizierung aktivieren"
 OBSWebSocket.Settings.Password="Serverpasswort"
@@ -28,7 +28,7 @@
 OBSWebSocket.SessionTable.KickButtonText="Entfernen"
 OBSWebSocket.ConnectInfo.DialogTitle="WebSocket-Verbindungsinformationen"
 OBSWebSocket.ConnectInfo.CopyText="Kopieren"
-OBSWebSocket.ConnectInfo.ServerIp="Server-IP (geschätzt)"
+OBSWebSocket.ConnectInfo.ServerIp="Server-IP (Geschätzt)"
 OBSWebSocket.ConnectInfo.ServerPort="Serverport"
 OBSWebSocket.ConnectInfo.ServerPassword="Serverpasswort"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Authentifizierung deaktiviert"
@@ -39,5 +39,3 @@
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Client %1 konnte sich nicht authentifizieren."
 OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-Client getrennt"
 OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 getrennt."
-OBSWebSocket.Server.StartFailed.Title="WebSocket-Serverfehler"
-OBSWebSocket.Server.StartFailed.Message="Der WebSocket-Server konnte nicht gestartet werden, da der TCP-Port %1 möglicherweise benutzt wird. Versuchen Sie, den Port in den WebSocket-Servereinstellungen zu ändern oder Anwendungen zu schließen, die diesen verwenden könnten.\nFehler: %2"

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/el-GR.ini Changed

@@ -1,4 +1,5 @@
 OBSWebSocket.Plugin.Description="Απομακρυσμένος έλεγχος του OBS Studio μέσω WebSocket"
+OBSWebSocket.Settings.DialogTitle="Ρυθμίσεις Διακομιστή WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Ρυθμίσεις Προσθέτων"
 OBSWebSocket.Settings.ServerEnable="Ενεργοποίηση διακομιστή WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Ενεργοποίηση Ειδοποιήσεων στο System Tray"
@@ -38,5 +39,3 @@
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Αποτυχία ταυτοποίησης του πελάτη %1."
 OBSWebSocket.TrayNotification.Disconnected.Title="Αποσυνδέθηκε ο Πελάτης του WebSocket"
 OBSWebSocket.TrayNotification.Disconnected.Body="Ο πελάτης %1 αποσυνδέθηκε."
-OBSWebSocket.Server.StartFailed.Title="Αποτυχία Διακομιστή WebSocket"
-OBSWebSocket.Server.StartFailed.Message="Ο διακομιστής WebSocket απέτυχε να ξεκινήσει. Η θύρα %1 TCP μπορεί ήδη να χρησιμοποιείται από μια άλλη εφαρμογή σε αυτό το σύστημα. Δοκιμάστε να ορίσετε μια διαφορετική θύρα TCP στις ρυθμίσεις διακομιστή WebSocket ή να σταματήσετε οποιαδήποτε εφαρμογή που θα μπορούσε να χρησιμοποιήσει αυτή τη θύρα.\n Μήνυμα σφάλματος: %2"

obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/fr-FR.ini Changed

@@ -16,9 +16,9 @@
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Êtes-vous sûr de vouloir afficher vos informations de connexion ?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Avertissement : Problème potentiel de sécurité"
 OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket enregistre le mot de passe du serveur en texte brut. L'utilisation d'un mot de passe généré par obs-websocket est fortement recommandée."
-OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Êtes-vous sûr de vouloir utiliser votre propre mot de passe ?"
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Êtes-vous sûr(e) de vouloir utiliser votre propre mot de passe ?"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Erreur : Configuration invalide"
-OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Vous devez utiliser un mot de passe d'au moins 6 caractères"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Vous devez utiliser un mot de passe de 6 caractères ou plus."
 OBSWebSocket.SessionTable.Title="Sessions WebSocket connectées"
 OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Adresse distante"
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durée de session"
@@ -30,7 +30,7 @@
 OBSWebSocket.ConnectInfo.CopyText="Copier"
 OBSWebSocket.ConnectInfo.ServerIp="IP du serveur (meilleure estimation)"
 OBSWebSocket.ConnectInfo.ServerPort="Port serveur"
-OBSWebSocket.ConnectInfo.ServerPassword="Mot de passe serveur"
+OBSWebSocket.ConnectInfo.ServerPassword="Mot de passe du serveur"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Authentification désactivée"
 OBSWebSocket.ConnectInfo.QrTitle="QR code de connexion"
 OBSWebSocket.TrayNotification.Identified.Title="Nouvelle connexion WebSocket"
@@ -39,5 +39,3 @@
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Échec d'authentification du client %1."
 OBSWebSocket.TrayNotification.Disconnected.Title="Client WebSocket déconnecté"
 OBSWebSocket.TrayNotification.Disconnected.Body="Client %1 déconnecté."
-OBSWebSocket.Server.StartFailed.Title="Échec du serveur WebSocket"
-OBSWebSocket.Server.StartFailed.Message="Le serveur WebSocket n'a pas pu démarrer. Le port TCP %1 est peut être déjà utilisé par une autre application ailleurs sur ce système. Essayez de définir un port TCP différent dans les paramètres du serveur WebSocket, ou arrêtez toute application qui pourrait utiliser ce port.\n Message d'erreur : %2"

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/nb-NO.ini Changed

@@ -1,2 +1,25 @@
+OBSWebSocket.Settings.DialogTitle="WebSocket-tjenerinnstillinger"
+OBSWebSocket.Settings.PluginSettingsTitle="Utvidelsesinnstillinger"
+OBSWebSocket.Settings.ServerSettingsTitle="Tjenerinnstillinger"
+OBSWebSocket.Settings.AuthRequired="Skru på autentisering"
 OBSWebSocket.Settings.Password="Server Passord"
 OBSWebSocket.Settings.GeneratePassword="Generer Passord"
+OBSWebSocket.Settings.ShowConnectInfo="Vis tilkoblingsinfo"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Advarsel: For øyeblikket på direktesending"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Advarsel: Potensielt sikkerhetsproblem"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Feil: Ugyldig konfigurasjon"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Du må bruke et passord på minst 6 tegn."
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Ekstern adresse"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Øktens varighet"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Innboks/Utboks"
+OBSWebSocket.SessionTable.IdentifiedTitle="Identifisert"
+OBSWebSocket.ConnectInfo.DialogTitle="WebSocket-tilkoblingsinfo"
+OBSWebSocket.ConnectInfo.CopyText="Kopier"
+OBSWebSocket.ConnectInfo.ServerIp="Tjenerens IP (beste gjetning)"
+OBSWebSocket.ConnectInfo.ServerPort="Tjenerport"
+OBSWebSocket.ConnectInfo.ServerPassword="Tjenerpassord"
+OBSWebSocket.ConnectInfo.QrTitle="QR-tilkobling"
+OBSWebSocket.TrayNotification.Identified.Title="Ny WebSocket-tilkobling"
+OBSWebSocket.TrayNotification.Identified.Body="Klient %1 er identifisert."
+OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket-klient koblet fra"
+OBSWebSocket.TrayNotification.Disconnected.Body="Klient %1 koblet fra."

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ro-RO.ini Changed

@@ -1,16 +1,16 @@
 OBSWebSocket.Plugin.Description="Control de la distanță pentru OBS Studio prin WebSocket"
-OBSWebSocket.Settings.DialogTitle="Setări ale server-ului WebSocket"
+OBSWebSocket.Settings.DialogTitle="Setări pentru serverul WebSocket"
 OBSWebSocket.Settings.PluginSettingsTitle="Setări pentru plugin"
 OBSWebSocket.Settings.ServerEnable="Activează serverul WebSocket"
 OBSWebSocket.Settings.AlertsEnable="Activează alertele din bara de sistem"
-OBSWebSocket.Settings.DebugEnable="Activează jurnalizarea de depanare"
-OBSWebSocket.Settings.DebugEnableHoverText="Activează jurnalizarea de depanare pentru instanța actuală de OBS. Nu persistă la încărcare.\nFolosește --websocket_debug pentru a activa la încărcare."
-OBSWebSocket.Settings.ServerSettingsTitle="Setări server"
+OBSWebSocket.Settings.DebugEnable="Activează jurnalizarea pentru depanare"
+OBSWebSocket.Settings.DebugEnableHoverText="Activează jurnalizarea pentru depanare în cazul instanței actuale de OBS. Nu persistă la încărcare.\nFolosește --websocket_debug pentru a activa la încărcare."
+OBSWebSocket.Settings.ServerSettingsTitle="Setări pentru server"
 OBSWebSocket.Settings.AuthRequired="Activează autentificarea"
 OBSWebSocket.Settings.Password="Parola serverului"
 OBSWebSocket.Settings.GeneratePassword="Generează parola"
 OBSWebSocket.Settings.ServerPort="Portul serverului"
-OBSWebSocket.Settings.ShowConnectInfo="Afișează informațiile de conectare"
+OBSWebSocket.Settings.ShowConnectInfo="Afișează informațiile conexiunii"
 OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Avertisment: În prezent în direct"
 OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că un output (transmisiune, înregistrare etc.) este activ în prezent."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sigur vrei să afișezi informațiile de conectare?"
@@ -24,20 +24,18 @@
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="Durata sesiunii"
 OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mesaje de intrare/ieșire"
 OBSWebSocket.SessionTable.IdentifiedTitle="Identificat"
-OBSWebSocket.SessionTable.KickButtonColumnTitle="Înlătură?"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Înlături?"
 OBSWebSocket.SessionTable.KickButtonText="Înlătură"
-OBSWebSocket.ConnectInfo.DialogTitle="Informații de conectare WebSocket"
+OBSWebSocket.ConnectInfo.DialogTitle="Informațiile conexiunii WebSocket"
 OBSWebSocket.ConnectInfo.CopyText="Copiază"
 OBSWebSocket.ConnectInfo.ServerIp="IP-ul serverului (cea mai bună presupunere)"
 OBSWebSocket.ConnectInfo.ServerPort="Portul serverului"
 OBSWebSocket.ConnectInfo.ServerPassword="Parola serverului"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Autentificare dezactivată"
-OBSWebSocket.ConnectInfo.QrTitle="Conectare QR"
+OBSWebSocket.ConnectInfo.QrTitle="QR de conectare"
 OBSWebSocket.TrayNotification.Identified.Title="O nouă conexiune WebSocket"
-OBSWebSocket.TrayNotification.Identified.Body="Client %1 identificat."
+OBSWebSocket.TrayNotification.Identified.Body="Clientul %1 identificat."
 OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Eroare de autentificare WebSocket"
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Client %1 nu a reușit să se autentifice."
 OBSWebSocket.TrayNotification.Disconnected.Title="Client WebSocket deconectat"
 OBSWebSocket.TrayNotification.Disconnected.Body="Clientul %1 s-a deconectat."
-OBSWebSocket.Server.StartFailed.Title="Eroare de server WebSocket"
-OBSWebSocket.Server.StartFailed.Message="Serverul WebSocket nu a reușit să pornească. Este posibil ca portul TCP %1 să fie deja utilizat în altă parte pe acest sistem de o altă aplicație. Încearcă să setezi un alt port TCP în setările serverului WebSocket sau oprește orice aplicație care ar putea utiliza acest port.\n Mesaj de eroare: %2"

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/ru-RU.ini Changed

@@ -6,13 +6,13 @@
 OBSWebSocket.Settings.DebugEnable="Включить отладочный журнал"
 OBSWebSocket.Settings.DebugEnableHoverText="Включает ведение журнала отладки для текущего экземпляра OBS. Не сохраняется при запуске.\nИспользуйте --websocket_debug для включения при запуске."
 OBSWebSocket.Settings.ServerSettingsTitle="Настройки сервера"
-OBSWebSocket.Settings.AuthRequired="Включить аутентификацию"
+OBSWebSocket.Settings.AuthRequired="Включить вход в аккаунт"
 OBSWebSocket.Settings.Password="Пароль сервера"
-OBSWebSocket.Settings.GeneratePassword="Сгенерировать пароль"
+OBSWebSocket.Settings.GeneratePassword="Создать пароль"
 OBSWebSocket.Settings.ServerPort="Порт сервера"
 OBSWebSocket.Settings.ShowConnectInfo="Показать сведения о подключении"
 OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Предупреждение: Сейчас в эфире"
-OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Похоже, что вывод (поток, запись и т. д.) в настоящее время активен."
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Похоже, что вывод (поток, запись и т. д.) в настоящее время уже выбран."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Уверены, что хотите показать ваши сведения о подключении?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Предупреждение: Потенциальная проблема безопасности"
 OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket хранит пароль сервера в виде обычного текста. Настоятельно рекомендуется использовать пароль, сгенерированный obs-websock."
@@ -31,13 +31,11 @@
 OBSWebSocket.ConnectInfo.ServerIp="IP сервера (лучшая догадка)"
 OBSWebSocket.ConnectInfo.ServerPort="Порт сервера"
 OBSWebSocket.ConnectInfo.ServerPassword="Пароль сервера"
-OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Авторизация отключена"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Вход отключён"
 OBSWebSocket.ConnectInfo.QrTitle="QR-код подключения"
 OBSWebSocket.TrayNotification.Identified.Title="Новое подключение WebSocket"
 OBSWebSocket.TrayNotification.Identified.Body="Клиент %1 распознан."
-OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ошибка аутентификации WebSocket"
-OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Клиент %1 не смог аутентифицироваться."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Ошибка входа WebSocket"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="Клиент %1 не смог войти."
 OBSWebSocket.TrayNotification.Disconnected.Title="Клиент WebSocket отключился"
 OBSWebSocket.TrayNotification.Disconnected.Body="Клиент %1 отключился."
-OBSWebSocket.Server.StartFailed.Title="Ошибка сервера WebSocket"
-OBSWebSocket.Server.StartFailed.Message="Не удалось запустить сервер WebSockt. Возможно, порт TCP %1 уже используется другим приложением. Попробуйте установить другой TCP-порт в настройках сервера WebSocket или остановите любое приложение, которое может использовать этот порт.\n Сообщение ошибки: %2"

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/tr-TR.ini Changed

@@ -29,7 +29,7 @@
 OBSWebSocket.ConnectInfo.DialogTitle="WebSocket Bağlanma Bilgileri"
 OBSWebSocket.ConnectInfo.CopyText="Kopyala"
 OBSWebSocket.ConnectInfo.ServerIp="Sunucu IP (En İyi Tahmin)"
-OBSWebSocket.ConnectInfo.ServerPort="Sunucu Kapısı"
+OBSWebSocket.ConnectInfo.ServerPort="Sunucu Portu"
 OBSWebSocket.ConnectInfo.ServerPassword="Sunucu Parolası"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Doğrulama Devre Dışı"
 OBSWebSocket.ConnectInfo.QrTitle="Kare Kod ile Bağlan"
@@ -39,5 +39,3 @@
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 istemcisinin kimlik doğrulaması başarısız oldu."
 OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket İstemcisinin Bağlantısı Kesildi"
 OBSWebSocket.TrayNotification.Disconnected.Body="%1 istemcisinin bağlantısı kesildi."
-OBSWebSocket.Server.StartFailed.Title="WebSocket Sunucu Hatası"
-OBSWebSocket.Server.StartFailed.Message="WebSocket sunucusu başlatılamadı. %1 TCP kapısı bu sistemde başka bir yerde başka bir uygulama tarafından zaten kullanılıyor olabilir. WebSocket sunucu ayarlarında farklı bir TCP kapısı ayarlamayı deneyin, veya bu kapıyı kullanıyor olabilecek herhangi bir uygulamayı durdurun.\n Hata mesajı: %2"

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/zh-CN.ini Changed

@@ -6,23 +6,23 @@
 OBSWebSocket.Settings.DebugEnable="开启调试日志"
 OBSWebSocket.Settings.DebugEnableHoverText="开启当前 OBS 实例的调试日志。下次启动时需重新设置。\n使用 --websocket_debug 在启动 OBS 时开启日志。"
 OBSWebSocket.Settings.ServerSettingsTitle="服务器设置"
-OBSWebSocket.Settings.AuthRequired="开启鉴权"
+OBSWebSocket.Settings.AuthRequired="开启身份认证"
 OBSWebSocket.Settings.Password="服务器密码"
 OBSWebSocket.Settings.GeneratePassword="生成密码"
 OBSWebSocket.Settings.ServerPort="服务器端口"
 OBSWebSocket.Settings.ShowConnectInfo="显示连接信息"
 OBSWebSocket.Settings.ShowConnectInfoWarningTitle="警告：正在直播"
-OBSWebSocket.Settings.ShowConnectInfoWarningMessage="似乎正在输出（串流、录像等）。"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="似乎输出（串流、录像等）正在进行。"
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="您确定要显示您的连接信息吗？"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="警告：潜在安全问题"
 OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket 会以明文形式储存服务器密码。强烈建议使用 obs-websocket 生成的密码。"
 OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="您确定要使用自定义密码吗？"
-OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="错误：配置无效"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="错误：无效的配置"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="您的密码必须包含 6 个或以上的字符。"
 OBSWebSocket.SessionTable.Title="已连接的 WebSocket 会话"
 OBSWebSocket.SessionTable.RemoteAddressColumnTitle="远程地址"
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="会话持续时间"
-OBSWebSocket.SessionTable.MessagesInOutColumnTitle="消息传入/出"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="消息传入/传出"
 OBSWebSocket.SessionTable.IdentifiedTitle="已识别"
 OBSWebSocket.SessionTable.KickButtonColumnTitle="踢出？"
 OBSWebSocket.SessionTable.KickButtonText="踢出"
@@ -31,13 +31,11 @@
 OBSWebSocket.ConnectInfo.ServerIp="服务器 IP（最佳猜测）"
 OBSWebSocket.ConnectInfo.ServerPort="服务器端口"
 OBSWebSocket.ConnectInfo.ServerPassword="服务器密码"
-OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="鉴权已停用"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="身份认证已停用"
 OBSWebSocket.ConnectInfo.QrTitle="连接 QR 码"
 OBSWebSocket.TrayNotification.Identified.Title="新 WebSocket 连接"
-OBSWebSocket.TrayNotification.Identified.Body="已识别 %1 客户端。"
-OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket 鉴权失败"
+OBSWebSocket.TrayNotification.Identified.Body="客户端%1已识别 。"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket 认证失败"
 OBSWebSocket.TrayNotification.AuthenticationFailed.Body="%1 客户端认证失败。"
 OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket 客户端已断开"
 OBSWebSocket.TrayNotification.Disconnected.Body="%1 客户端已断开。"
-OBSWebSocket.Server.StartFailed.Title="WebSocket 服务器启动失败"
-OBSWebSocket.Server.StartFailed.Message="WebSocket 服务器启动失败。TCP 端口 %1 可能已被其它程序占用。请尝试在 WebSocket 服务器设置中更改不同的 TCP 端口号，或者结束其它任何可能占用此端口的程序。\n错误信息：%2"

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/docs/README.md -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/docs/README.md Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/docs/docs/partials/introduction.md -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/docs/docs/partials/introduction.md Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/docs/generated/protocol.json -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/docs/generated/protocol.json Changed

@@ -1225,7 +1225,7 @@
     {
       "description": "Gets the current directory that the record output is set to.",
       "requestType": "GetRecordDirectory",
-      "complexity": 1,
+      "complexity": 2,
       "rpcVersion": "1",
       "deprecated": false,
       "initialVersion": "5.0.0",
@@ -1240,6 +1240,26 @@
       
     },
     {
+      "description": "Sets the current directory that the record output writes files to.",
+      "requestType": "SetRecordDirectory",
+      "complexity": 2,
+      "rpcVersion": "1",
+      "deprecated": false,
+      "initialVersion": "5.3.0",
+      "category": "config",
+      "requestFields": 
+        {
+          "valueName": "recordDirectory",
+          "valueType": "String",
+          "valueDescription": "Output directory",
+          "valueRestrictions": null,
+          "valueOptional": false,
+          "valueOptionalBehavior": null
+        }
+      ,
+      "responseFields": 
+    },
+    {
       "description": "Gets an array of all of a source's filters.",
       "requestType": "GetSourceFilterList",
       "complexity": 2,
@@ -3934,7 +3954,7 @@
       
     },
     {
-      "description": "Gets the scene transition overridden for a scene.",
+      "description": "Sets the scene transition overridden for a scene.",
       "requestType": "SetSceneSceneTransitionOverride",
       "complexity": 2,
       "rpcVersion": "1",

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/docs/generated/protocol.md -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/docs/generated/protocol.md Changed

@@ -1,7 +1,7 @@
 
 
 
-# obs-websocket 5.1.0 Protocol
+# obs-websocket 5.x.x Protocol
 
 ## Main Table of Contents
 
@@ -2543,6 +2543,7 @@
 - GetStreamServiceSettings(#getstreamservicesettings)
 - SetStreamServiceSettings(#setstreamservicesettings)
 - GetRecordDirectory(#getrecorddirectory)
+ - SetRecordDirectory(#setrecorddirectory)
 - Sources Requests(#sources-requests)
 - GetSourceActive(#getsourceactive)
 - GetSourceScreenshot(#getsourcescreenshot)
@@ -3120,7 +3121,7 @@
 
 Gets the current directory that the record output is set to.
 
-- Complexity Rating: `1/5`
+- Complexity Rating: `2/5`
 - Latest Supported RPC Version: `1`
 - Added in v5.0.0
 
@@ -3130,6 +3131,22 @@
 | ---- | :---: | ----------- |
 | recordDirectory | String | Output directory |
 
+---
+
+### SetRecordDirectory
+
+Sets the current directory that the record output writes files to.
+
+- Complexity Rating: `2/5`
+- Latest Supported RPC Version: `1`
+- Added in v5.3.0
+
+**Request Fields:**
+
+| Name | Type | Description | Value Restrictions | ?Default Behavior |
+| ---- | :---: | ----------- | :----------------: | ----------------- |
+| recordDirectory | String | Output directory | None | N/A |
+
 ## Sources Requests
 
 ### GetSourceActive
@@ -3398,7 +3415,7 @@
 
 ### SetSceneSceneTransitionOverride
 
-Gets the scene transition overridden for a scene.
+Sets the scene transition overridden for a scene.
 
 - Complexity Rating: `2/5`
 - Latest Supported RPC Version: `1`

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/Config.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/Config.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/Config.h -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/Config.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/WebSocketApi.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/WebSocketApi.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/WebSocketApi.h -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/WebSocketApi.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler.cpp Changed

@@ -20,11 +20,6 @@
 #include "EventHandler.h"
 
 EventHandler::EventHandler()
-	: _obsLoaded(false),
-	 _inputVolumeMetersRef(0),
-	 _inputActiveStateChangedRef(0),
-	 _inputShowStateChangedRef(0),
-	 _sceneItemTransformChangedRef(0)
 {
 	blog_debug("EventHandler::EventHandler Setting up...");
 
@@ -59,6 +54,20 @@
 		blog(LOG_ERROR, "EventHandler::~EventHandler Unable to get libobs signal handler!");
 	}
 
+	// Revoke callbacks of all inputs and scenes, in case some still have our callbacks attached
+	auto enumInputs = (void *param, obs_source_t *source) {
+		auto eventHandler = static_cast<EventHandler *>(param);
+		eventHandler->DisconnectSourceSignals(source);
+		return true;
+	};
+	obs_enum_sources(enumInputs, this);
+	auto enumScenes = (void *param, obs_source_t *source) {
+		auto eventHandler = static_cast<EventHandler *>(param);
+		eventHandler->DisconnectSourceSignals(source);
+		return true;
+	};
+	obs_enum_scenes(enumScenes, this);
+
 	blog_debug("EventHandler::~EventHandler Finished.");
 }
 
@@ -67,9 +76,9 @@
 	_broadcastCallback = cb;
 }
 
-void EventHandler::SetObsLoadedCallback(EventHandler::ObsLoadedCallback cb)
+void EventHandler::SetObsReadyCallback(EventHandler::ObsReadyCallback cb)
 {
-	_obsLoadedCallback = cb;
+	_obsReadyCallback = cb;
 }
 
 // Function to increment refcounts for high volume event subscriptions
@@ -261,9 +270,6 @@
 {
 	auto eventHandler = static_cast<EventHandler *>(private_data);
 
-	if (!eventHandler->_obsLoaded.load() && event != OBS_FRONTEND_EVENT_FINISHED_LOADING)
-		return;
-
 	switch (event) {
 	// General
 	case OBS_FRONTEND_EVENT_FINISHED_LOADING:
@@ -283,7 +289,11 @@
 		}
 		obs_frontend_source_list_free(&transitions);
 	}
+		// Before ready update to allow event to broadcast
 		eventHandler->HandleCurrentSceneCollectionChanging();
+		eventHandler->_obsReady = false;
+		if (eventHandler->_obsReadyCallback)
+			eventHandler->_obsReadyCallback(false);
 		break;
 	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED: {
 		obs_frontend_source_list transitions = {};
@@ -294,6 +304,9 @@
 		}
 		obs_frontend_source_list_free(&transitions);
 	}
+		eventHandler->_obsReady = true;
+		if (eventHandler->_obsReadyCallback)
+			eventHandler->_obsReadyCallback(true);
 		eventHandler->HandleCurrentSceneCollectionChanged();
 		break;
 	case OBS_FRONTEND_EVENT_SCENE_COLLECTION_LIST_CHANGED:
@@ -430,30 +443,6 @@
 	blog_debug(
 		"EventHandler::FrontendFinishedLoadingMultiHandler OBS has finished loading. Connecting final handlers and enabling events...");
 
-	// Connect source signals and enable events only after OBS has fully loaded (to reduce extra logging).
-	_obsLoaded.store(true);
-
-	// In the case that plugins become hotloadable, this will have to go back into `EventHandler::EventHandler()`
-	// Enumerate inputs and connect each one
-	{
-		auto enumInputs = (void *param, obs_source_t *source) {
-			auto eventHandler = static_cast<EventHandler *>(param);
-			eventHandler->ConnectSourceSignals(source);
-			return true;
-		};
-		obs_enum_sources(enumInputs, this);
-	}
-
-	// Enumerate scenes and connect each one
-	{
-		auto enumScenes = (void *param, obs_source_t *source) {
-			auto eventHandler = static_cast<EventHandler *>(param);
-			eventHandler->ConnectSourceSignals(source);
-			return true;
-		};
-		obs_enum_scenes(enumScenes, this);
-	}
-
 	// Enumerate all scene transitions and connect each one
 	{
 		obs_frontend_source_list transitions = {};
@@ -465,41 +454,23 @@
 		obs_frontend_source_list_free(&transitions);
 	}
 
-	blog_debug("EventHandler::FrontendFinishedLoadingMultiHandler Finished.");
+	_obsReady = true;
+	if (_obsReadyCallback)
+		_obsReadyCallback(true);
 
-	if (_obsLoadedCallback)
-		_obsLoadedCallback();
+	blog_debug("EventHandler::FrontendFinishedLoadingMultiHandler Finished.");
 }
 
 void EventHandler::FrontendExitMultiHandler()
 {
-	HandleExitStarted();
-
 	blog_debug("EventHandler::FrontendExitMultiHandler OBS is unloading. Disabling events...");
 
-	// Disconnect source signals and disable events when OBS starts unloading (to reduce extra logging).
-	_obsLoaded.store(false);
-
-	// In the case that plugins become hotloadable, this will have to go back into `EventHandler::~EventHandler()`
-	// Enumerate inputs and disconnect each one
-	{
-		auto enumInputs = (void *param, obs_source_t *source) {
-			auto eventHandler = static_cast<EventHandler *>(param);
-			eventHandler->DisconnectSourceSignals(source);
-			return true;
-		};
-		obs_enum_sources(enumInputs, this);
-	}
+	HandleExitStarted();
 
-	// Enumerate scenes and disconnect each one
-	{
-		auto enumScenes = (void *param, obs_source_t *source) {
-			auto eventHandler = static_cast<EventHandler *>(param);
-			eventHandler->DisconnectSourceSignals(source);
-			return true;
-		};
-		obs_enum_scenes(enumScenes, this);
-	}
+	// Disconnect source signals and disable events when OBS starts unloading (to reduce extra logging).
+	_obsReady = false;
+	if (_obsReadyCallback)
+		_obsReadyCallback(false);
 
 	// Enumerate all scene transitions and disconnect each one
 	{
@@ -520,10 +491,6 @@
 {
 	auto eventHandler = static_cast<EventHandler *>(param);
 
-	// Don't react to signals until OBS has finished loading
-	if (!eventHandler->_obsLoaded.load())
-		return;
-
 	obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
 	if (!source)
 		return;
@@ -556,10 +523,6 @@
 	// Disconnect all signals from the source
 	eventHandler->DisconnectSourceSignals(source);
 
-	// Don't react to signals if OBS is unloading
-	if (!eventHandler->_obsLoaded.load())
-		return;
-
 	switch (obs_source_get_type(source)) {
 	case OBS_SOURCE_TYPE_INPUT:
 		// Only emit removed if the input has not already been removed. This is the case when removing the last scene item of an input.
@@ -582,9 +545,6 @@
 {
 	auto eventHandler = static_cast<EventHandler *>(param);
 
-	if (!eventHandler->_obsLoaded.load())
-		return;
-
 	obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
 	if (!source)
 		return;
@@ -605,9 +565,6 @@
 {
 	auto eventHandler = static_cast<EventHandler *>(param);
 
-	if (!eventHandler->_obsLoaded.load())
-		return;
-
 	obs_source_t *source = GetCalldataPointer<obs_source_t>(data, "source");
 	if (!source)
 		return;

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler.h -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler.h Changed

@@ -34,25 +34,26 @@
 	EventHandler();
 	~EventHandler();
 
-	typedef std::function<void(uint64_t, std::string, json, uint8_t)> BroadcastCallback;
+	typedef std::function<void(uint64_t, std::string, json, uint8_t)>
+		BroadcastCallback; // uint64_t requiredIntent, std::string eventType, json eventData, uint8_t rpcVersion
 	void SetBroadcastCallback(BroadcastCallback cb);
-	typedef std::function<void()> ObsLoadedCallback;
-	void SetObsLoadedCallback(ObsLoadedCallback cb);
+	typedef std::function<void(bool)> ObsReadyCallback; // bool ready
+	void SetObsReadyCallback(ObsReadyCallback cb);
 
 	void ProcessSubscription(uint64_t eventSubscriptions);
 	void ProcessUnsubscription(uint64_t eventSubscriptions);
 
 private:
 	BroadcastCallback _broadcastCallback;
-	ObsLoadedCallback _obsLoadedCallback;
+	ObsReadyCallback _obsReadyCallback;
 
-	std::atomic<bool> _obsLoaded;
+	std::atomic<bool> _obsReady = false;
 
 	std::unique_ptr<Utils::Obs::VolumeMeter::Handler> _inputVolumeMetersHandler;
-	std::atomic<uint64_t> _inputVolumeMetersRef;
-	std::atomic<uint64_t> _inputActiveStateChangedRef;
-	std::atomic<uint64_t> _inputShowStateChangedRef;
-	std::atomic<uint64_t> _sceneItemTransformChangedRef;
+	std::atomic<uint64_t> _inputVolumeMetersRef = 0;
+	std::atomic<uint64_t> _inputActiveStateChangedRef = 0;
+	std::atomic<uint64_t> _inputShowStateChangedRef = 0;
+	std::atomic<uint64_t> _sceneItemTransformChangedRef = 0;
 
 	void ConnectSourceSignals(obs_source_t *source);
 	void DisconnectSourceSignals(obs_source_t *source);

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler_Scenes.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/eventhandler/EventHandler_Scenes.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/forms/ConnectInfo.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/forms/ConnectInfo.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/obs-websocket.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/obs-websocket.cpp Changed

@@ -89,7 +89,24 @@
 	return true;
 }
 
-void obs_module_unload()
+#ifdef PLUGIN_TESTS
+void test_register_vendor();
+#endif
+
+void obs_module_post_load(void)
+{
+#ifdef PLUGIN_TESTS
+	test_register_vendor();
+#endif
+
+	// Server will accept clients, but requests and events will not be served until FINISHED_LOADING occurs
+	if (_config->ServerEnabled) {
+		blog(LOG_INFO, "obs_module_post_load WebSocket server is enabled, starting...");
+		_webSocketServer->Start();
+	}
+}
+
+void obs_module_unload(void)
 {
 	blog(LOG_INFO, "obs_module_unload Shutting down...");
 
@@ -108,8 +125,7 @@
 	// Destroy the event handler
 	_eventHandler.reset();
 
-	// Save and destroy the config manager
-	_config->Save();
+	// Destroy the config manager
 	_config.reset();
 
 	// Destroy the cpu stats
@@ -193,18 +209,18 @@
 	obs_websocket_vendor_emit_event(priv_data, "TestEvent", requestData);
 }
 
-void obs_module_post_load()
+void test_register_vendor()
 {
-	blog(LOG_INFO, "obs_module_post_load Post load started.");
+	blog(LOG_INFO, "test_register_vendor Registering test vendor...");
 
 	// Test plugin API version fetch
 	uint apiVersion = obs_websocket_get_api_version();
-	blog(LOG_INFO, "obs_module_post_load obs-websocket plugin API version: %u", apiVersion);
+	blog(LOG_INFO, "test_register_vendor obs-websocket plugin API version: %u", apiVersion);
 
 	// Test calling obs-websocket requests
 	struct obs_websocket_request_response *response = obs_websocket_call_request("GetVersion");
 	if (response) {
-		blog(LOG_INFO, "obs_module_post_load Called GetVersion. Status Code: %u | Comment: %s | Response Data: %s",
+		blog(LOG_INFO, "test_register_vendor Called GetVersion. Status Code: %u | Comment: %s | Response Data: %s",
 		     response->status_code, response->comment, response->response_data);
 		obs_websocket_request_response_free(response);
 	}
@@ -212,17 +228,17 @@
 	// Test vendor creation
 	auto vendor = obs_websocket_register_vendor("obs-websocket-test");
 	if (!vendor) {
-		blog(LOG_WARNING, "obs_module_post_load Failed to create vendor!");
+		blog(LOG_WARNING, "test_register_vendor Failed to create vendor!");
 		return;
 	}
 
 	// Test vendor request registration
 	if (!obs_websocket_vendor_register_request(vendor, "TestRequest", test_vendor_request_cb, vendor)) {
-		blog(LOG_WARNING, "obs_module_post_load Failed to register vendor request!");
+		blog(LOG_WARNING, "test_register_vendor Failed to register vendor request!");
 		return;
 	}
 
-	blog(LOG_INFO, "obs_module_post_load Post load completed.");
+	blog(LOG_INFO, "test_register_vendor Post load completed.");
 }
 
 #endif

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/requesthandler/RequestBatchHandler.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/requesthandler/RequestBatchHandler.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler.h -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler_Config.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler_Config.cpp Changed

@@ -622,7 +622,7 @@
  * @responseField recordDirectory | String | Output directory
  *
  * @requestType GetRecordDirectory
- * @complexity 1
+ * @complexity 2
  * @rpcVersion -1
  * @initialVersion 5.0.0
  * @api requests
@@ -635,3 +635,35 @@
 
 	return RequestResult::Success(responseData);
 }
+
+/**
+ * Sets the current directory that the record output writes files to.
+ *
+ * @requestField recordDirectory | String | Output directory
+ *
+ * @requestType SetRecordDirectory
+ * @complexity 2
+ * @rpcVersion -1
+ * @initialVersion 5.3.0
+ * @api requests
+ * @category config
+ */
+RequestResult RequestHandler::SetRecordDirectory(const Request &request)
+{
+	if (obs_frontend_recording_active())
+		return RequestResult::Error(RequestStatus::OutputRunning);
+
+	RequestStatus::RequestStatus statusCode;
+	std::string comment;
+	if (!request.ValidateString("recordDirectory", statusCode, comment))
+		return RequestResult::Error(statusCode, comment);
+
+	std::string recordDirectory = request.RequestData"recordDirectory";
+
+	config_t *config = obs_frontend_get_profile_config();
+	config_set_string(config, "AdvOut", "RecFilePath", recordDirectory.c_str());
+	config_set_string(config, "SimpleOutput", "FilePath", recordDirectory.c_str());
+	config_save(config);
+
+	return RequestResult::Success();
+}

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler_Scenes.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/requesthandler/RequestHandler_Scenes.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/websocketserver/WebSocketServer.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/websocketserver/WebSocketServer.cpp Changed

@@ -31,7 +31,7 @@
 #include "../utils/Platform.h"
 #include "../utils/Compat.h"
 
-WebSocketServer::WebSocketServer() : QObject(nullptr), _sessions()
+WebSocketServer::WebSocketServer() : QObject(nullptr)
 {
 	_server.get_alog().clear_channels(websocketpp::log::alevel::all);
 	_server.get_elog().clear_channels(websocketpp::log::elevel::all);
@@ -49,14 +49,21 @@
 							   websocketpp::lib::placeholders::_2));
 
 	auto eventHandler = GetEventHandler();
-	eventHandler->SetBroadcastCallback(std::bind(&WebSocketServer::BroadcastEvent, this, std::placeholders::_1,
-						     std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-
-	eventHandler->SetObsLoadedCallback(std::bind(&WebSocketServer::onObsLoaded, this));
+	if (eventHandler) {
+		eventHandler->SetBroadcastCallback(std::bind(&WebSocketServer::BroadcastEvent, this, std::placeholders::_1,
+							     std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+		eventHandler->SetObsReadyCallback(std::bind(&WebSocketServer::onObsReady, this, std::placeholders::_1));
+	}
 }
 
 WebSocketServer::~WebSocketServer()
 {
+	auto eventHandler = GetEventHandler();
+	if (eventHandler) {
+		eventHandler->SetObsReadyCallback(nullptr);
+		eventHandler->SetBroadcastCallback(nullptr);
+	}
+
 	if (_server.is_listening())
 		Stop();
 }
@@ -113,6 +120,10 @@
 	} else {
 		blog(LOG_INFO, "WebSocketServer::Start Not locked to IPv4 bindings");
 		_server.listen(conf->ServerPort, errorCode);
+		if (errorCode && errorCode == websocketpp::lib::asio::error::address_family_not_supported) {
+			blog(LOG_INFO, "WebSocketServer::Start IPv6 address family not supported, binding only to IPv4");
+			_server.listen(websocketpp::lib::asio::ip::tcp::v4(), conf->ServerPort, errorCode);
+		}
 	}
 
 	if (errorCode) {
@@ -158,9 +169,8 @@
 	_threadPool.waitForDone();
 
 	// This can delay the thread that it is running on. Bad but kinda required.
-	while (_sessions.size() > 0) {
+	while (_sessions.size() > 0)
 		std::this_thread::sleep_for(std::chrono::milliseconds(10));
-	}
 
 	_serverThread.join();
 
@@ -205,18 +215,9 @@
 	return webSocketSessions;
 }
 
-void WebSocketServer::onObsLoaded()
+void WebSocketServer::onObsReady(bool ready)
 {
-	auto conf = GetConfig();
-	if (!conf) {
-		blog(LOG_ERROR, "WebSocketServer::onObsLoaded Unable to retreive config!");
-		return;
-	}
-
-	if (conf->ServerEnabled) {
-		blog(LOG_INFO, "WebSocketServer::onObsLoaded WebSocket server is enabled, starting...");
-		Start();
-	}
+	_obsReady = ready;
 }
 
 bool WebSocketServer::onValidate(websocketpp::connection_hdl hdl)
@@ -266,7 +267,7 @@
 	json helloMessageData;
 	helloMessageData"obsWebSocketVersion" = OBS_WEBSOCKET_VERSION;
 	helloMessageData"rpcVersion" = OBS_WEBSOCKET_RPC_VERSION;
-	if (conf->AuthRequired) {
+	if (session->AuthenticationRequired()) {
 		session->SetSecret(_authenticationSecret);
 		std::string sessionChallenge = Utils::Crypto::GenerateSalt();
 		session->SetChallenge(sessionChallenge);

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/websocketserver/WebSocketServer.h -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/websocketserver/WebSocketServer.h Changed

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/websocketserver/WebSocketServer_Protocol.cpp -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/websocketserver/WebSocketServer_Protocol.cpp Changed

@@ -82,7 +82,7 @@
 	}
 
 	// Only `Identify` is allowed when not identified
-	if (!session->IsIdentified() && opCode != 1) {
+	if (!session->IsIdentified() && opCode != WebSocketOpCode::Identify) {
 		ret.closeCode = WebSocketCloseCode::NotIdentified;
 		ret.closeReason = "You attempted to send a non-Identify message while not identified.";
 		return;
@@ -146,9 +146,8 @@
 		session->SetRpcVersion(requestedRpcVersion);
 
 		SetSessionParameters(session, ret, payloadData);
-		if (ret.closeCode != WebSocketCloseCode::DontClose) {
+		if (ret.closeCode != WebSocketCloseCode::DontClose)
 			return;
-		}
 
 		// Increment refs for event subscriptions
 		auto eventHandler = GetEventHandler();
@@ -178,9 +177,8 @@
 		eventHandler->ProcessUnsubscription(session->EventSubscriptions());
 
 		SetSessionParameters(session, ret, payloadData);
-		if (ret.closeCode != WebSocketCloseCode::DontClose) {
+		if (ret.closeCode != WebSocketCloseCode::DontClose)
 			return;
-		}
 
 		// Increment refs for new subscriptions
 		eventHandler->ProcessSubscription(session->EventSubscriptions());
@@ -209,13 +207,17 @@
 			return;
 		}
 
-		RequestHandler requestHandler(session);
-
 		std::string requestType = payloadData"requestType";
-		json requestData = payloadData"requestData";
-		Request request(requestType, requestData);
+		RequestResult requestResult;
+		if (_obsReady) {
+			json requestData = payloadData"requestData";
+			Request request(requestType, requestData);
 
-		RequestResult requestResult = requestHandler.ProcessRequest(request);
+			RequestHandler requestHandler(session);
+			requestResult = requestHandler.ProcessRequest(request);
+		} else {
+			requestResult = RequestResult::Error(RequestStatus::NotReady, "OBS is not ready to perform the request.");
+		}
 
 		json resultPayloadData;
 		resultPayloadData"requestType" = requestType;
@@ -303,22 +305,34 @@
 		}
 
 		std::vector<json> requests = payloadData"requests";
+		std::vector<RequestResult> resultsVector;
+		if (_obsReady) {
+			std::vector<RequestBatchRequest> requestsVector;
+			for (auto &requestJson : requests) {
+				if (!requestJson"requestType".is_string())
+					requestJson"requestType" =
+						""; // Workaround for what would otherwise be extensive additional logic for a rare edge case
+				std::string requestType = requestJson"requestType";
+				json requestData = requestJson"requestData";
+				json inputVariables = requestJson"inputVariables";
+				json outputVariables = requestJson"outputVariables";
+				requestsVector.emplace_back(requestType, requestData, executionType, inputVariables,
+							 outputVariables);
+			}
 
-		std::vector<RequestBatchRequest> requestsVector;
-		for (auto &requestJson : requests) {
-			if (!requestJson"requestType".is_string())
-				requestJson"requestType" =
-					""; // Workaround for what would otherwise be extensive additional logic for a rare edge case
-			std::string requestType = requestJson"requestType";
-			json requestData = requestJson"requestData";
-			json inputVariables = requestJson"inputVariables";
-			json outputVariables = requestJson"outputVariables";
-			requestsVector.emplace_back(requestType, requestData, executionType, inputVariables, outputVariables);
+			resultsVector = RequestBatchHandler::ProcessRequestBatch(
+				_threadPool, session, executionType, requestsVector, payloadData"variables", haltOnFailure);
+		} else {
+			// I lowkey hate this, but whatever
+			if (haltOnFailure) {
+				resultsVector.emplace_back(RequestStatus::NotReady, "OBS is not ready to perform the request.");
+			} else {
+				for (size_t i = 0; i < requests.size(); i++)
+					resultsVector.emplace_back(RequestStatus::NotReady,
+								 "OBS is not ready to perform the request.");
+			}
 		}
 
-		auto resultsVector = RequestBatchHandler::ProcessRequestBatch(_threadPool, session, executionType, requestsVector,
-									 payloadData"variables", haltOnFailure);
-
 		size_t i = 0;
 		std::vector<json> results;
 		for (auto &requestResult : resultsVector) {
@@ -342,7 +356,7 @@
 void WebSocketServer::BroadcastEvent(uint64_t requiredIntent, const std::string &eventType, const json &eventData,
 				 uint8_t rpcVersion)
 {
-	if (!_server.is_listening())
+	if (!_server.is_listening() || !_obsReady)
 		return;
 
 	_threadPool.start(Utils::Compat::CreateFunctionRunnable(=() {
@@ -361,19 +375,16 @@
 		// Recurse connected sessions and send the event to suitable sessions.
 		std::unique_lock<std::mutex> lock(_sessionMutex);
 		for (auto &it : _sessions) {
-			if (!it.second->IsIdentified()) {
+			if (!it.second->IsIdentified())
 				continue;
-			}
-			if (rpcVersion && it.second->RpcVersion() != rpcVersion) {
+			if (rpcVersion && it.second->RpcVersion() != rpcVersion)
 				continue;
-			}
 			if ((it.second->EventSubscriptions() & requiredIntent) != 0) {
 				websocketpp::lib::error_code errorCode;
 				switch (it.second->Encoding()) {
 				case WebSocketEncoding::Json:
-					if (messageJson.empty()) {
+					if (messageJson.empty())
 						messageJson = eventMessage.dump();
-					}
 					_server.send((websocketpp::connection_hdl)it.first, messageJson,
 						 websocketpp::frame::opcode::text, errorCode);
 					it.second->IncrementOutgoingMessages();

obs-studio-29.1.3.tar.xz/plugins/obs-websocket/src/websocketserver/rpc/WebSocketSession.h -> obs-studio-30.0.2.tar.xz/plugins/obs-websocket/src/websocketserver/rpc/WebSocketSession.h Changed

@@ -24,6 +24,7 @@
 #include <atomic>
 #include <memory>
 
+#include "../../eventhandler/types/EventSubscription.h"
 #include "plugin-macros.generated.h"
 
 class WebSocketSession;
@@ -31,56 +32,78 @@
 
 class WebSocketSession {
 public:
-	WebSocketSession();
-
-	std::string RemoteAddress();
-	void SetRemoteAddress(std::string address);
-
-	uint64_t ConnectedAt();
-	void SetConnectedAt(uint64_t at);
-
-	uint64_t IncomingMessages();
-	void IncrementIncomingMessages();
-
-	uint64_t OutgoingMessages();
-	void IncrementOutgoingMessages();
-
-	uint8_t Encoding();
-	void SetEncoding(uint8_t encoding);
-
-	bool AuthenticationRequired();
-	void SetAuthenticationRequired(bool required);
-
-	std::string Secret();
-	void SetSecret(std::string secret);
-
-	std::string Challenge();
-	void SetChallenge(std::string challenge);
-
-	uint8_t RpcVersion();
-	void SetRpcVersion(uint8_t version);
-
-	bool IsIdentified();
-	void SetIsIdentified(bool identified);
-
-	uint64_t EventSubscriptions();
-	void SetEventSubscriptions(uint64_t subscriptions);
+	inline std::string RemoteAddress()
+	{
+		std::lock_guard<std::mutex> lock(_remoteAddressMutex);
+		return _remoteAddress;
+	}
+	inline void SetRemoteAddress(std::string address)
+	{
+		std::lock_guard<std::mutex> lock(_remoteAddressMutex);
+		_remoteAddress = address;
+	}
+
+	inline uint64_t ConnectedAt() { return _connectedAt; }
+	inline void SetConnectedAt(uint64_t at) { _connectedAt = at; }
+
+	inline uint64_t IncomingMessages() { return _incomingMessages; }
+	inline void IncrementIncomingMessages() { _incomingMessages++; }
+
+	inline uint64_t OutgoingMessages() { return _outgoingMessages; }
+	inline void IncrementOutgoingMessages() { _outgoingMessages++; }
+
+	inline uint8_t Encoding() { return _encoding; }
+	inline void SetEncoding(uint8_t encoding) { _encoding = encoding; }
+
+	inline bool AuthenticationRequired() { return _authenticationRequired; }
+	inline void SetAuthenticationRequired(bool required) { _authenticationRequired = required; }
+
+	inline std::string Secret()
+	{
+		std::lock_guard<std::mutex> lock(_secretMutex);
+		return _secret;
+	}
+	inline void SetSecret(std::string secret)
+	{
+		std::lock_guard<std::mutex> lock(_secretMutex);
+		_secret = secret;
+	}
+
+	inline std::string Challenge()
+	{
+		std::lock_guard<std::mutex> lock(_challengeMutex);
+		return _challenge;
+	}
+	inline void SetChallenge(std::string challenge)
+	{
+		std::lock_guard<std::mutex> lock(_challengeMutex);
+		_challenge = challenge;
+	}
+
+	inline uint8_t RpcVersion() { return _rpcVersion; }
+	inline void SetRpcVersion(uint8_t version) { _rpcVersion = version; }
+
+	inline bool IsIdentified() { return _isIdentified; }
+	inline void SetIsIdentified(bool identified) { _isIdentified = identified; }
+
+	inline uint64_t EventSubscriptions() { return _eventSubscriptions; }
+	inline void SetEventSubscriptions(uint64_t subscriptions) { _eventSubscriptions = subscriptions; }
 
 	std::mutex OperationMutex;
 
 private:
 	std::mutex _remoteAddressMutex;
 	std::string _remoteAddress;
-	std::atomic<uint64_t> _connectedAt;
-	std::atomic<uint64_t> _incomingMessages;
-	std::atomic<uint64_t> _outgoingMessages;
-	std::atomic<uint8_t> _encoding;
-	std::atomic<bool> _authenticationRequired;
+	std::atomic<uint64_t> _connectedAt = 0;
+	std::atomic<uint64_t> _incomingMessages = 0;
+	std::atomic<uint64_t> _outgoingMessages = 0;
+	std::atomic<uint8_t> _encoding = 0;
+	std::atomic<bool> _authenticationRequired = false;
 	std::mutex _secretMutex;
 	std::string _secret;
 	std::mutex _challengeMutex;
 	std::string _challenge;
-	std::atomic<uint8_t> _rpcVersion;
-	std::atomic<bool> _isIdentified;
-	std::atomic<uint64_t> _eventSubscriptions;
+	std::atomic<uint8_t> _rpcVersion = OBS_WEBSOCKET_RPC_VERSION;
+	std::atomic<bool> _isIdentified = false;
+	std::atomic<uint64_t> _eventSubscriptions = EventSubscription::All;
 };

obs-studio-29.1.3.tar.xz/plugins/obs-x264/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/cmake/x264-test.cmake -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/cmake/x264-test.cmake Changed

obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/be-BY.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/be-BY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/lv-LV.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/lv-LV.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/th-TH.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/th-TH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/obs-x264/obs-x264.c -> obs-studio-30.0.2.tar.xz/plugins/obs-x264/obs-x264.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -237,22 +237,6 @@
 	return props;
 }
 
-static bool getparam(const char *param, char **name, const char **value)
-{
-	const char *assign;
-
-	if (!param || !*param || (*param == '='))
-		return false;
-
-	assign = strchr(param, '=');
-	if (!assign || !*assign || !*(assign + 1))
-		return false;
-
-	*name = bstrdup_n(param, assign - param);
-	*value = assign + 1;
-	return true;
-}
-
 static const char *validate(struct obs_x264 *obsx264, const char *val,
 			 const char *name, const char *const *list)
 {
@@ -358,13 +342,20 @@
 
 static void log_x264(void *param, int level, const char *format, va_list args)
 {
-	struct obs_x264 *obsx264 = param;
-	char str1024;
-
-	vsnprintf(str, sizeof(str), format, args);
-	info("%s", str);
-
-	UNUSED_PARAMETER(level);
+	static const int level_map = {
+		LOG_ERROR,
+		LOG_WARNING,
+		LOG_INFO,
+		LOG_DEBUG,
+	};
+
+	UNUSED_PARAMETER(param);
+	if (level < X264_LOG_ERROR)
+		level = X264_LOG_ERROR;
+	else if (level > X264_LOG_DEBUG)
+		level = X264_LOG_DEBUG;
+
+	blogva(level_maplevel, format, args);
 }
 
 static inline int get_x264_cs_val(const char *const name,

obs-studio-30.0.2.tar.xz/plugins/oss-audio/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/oss-audio/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/oss-audio/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/oss-audio/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/oss-audio/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/oss-audio/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/oss-audio/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/oss-audio/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/CMakeLists.txt Changed

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/cmake/legacy.cmake -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/cmake/legacy.cmake Changed

obs-studio-30.0.2.tar.xz/plugins/rtmp-services/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/rtmp-services/data/locale/az-AZ.ini Added

obs-studio-30.0.2.tar.xz/plugins/rtmp-services/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/data/schema/service-schema-v5.json -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/data/schema/service-schema-v5.json Changed

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/data/services.json Changed

@@ -352,28 +352,6 @@
             
         },
         {
-            "name": "VIMM",
-            "servers": 
-                {
-                    "name": "Europe: Frankfurt",
-                    "url": "rtmp://eu.vimm.tv/live"
-                },
-                {
-                    "name": "North America: Montreal",
-                    "url": "rtmp://us.vimm.tv/live"
-                }
-            ,
-            "recommended": {
-                "keyint": 2,
-                "max video bitrate": 8000,
-                "max audio bitrate": 320,
-                "x264opts": "scenecut=0"
-            },
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
             "name": "Web.TV",
             "servers": 
                 {
@@ -404,19 +382,6 @@
             
         },
         {
-            "name": "YouStreamer",
-            "stream_key_link": "https://www.app.youstreamer.com/stream/",
-            "servers": 
-                {
-                    "name": "Moscow",
-                    "url": "rtmp://push.youstreamer.com/in/"
-                }
-            ,
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
             "name": "Vaughn Live / iNSTAGIB",
             "servers": 
                 {
@@ -1543,31 +1508,19 @@
             
         },
         {
-            "name": "Chathostess",
-            "servers": 
-                {
-                    "name": "Chathostess - Backup",
-                    "url": "rtmp://wowza05.foobarweb.com/cmschatsys_video"
-                }
-            ,
-            "recommended": {
-                "keyint": 2,
-                "max video bitrate": 3600,
-                "max audio bitrate": 128
-            },
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
             "name": "OnlyFans.com",
+            "stream_key_link": "https://onlyfans.com/my/settings/other",
             "servers": 
                 {
-                    "name": "USA",
+                    "name": "CloudBeta",
+                    "url": "rtmp://cloudbetastreaming.onlyfans.com/live"
+                },
+                {
+                    "name": "Backup (USA)",
                     "url": "rtmp://route0.onlyfans.com/live"
                 },
                 {
-                    "name": "Europe",
+                    "name": "Backup (Europe)",
                     "url": "rtmp://route0-dc2.onlyfans.com/live"
                 }
             ,
@@ -1698,16 +1651,8 @@
                     "url": "rtmp://push.rtmp.wasd.tv/live"
                 },
                 {
-                    "name": "Russia, Moscow",
-                    "url": "rtmp://ru-moscow.rtmp.wasd.tv/live"
-                },
-                {
                     "name": "Germany, Frankfurt",
                     "url": "rtmp://de-frankfurt.rtmp.wasd.tv/live"
-                },
-                {
-                    "name": "Finland, Helsinki",
-                    "url": "rtmp://fi-helsinki.rtmp.wasd.tv/live"
                 }
             ,
             "recommended": {
@@ -1723,10 +1668,6 @@
             "name": "Nimo TV",
             "servers": 
                 {
-                    "name": "Global:1",
-                    "url": "rtmp://wspush.rtmp.nimo.tv/live/"
-                },
-                {
                     "name": "Global:2",
                     "url": "rtmp://txpush.rtmp.nimo.tv/live/"
                 },
@@ -2000,125 +1941,6 @@
             
         },
         {
-            "name": "Glimesh",
-            "stream_key_link": "https://glimesh.tv/users/settings/stream",
-            "protocol": "FTL",
-            "servers": 
-                {
-                    "name": "North America - Chicago, United States",
-                    "url": "ingest.kord.live.glimesh.tv"
-                },
-                {
-                    "name": "North America - New York, United States",
-                    "url": "ingest.kjfk.live.glimesh.tv"
-                },
-                {
-                    "name": "North America - San Francisco, United States",
-                    "url": "ingest.ksfo.live.glimesh.tv"
-                },
-                {
-                    "name": "North America - Toronto, Canada",
-                    "url": "ingest.cyyz.live.glimesh.tv"
-                },
-                {
-                    "name": "South America - Sao Paulo, Brazil",
-                    "url": "ingest.sbgr.live.glimesh.tv"
-                },
-                {
-                    "name": "Europe - Amsterdam, Netherlands",
-                    "url": "ingest.eham.live.glimesh.tv"
-                },
-                {
-                    "name": "Europe - Frankfurt, Germany",
-                    "url": "ingest.eddf.live.glimesh.tv"
-                },
-                {
-                    "name": "Europe - London, United Kingdom",
-                    "url": "ingest.egll.live.glimesh.tv"
-                },
-                {
-                    "name": "Asia - Bangalore, India",
-                    "url": "ingest.vobl.live.glimesh.tv"
-                },
-                {
-                    "name": "Asia - Singapore",
-                    "url": "ingest.wsss.live.glimesh.tv"
-                },
-                {
-                    "name": "Australia - Sydney, Australia",
-                    "url": "ingest.yssy.live.glimesh.tv"
-                }
-            ,
-            "recommended": {
-                "keyint": 2,
-                "output": "ftl_output",
-                "max audio bitrate": 160,
-                "max video bitrate": 6000,
-                "bframes": 0,
-                "x264opts": "scenecut=0"
-            }
-        },
-        {
-            "name": "Glimesh - RTMP",
-            "stream_key_link": "https://glimesh.tv/users/settings/stream",
-            "servers": 
-                {
-                    "name": "North America - Chicago, United States",
-                    "url": "rtmp://ingest.kord.live.glimesh.tv"
-                },
-                {
-                    "name": "North America - New York, United States",
-                    "url": "rtmp://ingest.kjfk.live.glimesh.tv"
-                },
-                {
-                    "name": "North America - San Francisco, United States",
-                    "url": "rtmp://ingest.ksfo.live.glimesh.tv"
-                },
-                {
-                    "name": "North America - Toronto, Canada",
-                    "url": "rtmp://ingest.cyyz.live.glimesh.tv"
-                },
-                {
-                    "name": "South America - Sao Paulo, Brazil",
-                    "url": "rtmp://ingest.sbgr.live.glimesh.tv"
-                },
-                {
-                    "name": "Europe - Amsterdam, Netherlands",
-                    "url": "rtmp://ingest.eham.live.glimesh.tv"
-                },
-                {
-                    "name": "Europe - Frankfurt, Germany",
-                    "url": "rtmp://ingest.eddf.live.glimesh.tv"
-                },
-                {
-                    "name": "Europe - London, United Kingdom",
-                    "url": "rtmp://ingest.egll.live.glimesh.tv"
-                },
-                {
-                    "name": "Asia - Bangalore, India",
-                    "url": "rtmp://ingest.vobl.live.glimesh.tv"
-                },
-                {
-                    "name": "Asia - Singapore",
-                    "url": "rtmp://ingest.wsss.live.glimesh.tv"
-                },
-                {
-                    "name": "Australia - Sydney, Australia",
-                    "url": "rtmp://ingest.yssy.live.glimesh.tv"
-                }
-            ,
-            "recommended": {
-                "keyint": 2,
-                "max audio bitrate": 160,
-                "max video bitrate": 6000,
-                "bframes": 0,
-                "x264opts": "scenecut=0"
-            },
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
             "name": "OPENREC.tv - Premium member (プレミアム会員)",
             "stream_key_link": "https://www.openrec.tv/login?keep_login=true&url=https://www.openrec.tv/dashboard/live?from=obs",
             "servers": 
@@ -2231,15 +2053,27 @@
         },
         {
             "name": "Bilibili Live - RTMP | 哔哩哔哩直播 - RTMP",
-            "more_info_link": "https://link.bilibili.com/p/help/index#/tools-tutorial?id=9",
+            "more_info_link": "https://link.bilibili.com/p/help/index?id=4#/tools-tutorial",
             "stream_key_link": "https://link.bilibili.com/p/center/index#/my-room/start-live",
             "alt_names": 
                 "Bilibili Live"
             ,
             "servers": 
                 {
-                    "name": "Default | 默认",
+                    "name": "Global - Primary | 全球 - 主要",
                     "url": "rtmp://live-push.bilivideo.com/live-bvc/"
+                },
+                {
+                    "name": "Non Chinese Mainland - Primary | 非中国大陆地区 - 主要",
+                    "url": "rtmp://bdy.live-push.bilivideo.com/live-bvc/"
+                },
+                {
+                    "name": "Chinese Mainland - Backup | 中国大陆地区 - 备用",
+                    "url": "rtmp://txy2.live-push.bilivideo.com/live-bvc/"
+                },
+                {
+                    "name": "Non Chinese Mainland - Backup | 非中国大陆地区 - 备用",
+                    "url": "rtmp://txy.live-push.bilivideo.com/live-bvc/"
                 }
             ,
             "supported video codecs": 
@@ -2336,11 +2170,14 @@
             
         },
         {
-            "name": "Utreon",
+            "name": "Playeur",
+            "alt_names": 
+                "Utreon"
+            ,
             "servers": 
                 {
                     "name": "Default",
-                    "url": "rtmp://live.utreon.com:5222/app"
+                    "url": "rtmp://live.playeur.com:5222/app"
                 }
             ,
             "recommended": {
@@ -2388,106 +2225,6 @@
             
         },
         {
-            "name": "ManyVids",
-            "servers": 
-                {
-                    "name": "Default",
-                    "url": "rtmp://rtmp.str.manyvids.com:1935/live_stream/"
-                }
-            ,
-            "recommended": {
-                "supported resolutions": 
-                    "1280x720",
-                    "960x540"
-                ,
-                "bitrate matrix": 
-                    {
-                        "res": "960x540",
-                        "fps": 30,
-                        "max bitrate": 3000
-                    },
-                    {
-                        "res": "1280x720",
-                        "fps": 30,
-                        "max bitrate": 4000
-                    }
-                ,
-                "keyint": 2,
-                "max video bitrate": 4000,
-                "max fps": 30
-            },
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
-            "name": "Fantasy.Club",
-            "stream_key_link": "https://fantasy.club/app/create-content/stream-now",
-            "more_info_link": "https://help.fantasy.club/",
-            "servers": 
-                {
-                    "name": "US: East",
-                    "url": "rtmp://live-east.fantasy.club/live"
-                },
-                {
-                    "name": "US: West",
-                    "url": "rtmp://live-west.fantasy.club/live"
-                },
-                {
-                    "name": "Europe",
-                    "url": "rtmp://live-eu.fantasy.club/live"
-                },
-                {
-                    "name": "South America",
-                    "url": "rtmp://live-sa.fantasy.club/live"
-                }
-            ,
-            "recommended": {
-                "keyint": 2,
-                "profile": "high",
-                "bframes": 0,
-                "x264opts": "scenecut=0",
-                "supported resolutions": 
-                    "1920x1080",
-                    "1280x720",
-                    "852x480"
-                ,
-                "bitrate matrix": 
-                    {
-                        "res": "852x480",
-                        "fps": 30,
-                        "max bitrate": 1200
-                    },
-                    {
-                        "res": "1280x720",
-                        "fps": 30,
-                        "max bitrate": 3600
-                    },
-                    {
-                        "res": "1280x720",
-                        "fps": 60,
-                        "max bitrate": 4200
-                    },
-                    {
-                        "res": "1920x1080",
-                        "fps": 30,
-                        "max bitrate": 5000
-                    },
-                    {
-                        "res": "1920x1080",
-                        "fps": 60,
-                        "max bitrate": 7200
-                    }
-                ,
-                "max fps": 60,
-                "max video bitrate": 7200,
-                "max audio bitrate": 196
-            },
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
             "name": "Sympla",
             "servers": 
                 {
@@ -2651,14 +2388,11 @@
         {
             "name": "Vindral",
             "more_info_link": "https://docs.vindral.com/docs/vindral-cdn/",
+            "stream_key_link": "https://portal.cdn.vindral.com/channels",
             "servers": 
                 {
-                    "name": "eu-north",
-                    "url": "rtmps://rtmp.eu-north.cdn.vindral.com/publish"
-                },
-                {
-                    "name": "eu-west",
-                    "url": "rtmps://rtmp.eu-west.cdn.vindral.com/publish"
+                    "name": "Global",
+                    "url": "rtmps://rtmp.global.cdn.vindral.com/publish"
                 }
             ,
             "recommended": {
@@ -2697,37 +2431,46 @@
             "servers": 
                 {
                     "name": "Global (Recommended)",
-                    "url": "rtmp://stream.global.irl.run/ingest"
+                    "url": "rtmps://stream.global.irl.run/ingest"
                 },
                 {
                     "name": "Los Angeles, US",
-                    "url": "rtmp://stream.lax.irl.run/ingest"
+                    "url": "rtmps://stream.lax.irl.run/ingest"
+                },
+                {
+                    "name": "Dallas, US",
+                    "url": "rtmps://stream.dal.irl.run/ingest"
                 },
                 {
                     "name": "New York, US",
-                    "url": "rtmp://stream.ewr.irl.run/ingest"
+                    "url": "rtmps://stream.ewr.irl.run/ingest"
                 },
                 {
-                    "name": "Rotterdam, NL",
-                    "url": "rtmp://stream.rtm.irl.run/ingest"
+                    "name": "Miami, US",
+                    "url": "rtmps://stream.mia.irl.run/ingest"
+                },
+                {
+                    "name": "Amsterdam, NL",
+                    "url": "rtmps://stream.ams.irl.run/ingest"
                 },
                 {
                     "name": "Singapore",
-                    "url": "rtmp://stream.sin.irl.run/ingest"
+                    "url": "rtmps://stream.sin.irl.run/ingest"
                 },
                 {
                     "name": "Tokyo, JP",
-                    "url": "rtmp://stream.tyo.irl.run/ingest"
+                    "url": "rtmps://stream.tyo.irl.run/ingest"
                 },
                 {
                     "name": "Sydney, AU",
-                    "url": "rtmp://stream.syd.irl.run/ingest"
+                    "url": "rtmps://stream.syd.irl.run/ingest"
                 }
             ,
             "recommended": {
                 "keyint": 2,
                 "bframes": 2,
-                "max video bitrate": 20000
+                "max video bitrate": 20000,
+                "max audio bitrate": 256
             },
             "supported video codecs": 
                 "h264"
@@ -2808,6 +2551,155 @@
             "supported video codecs": 
                 "h264"
             
+        },
+        {
+            "name": "Livepeer Studio",
+            "more_info_link": "https://docs.livepeer.org/guides/developing/stream-via-obs",
+            "stream_key_link": "https://livepeer.studio/dashboard/streams",
+            "servers": 
+                {
+                    "name": "Global (RTMP)",
+                    "url": "rtmp://rtmp.livepeer.com/live"
+                },
+                {
+                    "name": "Global (RTMP Primary)",
+                    "url": "rtmp://rtmp-a.livepeer.com/live"
+                },
+                {
+                    "name": "Global (RTMP Backup)",
+                    "url": "rtmp://rtmp-b.livepeer.com/live"
+                }
+            ,
+            "recommended": {
+                "keyint": 1,
+                "profile": "high",
+                "bframes": 0,
+                "max video bitrate": 20000,
+                "max audio bitrate": 512
+            },
+            "supported video codecs": 
+                "h264"
+            
+        },
+        {
+            "name": "VStream",
+            "common": false,
+            "stream_key_link": "https://vstream.com/dashboard/livestreams",
+            "more_info_link": "https://vstream.com/help/streaming-with-obs",
+            "servers": 
+                {
+                    "name": "Global (RTMP)",
+                    "url": "rtmp://live.vstream.com"
+                }
+            ,
+            "recommended": {
+                "keyint": 2,
+                "profile": "high",
+                "x264opts": "scenecut=0",
+                "supported resolutions": 
+                    "1920x1080",
+                    "1280x720",
+                    "852x480"
+                ,
+                "bitrate matrix": 
+                    {
+                        "res": "1920x1080",
+                        "fps": 60,
+                        "max bitrate": 8000
+                    },
+                    {
+                        "res": "1920x1080",
+                        "fps": 30,
+                        "max bitrate": 6000
+                    },
+                    {
+                        "res": "1280x720",
+                        "fps": 60,
+                        "max bitrate": 6000
+                    },
+                    {
+                        "res": "1280x720",
+                        "fps": 30,
+                        "max bitrate": 4000
+                    },
+                    {
+                        "res": "852x480",
+                        "fps": 60,
+                        "max bitrate": 3000
+                    },
+                    {
+                        "res": "852x480",
+                        "fps": 30,
+                        "max bitrate": 2000
+                    }
+                ,
+                "max fps": 60,
+                "max video bitrate": 8000,
+                "max audio bitrate": 320
+            },
+            "supported video codecs": 
+                "h264"
+            
+        },
+        {
+            "name": "MasterStream.iR | مستراستریم | ری استریم و استریم همزمان",
+            "common": false,
+            "more_info_link": "https://masterstream.ir/webpage/page/docs",
+            "stream_key_link": "https://masterstream.ir/managestreams.php",
+            "servers": 
+                {
+                    "name": "Auto (Iran Servers)",
+                    "url": "rtmp://auto.masterstream.ir/live"
+                },
+                {
+                    "name": "Iran Server 1",
+                    "url": "rtmp://live1.masterstream.ir/live"
+                },
+                {
+                    "name": "Iran Server 2",
+                    "url": "rtmp://live2.masterstream.ir/live"
+                },
+                {
+                    "name": "Iran Server 3",
+                    "url": "rtmp://live3.masterstream.ir/live"
+                },
+                {
+                    "name": "Iran Server 4",
+                    "url": "rtmp://live4.masterstream.ir/live"
+                },
+                {
+                    "name": "Iran Server 5",
+                    "url": "rtmp://live5.masterstream.ir/live"
+                },
+                {
+                    "name": "Iran Server 6",
+                    "url": "rtmp://live6.masterstream.ir/live"
+                },
+                {
+                    "name": "Iran Server 7",
+                    "url": "rtmp://live7.masterstream.ir/live"
+                },
+                {
+                    "name": "Turkey Server 1",
+                    "url": "rtmp://tr-live1.masterstream.ir/live"
+                }
+            ,
+            "protocol": "RTMP",
+            "supported video codecs": 
+                "h264"
+            ,
+            "recommended": {
+                "keyint": 2,
+                "supported resolutions": 
+                    "1920x1080",
+                    "1280x720",
+                    "852x480",
+                    "640x360"
+                ,
+                "max video bitrate": 6000,
+                "max audio bitrate": 320,
+                "x264opts": "scenecut=0"
+            }
         }
     
 }

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/rtmp-common.c -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/rtmp-common.c Changed

obs-studio-29.1.3.tar.xz/plugins/rtmp-services/rtmp-custom.c -> obs-studio-30.0.2.tar.xz/plugins/rtmp-services/rtmp-custom.c Changed

@@ -134,18 +134,21 @@
 	return "RTMP";
 }
 
-#define RTMP_PROTOCOL "rtmp"
-
 static void rtmp_custom_apply_settings(void *data, obs_data_t *video_settings,
 				       obs_data_t *audio_settings)
 {
 	struct rtmp_custom *service = data;
-	if (service->server != NULL && video_settings != NULL &&
-	    strncmp(service->server, RTMP_PROTOCOL, strlen(RTMP_PROTOCOL)) !=
-		    0) {
+	const char *protocol = rtmp_custom_get_protocol(service);
+	bool has_mpegts = false;
+	bool is_rtmp = false;
+	if (strcmp(protocol, "SRT") == 0 || strcmp(protocol, "RIST") == 0)
+		has_mpegts = true;
+	if (strcmp(protocol, "RTMP") == 0 || strcmp(protocol, "RTMPS") == 0)
+		is_rtmp = true;
+	if (!is_rtmp && video_settings != NULL)
 		obs_data_set_bool(video_settings, "repeat_headers", true);
+	if (has_mpegts && audio_settings != NULL)
 		obs_data_set_bool(audio_settings, "set_to_ADTS", true);
-	}
 }
 
 static const char *rtmp_custom_get_connect_info(void *data, uint32_t type)
@@ -169,6 +172,8 @@
 
 		break;
 	}
+	case OBS_SERVICE_CONNECT_INFO_BEARER_TOKEN:
+		return NULL;
 	}
 
 	return NULL;

obs-studio-30.0.2.tar.xz/plugins/sndio/data/locale/af-ZA.ini Added

obs-studio-30.0.2.tar.xz/plugins/sndio/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/sndio/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/sndio/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/sndio/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/sndio/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/sndio/sndio-input.c -> obs-studio-30.0.2.tar.xz/plugins/sndio/sndio-input.c Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ba-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ba-RU.ini Changed

obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/be-BY.ini Added

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/en-US.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/eo-UY.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/eo-UY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/mn-MN.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/mn-MN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ru-RU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/szl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/szl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/ta-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/tl-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/tl-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/find-font-cocoa.m -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/find-font-cocoa.m Changed

@@ -9,117 +9,100 @@
 
 static inline void add_path_font(const char *path)
 {
-	FT_Face face;
-	FT_Long idx = 0;
-	FT_Long max_faces = 1;
-
-	while (idx < max_faces) {
-		if (FT_New_Face(ft2_lib, path, idx, &face) != 0)
-			break;
-
-		build_font_path_info(face, idx++, path);
-		max_faces = face->num_faces;
-		FT_Done_Face(face);
-	}
+ FT_Face face;
+ FT_Long idx = 0;
+ FT_Long max_faces = 1;
+
+ while (idx < max_faces) {
+ if (FT_New_Face(ft2_lib, path, idx, &face) != 0)
+ break;
+
+ build_font_path_info(face, idx++, path);
+ max_faces = face->num_faces;
+ FT_Done_Face(face);
+ }
 }
 
 static void add_path_fonts(NSFileManager *file_manager, NSString *path)
 {
-	NSArray *files = NULL;
+ NSArray *files = NULL;
 
-	files = file_manager contentsOfDirectoryAtPath:path error:nil;
+ files = file_manager contentsOfDirectoryAtPath:path error:nil;
 
-	for (NSString *file in files) {
-		NSString *full_path =
-			path stringByAppendingPathComponent:file;
+ for (NSString *file in files) {
+ NSString *full_path = path stringByAppendingPathComponent:file;
 
-		BOOL is_dir = FALSE;
-		bool folder_exists = file_manager fileExistsAtPath:full_path
-							isDirectory:&is_dir;
+ BOOL is_dir = FALSE;
+ bool folder_exists = file_manager fileExistsAtPath:full_path isDirectory:&is_dir;
 
-		if (folder_exists && is_dir) {
-			add_path_fonts(file_manager, full_path);
-		} else {
-			add_path_font(full_path.fileSystemRepresentation);
-		}
-	}
+ if (folder_exists && is_dir) {
+ add_path_fonts(file_manager, full_path);
+ } else {
+ add_path_font(full_path.fileSystemRepresentation);
+ }
+ }
 }
 
 void load_os_font_list(void)
 {
-	@autoreleasepool {
-		BOOL is_dir;
-		NSArray *paths = NSSearchPathForDirectoriesInDomains(
-			NSLibraryDirectory, NSAllDomainsMask, true);
-
-		for (NSString *path in paths) {
-			NSFileManager *file_manager =
-				NSFileManager defaultManager;
-			NSString *font_path =
-				path stringByAppendingPathComponent:@"Fonts";
-
-			bool folder_exists = file_manager
-				fileExistsAtPath:font_path
-				 isDirectory:&is_dir;
-
-			if (folder_exists && is_dir)
-				add_path_fonts(file_manager, font_path);
-		}
-
-		save_font_list();
-	}
+ @autoreleasepool {
+ BOOL is_dir;
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, true);
+
+ for (NSString *path in paths) {
+ NSFileManager *file_manager = NSFileManager defaultManager;
+ NSString *font_path = path stringByAppendingPathComponent:@"Fonts";
+
+ bool folder_exists = file_manager fileExistsAtPath:font_path isDirectory:&is_dir;
+
+ if (folder_exists && is_dir)
+ add_path_fonts(file_manager, font_path);
+ }
+
+ save_font_list();
+ }
 }
 
 static uint32_t add_font_checksum(uint32_t checksum, const char *path)
 {
-	if (path && *path)
-		checksum = calc_crc32(checksum, path, strlen(path));
-	return checksum;
+ if (path && *path)
+ checksum = calc_crc32(checksum, path, strlen(path));
+ return checksum;
 }
 
-static uint32_t add_font_checksum_path(uint32_t checksum,
-				 NSFileManager *file_manager,
-				 NSString *path)
+static uint32_t add_font_checksum_path(uint32_t checksum, NSFileManager *file_manager, NSString *path)
 {
-	NSArray *files = NULL;
+ NSArray *files = NULL;
 
-	files = file_manager contentsOfDirectoryAtPath:path error:nil;
+ files = file_manager contentsOfDirectoryAtPath:path error:nil;
 
-	for (NSString *file in files) {
-		NSString *full_path =
-			path stringByAppendingPathComponent:file;
+ for (NSString *file in files) {
+ NSString *full_path = path stringByAppendingPathComponent:file;
 
-		checksum = add_font_checksum(
-			checksum, full_path.fileSystemRepresentation);
-	}
+ checksum = add_font_checksum(checksum, full_path.fileSystemRepresentation);
+ }
 
-	return checksum;
+ return checksum;
 }
 
 uint32_t get_font_checksum(void)
 {
-	uint32_t checksum = 0;
-
-	@autoreleasepool {
-		BOOL is_dir;
-		NSArray *paths = NSSearchPathForDirectoriesInDomains(
-			NSLibraryDirectory, NSAllDomainsMask, true);
-
-		for (NSString *path in paths) {
-			NSFileManager *file_manager =
-				NSFileManager defaultManager;
-			NSString *font_path =
-				path stringByAppendingPathComponent:@"Fonts";
-
-			bool folder_exists = file_manager
-				fileExistsAtPath:font_path
-				 isDirectory:&is_dir;
-
-			if (folder_exists && is_dir)
-				checksum = add_font_checksum_path(
-					checksum, file_manager, font_path);
-		}
-	}
-
-	return checksum;
+ uint32_t checksum = 0;
+
+ @autoreleasepool {
+ BOOL is_dir;
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, true);
+
+ for (NSString *path in paths) {
+ NSFileManager *file_manager = NSFileManager defaultManager;
+ NSString *font_path = path stringByAppendingPathComponent:@"Fonts";
+
+ bool folder_exists = file_manager fileExistsAtPath:font_path isDirectory:&is_dir;
+
+ if (folder_exists && is_dir)
+ checksum = add_font_checksum_path(checksum, file_manager, font_path);
+ }
+ }
+
+ return checksum;
 }

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/find-font.c -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/find-font.c Changed

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/text-freetype2.c -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/text-freetype2.c Changed

@@ -138,6 +138,22 @@
 	return srcdata->cy + srcdata->outline_width;
 }
 
+static bool from_file_modified(obs_properties_t *props, obs_property_t *prop,
+			       obs_data_t *settings)
+{
+	UNUSED_PARAMETER(prop);
+
+	bool from_file = obs_data_get_bool(settings, "from_file");
+
+	obs_property_t *text = obs_properties_get(props, "text");
+	obs_property_t *text_file = obs_properties_get(props, "text_file");
+
+	obs_property_set_visible(text, !from_file);
+	obs_property_set_visible(text_file, from_file);
+
+	return true;
+}
+
 static obs_properties_t *ft2_source_properties(void *unused)
 {
 	UNUSED_PARAMETER(unused);
@@ -153,12 +169,24 @@
 
 	obs_properties_add_font(props, "font", obs_module_text("Font"));
 
+	obs_property_t *from_file = obs_properties_add_list(
+		props, "from_file", obs_module_text("TextInputMode"),
+		OBS_COMBO_TYPE_RADIO, OBS_COMBO_FORMAT_BOOL);
+	obs_property_list_add_bool(
+		from_file, obs_module_text("TextInputMode.Manual"), false);
+	obs_property_list_add_bool(
+		from_file, obs_module_text("TextInputMode.FromFile"), true);
+	obs_property_set_modified_callback(from_file, from_file_modified);
+
+	obs_property_t *text_file = obs_properties_add_path(
+		props, "text_file", obs_module_text("TextFile"), OBS_PATH_FILE,
+		obs_module_text("TextFileFilter"), NULL);
+	obs_property_set_long_description(text_file,
+					  obs_module_text("TextFile.Encoding"));
+
 	obs_properties_add_text(props, "text", obs_module_text("Text"),
 				OBS_TEXT_MULTILINE);
 
-	obs_properties_add_bool(props, "from_file",
-				obs_module_text("ReadFromFile"));
-
 	obs_properties_add_bool(props, "antialiasing",
 				obs_module_text("Antialiasing"));
 
@@ -168,10 +196,6 @@
 	obs_properties_add_int(props, "log_lines",
 			       obs_module_text("ChatLogLines"), 1, 1000, 1);
 
-	obs_properties_add_path(props, "text_file", obs_module_text("TextFile"),
-				OBS_PATH_FILE,
-				obs_module_text("TextFileFilter"), NULL);
-
 	obs_properties_add_color_alpha(props, "color1",
 				       obs_module_text("Color1"));

obs-studio-29.1.3.tar.xz/plugins/text-freetype2/text-freetype2.h -> obs-studio-30.0.2.tar.xz/plugins/text-freetype2/text-freetype2.h Changed

obs-studio-29.1.3.tar.xz/plugins/vlc-video/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/vlc-video/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/vlc-video/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/vlc-video/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/vlc-video/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/vlc-video/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/vlc-video/data/locale/zh-CN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/vlc-video/vlc-video-source.c -> obs-studio-30.0.2.tar.xz/plugins/vlc-video/vlc-video-source.c Changed

@@ -46,6 +46,8 @@
 	libvlc_media_t *media;
 };
 
+typedef DARRAY(struct media_file_data) media_file_array_t;
+
 enum behavior {
 	BEHAVIOR_STOP_RESTART,
 	BEHAVIOR_PAUSE_UNPAUSE,
@@ -63,7 +65,7 @@
 	size_t audio_capacity;
 
 	pthread_mutex_t mutex;
-	DARRAY(struct media_file_data) files;
+	media_file_array_t files;
 	enum behavior behavior;
 	bool loop;
 	bool shuffle;
@@ -75,18 +77,15 @@
 	obs_hotkey_id playlist_prev_hotkey;
 };
 
-static libvlc_media_t *get_media(struct darray *array, const char *path)
+static libvlc_media_t *get_media(media_file_array_t *files, const char *path)
 {
-	DARRAY(struct media_file_data) files;
 	libvlc_media_t *media = NULL;
 
-	files.da = *array;
-
-	for (size_t i = 0; i < files.num; i++) {
-		const char *cur_path = files.arrayi.path;
+	for (size_t i = 0; i < files->num; i++) {
+		const char *cur_path = files->arrayi.path;
 
 		if (strcmp(path, cur_path) == 0) {
-			media = files.arrayi.media;
+			media = files->arrayi.media;
 			libvlc_media_retain_(media);
 			break;
 		}
@@ -102,17 +101,14 @@
 		 : libvlc_media_new_path_(libvlc, file);
 }
 
-static void free_files(struct darray *array)
+static void free_files(media_file_array_t *files)
 {
-	DARRAY(struct media_file_data) files;
-	files.da = *array;
-
-	for (size_t i = 0; i < files.num; i++) {
-		bfree(files.arrayi.path);
-		libvlc_media_release_(files.arrayi.media);
+	for (size_t i = 0; i < files->num; i++) {
+		bfree(files->arrayi.path);
+		libvlc_media_release_(files->arrayi.media);
 	}
 
-	da_free(files);
+	da_free(*files);
 }
 
 #define MAKEFORMAT(ch0, ch1, ch2, ch3) \
@@ -360,7 +356,7 @@
 	bfree((void *)c->audio.data0);
 	obs_source_frame_free(&c->frame);
 
-	free_files(&c->files.da);
+	free_files(&c->files);
 	pthread_mutex_destroy(&c->mutex);
 	bfree(c);
 }
@@ -529,18 +525,15 @@
 	return 0;
 }
 
-static void add_file(struct vlc_source *c, struct darray *array,
+static void add_file(struct vlc_source *c, media_file_array_t *new_files,
 		 const char *path, int network_caching, int track_index,
 		 int subtitle_index, bool subtitle_enable)
 {
-	DARRAY(struct media_file_data) new_files;
 	struct media_file_data data;
 	struct dstr new_path = {0};
 	libvlc_media_t *new_media;
 	bool is_url = path && strstr(path, "://") != NULL;
 
-	new_files.da = *array;
-
 	dstr_copy(&new_path, path);
 #ifdef _WIN32
 	if (!is_url)
@@ -548,10 +541,10 @@
 #endif
 	path = new_path.array;
 
-	new_media = get_media(&c->files.da, path);
+	new_media = get_media(&c->files, path);
 
 	if (!new_media)
-		new_media = get_media(&new_files.da, path);
+		new_media = get_media(new_files, path);
 	if (!new_media)
 		new_media = create_media_from_file(path);
 
@@ -579,12 +572,10 @@
 
 		data.path = new_path.array;
 		data.media = new_media;
-		da_push_back(new_files, &data);
+		da_push_back(*new_files, &data);
 	} else {
 		dstr_free(&new_path);
 	}
-
-	*array = new_files.da;
 }
 
 static bool valid_extension(const char *ext)
@@ -624,8 +615,8 @@
 
 static void vlcs_update(void *data, obs_data_t *settings)
 {
-	DARRAY(struct media_file_data) new_files;
-	DARRAY(struct media_file_data) old_files;
+	media_file_array_t new_files;
+	media_file_array_t old_files;
 	libvlc_media_list_t *media_list;
 	struct vlc_source *c = data;
 	obs_data_array_t *array;
@@ -694,7 +685,7 @@
 				dstr_copy(&dir_path, path);
 				dstr_cat_ch(&dir_path, '/');
 				dstr_cat(&dir_path, ent->d_name);
-				add_file(c, &new_files.da, dir_path.array,
+				add_file(c, &new_files, dir_path.array,
 					 network_caching, track_index,
 					 subtitle_index, subtitle_enable);
 			}
@@ -702,7 +693,7 @@
 			dstr_free(&dir_path);
 			os_closedir(dir);
 		} else {
-			add_file(c, &new_files.da, path, network_caching,
+			add_file(c, &new_files, path, network_caching,
 				 track_index, subtitle_index, subtitle_enable);
 		}
 
@@ -715,8 +706,8 @@
 	libvlc_media_list_player_stop_(c->media_list_player);
 
 	pthread_mutex_lock(&c->mutex);
-	old_files.da = c->files.da;
-	c->files.da = new_files.da;
+	old_files = c->files;
+	c->files = new_files;
 	pthread_mutex_unlock(&c->mutex);
 
 	/* ------------------------------------- */
@@ -725,7 +716,7 @@
 	c->shuffle = obs_data_get_bool(settings, S_SHUFFLE);
 
 	if (c->files.num > 1 && c->shuffle) {
-		DARRAY(struct media_file_data) new_files;
+		media_file_array_t new_files;
 		DARRAY(size_t) idxs;
 
 		da_init(new_files);
@@ -745,13 +736,13 @@
 
 		da_free(c->files);
 		da_free(idxs);
-		c->files.da = new_files.da;
+		c->files = new_files;
 	}
 
 	/* ------------------------------------- */
 	/* clean up and restart playback */
 
-	free_files(&old_files.da);
+	free_files(&old_files);
 
 	media_list = libvlc_media_list_new_(libvlc);

obs-studio-29.1.3.tar.xz/plugins/win-capture/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/win-capture/CMakeLists.txt Changed

@@ -1,61 +1,87 @@
-project(win-capture)
+cmake_minimum_required(VERSION 3.24...3.25)
 
-option(ENABLE_COMPAT_UPDATES "Checks for service updates" OFF)
+if(OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
+ add_library(hook-config INTERFACE)
+ add_library(OBS::hook-config ALIAS hook-config)
+ target_sources(hook-config INTERFACE graphics-hook-ver.h graphics-hook-info.h hook-helpers.h)
+ target_include_directories(hook-config INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 
-set(COMPAT_URL
- "https://obsproject.com/obs2_update/win-capture"
- CACHE STRING "Default services package URL")
+ add_library(inject-library INTERFACE)
+ add_library(OBS::inject-library ALIAS inject-library)
+ target_sources(inject-library INTERFACE inject-library.c inject-library.h)
+ target_include_directories(inject-library INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 
+ add_library(d3d8-api INTERFACE)
+ add_library(OBS::d3d8-api ALIAS d3d8-api)
+ target_sources(d3d8-api INTERFACE d3d8-api/d3d8.h d3d8-api/d3d8caps.h d3d8-api/d3d8types.h)
+ target_include_directories(d3d8-api INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/d3d8-api")
+endif()
+
+legacy_check()
+
+option(ENABLE_COMPAT_UPDATES "Checks for capture compatibility data updates" ON)
+
+# cmake-format: off
+set(COMPAT_URL "https://obsproject.com/obs2_update/win-capture" CACHE STRING "Default services package URL")
 mark_as_advanced(COMPAT_URL)
+# cmake-format: on
+
+if(NOT TARGET OBS::ipc-util)
+ add_subdirectory("${CMAKE_SOURCE_DIR}/deps/ipc-util" "${CMAKE_BINARY_DIR}/deps/ipc-util")
+endif()
+
+if(NOT TARGET OBS::file-updater)
+ add_subdirectory("${CMAKE_SOURCE_DIR}/deps/file-updater" "${CMAKE_BINARY_DIR}/deps/file-updater")
+endif()
+
+find_package(jansson REQUIRED)
 
 add_library(win-capture MODULE)
 add_library(OBS::capture ALIAS win-capture)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/compat-config.h.in ${CMAKE_BINARY_DIR}/config/compat-config.h)
-
 target_sources(
 win-capture
- PRIVATE plugin-main.c
+ PRIVATE # cmake-format: sortable
 app-helpers.c
 app-helpers.h
+ compat-format-ver.h
+ compat-helpers.c
+ compat-helpers.h
 cursor-capture.c
 cursor-capture.h
 dc-capture.c
 dc-capture.h
 duplicator-monitor-capture.c
- game-capture.c
 game-capture-file-init.c
- graphics-hook-info.h
- graphics-hook-ver.h
- hook-helpers.h
- inject-library.c
- inject-library.h
+ game-capture.c
 load-graphics-offsets.c
 monitor-capture.c
 nt-stuff.c
 nt-stuff.h
- window-capture.c
- compat-helpers.c
- compat-helpers.h
- compat-format-ver.h
- ../../libobs/util/windows/obfuscate.c
- ../../libobs/util/windows/obfuscate.h
- ${CMAKE_BINARY_DIR}/config/compat-config.h)
-
-target_link_libraries(win-capture PRIVATE OBS::libobs OBS::ipc-util OBS::file-updater Jansson::Jansson)
+ plugin-main.c
+ window-capture.c)
 
-set_target_properties(win-capture PROPERTIES FOLDER "plugins/win-capture")
+target_compile_definitions(
+ win-capture PRIVATE COMPAT_URL="${COMPAT_URL}" "$<$<BOOL:${ENABLE_COMPAT_UPDATES}>:ENABLE_COMPAT_UPDATES>"
+ OBS_VERSION="${OBS_VERSION_CANONICAL}")
 
-if(MSVC)
- target_link_libraries(win-capture PRIVATE OBS::w32-pthreads)
- target_link_options(win-capture PRIVATE "LINKER:/IGNORE:4098")
-endif()
-
-target_compile_definitions(win-capture PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
+target_link_libraries(
+ win-capture
+ PRIVATE OBS::file-updater
+ OBS::hook-config
+ OBS::inject-library
+ OBS::ipc-util
+ OBS::libobs
+ OBS::obfuscate
+ OBS::w32-pthreads
+ OBS::winrt-headers
+ jansson::jansson)
 
-set_property(GLOBAL APPEND PROPERTY OBS_MODULE_LIST "win-capture")
+target_link_options(win-capture PRIVATE /NODEFAULTLIB:msvcrtd.lib)
 
-setup_plugin_target(win-capture)
+# cmake-format: off
+set_target_properties_obs(win-capture PROPERTIES FOLDER plugins/win-capture PREFIX "")
+# cmake-format: on
 
 add_subdirectory(graphics-hook)
 add_subdirectory(get-graphics-offsets)

obs-studio-30.0.2.tar.xz/plugins/win-capture/cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/cmake/32bit-build.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/cmake/legacy.cmake Added

@@ -0,0 +1,65 @@
+project(win-capture)
+
+option(ENABLE_COMPAT_UPDATES "Checks for capture compatibility data updates" ON)
+
+set(COMPAT_URL
+    "https://obsproject.com/obs2_update/win-capture"
+    CACHE STRING "Default services package URL")
+
+mark_as_advanced(COMPAT_URL)
+
+add_library(win-capture MODULE)
+add_library(OBS::capture ALIAS win-capture)
+
+find_package(Jansson 2.5 REQUIRED)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/compat-config.h.in ${CMAKE_BINARY_DIR}/config/compat-config.h)
+
+target_sources(
+  win-capture
+  PRIVATE plugin-main.c
+          app-helpers.c
+          app-helpers.h
+          cursor-capture.c
+          cursor-capture.h
+          dc-capture.c
+          dc-capture.h
+          duplicator-monitor-capture.c
+          game-capture.c
+          game-capture-file-init.c
+          graphics-hook-info.h
+          graphics-hook-ver.h
+          hook-helpers.h
+          inject-library.c
+          inject-library.h
+          load-graphics-offsets.c
+          monitor-capture.c
+          nt-stuff.c
+          nt-stuff.h
+          window-capture.c
+          compat-helpers.c
+          compat-helpers.h
+          compat-format-ver.h
+          ../../libobs/util/windows/obfuscate.c
+          ../../libobs/util/windows/obfuscate.h
+          ${CMAKE_BINARY_DIR}/config/compat-config.h)
+
+target_link_libraries(win-capture PRIVATE OBS::libobs OBS::ipc-util OBS::file-updater Jansson::Jansson)
+
+set_target_properties(win-capture PROPERTIES FOLDER "plugins/win-capture")
+
+if(MSVC)
+  target_link_libraries(win-capture PRIVATE OBS::w32-pthreads)
+  target_link_options(win-capture PRIVATE "LINKER:/IGNORE:4098")
+endif()
+
+target_compile_definitions(win-capture PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS
+                                               OBS_VERSION="${OBS_VERSION_CANONICAL}" OBS_LEGACY)
+
+set_property(GLOBAL APPEND PROPERTY OBS_MODULE_LIST "win-capture")
+
+setup_plugin_target(win-capture)
+
+add_subdirectory(graphics-hook)
+add_subdirectory(get-graphics-offsets)
+add_subdirectory(inject-helper)

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/compatibility.json -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/compatibility.json Changed

@@ -17,8 +17,22 @@
 "url": "https://help.steampowered.com/faqs/view/09A0-4879-4353-EF95#whitelist"
 },
 {
- "name": "Electron",
- "translation_key": "Compatibility.Application.ElectronBitBlt",
+ "name": "Counter-Strike 2",
+ "translation_key": "Compatibility.Application.CSGO",
+ "severity": 1,
+ "executable": "cs2.exe",
+ "window_class": "",
+ "window_title": "",
+ "match_flags": 1,
+ "game_capture": true,
+ "window_capture": false,
+ "window_capture_wgc": false,
+ "message": "Counter-Strike 2 may require the <code>-allow_third_party_software</code> launch option to use Game Capture.",
+ "url": "https://help.steampowered.com/faqs/view/09A0-4879-4353-EF95#whitelist"
+ },
+ {
+ "name": "Chromium",
+ "translation_key": "Compatibility.WindowCapture.BitBlt.Applications.Based",
 "severity": 0,
 "executable": "",
 "window_class": "Chrome_WidgetWin_0",
@@ -27,12 +41,12 @@
 "game_capture": false,
 "window_capture": true,
 "window_capture_wgc": false,
- "message": "Electron-based applications may not be capturable using the selected Capture Method (BitBlt).",
+ "message": "Applications based on Chromium may not be capturable using the selected Capture Method (BitBlt).",
 "url": ""
 },
 {
- "name": "Electron",
- "translation_key": "Compatibility.Application.ElectronBitBlt",
+ "name": "Chromium",
+ "translation_key": "Compatibility.WindowCapture.BitBlt.Applications.Based",
 "severity": 0,
 "executable": "",
 "window_class": "Chrome_WidgetWin_1",
@@ -41,12 +55,12 @@
 "game_capture": false,
 "window_capture": true,
 "window_capture_wgc": false,
- "message": "Electron-based applications may not be capturable using the selected Capture Method (BitBlt).",
+ "message": "Applications based on Chromium may not be capturable using the selected Capture Method (BitBlt).",
 "url": ""
 },
 {
- "name": "Electron",
- "translation_key": "Compatibility.Application.ElectronGameCapture",
+ "name": "Chromium",
+ "translation_key": "Compatibility.GameCapture.Blocked.Applications.Built",
 "severity": 2,
 "executable": "",
 "window_class": "Chrome_WidgetWin_0",
@@ -55,12 +69,12 @@
 "game_capture": true,
 "window_capture": false,
 "window_capture_wgc": false,
- "message": "Games built on Electron cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
+ "message": "Games built on Chromium cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
 "url": ""
 },
 {
- "name": "Electron",
- "translation_key": "Compatibility.Application.ElectronGameCapture",
+ "name": "Chromium",
+ "translation_key": "Compatibility.GameCapture.Blocked.Applications.Built",
 "severity": 2,
 "executable": "",
 "window_class": "Chrome_WidgetWin_1",
@@ -69,7 +83,63 @@
 "game_capture": true,
 "window_capture": false,
 "window_capture_wgc": false,
- "message": "Games built on Electron cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
+ "message": "Games built on Chromium cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
+ "url": ""
+ },
+ {
+ "name": "UWP",
+ "translation_key": "Compatibility.WindowCapture.BitBlt.Applications",
+ "severity": 0,
+ "executable": "",
+ "window_class": "ApplicationFrameWindow",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "UWP applications may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "UWP",
+ "translation_key": "Compatibility.WindowCapture.BitBlt.Applications",
+ "severity": 0,
+ "executable": "",
+ "window_class": "Windows.UI.Core.CoreWindow",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "UWP applications may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Gaming Services",
+ "translation_key": "Compatibility.WindowCapture.BitBlt.Applications",
+ "severity": 0,
+ "executable": "",
+ "window_class": "GAMINGSERVICESUI_HOSTING_WINDOW_CLASS",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Gaming Services applications may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Gaming Services",
+ "translation_key": "Compatibility.GameCapture.Blocked.Applications",
+ "severity": 2,
+ "executable": "",
+ "window_class": "GAMINGSERVICESUI_HOSTING_WINDOW_CLASS",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": true,
+ "window_capture": false,
+ "window_capture_wgc": false,
+ "message": "Gaming Services applications cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
 "url": ""
 },
 {
@@ -125,7 +195,7 @@
 "game_capture": true,
 "window_capture": false,
 "window_capture_wgc": false,
- "message": "Destiny 2 cannot be captured via Game Capture. Use Window Capture or Display Capture instead.",
+ "message": "Destiny 2 cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
 "url": "https://www.bungie.net/en/Help/Article/46101"
 },
 {
@@ -139,7 +209,7 @@
 "game_capture": true,
 "window_capture": false,
 "window_capture_wgc": false,
- "message": "Grand Theft Auto: San Andreas cannot be captured via Game Capture. Use Window Capture or Display Capture instead.",
+ "message": "Grand Theft Auto: San Andreas cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
 "url": ""
 },
 {
@@ -153,7 +223,7 @@
 "game_capture": true,
 "window_capture": false,
 "window_capture_wgc": false,
- "message": "League of Legends Launcher cannot be captured via Game Capture. Use Window Capture or Display Capture instead.",
+ "message": "League of Legends Launcher cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
 "url": ""
 },
 {
@@ -167,7 +237,7 @@
 "game_capture": true,
 "window_capture": false,
 "window_capture_wgc": false,
- "message": "San Andreas Multiplayer cannot be captured via Game Capture. Use Window Capture or Display Capture instead.",
+ "message": "San Andreas Multiplayer cannot be captured using Game Capture. Use Window Capture or Display Capture instead.",
 "url": ""
 },
 {
@@ -185,31 +255,283 @@
 "url": "https://obsproject.com/kb/gpu-selection-guide"
 },
 {
- "name": "Chrome",
+ "name": "Microsoft Excel",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "XLMAIN",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft Excel may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft PowerPoint",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "PPTFrameClass",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft PowerPoint may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft PowerPoint",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "screenClass",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft PowerPoint may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft PowerPoint",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "PodiumParent",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft PowerPoint may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft Word",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "OpusApp",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft Word may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft Access",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "OMain",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft Access may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft OneNote",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "Framework::CFrame",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft OneNote may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft Outlook",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "rctrl_renwnd32",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft Outlook may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft Publisher",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "MSWinPub",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft Publisher may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Microsoft 365",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "OfficeApp-Frame",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Microsoft 365 may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Adobe After Effects",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "AfterFX.exe",
+ "window_class": "",
+ "window_title": "",
+ "match_flags": 1,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Adobe After Effects may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Adobe Character Animator",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "Character Animator.exe",
+ "window_class": "",
+ "window_title": "",
+ "match_flags": 1,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Adobe Character Animator may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Adobe Photoshop",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "Photoshop.exe",
+ "window_class": "",
+ "window_title": "",
+ "match_flags": 1,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Adobe Photoshop may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Adobe Premiere Pro",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "Adobe Premiere Pro.exe",
+ "window_class": "",
+ "window_title": "",
+ "match_flags": 1,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Adobe Premiere Pro may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Steam",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "",
+ "window_class": "SDL_app",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Steam may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Epic Games Launcher",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "EpicGamesLauncher.exe",
+ "window_class": "",
+ "window_title": "",
+ "match_flags": 1,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Epic Games Launcher may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Ubisoft Connect",
+ "translation_key": "Compatibility.WindowCapture.BitBlt",
+ "severity": 0,
+ "executable": "upc.exe",
+ "window_class": "",
+ "window_title": "",
+ "match_flags": 1,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Ubisoft Connect may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "Tencent GUI",
+ "translation_key": "Compatibility.WindowCapture.BitBlt.Applications.Based",
+ "severity": 0,
+ "executable": "",
+ "window_class": "TXGuiFoundation",
+ "window_title": "",
+ "match_flags": 4,
+ "game_capture": false,
+ "window_capture": true,
+ "window_capture_wgc": false,
+ "message": "Applications based on Tencent GUI may not be capturable using the selected Capture Method (BitBlt).",
+ "url": ""
+ },
+ {
+ "name": "WeChat",
 "translation_key": "Compatibility.WindowCapture.BitBlt",
 "severity": 0,
- "executable": "chrome.exe",
+ "executable": "WeChat.exe",
 "window_class": "",
 "window_title": "",
 "match_flags": 1,
 "game_capture": false,
 "window_capture": true,
 "window_capture_wgc": false,
- "message": "Chrome may not be capturable using the selected Capture Method (BitBlt).",
+ "message": "WeChat may not be capturable using the selected Capture Method (BitBlt).",
 "url": ""
 },
 {
- "name": "Edge",
+ "name": "YY",
 "translation_key": "Compatibility.WindowCapture.BitBlt",
 "severity": 0,
- "executable": "msedge.exe",
+ "executable": "YY.exe",
 "window_class": "",
 "window_title": "",
 "match_flags": 1,
 "game_capture": false,
 "window_capture": true,
 "window_capture_wgc": false,
- "message": "Edge may not be capturable using the selected Capture Method (BitBlt).",
+ "message": "YY may not be capturable using the selected Capture Method (BitBlt).",
 "url": ""
 },
 {

obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/af-ZA.ini Added

@@ -0,0 +1,30 @@
+MonitorCapture="Beeldskermopname"
+WindowCapture="Vensteropname"
+WindowCapture.Window="Venster"
+WindowCapture.Method="Opnamemetode"
+WindowCapture.Method.Auto="Outomaties"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 en nuwer)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows 10 (1903 en nuwer)"
+WindowCapture.Priority.Title="Venstertitel moet ooreenstem"
+WindowCapture.Priority.Class="Gelyk aan titel, vind anders ’n skerm van dieselfde tipe"
+WindowCapture.Priority.Exe="Gelyk aan titel, vind anders ’n skerm van dieselfde uitvoerbare"
+CaptureCursor="Neem muiswyser op"
+AllowTransparency="Laat deursigtigheid toe"
+Monitor="Beeldskerm"
+PrimaryMonitor="Primêre skerm"
+Method="Opnamemetode"
+Method.DXGI="DXGI-werkskermduplisering"
+Method.WindowsGraphicsCapture="Windows 10 (1903 en nuwer)"
+GameCapture="Spelopname"
+GameCapture.AnyFullscreen="Neem enige volskermtoepassing op"
+GameCapture.CaptureWindow="Neem spesifieke venster op"
+GameCapture.UseHotkey="Neem voorgrondvenster op net sneltoets"
+GameCapture.LimitFramerate="Beperk vaslêbeeldduur"
+GameCapture.HotkeyStart="Neem voorgrondvenster op"
+GameCapture.HotkeyStop="Deaktiveer opname"
+GameCapture.HookRate.Slow="Stadig"
+GameCapture.HookRate.Normal="Normaal (aanbeveel)"
+GameCapture.HookRate.Fast="Vinnig"
+GameCapture.HookRate.Fastest="Vinnigste"
+GameCapture.Rgb10a2Space="RGB10A2 kluirruimte"
+Mode="Modus"

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ar-SA.ini Changed

@@ -18,7 +18,6 @@
 Monitor="جهاز العرض"
 PrimaryMonitor="الشاشة الأساسية"
 Method="طريقة الإلتقاط"
-Method.Auto="أوتوماتيكي"
 Method.DXGI="ازدواجية سطح المكتب DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 وما فوق)"
 GameCapture="التقاط لعبة"
@@ -26,7 +25,7 @@
 GameCapture.CaptureWindow="التقاط نافذة محددة"
 GameCapture.UseHotkey="إلتقاط النافذة الأمامية باستخدام مفتاح إختصار"
 GameCapture.LimitFramerate="تقييد معدل إطارات الإلتقاط"
-GameCapture.CaptureOverlays="التقاط طبقات طرف ثالث (ستيم)"
+GameCapture.CaptureOverlays="التقاط طبقات طرف ثالث (مثل ستيم)"
 GameCapture.AntiCheatHook="استخدم رابط التوافقية مع برامج منع الغش"
 GameCapture.HotkeyStart="التقاط النافذة الأمامية"
 GameCapture.HotkeyStop="إلغاء تنشيط التقاط"
@@ -39,9 +38,11 @@
 Mode="الوضع"
 Compatibility.GameCapture.Admin="%name% قد يتطلب تشغيل OBS بصلاحيات مشرف من أجل التقاط اللعبة."
 Compatibility.GameCapture.Blocked="لا يمكن التقاط %name% عن طريق التقاط اللعبة. استخدم التقاط النافذة أو التقاط الشاشة بدلا من ذلك."
+Compatibility.GameCapture.Blocked.Applications="لا يمكن التقاط برامج %name% عن طريق التقاط اللعبة. استخدم التقاط النافذة أو التقاط الشاشة بدلا من ذلك."
+Compatibility.GameCapture.Blocked.Applications.Built="الألعاب المبنية على %name% لا يمكن التقاطها عن طريق التقاط اللعبة. استخدم التقاط النافذة أو التقاط الشاشة بدلا من ذلك."
 Compatibility.GameCapture.WrongGPU="إذا كانت المعاينة فارغة، تحقق أن %name% يعمل على نفس معالج الرسومات مثل OBS."
 Compatibility.WindowCapture.BitBlt="قد لا يكون %name% قابلاً للالتقاط باستخدام طريقة التقاط المحددة (BitBlt)."
-Compatibility.Application.CSGO="قد تتطلب لُعْبَة CS:GO تفعيل خِيار <code>-allow_third_party_software</code> لتسجيل اللعبة."
-Compatibility.Application.ElectronGameCapture="لا يمكن التقاط الألعاب المبنية على إلكترون باستخدام التقاط اللعبة. استخدم التقاط النافذة أو العرض."
-Compatibility.Application.ElectronBitBlt="قد لا تكون التطبيقات القائمة على الإلكترون قابلة للالتقاط باستخدام طريقة التقاط المحددة (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="قد لا تكون تطبيقات %name% قابلة للالتقاط باستخدام طريقة التقاط المحددة (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="قد لا تكون التطبيقات القائمة على %name% قابلة للالتقاط باستخدام طريقة التقاط المحددة (BitBlt)."
+Compatibility.Application.CSGO="قد يطلب برنامَج %name% تفعيل خِيار <code>-allow_third_party_software</code> لتسجيله."
 Compatibility.Application.Minecraft="إذا كنت تواجه مشاكل في التقاط Minecraft: إصدار Java Edition، تحقق من دليل استكشاف الأخطاء وإصلاحها."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ca-ES.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Pantalla"
 PrimaryMonitor="Monitor principal"
 Method="Mètode de captura"
-Method.Auto="Automàtic"
 Method.DXGI="Duplicació d'escriptori DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 i superior)"
 GameCapture="Captura de videojoc"
@@ -38,9 +37,11 @@
 GameCapture.Rgb10a2Space="Espai de color RGB10A2"
 Compatibility.GameCapture.Admin="%name% pot requerir que s'executi l'OBS com a administrador per utilitzar la captura del joc."
 Compatibility.GameCapture.Blocked="%name% no es pot capturar mitjançant la captura de jocs. Utilitzeu la captura de finestra o la captura de pantalla."
+Compatibility.GameCapture.Blocked.Applications="L'aplicació %name% no es pot capturar mitjançant la captura de jocs. Utilitzeu la captura de finestra o la captura de pantalla."
+Compatibility.GameCapture.Blocked.Applications.Built="Els jocs creats amb %name% no es poden capturar mitjançant la captura de jocs. Utilitzeu la captura de finestra o la captura de pantalla."
 Compatibility.GameCapture.WrongGPU="Si la vista prèvia està en blanc, assegureu-vos que %name% s'està executant a la mateixa GPU que l'OBS."
 Compatibility.WindowCapture.BitBlt="És possible que %name% no es pugui capturar amb el mètode de captura seleccionat (BitBlt)."
-Compatibility.Application.CSGO="CS:GO pot requerir l'opció de llançament <code>-allow_third_party_software</code> per utilitzar la captura de jocs."
-Compatibility.Application.ElectronGameCapture="Els jocs creats amb Electron no es poden capturar mitjançant la captura de jocs. Utilitzeu la captura de finestra o la captura de pantalla."
-Compatibility.Application.ElectronBitBlt="És possible que les aplicacions basades en Electron no es puguin capturar mitjançant el mètode de captura seleccionat (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="És possible que aplicacions com ara %name% no es puguin capturar amb el mètode de captura seleccionat (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="És possible que aplicacions basades en %name% no es puguin capturar amb el mètode de captura seleccionat (BitBlt)."
+Compatibility.Application.CSGO="%name% pot requerir l'opció de llançament <code>-allow_third_party_software</code> per utilitzar la captura de jocs."
 Compatibility.Application.Minecraft="Si teniu problemes per capturar Minecraft: Java Edition, consulteu la nostra guia de resolució de problemes."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/cs-CZ.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Obrazovka"
 PrimaryMonitor="Primární obrazovka"
 Method="Metoda záznamu"
-Method.Auto="Automaticky"
 Method.DXGI="DXGI Duplikace plochy"
 Method.WindowsGraphicsCapture="Windows 10 (1903 a novější)"
 GameCapture="Záznam hry"
@@ -39,9 +38,11 @@
 Mode="Režim"
 Compatibility.GameCapture.Admin="Pro záznam hry %name% může OBS vyžadovat, aby běžel s právy administrátora."
 Compatibility.GameCapture.Blocked="%name% nemůže být zaznamenáno pomocí záznamu hry. Použijte záznam okna či obrazovky."
+Compatibility.GameCapture.Blocked.Applications="Aplikace %name% nemohout být zaznamenány pomocí záznamu hry. Použijte záznam okna či obrazovky."
+Compatibility.GameCapture.Blocked.Applications.Built="Hry se základem %name% nemohou být zaznamenány pomocí záznamu hry. Použijte záznam okna či obrazovky."
 Compatibility.GameCapture.WrongGPU="Pokud je náhled prázdný, zkontrolujte, zda %name% běží na stejným GPU jako OBS."
 Compatibility.WindowCapture.BitBlt="%name% nemusí být zaznamenatelná pomocí vybrané metody záznamu (BitBlt)."
-Compatibility.Application.CSGO="Záznam CS:GO může vyžadovat přidání <code>-allow_third_party_software</code> do argumentů pro spuštění."
-Compatibility.Application.ElectronGameCapture="Hry založené na Electronu nemohou být zaznamenány pomocí záznamu hry. Použijte záznam okna či obrazovky."
-Compatibility.Application.ElectronBitBlt="Aplikace zapožené na Electronu nemusí být zaznamenatelné pomocí vybrané metody záznamu (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Aplikace %name% nemusí být zaznamenatelné pomocí vybrané metody záznamu (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Aplikace se základem %name% nemusí být zaznamenatelné pomocí vybrané metody záznamu (BitBlt)."
+Compatibility.Application.CSGO="Záznam %name% může vyžadovat přidání <code>-allow_third_party_software</code> do argumentů pro spuštění."
 Compatibility.Application.Minecraft="Pokud máte problém se záznamem Minecraft: Java Edition, přečtěte si nás průvodce řešením problémů."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/de-DE.ini Changed

@@ -13,12 +13,11 @@
 Compatibility="Multi-Adapter-Kompatibilität"
 ClientArea="Client-Bereich"
 ForceSdr="SDR erzwingen"
-SLIFix="SLI-/Crossfire-Aufnahmemodus (langsam)"
+SLIFix="SLI-/Crossfire-Aufnahmemodus (Langsam)"
 AllowTransparency="Transparenz erlauben"
 Monitor="Bildschirm"
 PrimaryMonitor="Primärbildschirm"
 Method="Aufnahmemethode"
-Method.Auto="Automatisch"
 Method.DXGI="DXGI-Desktopduplikation"
 Method.WindowsGraphicsCapture="Windows 10 (1903 und höher)"
 GameCapture="Spielaufnahme"
@@ -39,9 +38,11 @@
 Mode="Modus"
 Compatibility.GameCapture.Admin="Für %name% kann es erforderlich sein, OBS als Administrator auszuführen, um die Spieleaufnahme verwenden zu können."
 Compatibility.GameCapture.Blocked="%name% kann nicht über die Spielaufnahme aufgenommen werden. Verwenden Sie stattdessen die Fenster- oder Bildschirmaufnahme."
+Compatibility.GameCapture.Blocked.Applications="%name%-Anwendungen können nicht über die Spielaufnahme aufgenommen werden. Verwenden Sie stattdessen die Fenster- oder Bildschirmaufnahme."
+Compatibility.GameCapture.Blocked.Applications.Built="%name%-basierte Spiele können nicht über die Spielaufnahme aufgenommen werden. Verwenden Sie stattdessen die Fenster- oder Bildschirmaufnahme."
 Compatibility.GameCapture.WrongGPU="Falls die Vorschau leer ist, sollten Sie sicherstellen, dass %name% auf derselben GPU wie OBS läuft."
 Compatibility.WindowCapture.BitBlt="%name% kann möglicherweise nicht mit der ausgewählten Aufnahmemethode (BitBlt) aufgenommen werden."
-Compatibility.Application.CSGO="CS:GO erfordert möglicherweise die Startoption <code>-allow_third_party_software</code>, um die Spieleaufnahme zu verwenden."
-Compatibility.Application.ElectronGameCapture="Electron-basierte Spiele können nicht über die Spielaufnahme aufgenommen werden. Verwenden Sie stattdessen die Fenster- oder Bildschirmaufnahme."
-Compatibility.Application.ElectronBitBlt="Electron-basierte Anwendungen können möglicherweise nicht mit der ausgewählten Aufnahmemethode (BitBlt) aufgenommen werden."
+Compatibility.WindowCapture.BitBlt.Applications="%name%-Anwendungen können möglicherweise nicht mit der ausgewählten Aufnahmemethode (BitBlt) aufgenommen werden."
+Compatibility.WindowCapture.BitBlt.Applications.Based="%name%-basierte Anwendungen können möglicherweise nicht mit der ausgewählten Aufnahmemethode (BitBlt) aufgenommen werden."
+Compatibility.Application.CSGO="%name% erfordert möglicherweise die Startoption <code>-allow_third_party_software</code>, um die Spieleaufnahme zu verwenden."
 Compatibility.Application.Minecraft="Wenn Sie Probleme beim Aufnehmen von Minecraft: Java Edition haben, lesen Sie unsere Anleitung zur Fehlerbehebung."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/el-GR.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Οθόνη"
 PrimaryMonitor="Κύρια Oθόνη"
 Method="Μέθοδος Λήψης"
-Method.Auto="Αυτόματα"
 Method.DXGI="Αντιγραφή Επιφάνειας Εργασίας Dxgi"
 Method.WindowsGraphicsCapture="Windows 10 (1903 και άνω)"
 GameCapture="Καταγραφή Παιχνιδιού"
@@ -37,3 +36,13 @@
 GameCapture.HookRate.Fastest="Γρηγορότερο"
 GameCapture.Rgb10a2Space="Χρωματικός Χώρος RGB10A2"
 Mode="Τύπος"
+Compatibility.GameCapture.Admin="Το %name% ίσως να απαιτεί το OBS να εκτελείται ως διαχειριστής για να χρησιμοποιηθεί η Καταγραφή Παιχνιδιού."
+Compatibility.GameCapture.Blocked="Το %name% δεν μπορεί να καταγραφεί μέσω της Καταγραφής Παιχνιδιού. Χρησιμοποιήστε αντί αυτού Καταγραφή Παραθύρου ή Καταγραφή Οθόνης."
+Compatibility.GameCapture.Blocked.Applications="Οι εφαρμογές %name% δεν μπορούν να καταγραφούν μέσω της Καταγραφής Παιχνιδιού. Χρησιμοποιήστε αντί αυτού Καταγραφή Παραθύρου ή Καταγραφή Οθόνης."
+Compatibility.GameCapture.Blocked.Applications.Built="Τα παιχνίδια που έχουν δημιουργηθεί στο %name% δεν μπορούν να καταγραφούν μέσω της Καταγραφής Παιχνιδιού. Χρησιμοποιήστε αντί αυτού Καταγραφή Παραθύρου ή Καταγραφή Οθόνης."
+Compatibility.GameCapture.WrongGPU="Αν η προεπισκόπηση είναι κενή, βεβαιωθείτε ότι το %name% εκτελείται στην ίδια GPU με το OBS."
+Compatibility.WindowCapture.BitBlt="Το %name% ίσως να μην μπορεί να καταγραφεί με την επιλεγμένη Μέθοδο Καταγραφής (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Οι εφαρμογές %name% ενδέχεται να μην μπορούν να καταγραφούν χρησιμοποιώντας την επιλεγμένη μέθοδο λήψης (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Εφαρμογές που βασίζονται στο %name% ενδέχεται να μην μπορούν να καταγραφούν χρησιμοποιώντας την επιλεγμένη μέθοδο καταγραφής (BitBlt)."
+Compatibility.Application.CSGO="Το %name% ενδέχεται να απαιτεί την επιλογή εκκίνησης <code>-allow_third_party_software</code> για να χρησιμοποιηθεί η Καταγραφή Παιχνιδιού."
+Compatibility.Application.Minecraft="Αν έχετε προβλήματα με την καταγραφή του Minecraft: Java Edition, ελέγξτε τον οδηγό αντιμετώπισης προβλημάτων."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/en-US.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/en-US.ini Changed

@@ -41,12 +41,14 @@
 
 # Generic compatibility messages
 Compatibility.GameCapture.Admin="%name% may require OBS to be run as admin to use Game Capture."
-Compatibility.GameCapture.Blocked="%name% cannot be captured via Game Capture. Use Window Capture or Display Capture instead."
+Compatibility.GameCapture.Blocked="%name% cannot be captured using Game Capture. Use Window Capture or Display Capture instead."
+Compatibility.GameCapture.Blocked.Applications="%name% applications cannot be captured using Game Capture. Use Window Capture or Display Capture instead."
+Compatibility.GameCapture.Blocked.Applications.Built="Games built on %name% cannot be captured using Game Capture. Use Window Capture or Display Capture instead."
 Compatibility.GameCapture.WrongGPU="If the preview is blank, make sure %name% is running on the same GPU as OBS."
 Compatibility.WindowCapture.BitBlt="%name% may not be capturable using the selected Capture Method (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="%name% applications may not be capturable using the selected Capture Method (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Applications based on %name% may not be capturable using the selected Capture Method (BitBlt)."
 
 # Specific compatibility messages
-Compatibility.Application.CSGO="CS:GO may require the <code>-allow_third_party_software</code> launch option to use Game Capture."
-Compatibility.Application.ElectronGameCapture="Games built on Electron cannot be captured using Game Capture. Use Window Capture or Display Capture instead."
-Compatibility.Application.ElectronBitBlt="Electron-based applications may not be capturable using the selected Capture Method (BitBlt)."
+Compatibility.Application.CSGO="%name% may require the <code>-allow_third_party_software</code> launch option to use Game Capture."
 Compatibility.Application.Minecraft="If you're having issues capturing Minecraft: Java Edition, check our troubleshooting guide."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/es-ES.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Pantalla"
 PrimaryMonitor="Monitor principal"
 Method="Método de captura"
-Method.Auto="Automática"
 Method.DXGI="Duplicación de escritorio DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 o superior)"
 GameCapture="Captura de juego"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Espacio de color RGB10A2"
 Mode="Modo"
 Compatibility.GameCapture.Admin="%name% puede requerir que OBS se ejecute como administrador para usar la captura de juego."
-Compatibility.GameCapture.Blocked="%name% no puede ser capturado a través de la captura de juego. En su lugar, utiliza la captura de ventana o la captura de pantalla."
+Compatibility.GameCapture.Blocked="%name% no se puede capturar a través de la captura de juego. En su lugar, utilice la captura de ventana o de pantalla."
+Compatibility.GameCapture.Blocked.Applications="Las aplicaciones %name% no se pueden capturar a través de la captura de juego. En su lugar, utilice la captura de ventana o de pantalla."
+Compatibility.GameCapture.Blocked.Applications.Built="Los juegos creados con %name% no se pueden capturar a través de la captura de juegos. En su lugar, utilice la captura de ventana o de pantalla."
 Compatibility.GameCapture.WrongGPU="Si la vista previa está en blanco, asegúrate de que %name% se esté ejecutando en el misma GPU que OBS."
 Compatibility.WindowCapture.BitBlt="%name% no puede ser capturado usando el método de captura seleccionado (BitBlt)."
-Compatibility.Application.CSGO="CS:GO puede requerir la opción de lanzamiento <code>-allow_third_party_software</code> para usar la captura de juego."
-Compatibility.Application.ElectronGameCapture="Los juegos creados con Electron no pueden ser capturados a través de la captura de juegos. En su lugar, utiliza la captura de ventana o la captura de pantalla."
-Compatibility.Application.ElectronBitBlt="Es posible que las aplicaciones basadas en Electron no se puedan capturar con el método de captura seleccionado (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Es posible que las aplicaciones %name% no se puedan capturar con el método de captura seleccionado (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Es posible que las aplicaciones basadas en %name% no se puedan capturar con el método de captura seleccionado (BitBlt)."
+Compatibility.Application.CSGO="%name% puede requerir la opción de inicio <code>-allow_third_party_software</code> para usar la captura de juego."
 Compatibility.Application.Minecraft="Si tienes problemas para capturar Minecraft: Java Edition, revisa nuestra guía de solución de problemas."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/fa-IR.ini Changed

@@ -18,7 +18,6 @@
 Monitor="نمایش"
 PrimaryMonitor="نمایشگر اصلی"
 Method="روش ضبط"
-Method.Auto="خودکار"
 Method.DXGI="تکثیر دسک تاپ DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 به بالا)"
 GameCapture="ضبط بازی"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="فضای رنگی RGB10A2"
 Mode="نوع"
 Compatibility.GameCapture.Admin="%name% ممکن است به عنوان مدیر برای استفاده از ضبط بازی به عنوان سرپرست اجرا شود."
-Compatibility.GameCapture.Blocked="%name% از طریق ضبط بازی قابل ضبط نیست. به جای آن از ضبط پنجره یا ضبط صفحه استفاده کنید."
+Compatibility.GameCapture.Blocked="%name% را نمی توان با استفاده از ضبط بازی گرفت. به جای آن از ضبط پنجره یا ضبط صفحه نمایش استفاده کنید."
+Compatibility.GameCapture.Blocked.Applications="برنامه های %name% را نمی توان با استفاده از ضبط بازی ضبط کرد. به جای آن از ضبط پنجره یا ضبط صفحه نمایش استفاده کنید."
+Compatibility.GameCapture.Blocked.Applications.Built="بازی‌های ساخته شده روی %name% را نمی‌توان با استفاده از ضبط بازی ضبط کرد. به جای آن از ضبط پنجره یا ضبط صفحه نمایش استفاده کنید."
 Compatibility.GameCapture.WrongGPU="اگر پیش نمایش خالی است، اطمینان حاصل کنید که %name% در همان گرافیک به عنوان OBS اجرا می شود."
 Compatibility.WindowCapture.BitBlt="%name% ممکن است با استفاده از روش ضبط انتخاب شده (BitBlt) قابل استفاده نباشد."
-Compatibility.Application.CSGO="CS:GO ممکن است برای استفاده از ضبط بازی به گزینه راه‌اندازی <code>-allow_third_party_software</code> نیاز داشته باشد."
-Compatibility.Application.ElectronGameCapture="بازی های ساخته شده بر روی الکترون با استفاده از ضبط بازی قابل ضبط نیستند. به جای آن از ضبط پنجره یا ضبط صفحه استفاده کنید."
-Compatibility.Application.ElectronBitBlt="برنامه های مبتنی بر الکترون ممکن است با استفاده از روش ضبط انتخاب شده (BITBLT) قابل استفاده نباشند."
+Compatibility.WindowCapture.BitBlt.Applications="برنامه‌های %name% ممکن است با استفاده از روش ضبط انتخابی (BitBlt) قابل ضبط نباشند."
+Compatibility.WindowCapture.BitBlt.Applications.Based="برنامه‌های مبتنی بر %name% ممکن است با استفاده از روش ضبط انتخابی (BitBlt) قابل ضبط نباشند."
+Compatibility.Application.CSGO="%name% ممکن است <code>اجازه دادن_به_نرم‌افزار_شخص_ثالث</code> برای ضبط بازی به گزینه راه‌اندازی نیاز داشته باشد"
 Compatibility.Application.Minecraft="اگر مشکلی در ماینکرفت: نسخه جاوا ضبط دارید، راهنمای عیب یابی ما را بررسی کنید."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/fi-FI.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Monitori"
 PrimaryMonitor="Ensisijainen näyttö"
 Method="Kaappausmenetelmä"
-Method.Auto="Automaattinen"
 Method.DXGI="DXGI-työpöydän monistaminen"
 Method.WindowsGraphicsCapture="Windows 10 (1903 tai uudempi)"
 GameCapture="Pelikaappaus"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="RGB10A2-väriavaruus"
 Mode="Tila"
 Compatibility.GameCapture.Admin="%name% saattaa vaatia OBS:n avaamisen järjestelmänvalvojana Game Capture -toiminnon käyttämiseksi."
-Compatibility.GameCapture.Blocked="%name% ei voi kaapata Game Capture -kaappauksella. Käytä sen sijaan kaappausta ikkunasta tai koko näytön kaappausta."
+Compatibility.GameCapture.Blocked="%name% ei voi kaapata Game Capture:lla. Käytä sen sijaan kaappausta ikkunasta tai koko näytöstä."
+Compatibility.GameCapture.Blocked.Applications="%name% sovelluksia ei voi kaapata Game Capture:lla. Käytä sen sijaan kaappausta ikkunasta tai koko näytöstä."
+Compatibility.GameCapture.Blocked.Applications.Built="Pelejä jotka on tehty %name% ei voi kaapata Game Capture:lla. Käytä sen sijaan kaappausta ikkunasta tai koko näytöstä."
 Compatibility.GameCapture.WrongGPU="Jos esikatselu on tyhjä, varmista, että %name% käyttää samaa näytönohjainta kuin OBS."
 Compatibility.WindowCapture.BitBlt="%name% ei ehkä kaappaa valitun kaapatusmenetelmän (BitBlt) avulla."
-Compatibility.Application.CSGO="CS:GO saattaa vaatia käynnistysvalinnan <code>-allow_third_party_software</code>, jotta Game Capturea on mahdollista käyttää."
-Compatibility.Application.ElectronGameCapture="Electronilla tehtyjä pelejä ei voi kaapata Game Capturella. Käytä sen sijaan ikkunan kaappausta tai koko näytön kaappausta."
-Compatibility.Application.ElectronBitBlt="Electron-pohjaiset sovelluksia ei ehkä voi kaapata valitun kaappausmenetelmän (BitBlt) avulla."
+Compatibility.WindowCapture.BitBlt.Applications="%name% sovelluksia ei ehkä voi kaapata valitulla menetelmällä (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Sovelluksia jotka pohjautuvat %name% ei ehkä voi kaapata valitulla menetelmällä (BitBlt)."
+Compatibility.Application.CSGO="%name% saattaa vaatia <code>-allow_third_party_software</code> valinnan käynnistykseen kun käytetään Game Capturea."
 Compatibility.Application.Minecraft="Jos sinulla on ongelmia Minecraftin Java-version kaappauksessa, tarkista ohjeemme vianmääritykseen."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/fr-FR.ini Changed

@@ -18,10 +18,9 @@
 Monitor="Écran"
 PrimaryMonitor="Écran principal"
 Method="Méthode de capture"
-Method.Auto="Automatique"
 Method.DXGI="Duplication de bureau DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (versions 1903 et postérieures)"
-GameCapture="Capture de Jeu"
+GameCapture="Capture de jeu"
 GameCapture.AnyFullscreen="Capturer les applications en plein écran"
 GameCapture.CaptureWindow="Capturer une fenêtre spécifique"
 GameCapture.UseHotkey="Capturer la fenêtre au premier plan via un raccourci clavier"
@@ -31,16 +30,18 @@
 GameCapture.HotkeyStart="Capturer la fenêtre au premier plan"
 GameCapture.HotkeyStop="Arrêter la capture"
 GameCapture.HookRate="Vitesse de capture"
-GameCapture.HookRate.Slow="Lent"
+GameCapture.HookRate.Slow="Lente"
 GameCapture.HookRate.Normal="Normal (recommandé)"
 GameCapture.HookRate.Fast="Rapide"
-GameCapture.HookRate.Fastest="Le plus rapide"
+GameCapture.HookRate.Fastest="La plus rapide"
 GameCapture.Rgb10a2Space="Espace de couleurs RGB10A2"
 Compatibility.GameCapture.Admin="%name% peut nécessiter qu'OBS soit exécuté en tant qu'administrateur pour utiliser la capture de jeu."
-Compatibility.GameCapture.Blocked="%name% ne peut pas être capturé via la capture de jeu. Utilisez la capture de fenêtre ou la capture d'écran à la place."
+Compatibility.GameCapture.Blocked="%name% ne peut pas être capturé via la capture de jeu. Utilisez plutôt la capture de fenêtre ou la capture d'écran."
+Compatibility.GameCapture.Blocked.Applications="Les applications %name% ne peuvent pas être capturées via la capture de jeu. Utilisez plutôt la capture de fenêtre ou la capture d'écran."
+Compatibility.GameCapture.Blocked.Applications.Built="Les jeux créés avec %name% ne peuvent pas être capturés via la capture de jeu. Utilisez plutôt la capture de fenêtre ou la capture d'écran."
 Compatibility.GameCapture.WrongGPU="Si l'aperçu est vide, assurez-vous que %name% s'exécute sur le même GPU qu'OBS."
 Compatibility.WindowCapture.BitBlt="%name% peut ne pas être capturable en utilisant la méthode de capture sélectionnée (BitBlt)."
-Compatibility.Application.CSGO="CS:GO peut nécessiter l'option de lancement <code>-allow_third_party_software</code> pour utiliser la capture de jeu."
-Compatibility.Application.ElectronGameCapture="Les jeux créés avec Electron ne peuvent pas être capturés via la capture de jeu. Utilisez la capture de fenêtre ou la capture d'écran à la place."
-Compatibility.Application.ElectronBitBlt="Les applications basées sur Electron peuvent ne pas être capturables en utilisant la méthode de capture sélectionnée (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Les applications %name% pourraient ne pas être capturées en utilisant la méthode de capture sélectionnée (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Les applications basées sur %name% pourraient ne pas être capturées en utilisant la méthode de capture sélectionnée (BitBlt)."
+Compatibility.Application.CSGO="%name% peut nécessiter l'option de lancement <code>-allow_third_party_software</code> pour utiliser la capture de jeu."
 Compatibility.Application.Minecraft="Si vous rencontrez des problèmes pour capturer Minecraft: Édition Java, consultez notre guide de dépannage."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/he-IL.ini Changed

@@ -18,7 +18,6 @@
 Monitor="צג"
 PrimaryMonitor="צג ראשי"
 Method="שיטת הקלטה"
-Method.Auto="באופן אוטומטי"
 Method.DXGI="שכפול שולחן עבודה DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 ומעלה)"
 GameCapture="הקלטת משחקים"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="מרחב צבעים RGB10A2"
 Mode="מצב"
 Compatibility.GameCapture.Admin="%name% עשוי לדרוש מ־OBS לפעול תחת חשבון ניהולי כדי להשתמש בלכידת משחקים."
-Compatibility.GameCapture.Blocked="לא ניתן להקליט את %name% דרך הקלטת משחקים. נא להשתמש בהקלטת חלון או בהקלטת תצוגה במקום."
+Compatibility.GameCapture.Blocked="לא ניתן להקליט את %name% באמצעות הקלטת משחקים. נא להשתמש בהקלטת חלון או בהקלטת תצוגה במקום."
+Compatibility.GameCapture.Blocked.Applications="לא ניתן להקליט יישומי %name% באמצעות הקלטת משחקים. נא להשתמש בהקלטת חלון או בהקלטת תצוגה במקום."
+Compatibility.GameCapture.Blocked.Applications.Built="לא ניתן להקליט משחקים שנבנו ב־%name% דרך הקלטת משחקים. נא להשתמש בהקלטת חלון או בהקלטת תצוגה במקום."
 Compatibility.GameCapture.WrongGPU="אם התצוגה המקדימה ריקה, נא לוודא ש־%name% רץ על אותו מעבד גרפי כמו OBS."
 Compatibility.WindowCapture.BitBlt="יכול להיות שלא ניתן להקליט את %name% באמצעות שיטת ההקלטה הנבחרת (BitBlt)."
-Compatibility.Application.CSGO="CS:GO עלול לדרוש את הוספת אפשרות ההפעלה ‎<code>-allow_third_party_software</code> כדי להשתמש בהקלטת משחקים."
-Compatibility.Application.ElectronGameCapture="לא ניתן להקליט משחקים שנבנו ב־Electron דרך הקלטת משחקים. נא להשתמש בהקלטת חלון או בהקלטת תצוגה במקום."
-Compatibility.Application.ElectronBitBlt="יכול להיות שלא ניתן להקליט יישומים מבוססי Electron באמצעות שיטת ההקלטה הנבחרת (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="יכול להיות שלא ניתן להקליט יישומים מבוססי %name% באמצעות שיטת ההקלטה הנבחרת (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="יכול להיות שלא ניתן להקליט יישומים מבוססי %name% באמצעות שיטת ההקלטה הנבחרת (BitBlt)."
+Compatibility.Application.CSGO="%name% עלול לדרוש את הוספת אפשרות ההפעלה ‎<code>-allow_third_party_software</code> כדי להשתמש בהקלטת משחקים."
 Compatibility.Application.Minecraft="אם נתקלת בהפרעות בהקלטה של Minecraft: מהדורת ה־Java, כדאי לעיין במדריך פתרון הבעיות שלנו."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/hi-IN.ini Changed

@@ -18,7 +18,6 @@
 Monitor="डिस्प्ले"
 PrimaryMonitor="प्राथमिक मॉनिटर"
 Method="कैप्चर विधि"
-Method.Auto="स्वचालित"
 Method.DXGI="DXGI डेस्कटॉप प्रतिलिपि बनाना"
 Method.WindowsGraphicsCapture="Windows 10 (1903 और ऊपर)"
 GameCapture="गेम कैप्चर"
@@ -37,3 +36,13 @@
 GameCapture.HookRate.Fastest="शीघ्रतम"
 GameCapture.Rgb10a2Space="RGB10A2 रंग स्पेस"
 Mode="मोड"
+Compatibility.GameCapture.Admin="OBS में गेम कैप्चर का उपयोग करने के लिए %name% को व्यवस्थापक के रूप में चलाने के लिए की आवश्यकता हो सकती है."
+Compatibility.GameCapture.Blocked="गेम कैप्चर के माध्यम से %name% को कैप्चर नहीं किया जा सकता है. इसके बजाय विंडो कैप्चर या डिस्प्ले कैप्चर का उपयोग करें."
+Compatibility.GameCapture.Blocked.Applications="गेम कैप्चर के माध्यम से %name% को कैप्चर नहीं किया जा सकता है. इसके बजाय विंडो कैप्चर या डिस्प्ले कैप्चर का उपयोग करें."
+Compatibility.GameCapture.Blocked.Applications.Built="गेम कैप्चर का उपयोग करके %name% पर निर्मित खेलों को कैप्चर नहीं किया जा सकता है. इसके बजाय विंडो कैप्चर या डिस्प्ले कैप्चर का उपयोग करें."
+Compatibility.GameCapture.WrongGPU="यदि पूर्वावलोकन रिक्त है, तो सुनिश्चित करें कि %name% उसी GPU पर चल रहा है जिस पर OBS चल रहा है."
+Compatibility.WindowCapture.BitBlt="चयनित कैप्चर विधि (BitBlt) का उपयोग करके %name% कैप्चर करने योग्य नहीं भी हो सकता है."
+Compatibility.WindowCapture.BitBlt.Applications="चयनित कैप्चर विधि का उपयोग करके %name% ऐप्लिकेशन्स कैप्चर करने योग्य नहीं भी हो सकते हैं."
+Compatibility.WindowCapture.BitBlt.Applications.Based="चयनित कैप्चर विधि (BitBlt) का उपयोग करके %name% ऐप्लिकेशन्स कैप्चर करने योग्य नहीं भी हो सकते हैं."
+Compatibility.Application.CSGO="%name% को गेम कैप्चर का उपयोग करने के लिए <code>-allow_third_party_software</code> लॉन्च विकल्प की आवश्यकता हो सकती है."
+Compatibility.Application.Minecraft="यदि आपको Minecraft: Java संस्करण कैप्चर करने में समस्या हो रही है, तो हमारी समस्या निवारण मार्गदर्शिका देखें."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/hr-HR.ini Changed

@@ -1,13 +1,19 @@
-MonitorCapture="Prikaži ulaz"
-WindowCapture="Ulaz sa prozora"
+MonitorCapture="Snimanje ekrana"
+WindowCapture="Snimanje prozora"
 WindowCapture.Window="Prozor"
+WindowCapture.Method="Metoda snimanja"
+WindowCapture.Method.Auto="Automatski"
+WindowCapture.Method.BitBlt="BitBlt (Windows 7 i noviji)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows 10 (1903 i noviji)"
 WindowCapture.Priority="Prioritet prozora"
 CaptureCursor="Snimaj kursor"
 Compatibility="Višeadapterska kompatibilnost"
 AllowTransparency="Omogući providnost"
 Monitor="Prikaži"
 PrimaryMonitor="Primarni monitor"
-GameCapture="Ulaz sa igre"
+Method="Metoda snimanja"
+Method.WindowsGraphicsCapture="Windows 10 (1903 i noviji)"
+GameCapture="Snimanje igre"
 GameCapture.AnyFullscreen="Ulaz sa bilo koje aplikacije koja je preko celog ekrana"
 GameCapture.CaptureWindow="Snimanje određenog prozora"
 GameCapture.UseHotkey="Snimanje prozora u prvom planu sa tastaturnom prečicom"
@@ -17,4 +23,10 @@
 GameCapture.HotkeyStart="Snimanje prozora u prvom planu"
 GameCapture.HotkeyStop="Isključivanje snimanja"
 Mode="Režim"
-Compatibility.Application.CSGO="CS:GO možda će trebati postavku <code>-allow_third_party_software</code> pri pokretanju kako bi snimanje igre funkcioniralo."
+Compatibility.GameCapture.Blocked="%name% se ne može snimati metodom Snimanje igre. Upotrijebite Snimanje prozora ili Snimanje ekrana."
+Compatibility.GameCapture.Blocked.Applications="Aplikacije %name% ne mogu se snimati funkcijom Snimanje igre. Upotrijebite Snimanje prozora ili Snimanje ekrana."
+Compatibility.GameCapture.Blocked.Applications.Built="Igre izrađene u %name% ne mogu se snimati funkcijom Snimanje igre. Upotrijebite Snimanje prozora ili Snimanje ekrana."
+Compatibility.WindowCapture.BitBlt="%name% se možda neće moći snimiti izabranom metodom snimanja (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Aplikacije %name% možda se neće moći snimiti izabranom metodom snimanja (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Aplikacije temeljene na %name% možda se neće moći snimiti izabranom metodom snimanja (BitBlt)."
+Compatibility.Application.CSGO="%name% će možda trebati postavku <code>-allow_third_party_software</code> pri pokretanju kako bi snimanje igre funkcioniralo."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/hu-HU.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Kijelző"
 PrimaryMonitor="Elsődleges képernyő"
 Method="Felvétel módja"
-Method.Auto="Automatikus"
 Method.DXGI="DXGI asztaltükrözés"
 Method.WindowsGraphicsCapture="Windows 10 (1903 és újabb)"
 GameCapture="Játék felvétele"
@@ -39,9 +38,11 @@
 Mode="Mód"
 Compatibility.GameCapture.Admin="A játékfelvétel használatához a(z) %name% esetén lehet, hogy az OBS adminisztrátorként történő futtatása szükséges."
 Compatibility.GameCapture.Blocked="A(z) %name% nem vehető fel a játékfelvétel használatával. Használja helyette az Ablak felvétele vagy a Kijelző felvétele lehetőséget."
+Compatibility.GameCapture.Blocked.Applications="A(z) %name% alkalmazások nem vehetők fel a játékfelvétel használatával. Használja helyette az Ablak felvétele vagy a Kijelző felvétele lehetőséget."
+Compatibility.GameCapture.Blocked.Applications.Built="A(z) %name% technológiára épülő játékok nem vehetők fel a játékfelvétel használatával. Használja helyette az Ablak felvétele vagy a Kijelző felvétele lehetőséget."
 Compatibility.GameCapture.WrongGPU="Ha az előnézet üres, akkor győződjön meg róla, hogy a(z) %name% ugyanazon a GPU-n fut, mint az OBS."
 Compatibility.WindowCapture.BitBlt="A(z) %name% nem vehető fel a kiválasztott felvételi mód (BitBlt) használatával."
-Compatibility.Application.CSGO="A CS:GO-hoz lehet, hogy az <code>-allow_third_party_software</code> indítási kapcsoló szükséges a játékfelvétel használatához."
-Compatibility.Application.ElectronGameCapture="Az Electronra épülő játékok nem vehetők fel a játékfelvétel használatával. Használja helyette az Ablak felvétele vagy a Kijelző felvétele lehetőséget."
-Compatibility.Application.ElectronBitBlt="Az Electron-alapú alkalmazások nem vehetők fel a kiválasztott felvételi mód (BitBlt) használatával."
+Compatibility.WindowCapture.BitBlt.Applications="A(z) %name% alkalmazások nem vehetők fel a kiválasztott felvételi mód (BitBlt) használatával."
+Compatibility.WindowCapture.BitBlt.Applications.Based="A(z) %name%-alapú alkalmazások nem vehetők fel a kiválasztott felvételi mód (BitBlt) használatával."
+Compatibility.Application.CSGO="A(z) %name% számára lehet, hogy az <code>-allow_third_party_software</code> indítási kapcsoló szükséges a játékfelvétel használatához."
 Compatibility.Application.Minecraft="Ha problémái vannak a Minecraft: Java Edition felvételével, akkor nézze meg a hibaelhárítási útmutatót."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/hy-AM.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Էկրան"
 PrimaryMonitor="Առաջնային մոնիտոր"
 Method="Նկարահանման մեթոդ"
-Method.Auto="Ավտոմատ"
 Method.DXGI="DXGI աշխատասեղանի կրկնօրինակում"
 Method.WindowsGraphicsCapture="Windows 10 (1903 և ավելի բարձր)"
 GameCapture="Խաղի նկարահանումը"
@@ -38,10 +37,6 @@
 GameCapture.Rgb10a2Space="RGB10A2 գունային տարածություն"
 Mode="Գործելակերպ"
 Compatibility.GameCapture.Admin="%name%-ը կարող է պահանջել OBS՝ մեկնարկելով որպես ադմին, օգտագործելով Game Capture-ը։"
-Compatibility.GameCapture.Blocked="%name%-ը չի կարող տեսագրել Game Capture-ով։ Օգտագործեք փոխարենը Window Capture կամ Display Capture։"
 Compatibility.GameCapture.WrongGPU="Երբ նախադիտումը դատարկ է, վստայհ եղեք %name%-ը աշխատում է նույն GPU-ով ինչպես OBS-ը։"
 Compatibility.WindowCapture.BitBlt="%name%-ը կարող է չտեսագրվող լինել՝ ընտրվելով Տեսագրման մեթոդը (ԲիթԲիթ)։"
-Compatibility.Application.CSGO="CS:GO-ը կարող է հայցել <code>-allow_third_party_software</code> մեկնարկի կայանքը՝ Game Capture-ը օգտագործելու համար։"
-Compatibility.Application.ElectronGameCapture="Electron-ի կողմից ստեղծված խաղերը չեն կարող տեսագրվել Game Capture-ով։ Փոխարենը օգտագործեք Window Capture կամ Display Capture։"
-Compatibility.Application.ElectronBitBlt="Electron-ի հավելվածները կարող են չտեսագրվել ընտրված Capture Method (BitBlt)-ով։"
 Compatibility.Application.Minecraft="Երբ տեսագրում եք Minecraft․ Java Edition-ը, ստուգեք մեր շտկման ուղեցույցը։"

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/id-ID.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Tampilan"
 PrimaryMonitor="Monitor Utama"
 Method="Metode Tangkapan"
-Method.Auto="Otomatis"
 Method.DXGI="Duplikasi Desktop DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 ke atas)"
 GameCapture="Tangkapan Gim"
@@ -37,10 +36,12 @@
 GameCapture.HookRate.Fastest="Sangat cepat"
 GameCapture.Rgb10a2Space="Ruang Warna RGB10A2"
 Compatibility.GameCapture.Admin="%name% mungkin membutuhkan OBS aktif sebagai admin untuk menggunakan Tangkapan Gim."
-Compatibility.GameCapture.Blocked="%name% tidak dapat ditangkap melalui Tangkapan Gim. Sebagai gantinya, gunakan Tangkapan Jendela atau Tangkapan Layar."
+Compatibility.GameCapture.Blocked="%name% tidak dapat ditangkap menggunakan Tangkapan Gim. Sebagai gantinya, gunakan Tangkapan Jendela atau Tangkapan Layar."
+Compatibility.GameCapture.Blocked.Applications="Aplikasi %name% tidak dapat ditangkap menggunakan Tangkapan Gim. Sebagai gantinya, gunakan Tangkapan Jendela atau Tangkapan Layar."
+Compatibility.GameCapture.Blocked.Applications.Built="Gim yang dibangun dengan %name% tidak dapat ditangkap menggunakan Tangkapan Gim. Sebagai gantinya, gunakan Tangkapan Jendela atau Tangkapan Layar."
 Compatibility.GameCapture.WrongGPU="Jika pratinjau nya kosong, pastikan %name% aktif pada GPU yang sama dengan OBS."
 Compatibility.WindowCapture.BitBlt="%name% mungkin tidak dapat ditangkap menggunakan Metode Tangkapan yang dipilih (BitBlt)."
-Compatibility.Application.CSGO="CS:GO mungkin membutuhkan opsi perintah peluncuran <code>-allow_third_party_software</code> untuk menggunakan Tangkapan Gim."
-Compatibility.Application.ElectronGameCapture="Gim yang dibangun dengan Electron tidak dapat ditangkap menggunakan Tangkapan Gim. Sebagai gantinya, gunakan Tangkapan Jendela atau Tangkapan Layar."
-Compatibility.Application.ElectronBitBlt="Aplikasi yang berbasis Electron mungkin tidak dapat ditangkap menggunakan Metode Tangkapan yang dipilih (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Aplikasi %name% mungkin tidak dapat bisa ditangkap menggunakan Metode Tangkapan yang dipilih (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Aplikasi yang dibangun dengan %name% mungkin tidak dapat bisa ditangkap menggunakan Metode Tangkapan yang dipilih (BitBlt)."
+Compatibility.Application.CSGO="%name% mungkin membutuhkan opsi peluncuran <code>-allow_third_party_software</code> untuk menggunakan Tangkapan Gim."
 Compatibility.Application.Minecraft="Jika Anda mempunyai kendala saat menangkap Minecraft: Java Edition, periksa panduan pemecahan masalah kami."

obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/it-IT.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Schermo"
 PrimaryMonitor="Schermo Principale"
 Method="Metodo di acquisizione"
-Method.Auto="Automatico"
 Method.DXGI="Duplicazione Desktop DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 e superiore)"
 GameCapture="Cattura gioco"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Spazio colore RGB10A2"
 Mode="Modalità"
 Compatibility.GameCapture.Admin="%name% potrebbe richiedere che OBS sia eseguito come amministratore per utilizzare Cattura Gioco"
-Compatibility.GameCapture.Blocked="%name% non può essere catturato tramite Game Capture. Utilizza invece Cattura Finestra o Cattura Schermo."
+Compatibility.GameCapture.Blocked="'%name%' non può essere catturato tramite 'Cattura gioco'. Usa invece 'Cattura finestra' o 'Cattura schermo'."
+Compatibility.GameCapture.Blocked.Applications="%name% applicazioni non possono essere catturate tramite 'Cattura gioco'; usa invece 'Cattura finestra' o 'Cattura schermo'."
+Compatibility.GameCapture.Blocked.Applications.Built="I giochi creati con '%name%' non possono essere catturati usando 'Cattura gioco'; usa invece 'Cattura finestra' o 'Cattura schermo'."
 Compatibility.GameCapture.WrongGPU="Se l'anteprima è vuota, assicurati che %name% sia in esecuzione sulla stessa GPU di OBS."
 Compatibility.WindowCapture.BitBlt="%name% potrebbe non essere catturabile usando il metodo di acquisizione selezionato (BitBlt)."
-Compatibility.Application.CSGO="Per usare Game Capture CS:GO può richiedere l'opzione di esecuzione <code>-allow_third_party_software</code>."
-Compatibility.Application.ElectronGameCapture="I giochi costruiti su Electron non possono essere catturati utilizzando Cattura Gioco. Utilizza invece Cattura Finestra o Cattura Schermo."
-Compatibility.Application.ElectronBitBlt="Le applicazioni basate su dispositivi elettronici potrebbero non essere catturabili utilizzando il metodo di acquisizione selezionato (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="'%name%' potrebbe non essere catturabile usando il metodo di acquisizione selezionato (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Le applicazioni basate su ì%name%ì potrebbero non essere catturabili usando il metodo di acquisizione selezionato (BitBlt)."
+Compatibility.Application.CSGO="'%name%' per usare 'Cattura gioco' potrebbe richiedere l'opzione di avvio <code>--allow_third_party_software</code> ."
 Compatibility.Application.Minecraft="Se hai problemi a catturare Minecraft: Java Edition, controlla la nostra guida per la risoluzione dei problemi."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ja-JP.ini Changed

@@ -18,7 +18,6 @@
 Monitor="画面"
 PrimaryMonitor="プライマリモニター"
 Method="キャプチャ方法"
-Method.Auto="自動"
 Method.DXGI="DXGI デスクトップ複製"
 Method.WindowsGraphicsCapture="Windows 10 (1903以降)"
 GameCapture="ゲームキャプチャ"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="RGB10A2 色空間"
 Mode="モード"
 Compatibility.GameCapture.Admin="%name% は ゲームキャプチャ を使用するためにOBSを管理者として実行する必要がある場合があります。"
-Compatibility.GameCapture.Blocked="%name% は ゲームキャプチャ でキャプチャできません。 代わりに ウィンドウキャプチャ または 画面キャプチャ を使用してください。"
+Compatibility.GameCapture.Blocked="%name% はゲームキャプチャを使用してキャプチャできません。 代わりにウィンドウキャプチャまたは画面キャプチャを使用してください。"
+Compatibility.GameCapture.Blocked.Applications="%name% アプリケーションはゲームキャプチャを使用してキャプチャできません。 代わりにウィンドウキャプチャまたは画面キャプチャを使用してください。"
+Compatibility.GameCapture.Blocked.Applications.Built="%name% で構築されたゲームはゲームキャプチャを使用してキャプチャできません。 代わりにウィンドウ キャプチャまたは画面キャプチャを使用してください。"
 Compatibility.GameCapture.WrongGPU="プレビューが空白の場合は、%name% がOBSと同じGPUで実行されていることを確認してください。"
 Compatibility.WindowCapture.BitBlt="%name% は選択したキャプチャ方法 (BitBlt) を使用してキャプチャできない場合があります。"
-Compatibility.Application.CSGO="CS:GO でゲームキャプチャを使用するには <code>-allow_third_party_software</code> 起動オプションが必要になる場合があります。"
-Compatibility.Application.ElectronGameCapture="Electron で作られたゲームは ゲームキャプチャ を使用してキャプチャすることはできません。 代わりに ウィンドウキャプチャ または 画面キャプチャ を使用してください。"
-Compatibility.Application.ElectronBitBlt="Electron ベースのアプリケーションは選択したキャプチャ方法 (BitBlt) を使用してキャプチャできない場合があります。"
+Compatibility.WindowCapture.BitBlt.Applications="%name% アプリケーションは選択したキャプチャ方法 (BitBlt) を使用してキャプチャできない可能性があります。"
+Compatibility.WindowCapture.BitBlt.Applications.Based="%name% に基づくアプリケーションは選択したキャプチャ方法 (BitBlt) を使用してキャプチャできない可能性があります。"
+Compatibility.Application.CSGO="%name% でゲームキャプチャを使用するには <code>-allow_third_party_software</code> 起動オプションが必要な場合があります。"
 Compatibility.Application.Minecraft="Minecraft: Java Edition のキャプチャに問題がある場合は、トラブルシューティングガイドを確認してください。"

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ka-GE.ini Changed

@@ -18,7 +18,6 @@
 Monitor="ეკრანი"
 PrimaryMonitor="ძირითადი მონიტორი"
 Method="გადაღების მეთოდი"
-Method.Auto="თვითშერჩევა"
 Method.DXGI="DXGI-ეკრანის გაორმაგება"
 Method.WindowsGraphicsCapture="Windows 10 (1903 და ზემოთ)"
 GameCapture="თამაშის გადაღება"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="RGB10A2-ფერთა არე"
 Mode="რეჟიმი"
 Compatibility.GameCapture.Admin="%name% შეიძლება მოითხოვდეს OBS-ის ადმინისტრატორად გაშვება თამაშის გადაღების გამოსაყენებლად."
-Compatibility.GameCapture.Blocked="%name% ვერ აღიბეჭდება თამაშის გადაღების საშუალებით. ამის ნაცვლად გამოიყენეთ ფანჯრის გადაღება ან ეკრანის გადაღება."
+Compatibility.GameCapture.Blocked="%name% ვერ აღიბეჭდება თამაშის გადაღებით. სანაცვლოდ გამოიყენეთ ფანჯრის გადაღება ან ეკრანის გადაღება."
+Compatibility.GameCapture.Blocked.Applications="%name% პროგრამები ვერ აღიბეჭდება თამაშის გადაღებით. სანაცვლოდ გამოიყენეთ ფანჯრის გადაღება ან ეკრანის გადაღება."
+Compatibility.GameCapture.Blocked.Applications.Built="თამაშები, რომელთა შემადგენელია %name%, ვერ აღიბეჭდება თამაშების გადაღებით. სანაცვლოდ გამოიყენეთ ფანჯრის გადაღება ან ეკრანის გადაღება."
 Compatibility.GameCapture.WrongGPU="თუ შეთვალიერებისას ეკრანი ცარიელია, დარწმუნდით, რომ %name% გაშვებულია იმავე GPU-თი, რომლითაც OBS."
 Compatibility.WindowCapture.BitBlt="%name% შეიძლება არ იყოს გადაღებული არჩეული გადაღების მეთოდის გამოყენებით (BitBlt)."
-Compatibility.Application.CSGO="CS:GO-მ შეიძლება მოითხოვოს <code>-allow_third_party_software</code> გაშვების ვარიანტი თამაშის გადაღების გამოსაყენებლად."
-Compatibility.Application.ElectronGameCapture="Electron-ზე აგებული თამაშების გადაღება შეუძლებელია თამაშის გადაღების გამოყენებით. ამის ნაცვლად გამოიყენეთ ფანჯრის გადაღება ან ეკრანის გადაღება."
-Compatibility.Application.ElectronBitBlt="Electron-გარსით აგებული აპლიკაციების გადასაღებად შეიძლება არ გამოდგეს შერჩეული მეთოდი (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="%name% შემადგენლის მქონე პროგრამების გადასაღებად შეიძლება არ გამოდგეს შერჩეული საშუალება (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="%name% შემადგენლის მქონე პროგრამების გადასაღებად შეიძლება არ გამოდგეს შერჩეული საშუალება (BitBlt)."
+Compatibility.Application.CSGO="%name% შეიძლება საჭიროებდეს <code>-allow_third_party_software</code> ბრძანების დართვას გაშვებისას, რომ იმუშაოს თამაშის გადაღებამ."
 Compatibility.Application.Minecraft="თუ პრობლემები გაქვთ Minecraft: Java Edition-ის გადაღებისას, შეამოწმეთ ჩვენი პრობლემების მოგვარების სახელმძღვანელო."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/kmr-TR.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Dîmender"
 PrimaryMonitor="Dîmendera seretayî"
 Method="Awayê girtinê"
-Method.Auto="Bixweber"
 Method.DXGI="Dubarekirina sermaseya DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 û jor)"
 GameCapture="Girtina lîstikê"
@@ -38,10 +37,6 @@
 GameCapture.Rgb10a2Space="Valahiya rengê RGB10A2"
 Mode="Awa"
 Compatibility.GameCapture.Admin="%name% dibe ku pêdivî hebe ku OBS wekî rêveber were xebitandin bo bikaranîna girtina lîskê."
-Compatibility.GameCapture.Blocked="%name% nikare bi riya girtina lîskê bigire. Şûna wê girtina çarçoveyê yan jî girtina dîmenderê bi kar bîne."
 Compatibility.GameCapture.WrongGPU="Ku pêşdîtin vala be, pê ewle be ku %name% li ser heman GPU dixebite wekî OBS."
 Compatibility.WindowCapture.BitBlt="%name% dibe ku nikare be bi riya karanîna rêbaza girtinê ya hilbijartî (BitBlt) girtinê pêk bîne."
-Compatibility.Application.CSGO="CS:GO dibe ku pêdivî bi destpêkirina <code>-allow_third_party_software</code> bi girtina lîskê were bikaranîn."
-Compatibility.Application.ElectronGameCapture="Lîskên ku li ser bingeha Electron hatine çêkirin, bi riya karanîna girtina lîskê nayê girtin. Li şûna wê girtina çarçoveyê yan jî girtina dîmenderê bi kar bîne."
-Compatibility.Application.ElectronBitBlt="Lîskên ku li ser bingeha Electron hatine çêkirin dibe ku nikare be bi riya karanîna rêbaza girtinê ya hilbijartî (BitBlt) girtinê pêk bîne."
 Compatibility.Application.Minecraft="Ku di girtina Minecraft de pirsgirêk hebe: Java Edition, rêbernameya me ya çareserkirina pirsgirêkan kontrol bike."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ko-KR.ini Changed

@@ -18,7 +18,6 @@
 Monitor="디스플레이"
 PrimaryMonitor="주 모니터"
 Method="캡쳐 방식"
-Method.Auto="자동"
 Method.DXGI="DXGI 데스크탑 복사"
 Method.WindowsGraphicsCapture="Windows 10 (1903 이상)"
 GameCapture="게임 캡쳐"
@@ -39,9 +38,11 @@
 Mode="방식"
 Compatibility.GameCapture.Admin="%name%은(는) 게임 캡처를 사용하기 위해 OBS를 관리자 권한으로 실행해야 할 수 있습니다."
 Compatibility.GameCapture.Blocked="%name%은(는) 게임 캡처를 통해 캡처할 수 없습니다. 창 캡처 혹은 디스플레이 캡처를 사용하십시오."
+Compatibility.GameCapture.Blocked.Applications="%name% 응용 프로그램은 게임 캡처를 통해 캡처할 수 없습니다. 창 캡처 혹은 디스플레이 캡처를 사용하십시오."
+Compatibility.GameCapture.Blocked.Applications.Built="%name% 기반 게임은 게임 캡처를 통해 캡처할 수 없습니다. 창 캡처 혹은 디스플레이 캡처를 사용하십시오."
 Compatibility.GameCapture.WrongGPU="미리 보기가 비어 있다면 %name%이(가) OBS와 동일한 GPU상에서 실행되고 있는지 확인하십시오."
 Compatibility.WindowCapture.BitBlt="선택한 캡처 방법(BitBlt)을 사용하여 %name%을(를) 캡처할 수 없습니다."
-Compatibility.Application.CSGO="CS:GO는 게임 캡처를 사용하기 위해 <code>-allow_third_party_software</code> 실행 옵션이 필요할 수 있습니다."
-Compatibility.Application.ElectronGameCapture="Electron에 기반을 둔 게임은 게임 캡처를 사용하여 캡처할 수 없습니다. 창 캡처 혹은 디스플레이 캡처를 사용하십시오."
-Compatibility.Application.ElectronBitBlt="Electron 기반 애플리케이션은 선택된 캡처 방법(BitBlt)을 사용하여 캡처할 수 없습니다."
+Compatibility.WindowCapture.BitBlt.Applications="%name% 애플리케이션은 선택된 캡처 방법(BitBlt)을 사용하여 캡처할 수 없습니다."
+Compatibility.WindowCapture.BitBlt.Applications.Based="%name% 기반 애플리케이션은 선택된 캡처 방법(BitBlt)을 사용하여 캡처할 수 없습니다."
+Compatibility.Application.CSGO="%name%의 경우 게임 캡처를 사용하기 위해 <code>-allow_third_party_software</code> 실행 옵션이 필요할 수 있습니다."
 Compatibility.Application.Minecraft="Minecraft: Java 버전을 캡처하는 데 문제가 있는 경우 문제 해결 가이드를 참조하십시오."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/lt-LT.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/lt-LT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ms-MY.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Paparan"
 PrimaryMonitor="Pemantau Utama"
 Method="Kaedah Tangkap"
-Method.Auto="Automatik"
 Method.DXGI="Duplikasi Atas Meja DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 dan ke atas)"
 GameCapture="Tangkap Permainan"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Ruang Warna RGB10A2"
 Mode="Mod"
 Compatibility.GameCapture.Admin="%name% mungkin memerlukan OBS dijalankan sebagai admin untuk menggunakan Game Capture."
-Compatibility.GameCapture.Blocked="%name% tidak dapat dirakam melalui Game Capture. Sila gunakan Window Capture atau Display Capture."
+Compatibility.GameCapture.Blocked="%name% tidak dapat dirakam melalui Game Capture. Sila gunakan Window Capture atau Display Capture sebagai ganti."
+Compatibility.GameCapture.Blocked.Applications="Aplikasi %name% tidak dapat dirakam melalui Game Capture. Sila gunakan Window Capture atau Display Capture sebagai ganti."
+Compatibility.GameCapture.Blocked.Applications.Built="Permainan terbina-dalam %name% tidak dapat dirakam melalui Game Capture. Sila gunakan Window Capture atau Display Capture sebagai ganti."
 Compatibility.GameCapture.WrongGPU="Jika pratonton kosong, pastikan %name% berjalan pada GPU yang sama seperti OBS."
 Compatibility.WindowCapture.BitBlt="%name% mungkin tidak dapat dirakam menggunakan kaedah Capture Method (BitBlt) yang dilipih."
-Compatibility.Application.CSGO="CS:GO mungkin memerlukan <code>-allow_third_party_software</code> pilihan pelancaran untuk menggunakan Game Capture."
-Compatibility.Application.ElectronGameCapture="Permainan yang dibina pada Electron tidak dapat dirakam menggunakan Game Capture. Sila gunakan Window Capture atau Display Capture."
-Compatibility.Application.ElectronBitBlt="Aplikasi berasaskan elektron mungkin tidak boleh ditangkap menggunakan Capture Method (BitBlt) yang dipilih."
+Compatibility.WindowCapture.BitBlt.Applications="Aplikasi %name% mungkin tidak dapat dirakam menggunakan Kaedah Tangkapan (BitBlt) terpilih."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Aplikasi berasaskan %name% mungkin tidak dapat dirakam menggunakan Kaedah Tangkapan (BitBlt) terpilih."
+Compatibility.Application.CSGO="%name% mungkin memerlukan pilihan pelancaraj <code>-allow_third_party_software</code> supaya dapat menggunakan Game Capture."
 Compatibility.Application.Minecraft="Jika anda mengalami masalah merakam Minecraft: Jave Edition, sila semak panduan penyelesaian masalah kami."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/nl-NL.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Beeldscherm"
 PrimaryMonitor="Primaire Monitor"
 Method="Opnamemethode"
-Method.Auto="Automatisch"
 Method.DXGI="DXGI-Desktopduplicatie"
 Method.WindowsGraphicsCapture="Windows 10 (1903 en hoger)"
 GameCapture.AnyFullscreen="Capture elke full-screen applicatie"
@@ -36,10 +35,12 @@
 GameCapture.Rgb10a2Space="RGB10A2 Kleurruimte"
 Mode="Modus"
 Compatibility.GameCapture.Admin="%name% vereist mogelijk dat OBS wordt uitgevoerd als admin om Game Capture te gebruiken."
-Compatibility.GameCapture.Blocked="%name% kan niet worden opgenomen via Game Capture. Gebruik in plaats daarvan Window Capture of Scherm Capture."
+Compatibility.GameCapture.Blocked="%name% kan niet worden opgenomen met Game Capture. Gebruik in plaats daarvan Window Capture of Scherm Capture."
+Compatibility.GameCapture.Blocked.Applications="%name% applicaties kan niet worden opgenomen met Game Capture. Gebruik in plaats daarvan Window Capture of Scherm Capture."
+Compatibility.GameCapture.Blocked.Applications.Built="Spellen die op %name% zijn gebouwd, kunnen niet worden opgenomen met behulp van Game Capture. Gebruik in plaats daarvan Window Capture of Scherm Capture."
 Compatibility.GameCapture.WrongGPU="Als het voorbeeld leeg is, zorg er dan voor dat %name% op dezelfde GPU als OBS wordt uitgevoerd."
 Compatibility.WindowCapture.BitBlt="%name% kan mogelijk niet opgenomen worden met de geselecteerde opnamemethode (BitBlt)."
-Compatibility.Application.CSGO="CS:GO heeft mogelijk de optie <code>-allow_third_party_software</code> nodig om Game Capture te gebruiken."
-Compatibility.Application.ElectronGameCapture="Spellen die op Electron zijn gebouwd, kunnen niet worden opgenomen met behulp van Game Capture. Gebruik in plaats daarvan Window Capture of Scherm Capture."
-Compatibility.Application.ElectronBitBlt="Electron-gebaseerde applicaties kunnen mogelijk niet opgenomen worden met de geselecteerde opnamemethode (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="%name% applicaties kunnen mogelijk niet opgenomen worden met de geselecteerde opnamemethode (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Applicaties gebaseerd op %name% kunnen mogelijk niet opgenomen worden met de geselecteerde opnamemethode (BitBlt)."
+Compatibility.Application.CSGO="%name% heeft mogelijk de optie <code>-allow_third_party_software</code> nodig om Game Capture te gebruiken."
 Compatibility.Application.Minecraft="Als je problemen ondervindt bij het opnemen van Minecraft: Java Edition, bekijk dan onze handleiding voor probleemoplossing."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/nn-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/nn-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/pl-PL.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Ekran"
 PrimaryMonitor="Monitor główny"
 Method="Metoda przechwytywania"
-Method.Auto="Automatyczna"
 Method.DXGI="Duplikacja pulpitu DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 i nowsze)"
 GameCapture="Przechwytywanie gry"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Przestrzeń kolorów RGB10A2"
 Mode="Tryb"
 Compatibility.GameCapture.Admin="%name% może wymagać uruchomienia OBS jako administrator, aby przechwytywanie gry działo poprawnie."
-Compatibility.GameCapture.Blocked="Nie można przechwycić %name% za pomocą przechwytywania gry. Zamiast tego użyj przechwytywania okien lub przechwytywania ekranu."
+Compatibility.GameCapture.Blocked="Nie można przechwycić %name% przy pomocy Przechwytywania gry. Użyj Przechwytywania okna lub Przechwytywania obrazu."
+Compatibility.GameCapture.Blocked.Applications="Aplikacje %name% nie mogę być przechwytywane przy pomocy Przechwytywania gry. Użyj Przechwytywania okna lub Przechwytywania obrazu."
+Compatibility.GameCapture.Blocked.Applications.Built="Gry zbudowane na %name% nie mogą być przechwytywane przy pomocy Przechwytywania gry. Użyj Przechwytywania okna lub Przechwytywania obrazu."
 Compatibility.GameCapture.WrongGPU="Jeśli podgląd jest pusty, upewnij się, że %name% działa na tej samej karcie graficznej co OBS."
 Compatibility.WindowCapture.BitBlt="%name% może nie być przechwycony przy użyciu wybranej metody przechwytywania (BitBlt)."
-Compatibility.Application.CSGO="CS:GO może wymagać uruchomienia z parametrem <code>-allow_third_party_software</code> aby użyć przechwytywania gry."
-Compatibility.Application.ElectronGameCapture="Gry oparte na silniku Electron nie mogą być przechwycone przy pomocy przechwytywania gry. Należy użyć przechwytywania okna lub wyświetlacza."
-Compatibility.Application.ElectronBitBlt="Aplikacje oparte na silniku Electron mogą nie być możliwe do przechwycenia wybraną metodą (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Aplikacje %name% nie mogą być przechwytywane przy pomocy wybranej metody przechwytywania (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Aplikacje oparte na %name% mogą nie być przechwytywane przy pomocy wybranej metody przechwytywania (BitBlt)."
+Compatibility.Application.CSGO="%name% może wymagać uruchomienia z parametrem <code>-allow_third_party_software</code> aby użyć przechwytywania gry."
 Compatibility.Application.Minecraft="Jeśli masz problemy z przechwytywaniem Minecraft: Java Edition, sprawdź nasz poradnik rozwiązywania problemów."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/pt-BR.ini Changed

@@ -18,30 +18,31 @@
 Monitor="Monitor"
 PrimaryMonitor="Monitor principal"
 Method="Método de captura"
-Method.Auto="Automático"
-Method.DXGI="Duplicação de Área de Trabalho DXGI"
+Method.DXGI="Duplicação da área de trabalho DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 ou superior)"
 GameCapture="Captura de jogo"
 GameCapture.AnyFullscreen="Capturar qualquer aplicação em tela cheia"
 GameCapture.CaptureWindow="Capturar janela específica"
-GameCapture.UseHotkey="Capturar janela de primeiro plano com a tecla de atalho"
+GameCapture.UseHotkey="Capturar janela em primeiro plano com a tecla de atalho"
 GameCapture.LimitFramerate="Limitar taxa de quadros da captura"
-GameCapture.CaptureOverlays="Capturar overlays de terceiros (tais como as do Steam)"
-GameCapture.AntiCheatHook="Utilizar hook de compatibilidade de anticheat"
-GameCapture.HotkeyStart="Capturar janela de primeiro plano"
+GameCapture.CaptureOverlays="Capturar sobreposições de terceiros (ex.: Steam Overlay)"
+GameCapture.AntiCheatHook="Utilizar hook de compatibilidade de anti-cheat"
+GameCapture.HotkeyStart="Capturar janela em primeiro plano"
 GameCapture.HotkeyStop="Desativar a captura"
-GameCapture.HookRate="Taxa de Hook"
+GameCapture.HookRate="Taxa de captura"
 GameCapture.HookRate.Slow="Devagar"
 GameCapture.HookRate.Normal="Normal (recomendado)"
 GameCapture.HookRate.Fast="Rápida"
 GameCapture.HookRate.Fastest="Super-rápida"
-GameCapture.Rgb10a2Space="Espaço de cor RGB10A2"
+GameCapture.Rgb10a2Space="Espaço de cores RGB10A2"
 Mode="Modo"
-Compatibility.GameCapture.Admin="%name% Pode exigir que o OBS seja executado como administrador para usar a Captura de Jogo."
-Compatibility.GameCapture.Blocked="%name% Não pode ser capturado através da Captura de Jogo. Use Captura de Janela ou Captura de Exibição."
-Compatibility.GameCapture.WrongGPU="Se o “preview” estiver em branco, certifique-se de que %name% está em execução na mesma GPU que o OBS."
-Compatibility.WindowCapture.BitBlt="%name% pode não ser capturável usando o Método de Captura selecionado (BitBlt)."
-Compatibility.Application.CSGO="CS:GO pode exigir a opção de lançamento <code>-allow_third_party_software</code> para usar a Captura de Jogo."
-Compatibility.Application.ElectronGameCapture="Jogos em Eléctron não podem ser capturados usando Captura de Jogo. Use Captura de Janela ou Captura de Exibição no lugar."
-Compatibility.Application.ElectronBitBlt="Aplicativos baseados no Electron podem não ser capturáveis usando o Método de Captura selecionado (BitBlt)."
-Compatibility.Application.Minecraft="Se você está tendo problemas para capturar o Minecraft: Java Ditionito, verifique nosso guia de solução de problemas."
+Compatibility.GameCapture.Admin="%name% pode exigir que o OBS seja executado como administrador para usar a captura de jogo."
+Compatibility.GameCapture.Blocked="%name% não pode ser capturado através da captura de jogo. Use captura de janela ou captura de tela."
+Compatibility.GameCapture.Blocked.Applications="%name% não pode ser capturado através da captura de jogo. Use captura de janela ou captura de tela."
+Compatibility.GameCapture.Blocked.Applications.Built="Jogos em %name% não podem ser capturados usando o método de captura de jogo. Em vez disso, use captura de janela ou captura de tela."
+Compatibility.GameCapture.WrongGPU="Se a pré-visualização estiver vazia, certifique-se de que %name% está em execução na mesma GPU que o OBS."
+Compatibility.WindowCapture.BitBlt="%name% pode não ser capturável usando o método de captura selecionado (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="%name% pode não ser capturável usando o método de captura selecionado (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="%name% pode não ser capturável usando o método de captura selecionado (BitBlt)."
+Compatibility.Application.CSGO="%name% requer habilitar a opção <code>-allow_third_party_software</code> nas opções de inicialização para usar a captura de jogo."
+Compatibility.Application.Minecraft="Se você está tendo problemas para capturar Minecraft: Java Edition, verifique nosso guia de solução de problemas."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/pt-PT.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Ecrã"
 PrimaryMonitor="Monitor principal"
 Method="Método de captura"
-Method.Auto="Automático"
 Method.DXGI="Duplicação do ambiente DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 ou superior)"
 GameCapture="Captura de jogo"
@@ -38,5 +37,12 @@
 GameCapture.Rgb10a2Space="Espaço de cor RGB10A2"
 Mode="Modo"
 Compatibility.GameCapture.Admin="%name% pode implicar que o OBS seja executado como administrador para poder usar o modo Captura de jogo."
-Compatibility.GameCapture.Blocked="%name% não pode ser capturado via captura de Jogo. Em alternativa, use captura de janela ou captura de visualização."
-Compatibility.Application.CSGO="CS:GO pode implicar a opção de lançamento de <code>-allow_third_party_software</code> para usar o modo Captura de jogo."
+Compatibility.GameCapture.Blocked="%name% não pode ser capturado através do modo de captura de jogo. Em alternativa, use captura de janela ou captura de visualização."
+Compatibility.GameCapture.Blocked.Applications="Aplicações %name% não podem ser capturadas através do modo de captura de jogo. Em alternativa, use captura de janela ou captura de visualização."
+Compatibility.GameCapture.Blocked.Applications.Built="Jogos criados em %name% não podem ser capturados com o modo de captura de Jogo. Em alternativa, use o modo de captura de janela ou captura de visualização."
+Compatibility.GameCapture.WrongGPU="Se a pré-visualização estiver em branco, verifique se %name% está a funcionar na mesma GPU que o OBS"
+Compatibility.WindowCapture.BitBlt="%name% podem não ser capturáveis com o modo de captura selecionado (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Aplicações %name% podem não ser capturáveis usando o modo de captura selecionado (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Aplicações baseadas em %name% podem não ser capturáveis usando o modo de captura selecionado (BitBlt)."
+Compatibility.Application.CSGO="%name% pode implicar a opção de lançamento de <code>-allow_third_party_software</code> para usar o modo de captura de jogo."
+Compatibility.Application.Minecraft="Se estiver com problemas a capturar Minecraft Java Edition, verifique o nosso guia de solução de problemas."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ro-RO.ini Changed

@@ -17,7 +17,6 @@
 AllowTransparency="Permite transparență"
 PrimaryMonitor="Monitor principal"
 Method="Metodă de captură"
-Method.Auto="Automat"
 Method.DXGI="Duplicare desktop DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 și superior)"
 GameCapture="Captură de joc"
@@ -37,10 +36,6 @@
 GameCapture.Rgb10a2Space="Spațiu de culoare RGB10A2"
 Mode="Mod"
 Compatibility.GameCapture.Admin="%name% poate să necesite ca OBS să fie rulat ca administrator pentru a utiliza captura de joc."
-Compatibility.GameCapture.Blocked="%name% nu poate fi capturat prin intermediul capturei de joc. Folosiți în schimb captura de fereastră sau captura de display."
 Compatibility.GameCapture.WrongGPU="Dacă previzualizarea este goală, asigurați-vă că %name% rulează pe același GPU ca OBS."
 Compatibility.WindowCapture.BitBlt="%name% este posibil să nu poată fi capturat cu ajutorul metodei de captură selectate (BitBlt)."
-Compatibility.Application.CSGO="CS:GO poate necesita opțiunea de lansare <code>-allow_third_party_software</code> pentru a utiliza captura de joc."
-Compatibility.Application.ElectronGameCapture="Jocurile construite pe electron nu pot fi capturate cu ajutorul capturei de joc. Utilizați în schimb captura de fereastră sau captura de display."
-Compatibility.Application.ElectronBitBlt="Este posibil ca aplicațiile bazate pe electron să nu poată fi capturate utilizând metoda de captură selectată (BitBlt)."
 Compatibility.Application.Minecraft="Dacă aveți probleme cu capturarea Minecraft: Java Edition, consultați ghidul nostru de depanare."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ru-RU.ini Changed

@@ -10,7 +10,7 @@
 WindowCapture.Priority.Class="Сравнивать заголовок, в противном случае найти окно того же типа"
 WindowCapture.Priority.Exe="Сравнивать заголовок, в противном случае найти окно того же исполняемого файла"
 CaptureCursor="Захватывать курсор"
-Compatibility="Совместимость с мульти-адаптером"
+Compatibility="Совместимость с мультиадаптером"
 ClientArea="Область клиента"
 ForceSdr="Использовать SDR принудительно"
 SLIFix="Режим захвата SLI/Crossfire (Медленно)"
@@ -18,7 +18,6 @@
 Monitor="Экран"
 PrimaryMonitor="Основной монитор"
 Method="Метод захвата"
-Method.Auto="Автоматический"
 Method.DXGI="Копия рабочего стола DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 и выше)"
 GameCapture="Захват игры"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Цветное пространство RGB10A2"
 Mode="Режим"
 Compatibility.GameCapture.Admin="%name% может потребовать запуска OBS с правами администратора для использования захвата игры."
-Compatibility.GameCapture.Blocked="%name% нельзя захватить с помощью захвата игры. Вместо этого используйте захват окна или экрана."
-Compatibility.GameCapture.WrongGPU="Если предпросмотр пуст, убедитесь, что %name% работает на том же ГП, что и OBS."
+Compatibility.GameCapture.Blocked="%name% нельзя захватить используя захвата игры. Вместо этого используйте захват окна или экрана."
+Compatibility.GameCapture.Blocked.Applications="Приложения %name% нельзя захватить используя захвата игры. Вместо этого используйте захват окна или экрана."
+Compatibility.GameCapture.Blocked.Applications.Built="Игры на базе %name% нельзя захватить с помощью захвата игры. Вместо этого используйте захват окна или экрана."
+Compatibility.GameCapture.WrongGPU="Если предпросмотр пуст, убедитесь, что %name% работает на той же видеокарте, что и OBS."
 Compatibility.WindowCapture.BitBlt="Захват %name% может не состояться при выбранного метода захвата (BitBlt)."
-Compatibility.Application.CSGO="CS:GO может потребовать параметр запуска <code>-allow_third_party_software</code> для использования захвата игры."
-Compatibility.Application.ElectronGameCapture="Игры на базе Electron нельзя захватить с помощью захвата игры. Вместо этого используйте захват окна или экрана."
-Compatibility.Application.ElectronBitBlt="Захват приложений на базе Electron может не состояться для выбранного метода захвата (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Захват приложений на базе %name% может не состояться для выбранного метода захвата (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Захват приложений на базе %name% может не состояться для выбранного метода захвата (BitBlt)."
+Compatibility.Application.CSGO="%name% может потребовать параметр запуска <code>-allow_third_party_software</code> для использования захвата игры."
 Compatibility.Application.Minecraft="Если у вас возникли проблемы с захватом Minecraft: Java Edition, обратитесь к нашему руководству по устранению неполадок."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/si-LK.ini Changed

@@ -1,5 +1,7 @@
 MonitorCapture="දර්ශකය ග්‍රහණය"
+WindowCapture="කවුළුව ග්‍රහණය"
 WindowCapture.Window="කවුළුව"
+WindowCapture.Method="ග්‍රහණ ක්‍රමය"
 WindowCapture.Method.Auto="ස්වයංක්‍රීය"
 WindowCapture.Method.WindowsGraphicsCapture="වින්ඩෝස් 10 (1903 සහ +)"
 CaptureCursor="ඊතලය ග්‍රහණය"
@@ -7,10 +9,16 @@
 AllowTransparency="විනිවිදභාවයට ඉඩ දෙන්න"
 Monitor="දර්ශකය"
 PrimaryMonitor="ප්‍රාථමික තිරය"
-Method.Auto="ස්වයංක්‍රීය"
 Method.WindowsGraphicsCapture="වින්ඩෝස් 10 (1903 සහ +)"
+GameCapture="ක්‍රීඩාවක් ග්‍රහණය"
+GameCapture.AnyFullscreen="ඕනෑම පූර්ණ තිර යෙදුමක් ග්‍රහණය කරන්න"
+GameCapture.CaptureWindow="නිශ්චිත කවුළුවක් ග්‍රහණය කරන්න"
+GameCapture.UseHotkey="කෙටිමඟකින් පෙරබිමෙහි කවුළුව ග්‍රහණය කරන්න"
+GameCapture.HotkeyStart="පෙරබිමෙහි කවුළුවක් ග්‍රහණය"
+GameCapture.HotkeyStop="ග්‍රහණය අක්‍රිය කරන්න"
 GameCapture.HookRate.Slow="සෙමින්"
 GameCapture.HookRate.Normal="සාමාන්‍ය (නිර්දේශිත)"
 GameCapture.HookRate.Fast="වේගයෙන්"
 GameCapture.HookRate.Fastest="ඉතා වේගයෙන්"
-Mode="ආකාරය"
+GameCapture.Rgb10a2Space="RGB10A2 වර්ණ අවකාශය"
+Mode="ප්‍රකාරය"

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/sk-SK.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Monitor"
 PrimaryMonitor="Primárny monitor"
 Method="Metóda zachytenia"
-Method.Auto="Automaticky"
 Method.DXGI="DXGI Duplikácia plochy"
 Method.WindowsGraphicsCapture="Windows 10 (1903 a vyššie)"
 GameCapture="Zachytávanie hry"
@@ -39,9 +38,11 @@
 Mode="Mód"
 Compatibility.GameCapture.Admin="%name% môže vyžadovať aby bolo OBS spustené po administrátorom aby ste mohli použiť Zachytávanie hry."
 Compatibility.GameCapture.Blocked="%name% nemôže byť zachytené cez Zachytávanie hry. Použite Zachytávanie okna alebo Zachytávanie monitora."
+Compatibility.GameCapture.Blocked.Applications="%name% aplikácie nemôžu byť zachytené cez Zachytávanie hry. Použite Zachytávanie okna alebo Zachytávanie monitora."
+Compatibility.GameCapture.Blocked.Applications.Built="Hry postavené na %name% nemôžu byť zachytené použitím 'Zachytávanie hry'. Použite Zachytávanie okna alebo Zachytávanie monitora."
 Compatibility.GameCapture.WrongGPU="Ak je náhľad prázdny, uistite sa, že %name% beží na rovnakom GPU ako OBS."
 Compatibility.WindowCapture.BitBlt="%name% nemusí byť zachytávateľné použitím vybranej zachytávacej metódy (BitBlt)."
-Compatibility.Application.CSGO="CS:GO môže vyžadovať spúšťaciu možnosť <code>-allow_third_party_software</code> pre použitie 'Zachytávanie hry'."
-Compatibility.Application.ElectronGameCapture="Hry postavené na Electron-e nemôžu byť zachytené použitím 'Zachytávanie hry'. Použite Zachytávanie okna alebo Zachytávanie monitora."
-Compatibility.Application.ElectronBitBlt="Electron-ové aplikácie nemusia byť zachytávateľné použitím vybranej zachytávacej metódy (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="%name% aplikácie nemusia byť zachytávateľné použitím vybranej zachytávacej metódy (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Aplikácie postavené na %name% nemusia byť zachytávateľné použitím vybranej zachytávacej metódy (BitBlt)."
+Compatibility.Application.CSGO="%name% môže vyžadovať spúšťaciu možnosť <code>-allow_third_party_software</code> pre použitie 'Zachytávanie hry'."
 Compatibility.Application.Minecraft="Ak máte problémy so zachytením Minecraft: Java Edition, pozrite si našu príručku na riešenie problémov."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/sl-SI.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Zaslon"
 PrimaryMonitor="Glavni monitor"
 Method="Način zajemanja"
-Method.Auto="Samodejno"
 Method.DXGI="DXGI podvajanje namizja"
 Method.WindowsGraphicsCapture="Windows 10 (1903 in več)"
 GameCapture="Zajemanje igre"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Barvni prostor RGB10A2"
 Mode="Način"
 Compatibility.GameCapture.Admin="%name% morda zahteva OBS v izvajanju pod skrbniškim računom, da lahko uporabite zajem igre."
-Compatibility.GameCapture.Blocked="%name% ni možno zajemati z zajemom iger. Namesto tega uporabite zajem okna ali zaslona."
+Compatibility.GameCapture.Blocked="%name% ni možno zajemati z uporabo zajema iger. Namesto tega uporabite zajem okna ali zaslona."
+Compatibility.GameCapture.Blocked.Applications="Programov %name% ni možno zajemati z uporabo zajema iger. Namesto tega uporabite zajem okna ali zaslona."
+Compatibility.GameCapture.Blocked.Applications.Built="Iger, zgrajenih na %name%, ni možno zajemati z uporabo zajema iger. Namesto tega uporabite zajem okna ali zaslona."
 Compatibility.GameCapture.WrongGPU="Če je predogled prazen, preverite, da %name% teče na istem GPE kot OBS."
 Compatibility.WindowCapture.BitBlt="%name% morda ni možno zajeti prek izbrane metode zajema (BitBlt)."
-Compatibility.Application.CSGO="CS:GO morda potrebuje <code>-dovoljenje za zagon naznane programske opreme</code> za zajemanje iger."
-Compatibility.Application.ElectronGameCapture="Iger, zgrajenih na Electronu, ni možno zajemati z zajemom iger. Namesto tega uporabite zajem okna ali zaslona."
-Compatibility.Application.ElectronBitBlt="Programov na osnovi Electrona morda ni mogoče zajeti z izbrano metodo zajema (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Programov %name% morda ni mogoče zajeti z izbrano metodo zajemanja (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Programov na osnovi %name% morda ni mogoče zajeti z izbrano metodo zajemanja (BitBlt)."
+Compatibility.Application.CSGO="%name% morda potrebuje <code>-dovoljenje za zagon naznane programske opreme</code> za zajemanje iger."
 Compatibility.Application.Minecraft="Če imate težave pri zajemanju Minecraft: Java Edition, preverite vodnik za reševanje težav."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/sv-SE.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Bildskärm"
 PrimaryMonitor="Primära bildskärmen"
 Method="Uppfångstmetod"
-Method.Auto="Automatisk"
 Method.DXGI="DXGI-skrivbordsduplicering"
 Method.WindowsGraphicsCapture="Windows 10 (1903 och senare)"
 GameCapture="Spelintagning"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="RGB10A2-färgrymd"
 Mode="Läge"
 Compatibility.GameCapture.Admin="%name% kan kräva att OBS körs som administratör för att använda spelkälla."
-Compatibility.GameCapture.Blocked="%name% kan inte fångas via spelkälla. Använd i stället fönsterkälla eller skärmkälla."
+Compatibility.GameCapture.Blocked="%name% kan inte fångas med spelkälla. Använd i stället fönsterkälla eller skärmkälla."
+Compatibility.GameCapture.Blocked.Applications="%name%-applikationer kan inte fångas med spelkälla. Använd i stället fönsterkälla eller skärmkälla."
+Compatibility.GameCapture.Blocked.Applications.Built="Spel som byggs på %name% kan inte fångas med hjälp av spelkälla. Använd i stället fönsterkälla eller skärmkälla."
 Compatibility.GameCapture.WrongGPU="Se till att %name% körs på samma grafikprocessor som OBS om förhandsgranskningen är tom."
 Compatibility.WindowCapture.BitBlt="%name% kanske inte kan fångas med hjälp av den valda källan (BitBlt)."
-Compatibility.Application.CSGO="CS:GO kanske kräver startalternativet <code>-allow_third_party_software</code> för att använda spelkälla."
-Compatibility.Application.ElectronGameCapture="Spel som byggs på Electron kan inte fångas med hjälp av spelkälla. Använd i stället fönsterkälla eller skärmkälla."
-Compatibility.Application.ElectronBitBlt="Electron-baserade applikationer kanske inte kan fångas med hjälp av den valda källan (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="%name%-applikationer kanske inte kan fångas med hjälp av den valda källan (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="%name%-baserade applikationer kanske inte kan fångas med hjälp av den valda källan (BitBlt)."
+Compatibility.Application.CSGO="%name% kanske kräver startalternativet <code>-allow_third_party_software</code> för att använda spelkälla."
 Compatibility.Application.Minecraft="Se vår felsökningsguide om du har problem med att fånga Minecraft: Java Edition."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/ta-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/tr-TR.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Görüntü"
 PrimaryMonitor="Birincil Ekran"
 Method="Yakalama Yöntemi"
-Method.Auto="Otomatik"
 Method.DXGI="DXGI Masaüstü Çoğaltma"
 Method.WindowsGraphicsCapture="Windows 10 (1903 ve üstü)"
 GameCapture="Oyun Yakalama"
@@ -39,9 +38,11 @@
 Mode="Mod"
 Compatibility.GameCapture.Admin="%name% Oyun Yakalamanın kullanılabilmesi için OBS'in yönetici olarak çalıştırılmasını gerektirebilir"
 Compatibility.GameCapture.Blocked="%name% Oyun Yakalama kullanılarak yakalanamaz. Pencere Yakalama veya Ekran Yakalama kullanın."
+Compatibility.GameCapture.Blocked.Applications="%name% uygulamaları Oyun Yakalama kullanılarak yakalanamaz. Pencere Yakalama veya Ekran Yakalama kullanın."
+Compatibility.GameCapture.Blocked.Applications.Built="%name% üzerine kurulu oyunlar Oyun Yakalama kullanılarak yakalanamaz. Bunun yerine Pencere Yakalama veya Ekran Yakalama kullanın."
 Compatibility.GameCapture.WrongGPU="Eğer önizleme boş ise %name% ile OBS'in aynı ekran kartında çalıştığına emin olun."
 Compatibility.WindowCapture.BitBlt="%name% seçilen Yakalama Metodu ile yakalanamayabilir (BitBlt)."
-Compatibility.Application.CSGO="CS:GO, Oyun Yakalamayı kullanmak için <code>-allow_third_party_software</code> başlatma seçeneğini gerektirebilir."
-Compatibility.Application.ElectronGameCapture="Electron üzerine kurulu oyunlar Oyun Yakalama kullanılarak yakalanamaz. Bunun yerine Pencere Yakalama veya Ekran Yakalama kullanın."
-Compatibility.Application.ElectronBitBlt="Electron bazlı uygulamalar seçilen Yakalama Metodu ile yakalanamayabilir (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="%name% uygulamaları seçilen Yakalama Metodu ile yakalanamayabilir (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="%name% tabanlı uygulamalar seçilen Yakalama Metodu ile yakalanamayabilir (BitBlt)."
+Compatibility.Application.CSGO="%name%, Oyun Yakalamayı kullanmak için <code>-allow_third_party_software</code> başlatma seçeneğini gerektirebilir."
 Compatibility.Application.Minecraft="Minecraft: Java Edition'ı yakalamada problem yaşıyorsanız sorun giderme kılavuzumuza göz atın."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/uk-UA.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Дисплей"
 PrimaryMonitor="Основний монітор"
 Method="Метод захоплення"
-Method.Auto="Автоматично"
 Method.DXGI="Дублювання стільниці DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 і вище)"
 GameCapture="Захоплення гри"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Колірний простір RGB10A2"
 Mode="Режим"
 Compatibility.GameCapture.Admin="%name% може вимагати запуску OBS від імені адміністратора для використання Захоплення гри."
-Compatibility.GameCapture.Blocked="%name% не можна захопити за допомогою Захоплення гри. Замість цього скористайтеся захопленням вікна або захопленням екрана."
+Compatibility.GameCapture.Blocked="%name% не можна захопити використовуючи Захоплення гри. Замість цього скористайтеся захопленням вікна або захопленням екрана."
+Compatibility.GameCapture.Blocked.Applications="Застосунки %name% не можна захопити використовуючи Захоплення гри. Замість цього скористайтеся захопленням вікна або захопленням екрана."
+Compatibility.GameCapture.Blocked.Applications.Built="Ігри, створені на %name%, не можуть бути захоплені за допомогою Захоплення гри. Замість цього використовуйте Захоплення вікна або Захоплення дисплея."
 Compatibility.GameCapture.WrongGPU="Якщо попередній перегляд порожній, переконайтеся, що %name% запущено на тому самому GPU, що й OBS."
 Compatibility.WindowCapture.BitBlt="%name% не може бути застосований з використанням обраного методу захоплення (BitBlt)."
-Compatibility.Application.CSGO="CS:GO може знадобитися параметр <code>-allow_third_party_software</code> для використання Захоплення гри."
-Compatibility.Application.ElectronGameCapture="Ігри, створені на Electron, не можуть бути захоплені за допомогою Захоплення гри. Замість цього використовуйте Захоплення вікна або Захоплення дисплея."
-Compatibility.Application.ElectronBitBlt="Застосунки на основі Electron можуть не використовувати обраний метод Захоплення (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Застосунки %name% можуть не використовувати обраний метод Захоплення (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Застосунки на основі %name% можуть не захоплюватися використовувати вибраний метод Захоплення (BitBlt)."
+Compatibility.Application.CSGO="%name% може знадобитися параметр <code>-allow_third_party_software</code> для використання Захоплення гри."
 Compatibility.Application.Minecraft="Якщо у вас виникли проблеми із захопленням Minecraft: Java Edition, перегляньте наш посібник з усунення несправностей."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/vi-VN.ini Changed

@@ -18,7 +18,6 @@
 Monitor="Hiển thị"
 PrimaryMonitor="Màn hình chính"
 Method="Phương pháp chụp"
-Method.Auto="Tự động"
 Method.DXGI="Sao chép desktop DXGI"
 Method.WindowsGraphicsCapture="Windows 10 (1903 trở lên)"
 GameCapture="Quay trò chơi"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="Không gian màu RGB10A2"
 Mode="Chế độ"
 Compatibility.GameCapture.Admin="%name% có thể yêu cầu chạy OBS với tư cách quản trị viên để sử dụng Quay trò chơi."
-Compatibility.GameCapture.Blocked="Không thể quay %name% qua Quay trò chơi. Thay vào đó, hãy sử dụng Quay cửa sổ hoặc Quay màn hình."
+Compatibility.GameCapture.Blocked="Không thể quay %name% bằng Quay trò chơi. Thay vào đó, hãy sử dụng Quay cửa sổ hoặc Quay màn hình."
+Compatibility.GameCapture.Blocked.Applications="Không thể quay chương trình %name% bằng Quay trò chơi. Thay vào đó, hãy sử dụng Quay cửa sổ hoặc Quay màn hình."
+Compatibility.GameCapture.Blocked.Applications.Built="Không thể quay các trò chơi được xây dựng trên %name% bằng Quay trò chơi. Thay vào đó, hãy sử dụng Quay cửa sổ hoặc Quay màn hình."
 Compatibility.GameCapture.WrongGPU="Nếu bản xem trước trống, hãy đảm bảo %name% đang chạy trên cùng một GPU với OBS."
 Compatibility.WindowCapture.BitBlt="%name% có thể không chụp được bằng Phương pháp chụp đã chọn (BitBlt)."
-Compatibility.Application.CSGO="CS:GO có thể yêu cầu tùy chọn khởi chạy <code>-allow_third_party_software</code> để sử dụng Quay trò chơi."
-Compatibility.Application.ElectronGameCapture="Không thể quay các trò chơi được xây dựng trên Electron bằng Quay trò chơi. Thay vào đó, hãy sử dụng Quay cửa sổ hoặc Quay màn hình."
-Compatibility.Application.ElectronBitBlt="Các ứng dụng dựa trên Electron có thể không bắt được bằng Phương thức chụp đã chọn (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications="Các ứng dụng dựa trên %name% có thể không quay được bằng Phương thức quay đã chọn (BitBlt)."
+Compatibility.WindowCapture.BitBlt.Applications.Based="Các ứng dụng dựa trên %name% có thể không quay được bằng Phương thức quay đã chọn (BitBlt)."
+Compatibility.Application.CSGO="%name% có thể yêu cầu tùy chọn khởi chạy <code>-allow_third_party_software</code> để sử dụng Quay trò chơi."
 Compatibility.Application.Minecraft="Nếu bạn gặp sự cố khi quay Minecraft: Java Edition, hãy xem hướng dẫn khắc phục sự cố của chúng tôi."

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/zh-CN.ini Changed

@@ -4,23 +4,22 @@
 WindowCapture.Method="采集方式"
 WindowCapture.Method.Auto="自动"
 WindowCapture.Method.BitBlt="BitBlt (Windows 7 或更新版本)"
-WindowCapture.Method.WindowsGraphicsCapture="Windows 10 (1903及以上版本)"
+WindowCapture.Method.WindowsGraphicsCapture="Windows 10 (1903或更新版本)"
 WindowCapture.Priority="窗口匹配优先级"
 WindowCapture.Priority.Title="窗口标题必须匹配"
 WindowCapture.Priority.Class="匹配标题，否则查找相同类型的窗口"
 WindowCapture.Priority.Exe="匹配标题，否则查找相同可执行程序的窗口"
 CaptureCursor="显示鼠标指针"
-Compatibility="多显示器的兼容性"
-ClientArea="客户端区域"
-ForceSdr="强制使用 SDR"
-SLIFix="SLI/交火采集模式 (慢)"
+Compatibility="多显示器兼容"
+ClientArea="无边框模式"
+ForceSdr="强制使用标准动态范围（SDR）"
+SLIFix="SLI / 交火 (Crossfire) 采集模式 (慢)"
 AllowTransparency="允许窗口透明"
 Monitor="显示器"
 PrimaryMonitor="主显示器"
 Method="采集方式"
-Method.Auto="自动"
 Method.DXGI="DXGI截屏"
-Method.WindowsGraphicsCapture="Windows 10 (1903及以上版本)"
+Method.WindowsGraphicsCapture="Windows 10 (1903或更新版本)"
 GameCapture="游戏采集"
 GameCapture.AnyFullscreen="采集全屏应用程序"
 GameCapture.CaptureWindow="采集特定窗口"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="RGB10A2 色彩空间"
 Mode="模式"
 Compatibility.GameCapture.Admin="%name% 可能需要以管理员身份运行 OBS 才能使用游戏采集。"
-Compatibility.GameCapture.Blocked="%name% 无法被游戏采集捕获，请改用窗口采集或显示器采集。"
+Compatibility.GameCapture.Blocked="%name% 无法通过游戏采集捕获，请改用窗口采集或显示器采集。"
+Compatibility.GameCapture.Blocked.Applications="%name% 程序无法使用游戏采集，请改用窗口采集或显示器采集。"
+Compatibility.GameCapture.Blocked.Applications.Built="基于 %name% 编译的游戏无法使用游戏采集，请改用窗口采集或显示器采集。"
 Compatibility.GameCapture.WrongGPU="如果预览显示空白，请确保 %name% 与 OBS 运行在相同的 GPU 里。"
-Compatibility.WindowCapture.BitBlt="使用选定的 BitBlt 采集方式可能无法捕获 %name%。"
-Compatibility.Application.CSGO="CS:GO 可能需要添加 <code>-allow_third_party_software</code> 启动项才能使用游戏采集。"
-Compatibility.Application.ElectronGameCapture="基于 Electron 的游戏无法被游戏采集捕获，请改用窗口采集或显示器采集。"
-Compatibility.Application.ElectronBitBlt="使用选定的 BitBlt 采集方式可能无法捕获基于 Electron 的应用程序。"
+Compatibility.WindowCapture.BitBlt="使用选定的采集方式（BitBlt）可能无法捕获 %name%。"
+Compatibility.WindowCapture.BitBlt.Applications="使用选定的采集方式（BitBlt）可能无法捕获 %name% 程序。"
+Compatibility.WindowCapture.BitBlt.Applications.Based="使用选定的采集方式（BitBlt）可能无法捕获基于 %name% 的应用程序。"
+Compatibility.Application.CSGO="%name% 可能需要添加 <code>-allow_third_party_software</code> 启动选项才能使用游戏采集。"
 Compatibility.Application.Minecraft="如果您在捕获 Minecraft：Java 版时遇到问题，请查看我们的故障排除指南。"

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/locale/zh-TW.ini Changed

@@ -18,7 +18,6 @@
 Monitor="顯示器"
 PrimaryMonitor="主顯示器"
 Method="擷取方式"
-Method.Auto="自動"
 Method.DXGI="DXGI 桌面複製"
 Method.WindowsGraphicsCapture="Windows 10（1903 或更新版本）"
 GameCapture="遊戲擷取"
@@ -38,10 +37,12 @@
 GameCapture.Rgb10a2Space="RGB10A2 色彩空間"
 Mode="模式"
 Compatibility.GameCapture.Admin="%name% 可能需要 OBS 以管理員權限執行，才能使用遊戲擷取。"
-Compatibility.GameCapture.Blocked="%name% 無法使用「遊戲擷取」擷取。請改用視窗擷取或顯示器擷取。"
+Compatibility.GameCapture.Blocked="無法用「遊戲擷取」功能來擷取 %name%。請選擇「視窗擷取」或「顯示器擷取」作為替代。"
+Compatibility.GameCapture.Blocked.Applications="基於 %name% 的應用程式不能透過「遊戲擷取」來擷取畫面。請選擇「視窗擷取」或「顯示器擷取」。"
+Compatibility.GameCapture.Blocked.Applications.Built="由 %name% 架構打造的遊戲，無法用「遊戲擷取」來錄影。建議使用「視窗擷取」或「顯示器擷取」。"
 Compatibility.GameCapture.WrongGPU="如果預覽是空白的，請確認執行 %name% 的 GPU 和 OBS 擷取的相同。"
 Compatibility.WindowCapture.BitBlt="%name% 可能無法使用指定的擷取方式 (BitBlt) 擷取。"
-Compatibility.Application.CSGO="CS:GO 可能需要 <code>-allow_third_party_software</code> 啟動選項，才能使用遊戲擷取。"
-Compatibility.Application.ElectronGameCapture="使用 Electron 建構的遊戲不能使用「遊戲擷取」擷取。請改用視窗擷取或顯示器擷取。"
-Compatibility.Application.ElectronBitBlt="使用 Electron 建構的應用程式可能無法使用指定的擷取方式 (BitBlt) 擷取。"
+Compatibility.WindowCapture.BitBlt.Applications="%name% 應用程式可能不支援您選擇的擷取方法（BitBlt）。"
+Compatibility.WindowCapture.BitBlt.Applications.Based="以 %name% 為基底開發的應用程式，有可能無法用選定的「BitBlt」方式擷取。"
+Compatibility.Application.CSGO="若要成功使用「遊戲擷取」功能，%name% 可能需要加上 <code>-allow_third_party_software</code> 的啟動參數。"
 Compatibility.Application.Minecraft="如果擷取 Minecraft: Java Edition 時遇到問題，請查閱我們的排錯指南。"

obs-studio-29.1.3.tar.xz/plugins/win-capture/data/package.json -> obs-studio-30.0.2.tar.xz/plugins/win-capture/data/package.json Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/duplicator-monitor-capture.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/duplicator-monitor-capture.c Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/game-capture.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/game-capture.c Changed

@@ -366,6 +366,16 @@
 	if (gc->active)
 		info("capture stopped");
 
+	// if it was previously capturing, send an unhooked signal
+	if (gc->capturing) {
+		signal_handler_t *sh =
+			obs_source_get_signal_handler(gc->source);
+		calldata_t data = {0};
+		calldata_set_ptr(&data, "source", gc->source);
+		signal_handler_signal(sh, "unhooked", &data);
+		calldata_free(&data);
+	}
+
 	gc->copy_texture = NULL;
 	gc->wait_for_target_startup = false;
 	gc->active = false;
@@ -518,6 +528,25 @@
 	return true;
 }
 
+static void game_capture_get_hooked(void *data, calldata_t *cd)
+{
+	struct game_capture *gc = data;
+	if (!gc)
+		return;
+
+	calldata_set_bool(cd, "hooked", gc->capturing);
+
+	if (gc->capturing) {
+		calldata_set_string(cd, "title", gc->title.array);
+		calldata_set_string(cd, "class", gc->class.array);
+		calldata_set_string(cd, "executable", gc->executable.array);
+	} else {
+		calldata_set_string(cd, "title", "");
+		calldata_set_string(cd, "class", "");
+		calldata_set_string(cd, "executable", "");
+	}
+}
+
 static void game_capture_update(void *data, obs_data_t *settings)
 {
 	struct game_capture *gc = data;
@@ -610,6 +639,18 @@
 		}
 	}
 
+	signal_handler_t *sh = obs_source_get_signal_handler(source);
+	signal_handler_add(sh, "void unhooked(ptr source)");
+	signal_handler_add(
+		sh,
+		"void hooked(ptr source, string title, string class, string executable)");
+
+	proc_handler_t *ph = obs_source_get_proc_handler(source);
+	proc_handler_add(
+		ph,
+		"void get_hooked(out bool hooked, out string title, out string class, out string executable)",
+		game_capture_get_hooked, gc);
+
 	game_capture_update(gc, settings);
 	return gc;
 }
@@ -1850,6 +1891,26 @@
 		else
 			debug("init_capture_data failed");
 
+		// If capture was successful, send a hooked signal
+		if (gc->capturing) {
+			if (gc->config.mode == CAPTURE_MODE_ANY) {
+				ms_get_window_exe(&gc->executable, gc->window);
+				ms_get_window_title(&gc->title, gc->window);
+				ms_get_window_class(&gc->class, gc->window);
+			}
+			signal_handler_t *sh =
+				obs_source_get_signal_handler(gc->source);
+			calldata_t data = {0};
+
+			calldata_set_ptr(&data, "source", gc->source);
+			calldata_set_string(&data, "title", gc->title.array);
+			calldata_set_string(&data, "class", gc->class.array);
+			calldata_set_string(&data, "executable",
+					    gc->executable.array);
+
+			signal_handler_signal(sh, "hooked", &data);
+			calldata_free(&data);
+		}
 		if (result != CAPTURE_RETRY && !gc->capturing) {
 			gc->retry_interval =
 				ERROR_RETRY_INTERVAL *

obs-studio-29.1.3.tar.xz/plugins/win-capture/get-graphics-offsets/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/CMakeLists.txt Changed

@@ -1,30 +1,22 @@
-project(get-graphics-offsets)
+cmake_minimum_required(VERSION 3.24...3.25)
 
-add_executable(get-graphics-offsets)
+add_library(_get-graphics-offsets INTERFACE)
+target_sources(_get-graphics-offsets INTERFACE d3d8-offsets.cpp d3d9-offsets.cpp dxgi-offsets.cpp
+ get-graphics-offsets.c get-graphics-offsets.h)
 
-target_sources(
- get-graphics-offsets
- PRIVATE get-graphics-offsets.c
- get-graphics-offsets.h
- dxgi-offsets.cpp
- d3d8-offsets.cpp
- d3d9-offsets.cpp
- ../graphics-hook-info.h
- ../hook-helpers.h)
+target_compile_options(_get-graphics-offsets INTERFACE $<IF:$<CONFIG:Debug>,/MTd,/MT>)
 
-target_include_directories(get-graphics-offsets PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
+target_link_libraries(_get-graphics-offsets INTERFACE OBS::hook-config OBS::d3d8-api d3d9.lib dxgi.lib d3d11.lib)
 
-target_link_libraries(get-graphics-offsets d3d9.lib dxgi.lib d3d11.lib)
+legacy_check()
 
-if(MSVC)
- target_compile_options(get-graphics-offsets PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
-endif()
+add_executable(get-graphics-offsets)
+target_link_libraries(get-graphics-offsets PRIVATE _get-graphics-offsets)
 
-set_target_properties(get-graphics-offsets PROPERTIES FOLDER "plugins/win-capture")
-set_target_properties(get-graphics-offsets
- PROPERTIES OUTPUT_NAME "get-graphics-offsets$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
+include(cmake/32bit.cmake)
 
-set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
-setup_plugin_target(get-graphics-offsets)
+# cmake-format: off
+set_target_properties_obs(get-graphics-offsets PROPERTIES FOLDER plugins/win-capture OUTPUT_NAME get-graphics-offsets64)
+# cmake-format: on
 
 add_dependencies(win-capture get-graphics-offsets)

obs-studio-30.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/cmake/32bit-build.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/cmake/32bit.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/cmake/legacy.cmake Added

@@ -0,0 +1,33 @@
+project(get-graphics-offsets)
+
+add_executable(get-graphics-offsets)
+
+target_sources(
+ get-graphics-offsets
+ PRIVATE get-graphics-offsets.c
+ get-graphics-offsets.h
+ dxgi-offsets.cpp
+ d3d8-offsets.cpp
+ d3d9-offsets.cpp
+ ../graphics-hook-info.h
+ ../hook-helpers.h)
+
+target_include_directories(get-graphics-offsets PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..
+ ${CMAKE_CURRENT_SOURCE_DIR}/../d3d8-api)
+
+target_link_libraries(get-graphics-offsets d3d9.lib dxgi.lib d3d11.lib)
+
+target_compile_definitions(get-graphics-offsets PRIVATE OBS_LEGACY)
+
+if(MSVC)
+ target_compile_options(get-graphics-offsets PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
+endif()
+
+set_target_properties(get-graphics-offsets PROPERTIES FOLDER "plugins/win-capture")
+set_target_properties(get-graphics-offsets
+ PROPERTIES OUTPUT_NAME "get-graphics-offsets$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
+
+set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
+setup_plugin_target(get-graphics-offsets)
+
+add_dependencies(win-capture get-graphics-offsets)

obs-studio-29.1.3.tar.xz/plugins/win-capture/get-graphics-offsets/d3d8-offsets.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/d3d8-offsets.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/get-graphics-offsets/get-graphics-offsets.h -> obs-studio-30.0.2.tar.xz/plugins/win-capture/get-graphics-offsets/get-graphics-offsets.h Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook-ver.h -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook-ver.h Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/CMakeLists.txt Changed

@@ -1,57 +1,57 @@
-project(graphics-hook)
+cmake_minimum_required(VERSION 3.24...3.25)
 
 find_package(Detours REQUIRED)
 find_package(Vulkan REQUIRED)
 
-add_library(graphics-hook MODULE)
-add_library(OBS::graphics-hook ALIAS graphics-hook)
+if(NOT TARGET OBS::ipc-util)
+ add_subdirectory("${CMAKE_SOURCE_DIR}/deps/ipc-util" "${CMAKE_BINARY_DIR}/deps/ipc-util")
+endif()
 
-target_sources(
- graphics-hook
- PRIVATE graphics-hook.c
- graphics-hook.h
- gl-capture.c
- gl-decs.h
- d3d8-capture.cpp
- d3d9-capture.cpp
- d3d9-patches.hpp
- dxgi-capture.cpp
- d3d10-capture.cpp
- d3d11-capture.cpp
- d3d12-capture.cpp
- ../../../libobs/util/windows/obfuscate.c
- ../../../libobs/util/windows/obfuscate.h
- ../graphics-hook-ver.h
- ../graphics-hook-info.h
- ../hook-helpers.h
- graphics-hook.rc)
-
-target_include_directories(graphics-hook PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-target_link_libraries(graphics-hook PRIVATE OBS::ipc-util Detours::Detours dxguid)
-target_link_options(graphics-hook PRIVATE "LINKER:/IGNORE:4099")
-
-if(MSVC)
- target_compile_options(graphics-hook PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
+if(NOT TARGET OBS::obfuscate)
+ add_subdirectory("${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_BINARY_DIR}/libobs")
 endif()
 
-set_target_properties(graphics-hook PROPERTIES FOLDER "plugins/win-capture"
- OUTPUT_NAME "graphics-hook$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
+add_library(_graphics-hook INTERFACE)
 
-target_compile_definitions(graphics-hook PRIVATE COMPILE_D3D12_HOOK)
+target_sources(
+ _graphics-hook
+ INTERFACE d3d8-capture.cpp
+ d3d9-capture.cpp
+ d3d9-patches.hpp
+ d3d10-capture.cpp
+ d3d11-capture.cpp
+ d3d12-capture.cpp
+ dxgi-capture.cpp
+ gl-capture.c
+ gl-decs.h
+ graphics-hook.c
+ graphics-hook.h
+ graphics-hook.rc)
+
+target_compile_definitions(_graphics-hook INTERFACE COMPILE_D3D12_HOOK)
+target_compile_options(_graphics-hook INTERFACE $<IF:$<CONFIG:Debug>,/MTd,/MT>)
+
+target_link_libraries(_graphics-hook INTERFACE OBS::d3d8-api OBS::hook-config OBS::ipc-util OBS::obfuscate
+ Detours::Detours dxguid)
+target_link_options(_graphics-hook INTERFACE /IGNORE:4099)
 
 if(TARGET Vulkan::Vulkan)
- target_sources(graphics-hook PRIVATE vulkan-capture.c vulkan-capture.h)
+ target_sources(_graphics-hook INTERFACE vulkan-capture.c vulkan-capture.h)
+ target_link_libraries(_graphics-hook INTERFACE Vulkan::Vulkan)
+ target_compile_definitions(_graphics-hook INTERFACE COMPILE_VULKAN_HOOK)
+endif()
 
- target_link_libraries(graphics-hook PRIVATE Vulkan::Vulkan)
+legacy_check()
 
- target_compile_definitions(graphics-hook PRIVATE COMPILE_VULKAN_HOOK)
+add_library(graphics-hook MODULE)
+add_library(OBS::graphics-hook ALIAS graphics-hook)
 
- add_target_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan64.json" "obs-plugins/win-capture/")
- add_target_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan32.json" "obs-plugins/win-capture/")
-endif()
+target_link_libraries(graphics-hook PRIVATE _graphics-hook)
+
+include(cmake/32bit.cmake)
 
-set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
-setup_plugin_target(graphics-hook)
+# cmake-format: off
+set_target_properties_obs(graphics-hook PROPERTIES FOLDER "plugins/win-capture" OUTPUT_NAME graphics-hook64)
+# cmake-format: on
 
 add_dependencies(win-capture graphics-hook)

obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/cmake/32bit-build.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/cmake/32bit.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/cmake/legacy.cmake Added

@@ -0,0 +1,58 @@
+project(graphics-hook)
+
+find_package(Detours REQUIRED)
+find_package(Vulkan REQUIRED)
+
+add_library(graphics-hook MODULE)
+add_library(OBS::graphics-hook ALIAS graphics-hook)
+
+target_sources(
+ graphics-hook
+ PRIVATE graphics-hook.c
+ graphics-hook.h
+ gl-capture.c
+ gl-decs.h
+ d3d8-capture.cpp
+ d3d9-capture.cpp
+ d3d9-patches.hpp
+ dxgi-capture.cpp
+ d3d10-capture.cpp
+ d3d11-capture.cpp
+ d3d12-capture.cpp
+ ../../../libobs/util/windows/obfuscate.c
+ ../../../libobs/util/windows/obfuscate.h
+ ../graphics-hook-ver.h
+ ../graphics-hook-info.h
+ ../hook-helpers.h
+ graphics-hook.rc)
+
+target_include_directories(graphics-hook PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/libobs
+ ${CMAKE_CURRENT_SOURCE_DIR}/../d3d8-api)
+
+target_link_libraries(graphics-hook PRIVATE OBS::ipc-util Detours::Detours dxguid)
+target_link_options(graphics-hook PRIVATE "LINKER:/IGNORE:4099")
+
+if(MSVC)
+ target_compile_options(graphics-hook PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
+endif()
+
+set_target_properties(graphics-hook PROPERTIES FOLDER "plugins/win-capture"
+ OUTPUT_NAME "graphics-hook$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
+
+target_compile_definitions(graphics-hook PRIVATE COMPILE_D3D12_HOOK OBS_LEGACY)
+
+if(TARGET Vulkan::Vulkan)
+ target_sources(graphics-hook PRIVATE vulkan-capture.c vulkan-capture.h)
+
+ target_link_libraries(graphics-hook PRIVATE Vulkan::Vulkan)
+
+ target_compile_definitions(graphics-hook PRIVATE COMPILE_VULKAN_HOOK)
+
+ add_target_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan64.json" "obs-plugins/win-capture/")
+ add_target_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan32.json" "obs-plugins/win-capture/")
+endif()
+
+set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
+setup_plugin_target(graphics-hook)
+
+add_dependencies(win-capture graphics-hook)

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/d3d8-capture.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/d3d8-capture.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/gl-capture.c Changed

@@ -96,10 +96,10 @@
 
 	if (data.using_shtex) {
 		if (data.gl_dxobj)
-			jimglDXUnregisterObjectNV(data.gl_device,
+			obsglDXUnregisterObjectNV(data.gl_device,
 						  data.gl_dxobj);
 		if (data.gl_device)
-			jimglDXCloseDeviceNV(data.gl_device);
+			obsglDXCloseDeviceNV(data.gl_device);
 		if (data.texture)
 			glDeleteTextures(1, &data.texture);
 		if (data.d3d11_tex)
@@ -147,7 +147,7 @@
 
 static inline void *wgl_get_proc(const char *name)
 {
-	return (void *)jimglGetProcAddress(name);
+	return (void *)obsglGetProcAddress(name);
 }
 
 static inline void *get_proc(const char *name)
@@ -161,21 +161,21 @@
 
 static void init_nv_functions(void)
 {
-	jimglDXSetResourceShareHandleNV =
+	obsglDXSetResourceShareHandleNV =
 		get_proc("wglDXSetResourceShareHandleNV");
-	jimglDXOpenDeviceNV = get_proc("wglDXOpenDeviceNV");
-	jimglDXCloseDeviceNV = get_proc("wglDXCloseDeviceNV");
-	jimglDXRegisterObjectNV = get_proc("wglDXRegisterObjectNV");
-	jimglDXUnregisterObjectNV = get_proc("wglDXUnregisterObjectNV");
-	jimglDXObjectAccessNV = get_proc("wglDXObjectAccessNV");
-	jimglDXLockObjectsNV = get_proc("wglDXLockObjectsNV");
-	jimglDXUnlockObjectsNV = get_proc("wglDXUnlockObjectsNV");
+	obsglDXOpenDeviceNV = get_proc("wglDXOpenDeviceNV");
+	obsglDXCloseDeviceNV = get_proc("wglDXCloseDeviceNV");
+	obsglDXRegisterObjectNV = get_proc("wglDXRegisterObjectNV");
+	obsglDXUnregisterObjectNV = get_proc("wglDXUnregisterObjectNV");
+	obsglDXObjectAccessNV = get_proc("wglDXObjectAccessNV");
+	obsglDXLockObjectsNV = get_proc("wglDXLockObjectsNV");
+	obsglDXUnlockObjectsNV = get_proc("wglDXUnlockObjectsNV");
 
 	nv_capture_available =
-		!!jimglDXSetResourceShareHandleNV && !!jimglDXOpenDeviceNV &&
-		!!jimglDXCloseDeviceNV && !!jimglDXRegisterObjectNV &&
-		!!jimglDXUnregisterObjectNV && !!jimglDXObjectAccessNV &&
-		!!jimglDXLockObjectsNV && !!jimglDXUnlockObjectsNV;
+		!!obsglDXSetResourceShareHandleNV && !!obsglDXOpenDeviceNV &&
+		!!obsglDXCloseDeviceNV && !!obsglDXRegisterObjectNV &&
+		!!obsglDXUnregisterObjectNV && !!obsglDXObjectAccessNV &&
+		!!obsglDXLockObjectsNV && !!obsglDXUnlockObjectsNV;
 
 	if (nv_capture_available)
 		hlog("Shared-texture OpenGL capture available");
@@ -195,15 +195,15 @@
 {
 	bool success = true;
 
-	jimglGetProcAddress = base_get_proc("wglGetProcAddress");
-	if (!jimglGetProcAddress) {
+	obsglGetProcAddress = base_get_proc("wglGetProcAddress");
+	if (!obsglGetProcAddress) {
 		hlog("init_gl_functions: failed to get wglGetProcAddress");
 		return false;
 	}
 
-	GET_PROC(init_gl_functions, jimglMakeCurrent, wglMakeCurrent);
-	GET_PROC(init_gl_functions, jimglGetCurrentDC, wglGetCurrentDC);
-	GET_PROC(init_gl_functions, jimglGetCurrentContext,
+	GET_PROC(init_gl_functions, obsglMakeCurrent, wglMakeCurrent);
+	GET_PROC(init_gl_functions, obsglGetCurrentDC, wglGetCurrentDC);
+	GET_PROC(init_gl_functions, obsglGetCurrentContext,
 		 wglGetCurrentContext);
 	GET_PROC(init_gl_functions, glTexImage2D, glTexImage2D);
 	GET_PROC(init_gl_functions, glReadBuffer, glReadBuffer);
@@ -393,7 +393,7 @@
 
 static inline bool gl_shtex_init_gl_tex(void)
 {
-	data.gl_device = jimglDXOpenDeviceNV(data.d3d11_device);
+	data.gl_device = obsglDXOpenDeviceNV(data.d3d11_device);
 	if (!data.gl_device) {
 		hlog("gl_shtex_init_gl_tex: failed to open device");
 		return false;
@@ -404,7 +404,7 @@
 		return false;
 	}
 
-	data.gl_dxobj = jimglDXRegisterObjectNV(data.gl_device, data.d3d11_tex,
+	data.gl_dxobj = obsglDXRegisterObjectNV(data.gl_device, data.d3d11_tex,
 						data.texture, GL_TEXTURE_2D,
 						WGL_ACCESS_WRITE_DISCARD_NV);
 	if (!data.gl_dxobj) {
@@ -609,7 +609,7 @@
 	GLint last_fbo;
 	GLint last_tex;
 
-	jimglDXLockObjectsNV(data.gl_device, 1, &data.gl_dxobj);
+	obsglDXLockObjectsNV(data.gl_device, 1, &data.gl_dxobj);
 
 	glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &last_fbo);
 	if (gl_error("gl_shtex_capture", "failed to get last fbo")) {
@@ -626,7 +626,7 @@
 	glBindTexture(GL_TEXTURE_2D, last_tex);
 	glBindFramebuffer(GL_DRAW_FRAMEBUFFER, last_fbo);
 
-	jimglDXUnlockObjectsNV(data.gl_device, 1, &data.gl_dxobj);
+	obsglDXUnlockObjectsNV(data.gl_device, 1, &data.gl_dxobj);
 
 	IDXGISwapChain_Present(data.dxgi_swap, 0, 0);
 }
@@ -820,12 +820,12 @@
 static BOOL WINAPI hook_wgl_delete_context(HGLRC hrc)
 {
 	if (capture_active() && functions_initialized) {
-		HDC last_hdc = jimglGetCurrentDC();
-		HGLRC last_hrc = jimglGetCurrentContext();
+		HDC last_hdc = obsglGetCurrentDC();
+		HGLRC last_hrc = obsglGetCurrentContext();
 
-		jimglMakeCurrent(data.hdc, hrc);
+		obsglMakeCurrent(data.hdc, hrc);
 		gl_free();
-		jimglMakeCurrent(last_hdc, last_hrc);
+		obsglMakeCurrent(last_hdc, last_hrc);
 	}
 
 	return RealWglDeleteContext(hrc);

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/gl-decs.h -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/gl-decs.h Changed

@@ -127,10 +127,10 @@
 static GLDRAWBUFFERPROC glDrawBuffer = NULL;
 static GLGETINTEGERVPROC glGetIntegerv = NULL;
 static GLGETERRORPROC glGetError = NULL;
-static WGLGETPROCADDRESSPROC jimglGetProcAddress = NULL;
-static WGLMAKECURRENTPROC jimglMakeCurrent = NULL;
-static WGLGETCURRENTDCPROC jimglGetCurrentDC = NULL;
-static WGLGETCURRENTCONTEXTPROC jimglGetCurrentContext = NULL;
+static WGLGETPROCADDRESSPROC obsglGetProcAddress = NULL;
+static WGLMAKECURRENTPROC obsglMakeCurrent = NULL;
+static WGLGETCURRENTDCPROC obsglGetCurrentDC = NULL;
+static WGLGETCURRENTCONTEXTPROC obsglGetCurrentContext = NULL;
 static GLBUFFERDATAARBPROC glBufferData = NULL;
 static GLDELETEBUFFERSARBPROC glDeleteBuffers = NULL;
 static GLDELETETEXTURESPROC glDeleteTextures = NULL;
@@ -146,11 +146,11 @@
 static GLBLITFRAMEBUFFERPROC glBlitFramebuffer = NULL;
 static GLFRAMEBUFFERTEXTURE2DPROC glFramebufferTexture2D = NULL;
 
-static WGLSETRESOURCESHAREHANDLENVPROC jimglDXSetResourceShareHandleNV = NULL;
-static WGLDXOPENDEVICENVPROC jimglDXOpenDeviceNV = NULL;
-static WGLDXCLOSEDEVICENVPROC jimglDXCloseDeviceNV = NULL;
-static WGLDXREGISTEROBJECTNVPROC jimglDXRegisterObjectNV = NULL;
-static WGLDXUNREGISTEROBJECTNVPROC jimglDXUnregisterObjectNV = NULL;
-static WGLDXOBJECTACCESSNVPROC jimglDXObjectAccessNV = NULL;
-static WGLDXLOCKOBJECTSNVPROC jimglDXLockObjectsNV = NULL;
-static WGLDXUNLOCKOBJECTSNVPROC jimglDXUnlockObjectsNV = NULL;
+static WGLSETRESOURCESHAREHANDLENVPROC obsglDXSetResourceShareHandleNV = NULL;
+static WGLDXOPENDEVICENVPROC obsglDXOpenDeviceNV = NULL;
+static WGLDXCLOSEDEVICENVPROC obsglDXCloseDeviceNV = NULL;
+static WGLDXREGISTEROBJECTNVPROC obsglDXRegisterObjectNV = NULL;
+static WGLDXUNREGISTEROBJECTNVPROC obsglDXUnregisterObjectNV = NULL;
+static WGLDXOBJECTACCESSNVPROC obsglDXObjectAccessNV = NULL;
+static WGLDXLOCKOBJECTSNVPROC obsglDXLockObjectsNV = NULL;
+static WGLDXUNLOCKOBJECTSNVPROC obsglDXUnlockObjectsNV = NULL;

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.c Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.h Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.rc -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/graphics-hook.rc Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/graphics-hook/vulkan-capture.c Changed

@@ -397,7 +397,7 @@
 					 const VkAllocationCallbacks *ac)
 {
 	struct vk_swap_data *const framebuffer_data =
-		(struct vk_swap_data *)remove_obj_data(&data->swaps,
+		(struct vk_swap_data *)remove_obj_data(&data->framebuffers,
 						 (uint64_t)framebuffer);
 	vk_free(ac, framebuffer_data);
 }
@@ -1796,7 +1796,6 @@
 	if ((res == VK_SUCCESS) && (count > 0)) {
 		struct vk_swap_data *swap_data = alloc_swap_data(ac);
 		if (swap_data) {
-			init_swap_data(swap_data, data, sc);
 			swap_data->swap_images = vk_alloc(
 				ac, count * sizeof(VkImage), _Alignof(VkImage),
 				VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
@@ -1816,6 +1815,7 @@
 			swap_data->shtex_info = NULL;
 			swap_data->d3d11_tex = NULL;
 			swap_data->captured = false;
+			init_swap_data(swap_data, data, sc);
 		}
 	}
 
@@ -1826,25 +1826,22 @@
 OBS_CreateImageView(VkDevice device, const VkImageViewCreateInfo *pCreateInfo,
 		 const VkAllocationCallbacks *pAllocator, VkImageView *pView)
 {
+	bool from_swap_chain = false;
+
 	struct vk_data *const data = get_device_data(device);
-	const PFN_vkCreateImageView func = data->funcs.CreateImageView;
-	VkResult result = func(device, pCreateInfo, pAllocator, pView);
-	if (data->valid && (result == VK_SUCCESS)) {
+	if (data->valid) {
 		struct vk_swap_data *swap = swap_walk_begin(data);
 
 		while (swap) {
-			bool match = false;
 			for (uint32_t i = 0, count = swap->image_count;
 			 i < count; ++i) {
-				match = swap->swap_imagesi ==
-					pCreateInfo->image;
-				if (match)
+				from_swap_chain = swap->swap_imagesi ==
+						 pCreateInfo->image;
+				if (from_swap_chain)
 					break;
 			}
-			if (match) {
-				add_swap_view_data(data, *pView, pAllocator);
+			if (from_swap_chain)
 				break;
-			}
 
 			swap = swap_walk_next(swap);
 		}
@@ -1852,6 +1849,27 @@
 		swap_walk_end(data);
 	}
 
+	if (from_swap_chain) {
+		const void *pCurrent = pCreateInfo->pNext;
+		while (pCurrent) {
+			VkBaseInStructure baseIn;
+			memcpy(&baseIn, pCurrent, sizeof(baseIn));
+			if (baseIn.sType ==
+			 VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO) {
+				((VkImageViewUsageCreateInfo *)pCurrent)
+					->usage |=
+					VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
+				break;
+			}
+
+			pCurrent = baseIn.pNext;
+		}
+	}
+
+	const PFN_vkCreateImageView func = data->funcs.CreateImageView;
+	VkResult result = func(device, pCreateInfo, pAllocator, pView);
+	if ((result == VK_SUCCESS) && from_swap_chain)
+		add_swap_view_data(data, *pView, pAllocator);
 	return result;
 }
 
@@ -2100,8 +2118,8 @@
 {
 	struct vk_data *const data =
 		get_device_data_by_command_buffer(commandBuffer);
+	VkRenderPassBeginInfo alternateBegin;
 	if (data->valid) {
-		VkRenderPassBeginInfo alternateBegin;
 		pRenderPassBegin = process_render_pass_begin_info(
 			pRenderPassBegin, &alternateBegin, data);
 	}
@@ -2117,8 +2135,8 @@
 {
 	struct vk_data *const data =
 		get_device_data_by_command_buffer(commandBuffer);
+	VkRenderPassBeginInfo alternateBegin;
 	if (data->valid) {
-		VkRenderPassBeginInfo alternateBegin;
 		pRenderPassBegin = process_render_pass_begin_info(
 			pRenderPassBegin, &alternateBegin, data);
 	}
@@ -2134,8 +2152,8 @@
 {
 	struct vk_data *const data =
 		get_device_data_by_command_buffer(commandBuffer);
+	VkRenderPassBeginInfo alternateBegin;
 	if (data->valid) {
-		VkRenderPassBeginInfo alternateBegin;
 		pRenderPassBegin = process_render_pass_begin_info(
 			pRenderPassBegin, &alternateBegin, data);
 	}

obs-studio-29.1.3.tar.xz/plugins/win-capture/inject-helper/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/win-capture/inject-helper/CMakeLists.txt Changed

@@ -1,20 +1,23 @@
-project(inject-helper)
+cmake_minimum_required(VERSION 3.24...3.25)
 
-add_executable(inject-helper)
+if(NOT TARGET OBS::obfuscate)
+ add_subdirectory("${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_BINARY_DIR}/libobs")
+endif()
 
-target_sources(inject-helper PRIVATE inject-helper.c ../inject-library.c ../inject-library.h
- ../../../libobs/util/windows/obfuscate.c ../../../libobs/util/windows/obfuscate.h)
+add_library(_inject-helper INTERFACE)
+target_sources(_inject-helper INTERFACE inject-helper.c)
+target_compile_options(_inject-helper INTERFACE $<IF:$<CONFIG:Debug>,/MTd,/MT>)
+target_link_libraries(_inject-helper INTERFACE OBS::inject-library OBS::obfuscate)
 
-target_include_directories(inject-helper PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
+legacy_check()
 
-if(MSVC)
- target_compile_options(inject-helper PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
-endif()
+add_executable(inject-helper)
+target_link_libraries(inject-helper PRIVATE _inject-helper)
 
-set_target_properties(inject-helper PROPERTIES FOLDER "plugins/win-capture"
- OUTPUT_NAME "inject-helper$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
+include(cmake/32bit.cmake)
 
-set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
-setup_plugin_target(inject-helper)
+# cmake-format: off
+set_target_properties_obs(inject-helper PROPERTIES FOLDER plugins/win-capture OUTPUT_NAME inject-helper64)
+# cmake-format: on
 
 add_dependencies(win-capture inject-helper)

obs-studio-30.0.2.tar.xz/plugins/win-capture/inject-helper/cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/inject-helper/cmake/32bit-build.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/inject-helper/cmake/32bit.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-capture/inject-helper/cmake/legacy.cmake Added

obs-studio-29.1.3.tar.xz/plugins/win-capture/inject-helper/inject-helper.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/inject-helper/inject-helper.c Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/inject-library.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/inject-library.c Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/load-graphics-offsets.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/load-graphics-offsets.c Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/plugin-main.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/plugin-main.c Changed

obs-studio-29.1.3.tar.xz/plugins/win-capture/window-capture.c -> obs-studio-30.0.2.tar.xz/plugins/win-capture/window-capture.c Changed

@@ -4,8 +4,13 @@
 #include <util/windows/window-helpers.h>
 #include "dc-capture.h"
 #include "compat-helpers.h"
+#ifdef OBS_LEGACY
 #include "../../libobs/util/platform.h"
 #include "../../libobs-winrt/winrt-capture.h"
+#else
+#include <util/platform.h>
+#include <winrt-capture.h>
+#endif
 
 /* clang-format off */
 
@@ -87,6 +92,7 @@
 	bool compatibility;
 	bool client_area;
 	bool force_sdr;
+	bool hooked;
 
 	struct dc_capture capture;
 
@@ -116,9 +122,18 @@
 static const char *wgc_whole_match_classes = {
 	"ApplicationFrameWindow",
 	"Windows.UI.Core.CoreWindow",
-	"XLMAIN", /* excel*/
-	"PPTFrameClass", /* powerpoint */
-	"OpusApp", /* word */
+	"GAMINGSERVICESUI_HOSTING_WINDOW_CLASS",
+	"XLMAIN", /* Microsoft Excel */
+	"PPTFrameClass", /* Microsoft PowerPoint */
+	"screenClass", /* Microsoft PowerPoint (Slide Show) */
+	"PodiumParent", /* Microsoft PowerPoint (Presenter View) */
+	"OpusApp", /* Microsoft Word */
+	"OMain", /* Microsoft Access */
+	"Framework::CFrame", /* Microsoft OneNote */
+	"rctrl_renwnd32", /* Microsoft Outlook */
+	"MSWinPub", /* Microsoft Publisher */
+	"OfficeApp-Frame", /* Microsoft 365 Software */
+	"SDL_app",
 	NULL,
 };
 
@@ -220,6 +235,34 @@
 
 /* ------------------------------------------------------------------------- */
 
+static void wc_get_hooked(void *data, calldata_t *cd)
+{
+	struct window_capture *wc = data;
+	if (!wc)
+		return;
+
+	if (wc->hooked && wc->window) {
+		calldata_set_bool(cd, "hooked", true);
+		struct dstr title = {0};
+		struct dstr class = {0};
+		struct dstr executable = {0};
+		ms_get_window_title(&title, wc->window);
+		ms_get_window_class(&class, wc->window);
+		ms_get_window_exe(&executable, wc->window);
+		calldata_set_string(cd, "title", title.array);
+		calldata_set_string(cd, "class", class.array);
+		calldata_set_string(cd, "executable", executable.array);
+		dstr_free(&title);
+		dstr_free(&class);
+		dstr_free(&executable);
+	} else {
+		calldata_set_bool(cd, "hooked", false);
+		calldata_set_string(cd, "title", "");
+		calldata_set_string(cd, "class", "");
+		calldata_set_string(cd, "executable", "");
+	}
+}
+
 static const char *wc_getname(void *unused)
 {
 	UNUSED_PARAMETER(unused);
@@ -303,6 +346,19 @@
 				get_window_dpi_awareness_context;
 		}
 	}
+	wc->hooked = false;
+
+	signal_handler_t *sh = obs_source_get_signal_handler(source);
+	signal_handler_add(sh, "void unhooked(ptr source)");
+	signal_handler_add(
+		sh,
+		"void hooked(ptr source, string title, string class, string executable)");
+
+	proc_handler_t *ph = obs_source_get_proc_handler(source);
+	proc_handler_add(
+		ph,
+		"void get_hooked(out bool hooked, out string title, out string class, out string executable)",
+		wc_get_hooked, wc);
 
 	update_settings(wc, settings);
 	log_settings(wc, settings);
@@ -357,9 +413,18 @@
 	force_reset(wc);
 }
 
+static bool window_normal(struct window_capture *wc)
+{
+	return (IsWindow(wc->window) && !IsIconic(wc->window));
+}
+
 static uint32_t wc_width(void *data)
 {
 	struct window_capture *wc = data;
+
+	if (!window_normal(wc))
+		return 0;
+
 	return (wc->method == METHOD_WGC)
 		 ? wc->exports.winrt_capture_width(wc->capture_winrt)
 		 : wc->capture.width;
@@ -368,6 +433,10 @@
 static uint32_t wc_height(void *data)
 {
 	struct window_capture *wc = data;
+
+	if (!window_normal(wc))
+		return 0;
+
 	return (wc->method == METHOD_WGC)
 		 ? wc->exports.winrt_capture_height(wc->capture_winrt)
 		 : wc->capture.height;
@@ -519,6 +588,17 @@
 	}
 
 	memset(&wc->last_rect, 0, sizeof(wc->last_rect));
+
+	if (wc->hooked) {
+		wc->hooked = false;
+
+		signal_handler_t *sh =
+			obs_source_get_signal_handler(wc->source);
+		calldata_t data = {0};
+		calldata_set_ptr(&data, "source", wc->source);
+		signal_handler_signal(sh, "unhooked", &data);
+		calldata_free(&data);
+	}
 }
 
 static void wc_tick(void *data, float seconds)
@@ -531,6 +611,17 @@
 		return;
 
 	if (!wc->window || !IsWindow(wc->window)) {
+		if (wc->hooked) {
+			wc->hooked = false;
+
+			signal_handler_t *sh =
+				obs_source_get_signal_handler(wc->source);
+			calldata_t data = {0};
+			calldata_set_ptr(&data, "source", wc->source);
+			signal_handler_signal(sh, "unhooked", &data);
+			calldata_free(&data);
+		}
+
 		if (!wc->title && !wc->class) {
 			if (wc->capture.valid)
 				dc_capture_free(&wc->capture);
@@ -593,6 +684,17 @@
 		 !wc->exports.winrt_capture_show_cursor(wc->capture_winrt,
 							 !cursor_hidden)) {
 			force_reset(wc);
+			if (wc->hooked) {
+				wc->hooked = false;
+
+				signal_handler_t *sh =
+					obs_source_get_signal_handler(
+						wc->source);
+				calldata_t data = {0};
+				calldata_set_ptr(&data, "source", wc->source);
+				signal_handler_signal(sh, "unhooked", &data);
+				calldata_free(&data);
+			}
 			return;
 		}
 
@@ -637,6 +739,35 @@
 					rect.right - rect.left,
 					rect.bottom - rect.top, wc->cursor,
 					wc->compatibility);
+			if (!wc->hooked && wc->capture.valid) {
+				wc->hooked = true;
+
+				signal_handler_t *sh =
+					obs_source_get_signal_handler(
+						wc->source);
+				calldata_t data = {0};
+				struct dstr title = {0};
+				struct dstr class = {0};
+				struct dstr executable = {0};
+
+				ms_get_window_title(&title, wc->window);
+				ms_get_window_class(&class, wc->window);
+				ms_get_window_exe(&executable, wc->window);
+
+				calldata_set_ptr(&data, "source", wc->source);
+				calldata_set_string(&data, "title",
+						 title.array);
+				calldata_set_string(&data, "class",
+						 class.array);
+				calldata_set_string(&data, "executable",
+						 executable.array);
+				signal_handler_signal(sh, "hooked", &data);
+
+				dstr_free(&title);
+				dstr_free(&class);
+				dstr_free(&executable);
+				calldata_free(&data);
+			}
 		}
 
 		dc_capture_capture(&wc->capture, wc->window);
@@ -653,6 +784,37 @@
 
 				if (!wc->capture_winrt) {
 					wc->previously_failed = true;
+				} else if (!wc->hooked) {
+					wc->hooked = true;
+
+					signal_handler_t *sh =
+						obs_source_get_signal_handler(
+							wc->source);
+					calldata_t data = {0};
+					struct dstr title = {0};
+					struct dstr class = {0};
+					struct dstr executable = {0};
+
+					ms_get_window_title(&title, wc->window);
+					ms_get_window_class(&class, wc->window);
+					ms_get_window_exe(&executable,
+							 wc->window);
+
+					calldata_set_ptr(&data, "source",
+							 wc->source);
+					calldata_set_string(&data, "title",
+							 title.array);
+					calldata_set_string(&data, "class",
+							 class.array);
+					calldata_set_string(&data, "executable",
+							 executable.array);
+					signal_handler_signal(sh, "hooked",
+							 &data);
+
+					dstr_free(&title);
+					dstr_free(&class);
+					dstr_free(&executable);
+					calldata_free(&data);
 				}
 			}
 		}
@@ -664,6 +826,10 @@
 static void wc_render(void *data, gs_effect_t *effect)
 {
 	struct window_capture *wc = data;
+
+	if (!window_normal(wc))
+		return;
+
 	if (wc->method == METHOD_WGC) {
 		if (wc->capture_winrt) {
 			if (wc->exports.winrt_capture_active(

obs-studio-29.1.3.tar.xz/plugins/win-dshow/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/CMakeLists.txt Changed

@@ -1,215 +1,48 @@
-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture/dshowcapture.hpp")
-  obs_status(FATAL_ERROR "libdshowcapture submodule not found! Please fetch submodules. win-dshow plugin disabled.")
-  return()
-endif()
+cmake_minimum_required(VERSION 3.24...3.25)
 
-option(ENABLE_VIRTUALCAM "Enable building with Virtual Camera (Windows)" ON)
+if(OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
+  add_library(obs-virtualcam-interface INTERFACE)
+  add_library(OBS::virtualcam-interface ALIAS obs-virtualcam-interface)
 
-if(NOT ENABLE_VIRTUALCAM)
-  obs_status(DISABLED "Windows Virtual Camera")
-endif()
+  target_sources(obs-virtualcam-interface INTERFACE shared-memory-queue.c shared-memory-queue.h tiny-nv12-scale.c
+                                                    tiny-nv12-scale.h)
+  target_include_directories(obs-virtualcam-interface INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 
-if(ENABLE_VIRTUALCAM AND NOT VIRTUALCAM_GUID)
-  set(VIRTUALCAM_GUID
-      ""
-      CACHE STRING "Virtual Camera GUID" FORCE)
-  mark_as_advanced(VIRTUALCAM_GUID)
+  include(cmake/libdshowcapture.cmake)
+  add_subdirectory(virtualcam-module)
 endif()
 
-project(win-dshow)
+legacy_check()
 
-find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil)
+find_package(FFmpeg REQUIRED avcodec avutil)
 
 add_library(win-dshow MODULE)
 add_library(OBS::dshow ALIAS win-dshow)
 
-target_sources(win-dshow PRIVATE encode-dstr.hpp win-dshow.cpp win-dshow-encoder.cpp dshow-plugin.cpp ffmpeg-decode.c
-                                 ffmpeg-decode.h)
-
-add_library(libdshowcapture-external INTERFACE)
-add_library(libdshowcapture INTERFACE)
-add_library(OBS::libdshowcapture-external ALIAS libdshowcapture-external)
-add_library(OBS::libdshowcapture ALIAS libdshowcapture)
-
-target_sources(
-  libdshowcapture-external
-  INTERFACE libdshowcapture/external/capture-device-support/Library/EGAVResult.cpp
-            libdshowcapture/external/capture-device-support/Library/ElgatoUVCDevice.cpp
-            libdshowcapture/external/capture-device-support/Library/win/EGAVHIDImplementation.cpp
-            libdshowcapture/external/capture-device-support/SampleCode/DriverInterface.cpp)
-
-target_sources(
-  libdshowcapture
-  INTERFACE libdshowcapture/dshowcapture.hpp
-            libdshowcapture/source/capture-filter.cpp
-            libdshowcapture/source/capture-filter.hpp
-            libdshowcapture/source/output-filter.cpp
-            libdshowcapture/source/output-filter.hpp
-            libdshowcapture/source/dshowcapture.cpp
-            libdshowcapture/source/dshowencode.cpp
-            libdshowcapture/source/device.cpp
-            libdshowcapture/source/device.hpp
-            libdshowcapture/source/device-vendor.cpp
-            libdshowcapture/source/encoder.cpp
-            libdshowcapture/source/encoder.hpp
-            libdshowcapture/source/dshow-base.cpp
-            libdshowcapture/source/dshow-base.hpp
-            libdshowcapture/source/dshow-demux.cpp
-            libdshowcapture/source/dshow-demux.hpp
-            libdshowcapture/source/dshow-device-defs.hpp
-            libdshowcapture/source/dshow-enum.cpp
-            libdshowcapture/source/dshow-enum.hpp
-            libdshowcapture/source/dshow-formats.cpp
-            libdshowcapture/source/dshow-formats.hpp
-            libdshowcapture/source/dshow-media-type.cpp
-            libdshowcapture/source/dshow-encoded-device.cpp
-            libdshowcapture/source/dshow-media-type.hpp
-            libdshowcapture/source/log.cpp
-            libdshowcapture/source/log.hpp
-            libdshowcapture/source/external/IVideoCaptureFilter.h)
-
-target_include_directories(
-  libdshowcapture INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture
-                            ${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture/external/capture-device-support/Library)
-
-target_compile_definitions(libdshowcapture-external INTERFACE _UP_WINDOWS=1)
-target_compile_definitions(libdshowcapture INTERFACE _UP_WINDOWS=1)
-target_compile_options(libdshowcapture-external INTERFACE /wd4018)
-
-set(MODULE_DESCRIPTION "OBS DirectShow module")
-
-configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in win-dshow.rc)
+target_sources(win-dshow PRIVATE dshow-plugin.cpp encode-dstr.hpp ffmpeg-decode.c ffmpeg-decode.h win-dshow-encoder.cpp
+                                 win-dshow.cpp)
 
+configure_file(cmake/windows/obs-module.rc.in win-dshow.rc)
 target_sources(win-dshow PRIVATE win-dshow.rc)
 
-target_compile_definitions(win-dshow PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
-
-set(VIRTUALCAM_AVAILABLE OFF)
-if(ENABLE_VIRTUALCAM)
-  if(VIRTUALCAM_GUID STREQUAL "")
-    obs_status(WARNING "Windows Virtual Camera - GUID not set. Specify as 'VIRTUALCAM_GUID' to enable.")
-  else()
-    set(INVALID_GUID ON)
-
-    string(REPLACE "-" ";" GUID_VALS ${VIRTUALCAM_GUID})
-
-    list(LENGTH GUID_VALS GUID_VAL_COUNT)
-    if(GUID_VAL_COUNT EQUAL 5)
-      string(REPLACE ";" "0" GUID_HEX ${GUID_VALS})
-      string(REGEX MATCH "0-9a-fA-F+" GUID_ACTUAL_HEX ${GUID_HEX})
-      if(GUID_ACTUAL_HEX STREQUAL GUID_HEX)
-        list(GET GUID_VALS 0 GUID_VALS_DATA1)
-        list(GET GUID_VALS 1 GUID_VALS_DATA2)
-        list(GET GUID_VALS 2 GUID_VALS_DATA3)
-        list(GET GUID_VALS 3 GUID_VALS_DATA4)
-        list(GET GUID_VALS 4 GUID_VALS_DATA5)
-        string(LENGTH ${GUID_VALS_DATA1} GUID_VALS_DATA1_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA2} GUID_VALS_DATA2_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA3} GUID_VALS_DATA3_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA4} GUID_VALS_DATA4_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA5} GUID_VALS_DATA5_LENGTH)
-        if(GUID_VALS_DATA1_LENGTH EQUAL 8
-           AND GUID_VALS_DATA2_LENGTH EQUAL 4
-           AND GUID_VALS_DATA3_LENGTH EQUAL 4
-           AND GUID_VALS_DATA4_LENGTH EQUAL 4
-           AND GUID_VALS_DATA5_LENGTH EQUAL 12)
-          set(GUID_VAL01 ${GUID_VALS_DATA1})
-          set(GUID_VAL02 ${GUID_VALS_DATA2})
-          set(GUID_VAL03 ${GUID_VALS_DATA3})
-          string(SUBSTRING ${GUID_VALS_DATA4} 0 2 GUID_VAL04)
-          string(SUBSTRING ${GUID_VALS_DATA4} 2 2 GUID_VAL05)
-          string(SUBSTRING ${GUID_VALS_DATA5} 0 2 GUID_VAL06)
-          string(SUBSTRING ${GUID_VALS_DATA5} 2 2 GUID_VAL07)
-          string(SUBSTRING ${GUID_VALS_DATA5} 4 2 GUID_VAL08)
-          string(SUBSTRING ${GUID_VALS_DATA5} 6 2 GUID_VAL09)
-          string(SUBSTRING ${GUID_VALS_DATA5} 8 2 GUID_VAL10)
-          string(SUBSTRING ${GUID_VALS_DATA5} 10 2 GUID_VAL11)
-          set(VIRTUALCAM_AVAILABLE ON)
-          set(INVALID_GUID OFF)
-        endif()
-      endif()
-    endif()
-  endif()
-
-  if(INVALID_GUID)
-    obs_status(WARNING "Windows Virtual Camera - invalid GUID supplied")
-  endif()
-endif()
-
 target_link_libraries(
   win-dshow
   PRIVATE OBS::libobs
           OBS::w32-pthreads
-          OBS::libdshowcapture-external
           OBS::libdshowcapture
-          setupapi
-          strmiids
-          ksuser
-          winmm
-          wmcodecdspuuid
           FFmpeg::avcodec
-          FFmpeg::avutil)
-
-source_group(
-  "libdshowcapture-external\\Source Files"
-  FILES libdshowcapture/external/capture-device-support/Library/EGAVResult.cpp
-        libdshowcapture/external/capture-device-support/Library/ElgatoUVCDevice.cpp
-        libdshowcapture/external/capture-device-support/Library/win/EGAVHIDImplementation.cpp
-        libdshowcapture/external/capture-device-support/SampleCode/DriverInterface.cpp)
-source_group(
-  "libdshowcapture\\Source Files"
-  FILES libdshowcapture/source/capture-filter.cpp
-        libdshowcapture/source/output-filter.cpp
-        libdshowcapture/source/dshowcapture.cpp
-        libdshowcapture/source/dshowencode.cpp
-        libdshowcapture/source/device.cpp
-        libdshowcapture/source/device-vendor.cpp
-        libdshowcapture/source/encoder.cpp
-        libdshowcapture/source/dshow-base.cpp
-        libdshowcapture/source/dshow-demux.cpp
-        libdshowcapture/source/dshow-enum.cpp
-        libdshowcapture/source/dshow-formats.cpp
-        libdshowcapture/source/dshow-media-type.cpp
-        libdshowcapture/source/dshow-encoded-device.cpp
-        libdshowcapture/source/log.cpp)
-source_group(
-  "libdshowcapture\\Header Files"
-  FILES libdshowcapture/dshowcapture.hpp
-        libdshowcapture/source/capture-filter.hpp
-        libdshowcapture/source/output-filter.hpp
-        libdshowcapture/source/device.hpp
-        libdshowcapture/source/encoder.hpp
-        libdshowcapture/source/dshow-base.hpp
-        libdshowcapture/source/dshow-demux.hpp
-        libdshowcapture/source/dshow-device-defs.hpp
-        libdshowcapture/source/dshow-enum.hpp
-        libdshowcapture/source/dshow-formats.hpp
-        libdshowcapture/source/dshow-media-type.hpp
-        libdshowcapture/source/log.hpp
-        libdshowcapture/source/external/IVideoCaptureFilter.h)
-
-set_target_properties(win-dshow PROPERTIES FOLDER "plugins/win-dshow")
-
-setup_plugin_target(win-dshow)
-
-if(ENABLE_VIRTUALCAM AND VIRTUALCAM_AVAILABLE)
-  target_sources(win-dshow PRIVATE tiny-nv12-scale.c tiny-nv12-scale.h shared-memory-queue.c shared-memory-queue.h
-                                   virtualcam.c)
+          FFmpeg::avutil
+          strmiids
+          winmm)
 
+if(TARGET OBS::virtualcam AND TARGET OBS::virtualcam-guid)
+  target_sources(win-dshow PRIVATE virtualcam.c)
+  target_link_libraries(win-dshow PRIVATE OBS::virtualcam-interface OBS::virtualcam-guid)
   target_compile_definitions(win-dshow PRIVATE VIRTUALCAM_AVAILABLE)
 
-  target_include_directories(win-dshow PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config)
-
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-guid.h.in ${CMAKE_CURRENT_BINARY_DIR}/config/virtualcam-guid.h)
-
-  target_sources(win-dshow PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config/virtualcam-guid.h)
-
-  configure_file(virtualcam-install.bat.in "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-install.bat")
-
-  configure_file(virtualcam-uninstall.bat.in "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-uninstall.bat")
-
-  add_target_resource(win-dshow "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-install.bat" "obs-plugins/win-dshow/")
-  add_target_resource(win-dshow "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-uninstall.bat" "obs-plugins/win-dshow/")
-
-  add_subdirectory(virtualcam-module)
+  add_dependencies(win-dshow obs-virtualcam-module)
 endif()
+
+# cmake-format: off
+set_target_properties_obs(win-dshow PROPERTIES FOLDER plugins/win-dshow PREFIX "")
+# cmake-format: on

obs-studio-30.0.2.tar.xz/plugins/win-dshow/cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/cmake/legacy.cmake Added

@@ -0,0 +1,217 @@
+if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture/dshowcapture.hpp")
+  obs_status(FATAL_ERROR "libdshowcapture submodule not found! Please fetch submodules. win-dshow plugin disabled.")
+  return()
+endif()
+
+option(ENABLE_VIRTUALCAM "Enable building with Virtual Camera (Windows)" ON)
+
+if(NOT ENABLE_VIRTUALCAM)
+  obs_status(DISABLED "Windows Virtual Camera")
+endif()
+
+if(ENABLE_VIRTUALCAM AND NOT VIRTUALCAM_GUID)
+  set(VIRTUALCAM_GUID
+      ""
+      CACHE STRING "Virtual Camera GUID" FORCE)
+  mark_as_advanced(VIRTUALCAM_GUID)
+endif()
+
+project(win-dshow)
+
+find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil)
+
+add_library(win-dshow MODULE)
+add_library(OBS::dshow ALIAS win-dshow)
+
+target_sources(win-dshow PRIVATE encode-dstr.hpp win-dshow.cpp win-dshow-encoder.cpp dshow-plugin.cpp ffmpeg-decode.c
+                                 ffmpeg-decode.h)
+
+add_library(libdshowcapture-external INTERFACE)
+add_library(libdshowcapture INTERFACE)
+add_library(OBS::libdshowcapture-external ALIAS libdshowcapture-external)
+add_library(OBS::libdshowcapture ALIAS libdshowcapture)
+
+target_sources(
+  libdshowcapture-external
+  INTERFACE libdshowcapture/external/capture-device-support/Library/EGAVResult.cpp
+            libdshowcapture/external/capture-device-support/Library/ElgatoUVCDevice.cpp
+            libdshowcapture/external/capture-device-support/Library/win/EGAVHIDImplementation.cpp
+            libdshowcapture/external/capture-device-support/SampleCode/DriverInterface.cpp)
+
+target_sources(
+  libdshowcapture
+  INTERFACE libdshowcapture/dshowcapture.hpp
+            libdshowcapture/source/capture-filter.cpp
+            libdshowcapture/source/capture-filter.hpp
+            libdshowcapture/source/output-filter.cpp
+            libdshowcapture/source/output-filter.hpp
+            libdshowcapture/source/dshowcapture.cpp
+            libdshowcapture/source/dshowencode.cpp
+            libdshowcapture/source/device.cpp
+            libdshowcapture/source/device.hpp
+            libdshowcapture/source/device-vendor.cpp
+            libdshowcapture/source/encoder.cpp
+            libdshowcapture/source/encoder.hpp
+            libdshowcapture/source/dshow-base.cpp
+            libdshowcapture/source/dshow-base.hpp
+            libdshowcapture/source/dshow-demux.cpp
+            libdshowcapture/source/dshow-demux.hpp
+            libdshowcapture/source/dshow-device-defs.hpp
+            libdshowcapture/source/dshow-enum.cpp
+            libdshowcapture/source/dshow-enum.hpp
+            libdshowcapture/source/dshow-formats.cpp
+            libdshowcapture/source/dshow-formats.hpp
+            libdshowcapture/source/dshow-media-type.cpp
+            libdshowcapture/source/dshow-encoded-device.cpp
+            libdshowcapture/source/dshow-media-type.hpp
+            libdshowcapture/source/log.cpp
+            libdshowcapture/source/log.hpp
+            libdshowcapture/source/external/IVideoCaptureFilter.h)
+
+target_include_directories(
+  libdshowcapture INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture
+                            ${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture/external/capture-device-support/Library)
+
+target_compile_definitions(libdshowcapture-external INTERFACE _UP_WINDOWS=1)
+target_compile_definitions(libdshowcapture INTERFACE _UP_WINDOWS=1)
+target_compile_options(libdshowcapture-external INTERFACE /wd4018)
+
+set(MODULE_DESCRIPTION "OBS DirectShow module")
+
+configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in win-dshow.rc)
+
+target_sources(win-dshow PRIVATE win-dshow.rc)
+
+target_compile_definitions(win-dshow PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS
+                                             OBS_LEGACY)
+
+set(VIRTUALCAM_AVAILABLE OFF)
+if(ENABLE_VIRTUALCAM)
+  if(VIRTUALCAM_GUID STREQUAL "")
+    obs_status(WARNING "Windows Virtual Camera - GUID not set. Specify as 'VIRTUALCAM_GUID' to enable.")
+  else()
+    set(INVALID_GUID ON)
+
+    string(REPLACE "-" ";" GUID_VALS ${VIRTUALCAM_GUID})
+
+    list(LENGTH GUID_VALS GUID_VAL_COUNT)
+    if(GUID_VAL_COUNT EQUAL 5)
+      string(REPLACE ";" "0" GUID_HEX ${GUID_VALS})
+      string(REGEX MATCH "0-9a-fA-F+" GUID_ACTUAL_HEX ${GUID_HEX})
+      if(GUID_ACTUAL_HEX STREQUAL GUID_HEX)
+        list(GET GUID_VALS 0 GUID_VALS_DATA1)
+        list(GET GUID_VALS 1 GUID_VALS_DATA2)
+        list(GET GUID_VALS 2 GUID_VALS_DATA3)
+        list(GET GUID_VALS 3 GUID_VALS_DATA4)
+        list(GET GUID_VALS 4 GUID_VALS_DATA5)
+        string(LENGTH ${GUID_VALS_DATA1} GUID_VALS_DATA1_LENGTH)
+        string(LENGTH ${GUID_VALS_DATA2} GUID_VALS_DATA2_LENGTH)
+        string(LENGTH ${GUID_VALS_DATA3} GUID_VALS_DATA3_LENGTH)
+        string(LENGTH ${GUID_VALS_DATA4} GUID_VALS_DATA4_LENGTH)
+        string(LENGTH ${GUID_VALS_DATA5} GUID_VALS_DATA5_LENGTH)
+        if(GUID_VALS_DATA1_LENGTH EQUAL 8
+           AND GUID_VALS_DATA2_LENGTH EQUAL 4
+           AND GUID_VALS_DATA3_LENGTH EQUAL 4
+           AND GUID_VALS_DATA4_LENGTH EQUAL 4
+           AND GUID_VALS_DATA5_LENGTH EQUAL 12)
+          set(GUID_VAL01 ${GUID_VALS_DATA1})
+          set(GUID_VAL02 ${GUID_VALS_DATA2})
+          set(GUID_VAL03 ${GUID_VALS_DATA3})
+          string(SUBSTRING ${GUID_VALS_DATA4} 0 2 GUID_VAL04)
+          string(SUBSTRING ${GUID_VALS_DATA4} 2 2 GUID_VAL05)
+          string(SUBSTRING ${GUID_VALS_DATA5} 0 2 GUID_VAL06)
+          string(SUBSTRING ${GUID_VALS_DATA5} 2 2 GUID_VAL07)
+          string(SUBSTRING ${GUID_VALS_DATA5} 4 2 GUID_VAL08)
+          string(SUBSTRING ${GUID_VALS_DATA5} 6 2 GUID_VAL09)
+          string(SUBSTRING ${GUID_VALS_DATA5} 8 2 GUID_VAL10)
+          string(SUBSTRING ${GUID_VALS_DATA5} 10 2 GUID_VAL11)
+          set(VIRTUALCAM_AVAILABLE ON)
+          set(INVALID_GUID OFF)
+        endif()
+      endif()
+    endif()
+  endif()
+
+  if(INVALID_GUID)
+    obs_status(WARNING "Windows Virtual Camera - invalid GUID supplied")
+  endif()
+endif()
+
+target_link_libraries(
+  win-dshow
+  PRIVATE OBS::libobs
+          OBS::w32-pthreads
+          OBS::libdshowcapture-external
+          OBS::libdshowcapture
+          setupapi
+          strmiids
+          ksuser
+          winmm
+          wmcodecdspuuid
+          FFmpeg::avcodec
+          FFmpeg::avutil)
+
+source_group(
+  "libdshowcapture-external\\Source Files"
+  FILES libdshowcapture/external/capture-device-support/Library/EGAVResult.cpp
+        libdshowcapture/external/capture-device-support/Library/ElgatoUVCDevice.cpp
+        libdshowcapture/external/capture-device-support/Library/win/EGAVHIDImplementation.cpp
+        libdshowcapture/external/capture-device-support/SampleCode/DriverInterface.cpp)
+source_group(
+  "libdshowcapture\\Source Files"
+  FILES libdshowcapture/source/capture-filter.cpp
+        libdshowcapture/source/output-filter.cpp
+        libdshowcapture/source/dshowcapture.cpp
+        libdshowcapture/source/dshowencode.cpp
+        libdshowcapture/source/device.cpp
+        libdshowcapture/source/device-vendor.cpp
+        libdshowcapture/source/encoder.cpp
+        libdshowcapture/source/dshow-base.cpp
+        libdshowcapture/source/dshow-demux.cpp
+        libdshowcapture/source/dshow-enum.cpp
+        libdshowcapture/source/dshow-formats.cpp
+        libdshowcapture/source/dshow-media-type.cpp
+        libdshowcapture/source/dshow-encoded-device.cpp
+        libdshowcapture/source/log.cpp)
+source_group(
+  "libdshowcapture\\Header Files"
+  FILES libdshowcapture/dshowcapture.hpp
+        libdshowcapture/source/capture-filter.hpp
+        libdshowcapture/source/output-filter.hpp
+        libdshowcapture/source/device.hpp
+        libdshowcapture/source/encoder.hpp
+        libdshowcapture/source/dshow-base.hpp
+        libdshowcapture/source/dshow-demux.hpp
+        libdshowcapture/source/dshow-device-defs.hpp
+        libdshowcapture/source/dshow-enum.hpp
+        libdshowcapture/source/dshow-formats.hpp
+        libdshowcapture/source/dshow-media-type.hpp
+        libdshowcapture/source/log.hpp
+        libdshowcapture/source/external/IVideoCaptureFilter.h)
+
+set_target_properties(win-dshow PROPERTIES FOLDER "plugins/win-dshow")
+
+setup_plugin_target(win-dshow)
+
+if(ENABLE_VIRTUALCAM AND VIRTUALCAM_AVAILABLE)
+  target_sources(win-dshow PRIVATE tiny-nv12-scale.c tiny-nv12-scale.h shared-memory-queue.c shared-memory-queue.h
+                                   virtualcam.c)
+
+  target_compile_definitions(win-dshow PRIVATE VIRTUALCAM_AVAILABLE)
+
+  target_include_directories(win-dshow PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config)
+
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-module/virtualcam-guid.h.in
+                 ${CMAKE_CURRENT_BINARY_DIR}/config/virtualcam-guid.h)
+
+  target_sources(win-dshow PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config/virtualcam-guid.h)
+
+  configure_file(virtualcam-module/virtualcam-install.bat.in "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-install.bat")
+
+  configure_file(virtualcam-module/virtualcam-uninstall.bat.in "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-uninstall.bat")
+
+  add_target_resource(win-dshow "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-install.bat" "obs-plugins/win-dshow/")
+  add_target_resource(win-dshow "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-uninstall.bat" "obs-plugins/win-dshow/")
+
+  add_subdirectory(virtualcam-module)
+endif()

obs-studio-30.0.2.tar.xz/plugins/win-dshow/cmake/libdshowcapture.cmake Added

@@ -0,0 +1,56 @@
+add_library(libdshowcapture INTERFACE)
+add_library(OBS::libdshowcapture ALIAS libdshowcapture)
+
+target_sources(
+  libdshowcapture
+  INTERFACE libdshowcapture/dshowcapture.hpp
+            libdshowcapture/source/capture-filter.cpp
+            libdshowcapture/source/capture-filter.hpp
+            libdshowcapture/source/device-vendor.cpp
+            libdshowcapture/source/device.cpp
+            libdshowcapture/source/device.hpp
+            libdshowcapture/source/dshow-base.cpp
+            libdshowcapture/source/dshow-base.hpp
+            libdshowcapture/source/dshow-demux.cpp
+            libdshowcapture/source/dshow-demux.hpp
+            libdshowcapture/source/dshow-device-defs.hpp
+            libdshowcapture/source/dshow-encoded-device.cpp
+            libdshowcapture/source/dshow-enum.cpp
+            libdshowcapture/source/dshow-enum.hpp
+            libdshowcapture/source/dshow-formats.cpp
+            libdshowcapture/source/dshow-formats.hpp
+            libdshowcapture/source/dshow-media-type.cpp
+            libdshowcapture/source/dshow-media-type.hpp
+            libdshowcapture/source/dshowcapture.cpp
+            libdshowcapture/source/dshowencode.cpp
+            libdshowcapture/source/encoder.cpp
+            libdshowcapture/source/encoder.hpp
+            libdshowcapture/source/external/IVideoCaptureFilter.h
+            libdshowcapture/source/log.cpp
+            libdshowcapture/source/log.hpp
+            libdshowcapture/source/output-filter.cpp
+            libdshowcapture/source/output-filter.hpp
+            libdshowcapture/external/capture-device-support/Library/EGAVResult.cpp
+            libdshowcapture/external/capture-device-support/Library/ElgatoUVCDevice.cpp
+            libdshowcapture/external/capture-device-support/Library/win/EGAVHIDImplementation.cpp
+            libdshowcapture/external/capture-device-support/SampleCode/DriverInterface.cpp)
+
+target_include_directories(
+  libdshowcapture INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture"
+                            "${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture/external/capture-device-support/Library")
+
+target_compile_definitions(libdshowcapture INTERFACE _UP_WINDOWS=1)
+target_compile_options(libdshowcapture INTERFACE /wd4018)
+
+get_target_property(target_sources libdshowcapture INTERFACE_SOURCES)
+set(target_headers ${target_sources})
+set(target_external_sources ${target_sources})
+
+list(FILTER target_external_sources INCLUDE REGEX ".+external/.+/.+\\.cpp")
+list(FILTER target_sources EXCLUDE REGEX ".+external/.+/.+\\.cpp")
+list(FILTER target_sources INCLUDE REGEX ".*\\.(m|ccp?p?|swift)")
+list(FILTER target_headers INCLUDE REGEX ".*\\.h(pp)?")
+
+source_group("libdshowcapture-external\\Source Files" FILES ${target_external_sources})
+source_group("libdshowcapture\\Source Files" FILES ${target_sources})
+source_group("libdshowcapture\\Header Files" FILES ${target_headers})

obs-studio-30.0.2.tar.xz/plugins/win-dshow/cmake/windows Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/cmake/windows/obs-module.rc.in Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/af-ZA.ini Added

@@ -0,0 +1,35 @@
+VideoCaptureDevice="Video-opnametoestel"
+Device="Toestel"
+ColorSpace="Kleurruimte"
+ColorSpace.Default="Verstek"
+ColorRange="Kleurbereik"
+ColorRange.Default="Verstek"
+ColorRange.Partial="Beperk"
+ColorRange.Full="Volledig"
+ConfigureVideo="Konfigureer video"
+ResFPSType="Beeldskerpte/RPS-tipe"
+ResFPSType.Custom="Pasgemaak"
+ResFPSType.DevPreferred="Verstektoestel"
+FPS.Matching="Gelyk aan afvoer-RPS"
+FPS.Highest="Hoogste RPS"
+Resolution="Beeldskerpte"
+VideoFormat="Videoformaat"
+VideoFormat.Any="Enige"
+VideoFormat.Unknown="Onbekend (%1)"
+AudioOutputMode.Capture="Neem slegs klank op"
+UseCustomAudioDevice="Gebruik pasgemaakte oudiotoestel"
+AudioDevice="Oudiotoestel"
+Buffering="Bufferwerking"
+Buffering.ToolTip="Indien geaktiveer word video-/oudiodata gebuffer om soepele en akkurate\nafspeel te waarborg, ten koste van ’n hoër vertraging. As bufferingwerking\ngebruik word, word aanbeveel om die kaart en die program op\ndieselfde beeldduur in te stel vir die beste resultate.\n\nIndien gedeaktiveer, word die vertraging geminimaliseer ten koste van\nakkurate raamafspeel. Dit is ideaal vir gesigkameras, of wanneer u die\nvoorskou van die program wil gebruike om ’n konsole te speel.\n\nOutobespeuring (verstek) stel dit in op geaktiveer as die\ntoestel vertraging het, en gedeaktiveer as dit geen vertraging het."
+Buffering.AutoDetect="Outobespeur"
+Buffering.Enable="Aktiveer"
+Buffering.Disable="Deaktiveer"
+Activate="Aktiveer"
+Deactivate="Deaktiveer"
+FlipVertically="Spieël vertikaal"
+Autorotation="Pas die rotasiedata van die kamera toe (indien enige)"
+HardwareDecode="Gebruik apparatuurdekodering wanneer moontlik"
+DeactivateWhenNotShowing="Deaktiveer wanneer nie sigbaar"
+Bitrate="Bistempo"
+Encoder.C985="AVerMedia H.264 Enkodeerder (c985)"
+Encoder.C353="AVerMedia H.264 Enkodeerder"

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/an-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/an-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/bg-BG.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/bg-BG.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/bn-BD.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/bn-BD.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ca-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ca-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/de-DE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/de-DE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/el-GR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/es-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/es-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/fil-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/fil-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/gd-GB.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/gd-GB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/gl-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/gl-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/hi-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/hi-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/hr-HR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/hr-HR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/hu-HU.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/hu-HU.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/hy-AM.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/id-ID.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/id-ID.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ja-JP.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ja-JP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ka-GE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ka-GE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/kab-KAB.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/kab-KAB.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ko-KR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ko-KR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/nl-NL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/nl-NL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/pl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/pl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/pt-PT.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/pt-PT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ru-RU.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ru-RU.ini Changed

@@ -6,7 +6,6 @@
 ColorRange.Default="По умолчанию"
 ColorRange.Partial="Ограниченный"
 ColorRange.Full="Полный"
-ConfigureAudio="Настроить звук"
 ConfigureVideo="Настройка видео"
 ConfigureCrossbar="Настройка кроссбара"
 ResFPSType="Разрешение / тип частоты кадров"
@@ -25,12 +24,12 @@
 UseCustomAudioDevice="Использовать пользовательское аудиоустройство"
 AudioDevice="Аудиоустройство"
 Buffering="Буферизация"
-Buffering.ToolTip="Если функция включена, поток данных аудио/видео буферизируется для плавного и\nточного воспроизведения, но при этом увеличивается задержка. Если вы\nиспользуете карту захвата, рекомендуем программно установить одинаковую\nчастоту кадров для лучшего результата.\n\nЕсли функция отключена, поток воспроизводится с наименьшей задержкой,\nно при этом страдает точность воспроизведения кадров. Этот вариант\nидеален для веб-камер, или если вы хотите использовать окно предпросмотра\nпрограммы для игры на консоли.\n\nАвто-обнаружение (по умолчанию), устанавливает опцию на «Включено», если\nустройство имеет задержку, и на «Отключено», если не имеет задержки."
+Buffering.ToolTip="Если функция включена, поток данных аудио/видео буферизируется для плавного и\nточного воспроизведения, но при этом увеличивается задержка. Если вы\nиспользуете карту захвата, рекомендуем программно установить одинаковую\nчастоту кадров для лучшего результата.\n\nЕсли функция отключена, поток воспроизводится с наименьшей задержкой,\nно при этом снижается точность воспроизведения кадров. Этот вариант\nидеален для веб-камер, или если вы хотите использовать окно предпросмотра\nпрограммы для игры на консоли.\n\nАвто-обнаружение (по умолчанию), устанавливает опцию на «Включено», если\nустройство имеет задержку, и на «Отключено», если не имеет задержки."
 Buffering.AutoDetect="Автообнаружение"
 Buffering.Enable="Включить"
 Buffering.Disable="Отключить"
-Activate="Активировать"
-Deactivate="Деактивировать"
+Activate="Запуск"
+Deactivate="Отключить"
 FlipVertically="Отразить вертикально"
 Autorotation="Применить данные вращения камеры (если они есть)"
 HardwareDecode="Использовать аппаратное декодирование по возможности"

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/si-LK.ini Changed

@@ -1,22 +1,33 @@
+VideoCaptureDevice="දෘශ්‍ය ග්‍රහණ උපාංගය"
 Device="උපාංගය"
+ColorSpace="වර්ණ අවකාශය"
 ColorSpace.Default="පෙරනිමි"
 ColorRange="වර්ණ පරාසය"
 ColorRange.Default="පෙරනිමි"
 ColorRange.Partial="සීමාසහිත"
 ColorRange.Full="පූර්ණ"
-ConfigureAudio="ශ්‍රව්‍ය වින්‍යාසය"
 ConfigureVideo="දෘශ්‍ය වින්‍යාසය"
+ResFPSType="විභේදනය/රාමු/ත. වර්ගය"
 ResFPSType.Custom="අභිරුචි"
+ResFPSType.DevPreferred="උපාංගයේ පෙරනිමි"
+FPS.Matching="ප්‍රතිදාන රාමු/ත. ගළපන්න"
+FPS.Highest="වැඩිම රාමු/ත."
 Resolution="විභේදනය"
 VideoFormat="දෘශ්‍යක ආකෘතිය"
 VideoFormat.Any="ඕනෑම"
 VideoFormat.Unknown="නොදන්නා (%1)"
-AudioOutputMode="හඬ ප්‍රතිදාන ආකාරය"
+AudioOutputMode="හඬ ප්‍රතිදාන ප්‍රකාරය"
+AudioOutputMode.Capture="හඬ පමණක් ග්‍රහණය කරන්න"
 AudioOutputMode.DirectSound="වැඩතලයෙහි හඬ ප්‍රතිදානය (ඩිරෙක්ට්සවුන්ඩ්)"
+AudioOutputMode.WaveOut="වැඩතලයෙහි හඬ ප්‍රතිදානය (WaveOut)"
 UseCustomAudioDevice="අභිරුචි ශ්‍රව්‍ය උපාංගයක් භාවිතා කරන්න"
 AudioDevice="ශ්‍රව්‍ය උපාංගය"
 Buffering.AutoDetect="ස්වයං-අනාවරණය"
 Buffering.Enable="සබල කරන්න"
 Buffering.Disable="අබල කරන්න"
+Activate="සක්‍රිය කරන්න"
+Deactivate="අක්‍රිය කරන්න"
+FlipVertically="සිරස්ව පෙරළන්න"
+Bitrate="බිටුඅනුපා."
 Encoder.C985="AVerMedia H.264 ආකේතකය (c985)"
 Encoder.C353="AVerMedia H.264 ආකේතකය"

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/sk-SK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/sk-SK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/sl-SI.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/sl-SI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/sr-CS.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/sr-CS.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/sv-SE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/sv-SE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/szl-PL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/szl-PL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/ta-IN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/ta-IN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/th-TH.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/th-TH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/tl-PH.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/tl-PH.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/tr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/tr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/zh-CN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/zh-CN.ini Changed

@@ -6,7 +6,6 @@
 ColorRange.Default="默认"
 ColorRange.Partial="常规 (Limited)"
 ColorRange.Full="扩展 (Full)"
-ConfigureAudio="配置音频"
 ConfigureVideo="配置视频"
 ConfigureCrossbar="配置Crossbar"
 ResFPSType="分辨率/帧率 类型"
@@ -17,17 +16,17 @@
 Resolution="分辨率"
 VideoFormat="视频格式"
 VideoFormat.Any="任意"
-VideoFormat.Unknown="未知(%1)"
+VideoFormat.Unknown="未知 (%1)"
 AudioOutputMode="音频输出模式"
 AudioOutputMode.Capture="只采集音频"
-AudioOutputMode.DirectSound="输出桌面音频(DirectSound)"
-AudioOutputMode.WaveOut="输出桌面音频(WaveOut)"
+AudioOutputMode.DirectSound="输出桌面音频 (DirectSound) "
+AudioOutputMode.WaveOut="输出桌面音频 (WaveOut)"
 UseCustomAudioDevice="使用自定义的音频设备"
 AudioDevice="音频设备"
 Buffering="缓冲"
-Buffering.ToolTip="当开启缓冲时，音视频数据可以得到最平滑和准确的播放效果，代价是延迟变大。\n如果在视频采集卡上开启了缓冲，推荐将程序输出和采集卡设置为相同帧率以达到最佳效果。\n\n当禁用缓冲时，播放的延迟将会降到最小，代价是降低了播放的准确性。\n如果这是一个拍摄面部的摄像头、或希望看着预览画面来玩游戏，推荐禁用缓冲。\n\n设置为自动检测（默认）时，当设备有延迟将会开启缓冲，无延迟则会禁用缓冲。"
+Buffering.ToolTip="当启用时，视频/音频数据被缓冲以确保最流畅和最准确的播放，但代价是增加了延迟。\n在使用视频采集卡进行缓冲时，建议将采集卡和程序设置为相同的帧率以获得最佳效果。\n\n当禁用时，确保最低延迟的播放，但以牺牲帧播放准确性为代价。\n这对于人脸摄像头或者当你想要使用程序的预览窗口播放游戏机时是理想的选择。\n\n自动检测（默认）会根据设备是否具有延迟来设置是否启用缓冲。\n如果设备有延迟，则启用缓冲；如果设备没有延迟，则禁用缓冲。"
 Buffering.AutoDetect="自动检测"
-Buffering.Enable="开启"
+Buffering.Enable="启用"
 Buffering.Disable="禁用"
 Activate="激活"
 Deactivate="取消激活"

obs-studio-29.1.3.tar.xz/plugins/win-dshow/data/locale/zh-TW.ini -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/data/locale/zh-TW.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/ffmpeg-decode.c -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/ffmpeg-decode.c Changed

@@ -1,5 +1,5 @@
 /******************************************************************************
- Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
+ Copyright (C) 2023 by Lain Bailey <lain@obsproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,11 +22,6 @@
 #include <obs-hevc.h>
 #endif
 
-#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(58, 4, 100)
-#define USE_NEW_HARDWARE_CODEC_METHOD
-#endif
-
-#ifdef USE_NEW_HARDWARE_CODEC_METHOD
 enum AVHWDeviceType hw_priority = {
 	AV_HWDEVICE_TYPE_D3D11VA,
 	AV_HWDEVICE_TYPE_DXVA2,
@@ -72,16 +67,12 @@
 		d->hw = true;
 	}
 }
-#endif
 
 int ffmpeg_decode_init(struct ffmpeg_decode *decode, enum AVCodecID id,
 		 bool use_hw)
 {
 	int ret;
 
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
-	avcodec_register_all();
-#endif
 	memset(decode, 0, sizeof(*decode));
 
 	decode->codec = avcodec_find_decoder(id);
@@ -92,12 +83,8 @@
 
 	decode->decoder->thread_count = 0;
 
-#ifdef USE_NEW_HARDWARE_CODEC_METHOD
 	if (use_hw)
 		init_hw_decoder(decode);
-#else
-	(void)use_hw;
-#endif
 
 	ret = avcodec_open2(decode->decoder, decode->codec, NULL);
 	if (ret < 0) {
@@ -138,6 +125,8 @@
 	switch (f) {
 	case AV_PIX_FMT_NONE:
 		return VIDEO_FORMAT_NONE;
+	case AV_PIX_FMT_GRAY8:
+		return VIDEO_FORMAT_Y800;
 	case AV_PIX_FMT_YUV420P:
 	case AV_PIX_FMT_YUVJ420P:
 		return VIDEO_FORMAT_I420;
@@ -374,14 +363,12 @@
 	else if (!got_frame)
 		return true;
 
-#ifdef USE_NEW_HARDWARE_CODEC_METHOD
 	if (got_frame && decode->hw) {
 		ret = av_hwframe_transfer_data(decode->frame, out_frame, 0);
 		if (ret < 0) {
 			return false;
 		}
 	}
-#endif
 
 	for (size_t i = 0; i < MAX_AV_PLANES; i++) {
 		frame->datai = decode->frame->datai;

obs-studio-29.1.3.tar.xz/plugins/win-dshow/ffmpeg-decode.h -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/ffmpeg-decode.h Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/dshowcapture.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/CoTaskMemPtr.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/CoTaskMemPtr.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/ComPtr.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/ComPtr.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/capture-filter.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/device-vendor.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/device-vendor.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/device.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/device.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/device.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/device.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-base.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-demux.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-demux.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-demux.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-demux.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-device-defs.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-device-defs.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-encoded-device.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-encoded-device.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-enum.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-formats.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-media-type.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-media-type.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-media-type.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshow-media-type.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshowcapture.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshowcapture.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/dshowencode.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/dshowencode.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/encoder.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/log.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/log.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/log.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/log.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/libdshowcapture/source/output-filter.hpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/virtualcam-module/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/CMakeLists.txt Changed

@@ -1,59 +1,97 @@
-cmake_minimum_required(VERSION 3.5)
-project(obs-virtualcam-module)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(_output_suffix "64")
-else()
- set(_output_suffix "32")
+cmake_minimum_required(VERSION 3.24...3.25)
+
+if(OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
+ option(ENABLE_VIRTUALCAM "Enable Windows Virtual Camera" ON)
+ if(NOT ENABLE_VIRTUALCAM)
+ target_disable_feature(obs-virtualcam-module "Virtual Camera Support")
+ target_disable(obs-virtualcam-module)
+ return()
+ endif()
+
+ if(NOT VIRTUALCAM_GUID)
+ # cmake-format: off
+ set(VIRTUALCAM_GUID "" CACHE STRING "Virtual Camera GUID" FORCE)
+ mark_as_advanced(VIRTUALCAM_GUID)
+ # cmake-format: on
+
+ message(WARNING "Empty Virtual Camera GUID set.")
+ target_disable_feature(obs-virtualcam-module "Virtual Camera Support (empty GUID)")
+ return()
+ else()
+ set(VALID_GUID FALSE)
+ check_uuid(${VIRTUALCAM_GUID} VALID_GUID)
+
+ if(NOT VALID_GUID)
+ message(WARNING "Invalid Virtual Camera GUID set.")
+ target_disable_feature(obs-virtualcam-module "Virtual Camera Support (invalid GUID)")
+ return()
+ endif()
+
+ # DirectShow API requires separate GUID tokens
+ string(REPLACE "-" ";" GUID_VALS ${VIRTUALCAM_GUID})
+ list(GET GUID_VALS 0 GUID_VALS_DATA1)
+ list(GET GUID_VALS 1 GUID_VALS_DATA2)
+ list(GET GUID_VALS 2 GUID_VALS_DATA3)
+ list(GET GUID_VALS 3 GUID_VALS_DATA4)
+ list(GET GUID_VALS 4 GUID_VALS_DATA5)
+ set(GUID_VAL01 ${GUID_VALS_DATA1})
+ set(GUID_VAL02 ${GUID_VALS_DATA2})
+ set(GUID_VAL03 ${GUID_VALS_DATA3})
+ string(SUBSTRING ${GUID_VALS_DATA4} 0 2 GUID_VAL04)
+ string(SUBSTRING ${GUID_VALS_DATA4} 2 2 GUID_VAL05)
+ string(SUBSTRING ${GUID_VALS_DATA5} 0 2 GUID_VAL06)
+ string(SUBSTRING ${GUID_VALS_DATA5} 2 2 GUID_VAL07)
+ string(SUBSTRING ${GUID_VALS_DATA5} 4 2 GUID_VAL08)
+ string(SUBSTRING ${GUID_VALS_DATA5} 6 2 GUID_VAL09)
+ string(SUBSTRING ${GUID_VALS_DATA5} 8 2 GUID_VAL10)
+ string(SUBSTRING ${GUID_VALS_DATA5} 10 2 GUID_VAL11)
+ endif()
+
+ add_library(obs-virtualcam-guid INTERFACE)
+ add_library(OBS::virtualcam-guid ALIAS obs-virtualcam-guid)
+
+ configure_file(virtualcam-guid.h.in virtualcam-guid.h)
+ target_sources(obs-virtualcam-guid INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-guid.h")
+ target_include_directories(obs-virtualcam-guid INTERFACE "${CMAKE_CURRENT_BINARY_DIR}")
+
+ add_library(_virtualcam INTERFACE)
+
+ configure_file(cmake/windows/obs-module.rc.in virtualcam-module.rc)
+ target_sources(_virtualcam INTERFACE placeholder.cpp sleepto.c sleepto.h virtualcam-filter.cpp virtualcam-filter.hpp
+ virtualcam-module.cpp)
+ target_include_directories(_virtualcam INTERFACE "${CMAKE_CURRENT_BINARY_DIR}")
+ target_compile_definitions(_virtualcam INTERFACE VIRTUALCAM_AVAILABLE)
+ target_compile_options(_virtualcam INTERFACE $<IF:$<CONFIG:Debug>,/MTd,/MT>)
+
+ target_link_libraries(
+ _virtualcam
+ INTERFACE OBS::virtualcam-interface
+ OBS::virtualcam-guid
+ OBS::libdshowcapture
+ OBS::winhandle
+ gdiplus
+ strmiids
+ winmm)
 endif()
 
-add_library(obs-virtualcam-module MODULE)
-add_library(OBS::virtualcam-module ALIAS obs-virtualcam-module)
-
-target_sources(
- obs-virtualcam-module
- PRIVATE sleepto.c
- sleepto.h
- placeholder.cpp
- virtualcam-module.cpp
- virtualcam-filter.cpp
- virtualcam-filter.hpp
- virtualcam-module.rc
- ../shared-memory-queue.c
- ../shared-memory-queue.h
- ../tiny-nv12-scale.c
- ../tiny-nv12-scale.h)
-
-target_include_directories(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-set(MODULE_DESCRIPTION "OBS Virtual Camera output module")
-
-configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in virtualcam-module.rc)
-
-target_sources(obs-virtualcam-module PRIVATE virtualcam-module.rc)
+legacy_check()
 
-target_link_libraries(obs-virtualcam-module PRIVATE OBS::libdshowcapture OBS::libdshowcapture-external setupapi winmm
- strmiids gdiplus)
-
-target_link_options(obs-virtualcam-module PRIVATE "LINKER:/ignore:4104")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-module.def.in ${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def)
-
-target_sources(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def)
-
-target_include_directories(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../config)
-
-target_compile_definitions(obs-virtualcam-module PRIVATE VIRTUALCAM_AVAILABLE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS
- _CRT_NONSTDC_NO_WARNINGS)
+add_library(obs-virtualcam-module MODULE)
+add_library(OBS::virtualcam ALIAS obs-virtualcam-module)
 
-if(MSVC)
- target_compile_options(obs-virtualcam-module PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
- add_target_resource(win-dshow "$<TARGET_PDB_FILE:obs-virtualcam-module>" "obs-plugins/win-dshow/" OPTIONAL)
+target_sources(obs-virtualcam-module PRIVATE cmake/windows/virtualcam-module64.def)
+target_link_libraries(obs-virtualcam-module PRIVATE _virtualcam)
 
-endif()
+configure_file(virtualcam-install.bat.in virtualcam-install.bat)
+target_add_resource(obs-virtualcam-module "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-install.bat"
+ "${OBS_DATA_DESTINATION}/obs-plugins/win-dshow")
 
-set_target_properties(obs-virtualcam-module PROPERTIES FOLDER "plugins/win-dshow")
+configure_file(virtualcam-uninstall.bat.in virtualcam-uninstall.bat)
+target_add_resource(obs-virtualcam-module "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-uninstall.bat"
+ "${OBS_DATA_DESTINATION}/obs-plugins/win-dshow")
 
-set_target_properties(obs-virtualcam-module PROPERTIES OUTPUT_NAME "obs-virtualcam-module${_output_suffix}")
+include(cmake/32bit.cmake)
 
-add_target_resource(win-dshow "$<TARGET_FILE:obs-virtualcam-module>" "obs-plugins/win-dshow/")
+# cmake-format: off
+set_target_properties_obs(obs-virtualcam-module PROPERTIES FOLDER plugins/win-dshow OUTPUT_NAME obs-virtualcam-module64)
+# cmake-format: on

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake/32bit-build.cmake Added

@@ -0,0 +1,49 @@
+option(ENABLE_VIRTUALCAM "Enable Windows Virtual Camera" ON)
+if(NOT ENABLE_VIRTUALCAM)
+  return()
+endif()
+
+if(NOT VIRTUALCAM_GUID)
+  set(VIRTUALCAM_GUID
+      ""
+      CACHE STRING "Virtual Camera GUID" FORCE)
+  mark_as_advanced(VIRTUALCAM_GUID)
+
+  message(WARNING "Empty Virtual Camera GUID set.")
+  return()
+else()
+  set(VALID_GUID FALSE)
+  check_uuid(${VIRTUALCAM_GUID} VALID_GUID)
+
+  if(NOT VALID_GUID)
+    message(WARNING "Invalid Virtual Camera GUID set.")
+    return()
+  endif()
+
+  # DirectShow API requires separate GUID tokens
+  string(REPLACE "-" ";" GUID_VALS ${VIRTUALCAM_GUID})
+  list(GET GUID_VALS 0 GUID_VALS_DATA1)
+  list(GET GUID_VALS 1 GUID_VALS_DATA2)
+  list(GET GUID_VALS 2 GUID_VALS_DATA3)
+  list(GET GUID_VALS 3 GUID_VALS_DATA4)
+  list(GET GUID_VALS 4 GUID_VALS_DATA5)
+  set(GUID_VAL01 ${GUID_VALS_DATA1})
+  set(GUID_VAL02 ${GUID_VALS_DATA2})
+  set(GUID_VAL03 ${GUID_VALS_DATA3})
+  string(SUBSTRING ${GUID_VALS_DATA4} 0 2 GUID_VAL04)
+  string(SUBSTRING ${GUID_VALS_DATA4} 2 2 GUID_VAL05)
+  string(SUBSTRING ${GUID_VALS_DATA5} 0 2 GUID_VAL06)
+  string(SUBSTRING ${GUID_VALS_DATA5} 2 2 GUID_VAL07)
+  string(SUBSTRING ${GUID_VALS_DATA5} 4 2 GUID_VAL08)
+  string(SUBSTRING ${GUID_VALS_DATA5} 6 2 GUID_VAL09)
+  string(SUBSTRING ${GUID_VALS_DATA5} 8 2 GUID_VAL10)
+  string(SUBSTRING ${GUID_VALS_DATA5} 10 2 GUID_VAL11)
+endif()
+
+add_library(obs-virtualcam-module MODULE)
+add_library(OBS::virtualcam ALIAS obs-virtualcam-module)
+
+target_sources(obs-virtualcam-module PRIVATE cmake/windows/virtualcam-module32.def)
+target_link_libraries(obs-virtualcam-module PRIVATE _virtualcam)
+
+set_property(TARGET obs-virtualcam-module PROPERTY OUTPUT_NAME obs-virtualcam-module32)

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake/32bit.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake/legacy.cmake Added

@@ -0,0 +1,60 @@
+cmake_minimum_required(VERSION 3.5)
+project(obs-virtualcam-module)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(_output_suffix "64")
+else()
+ set(_output_suffix "32")
+endif()
+
+add_library(obs-virtualcam-module MODULE)
+add_library(OBS::virtualcam-module ALIAS obs-virtualcam-module)
+
+target_sources(
+ obs-virtualcam-module
+ PRIVATE sleepto.c
+ sleepto.h
+ placeholder.cpp
+ virtualcam-module.cpp
+ virtualcam-filter.cpp
+ virtualcam-filter.hpp
+ virtualcam-module.rc
+ ../shared-memory-queue.c
+ ../shared-memory-queue.h
+ ../tiny-nv12-scale.c
+ ../tiny-nv12-scale.h)
+
+target_include_directories(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+set(MODULE_DESCRIPTION "OBS Virtual Camera output module")
+
+configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in virtualcam-module.rc)
+
+target_sources(obs-virtualcam-module PRIVATE virtualcam-module.rc)
+
+target_link_libraries(obs-virtualcam-module PRIVATE OBS::libdshowcapture OBS::libdshowcapture-external setupapi winmm
+ strmiids gdiplus)
+
+target_link_options(obs-virtualcam-module PRIVATE "LINKER:/ignore:4104")
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-module.def.in ${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def)
+
+target_sources(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def)
+
+target_include_directories(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../config
+ ${CMAKE_SOURCE_DIR}/libobs)
+
+target_compile_definitions(obs-virtualcam-module PRIVATE VIRTUALCAM_AVAILABLE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS
+ _CRT_NONSTDC_NO_WARNINGS OBS_LEGACY)
+
+if(MSVC)
+ target_compile_options(obs-virtualcam-module PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
+ add_target_resource(win-dshow "$<TARGET_PDB_FILE:obs-virtualcam-module>" "obs-plugins/win-dshow/" OPTIONAL)
+
+endif()
+
+set_target_properties(obs-virtualcam-module PROPERTIES FOLDER "plugins/win-dshow")
+
+set_target_properties(obs-virtualcam-module PROPERTIES OUTPUT_NAME "obs-virtualcam-module${_output_suffix}")
+
+add_target_resource(win-dshow "$<TARGET_FILE:obs-virtualcam-module>" "obs-plugins/win-dshow/")

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake/windows Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake/windows/obs-module.rc.in Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake/windows/virtualcam-module32.def Added

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/cmake/windows/virtualcam-module64.def Added

obs-studio-29.1.3.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-filter.hpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-filter.hpp Changed

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-guid.h.in Changed

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-install.bat.in Changed

obs-studio-30.0.2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-uninstall.bat.in Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/win-dshow-encoder.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/win-dshow-encoder.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-dshow/win-dshow.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-dshow/win-dshow.cpp Changed

@@ -228,7 +228,8 @@
 	}
 
 	inline DShowInput(obs_source_t *source_, obs_data_t *settings)
-		: source(source_), device(InitGraph::False)
+		: source(source_),
+		 device(InitGraph::False)
 	{
 		memset(&audio, 0, sizeof(audio));
 		memset(&frame, 0, sizeof(frame));
@@ -500,7 +501,9 @@
 
 	if (!ffmpeg_decode_valid(video_decoder)) {
 		if (ffmpeg_decode_init(video_decoder, id, hw_decode) < 0) {
-			blog(LOG_WARNING, "Could not initialize video decoder");
+			blog(LOG_WARNING,
+			 "%s: Could not initialize video decoder",
+			 obs_source_get_name(source));
 			return;
 		}
 	}
@@ -509,7 +512,8 @@
 	bool success = ffmpeg_decode_video(video_decoder, data, size, &ts, cs,
 					 frame.range, &frame, &got_output);
 	if (!success) {
-		blog(LOG_WARNING, "Error decoding video");
+		blog(LOG_WARNING, "%s: Error decoding video",
+		 obs_source_get_name(source));
 		return;
 	}
 
@@ -632,7 +636,9 @@
 {
 	if (!ffmpeg_decode_valid(audio_decoder)) {
 		if (ffmpeg_decode_init(audio_decoder, id, false) < 0) {
-			blog(LOG_WARNING, "Could not initialize audio decoder");
+			blog(LOG_WARNING,
+			 "%s: Could not initialize audio decoder",
+			 obs_source_get_name(source));
 			return;
 		}
 	}
@@ -642,7 +648,8 @@
 		bool success = ffmpeg_decode_audio(audio_decoder, data, size,
 						 &audio, &got_output);
 		if (!success) {
-			blog(LOG_WARNING, "Error decoding audio");
+			blog(LOG_WARNING, "%s: Error decoding audio",
+			 obs_source_get_name(source));
 			return;
 		}
 
@@ -1026,13 +1033,16 @@
 
 	if (useCustomAudio) {
 		DeviceId id;
-		if (!DecodeDeviceId(id, audio_device_id.c_str()))
+		if (!DecodeDeviceId(id, audio_device_id.c_str())) {
+			obs_source_set_audio_active(source, false);
 			return false;
+		}
 
 		audioConfig.name = id.name;
 		audioConfig.path = id.path;
 
 	} else if (!deviceHasAudio) {
+		obs_source_set_audio_active(source, false);
 		return true;
 	}
 
@@ -1049,8 +1059,12 @@
 		(AudioMode)obs_data_get_int(settings, AUDIO_OUTPUT_MODE);
 
 	bool success = device.SetAudioConfig(&audioConfig);
-	if (!success)
+	if (!success) {
+		obs_source_set_audio_active(source, false);
 		return false;
+	}
+
+	obs_source_set_audio_active(source, true);
 
 	BPtr<char> name_utf8;
 	os_wcs_to_utf8_ptr(audioConfig.name.c_str(), audioConfig.name.size(),
@@ -1135,12 +1149,15 @@
 
 inline bool DShowInput::Activate(obs_data_t *settings)
 {
-	if (!device.ResetGraph())
+	if (!device.ResetGraph()) {
+		obs_source_set_audio_active(source, false);
 		return false;
+	}
 
 	if (!UpdateVideoConfig(settings)) {
 		blog(LOG_WARNING, "%s: Video configuration failed",
 		 obs_source_get_name(source));
+		obs_source_set_audio_active(source, false);
 		return false;
 	}

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/plugins/win-wasapi/cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-wasapi/cmake/legacy.cmake Added

obs-studio-30.0.2.tar.xz/plugins/win-wasapi/cmake/windows Added

obs-studio-30.0.2.tar.xz/plugins/win-wasapi/cmake/windows/obs-module.rc.in Added

obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/af-ZA.ini Added

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/ar-SA.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/ar-SA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/cs-CZ.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/cs-CZ.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/da-DK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/da-DK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/el-GR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/el-GR.ini Changed

obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/en-GB.ini Added

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/et-EE.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/et-EE.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/eu-ES.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/eu-ES.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/fa-IR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/fa-IR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/fi-FI.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/fi-FI.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/fr-FR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/fr-FR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/he-IL.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/he-IL.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/hy-AM.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/hy-AM.ini Changed

obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/is-IS.ini Added

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/it-IT.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/it-IT.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/kmr-TR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/kmr-TR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/ms-MY.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/ms-MY.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/nb-NO.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/nb-NO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/pt-BR.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/pt-BR.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/ro-RO.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/ro-RO.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/si-LK.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/si-LK.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/sr-SP.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/sr-SP.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/uk-UA.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/uk-UA.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/data/locale/vi-VN.ini -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/data/locale/vi-VN.ini Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/enum-wasapi.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/enum-wasapi.cpp Changed

obs-studio-29.1.3.tar.xz/plugins/win-wasapi/win-wasapi.cpp -> obs-studio-30.0.2.tar.xz/plugins/win-wasapi/win-wasapi.cpp Changed

@@ -180,6 +180,8 @@
 	const SourceType sourceType;
 	std::atomic<bool> useDeviceTiming = false;
 	std::atomic<bool> isDefaultDevice = false;
+	std::atomic<bool> sawBadTimestamp = false;
+	bool hooked = false;
 
 	bool previouslyFailed = false;
 	WinHandle reconnectThread = NULL;
@@ -248,7 +250,7 @@
 	audio_format format;
 	uint32_t sampleRate;
 
-	uint64_t framesProcessed = 0;
+	vector<BYTE> silence;
 
 	static DWORD WINAPI ReconnectThread(LPVOID param);
 	static DWORD WINAPI CaptureThread(LPVOID param);
@@ -307,6 +309,9 @@
 	void OnStartCapture();
 	void OnSampleReady();
 	void OnRestart();
+
+	bool GetHooked();
+	HWND GetHwnd();
 };
 
 class WASAPINotify : public IMMNotificationClient {
@@ -772,7 +777,7 @@
 		wf.nAvgBytesPerSec = nSamplesPerSec * nBlockAlign;
 		wf.nBlockAlign = nBlockAlign;
 		wf.wBitsPerSample = wBitsPerSample;
-		wf.cbSize = sizeof(wfextensible) - sizeof(format);
+		wf.cbSize = sizeof(wfextensible) - sizeof(wf);
 		wfextensible.Samples.wValidBitsPerSample = wBitsPerSample;
 		wfextensible.dwChannelMask =
 			GetSpeakerChannelMask(oai.speakers);
@@ -995,8 +1000,34 @@
 		}
 	}
 
-	blog(LOG_INFO, "WASAPI: Device '%s' %" PRIu32 " Hz initialized",
-	 device_name.c_str(), sampleRate);
+	blog(LOG_INFO,
+	 "WASAPI: Device '%s' %" PRIu32 " Hz initialized (source: %s)",
+	 device_name.c_str(), sampleRate, obs_source_get_name(source));
+
+	if (sourceType == SourceType::ProcessOutput && !hooked) {
+		hooked = true;
+
+		signal_handler_t *sh = obs_source_get_signal_handler(source);
+		calldata_t data = {0};
+		struct dstr title = {0};
+		struct dstr window_class = {0};
+		struct dstr executable = {0};
+
+		ms_get_window_title(&title, hwnd);
+		ms_get_window_class(&window_class, hwnd);
+		ms_get_window_exe(&executable, hwnd);
+
+		calldata_set_ptr(&data, "source", source);
+		calldata_set_string(&data, "title", title.array);
+		calldata_set_string(&data, "class", window_class.array);
+		calldata_set_string(&data, "executable", executable.array);
+		signal_handler_signal(sh, "hooked", &data);
+
+		dstr_free(&title);
+		dstr_free(&window_class);
+		dstr_free(&executable);
+		calldata_free(&data);
+	}
 }
 
 bool WASAPISource::TryInitialize()
@@ -1109,17 +1140,42 @@
 			return false;
 		}
 
+		if (!sawBadTimestamp &&
+		 flags & AUDCLNT_BUFFERFLAGS_TIMESTAMP_ERROR) {
+			blog(LOG_WARNING, "WASAPISource::ProcessCaptureData"
+					 " Timestamp error!");
+			sawBadTimestamp = true;
+		}
+
+		if (flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY) {
+			/* libobs should handle discontinuities fine. */
+			blog(LOG_DEBUG, "WASAPISource::ProcessCaptureData"
+					" Discontinuity flag is set.");
+		}
+
+		if (flags & AUDCLNT_BUFFERFLAGS_SILENT) {
+			blog(LOG_DEBUG, "WASAPISource::ProcessCaptureData"
+					" Silent flag is set.");
+
+			/* buffer size = frame size * number of frames
+			 * frame size = channels * sample size
+			 * sample size = 4 bytes (always float per InitFormat) */
+			uint32_t requiredBufSize =
+				get_audio_channels(speakers) * frames * 4;
+			if (silence.size() < requiredBufSize)
+				silence.resize(requiredBufSize);
+
+			buffer = silence.data();
+		}
+
 		obs_source_audio data = {};
-		data.data0 = (const uint8_t *)buffer;
-		data.frames = (uint32_t)frames;
+		data.data0 = buffer;
+		data.frames = frames;
 		data.speakers = speakers;
 		data.samples_per_sec = sampleRate;
 		data.format = format;
 		if (sourceType == SourceType::ProcessOutput) {
-			data.timestamp = util_mul_div64(framesProcessed,
-							UINT64_C(1000000000),
-							sampleRate);
-			framesProcessed += frames;
+			data.timestamp = ts * 100;
 		} else {
 			data.timestamp = useDeviceTiming ? ts * 100
 							 : os_gettime_ns();
@@ -1234,6 +1290,23 @@
 						 source->device_name.c_str(),
 						 obs_source_get_name(
 							 source->source));
+						if (source->sourceType ==
+							 SourceType::
+								 ProcessOutput &&
+						 source->hooked) {
+							source->hooked = false;
+							signal_handler_t *sh =
+								obs_source_get_signal_handler(
+									source->source);
+							calldata_t data = {0};
+							calldata_set_ptr(
+								&data, "source",
+								source->source);
+							signal_handler_signal(
+								sh, "unhooked",
+								&data);
+							calldata_free(&data);
+						}
 						stop = true;
 						reconnect = true;
 						source->reconnectDuration =
@@ -1269,6 +1342,18 @@
 			 "Device '%s' invalidated. Retrying (source: %s)",
 			 source->device_name.c_str(),
 			 obs_source_get_name(source->source));
+			if (source->sourceType == SourceType::ProcessOutput &&
+			 source->hooked) {
+				source->hooked = false;
+				signal_handler_t *sh =
+					obs_source_get_signal_handler(
+						source->source);
+				calldata_t data = {0};
+				calldata_set_ptr(&data, "source",
+						 source->source);
+				signal_handler_signal(sh, "unhooked", &data);
+				calldata_free(&data);
+			}
 			SetEvent(source->reconnectSignal);
 		}
 	}
@@ -1382,6 +1467,15 @@
 			 "Device '%s' invalidated. Retrying (source: %s)",
 			 device_name.c_str(), obs_source_get_name(source));
 			SetEvent(reconnectSignal);
+			if (sourceType == SourceType::ProcessOutput && hooked) {
+				hooked = false;
+				signal_handler_t *sh =
+					obs_source_get_signal_handler(source);
+				calldata_t data = {0};
+				calldata_set_ptr(&data, "source", source);
+				signal_handler_signal(sh, "unhooked", &data);
+				calldata_free(&data);
+			}
 		} else {
 			SetEvent(idleSignal);
 		}
@@ -1393,6 +1487,16 @@
 	SetEvent(receiveSignal);
 }
 
+bool WASAPISource::GetHooked()
+{
+	return hooked;
+}
+
+HWND WASAPISource::GetHwnd()
+{
+	return hwnd;
+}
+
 /* ------------------------------------------------------------------------- */
 
 static const char *GetWASAPIInputName(void *)
@@ -1424,11 +1528,66 @@
 
 static void GetWASAPIDefaultsProcessOutput(obs_data_t *) {}
 
+static void wasapi_get_hooked(void *data, calldata_t *cd)
+{
+	WASAPISource *wasapi_source = reinterpret_cast<WASAPISource *>(data);
+
+	if (!wasapi_source)
+		return;
+
+	bool hooked = wasapi_source->GetHooked();
+	HWND hwnd = wasapi_source->GetHwnd();
+
+	if (hooked && hwnd) {
+		calldata_set_bool(cd, "hooked", true);
+		struct dstr title = {0};
+		struct dstr window_class = {0};
+		struct dstr executable = {0};
+		ms_get_window_title(&title, hwnd);
+		ms_get_window_class(&window_class, hwnd);
+		ms_get_window_exe(&executable, hwnd);
+		calldata_set_string(cd, "title", title.array);
+		calldata_set_string(cd, "class", window_class.array);
+		calldata_set_string(cd, "executable", executable.array);
+		dstr_free(&title);
+		dstr_free(&window_class);
+		dstr_free(&executable);
+	} else {
+		calldata_set_bool(cd, "hooked", false);
+		calldata_set_string(cd, "title", "");
+		calldata_set_string(cd, "class", "");
+		calldata_set_string(cd, "executable", "");
+	}
+}
+
 static void *CreateWASAPISource(obs_data_t *settings, obs_source_t *source,
 				SourceType type)
 {
 	try {
-		return new WASAPISource(settings, source, type);
+		if (type != SourceType::ProcessOutput) {
+			return new WASAPISource(settings, source, type);
+		} else {
+			WASAPISource *wasapi_source =
+				new WASAPISource(settings, source, type);
+
+			if (wasapi_source) {
+				signal_handler_t *sh =
+					obs_source_get_signal_handler(source);
+				signal_handler_add(sh,
+						 "void unhooked(ptr source)");
+				signal_handler_add(
+					sh,
+					"void hooked(ptr source, string title, string class, string executable)");
+
+				proc_handler_t *ph =
+					obs_source_get_proc_handler(source);
+				proc_handler_add(
+					ph,
+					"void get_hooked(out bool hooked, out string title, out string class, out string executable)",
+					wasapi_get_hooked, wasapi_source);
+			}
+			return wasapi_source;
+		}
 	} catch (const char *error) {
 		blog(LOG_ERROR, "CreateWASAPISource %s", error);
 	}

obs-studio-29.1.3.tar.xz/test/cmocka/test_serializer.c -> obs-studio-30.0.2.tar.xz/test/cmocka/test_serializer.c Changed

obs-studio-29.1.3.tar.xz/test/osx/test.mm -> obs-studio-30.0.2.tar.xz/test/osx/test.mm Changed

@@ -16,23 +16,23 @@
 
 /* --------------------------------------------------- */
 
-template<typename T, typename D_T, D_T D>
-struct OBSUniqueHandle : std::unique_ptr<T, std::function<D_T>> {
-	using base = std::unique_ptr<T, std::function<D_T>>;
-	explicit OBSUniqueHandle(T *obj = nullptr) : base(obj, D) {}
-	operator T *() { return base::get(); }
+template<typename T, typename D_T, D_T D> struct OBSUniqueHandle : std::unique_ptr<T, std::function<D_T>> {
+ using base = std::unique_ptr<T, std::function<D_T>>;
+ explicit OBSUniqueHandle(T *obj = nullptr) : base(obj, D)
+ {}
+ operator T *()
+ {
+ return base::get();
+ }
 };
 
 #define DECLARE_DELETER(x) decltype(x), x
 
-using SourceContext =
-	OBSUniqueHandle<obs_source, DECLARE_DELETER(obs_source_release)>;
+using SourceContext = OBSUniqueHandle<obs_source, DECLARE_DELETER(obs_source_release)>;
 
-using SceneContext =
-	OBSUniqueHandle<obs_scene, DECLARE_DELETER(obs_scene_release)>;
+using SceneContext = OBSUniqueHandle<obs_scene, DECLARE_DELETER(obs_scene_release)>;
 
-using DisplayContext =
-	OBSUniqueHandle<obs_display, DECLARE_DELETER(obs_display_destroy)>;
+using DisplayContext = OBSUniqueHandle<obs_display, DECLARE_DELETER(obs_display_destroy)>;
 
 #undef DECLARE_DELETER
 
@@ -40,69 +40,68 @@
 
 static void CreateOBS()
 {
-	if (!obs_startup("en", nullptr, nullptr))
-		throw "Couldn't create OBS";
-
-	struct obs_video_info ovi;
-	ovi.adapter = 0;
-	ovi.fps_num = 30000;
-	ovi.fps_den = 1001;
-	ovi.graphics_module = DL_OPENGL;
-	ovi.output_format = VIDEO_FORMAT_RGBA;
-	ovi.base_width = cx;
-	ovi.base_height = cy;
-	ovi.output_width = cx;
-	ovi.output_height = cy;
-
-	if (obs_reset_video(&ovi) != 0)
-		throw "Couldn't initialize video";
+ if (!obs_startup("en", nullptr, nullptr))
+ throw "Couldn't create OBS";
+
+ struct obs_video_info ovi;
+ ovi.adapter = 0;
+ ovi.fps_num = 30000;
+ ovi.fps_den = 1001;
+ ovi.graphics_module = DL_OPENGL;
+ ovi.output_format = VIDEO_FORMAT_RGBA;
+ ovi.base_width = cx;
+ ovi.base_height = cy;
+ ovi.output_width = cx;
+ ovi.output_height = cy;
+
+ if (obs_reset_video(&ovi) != 0)
+ throw "Couldn't initialize video";
 }
 
 static DisplayContext CreateDisplay(NSView *view)
 {
-	gs_init_data info = {};
-	info.cx = cx;
-	info.cy = cy;
-	info.format = GS_RGBA;
-	info.zsformat = GS_ZS_NONE;
-	info.window.view = view;
-
-	return DisplayContext{obs_display_create(&info, 0)};
+ gs_init_data info = {};
+ info.cx = cx;
+ info.cy = cy;
+ info.format = GS_RGBA;
+ info.zsformat = GS_ZS_NONE;
+ info.window.view = view;
+
+ return DisplayContext {obs_display_create(&info, 0)};
 }
 
 static SceneContext SetupScene()
 {
-	/* ------------------------------------------------------ */
-	/* load modules */
-	obs_load_all_modules();
-
-	/* ------------------------------------------------------ */
-	/* create source */
-	SourceContext source{
-		obs_source_create("random", "a test source", nullptr, nullptr)};
-	if (!source)
-		throw "Couldn't create random test source";
-
-	/* ------------------------------------------------------ */
-	/* create scene and add source to scene */
-	SceneContext scene{obs_scene_create("test scene")};
-	if (!scene)
-		throw "Couldn't create scene";
-
-	obs_scene_add(scene, source);
-
-	/* ------------------------------------------------------ */
-	/* set the scene as the primary draw source and go */
-	obs_set_output_source(0, obs_scene_get_source(scene));
-
-	return scene;
+ /* ------------------------------------------------------ */
+ /* load modules */
+ obs_load_all_modules();
+
+ /* ------------------------------------------------------ */
+ /* create source */
+ SourceContext source {obs_source_create("random", "a test source", nullptr, nullptr)};
+ if (!source)
+ throw "Couldn't create random test source";
+
+ /* ------------------------------------------------------ */
+ /* create scene and add source to scene */
+ SceneContext scene {obs_scene_create("test scene")};
+ if (!scene)
+ throw "Couldn't create scene";
+
+ obs_scene_add(scene, source);
+
+ /* ------------------------------------------------------ */
+ /* set the scene as the primary draw source and go */
+ obs_set_output_source(0, obs_scene_get_source(scene));
+
+ return scene;
 }
 
 @interface OBSTest : NSObject <NSApplicationDelegate, NSWindowDelegate> {
-	NSWindow *win;
-	NSView *view;
-	DisplayContext display;
-	SceneContext scene;
+ NSWindow *win;
+ NSView *view;
+ DisplayContext display;
+ SceneContext scene;
 }
 - (void)applicationDidFinishLaunching:(NSNotification *)notification;
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app;
@@ -112,68 +111,63 @@
 @implementation OBSTest
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
-	UNUSED_PARAMETER(notification);
+ UNUSED_PARAMETER(notification);
 
-	try {
-		NSRect content_rect = NSMakeRect(0, 0, cx, cy);
-		win = NSWindow alloc
-			initWithContentRect:content_rect
-				 styleMask:NSTitledWindowMask |
-					 NSClosableWindowMask
-				 backing:NSBackingStoreBuffered
-				 defer:NO;
-		if (!win)
-			throw "Could not create window";
+ try {
+ NSRect content_rect = NSMakeRect(0, 0, cx, cy);
+ win = NSWindow alloc initWithContentRect:content_rect styleMask:NSTitledWindowMask | NSClosableWindowMask
+ backing:NSBackingStoreBuffered
+ defer:NO;
+ if (!win)
+ throw "Could not create window";
 
-		view = NSView alloc initWithFrame:content_rect;
-		if (!view)
-			throw "Could not create view";
+ view = NSView alloc initWithFrame:content_rect;
+ if (!view)
+ throw "Could not create view";
 
-		CreateOBS();
+ CreateOBS();
 
-		win.title = @"foo";
-		win.delegate = self;
-		win.contentView = view;
+ win.title = @"foo";
+ win.delegate = self;
+ win.contentView = view;
 
-		win orderFrontRegardless;
-		win center;
-		win makeMainWindow;
+ win orderFrontRegardless;
+ win center;
+ win makeMainWindow;
 
-		display = CreateDisplay(view);
+ display = CreateDisplay(view);
 
-		scene = SetupScene();
+ scene = SetupScene();
 
-		obs_display_add_draw_callback(
-			display.get(),
-			(void *, uint32_t, uint32_t) {
-				obs_render_main_texture();
-			},
-			nullptr);
+ obs_display_add_draw_callback(
+ display.get(), (void *, uint32_t, uint32_t) {
+ obs_render_main_texture();
+ }, nullptr);
 
-	} catch (char const *error) {
-		NSLog(@"%s\n", error);
+ } catch (char const *error) {
+ NSLog(@"%s\n", error);
 
-		NSApp terminate:nil;
-	}
+ NSApp terminate:nil;
+ }
 }
 
 - (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app
 {
-	UNUSED_PARAMETER(app);
+ UNUSED_PARAMETER(app);
 
-	return YES;
+ return YES;
 }
 
 - (void)windowWillClose:(NSNotification *)notification
 {
-	UNUSED_PARAMETER(notification);
+ UNUSED_PARAMETER(notification);
 
-	obs_set_output_source(0, nullptr);
-	scene.reset();
-	display.reset();
+ obs_set_output_source(0, nullptr);
+ scene.reset();
+ display.reset();
 
-	obs_shutdown();
-	NSLog(@"Number of memory leaks: %lu", bnum_allocs());
+ obs_shutdown();
+ NSLog(@"Number of memory leaks: %lu", bnum_allocs());
 }
 @end
 
@@ -181,13 +175,13 @@
 
 int main()
 {
-	@autoreleasepool {
-		NSApplication *app = NSApplication sharedApplication;
-		OBSTest *test = OBSTest alloc init;
-		app.delegate = test;
+ @autoreleasepool {
+ NSApplication *app = NSApplication sharedApplication;
+ OBSTest *test = OBSTest alloc init;
+ app.delegate = test;
 
-		app run;
-	}
+ app run;
+ }
 
-	return 0;
+ return 0;
 }

obs-studio-29.1.3.tar.xz/test/test-input/CMakeLists.txt -> obs-studio-30.0.2.tar.xz/test/test-input/CMakeLists.txt Changed

obs-studio-30.0.2.tar.xz/test/test-input/cmake Added

obs-studio-30.0.2.tar.xz/test/test-input/cmake/legacy.cmake Added

Changes of Revision 40